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

Improvements to YP support from Jason Downs.

This commit is contained in:
phil 1995-07-28 07:01:32 +00:00
parent c9d0b91d53
commit 72065007ac
3 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
usr.bin/chpass/chpass.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: chpass.c,v 1.6 1995/06/26 23:43:06 jtc Exp $ */
/* $NetBSD: chpass.c,v 1.7 1995/07/28 07:01:32 phil Exp $ */
/*-
* Copyright (c) 1988, 1993, 1994
@ -43,7 +43,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)chpass.c 8.4 (Berkeley) 4/2/94";
#else
static char rcsid[] = "$NetBSD: chpass.c,v 1.6 1995/06/26 23:43:06 jtc Exp $";
static char rcsid[] = "$NetBSD: chpass.c,v 1.7 1995/07/28 07:01:32 phil Exp $";
#endif
#endif /* not lint */
@ -174,7 +174,7 @@ main(argc, argv)
if (uid)
baduser();
pw = &lpw;
if (!pw_scan(arg, pw))
if (!pw_scan(arg, pw, (int *)NULL))
exit(1);
}

6
usr.bin/chpass/edit.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: edit.c,v 1.4 1995/03/26 04:55:27 glass Exp $ */
/* $NetBSD: edit.c,v 1.5 1995/07/28 07:03:41 phil Exp $ */
/*-
* Copyright (c) 1990, 1993, 1994
@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)edit.c 8.3 (Berkeley) 4/2/94";
#else
static char rcsid[] = "$NetBSD: edit.c,v 1.4 1995/03/26 04:55:27 glass Exp $";
static char rcsid[] = "$NetBSD: edit.c,v 1.5 1995/07/28 07:03:41 phil Exp $";
#endif
#endif /* not lint */
@ -215,5 +215,5 @@ bad: (void)fclose(fp);
warnx("entries too long");
return (0);
}
return (pw_scan(buf, pw));
return (pw_scan(buf, pw, (int *)NULL));
}

18
usr.sbin/pwd_mkdb/pw_scan.c
View File

@ -1,6 +1,7 @@
/*-
* 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
@ -33,7 +34,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)pw_scan.c 8.3 (Berkeley) 4/2/94";*/
static char *rcsid = "$Id: pw_scan.c,v 1.3 1994/08/28 23:32:49 mycroft Exp $";
static char *rcsid = "$Id: pw_scan.c,v 1.4 1995/07/28 07:11:30 phil Exp $";
#endif /* not lint */
/*
@ -55,14 +56,18 @@ static char *rcsid = "$Id: pw_scan.c,v 1.3 1994/08/28 23:32:49 mycroft Exp $";
#include "pw_scan.h"
int
pw_scan(bp, pw)
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");
@ -82,6 +87,8 @@ pw_scan(bp, pw)
return (0);
}
pw->pw_uid = id;
if ((*p == '\0') && (flags != (int *)NULL))
*flags |= _PASSWORD_NOUID;
if (!(p = strsep(&bp, ":"))) /* gid */
goto fmt;
@ -91,14 +98,20 @@ pw_scan(bp, pw)
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 */
@ -119,5 +132,6 @@ pw_scan(bp, pw)
fmt: warnx("corrupted entry");
return (0);
}
return (1);
}