diff options
author | Herb Lewis <herb@samba.org> | 2002-04-03 16:44:15 +0000 |
---|---|---|
committer | Herb Lewis <herb@samba.org> | 2002-04-03 16:44:15 +0000 |
commit | 62ad2d800eabe5aa8451cab8c12828ccf5c7ff95 (patch) | |
tree | 7fe260d4a4fe3ca811d67698f3d06aaff311b70d | |
parent | c15c667afbc221944745ce2a14f138bcb0e9e1ed (diff) | |
download | samba-62ad2d800eabe5aa8451cab8c12828ccf5c7ff95.tar.gz samba-62ad2d800eabe5aa8451cab8c12828ccf5c7ff95.tar.bz2 samba-62ad2d800eabe5aa8451cab8c12828ccf5c7ff95.zip |
reorder useage message a little. -L is not a root-only or local mode option.
(This used to be commit 020d6fa2f780099d662de1a456838ec0ac4d3ca7)
-rw-r--r-- | source3/utils/smbpasswd.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/source3/utils/smbpasswd.c b/source3/utils/smbpasswd.c index cd046dfb1b..a96fad0cdb 100644 --- a/source3/utils/smbpasswd.c +++ b/source3/utils/smbpasswd.c @@ -56,25 +56,26 @@ static void usage(void) printf(" smbpasswd [options] [password]\n\n"); printf("options:\n"); - printf(" -c smb.conf file Use the given path to the smb.conf file\n"); + printf(" -L local mode (must be first option)\n"); + printf(" -h print this usage message\n"); printf(" -s use stdin for password prompt\n"); + printf(" -c smb.conf file Use the given path to the smb.conf file\n"); printf(" -D LEVEL debug level\n"); - printf(" -U USER remote username\n"); printf(" -r MACHINE remote machine\n"); + printf(" -U USER remote username\n"); printf("extra options when run by root or in local mode:\n"); - printf(" -L local mode (must be first option)\n"); - printf(" -R ORDER name resolve order\n"); printf(" -a add user\n"); - printf(" -x delete user\n"); printf(" -d disable user\n"); printf(" -e enable user\n"); - printf(" -n set no password\n"); - printf(" -m machine trust account\n"); printf(" -i interdomain trust account\n"); + printf(" -m machine trust account\n"); + printf(" -n set no password\n"); #ifdef WITH_LDAP_SAM printf(" -w ldap admin password\n"); #endif + printf(" -x delete user\n"); + printf(" -R ORDER name resolve order\n"); exit(1); } |