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

* mkgroup.c (main): Remove special root group code. Only print

Browse Source 
SYSTEM group in case of printing local machine or local domain groups.
This commit is contained in:
Corinna Vinschen 2008-07-22 20:12:02 +00:00
parent 73814f5ee2
commit 4aeb44ee37
2 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/utils/ChangeLog
View File

@ -1,3 +1,8 @@
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.
2008-07-22 Corinna Vinschen <corinna@vinschen.de> 2008-07-22 Corinna Vinschen <corinna@vinschen.de>
* Makefile.in (cygcheck.exe): Link against ntdll. * Makefile.in (cygcheck.exe): Link against ntdll.

41
winsup/utils/mkgroup.c
View File

@ -588,11 +588,11 @@ main (int argc, char **argv)
domlist_t domains[16]; domlist_t domains[16];
char *opt; char *opt;
int print_current = 0; int print_current = 0;
int print_system = 0;
const char *sep_char = "\\"; const char *sep_char = "\\";
int id_offset = 10000; int id_offset = 10000;
int c, i, off; int c, i, off;
char *disp_groupname = NULL; char *disp_groupname = NULL;
int isRoot = 0;
BOOL in_domain; BOOL in_domain;
if (!isatty (1)) if (!isatty (1))
@ -632,7 +632,8 @@ main (int argc, char **argv)
if ((!locals[i].str && !opt) if ((!locals[i].str && !opt)
|| (locals[i].str && opt && !strcmp (locals[i].str, opt))) || (locals[i].str && opt && !strcmp (locals[i].str, opt)))
goto skip_local; goto skip_local;
locals[print_local].str = opt; if (!(locals[print_local].str = opt))
print_system = 1;
locals[print_local++].with_dom = c == 'L'; locals[print_local++].with_dom = c == 'L';
skip_local: skip_local:
break; break;
@ -650,7 +651,8 @@ main (int argc, char **argv)
if ((!domains[i].str && !opt) if ((!domains[i].str && !opt)
|| (domains[i].str && opt && !strcmp (domains[i].str, opt))) || (domains[i].str && opt && !strcmp (domains[i].str, opt)))
goto skip_domain; goto skip_domain;
domains[print_domain].str = opt; if (!(domains[print_domain].str = opt))
print_system = 1;
domains[print_domain++].with_dom = c == 'D'; domains[print_domain++].with_dom = c == 'D';
skip_domain: skip_domain:
break; break;
@ -684,7 +686,6 @@ main (int argc, char **argv)
break; break;
case 'g': case 'g':
disp_groupname = optarg; disp_groupname = optarg;
isRoot = !strcmp(disp_groupname, "root");
break; break;
case 'h': case 'h':
usage (stdout); usage (stdout);
@ -701,32 +702,24 @@ main (int argc, char **argv)
usage (stdout); usage (stdout);
/* Get 'system' group */ /* Get 'system' group */
if (!disp_groupname && (print_local > 0 || print_domain > 0)) if (!disp_groupname && print_system)
print_special (&sid_nt_auth, 1, SECURITY_LOCAL_SYSTEM_RID, print_special (&sid_nt_auth, 1, SECURITY_LOCAL_SYSTEM_RID,
0, 0, 0, 0, 0, 0, 0); 0, 0, 0, 0, 0, 0, 0);
off = 1; off = 1;
if (isRoot) for (i = 0; i < print_local; ++i)
{ {
/* Very special feature for the oncoming future: if (locals[i].str)
Create a "root" group being actually the local Administrators group. {
Printing root disables printing any other "real" local group. */ if (!enum_local_groups (FALSE, locals + i, sep_char,
printf ("root:S-1-5-32-544:0:\n"); id_offset * off, disp_groupname))
enum_groups (FALSE, locals + i, sep_char, id_offset * off++,
disp_groupname);
}
else if (!enum_local_groups (FALSE, locals + i, sep_char, 0,
disp_groupname))
enum_groups (FALSE, locals + i, sep_char, 0, disp_groupname);
} }
else
for (i = 0; i < print_local; ++i)
{
if (locals[i].str)
{
if (!enum_local_groups (FALSE, locals + i, sep_char,
id_offset * off, disp_groupname))
enum_groups (FALSE, locals + i, sep_char, id_offset * off++,
disp_groupname);
}
else if (!enum_local_groups (FALSE, locals + i, sep_char, 0,
disp_groupname))
enum_groups (FALSE, locals + i, sep_char, 0, disp_groupname);
}
for (i = 0; i < print_domain; ++i) for (i = 0; i < print_domain; ++i)
{ {