diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1996-05-04 08:13:55 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1996-05-04 08:13:55 +0000 |
| commit | 893b3b2c78edd1c624ee6562074aee005a097d6b (patch) | |
| tree | fb0b73429fb9c3a780a07632abe7d77299e37c2a | |
| parent | 19b42fbd58cb6cf7c355705e05242072137a8590 (diff) | |
strdup re-generated path in pwd_mkdb; "make distribution" passwd files with
proper arguments
| -rw-r--r-- | etc/Makefile | 2 | ||||
| -rw-r--r-- | usr.sbin/pwd_mkdb/pwd_mkdb.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/etc/Makefile b/etc/Makefile index f4a58a6d632..1f63711e307 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -41,7 +41,7 @@ distribution: distrib-dirs install -c -o ${BINOWN} -g ${BINGRP} -m 664 ${BIN2} ${DESTDIR}/etc install -c -o root -g wheel -m 600 crontab ${DESTDIR}/var/cron/tabs/root install -c -o root -g wheel -m 600 master.passwd ${DESTDIR}/etc - pwd_mkdb -p -d ${DESTDIR} /etc/master.passwd + pwd_mkdb -p -d ${DESTDIR}/etc /etc/master.passwd install -c -o ${BINOWN} -g ${BINGRP} -m 555 \ MAKEDEV.local etc.${MACHINE}/MAKEDEV ${DESTDIR}/dev (cd root; \ diff --git a/usr.sbin/pwd_mkdb/pwd_mkdb.c b/usr.sbin/pwd_mkdb/pwd_mkdb.c index 8ea7cab2f4c..47c044f33e2 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.2 1996/04/23 21:55:49 deraadt Exp $"; +static char *rcsid = "$Id: pwd_mkdb.c,v 1.3 1996/05/04 08:13:54 deraadt Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -140,7 +140,7 @@ main(argc, argv) /* We don't care what the user wants. */ (void)umask(0); - pname = *argv; + pname = strdup(changedir(*argv, basedir)); /* Open the original password file */ if (!(fp = fopen(pname, "r"))) error(pname); |