From 9f2cad57a65757981675decc852e9b14f86026b2 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Sun, 15 Apr 2001 14:09:33 +0000 Subject: Patch by Kazuhiro Fujieda : * mkgroup.c (enum_groups): Use RID + offset specified an additional argument as ID. (usage): Add description of -o option. (longopts, opts): Add specifications of -o/--id-offset option. (main): Add -o option. Invoke enum_groups with specified offset. * mkpasswd.c (enum_users): Just like mkgroup.c. (usage, longopts, opts): Ditto. (main): Add -o option. Invoke enum_users with specified offset only against domain accounts. --- winsup/utils/mkgroup.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) (limited to 'winsup/utils/mkgroup.c') diff --git a/winsup/utils/mkgroup.c b/winsup/utils/mkgroup.c index 331788fe6..801d12a5b 100644 --- a/winsup/utils/mkgroup.c +++ b/winsup/utils/mkgroup.c @@ -187,7 +187,7 @@ enum_local_groups (int print_sids) } void -enum_groups (LPWSTR servername, int print_sids) +enum_groups (LPWSTR servername, int print_sids, int id_offset) { GROUP_INFO_2 *buffer; DWORD entriesread = 0; @@ -273,7 +273,7 @@ enum_groups (LPWSTR servername, int print_sids) } printf ("%s:%s:%d:\n", groupname, print_sids ? put_sid (psid) : "", - gid); + gid + id_offset); } netapibufferfree (buffer); @@ -291,13 +291,15 @@ usage () fprintf (stderr, "Usage: mkgroup [OPTION]... [domain]\n\n"); fprintf (stderr, "This program prints a /etc/group file to stdout\n\n"); fprintf (stderr, "Options:\n"); - fprintf (stderr, " -l,--local print local group information\n"); - fprintf (stderr, " -d,--domain print global group information from the domain\n"); - 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 ntsec)\n"); - fprintf (stderr, " -?,--help print this message\n\n"); + fprintf (stderr, " -l,--local print local group information\n"); + fprintf (stderr, " -d,--domain print global group information from the domain\n"); + fprintf (stderr, " specified (or from the current domain if there is\n"); + fprintf (stderr, " no domain specified)\n"); + fprintf (stderr, " -o,--id-offset offset change the default offset (10000) added to uids\n"); + fprintf (stderr, " in domain accounts.\n"); + fprintf (stderr, " -s,--no-sids don't print SIDs in pwd field\n"); + fprintf (stderr, " (this affects ntsec)\n"); + fprintf (stderr, " -?,--help print this message\n\n"); fprintf (stderr, "One of `-l' or `-d' must be given on NT/W2K.\n"); return 1; } @@ -305,12 +307,13 @@ usage () struct option longopts[] = { {"local", no_argument, NULL, 'l'}, {"domain", no_argument, NULL, 'd'}, + {"id-offset", required_argument, NULL, 'o'}, {"no-sids", no_argument, NULL, 's'}, {"help", no_argument, NULL, 'h'}, {0, no_argument, NULL, 0} }; -char opts[] = "ldsh"; +char opts[] = "ldo:sh"; int main (int argc, char **argv) @@ -322,6 +325,7 @@ main (int argc, char **argv) int print_domain = 0; int print_sids = 1; int domain_specified = 0; + int id_offset = 10000; int i; char name[256], dom[256]; @@ -343,6 +347,9 @@ main (int argc, char **argv) case 'd': print_domain = 1; break; + case 'o': + id_offset = strtol (optarg, NULL, 10); + break; case 's': print_sids = 0; break; @@ -464,7 +471,7 @@ main (int argc, char **argv) exit (1); } - enum_groups (servername, print_sids); + enum_groups (servername, print_sids, id_offset); } if (print_local) -- cgit v1.2.3