* mkpasswd.c (main): Avoid printing system accounts when a single user name has

been requested.

diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog
index 5833048..5172ccb 100644 (file)
--- a/winsup/utils/ChangeLog
+++ b/winsup/utils/ChangeLog
@@ -1,5 +1,10 @@
 2008-08-17  Christopher Faylor  <me+cygwin@cgf.cx>
 
+       * mkpasswd.c (main): Avoid printing system accounts when a single user
+       name has been requested.
+
+2008-08-17  Christopher Faylor  <me+cygwin@cgf.cx>
+
        * Makefile.in (ALL_LDFLAGS): Add --enable-auto-import option to quiet
        ld warnings.
        * mkgroup.c: Change all global variables and most functions to static.

diff --git a/winsup/utils/mkpasswd.c b/winsup/utils/mkpasswd.c
index 66e81a2..3058425 100644 (file)
--- a/winsup/utils/mkpasswd.c
+++ b/winsup/utils/mkpasswd.c
@@ -868,7 +868,7 @@ skip:
                       ? domlist[i].id_offset : off : 0;
       if (!domlist[i].domain && domlist[i].str && print_unix)
        enum_unix_users (domlist + i, sep_char, my_off, print_unix);
-      if (!my_off && !print_current)
+      if (!my_off && !print_current && !disp_username)
        enum_std_accounts ();
       enum_users (domlist[i].domain, domlist + i, sep_char, print_cygpath,
                  passed_home_path, my_off, disp_username, print_current);