From 643dc1e2d83cf95b31f0518e68747162f85d7db5 Mon Sep 17 00:00:00 2001 From: Theodore Tso Date: Sat, 22 Apr 1995 04:44:24 +0000 Subject: [PATCH] The variable krb5_override_default_realm is obsolete. Use the krb5_set_default_realm function instead. Add #include for , which is now needed. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@5447 dc483132-0cff-0310-8789-dd5450dbe970 --- src/appl/bsd/ChangeLog | 9 +++++++++ src/appl/bsd/krshd.c | 11 +++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog index 967ccdf66..7683048a9 100644 --- a/src/appl/bsd/ChangeLog +++ b/src/appl/bsd/ChangeLog @@ -1,3 +1,12 @@ +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. + +Fri Apr 21 21:11:17 1995 Theodore Y. Ts'o (tytso@dcl) + + * krshd.c: Add #include for , which is now needed. + Fri Apr 21 17:18:57 1995 Mark Eichin rlogin testing changes from ian@cygnus.com. diff --git a/src/appl/bsd/krshd.c b/src/appl/bsd/krshd.c index eab21635c..ae1f99c2f 100644 --- a/src/appl/bsd/krshd.c +++ b/src/appl/bsd/krshd.c @@ -98,6 +98,7 @@ char copyright[] = #include #include #include +#include #include #include @@ -175,7 +176,6 @@ char des_outbuf[2*BUFSIZ]; /* needs to be > largest write size */ krb5_data desinbuf,desoutbuf; krb5_context bsd_context; char *srvtab = NULL; -extern char *krb5_override_default_realm; void fatal(); int v5_des_read(); @@ -262,6 +262,11 @@ main(argc, argv) openlog(progname, LOG_PID | LOG_ODELAY, LOG_DAEMON); #endif /* 4.2 syslog */ +#ifdef KERBEROS + krb5_init_context(&bsd_context); + krb5_init_ets(bsd_context); +#endif + if (argc == 1) { /* Get parameters from program name. */ if (strlen(progname) > MAX_PROG_NAME) { usage(); @@ -322,7 +327,7 @@ main(argc, argv) break; case 'M': - krb5_override_default_realm = optarg; + krb5_set_default_realm(bsd_context, optarg); break; case 'A': @@ -573,8 +578,6 @@ doit(f, fromp) exit(1); } #ifdef KERBEROS - krb5_init_context(&bsd_context); - krb5_init_ets(bsd_context); netf = f; desinbuf.data = des_inbuf; desoutbuf.data = des_outbuf; -- 2.26.2