diff options
| author | Jeff Layton <jlayton@redhat.com> | 2007-10-16 17:32:19 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2007-10-16 17:32:19 +0000 |
| commit | 0d3a01fadacef5901005dc8f61688a8f0471dc79 (patch) | |
| tree | 7108a14b5bd800f9338ad6129ee96470e7d1bc62 /fs/cifs/cifsglob.h | |
| parent | e187e44eb8902089da0c7725d606b0e20fee981d (diff) | |
| download | linux-3.10-0d3a01fadacef5901005dc8f61688a8f0471dc79.tar.gz linux-3.10-0d3a01fadacef5901005dc8f61688a8f0471dc79.tar.bz2 linux-3.10-0d3a01fadacef5901005dc8f61688a8f0471dc79.zip | |
[CIFS] Break up unicode_sessetup string functions
SPNEGO setup needs only some of these strings. Break up
unicode_ssetup_strings so we can call them individually.
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/cifsglob.h')
| -rw-r--r-- | fs/cifs/cifsglob.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h index 61d617370e5..9b7762c754c 100644 --- a/fs/cifs/cifsglob.h +++ b/fs/cifs/cifsglob.h @@ -495,9 +495,15 @@ require use of the stronger protocol */ #ifdef CONFIG_CIFS_WEAK_PW_HASH #define CIFSSEC_MUST_LANMAN 0x10010 #define CIFSSEC_MUST_PLNTXT 0x20020 +#ifdef CONFIG_CIFS_UPCALL +#define CIFSSEC_MASK 0x3F03F /* allows weak security but also krb5 */ +#else #define CIFSSEC_MASK 0x37037 /* current flags supported if weak */ +#else /* do not allow weak pw hash */ +#ifdef CONFIG_CIFS_UPCALL +#define CIFSSEC_MASK 0x0F00F /* flags supported if no weak allowed */ #else -#define CIFSSEC_MASK 0x07007 /* flags supported if no weak config */ +#define CIFSSEC_MASK 0x07007 /* flags supported if no weak allowed */ #endif /* WEAK_PW_HASH */ #define CIFSSEC_MUST_SEAL 0x40040 /* not supported yet */ |