From 0e63ea9c484388eff7e69c9bcd44d9dd57b33eb3 Mon Sep 17 00:00:00 2001 From: Steve French Date: Tue, 16 Oct 2007 18:10:10 +0000 Subject: [PATCH] --- yaml --- r: 71579 b: refs/heads/master c: 016ec75f1a0c0e765fce65d794569979104f031d h: refs/heads/master i: 71577: bd9e516f4d295abc293f269036ef8db2625fd166 71575: f015267a4c5a260bd3520059b2059e23bfdf89d7 v: v3 --- [refs] | 2 +- trunk/fs/cifs/cifsglob.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 55bbe0aae60c..8ffe51de24f7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6345a3a88012b0060ddeca8874e51cb442e1fb20 +refs/heads/master: 016ec75f1a0c0e765fce65d794569979104f031d diff --git a/trunk/fs/cifs/cifsglob.h b/trunk/fs/cifs/cifsglob.h index 9b7762c754cb..87f51f23276f 100644 --- a/trunk/fs/cifs/cifsglob.h +++ b/trunk/fs/cifs/cifsglob.h @@ -499,11 +499,13 @@ require use of the stronger protocol */ #define CIFSSEC_MASK 0x3F03F /* allows weak security but also krb5 */ #else #define CIFSSEC_MASK 0x37037 /* current flags supported if weak */ +#endif /* UPCALL */ #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 allowed */ +#endif /* UPCALL */ #endif /* WEAK_PW_HASH */ #define CIFSSEC_MUST_SEAL 0x40040 /* not supported yet */