diff options
Diffstat (limited to 'usr.bin/chpass/field.c')
-rw-r--r-- | usr.bin/chpass/field.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/usr.bin/chpass/field.c b/usr.bin/chpass/field.c index 264cf08..0e2770b 100644 --- a/usr.bin/chpass/field.c +++ b/usr.bin/chpass/field.c @@ -31,9 +31,11 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint -static const char sccsid[] = "@(#)field.c 8.4 (Berkeley) 4/2/94"; +static char sccsid[] = "@(#)field.c 8.4 (Berkeley) 4/2/94"; #endif /* not lint */ +#endif #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); @@ -54,8 +56,6 @@ __FBSDID("$FreeBSD$"); #include "chpass.h" #include "pathnames.h" -static char blank[] = ""; - /* ARGSUSED */ int p_login(char *p, struct passwd *pw, ENTRY *ep __unused) @@ -86,9 +86,7 @@ p_login(char *p, struct passwd *pw, ENTRY *ep __unused) int p_passwd(char *p, struct passwd *pw, ENTRY *ep __unused) { - if (!*p) - pw->pw_passwd = blank; /* "NOLOGIN"; */ - else if (!(pw->pw_passwd = strdup(p))) { + if (!(pw->pw_passwd = strdup(p))) { warnx("can't save password entry"); return (1); } @@ -155,9 +153,7 @@ p_gid(char *p, struct passwd *pw, ENTRY *ep __unused) int p_class(char *p, struct passwd *pw, ENTRY *ep __unused) { - if (!*p) - pw->pw_class = blank; - else if (!(pw->pw_class = strdup(p))) { + if (!(pw->pw_class = strdup(p))) { warnx("can't save entry"); return (1); } @@ -189,9 +185,7 @@ p_expire(char *p, struct passwd *pw, ENTRY *ep __unused) int p_gecos(char *p, struct passwd *pw __unused, ENTRY *ep __unused) { - if (!*p) - ep->save = blank; - else if (!(ep->save = strdup(p))) { + if (!(ep->save = strdup(p))) { warnx("can't save entry"); return (1); } |