From 5b6779a2b8630f8a67ab880c2a4e58ff93bd1de4 Mon Sep 17 00:00:00 2001 From: Theodore Tso Date: Sat, 22 Apr 1995 04:46:40 +0000 Subject: [PATCH] The variable krb5_override_default_realm is obsolete. Use the krb5_set_default_realm function instead. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@5448 dc483132-0cff-0310-8789-dd5450dbe970 --- src/appl/bsd/ChangeLog | 7 +++++-- src/appl/bsd/krlogind.c | 10 ++++++---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog index 7683048a9..ded3dfd56 100644 --- a/src/appl/bsd/ChangeLog +++ b/src/appl/bsd/ChangeLog @@ -1,7 +1,10 @@ Sat Apr 22 00:42:22 1995 Theodore Y. Ts'o (tytso@dcl) - * krshd.c (main): The variable krb5_override_default_realm is - obsolete. Use the krb5_set_default_realm function instead. + * rlogind (main, doit): The variable krb5_override_default_realm + is obsolete. Use the krb5_set_default_realm function instead. + + * krshd.c (main, doit): The variable krb5_override_default_realm + is obsolete. Use the krb5_set_default_realm function instead. Fri Apr 21 21:11:17 1995 Theodore Y. Ts'o (tytso@dcl) diff --git a/src/appl/bsd/krlogind.c b/src/appl/bsd/krlogind.c index cfeecd68b..1cc3ca5c7 100644 --- a/src/appl/bsd/krlogind.c +++ b/src/appl/bsd/krlogind.c @@ -246,7 +246,6 @@ krb5_ticket *ticket = 0; krb5_context bsd_context; char *srvtab = NULL; -extern char *krb5_override_default_realm; #define ARGSTR "rRkKeExXpPD:S:M:L:?" #else /* !KERBEROS */ @@ -322,6 +321,11 @@ main(argc, argv) #define LOG_NDELAY 0 #endif +#ifdef KERBEROS + krb5_init_context(&bsd_context); + krb5_init_ets(bsd_context); +#endif + #ifndef LOG_AUTH /* 4.2 syslog */ openlog(progname, LOG_PID | LOG_NDELAY); #else @@ -392,7 +396,7 @@ main(argc, argv) srvtab = optarg; break; case 'M': - krb5_override_default_realm = optarg; + krb5_set_default_realm(bsd_context, optarg); break; #endif case 'p': @@ -535,8 +539,6 @@ void doit(f, fromp) fatal(f, "Permission denied - Malformed from address\n"); #ifdef KERBEROS - krb5_init_context(&bsd_context); - krb5_init_ets(bsd_context); if (must_pass_k5 || must_pass_one) { /* setup des buffers */ desinbuf.data = des_inbuf; -- 2.26.2