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

* mkgroup.c (usage): Fix language.

Browse Source 
* mkpasswd.c (usage): Ditto.
This commit is contained in:
Corinna Vinschen
2014-11-12 14:22:05 +00:00
parent 4acb3408e9
commit 35983199f3
3 changed files with 45 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/utils/ChangeLog
View File

@@ -1,3 +1,8 @@
2014-11-12 Corinna Vinschen <corinna@vinschen.de>
* mkgroup.c (usage): Fix language.
* mkpasswd.c (usage): Ditto.
2014-11-12 Corinna Vinschen <corinna@vinschen.de>
* mkgroup.c (enum_unix_groups): Always print groupname with machine

38
winsup/utils/mkgroup.c
View File

@@ -481,27 +481,27 @@ usage (FILE * stream)
"\n"
"Options:\n"
"\n"
" -l,--local [machine] print local groups of \"machine\",\n"
" -l,--local [machine] Print local group accounts of \"machine\",\n"
" from local machine if no machine specified.\n"
" automatically adding machine prefix for local\n"
" machine depends on settings in /etc/nsswitch.conf)\n"
" -L,--Local machine ditto, but generate groupname with machine prefix\n"
" -d,--domain [domain] print domain groups\n"
" (from current domain if no domain specified)\n"
" -c,--current print current group\n"
" -S,--separator char for -l use character char as domain\\group\n"
" separator in groupname instead of default '%s'\n"
" -o,--id-offset offset change the default offset (0x10000) added to\n"
" gids of foreign machine accounts.\n"
" -g,--group groupname only return information for the specified group\n"
" one of -l, -d must be specified, too\n"
" -b,--no-builtin don't print BUILTIN groups\n"
" -U,--unix grouplist print UNIX groups when using -l on a UNIX Samba\n"
" server. grouplist is a comma-separated list of\n"
" Automatically adding machine prefix for local\n"
" machine depends on settings in /etc/nsswitch.conf.\n"
" -L,--Local machine Ditto, but generate groupname with machine prefix.\n"
" -d,--domain [domain] Print domain groups,\n"
" from current domain if no domain specified.\n"
" -c,--current Print current group.\n"
" -S,--separator char For -L use character char as domain\\group\n"
" separator in groupname instead of default '%s'.\n"
" -o,--id-offset offset Change the default offset (0x10000) added to gids\n"
" of foreign local machine accounts. Use with -l/-L.\n"
" -g,--group groupname Only return information for the specified group.\n"
" One of -l, -d must be specified, too.\n"
" -b,--no-builtin Don't print BUILTIN groups.\n"
" -U,--unix grouplist Print UNIX groups when using -l on a UNIX Samba\n"
" server. Grouplist is a comma-separated list of\n"
" groupnames or gid ranges (root,-25,50-100).\n"
" (enumerating large ranges can take a long time!)\n"
" -h,--help print this message\n"
" -v,--version print version information and exit\n"
" Enumerating large ranges can take a long time!\n"
" -h,--help Print this message.\n"
" -v,--version Print version information and exit.\n"
"\n"
"Default is to print local groups on stand-alone machines, plus domain\n"
"groups on domain controllers and domain member machines.\n"

42
winsup/utils/mkpasswd.c
View File

@@ -370,29 +370,29 @@ usage (FILE * stream)
"\n"
"Options:\n"
"\n"
" -l,--local [machine] print local user accounts of \"machine\",\n"
" -l,--local [machine] Print local user accounts of \"machine\",\n"
" from local machine if no machine specified.\n"
" automatically adding machine prefix for local\n"
" machine depends on settings in /etc/nsswitch.conf)\n"
" -L,--Local machine ditto, but generate username with machine prefix\n"
" -d,--domain [domain] print domain accounts\n"
" (from current domain if no domain specified)\n"
" -c,--current print current user\n"
" -S,--separator char for -l use character char as domain\\user\n"
" separator in username instead of the default '%s'\n"
" -o,--id-offset offset change the default offset (0x10000) added to uids\n"
" of foreign local machine accounts. Use with -l.\n"
" -u,--username username only return information for the specified user\n"
" one of -l, -d must be specified, too\n"
" -b,--no-builtin don't print BUILTIN users\n"
" -p,--path-to-home path use specified path instead of user account home dir\n"
" or /home prefix\n"
" -U,--unix userlist print UNIX users when using -l on a UNIX Samba\n"
" server. userlist is a comma-separated list of\n"
" Automatically adding machine prefix for local\n"
" machine depends on settings in /etc/nsswitch.conf.\n"
" -L,--Local machine Ditto, but generate username with machine prefix.\n"
" -d,--domain [domain] Print domain accounts,\n"
" from current domain if no domain specified.\n"
" -c,--current Print current user.\n"
" -S,--separator char For -L use character char as domain\\user\n"
" separator in username instead of the default '%s'.\n"
" -o,--id-offset offset Change the default offset (0x10000) added to uids\n"
" of foreign local machine accounts. Use with -l/-L.\n"
" -u,--username username Only return information for the specified user.\n"
" One of -l, -d must be specified, too\n"
" -b,--no-builtin Don't print BUILTIN users.\n"
" -p,--path-to-home path Use specified path instead of user account home dir\n"
" or /home prefix.\n"
" -U,--unix userlist Print UNIX users when using -l on a UNIX Samba\n"
" server. Userlist is a comma-separated list of\n"
" usernames or uid ranges (root,-25,50-100).\n"
" (enumerating large ranges can take a long time!)\n"
" -h,--help displays this message\n"
" -V,--version version information and exit\n"
" Enumerating large ranges can take a long time!\n"
" -h,--help Displays this message.\n"
" -V,--version Version information and exit.\n"
"\n"
"Default is to print local accounts on stand-alone machines, domain accounts\n"
"on domain controllers and domain member machines.\n"