Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implement '-d directory' option, to override the default of '/'.

Browse Source 
Useful for building ~ftp/etc/pwd.db without using chroot or unionfs.
Inspired by FreeBSD, closes [bin/2566]
This commit is contained in:
lukem 1996-11-22 05:37:29 +00:00
parent 8bcf7e5435
commit 9e8841e359
2 changed files with 40 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
usr.sbin/pwd_mkdb/pwd_mkdb.8
View File

@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)pwd_mkdb.8 8.1 (Berkeley) 6/6/93
.\" $Id: pwd_mkdb.8,v 1.5 1994/09/16 21:05:14 mycroft Exp $
.\" $Id: pwd_mkdb.8,v 1.6 1996/11/22 05:37:29 lukem Exp $
.\"
.Dd June 6, 1993
.Dt PWD_MKDB 8
@ -39,11 +39,12 @@
.Nm pwd_mkdb
.Nd "generate the password databases"
.Sh SYNOPSIS
.Nm pwd_mkdb
.Nm
.Op Fl p
.Op Fl d Ar directory
.Ar file
.Sh DESCRIPTION
.Nm Pwd_mkdb
.Nm
creates
.Xr db 3
style secure and insecure databases for the specified file.
@ -64,6 +65,11 @@ The options are as follows:
.It Fl p
Create a Version 7 style password file and install it into
.Dq Pa /etc/passwd .
.It Fl d Ar directory
Change the root directory of the generated files from
.Dq Pa /
to
.Ar directory .
.El
.Pp
The two databases differ in that the secure version contains the user's
@ -72,7 +78,7 @@ encrypted password and the insecure version has an asterisk (``*'')
The databases are used by the C library password routines (see
.Xr getpwent 3 ) .
.Pp
.Nm Pwd_mkdb
.Nm
exits zero on success, non-zero on failure.
.Sh FILES
.Bl -tag -width Pa -compact
@ -91,7 +97,7 @@ A temporary file.
.El
.Sh BUGS
Because of the necessity for atomic update of the password files,
.Nm pwd_mkdb
.Nm
uses
.Xr rename 2
to install them.
@ -101,7 +107,7 @@ on the same file system as the
directory.
.Pp
There are the obvious races with multiple people running
.Nm pwd_mkdb
.Nm
on different password files at the same time.
The front-ends to
.Nm pwd_mkdb ,

43
usr.sbin/pwd_mkdb/pwd_mkdb.c
View File

@ -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.7 1996/05/15 23:19:16 jtc Exp $";
static char *rcsid = "$Id: pwd_mkdb.c,v 1.8 1996/11/22 05:37:30 lukem Exp $";
#endif /* not lint */
#include <sys/param.h>
@ -79,6 +79,7 @@ HASHINFO openinfo = {
static enum state { FILE_INSECURE, FILE_SECURE, FILE_ORIG } clean;
static struct passwd pwd; /* password structure */
static char *pname; /* password file name */
static char prefix[MAXPATHLEN];
void cleanup __P((void));
void error __P((char *));
@ -97,13 +98,18 @@ main(argc, argv)
sigset_t set;
int ch, cnt, len, makeold, tfd, flags;
char *p, *t;
char buf[MAX(MAXPATHLEN, LINE_MAX * 2)], tbuf[1024];
char buf[MAX(MAXPATHLEN, LINE_MAX * 2)], buf2[MAXPATHLEN], tbuf[1024];
int hasyp = 0;
DBT ypdata, ypkey;
strcpy(prefix, "/");
makeold = 0;
while ((ch = getopt(argc, argv, "pv")) != EOF)
while ((ch = getopt(argc, argv, "d:pv")) != EOF)
switch(ch) {
case 'd':
strncpy(prefix, optarg, sizeof(prefix));
prefix[sizeof(prefix)-1] = '\0';
break;
case 'p': /* create V7 "file.orig" */
makeold = 1;
break;
@ -140,7 +146,7 @@ main(argc, argv)
error(pname);
/* Open the temporary insecure password database. */
(void)snprintf(buf, sizeof(buf), "%s.tmp", _PATH_MP_DB);
(void)snprintf(buf, sizeof(buf), "%s%s.tmp", prefix, _PATH_MP_DB);
dp = dbopen(buf,
O_RDWR|O_CREAT|O_EXCL, PERM_INSECURE, DB_HASH, &openinfo);
if (dp == NULL)
@ -182,7 +188,7 @@ main(argc, argv)
data.data = (u_char *)buf;
key.data = (u_char *)tbuf;
for (cnt = 1; scan(fp, &pwd, &flags); ++cnt) {
#define COMPACT(e) t = e; while (*p++ = *t++);
#define COMPACT(e) t = e; while ((*p++ = *t++));
/* look like YP? */
if((pwd.pw_name[0] == '+') || (pwd.pw_name[0] == '-'))
@ -255,7 +261,7 @@ main(argc, argv)
}
/* Open the temporary encrypted password database. */
(void)snprintf(buf, sizeof(buf), "%s.tmp", _PATH_SMP_DB);
(void)snprintf(buf, sizeof(buf), "%s%s.tmp", prefix, _PATH_SMP_DB);
edp = dbopen(buf,
O_RDWR|O_CREAT|O_EXCL, PERM_SECURE, DB_HASH, &openinfo);
if (!edp)
@ -326,13 +332,17 @@ main(argc, argv)
(void)fclose(fp);
/* Install as the real password files. */
(void)snprintf(buf, sizeof(buf), "%s.tmp", _PATH_MP_DB);
mv(buf, _PATH_MP_DB);
(void)snprintf(buf, sizeof(buf), "%s.tmp", _PATH_SMP_DB);
mv(buf, _PATH_SMP_DB);
(void)snprintf(buf, sizeof(buf), "%s%s.tmp", prefix, _PATH_MP_DB);
(void)snprintf(buf2, sizeof(buf2), "%s%s", prefix, _PATH_MP_DB);
mv(buf, buf2);
(void)snprintf(buf, sizeof(buf), "%s%s.tmp", prefix, _PATH_SMP_DB);
(void)snprintf(buf2, sizeof(buf2), "%s%s", prefix, _PATH_SMP_DB);
mv(buf, buf2);
if (makeold) {
(void)snprintf(buf, sizeof(buf), "%s.orig", pname);
mv(buf, _PATH_PASSWD);
(void)snprintf(buf2, sizeof(buf2), "%s%s", prefix,
_PATH_PASSWD);
mv(buf, buf2);
}
/*
* Move the master password LAST -- chpass(1), passwd(1) and vipw(8)
@ -340,7 +350,8 @@ main(argc, argv)
* The rename means that everything is unlocked, as the original file
* can no longer be accessed.
*/
mv(pname, _PATH_MASTERPASSWD);
(void)snprintf(buf, sizeof(buf), "%s%s", prefix, _PATH_MASTERPASSWD);
mv(pname, buf);
exit(0);
}
@ -412,11 +423,13 @@ cleanup()
(void)unlink(buf);
/* FALLTHROUGH */
case FILE_SECURE:
(void)snprintf(buf, sizeof(buf), "%s.tmp", _PATH_SMP_DB);
(void)snprintf(buf, sizeof(buf), "%s%s.tmp", prefix,
_PATH_SMP_DB);
(void)unlink(buf);
/* FALLTHROUGH */
case FILE_INSECURE:
(void)snprintf(buf, sizeof(buf), "%s.tmp", _PATH_MP_DB);
(void)snprintf(buf, sizeof(buf), "%s%s.tmp", prefix,
_PATH_MP_DB);
(void)unlink(buf);
}
}
@ -425,6 +438,6 @@ void
usage()
{
(void)fprintf(stderr, "usage: pwd_mkdb [-p] file\n");
(void)fprintf(stderr, "usage: pwd_mkdb [-p] [-d directory] file\n");
exit(1);
}