lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Mon, 13 Apr 2015 10:34:25 +0200 From: Nicolas Dichtel <nicolas.dichtel@...nd.com> To: shemminger@...tta.com Cc: netdev@...r.kernel.org, vadim4j@...il.com, jbenc@...hat.com, Nicolas Dichtel <nicolas.dichtel@...nd.com> Subject: [PATCH v2 iproute2 2/3] Revert "ip netns: Fix rtnl error while print netns list" This reverts commit d116ff34145b00db54a37e2a6282dccd8bc08225. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@...nd.com> --- configure | 21 +-------------------- ip/Makefile | 4 ---- ip/ipnetns.c | 7 ------- 3 files changed, 1 insertion(+), 31 deletions(-) diff --git a/configure b/configure index 631938e97206..c3dacdba14ff 100755 --- a/configure +++ b/configure @@ -201,7 +201,7 @@ check_setns() { cat >$TMPDIR/setnstest.c <<EOF #include <sched.h> -int main(int argc, char **argv) +int main(int argc, char **argv) { (void)setns(0,0); return 0; @@ -218,23 +218,6 @@ EOF rm -f $TMPDIR/setnstest.c $TMPDIR/setnstest } -check_netnsid() -{ - cat >$TMPDIR/netnsid.c <<EOF -#include <linux/rtnetlink.h> -int test_def = RTM_GETNSID; -EOF - $CC -c $TMPDIR/netnsid.c >/dev/null 2>&1 - if [ $? -eq 0 ] - then - echo "IP_CONFIG_NETNSID:=y" >> Config - echo "yes" - else - echo "no" - fi - rm -f $TMPDIR/netnsid.c $TMPDIR/netnsid.o -} - check_ipset() { cat >$TMPDIR/ipsettest.c <<EOF @@ -300,8 +283,6 @@ check_ipt_lib_dir echo -n "libc has setns: " check_setns -echo -n "netns has peer id suport: " -check_netnsid echo -n "SELinux support: " check_selinux diff --git a/ip/Makefile b/ip/Makefile index 5637bcfebde0..2c742f305fef 100644 --- a/ip/Makefile +++ b/ip/Makefile @@ -16,10 +16,6 @@ ifeq ($(IP_CONFIG_SETNS),y) CFLAGS += -DHAVE_SETNS endif -ifeq ($(IP_CONFIG_NETNSID),y) - CFLAGS += -DHAVE_NETNSID -endif - ALLOBJ=$(IPOBJ) $(RTMONOBJ) SCRIPTS=ifcfg rtpr routel routef TARGETS=ip rtmon diff --git a/ip/ipnetns.c b/ip/ipnetns.c index 45e234a4d98c..5a213dcf46cd 100644 --- a/ip/ipnetns.c +++ b/ip/ipnetns.c @@ -34,7 +34,6 @@ static int usage(void) exit(-1); } -#ifdef HAVE_NETNSID static int get_netnsid_from_name(const char *name) { struct { @@ -79,12 +78,6 @@ static int get_netnsid_from_name(const char *name) return -1; } -#else -static int get_netnsid_from_name(const char *name) -{ - return -1; -} -#endif /* HAVE_NETNSID */ static int netns_list(int argc, char **argv) { -- 2.2.2 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists