This just removes some redundant ifdeffed code:
--
patrick
--- Begin Message ---
Signed-off-by: Steven Whitehouse <[email protected]>
Signed-off-by: Patrick Caulfield <[email protected]>
diff -Nru linux-2.6.13/net/decnet/af_decnet.c linux/net/decnet/af_decnet.c
--- linux-2.6.13/net/decnet/af_decnet.c 2005-10-03 21:16:48.000000000 +0100
+++ linux/net/decnet/af_decnet.c 2005-10-07 11:21:25.000000000 +0100
@@ -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)) {
--- End Message ---
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
