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

* mkgroup.c (main): Fix test for duplicate domain/machine request.

Browse Source 
* mkpasswd.c (main): Ditto.
This commit is contained in:
Corinna Vinschen
2008-07-23 20:12:12 +00:00
parent f9519bcd1a
commit f36c78a487
3 changed files with 32 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/utils/ChangeLog
View File

@@ -1,3 +1,8 @@
2008-07-23 Corinna Vinschen <corinna@vinschen.de>
* mkgroup.c (main): Fix test for duplicate domain/machine request.
* mkpasswd.c (main): Ditto.
2008-07-23 Corinna Vinschen <corinna@vinschen.de>
* mkgroup.c: Rework to allow per-domain/per-machine id_offset.

19
winsup/utils/mkgroup.c
View File

@@ -750,12 +750,22 @@ main (int argc, char **argv)
"domains and machines.\n", __progname);
return 1;
}
domlist[print_domlist].domain = (c == 'd' || c == 'D');
opt = optarg ?:
argv[optind] && argv[optind][0] != '-' ? argv[optind] : NULL;
for (i = 0; i < print_domlist; ++i)
if ((!domlist[i].str && !opt)
|| (domlist[i].str && opt && !strcmp (domlist[i].str, opt)))
goto skip;
if (domlist[i].domain == domlist[print_domlist].domain
&& ((!domlist[i].str && !opt)
|| (domlist[i].str && opt
&& (off = strlen (domlist[i].str))
&& !strncmp (domlist[i].str, opt, off)
&& (!opt[off] || opt[off] == ','))))
{
fprintf (stderr, "%s: Duplicate %s '%s'. Skipping...\n",
__progname, domlist[i].domain ? "domain" : "machine",
domlist[i].str);
goto skip;
}
if (!(domlist[print_domlist].str = opt))
print_system = 1;
domlist[print_domlist].id_offset = ULONG_MAX;
@@ -772,9 +782,8 @@ main (int argc, char **argv)
}
*p = '\0';
}
domlist[print_domlist].domain = (c == 'd' || c == 'D');
domlist[print_domlist++].with_dom = (c == 'D' || c == 'L');
skip:
skip:
break;
case 'S':
sep_char = optarg;

17
winsup/utils/mkpasswd.c
View File

@@ -725,12 +725,22 @@ main (int argc, char **argv)
"domains and machines.\n", __progname);
return 1;
}
domlist[print_domlist].domain = (c == 'd' || c == 'D');
opt = optarg ?:
argv[optind] && argv[optind][0] != '-' ? argv[optind] : NULL;
for (i = 0; i < print_domlist; ++i)
if ((!domlist[i].str && !opt)
|| (domlist[i].str && opt && !strcmp (domlist[i].str, opt)))
goto skip;
if (domlist[i].domain == domlist[print_domlist].domain
&& ((!domlist[i].str && !opt)
|| (domlist[i].str && opt
&& (off = strlen (domlist[i].str))
&& !strncmp (domlist[i].str, opt, off)
&& (!opt[off] || opt[off] == ','))))
{
fprintf (stderr, "%s: Duplicate %s '%s'. Skipping...\n",
__progname, domlist[i].domain ? "domain" : "machine",
domlist[i].str);
goto skip;
}
domlist[print_domlist].str = opt;
domlist[print_domlist].id_offset = ULONG_MAX;
if (opt && (p = strchr (opt, ',')))
@@ -746,7 +756,6 @@ main (int argc, char **argv)
}
*p = '\0';
}
domlist[print_domlist].domain = (c == 'd' || c == 'D');
domlist[print_domlist++].with_dom = (c == 'D' || c == 'L');
skip:
break;