JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

12
winsup/utils/ChangeLog
View File

@@ -1,3 +1,15 @@
Sat Apr 15 23:34:00 2000 Corinna Vinschen <corinna@vinschen.de>
* 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.
Thu Apr 13 01:22:35 2000 Christopher Faylor <cgf@cygnus.com> Thu Apr 13 01:22:35 2000 Christopher Faylor <cgf@cygnus.com>
* cygpath.cc (main): Add -a -o and -c options. * cygpath.cc (main): Add -a -o and -c options.

16
winsup/utils/mkgroup.c
View File

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

30
winsup/utils/mkpasswd.c
View File

@@ -82,6 +82,7 @@ enum_users (LPWSTR servername, int print_sids, int print_cygpath)
DWORD entriesread = 0; DWORD entriesread = 0;
DWORD totalentries = 0; DWORD totalentries = 0;
DWORD resume_handle = 0; DWORD resume_handle = 0;
DWORD rc;
char ansi_srvname[256]; char ansi_srvname[256];
if (servername) if (servername)
@@ -90,10 +91,10 @@ enum_users (LPWSTR servername, int print_sids, int print_cygpath)
do do
{ {
DWORD i; DWORD i;
DWORD rc = NetUserEnum (servername, 3, FILTER_NORMAL_ACCOUNT,
(LPBYTE *) & buffer, 1024,
&entriesread, &totalentries, &resume_handle);
rc = NetUserEnum (servername, 3, FILTER_NORMAL_ACCOUNT,
(LPBYTE *) & buffer, 1024,
&entriesread, &totalentries, &resume_handle);
switch (rc) switch (rc)
{ {
case ERROR_ACCESS_DENIED: case ERROR_ACCESS_DENIED:
@@ -182,7 +183,7 @@ enum_users (LPWSTR servername, int print_sids, int print_cygpath)
NetApiBufferFree (buffer); NetApiBufferFree (buffer);
} }
while (entriesread < totalentries); while (rc == ERROR_MORE_DATA);
if (servername) if (servername)
NetApiBufferFree (servername); NetApiBufferFree (servername);
@@ -197,13 +198,14 @@ enum_local_groups (int print_sids)
DWORD entriesread = 0; DWORD entriesread = 0;
DWORD totalentries = 0; DWORD totalentries = 0;
DWORD resume_handle = 0; DWORD resume_handle = 0;
DWORD rc ;
do do
{ {
DWORD i; 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) switch (rc)
{ {
case ERROR_ACCESS_DENIED: case ERROR_ACCESS_DENIED:
@@ -270,7 +272,7 @@ enum_local_groups (int print_sids)
NetApiBufferFree (buffer); NetApiBufferFree (buffer);
} }
while (entriesread < totalentries); while (rc == ERROR_MORE_DATA);
return 0; return 0;
} }
@@ -288,7 +290,7 @@ usage ()
fprintf (stderr, " -g,--local-groups print local group information too\n"); fprintf (stderr, " -g,--local-groups print local group information too\n");
fprintf (stderr, " -m,--no-mount don't use mount points for home dir\n"); fprintf (stderr, " -m,--no-mount don't use mount points for home dir\n");
fprintf (stderr, " -s,--no-sids don't print SIDs in GCOS field\n"); fprintf (stderr, " -s,--no-sids don't print SIDs in GCOS field\n");
fprintf (stderr, " (this affects NT security)\n"); fprintf (stderr, " (this affects ntsec)\n");
fprintf (stderr, " -?,--help displays this message\n\n"); fprintf (stderr, " -?,--help displays this message\n\n");
fprintf (stderr, "This program does only work on Windows NT\n\n"); fprintf (stderr, "This program does only work on Windows NT\n\n");
exit (1); exit (1);
@@ -392,9 +394,11 @@ main (int argc, char **argv)
/* /*
* Get `administrators' group * Get `administrators' group
*/ */
if (AllocateAndInitializeSid (&sid_nt_auth, 2, SECURITY_BUILTIN_DOMAIN_RID, if (!print_local
DOMAIN_ALIAS_RID_ADMINS, && AllocateAndInitializeSid (&sid_nt_auth, 2,
0, 0, 0, 0, 0, 0, &sid)) SECURITY_BUILTIN_DOMAIN_RID,
DOMAIN_ALIAS_RID_ADMINS,
0, 0, 0, 0, 0, 0, &sid))
{ {
if (LookupAccountSid (NULL, sid, if (LookupAccountSid (NULL, sid,
name, (len = 256, &len), name, (len = 256, &len),
@@ -414,10 +418,10 @@ main (int argc, char **argv)
if (print_domain) if (print_domain)
{ {
if (domain_name_specified) if (domain_name_specified)
rc = NetGetAnyDCName (NULL, domain_name, (LPBYTE *) & servername); rc = NetGetDCName (NULL, domain_name, (LPBYTE *) & servername);
else else
rc = NetGetAnyDCName (NULL, NULL, (LPBYTE *) & servername); rc = NetGetDCName (NULL, NULL, (LPBYTE *) & servername);
if (rc != ERROR_SUCCESS) if (rc != ERROR_SUCCESS)
{ {