* [PATCH selinux-testsuite] capable_net: check for ifconfig in different locations
@ 2013-12-03 23:02 Paul Moore
0 siblings, 0 replies; 3+ messages in thread
From: Paul Moore @ 2013-12-03 23:02 UTC (permalink / raw)
To: selinux, serge
Pardon my C-like Perl, but in current Fedora Rawhide releases we need
to check for ifconfig in /usr/bin and not just /sbin.
Signed-off-by: Paul Moore <pmoore@redhat.com>
---
tests/capable_net/test | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/tests/capable_net/test b/tests/capable_net/test
index 378bf92..24261c3 100755
--- a/tests/capable_net/test
+++ b/tests/capable_net/test
@@ -8,11 +8,20 @@ BEGIN { plan tests => 5 }
$basedir = $0; $basedir =~ s|(.*)/[^/]*|$1|;
+# Find a usable ifconfig
+if (-x "/sbin/ifconfig") {
+ $ifconfig = "/sbin/ifconfig";
+} elsif (-x "/usr/bin/ifconfig") {
+ $ifconfig = "/usr/bin/ifconfig";
+} else {
+ BAIL_OUT("can not find a copy of ifconfig");
+}
+
#
# Tests for the good domain.
#
# CAP_NET_ADMIN
-$result = system "runcon -t test_ncap_t -- /sbin/ifconfig lo -promisc 2>&1";
+$result = system "runcon -t test_ncap_t -- $ifconfig lo -promisc 2>&1";
ok($result, 0);
# CAP_NET_BIND_SERVICE
@@ -30,7 +39,7 @@ ok($result, 0);
#
# CAP_NET_ADMIN
-$result = system "runcon -t test_resncap_t -- /sbin/ifconfig lo -promisc 2>&1";
+$result = system "runcon -t test_resncap_t -- $ifconfig lo -promisc 2>&1";
ok($result);
# CAP_NET_BIND_SERVICE; included in can_network by fedora policy
--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to majordomo@tycho.nsa.gov with
the words "unsubscribe selinux" without quotes as the message.
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH selinux-testsuite] capable_net: check for ifconfig in different locations
@ 2013-12-04 20:42 Paul Moore
2013-12-04 21:54 ` Serge E. Hallyn
0 siblings, 1 reply; 3+ messages in thread
From: Paul Moore @ 2013-12-04 20:42 UTC (permalink / raw)
To: selinux, serge
Pardon my C-like Perl, but in current Fedora Rawhide releases we need
to check for ifconfig in /usr/bin and not just /sbin.
Signed-off-by: Paul Moore <pmoore@redhat.com>
---
tests/capable_net/test | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/tests/capable_net/test b/tests/capable_net/test
index 378bf92..24261c3 100755
--- a/tests/capable_net/test
+++ b/tests/capable_net/test
@@ -8,11 +8,20 @@ BEGIN { plan tests => 5 }
$basedir = $0; $basedir =~ s|(.*)/[^/]*|$1|;
+# Find a usable ifconfig
+if (-x "/sbin/ifconfig") {
+ $ifconfig = "/sbin/ifconfig";
+} elsif (-x "/usr/bin/ifconfig") {
+ $ifconfig = "/usr/bin/ifconfig";
+} else {
+ BAIL_OUT("can not find a copy of ifconfig");
+}
+
#
# Tests for the good domain.
#
# CAP_NET_ADMIN
-$result = system "runcon -t test_ncap_t -- /sbin/ifconfig lo -promisc 2>&1";
+$result = system "runcon -t test_ncap_t -- $ifconfig lo -promisc 2>&1";
ok($result, 0);
# CAP_NET_BIND_SERVICE
@@ -30,7 +39,7 @@ ok($result, 0);
#
# CAP_NET_ADMIN
-$result = system "runcon -t test_resncap_t -- /sbin/ifconfig lo -promisc 2>&1";
+$result = system "runcon -t test_resncap_t -- $ifconfig lo -promisc 2>&1";
ok($result);
# CAP_NET_BIND_SERVICE; included in can_network by fedora policy
--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to majordomo@tycho.nsa.gov with
the words "unsubscribe selinux" without quotes as the message.
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH selinux-testsuite] capable_net: check for ifconfig in different locations
2013-12-04 20:42 Paul Moore
@ 2013-12-04 21:54 ` Serge E. Hallyn
0 siblings, 0 replies; 3+ messages in thread
From: Serge E. Hallyn @ 2013-12-04 21:54 UTC (permalink / raw)
To: Paul Moore; +Cc: selinux
Quoting Paul Moore (pmoore@redhat.com):
> Pardon my C-like Perl, but in current Fedora Rawhide releases we need
> to check for ifconfig in /usr/bin and not just /sbin.
>
> Signed-off-by: Paul Moore <pmoore@redhat.com>
Thanks, looks good, will apply.
> ---
> tests/capable_net/test | 13 +++++++++++--
> 1 file changed, 11 insertions(+), 2 deletions(-)
>
> diff --git a/tests/capable_net/test b/tests/capable_net/test
> index 378bf92..24261c3 100755
> --- a/tests/capable_net/test
> +++ b/tests/capable_net/test
> @@ -8,11 +8,20 @@ BEGIN { plan tests => 5 }
>
> $basedir = $0; $basedir =~ s|(.*)/[^/]*|$1|;
>
> +# Find a usable ifconfig
> +if (-x "/sbin/ifconfig") {
> + $ifconfig = "/sbin/ifconfig";
> +} elsif (-x "/usr/bin/ifconfig") {
> + $ifconfig = "/usr/bin/ifconfig";
> +} else {
> + BAIL_OUT("can not find a copy of ifconfig");
> +}
> +
> #
> # Tests for the good domain.
> #
> # CAP_NET_ADMIN
> -$result = system "runcon -t test_ncap_t -- /sbin/ifconfig lo -promisc 2>&1";
> +$result = system "runcon -t test_ncap_t -- $ifconfig lo -promisc 2>&1";
> ok($result, 0);
>
> # CAP_NET_BIND_SERVICE
> @@ -30,7 +39,7 @@ ok($result, 0);
> #
>
> # CAP_NET_ADMIN
> -$result = system "runcon -t test_resncap_t -- /sbin/ifconfig lo -promisc 2>&1";
> +$result = system "runcon -t test_resncap_t -- $ifconfig lo -promisc 2>&1";
> ok($result);
>
> # CAP_NET_BIND_SERVICE; included in can_network by fedora policy
--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to majordomo@tycho.nsa.gov with
the words "unsubscribe selinux" without quotes as the message.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-12-04 22:15 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-03 23:02 [PATCH selinux-testsuite] capable_net: check for ifconfig in different locations Paul Moore
-- strict thread matches above, loose matches on Subject: below --
2013-12-04 20:42 Paul Moore
2013-12-04 21:54 ` Serge E. Hallyn
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.