diff options
| -rw-r--r-- | usr.bin/chpass/Makefile | 2 | ||||
| -rw-r--r-- | usr.bin/chpass/pw_copy.c | 2 | ||||
| -rw-r--r-- | usr.bin/passwd/Makefile | 2 | ||||
| -rw-r--r-- | usr.sbin/pwd_mkdb/Makefile | 1 | ||||
| -rw-r--r-- | usr.sbin/pwd_mkdb/pwd_mkdb.c | 8 |
5 files changed, 4 insertions, 11 deletions
diff --git a/usr.bin/chpass/Makefile b/usr.bin/chpass/Makefile index 37374d2..c17a4ce 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 -DPASSWD_IGNORE_COMMENTS +CFLAGS+=-Wall 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 9018e4b..5d5a7de 100644 --- a/usr.bin/chpass/pw_copy.c +++ b/usr.bin/chpass/pw_copy.c @@ -85,7 +85,6 @@ pw_copy(ffd, tfd, pw) goto err; continue; } -#ifdef PASSWD_IGNORE_COMMENTS for (p = buf; *p != '\n'; p++) if (*p != ' ' && *p != '\t') break; @@ -95,7 +94,6 @@ pw_copy(ffd, tfd, pw) 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 9ac3f0d..8b99b28 100644 --- a/usr.bin/passwd/Makefile +++ b/usr.bin/passwd/Makefile @@ -6,7 +6,7 @@ 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 -DPASSWD_IGNORE_COMMENTS +CFLAGS+=-Wall DPADD= ${LIBCRYPT} ${LIBRPCSVC} ${LIBUTIL} LDADD= -lcrypt -lrpcsvc -lutil diff --git a/usr.sbin/pwd_mkdb/Makefile b/usr.sbin/pwd_mkdb/Makefile index 25d001e..86116fec 100644 --- a/usr.sbin/pwd_mkdb/Makefile +++ b/usr.sbin/pwd_mkdb/Makefile @@ -3,6 +3,5 @@ PROG= pwd_mkdb SRCS= pw_scan.c pwd_mkdb.c MAN8= pwd_mkdb.8 -CFLAGS+= -DPASSWD_IGNORE_COMMENTS .include <bsd.prog.mk> diff --git a/usr.sbin/pwd_mkdb/pwd_mkdb.c b/usr.sbin/pwd_mkdb/pwd_mkdb.c index 644ef08..5ee9699 100644 --- a/usr.sbin/pwd_mkdb/pwd_mkdb.c +++ b/usr.sbin/pwd_mkdb/pwd_mkdb.c @@ -311,11 +311,9 @@ main(argc, argv) if (!is_comment && (pwd.pw_name[0] == '+' || pwd.pw_name[0] == '-')) yp_enabled = 1; + if (is_comment) + --cnt; #define COMPACT(e) t = e; while ((*p++ = *t++)); -#ifdef PASSWD_IGNORE_COMMENTS - if(is_comment) - --cnt; -#endif if (!is_comment && (!username || (strcmp(username, pwd.pw_name) == 0))) { /* Create insecure data. */ @@ -510,7 +508,6 @@ scan(fp, pw) } *p = '\0'; -#ifdef PASSWD_IGNORE_COMMENTS /* * Ignore comments: ^[ \t]*# */ @@ -522,7 +519,6 @@ scan(fp, pw) return(1); } else is_comment = 0; -#endif if (!pw_scan(line, pw)) { warnx("at line #%d", lcnt); |
