From: Patrick Caulfield <patrick@tykepenguin.com>
To: davem@davemloft.net
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH] DECnet tidy
Date: Tue, 11 Oct 2005 08:22:33 +0100 [thread overview]
Message-ID: <434B6839.30600@tykepenguin.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 63 bytes --]
This just removes some redundant ifdeffed code:
--
patrick
[-- Attachment #2: Another small patch.eml --]
[-- Type: message/rfc822, Size: 955 bytes --]
Signed-off-by: Steven Whitehouse <steve@chygwyn.com>
Signed-off-by: Patrick Caulfield <patrick@tykepenguin.com>
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)) {
next reply other threads:[~2005-10-11 7:22 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-10-11 7:22 Patrick Caulfield [this message]
-- strict thread matches above, loose matches on Subject: below --
2005-08-30 8:47 [PATCH] DECnet Tidy Patrick Caulfield
2005-09-01 22:27 ` David S. Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=434B6839.30600@tykepenguin.com \
--to=patrick@tykepenguin.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.