From 1ce6c911345ea90d9def6ff83b2f6269da2f2660 Mon Sep 17 00:00:00 2001 From: Ezra Peisach Date: Wed, 26 Apr 1995 14:56:14 +0000 Subject: [PATCH] * krlogind.c (main): LOG_AUTH in openlog arguments in wrong place. (recvauth): Do not copy principal on a V4 request. The ticket portion is not set by krb5_compat_recvauth for these. * configure.in: Check for libutil. Under OSF/1, logwtmp is stored there. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@5494 dc483132-0cff-0310-8789-dd5450dbe970 --- src/appl/bsd/ChangeLog | 8 ++++++++ src/appl/bsd/configure.in | 1 + src/appl/bsd/krlogind.c | 10 +++++----- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog index c3c7a50f3..0a731c73a 100644 --- a/src/appl/bsd/ChangeLog +++ b/src/appl/bsd/ChangeLog @@ -1,3 +1,11 @@ +Wed Apr 26 09:41:35 1995 Ezra Peisach + + * krlogind.c (main): LOG_AUTH in openlog arguments in wrong place. + (recvauth): Do not copy principal on a V4 request. The + ticket portion is not set by krb5_compat_recvauth for these. + + * configure.in: Check for libutil. Under OSF/1, logwtmp is stored + there. Wed Apr 26 07:19:18 1995 Chris Provenzano (proven@mit.edu) diff --git a/src/appl/bsd/configure.in b/src/appl/bsd/configure.in index 72e0ddd27..cdb56ae5d 100644 --- a/src/appl/bsd/configure.in +++ b/src/appl/bsd/configure.in @@ -7,6 +7,7 @@ WITH_NETLIB dnl dbm libs for use of an_to_ln AC_CHECK_LIB(ndbm,main) AC_CHECK_LIB(dbm,main) +AC_CHECK_LIB(util,main) dnl dnl AIX has them all; SCO might too LOGINLIBS= diff --git a/src/appl/bsd/krlogind.c b/src/appl/bsd/krlogind.c index 9c1c70eb0..72a216363 100644 --- a/src/appl/bsd/krlogind.c +++ b/src/appl/bsd/krlogind.c @@ -329,7 +329,7 @@ main(argc, argv) #ifndef LOG_AUTH /* 4.2 syslog */ openlog(progname, LOG_PID | LOG_NDELAY); #else - openlog(progname, LOG_PID | LOG_AUTH | LOG_NDELAY, LOG_AUTH); + openlog(progname, LOG_PID | LOG_NDELAY, LOG_AUTH); #endif /* 4.2 syslog */ if (argc == 1) { /* Get parameters from program name. */ @@ -1599,10 +1599,6 @@ recvauth() getstr(netf, lusername, sizeof (lusername), "locuser"); getstr(netf, term, sizeof(term), "Terminal type"); - if (status = krb5_copy_principal(bsd_context, ticket->enc_part2->client, - &client)) - return status; - #ifdef KRB5_KRB4_COMPAT if (auth_sys == KRB5_RECVAUTH_V4) { @@ -1628,6 +1624,10 @@ recvauth() /* Must be V5 */ + if (status = krb5_copy_principal(bsd_context, ticket->enc_part2->client, + &client)) + return status; + des_read = v5_des_read; des_write = v5_des_write; -- 2.26.2