summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorSteve French <sfrench@samba.org>2007-05-17 22:40:48 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:22:13 -0500
commitc6b283666451eb920dd25f78c06dc4689d04c498 (patch)
treead44018954b12a687fb2fa5ee9c6f063fbe6bd9a /source3
parent58703289a32ff0311226f12540cf56eeca0cc0a0 (diff)
downloadsamba-c6b283666451eb920dd25f78c06dc4689d04c498.tar.gz
samba-c6b283666451eb920dd25f78c06dc4689d04c498.tar.bz2
samba-c6b283666451eb920dd25f78c06dc4689d04c498.zip
r22982: Do not prompt for password on sec=none for mount.cifs (and allow guest
option to pass to kernel code so it can know when to retry) (This used to be commit 500d9236c419be6ec32cc209279aeea2234f1a21)
Diffstat (limited to 'source3')
-rwxr-xr-xsource3/client/mount.cifs.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/source3/client/mount.cifs.c b/source3/client/mount.cifs.c
index 77074644e0..2e48a42aaf 100755
--- a/source3/client/mount.cifs.c
+++ b/source3/client/mount.cifs.c
@@ -419,6 +419,11 @@ static int parse_options(char ** optionsp, int * filesys_flags)
printf("password too long\n");
return 1;
}
+ } else if (strncmp(data, "sec", 3) == 0) {
+ if (value) {
+ if (!strcmp(value, "none"))
+ got_password = 1;
+ }
} else if (strncmp(data, "ip", 2) == 0) {
if (!value || !*value) {
printf("target ip address argument missing");
@@ -567,8 +572,6 @@ static int parse_options(char ** optionsp, int * filesys_flags)
*filesys_flags &= ~MS_NOEXEC;
} else if (strncmp(data, "guest", 5) == 0) {
got_password=1;
- /* remove the parm since it would otherwise be logged by kern */
- goto nocopy;
} else if (strncmp(data, "ro", 2) == 0) {
*filesys_flags |= MS_RDONLY;
} else if (strncmp(data, "rw", 2) == 0) {