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/mkpasswd.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'winsup/utils/mkpasswd.c') diff --git a/winsup/utils/mkpasswd.c b/winsup/utils/mkpasswd.c index 1309cac4d..d81db1aa1 100644 --- a/winsup/utils/mkpasswd.c +++ b/winsup/utils/mkpasswd.c @@ -102,7 +102,7 @@ uni2ansi (LPWSTR wcs, char *mbs, int size) int enum_users (LPWSTR servername, int print_sids, int print_cygpath, - const char * passed_home_path) + const char * passed_home_path, int id_offset) { USER_INFO_3 *buffer; DWORD entriesread = 0; @@ -205,7 +205,9 @@ enum_users (LPWSTR servername, int print_sids, int print_cygpath, } } } - printf ("%s::%d:%d:%s%s%s:%s:/bin/sh\n", username, uid, gid, + printf ("%s::%d:%d:%s%s%s:%s:/bin/sh\n", username, + uid + id_offset, + gid + id_offset, fullname, print_sids ? "," : "", print_sids ? put_sid (psid) : "", @@ -318,6 +320,8 @@ usage () fprintf (stderr, " -l,--local print local user accounts\n"); fprintf (stderr, " -d,--domain print domain accounts (from current domain\n"); fprintf (stderr, " if 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, " -g,--local-groups print local group information too\n"); fprintf (stderr, " if no domain specified\n"); fprintf (stderr, " -m,--no-mount don't use mount points for home dir\n"); @@ -333,6 +337,7 @@ usage () struct option longopts[] = { {"local", no_argument, NULL, 'l'}, {"domain", no_argument, NULL, 'd'}, + {"id-offset", required_argument, NULL, 'o'}, {"local-groups", no_argument, NULL, 'g'}, {"no-mount", no_argument, NULL, 'm'}, {"no-sids", no_argument, NULL, 's'}, @@ -341,7 +346,7 @@ struct option longopts[] = { {0, no_argument, NULL, 0} }; -char opts[] = "ldgsmhp:"; +char opts[] = "ldo:gsmhp:"; int main (int argc, char **argv) @@ -355,6 +360,7 @@ main (int argc, char **argv) int domain_name_specified = 0; int print_sids = 1; int print_cygpath = 1; + int id_offset = 10000; int i; char name[256], dom[256], passed_home_path[MAX_PATH]; @@ -378,6 +384,9 @@ main (int argc, char **argv) case 'd': print_domain = 1; break; + case 'o': + id_offset = strtol (optarg, NULL, 10); + break; case 'g': print_local_groups = 1; break; @@ -522,11 +531,11 @@ main (int argc, char **argv) exit (1); } - enum_users (servername, print_sids, print_cygpath, passed_home_path); + enum_users (servername, print_sids, print_cygpath, passed_home_path, id_offset); } if (print_local) - enum_users (NULL, print_sids, print_cygpath, passed_home_path); + enum_users (NULL, print_sids, print_cygpath, passed_home_path, 0); if (servername) netapibufferfree (servername); -- cgit v1.2.3