summaryrefslogtreecommitdiff
path: root/source3/client
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2009-02-25 20:27:43 +1100
committerAndrew Bartlett <abartlet@samba.org>2009-02-25 20:27:43 +1100
commit24a63add2d92afa0084fec956df7508ea28aab89 (patch)
tree9ba254caca85d5a9398c8cc0f8b8038b3fd0028b /source3/client
parent4823e988b6360646931f9b6369bf7b8f512069a8 (diff)
parenteb5efd1978acd38cf6cc97e067b5105743ca5469 (diff)
downloadsamba-24a63add2d92afa0084fec956df7508ea28aab89.tar.gz
samba-24a63add2d92afa0084fec956df7508ea28aab89.tar.bz2
samba-24a63add2d92afa0084fec956df7508ea28aab89.zip
Merge branch 'master' of ssh://git.samba.org/data/git/samba into master-devel
Diffstat (limited to 'source3/client')
-rw-r--r--source3/client/mount.cifs.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source3/client/mount.cifs.c b/source3/client/mount.cifs.c
index ae8a7fd186..8623d3c04b 100644
--- a/source3/client/mount.cifs.c
+++ b/source3/client/mount.cifs.c
@@ -649,7 +649,9 @@ static int parse_options(char ** optionsp, int * filesys_flags)
} else if (strncmp(data, "exec", 4) == 0) {
*filesys_flags &= ~MS_NOEXEC;
} else if (strncmp(data, "guest", 5) == 0) {
- got_password=1;
+ user_name = (char *)calloc(1, 1);
+ got_user = 1;
+ got_password = 1;
} else if (strncmp(data, "ro", 2) == 0) {
*filesys_flags |= MS_RDONLY;
} else if (strncmp(data, "rw", 2) == 0) {