summaryrefslogtreecommitdiffstats
path: root/usr.sbin
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>1999-09-06 17:30:03 +0000
committerpeter <peter@FreeBSD.org>1999-09-06 17:30:03 +0000
commitcc8565d1c5634a6a893afb9125335e2a5ecaa4d3 (patch)
tree58938fae2dfe2f2f85a03bf3196a7bf36f7135ca /usr.sbin
parent2a9e7395d5400df0e7b30cbd66da12f4a494e661 (diff)
downloadFreeBSD-src-cc8565d1c5634a6a893afb9125335e2a5ecaa4d3.zip
FreeBSD-src-cc8565d1c5634a6a893afb9125335e2a5ecaa4d3.tar.gz
Unifdef -DPASSWD_IGNORE_COMMENTS. This wasn't really optional and
we have enough pseudo-options already.
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/pwd_mkdb/Makefile1
-rw-r--r--usr.sbin/pwd_mkdb/pwd_mkdb.c8
2 files changed, 2 insertions, 7 deletions
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);
OpenPOWER on IntegriCloud