[DECNET]: Remove some redundant ifdeffed code
Signed-off-by: Patrick Caulfield <patrick@tykepenguin.com> Signed-off-by: Steven Whitehouse <steve@chygwyn.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
This commit is contained in:
Родитель
5ed688a716
Коммит
900e0143a5
|
@ -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)) {
|
||||
|
|
Загрузка…
Ссылка в новой задаче