* 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.
This commit is contained in:
Corinna Vinschen 2008-07-22 20:47:14 +00:00
parent 4aeb44ee37
commit 7e1fdc9e2c
3 changed files with 10 additions and 2 deletions

View File

@ -1,3 +1,9 @@
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

View File

@ -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;

View File

@ -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;