oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

add -G and config file support. From Miroslav Ruda <ruda@ics.muni.cz>

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@6729 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1999-08-04 17:22:50 +00:00
parent fb7bb330b4
commit 9f826a0fc8
1 changed files with 45 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
appl/telnet/telnet/main.c
View File

@@ -69,7 +69,7 @@ usage(void)
{ {
fprintf(stderr, "Usage: %s %s%s%s%s\n", prompt, fprintf(stderr, "Usage: %s %s%s%s%s\n", prompt,
#ifdef AUTHENTICATION #ifdef AUTHENTICATION
"[-8] [-E] [-K] [-L] [-S tos] [-X atype] [-a] [-c] [-d] [-e char]", "[-8] [-E] [-K] [-L] [-G] [-S tos] [-X atype] [-a] [-c] [-d] [-e char]",
"\n\t[-k realm] [-l user] [-f/-F] [-n tracefile] ", "\n\t[-k realm] [-l user] [-f/-F] [-n tracefile] ",
#else #else
"[-8] [-E] [-L] [-S tos] [-a] [-c] [-d] [-e char] [-l user]", "[-8] [-E] [-L] [-S tos] [-a] [-c] [-d] [-e char] [-l user]",
@@ -90,6 +90,11 @@ usage(void)
*/ */
#ifdef FORWARD
extern int forward_flags;
static int default_forward=0;
#endif /* FORWARD */
#ifdef KRB5 #ifdef KRB5
/* XXX ugly hack to setup dns-proxy stuff */ /* XXX ugly hack to setup dns-proxy stuff */
#define Authenticator asn1_Authenticator #define Authenticator asn1_Authenticator
@@ -99,8 +104,29 @@ krb5_init(void)
{ {
krb5_context context; krb5_context context;
krb5_init_context(&context); krb5_init_context(&context);
krb5_free_context(context);
#if defined(AUTHENTICATION) && defined(KRB5) && defined(FORWARD)
if (krb5_config_get_bool (context, NULL,
"libdefaults", "forward", NULL)) {
forward_flags |= OPTS_FORWARD_CREDS;
default_forward=1;
}
if (krb5_config_get_bool (context, NULL,
"libdefaults", "forwardable", NULL)) {
forward_flags |= OPTS_FORWARDABLE_CREDS;
default_forward=1;
}
#endif
#ifdef ENCRYPTION
if (krb5_config_get_bool (context, NULL,
"libdefaults", "encrypt", NULL)) {
encrypt_auto(1);
decrypt_auto(1);
EncryptVerbose(1);
}
#endif
krb5_free_context(context);
} }
#endif #endif
@@ -109,9 +135,6 @@ main(int argc, char **argv)
{ {
int ch; int ch;
char *user; char *user;
#ifdef FORWARD
extern int forward_flags;
#endif /* FORWARD */
#ifdef KRB5 #ifdef KRB5
krb5_init(); krb5_init();
@@ -137,7 +160,8 @@ main(int argc, char **argv)
*/ */
autologin = -1; autologin = -1;
while((ch = getopt(argc, argv, "78DEKLS:X:abcde:fFk:l:n:rx")) != EOF) { while((ch = getopt(argc, argv,
"78DEKLS:X:abcde:fFk:l:n:rxG")) != EOF) {
switch(ch) { switch(ch) {
case '8': case '8':
eight = 3; /* binary output and input */ eight = 3; /* binary output and input */
@@ -202,7 +226,8 @@ main(int argc, char **argv)
break; break;
case 'f': case 'f':
#if defined(AUTHENTICATION) && defined(KRB5) && defined(FORWARD) #if defined(AUTHENTICATION) && defined(KRB5) && defined(FORWARD)
if (forward_flags & OPTS_FORWARD_CREDS) { if ((forward_flags & OPTS_FORWARD_CREDS) &&
!default_forward) {
fprintf(stderr, fprintf(stderr,
"%s: Only one of -f and -F allowed.\n", "%s: Only one of -f and -F allowed.\n",
prompt); prompt);
@@ -217,7 +242,8 @@ main(int argc, char **argv)
break; break;
case 'F': case 'F':
#if defined(AUTHENTICATION) && defined(KRB5) && defined(FORWARD) #if defined(AUTHENTICATION) && defined(KRB5) && defined(FORWARD)
if (forward_flags & OPTS_FORWARD_CREDS) { if ((forward_flags & OPTS_FORWARD_CREDS) &&
!default_forward) {
fprintf(stderr, fprintf(stderr,
"%s: Only one of -f and -F allowed.\n", "%s: Only one of -f and -F allowed.\n",
prompt); prompt);
@@ -269,6 +295,17 @@ main(int argc, char **argv)
prompt); prompt);
#endif #endif
break; break;
case 'G':
#if defined(AUTHENTICATION) && defined(KRB5) && defined(FORWARD)
forward_flags ^= OPTS_FORWARD_CREDS;
forward_flags ^= OPTS_FORWARDABLE_CREDS;
#else
fprintf(stderr,
"%s: Warning: -G ignored, no Kerberos V5 support.\n",
prompt);
#endif
break;
case '?': case '?':
default: default:
usage(); usage();