From 9aee8e78ea1d7966b5d79034874d9cf831565410 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sun, 18 Mar 2007 18:04:30 +0100 Subject: [PATCH] * src/runcon.c (main): Don't reorder arguments. Reported by Ulrich Drepper in . * tests/misc/runcon-no-reorder: New file. Test for the above. * tests/misc/Makefile.am (TESTS): Add runcon-no-reorder. --- ChangeLog-selinux | 5 ++++ src/runcon.c | 4 +-- tests/misc/Makefile.am | 1 + tests/misc/runcon-no-reorder | 57 ++++++++++++++++++++++++++++++++++++ 4 files changed, 65 insertions(+), 2 deletions(-) create mode 100755 tests/misc/runcon-no-reorder diff --git a/ChangeLog-selinux b/ChangeLog-selinux index 95046dc6c..3b6264c38 100644 --- a/ChangeLog-selinux +++ b/ChangeLog-selinux @@ -1,5 +1,10 @@ 2007-03-18 Jim Meyering + * src/runcon.c (main): Don't reorder arguments. Reported by + Ulrich Drepper in . + * tests/misc/runcon-no-reorder: New file. Test for the above. + * tests/misc/Makefile.am (TESTS): Add runcon-no-reorder. + * src/runcon.c (main): Remove "." at end of a diagnostic. 2007-02-02 Jim Meyering diff --git a/src/runcon.c b/src/runcon.c index a8ddb7474..1d79ef6ff 100644 --- a/src/runcon.c +++ b/src/runcon.c @@ -114,9 +114,9 @@ main (int argc, char **argv, char **envp) while (1) { - int c; int option_index = 0; - c = getopt_long (argc, argv, "r:t:u:l:c", long_options, &option_index); + int c = getopt_long (argc, argv, "+r:t:u:l:c", long_options, + &option_index); if (c == -1) break; switch (c) diff --git a/tests/misc/Makefile.am b/tests/misc/Makefile.am index e4a15cf9e..87a644ee0 100644 --- a/tests/misc/Makefile.am +++ b/tests/misc/Makefile.am @@ -73,6 +73,7 @@ TESTS = \ printf \ printf-hex \ pwd-long \ + runcon-no-reorder \ sha224sum \ sha256sum \ sha384sum \ diff --git a/tests/misc/runcon-no-reorder b/tests/misc/runcon-no-reorder new file mode 100755 index 000000000..e41fd3041 --- /dev/null +++ b/tests/misc/runcon-no-reorder @@ -0,0 +1,57 @@ +#!/bin/sh +# Ensure that runcon does not reorder its arguments. + +# Copyright (C) 2007 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. + +if test "$VERBOSE" = yes; then + set -x + runcon --version +fi + +. $srcdir/../lang-default + +pwd=`pwd` +t0=`echo "$0"|sed 's,.*/,,'`.tmp; tmp=$t0/$$ +trap 'status=$?; cd "$pwd" && chmod -R u+rwx $t0 && rm -rf $t0 && exit $status' 0 +trap '(exit $?); exit $?' 1 2 13 15 + +framework_failure=0 +mkdir -p $tmp || framework_failure=1 +cd $tmp || framework_failure=1 + +cat <<\EOF > exp || framework_failure=1 +runcon: runcon may be used only on a SELinux kernel +EOF + +if test $framework_failure = 1; then + echo "$0: failure in testing framework" 1>&2 + (exit 1); exit 1 +fi + +fail=0 + +# This test works even on systems without SELinux. +# On such a system it fails with the above diagnostic, which is fine. +# Before the no-reorder change, it would have failed with a diagnostic +# about -j being an invalid option. +runcon -t unconfined_t true -j 2> out && : > exp + +cmp out exp || fail=1 +test $fail = 1 && diff out exp 2> /dev/null + +(exit $fail); exit $fail