libutil

4 files changed, 6 insertions, 178 deletions

diff --git a/usr.sbin/pwd_mkdb/Makefile b/usr.sbin/pwd_mkdb/Makefile
index 4110a97b72f..90f5c280627 100644
--- a/usr.sbin/pwd_mkdb/Makefile
+++ b/usr.sbin/pwd_mkdb/Makefile
@@ -1,9 +1,11 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/6/93
-#	$Id: Makefile,v 1.1.1.1 1995/10/18 08:48:01 deraadt Exp $
+#	$Id: Makefile,v 1.2 1996/05/22 11:35:51 deraadt Exp $
 
 PROG=	pwd_mkdb
-SRCS=	pw_scan.c pwd_mkdb.c getpwent.c
+SRCS=	pwd_mkdb.c getpwent.c
 MAN=	pwd_mkdb.8
+LDADD+=	-lutil
+DPADD+=	${LIBUTIL}
 
 .PATH:	${.CURDIR}/../../lib/libc/gen
 
diff --git a/usr.sbin/pwd_mkdb/pw_scan.c b/usr.sbin/pwd_mkdb/pw_scan.c
deleted file mode 100644
index 00fd45cdf64..00000000000
--- a/usr.sbin/pwd_mkdb/pw_scan.c
+++ /dev/null
@@ -1,137 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- * Portions Copyright(C) 1995, Jason Downs.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef lint
-/*static char sccsid[] = "from: @(#)pw_scan.c	8.3 (Berkeley) 4/2/94";*/
-static char *rcsid = "$Id: pw_scan.c,v 1.1.1.1 1995/10/18 08:48:01 deraadt Exp $";
-#endif /* not lint */
-
-/*
- * This module is used to "verify" password entries by chpass(1) and
- * pwd_mkdb(8).
- */
-
-#include <sys/param.h>
-
-#include <err.h>
-#include <fcntl.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include "pw_scan.h"
-
-int
-pw_scan(bp, pw, flags)
-	char *bp;
-	struct passwd *pw;
-	int *flags;
-{
-	long id;
-	int root;
-	char *p, *sh;
-
-	if (flags != (int *)NULL)
-		*flags = 0;
-
-	if (!(pw->pw_name = strsep(&bp, ":")))		/* login */
-		goto fmt;
-	root = !strcmp(pw->pw_name, "root");
-
-	if (!(pw->pw_passwd = strsep(&bp, ":")))	/* passwd */
-		goto fmt;
-
-	if (!(p = strsep(&bp, ":")))			/* uid */
-		goto fmt;
-	id = atol(p);
-	if (root && id) {
-		warnx("root uid should be 0");
-		return (0);
-	}
-	if (id > USHRT_MAX) {
-		warnx("%s > max uid value (%d)", p, USHRT_MAX);
-		return (0);
-	}
-	pw->pw_uid = id;
-	if ((*p == '\0') && (flags != (int *)NULL))
-		*flags |= _PASSWORD_NOUID;
-
-	if (!(p = strsep(&bp, ":")))			/* gid */
-		goto fmt;
-	id = atol(p);
-	if (id > USHRT_MAX) {
-		warnx("%s > max gid value (%d)", p, USHRT_MAX);
-		return (0);
-	}
-	pw->pw_gid = id;
-	if ((*p == '\0') && (flags != (int *)NULL))
-		*flags |= _PASSWORD_NOGID;
-
-	pw->pw_class = strsep(&bp, ":");		/* class */
-	if (!(p = strsep(&bp, ":")))			/* change */
-		goto fmt;
-	pw->pw_change = atol(p);
-	if ((*p == '\0') && (flags != (int *)NULL))
-		*flags |= _PASSWORD_NOCHG;
-	if (!(p = strsep(&bp, ":")))			/* expire */
-		goto fmt;
-	pw->pw_expire = atol(p);
-	if ((*p == '\0') && (flags != (int *)NULL))
-		*flags |= _PASSWORD_NOEXP;
-	pw->pw_gecos = strsep(&bp, ":");		/* gecos */
-	pw->pw_dir = strsep(&bp, ":");			/* directory */
-	if (!(pw->pw_shell = strsep(&bp, ":")))		/* shell */
-		goto fmt;
-
-	p = pw->pw_shell;
-	if (root && *p)					/* empty == /bin/sh */
-		for (setusershell();;) {
-			if (!(sh = getusershell())) {
-				warnx("warning, unknown root shell");
-				break;
-			}
-			if (!strcmp(p, sh))
-				break;	
-		}
-
-	if (p = strsep(&bp, ":")) {			/* too many */
-fmt:		warnx("corrupted entry");
-		return (0);
-	}
-
-	return (1);
-}
diff --git a/usr.sbin/pwd_mkdb/pw_scan.h b/usr.sbin/pwd_mkdb/pw_scan.h
index f1ff78c1f64..e69de29bb2d 100644
--- a/usr.sbin/pwd_mkdb/pw_scan.h
+++ b/usr.sbin/pwd_mkdb/pw_scan.h
@@ -1,36 +0,0 @@
-/*-
- * Copyright (c) 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)pw_scan.h	8.1 (Berkeley) 4/1/94
- */
-
-extern int	pw_scan __P((char *, struct passwd *, int *));
diff --git a/usr.sbin/pwd_mkdb/pwd_mkdb.c b/usr.sbin/pwd_mkdb/pwd_mkdb.c
index 2ef250eb835..5c0e3926040 100644
--- a/usr.sbin/pwd_mkdb/pwd_mkdb.c
+++ b/usr.sbin/pwd_mkdb/pwd_mkdb.c
@@ -40,7 +40,7 @@ static char copyright[] =
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)pwd_mkdb.c	8.5 (Berkeley) 4/20/94";*/
-static char *rcsid = "$Id: pwd_mkdb.c,v 1.4 1996/05/14 01:06:15 deraadt Exp $";
+static char *rcsid = "$Id: pwd_mkdb.c,v 1.5 1996/05/22 11:35:54 deraadt Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -57,8 +57,7 @@ static char *rcsid = "$Id: pwd_mkdb.c,v 1.4 1996/05/14 01:06:15 deraadt Exp $";
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-
-#include "pw_scan.h"
+#include <util.h>
 
 #define	INSECURE	1
 #define	SECURE		2