From 1175e543201444659522baa004c976838ecdc606 Mon Sep 17 00:00:00 2001 From: "Jordan K. Hubbard" Date: Thu, 9 Feb 1995 11:14:39 +0000 Subject: Fixes for chpass. Submitted by: Heikki Suonsivu --- chpass/edit.c | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) (limited to 'chpass/edit.c') diff --git a/chpass/edit.c b/chpass/edit.c index 34bd35b..b62b40f 100644 --- a/chpass/edit.c +++ b/chpass/edit.c @@ -118,16 +118,32 @@ display(fd, pw) (void)fprintf(fp, "Shell: %s\n", *pw->pw_shell ? pw->pw_shell : _PATH_BSHELL); else - list[E_SHELL].restricted = 1; + list[E_SHELL].restricted = 1; bp = pw->pw_gecos; + p = strsep(&bp, ","); - (void)fprintf(fp, "Full Name: %s\n", p ? p : ""); - p = strsep(&bp, ","); - (void)fprintf(fp, "Location: %s\n", p ? p : ""); - p = strsep(&bp, ","); - (void)fprintf(fp, "Office Phone: %s\n", p ? p : ""); - p = strsep(&bp, ","); - (void)fprintf(fp, "Home Phone: %s\n", p ? p : ""); + if (p) + list[E_NAME].save = strdup(p); + if (!list[E_NAME].restricted) + (void)fprintf(fp, "Full Name: %s\n", p ? p : ""); + + p = strsep(&bp, ","); + if (p) + list[E_LOCATE].save = strdup(p); + if (!list[E_LOCATE].restricted) + (void)fprintf(fp, "Location: %s\n", p ? p : ""); + + p = strsep(&bp, ","); + if (p) + list[E_BPHONE].save = strdup(p); + if (!list[E_BPHONE].restricted) + (void)fprintf(fp, "Office Phone: %s\n", p ? p : ""); + + p = strsep(&bp, ","); + if (p) + list[E_HPHONE].save = strdup(p); + if (!list[E_HPHONE].restricted) + (void)fprintf(fp, "Home Phone: %s\n", p ? p : ""); (void)fchown(fd, getuid(), getgid()); (void)fclose(fp); -- cgit v1.2.3-56-ge451