Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
[CIFS] Add destroy routine for dns_resolver
[CIFS] Reorder cifs config item for better clarity
[CIFS] Correct keys dependency for cifs kerberos support
+19
-11
+10
-10
fs/Kconfig
+10
-10
fs/Kconfig
···
1930
1930
1931
1931
If unsure, say N.
1932
1932
1933
+
config CIFS_UPCALL
1934
+
bool "Kerberos/SPNEGO advanced session setup"
1935
+
depends on CIFS && KEYS
1936
+
help
1937
+
Enables an upcall mechanism for CIFS which accesses
1938
+
userspace helper utilities to provide SPNEGO packaged (RFC 4178)
1939
+
Kerberos tickets which are needed to mount to certain secure servers
1940
+
(for which more secure Kerberos authentication is required). If
1941
+
unsure, say N.
1942
+
1933
1943
config CIFS_XATTR
1934
1944
bool "CIFS extended attributes"
1935
1945
depends on CIFS
···
1991
1981
setting a value of 1 to the pseudo-file /proc/fs/cifs/Experimental
1992
1982
(which is disabled by default). See the file fs/cifs/README
1993
1983
for more details. If unsure, say N.
1994
-
1995
-
config CIFS_UPCALL
1996
-
bool "Kerberos/SPNEGO advanced session setup (EXPERIMENTAL)"
1997
-
depends on KEYS
1998
-
help
1999
-
Enables an upcall mechanism for CIFS which accesses
2000
-
userspace helper utilities to provide SPNEGO packaged (RFC 4178)
2001
-
Kerberos tickets which are needed to mount to certain secure servers
2002
-
(for which more secure Kerberos authentication is required). If
2003
-
unsure, say N.
2004
1984
2005
1985
config CIFS_DFS_UPCALL
2006
1986
bool "DFS feature support (EXPERIMENTAL)"
+2
-1
fs/cifs/CHANGES
+2
-1
fs/cifs/CHANGES
···
8
8
files (e.g. "cp -a") to Windows servers. For mkdir and create honor setgid bit
9
9
on parent directory when server supports Unix Extensions but not POSIX
10
10
create. Update cifs.upcall version to handle new Kerberos sec flags
11
-
(this requires update of cifs.upcall program from Samba).
11
+
(this requires update of cifs.upcall program from Samba). Fix memory leak
12
+
on dns_upcall (resolving DFS referralls).
12
13
13
14
Version 1.53
14
15
------------
+7
fs/cifs/dns_resolve.c
+7
fs/cifs/dns_resolve.c
···
47
47
return rc;
48
48
}
49
49
50
+
static void
51
+
dns_resolver_destroy(struct key *key)
52
+
{
53
+
kfree(key->payload.data);
54
+
}
55
+
50
56
struct key_type key_type_dns_resolver = {
51
57
.name = "dns_resolver",
52
58
.def_datalen = sizeof(struct in_addr),
53
59
.describe = user_describe,
54
60
.instantiate = dns_resolver_instantiate,
61
+
.destroy = dns_resolver_destroy,
55
62
.match = user_match,
56
63
};
57
64