diff options
| author | Jeff Layton <jlayton@redhat.com> | 2011-01-07 11:30:28 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2011-01-09 23:39:17 +0000 |
| commit | b4d6fcf13f417464c13c6fde46e87c495ba6b6ee (patch) | |
| tree | 594e9823fd986969f1118220eb6581669af411ff /fs/cifs/connect.c | |
| parent | 1397f2ee4be65542fdc3460c7e8b6317779ea680 (diff) | |
| download | lwn-b4d6fcf13f417464c13c6fde46e87c495ba6b6ee.tar.gz lwn-b4d6fcf13f417464c13c6fde46e87c495ba6b6ee.zip | |
cifs: move "ntlmssp" and "local_leases" options out of experimental code
I see no real need to leave these sorts of options under an
EXPERIMENTAL ifdef. Since you need a mount option to turn this code
on, that only blows out the testing matrix.
local_leases has been under the EXPERIMENTAL tag for some time, but
it's only the mount option that's under this label. Move it out
from under this tag.
The NTLMSSP code is also under EXPERIMENTAL, but it needs a mount
option to turn it on, and in the future any distro will reasonably
want this enabled. Go ahead and move it out from under the
EXPERIMENTAL tag.
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Acked-by: Suresh Jayaraman <sjayaraman@suse.de>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/connect.c')
| -rw-r--r-- | fs/cifs/connect.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 5e7a7bcc39a6..a65d311d163a 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -984,13 +984,11 @@ cifs_parse_mount_options(char *options, const char *devname, return 1; } else if (strnicmp(value, "krb5", 4) == 0) { vol->secFlg |= CIFSSEC_MAY_KRB5; -#ifdef CONFIG_CIFS_EXPERIMENTAL } else if (strnicmp(value, "ntlmsspi", 8) == 0) { vol->secFlg |= CIFSSEC_MAY_NTLMSSP | CIFSSEC_MUST_SIGN; } else if (strnicmp(value, "ntlmssp", 7) == 0) { vol->secFlg |= CIFSSEC_MAY_NTLMSSP; -#endif } else if (strnicmp(value, "ntlmv2i", 7) == 0) { vol->secFlg |= CIFSSEC_MAY_NTLMV2 | CIFSSEC_MUST_SIGN; @@ -1341,10 +1339,8 @@ cifs_parse_mount_options(char *options, const char *devname, vol->no_psx_acl = 0; } else if (strnicmp(data, "noacl", 5) == 0) { vol->no_psx_acl = 1; -#ifdef CONFIG_CIFS_EXPERIMENTAL } else if (strnicmp(data, "locallease", 6) == 0) { vol->local_lease = 1; -#endif } else if (strnicmp(data, "sign", 4) == 0) { vol->secFlg |= CIFSSEC_MUST_SIGN; } else if (strnicmp(data, "seal", 4) == 0) { |