* mkpasswd.c (main): Use GetDCName instead of GetAnyDCName.

Don't create extra passwd entry for administrators group
        if local_groups is set.
        (usage): Change usage text slightly.
        (enum_users): Loop while ERROR_MORE_DATA is returned.
        (enum_local_groups): Ditto.
        * mkgroup.c (enum_local_groups): Ditto.
        (enum_groups) Ditto.
        (usage): Change usage text slightly.
This commit is contained in:
Corinna Vinschen
2000-04-15 22:30:49 +00:00
parent eed11cf2bb
commit 0ac91154fc
3 changed files with 38 additions and 20 deletions

View File

@ -82,13 +82,14 @@ enum_local_groups (int print_sids)
DWORD entriesread = 0;
DWORD totalentries = 0;
DWORD resume_handle = 0;
DWORD rc;
do
{
DWORD i;
DWORD rc = NetLocalGroupEnum (NULL, 0, (LPBYTE *) & buffer, 1024,
&entriesread, &totalentries, &resume_handle);
rc = NetLocalGroupEnum (NULL, 0, (LPBYTE *) & buffer, 1024,
&entriesread, &totalentries, &resume_handle);
switch (rc)
{
case ERROR_ACCESS_DENIED:
@ -155,7 +156,7 @@ enum_local_groups (int print_sids)
NetApiBufferFree (buffer);
}
while (entriesread < totalentries);
while (rc == ERROR_MORE_DATA);
return 0;
}
@ -167,6 +168,7 @@ enum_groups (LPWSTR servername, int print_sids)
DWORD entriesread = 0;
DWORD totalentries = 0;
DWORD resume_handle = 0;
DWORD rc;
char ansi_srvname[256];
if (servername)
@ -175,9 +177,9 @@ enum_groups (LPWSTR servername, int print_sids)
do
{
DWORD i;
DWORD rc = NetGroupEnum (servername, 2, (LPBYTE *) & buffer, 1024,
&entriesread, &totalentries, &resume_handle);
rc = NetGroupEnum (servername, 2, (LPBYTE *) & buffer, 1024,
&entriesread, &totalentries, &resume_handle);
switch (rc)
{
case ERROR_ACCESS_DENIED:
@ -252,7 +254,7 @@ enum_groups (LPWSTR servername, int print_sids)
NetApiBufferFree (buffer);
}
while (entriesread < totalentries);
while (rc == ERROR_MORE_DATA);
if (servername)
NetApiBufferFree (servername);
@ -271,7 +273,7 @@ usage ()
fprintf (stderr, " specified (or from the current domain if there is\n");
fprintf (stderr, " no domain specified)\n");
fprintf (stderr, " -s,--no-sids don't print SIDs in pwd field\n");
fprintf (stderr, " (this affects NT security)\n");
fprintf (stderr, " (this affects ntsec)\n");
fprintf (stderr, " -?,--help print this message\n\n");
exit (1);
}