summaryrefslogtreecommitdiffstats
path: root/winsup/utils
diff options
context:
space:
mode:
authorCorinna Vinschen <corinna@vinschen.de>2014-11-12 14:22:05 +0000
committerCorinna Vinschen <corinna@vinschen.de>2014-11-12 14:22:05 +0000
commit35983199f3519a38af2563ad1c87abe9077b3ee2 (patch)
treef77c339ba88c9ed460ac6f39fb8eb78a66386a15 /winsup/utils
parent4acb3408e9ceb45ea0c4a287b135519fe359e50a (diff)
downloadcygnal-35983199f3519a38af2563ad1c87abe9077b3ee2.tar.gz
cygnal-35983199f3519a38af2563ad1c87abe9077b3ee2.tar.bz2
cygnal-35983199f3519a38af2563ad1c87abe9077b3ee2.zip
* mkgroup.c (usage): Fix language.
* mkpasswd.c (usage): Ditto.
Diffstat (limited to 'winsup/utils')
-rw-r--r--winsup/utils/ChangeLog5
-rw-r--r--winsup/utils/mkgroup.c38
-rw-r--r--winsup/utils/mkpasswd.c42
3 files changed, 45 insertions, 40 deletions
diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog
index 05b9e31ec..179a3cc85 100644
--- a/winsup/utils/ChangeLog
+++ b/winsup/utils/ChangeLog
@@ -1,5 +1,10 @@
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
prefix.
(usage): Extend help output for -l option.
diff --git a/winsup/utils/mkgroup.c b/winsup/utils/mkgroup.c
index e540153cb..8308401ad 100644
--- a/winsup/utils/mkgroup.c
+++ b/winsup/utils/mkgroup.c
@@ -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"
diff --git a/winsup/utils/mkpasswd.c b/winsup/utils/mkpasswd.c
index e16639af6..9cdccd187 100644
--- a/winsup/utils/mkpasswd.c
+++ b/winsup/utils/mkpasswd.c
@@ -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"