[src/trunk]: src/usr.bin/login Ack. Disable login caps, until problems are fi...

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

details:   https://anonhg.NetBSD.org/src/rev/0a0f75880b0e
branches:  trunk
changeset: 480450:0a0f75880b0e
user:      mjl <mjl%NetBSD.org@localhost>
date:      Thu Jan 13 06:30:31 2000 +0000

description:
Ack. Disable login caps, until problems are fixed.

diffstat:

 usr.bin/login/Makefile |  4 ++--
 usr.bin/login/login.c  |  7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diffs (57 lines):

diff -r b17c6c5904be -r 0a0f75880b0e usr.bin/login/Makefile
--- a/usr.bin/login/Makefile    Thu Jan 13 06:17:56 2000 +0000
+++ b/usr.bin/login/Makefile    Thu Jan 13 06:30:31 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.25 2000/01/13 06:17:56 mjl Exp $
+#      $NetBSD: Makefile,v 1.26 2000/01/13 06:30:31 mjl Exp $
 #      @(#)Makefile    8.1 (Berkeley) 7/19/93
 
 SRCTOP=        ../..
@@ -11,7 +11,7 @@
 BINOWN=        root
 BINMODE=4555
 INSTALLFLAGS=-fschg
-CFLAGS+=       -DLOGIN_CAP
+# CFLAGS+=     -DLOGIN_CAP
 
 .include <bsd.own.mk>
 
diff -r b17c6c5904be -r 0a0f75880b0e usr.bin/login/login.c
--- a/usr.bin/login/login.c     Thu Jan 13 06:17:56 2000 +0000
+++ b/usr.bin/login/login.c     Thu Jan 13 06:30:31 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: login.c,v 1.48 2000/01/13 06:17:56 mjl Exp $       */
+/*     $NetBSD: login.c,v 1.49 2000/01/13 06:30:31 mjl 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.48 2000/01/13 06:17:56 mjl Exp $");
+__RCSID("$NetBSD: login.c,v 1.49 2000/01/13 06:30:31 mjl Exp $");
 #endif /* not lint */
 
 /*
@@ -165,11 +165,11 @@
        int login_retries = DEFAULT_RETRIES, 
            login_backoff = DEFAULT_BACKOFF;
        time_t pw_warntime = _PASSWORD_WARNDAYS * SECSPERDAY;
-       char *shell = NULL;
 #ifdef KERBEROS5
        krb5_error_code kerror;
 #endif
 #ifdef LOGIN_CAP
+       char *shell = NULL;
        login_cap_t *lc = NULL;
 #endif
 
@@ -330,7 +330,6 @@
                if (pwd != NULL)
                        lc = login_getclass(pwd->pw_class);
 #endif
-
                /*
                 * if we have a valid account name, and it doesn't have a
                 * password, or the -f option was specified and the caller