From 9189d6fe7c26a7ea93eeb4fb30ff6d44866366e4 Mon Sep 17 00:00:00 2001
From: Steve French <sfrench@us.ibm.com>
Date: Wed, 18 Jan 2012 17:13:47 -0600
Subject: [PATCH] --- yaml --- r: 286587 b: refs/heads/master c:
 88a4412b798236bfdd9284d5c251d76679f944e1 h: refs/heads/master i:   286585:
 37db68a9842171e13b539f8cf35b03e1a4793bd5   286583:
 ec3853735c99eddaa94649c8aa51da0a3c983ff2 v: v3

---
 [refs]                   | 2 +-
 trunk/fs/cifs/cifsglob.h | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 14a649bb645c..19a0778d6140 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 34f598ca0803f399da3438df46c7f56bfe423789
+refs/heads/master: 88a4412b798236bfdd9284d5c251d76679f944e1
diff --git a/trunk/fs/cifs/cifsglob.h b/trunk/fs/cifs/cifsglob.h
index ba53c1c6c6cc..76e7d8b6da17 100644
--- a/trunk/fs/cifs/cifsglob.h
+++ b/trunk/fs/cifs/cifsglob.h
@@ -879,6 +879,8 @@ require use of the stronger protocol */
 #define   CIFSSEC_MASK          0xB70B7 /* current flags supported if weak */
 #endif /* UPCALL */
 #else /* do not allow weak pw hash */
+#define   CIFSSEC_MUST_LANMAN	0
+#define   CIFSSEC_MUST_PLNTXT	0
 #ifdef CONFIG_CIFS_UPCALL
 #define   CIFSSEC_MASK          0x8F08F /* flags supported if no weak allowed */
 #else