From 95141e78352432454a849374c9096d941c484aa5 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Sun, 17 Aug 2008 17:00:50 +0000 Subject: [PATCH] * mkpasswd.c (main): Avoid printing system accounts when a single user name has been requested. --- winsup/utils/ChangeLog | 5 +++++ winsup/utils/mkpasswd.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog index 583304810..5172ccb04 100644 --- a/winsup/utils/ChangeLog +++ b/winsup/utils/ChangeLog @@ -1,3 +1,8 @@ +2008-08-17 Christopher Faylor + + * mkpasswd.c (main): Avoid printing system accounts when a single user + name has been requested. + 2008-08-17 Christopher Faylor * Makefile.in (ALL_LDFLAGS): Add --enable-auto-import option to quiet diff --git a/winsup/utils/mkpasswd.c b/winsup/utils/mkpasswd.c index 66e81a2cf..305842562 100644 --- 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);