aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2005-11-10 18:33:38 -0500
committerSteve French <sfrench@us.ibm.com>2005-11-10 18:33:38 -0500
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 4419855d779b..1f0ebe61ad40 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -1680,6 +1680,18 @@ config CIFS_EXPERIMENTAL
1680 1680
1681 If unsure, say N. 1681 If unsure, say N.
1682 1682
1683config CIFS_UPCALL
1684 bool "CIFS Kerberos/SPNEGO advanced session setup (EXPERIMENTAL)"
1685 depends on CIFS_EXPERIMENTAL
1686 select CONNECTOR
1687 help
1688 Enables an upcall mechanism for CIFS which will be used to contact
1689 userspace helper utilities to provide SPNEGO packaged Kerberos
1690 tickets which are needed to mount to certain secure servers
1691 (for which more secure Kerberos authentication is required).
1692
1693 If unsure, say N.
1694
1683config NCP_FS 1695config NCP_FS
1684 tristate "NCP file system support (to mount NetWare volumes)" 1696 tristate "NCP file system support (to mount NetWare volumes)"
1685 depends on IPX!=n || INET 1697 depends on IPX!=n || INET
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 450ab75d6546..2cb620716bc1 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -42,6 +42,7 @@
42#include "ntlmssp.h" 42#include "ntlmssp.h"
43#include "nterr.h" 43#include "nterr.h"
44#include "rfc1002pdu.h" 44#include "rfc1002pdu.h"
45#include "cn_cifs.h"
45 46
46#define CIFS_PORT 445 47#define CIFS_PORT 445
47#define RFC1001_PORT 139 48#define RFC1001_PORT 139
diff --git a/include/linux/connector.h b/include/linux/connector.h
index c5769c6585f4..ad1a22c1c42e 100644
--- a/include/linux/connector.h
+++ b/include/linux/connector.h
@@ -32,6 +32,8 @@
32 */ 32 */
33#define CN_IDX_PROC 0x1 33#define CN_IDX_PROC 0x1
34#define CN_VAL_PROC 0x1 34#define CN_VAL_PROC 0x1
35#define CN_IDX_CIFS 0x2
36#define CN_VAL_CIFS 0x1
35 37
36#define CN_NETLINK_USERS 1 38#define CN_NETLINK_USERS 1
37 39