diff options
| -rw-r--r-- | winsup/utils/ChangeLog | 6 | ||||
| -rw-r--r-- | winsup/utils/mkgroup.c | 3 | ||||
| -rw-r--r-- | winsup/utils/mkpasswd.c | 3 |
3 files changed, 10 insertions, 2 deletions
diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog index 91ab848fc..ce044e28a 100644 --- a/winsup/utils/ChangeLog +++ b/winsup/utils/ChangeLog @@ -1,5 +1,11 @@ 2008-07-22 Corinna Vinschen <corinna@vinschen.de> + * mkgroup.c (enum_groups): Create full qualified groupname using + domain or servername, depending on printing domain or machine accounts. + * mkpasswd.c (enum_users): Ditto for users. + +2008-07-22 Corinna Vinschen <corinna@vinschen.de> + * mkgroup.c (main): Remove special root group code. Only print SYSTEM group in case of printing local machine or local domain groups. diff --git a/winsup/utils/mkgroup.c b/winsup/utils/mkgroup.c index 89a13fd67..fc3f96585 100644 --- a/winsup/utils/mkgroup.c +++ b/winsup/utils/mkgroup.c @@ -379,7 +379,8 @@ enum_groups (BOOL domain, domlist_t *dom_or_machine, const char *sep, { WCHAR domname[MAX_DOMAIN_NAME_LEN + GNLEN + 2]; - wcscpy (domname, domain_name); + wcscpy (domname, domain || !servername + ? domain_name : servername); wcscat (domname, L"\\"); wcscat (domname, buffer[i].grpi2_name); sid_length = MAX_SID_LEN; diff --git a/winsup/utils/mkpasswd.c b/winsup/utils/mkpasswd.c index 0a1277f2a..c9031248a 100644 --- a/winsup/utils/mkpasswd.c +++ b/winsup/utils/mkpasswd.c @@ -364,7 +364,8 @@ enum_users (BOOL domain, domlist_t *dom_or_machine, const char *sep, { WCHAR domname[MAX_DOMAIN_NAME_LEN + UNLEN + 2]; - wcscpy (domname, domain_name); + wcscpy (domname, domain || !servername + ? domain_name : servername); wcscat (domname, L"\\"); wcscat (domname, buffer[i].usri3_name); sid_length = MAX_SID_LEN; |