DECnet tidy

PATCH New Patrick Caulfield 1 participant 1 message Oct 11, 2005 Networking

lore

Share & tools

lore

Patrick Caulfield

author

2005-10-11 07:22 UTC #0 lore raw

PATCH 1/1 DECnet tidy

This just removes some redundant ifdeffed code:

Signature · 1 line

patrick

Signed-off-by Steven Whitehouse <[email protected]>

Signed-off-by Patrick Caulfield <[email protected]>

net/decnet/af_decnet.c +0 ~~-13~~

diff -Nru linux-2.6.13/net/decnet/af_decnet.c linux/net/decnet/af_decnet.c
@@ -719,22 +719,9 @@
 	if (saddr->sdn_flags & ~SDF_WILD)
 		return -EINVAL;
 
-#if 1
 	if (!capable(CAP_NET_BIND_SERVICE) && (saddr->sdn_objnum ||
 	    (saddr->sdn_flags & SDF_WILD)))
 		return -EACCES;
-#else
-	/*
-	 * Maybe put the default actions in the default security ops for
-	 * dn_prot_sock ? Would be nice if the capable call would go there
-	 * too.
-	 */
-	if (security_dn_prot_sock(saddr) &&
-	    !capable(CAP_NET_BIND_SERVICE) || 
-	    saddr->sdn_objnum || (saddr->sdn_flags & SDF_WILD))
-		return -EACCES;
-#endif
-
 
 	if (!(saddr->sdn_flags & SDF_WILD)) {
 		if (dn_ntohs(saddr->sdn_nodeaddrl)) {