summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2001-08-30 05:54:41 +0000
committerGerald Carter <jerry@samba.org>2001-08-30 05:54:41 +0000
commitaca0710066fc4517eac7bbcee9b21a68d45496fd (patch)
tree4e69ab3f82419ddf2ccca0d176788201d9ce3292 /source3
parent4f168fd1148b24054f653ea10528e4f8daff444c (diff)
downloadsamba-aca0710066fc4517eac7bbcee9b21a68d45496fd.tar.gz
samba-aca0710066fc4517eac7bbcee9b21a68d45496fd.tar.bz2
samba-aca0710066fc4517eac7bbcee9b21a68d45496fd.zip
merge from 2.2
(This used to be commit d31e1b63b5a13ec585da18971e85c9eaa941ed33)
Diffstat (limited to 'source3')
-rw-r--r--source3/utils/smbpasswd.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/source3/utils/smbpasswd.c b/source3/utils/smbpasswd.c
index e02a8115a1..7ca9c37f28 100644
--- a/source3/utils/smbpasswd.c
+++ b/source3/utils/smbpasswd.c
@@ -558,6 +558,8 @@ static int process_root(int argc, char *argv[])
ZERO_STRUCT(user_name);
ZERO_STRUCT(user_password);
+ user_name[0] = '\0';
+
while ((ch = getopt(argc, argv, "ax:d:e:hmnj:r:sR:D:U:L")) != EOF) {
switch(ch) {
case 'L':
@@ -685,6 +687,7 @@ static int process_root(int argc, char *argv[])
switch(argc) {
case 0:
+ fstrcpy(user_name, "");
break;
case 1:
fstrcpy(user_name, argv[0]);