From 949ba3fff2093a76f224a8c053fe010ec6e734a6 Mon Sep 17 00:00:00 2001
From: Peter Wemm <peter@FreeBSD.org>
Date: Mon, 6 Sep 1999 17:30:03 +0000
Subject: Unifdef -DPASSWD_IGNORE_COMMENTS.  This wasn't really optional and we
 have enough pseudo-options already.

---
 chpass/Makefile  | 2 +-
 chpass/pw_copy.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

(limited to 'chpass')

diff --git a/chpass/Makefile b/chpass/Makefile
index 37374d2..c17a4ce 100644
--- a/chpass/Makefile
+++ b/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/chpass/pw_copy.c b/chpass/pw_copy.c
index 9018e4b..5d5a7de 100644
--- a/chpass/pw_copy.c
+++ b/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);
-- 
cgit v1.2.3-56-ge451