From a048a426d19dfce65bbb9f904e12abd868ecf22d Mon Sep 17 00:00:00 2001 From: Steve French Date: Mon, 30 Oct 2006 21:46:13 +0000 Subject: [PATCH] --- yaml --- r: 40636 b: refs/heads/master c: 4b952a9b0877dbe8f0f69b2747abe79e3bbd2865 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/cifs/CHANGES | 3 +++ trunk/fs/cifs/connect.c | 7 ++++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 68e65500e314..122580da8c60 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7ca85ba752e521f1b5ead1f3b91c562cc3910c7b +refs/heads/master: 4b952a9b0877dbe8f0f69b2747abe79e3bbd2865 diff --git a/trunk/fs/cifs/CHANGES b/trunk/fs/cifs/CHANGES index 1eb9a2ec0a3b..50afab81a59b 100644 --- a/trunk/fs/cifs/CHANGES +++ b/trunk/fs/cifs/CHANGES @@ -1,6 +1,9 @@ Version 1.46 ------------ Support deep tree mounts. Better support OS/2, Win9x (DOS) time stamps. +Allow null user to be specified on mount ("username="). Do not return +EINVAL on readdir when filldir fails due to overwritten blocksize +(fixes FC problem) Version 1.45 ------------ diff --git a/trunk/fs/cifs/connect.c b/trunk/fs/cifs/connect.c index 4093d5332930..71f77914ce93 100644 --- a/trunk/fs/cifs/connect.c +++ b/trunk/fs/cifs/connect.c @@ -822,10 +822,13 @@ cifs_parse_mount_options(char *options, const char *devname,struct smb_vol *vol) } else if (strnicmp(data, "nouser_xattr",12) == 0) { vol->no_xattr = 1; } else if (strnicmp(data, "user", 4) == 0) { - if (!value || !*value) { + if (!value) { printk(KERN_WARNING "CIFS: invalid or missing username\n"); return 1; /* needs_arg; */ + } else if(!*value) { + /* null user, ie anonymous, authentication */ + vol->nullauth = 1; } if (strnlen(value, 200) < 200) { vol->username = value; @@ -1642,6 +1645,8 @@ cifs_mount(struct super_block *sb, struct cifs_sb_info *cifs_sb, /* BB fixme parse for domain name here */ cFYI(1, ("Username: %s ", volume_info.username)); + } else if (volume_info.nullauth) { + cFYI(1,("null user")); } else { cifserror("No username specified"); /* In userspace mount helper we can get user name from alternate