diff options
| -rw-r--r-- | lib/libutil/Makefile | 4 | ||||
| -rw-r--r-- | lib/libutil/login_fbtab.c (renamed from usr.bin/login/login_fbtab.c) | 10 | ||||
| -rw-r--r-- | lib/libutil/util.h | 3 | ||||
| -rw-r--r-- | usr.bin/login/Makefile | 4 | ||||
| -rw-r--r-- | usr.bin/login/pathnames.h | 3 |
5 files changed, 13 insertions, 11 deletions
diff --git a/lib/libutil/Makefile b/lib/libutil/Makefile index 77fe63cc9c3..f8df9f03a69 100644 --- a/lib/libutil/Makefile +++ b/lib/libutil/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 1996/06/17 08:17:32 downsj Exp $ +# $OpenBSD: Makefile,v 1.7 1996/07/31 17:44:20 deraadt Exp $ # $NetBSD: Makefile,v 1.8 1996/05/16 07:03:28 thorpej Exp $ LIB= util @@ -6,7 +6,7 @@ CFLAGS+=-DLIBC_SCCS HDRS= util.h scsi.h SRCS= getmaxpartitions.c getrawpartition.c login.c login_tty.c logout.c \ - logwtmp.c opendev.c passwd.c pty.c scsi.c + logwtmp.c opendev.c passwd.c pty.c scsi.c login_fbtab.c MAN= getmaxpartitions.3 getrawpartition.3 login.3 opendev.3 openpty.3 \ pw_init.3 pw_lock.3 scsi.3 diff --git a/usr.bin/login/login_fbtab.c b/lib/libutil/login_fbtab.c index b34cf0871f3..98fadfa71fc 100644 --- a/usr.bin/login/login_fbtab.c +++ b/lib/libutil/login_fbtab.c @@ -64,10 +64,12 @@ #include <string.h> #include <errno.h> #include <dirent.h> -#include "pathnames.h" -void login_protect __P((char *, char *, int, uid_t, gid_t)); -void login_fbtab __P((char *tty, uid_t uid, gid_t gid)); +#include "util.h" + +#define _PATH_FBTAB "/etc/fbtab" + +static void login_protect __P((char *, char *, int, uid_t, gid_t)); #define WSPACE " \t\n" @@ -113,7 +115,7 @@ login_fbtab(tty, uid, gid) /* * login_protect - protect one device entry */ -void +static void login_protect(table, path, mask, uid, gid) char *table; char *path; diff --git a/lib/libutil/util.h b/lib/libutil/util.h index 95a7006e199..f4d63703e16 100644 --- a/lib/libutil/util.h +++ b/lib/libutil/util.h @@ -1,4 +1,4 @@ -/* $OpenBSD: util.h,v 1.1 1996/06/17 07:46:05 downsj Exp $ */ +/* $OpenBSD: util.h,v 1.2 1996/07/31 17:44:22 deraadt Exp $ */ /* $NetBSD: util.h,v 1.2 1996/05/16 07:00:22 thorpej Exp $ */ /*- @@ -71,6 +71,7 @@ int openpty __P((int *, int *, char *, struct termios *, pid_t forkpty __P((int *, char *, struct termios *, struct winsize *)); int getmaxpartitions __P((void)); int getrawpartition __P((void)); +void login_fbtab __P((char *tty, uid_t uid, gid_t gid)); __END_DECLS #endif /* !_UTIL_H_ */ diff --git a/usr.bin/login/Makefile b/usr.bin/login/Makefile index 1b43a388568..6a3f2a65ec4 100644 --- a/usr.bin/login/Makefile +++ b/usr.bin/login/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.5 1996/07/31 12:21:42 deraadt Exp $ +# $OpenBSD: Makefile,v 1.6 1996/07/31 17:44:23 deraadt Exp $ # $NetBSD: Makefile,v 1.10 1994/12/23 06:52:56 jtc Exp $ PROG= login -SRCS= login.c login_fbtab.c +SRCS= login.c #LDADD= -lutil -lcrypt LDADD= -lutil #DPADD= ${LIBUTIL} ${LIBCRYPT} diff --git a/usr.bin/login/pathnames.h b/usr.bin/login/pathnames.h index 6aa3028d7b2..056f423e2c4 100644 --- a/usr.bin/login/pathnames.h +++ b/usr.bin/login/pathnames.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pathnames.h,v 1.3 1996/07/31 12:21:44 deraadt Exp $ */ +/* $OpenBSD: pathnames.h,v 1.4 1996/07/31 17:44:24 deraadt Exp $ */ /* $NetBSD: pathnames.h,v 1.4 1994/12/23 06:53:03 jtc Exp $ */ /*- @@ -40,4 +40,3 @@ #define _PATH_HUSHLOGIN ".hushlogin" #define _PATH_MOTDFILE "/etc/motd" -#define _PATH_FBTAB "/etc/fbtab" |