diff options
Diffstat (limited to 'usr.bin')
-rw-r--r-- | usr.bin/chpass/Makefile | 2 | ||||
-rw-r--r-- | usr.bin/chpass/pw_copy.c | 11 | ||||
-rw-r--r-- | usr.bin/passwd/Makefile | 4 |
3 files changed, 14 insertions, 3 deletions
diff --git a/usr.bin/chpass/Makefile b/usr.bin/chpass/Makefile index c17a4ce..37374d2 100644 --- a/usr.bin/chpass/Makefile +++ b/usr.bin/chpass/Makefile @@ -1,7 +1,7 @@ # @(#)Makefile 8.2 (Berkeley) 4/2/94 PROG= chpass -CFLAGS+=-Wall +CFLAGS+=-Wall -DPASSWD_IGNORE_COMMENTS SRCS= chpass.c edit.c field.c pw_copy.c pw_scan.c pw_util.c pw_yp.c \ table.c util.c ypxfr_misc.c ${GENSRCS} GENSRCS=yp.h yp_clnt.c yppasswd.h yppasswd_clnt.c yppasswd_private.h \ diff --git a/usr.bin/chpass/pw_copy.c b/usr.bin/chpass/pw_copy.c index f584ba3..9018e4b 100644 --- a/usr.bin/chpass/pw_copy.c +++ b/usr.bin/chpass/pw_copy.c @@ -85,6 +85,17 @@ pw_copy(ffd, tfd, pw) goto err; continue; } +#ifdef PASSWD_IGNORE_COMMENTS + for (p = buf; *p != '\n'; p++) + if (*p != ' ' && *p != '\t') + break; + if (*p == '#' || *p == '\n') { + (void)fprintf(to, "%s", buf); + if (ferror(to)) + goto err; + continue; + } +#endif if (!(p = strchr(buf, ':'))) { warnx("%s: corrupted entry", _PATH_MASTERPASSWD); pw_error(NULL, 0, 1); diff --git a/usr.bin/passwd/Makefile b/usr.bin/passwd/Makefile index f01fe6d..d376bff 100644 --- a/usr.bin/passwd/Makefile +++ b/usr.bin/passwd/Makefile @@ -1,12 +1,12 @@ # From: @(#)Makefile 8.3 (Berkeley) 4/2/94 -# $Id: Makefile,v 1.30 1998/09/19 22:42:04 obrien Exp $ +# $Id: Makefile,v 1.31 1999/02/14 13:56:15 des Exp $ PROG= passwd SRCS= local_passwd.c passwd.c pw_copy.c pw_util.c pw_yp.c \ yp_passwd.c ypxfr_misc.c ${GENSRCS} GENSRCS=yp.h yp_clnt.c yppasswd.h yppasswd_clnt.c \ yppasswd_private.h yppasswd_private_clnt.c yppasswd_private_xdr.c -CFLAGS+=-Wall +CFLAGS+=-Wall -DPASSWD_IGNORE_COMMENTS DPADD= ${LIBCRYPT} ${LIBRPCSVC} ${LIBUTIL} LDADD= -lcrypt -lrpcsvc -lutil |