[src/netbsd-1-5]: src/usr.bin/login Pull up rev. 1.61:

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0ae541f8eb79
branches:  netbsd-1-5
changeset: 488906:0ae541f8eb79
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Sun Aug 06 16:47:19 2000 +0000

description:
Pull up rev. 1.61:
Don't syslog that krb5_init_context() failed if it failed due
to Kerberos not being configured on the system.

diffstat:

 usr.bin/login/login.c |  20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 deletions(-)

diffs (41 lines):

diff -r 23e078f26f87 -r 0ae541f8eb79 usr.bin/login/login.c
--- a/usr.bin/login/login.c     Sun Aug 06 12:56:17 2000 +0000
+++ b/usr.bin/login/login.c     Sun Aug 06 16:47:19 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: login.c,v 1.58.2.1 2000/08/02 21:16:04 thorpej Exp $       */
+/*     $NetBSD: login.c,v 1.58.2.2 2000/08/06 16:47:19 thorpej Exp $       */
 
 /*-
  * Copyright (c) 1980, 1987, 1988, 1991, 1993, 1994
@@ -44,7 +44,7 @@
 #if 0
 static char sccsid[] = "@(#)login.c    8.4 (Berkeley) 4/2/94";
 #endif
-__RCSID("$NetBSD: login.c,v 1.58.2.1 2000/08/02 21:16:04 thorpej Exp $");
+__RCSID("$NetBSD: login.c,v 1.58.2.2 2000/08/06 16:47:19 thorpej Exp $");
 #endif /* not lint */
 
 /*
@@ -298,8 +298,20 @@
 #ifdef KERBEROS5
        kerror = krb5_init_context(&kcontext);
        if (kerror) {
-               syslog(LOG_NOTICE, "%s when initializing Kerberos context",
-                   error_message(kerror));
+               /*
+                * If Kerberos is not configured, that is, we are
+                * not using Kerberos, do not log the error message.
+                * However, if Kerberos is configured,  and the
+                * context init fails for some other reason, we need
+                * to issue a no tickets warning to the user when the
+                * login succeeds.
+                */
+               if (kerror != ENXIO) {  /* XXX NetBSD-local Heimdal hack */
+                       syslog(LOG_NOTICE,
+                           "%s when initializing Kerberos context",
+                           error_message(kerror));
+                       krb5_configured = 1;
+               }
                login_krb5_get_tickets = 0;
        }
 #endif KERBEROS5