From: Steve French <sfrench@us.ibm.com>
Date: Thu, 10 Nov 2005 23:33:38 +0000 (-0800)
Subject: [CIFS] Reserve upcall IDX value for CIFS with connector header and add
X-Git-Tag: v2.6.15-rc1~18^2~5
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a2653ebab3a96c6e6183360821faa492c1f88c3f;p=linux-2.6

[CIFS] Reserve upcall IDX value for CIFS with connector header and add
Kconfig option for CIFS upcall.

Signed-off-by: Steve French <sfrench@us.ibm.com>
---

diff --git a/fs/Kconfig b/fs/Kconfig
index 4419855d77..1f0ebe61ad 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -1680,6 +1680,18 @@ config CIFS_EXPERIMENTAL
 
 	    If unsure, say N.
 
+config CIFS_UPCALL
+	  bool "CIFS Kerberos/SPNEGO advanced session setup (EXPERIMENTAL)"
+	  depends on CIFS_EXPERIMENTAL
+	  select CONNECTOR
+	  help
+	    Enables an upcall mechanism for CIFS which will be used to contact
+	    userspace helper utilities to provide SPNEGO packaged Kerberos
+	    tickets which are needed to mount to certain secure servers
+	    (for which more secure Kerberos authentication is required).
+	    
+	  If unsure, say N.  
+
 config NCP_FS
 	tristate "NCP file system support (to mount NetWare volumes)"
 	depends on IPX!=n || INET
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 450ab75d65..2cb620716b 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -42,6 +42,7 @@
 #include "ntlmssp.h"
 #include "nterr.h"
 #include "rfc1002pdu.h"
+#include "cn_cifs.h"
 
 #define CIFS_PORT 445
 #define RFC1001_PORT 139
diff --git a/include/linux/connector.h b/include/linux/connector.h
index c5769c6585..ad1a22c1c4 100644
--- a/include/linux/connector.h
+++ b/include/linux/connector.h
@@ -32,6 +32,8 @@
  */
 #define CN_IDX_PROC			0x1
 #define CN_VAL_PROC			0x1
+#define CN_IDX_CIFS			0x2
+#define CN_VAL_CIFS                     0x1
 
 #define CN_NETLINK_USERS		1