aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2005-11-10 15:33:38 -0800
committerSteve French <sfrench@us.ibm.com>2005-11-10 15:33:38 -0800
commita2653ebab3a96c6e6183360821faa492c1f88c3f (patch)
treed14fb220e2f4191fd506fd7628312987a186bb4a
parent7b7abfe3dd81d659a0889f88965168f7eef8c5c6 (diff)
[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>
-rw-r--r--fs/Kconfig12
-rw-r--r--fs/cifs/connect.c1
-rw-r--r--include/linux/connector.h2
3 files changed, 15 insertions, 0 deletions
diff --git a/fs/Kconfig b/fs/Kconfig
index 4419855d779..1f0ebe61ad4 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 450ab75d654..2cb620716bc 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 c5769c6585f..ad1a22c1c42 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