Replace the -q option to pwd_mkdb with a test for PW_SCAN_BIG_IDS in

the environment.  This allows big ID warnings to be suppressed for
vipw and chpass as well.

Since the environment variable test is only performed for callers
of pw_scan() that do not set pw_big_ids_warning, the test can still
be overriden.  Currently, chpass and pwd_mkdb are the only users
of pw_scan() and neither of them overrides the environment variable
test.

1 files changed, 9 insertions, 7 deletions

diff --git a/usr.sbin/pwd_mkdb/pwd_mkdb.8 b/usr.sbin/pwd_mkdb/pwd_mkdb.8
index 1e52b08..b2a5cd6 100644
--- a/usr.sbin/pwd_mkdb/pwd_mkdb.8
+++ b/usr.sbin/pwd_mkdb/pwd_mkdb.8
@@ -43,7 +43,6 @@
 .Op Fl C
 .Op Fl N
 .Op Fl p
-.Op Fl q
 .Op Fl d Ar directory
 .Op Fl s Ar cachesize
 .Op Fl u Ar username
@@ -79,12 +78,6 @@ the rebuilding of the database.
 .It Fl p
 Create a Version 7 style password file and install it into
 .Pa /etc/passwd .
-.It Fl q
-Suppress the warnings that
-.Nm
-normally generates for large user and group IDs.
-Such IDs can cause serious problems with software
-that makes assumptions about the values of IDs.
 .It Fl d Ar directory
 Store databases into specified destination directory instead of
 .Pa /etc .
@@ -110,6 +103,15 @@ The databases are used by the C library password routines (see
 .Pp
 .Nm Pwd_mkdb
 exits zero on success, non-zero on failure.
+.Sh ENVIRONMENT
+If the
+.Ev PW_SCAN_BIG_IDS
+environment variable is set,
+.Nm
+will suppress the warning messages that are
+normally generated for large user and group IDs.
+Such IDs can cause serious problems with software
+that makes assumptions about the values of IDs.
 .Sh FILES
 .Bl -tag -width Pa -compact
 .It Pa /etc/pwd.db