Changes for KTH KerberosIV.

Also quieten -Wall a bit.

5 files changed, 13 insertions, 16 deletions

diff --git a/usr.bin/login/Makefile b/usr.bin/login/Makefile
index ad1003c..6bbe886 100644
--- a/usr.bin/login/Makefile
+++ b/usr.bin/login/Makefile
@@ -1,5 +1,5 @@
 # From:	@(#)Makefile	8.1 (Berkeley) 7/19/93
-# $Id: Makefile,v 1.17 1997/09/05 12:00:01 peter Exp $
+# $Id$
 
 PROG=	login
 MAN1=	login.1
@@ -9,22 +9,16 @@ SRCS=	login.c login_access.c login_fbtab.c
 #Uncomment to activate login_auth
 #Warning: requires src/libexec/login_* auth modules
 #LC_AUTH=-DLOGIN_CAP_AUTH
-CFLAGS+=-DSKEY -DLOGIN_ACCESS -DLOGALL -DLOGIN_CAP $(LC_AUTH)
+CFLAGS+=-Wall -DSKEY -DLOGIN_ACCESS -DLOGALL -DLOGIN_CAP $(LC_AUTH)
 
 .if defined(KLOGIN_PARANOID)
 CFLAGS+=-DKLOGIN_PARANOID
 .endif
 
-DPADD=	${LIBUTIL} ${LIBSKEY} ${LIBCRYPT}
-LDADD=	-lutil -lskey -lcrypt
+DPADD=	${LIBUTIL} ${LIBSKEY} ${LIBMD} ${LIBCRYPT}
+LDADD=	-lutil -lskey -lmd -lcrypt
 
-# have to provide libmd.a for libskey.so to use.
-.if ${BINFORMAT} != elf
-DPADD+=	${LIBMD}
-LDADD+=	-lmd
-.endif
-
-.if exists(${DESTDIR}/usr/lib/libkrb.a) && defined(MAKE_EBONES) && !defined(LC_AUTH)
+.if exists(${DESTDIR}/usr/lib/libkrb.a) && defined(MAKE_KERBEROS4) && !defined(LC_AUTH)
 CFLAGS+=-DKERBEROS
 SRCS+=	klogin.c
 DPADD+=	${LIBKRB} ${LIBDES}
diff --git a/usr.bin/login/klogin.c b/usr.bin/login/klogin.c
index 6e30949..7c61b84 100644
--- a/usr.bin/login/klogin.c
+++ b/usr.bin/login/klogin.c
@@ -32,14 +32,14 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)klogin.c	8.3 (Berkeley) 4/2/94";
+static const char sccsid[] = "@(#)klogin.c	8.3 (Berkeley) 4/2/94";
 #endif /* not lint */
 
 #ifdef KERBEROS
 #include <sys/param.h>
 #include <sys/syslog.h>
 #include <des.h>
-#include <kerberosIV/krb.h>
+#include <krb.h>
 
 #include <err.h>
 #include <netdb.h>
diff --git a/usr.bin/login/login.c b/usr.bin/login/login.c
index ec6ed39..ecf1029 100644
--- a/usr.bin/login/login.c
+++ b/usr.bin/login/login.c
@@ -42,7 +42,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)login.c	8.4 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-	"$Id$";
+	"$Id: login.c,v 1.28 1997/07/22 07:39:43 charnier Exp $";
 #endif /* not lint */
 
 /*
@@ -111,6 +111,7 @@ void	 sleepexit __P((int));
 void	 refused __P((char *,char *,int));
 char	*stypeof __P((char *));
 void	 timedout __P((int));
+int	 login_access __P((char *, char *));
 void     login_fbtab __P((char *, uid_t, gid_t));
 #ifdef KERBEROS
 int	 klogin __P((struct passwd *, char *, char *, char *));
diff --git a/usr.bin/login/login_access.c b/usr.bin/login/login_access.c
index b5003c7..cfb24d2 100644
--- a/usr.bin/login/login_access.c
+++ b/usr.bin/login/login_access.c
@@ -9,7 +9,7 @@
 
 #ifdef LOGIN_ACCESS
 #ifndef lint
-static char sccsid[] = "%Z% %M% %I% %E% %U%";
+static const char sccsid[] = "%Z% %M% %I% %E% %U%";
 #endif
 
 #include <stdio.h>
diff --git a/usr.bin/login/login_fbtab.c b/usr.bin/login/login_fbtab.c
index 37cfe7a..488b3f3 100644
--- a/usr.bin/login/login_fbtab.c
+++ b/usr.bin/login/login_fbtab.c
@@ -59,11 +59,13 @@
  */
 
 #include <sys/types.h>
+#include <sys/stat.h>
 #include <stdio.h>
 #include <syslog.h>
 #include <string.h>
 #include <errno.h>
 #include <dirent.h>
+#include <unistd.h>
 #include "pathnames.h"
 
 void	login_protect	__P((char *, char *, int, uid_t, gid_t));
@@ -91,7 +93,7 @@ gid_t   gid;
 	return;
 
     while (fgets(buf, sizeof(buf), fp)) {
-	if (cp = strchr(buf, '#'))
+	if ((cp = strchr(buf, '#')))
 	    *cp = 0;				/* strip comment */
 	if ((cp = devname = strtok(buf, WSPACE)) == 0)
 	    continue;				/* empty or comment */