Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 325a9a3d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents e4268bd3 87ed1d65

fs/Kconfig

+10 −10
Original line number Diff line number Diff line
@@ -1930,6 +1930,16 @@ config CIFS_WEAK_PW_HASH 


	  If unsure, say N.



config CIFS_UPCALL

	  bool "Kerberos/SPNEGO advanced session setup"

	  depends on CIFS && KEYS

	  help

	    Enables an upcall mechanism for CIFS which accesses

	    userspace helper utilities to provide SPNEGO packaged (RFC 4178)

	    Kerberos tickets which are needed to mount to certain secure servers

	    (for which more secure Kerberos authentication is required). If

	    unsure, say N.



config CIFS_XATTR

        bool "CIFS extended attributes"

        depends on CIFS
@@ -1982,16 +1992,6 @@ config CIFS_EXPERIMENTAL 
	    (which is disabled by default). See the file fs/cifs/README 

	    for more details.  If unsure, say N.



config CIFS_UPCALL

	  bool "Kerberos/SPNEGO advanced session setup (EXPERIMENTAL)"

	  depends on KEYS

	  help

	    Enables an upcall mechanism for CIFS which accesses

	    userspace helper utilities to provide SPNEGO packaged (RFC 4178)

	    Kerberos tickets which are needed to mount to certain secure servers

	    (for which more secure Kerberos authentication is required). If

	    unsure, say N.



config CIFS_DFS_UPCALL

	  bool "DFS feature support (EXPERIMENTAL)"

	  depends on CIFS_EXPERIMENTAL

fs/cifs/CHANGES

+2 −1
Original line number Diff line number Diff line
@@ -8,7 +8,8 @@ architectures. Fix problems with preserving timestamps on copying open 
files (e.g. "cp -a") to Windows servers.  For mkdir and create honor setgid bit

on parent directory when server supports Unix Extensions but not POSIX

create. Update cifs.upcall version to handle new Kerberos sec flags

(this requires update of cifs.upcall program from Samba).

(this requires update of cifs.upcall program from Samba).  Fix memory leak

on dns_upcall (resolving DFS referralls).



Version 1.53

------------

fs/cifs/dns_resolve.c

+7 −0
Original line number Diff line number Diff line
@@ -47,11 +47,18 @@ static int dns_resolver_instantiate(struct key *key, const void *data, 
	return rc;

}



static void

dns_resolver_destroy(struct key *key)

{

	kfree(key->payload.data);

}



struct key_type key_type_dns_resolver = {

	.name        = "dns_resolver",

	.def_datalen = sizeof(struct in_addr),

	.describe    = user_describe,

	.instantiate = dns_resolver_instantiate,

	.destroy     = dns_resolver_destroy,

	.match       = user_match,

};