Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 0 insertions, 13 deletions

diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c
index 1186dc44cdff..3f25cadccddd 100644
--- a/net/decnet/af_decnet.c
+++ b/net/decnet/af_decnet.c
@@ -719,22 +719,9 @@ static int dn_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
         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)) {