diff options
| author | Christopher Faylor <me@cgf.cx> | 2008-08-17 17:00:50 +0000 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2008-08-17 17:00:50 +0000 |
| commit | 95141e78352432454a849374c9096d941c484aa5 (patch) | |
| tree | 534702a12942b9d8a0f09bed65d810961447c082 | |
| parent | 6510edf4bc4b61b49272970d1a311492e5b99285 (diff) | |
| download | cygnal-95141e78352432454a849374c9096d941c484aa5.tar.gz cygnal-95141e78352432454a849374c9096d941c484aa5.tar.bz2 cygnal-95141e78352432454a849374c9096d941c484aa5.zip | |
* mkpasswd.c (main): Avoid printing system accounts when a single user name has
been requested.
| -rw-r--r-- | winsup/utils/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/utils/mkpasswd.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog index 583304810..5172ccb04 100644 --- 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 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); |