drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch by Kazuhiro Fujieda <fujieda@jaist.ac.jp>: 

* 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.
This commit is contained in:
Corinna Vinschen 2001-04-15 14:09:33 +00:00
parent 1ff87985a1
commit 9f2cad57a6
3 changed files with 44 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
winsup/utils/ChangeLog
View File

@ -1,3 +1,15 @@
2001-04-13 Kazuhiro Fujieda <fujieda@jaist.ac.jp>
* 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.
2001-04-11 Egor Duda <deo@logos-m.ru> 2001-04-11 Egor Duda <deo@logos-m.ru>
* mkgroup.c (uni2ansi): Use native method to convert from Unicode * mkgroup.c (uni2ansi): Use native method to convert from Unicode

15
winsup/utils/mkgroup.c
View File

@ -187,7 +187,7 @@ enum_local_groups (int print_sids)
} }
void void
enum_groups (LPWSTR servername, int print_sids) enum_groups (LPWSTR servername, int print_sids, int id_offset)
{ {
GROUP_INFO_2 *buffer; GROUP_INFO_2 *buffer;
DWORD entriesread = 0; DWORD entriesread = 0;
@ -273,7 +273,7 @@ enum_groups (LPWSTR servername, int print_sids)
} }
printf ("%s:%s:%d:\n", groupname, printf ("%s:%s:%d:\n", groupname,
print_sids ? put_sid (psid) : "", print_sids ? put_sid (psid) : "",
gid); gid + id_offset);
} }
netapibufferfree (buffer); netapibufferfree (buffer);
@ -295,6 +295,8 @@ usage ()
fprintf (stderr, " -d,--domain print global group information from the domain\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, " specified (or from the current domain if there is\n");
fprintf (stderr, " no domain specified)\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, " -s,--no-sids don't print SIDs in pwd field\n");
fprintf (stderr, " (this affects ntsec)\n"); fprintf (stderr, " (this affects ntsec)\n");
fprintf (stderr, " -?,--help print this message\n\n"); fprintf (stderr, " -?,--help print this message\n\n");
@ -305,12 +307,13 @@ usage ()
struct option longopts[] = { struct option longopts[] = {
{"local", no_argument, NULL, 'l'}, {"local", no_argument, NULL, 'l'},
{"domain", no_argument, NULL, 'd'}, {"domain", no_argument, NULL, 'd'},
{"id-offset", required_argument, NULL, 'o'},
{"no-sids", no_argument, NULL, 's'}, {"no-sids", no_argument, NULL, 's'},
{"help", no_argument, NULL, 'h'}, {"help", no_argument, NULL, 'h'},
{0, no_argument, NULL, 0} {0, no_argument, NULL, 0}
}; };
char opts[] = "ldsh"; char opts[] = "ldo:sh";
int int
main (int argc, char **argv) main (int argc, char **argv)
@ -322,6 +325,7 @@ main (int argc, char **argv)
int print_domain = 0; int print_domain = 0;
int print_sids = 1; int print_sids = 1;
int domain_specified = 0; int domain_specified = 0;
int id_offset = 10000;
int i; int i;
char name[256], dom[256]; char name[256], dom[256];
@ -343,6 +347,9 @@ main (int argc, char **argv)
case 'd': case 'd':
print_domain = 1; print_domain = 1;
break; break;
case 'o':
id_offset = strtol (optarg, NULL, 10);
break;
case 's': case 's':
print_sids = 0; print_sids = 0;
break; break;
@ -464,7 +471,7 @@ main (int argc, char **argv)
exit (1); exit (1);
} }
enum_groups (servername, print_sids); enum_groups (servername, print_sids, id_offset);
} }
if (print_local) if (print_local)

19
winsup/utils/mkpasswd.c
View File

@ -102,7 +102,7 @@ uni2ansi (LPWSTR wcs, char *mbs, int size)
int int
enum_users (LPWSTR servername, int print_sids, int print_cygpath, 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; USER_INFO_3 *buffer;
DWORD entriesread = 0; 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, fullname,
print_sids ? "," : "", print_sids ? "," : "",
print_sids ? put_sid (psid) : "", print_sids ? put_sid (psid) : "",
@ -318,6 +320,8 @@ usage ()
fprintf (stderr, " -l,--local print local user accounts\n"); fprintf (stderr, " -l,--local print local user accounts\n");
fprintf (stderr, " -d,--domain print domain accounts (from current domain\n"); fprintf (stderr, " -d,--domain print domain accounts (from current domain\n");
fprintf (stderr, " if no domain specified)\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, " -g,--local-groups print local group information too\n");
fprintf (stderr, " if no domain specified\n"); fprintf (stderr, " if no domain specified\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");
@ -333,6 +337,7 @@ usage ()
struct option longopts[] = { struct option longopts[] = {
{"local", no_argument, NULL, 'l'}, {"local", no_argument, NULL, 'l'},
{"domain", no_argument, NULL, 'd'}, {"domain", no_argument, NULL, 'd'},
{"id-offset", required_argument, NULL, 'o'},
{"local-groups", no_argument, NULL, 'g'}, {"local-groups", no_argument, NULL, 'g'},
{"no-mount", no_argument, NULL, 'm'}, {"no-mount", no_argument, NULL, 'm'},
{"no-sids", no_argument, NULL, 's'}, {"no-sids", no_argument, NULL, 's'},
@ -341,7 +346,7 @@ struct option longopts[] = {
{0, no_argument, NULL, 0} {0, no_argument, NULL, 0}
}; };
char opts[] = "ldgsmhp:"; char opts[] = "ldo:gsmhp:";
int int
main (int argc, char **argv) main (int argc, char **argv)
@ -355,6 +360,7 @@ main (int argc, char **argv)
int domain_name_specified = 0; int domain_name_specified = 0;
int print_sids = 1; int print_sids = 1;
int print_cygpath = 1; int print_cygpath = 1;
int id_offset = 10000;
int i; int i;
char name[256], dom[256], passed_home_path[MAX_PATH]; char name[256], dom[256], passed_home_path[MAX_PATH];
@ -378,6 +384,9 @@ main (int argc, char **argv)
case 'd': case 'd':
print_domain = 1; print_domain = 1;
break; break;
case 'o':
id_offset = strtol (optarg, NULL, 10);
break;
case 'g': case 'g':
print_local_groups = 1; print_local_groups = 1;
break; break;
@ -522,11 +531,11 @@ main (int argc, char **argv)
exit (1); 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) 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) if (servername)
netapibufferfree (servername); netapibufferfree (servername);