summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2011-11-12 01:25:45 +0100
committerJim Meyering <meyering@redhat.com>2011-11-14 09:52:42 +0100
commit40324ca8b22a538e31aa2f9a8ac03f03f7d0537e (patch)
tree4a5a2c43a3bf870f64bf5e27fdd5aa342be246d1
parentb8b6dd27a61dce58d6537dfbee65c7428f4ae3cd (diff)
downloadcoreutils-40324ca8b22a538e31aa2f9a8ac03f03f7d0537e.tar.xz
id: fail when getuid, getgid, etc. fail, e.g., on GNU/Hurd
POSIX-conforming getuid, geteuid, etc. functions cannot fail, but on GNU/Hurd systems and some others, they may. * src/id.c (main) [__GNU__]: Detect and diagnose any such failure. * tests/id/gnu-zero-uids: New file. * tests/Makefile.am (TESTS): Add it to the list. * tests/init.cfg (require_gnu_): New function.
-rw-r--r--src/id.c20
-rw-r--r--tests/Makefile.am1
-rwxr-xr-xtests/id/gnu-zero-uids29
-rw-r--r--tests/init.cfg7
4 files changed, 57 insertions, 0 deletions
diff --git a/src/id.c b/src/id.c
index cfbaa296c..047e40b88 100644
--- a/src/id.c
+++ b/src/id.c
@@ -38,6 +38,13 @@
proper_name ("Arnold Robbins"), \
proper_name ("David MacKenzie")
+/* Whether the functions getuid, geteuid, getgid and getegid may fail. */
+#ifdef __GNU__
+# define GETID_MAY_FAIL 1
+#else
+# define GETID_MAY_FAIL 0
+#endif
+
/* If nonzero, output only the SELinux context. -Z */
static int just_context = 0;
@@ -202,9 +209,22 @@ main (int argc, char **argv)
else
{
euid = geteuid ();
+ if (GETID_MAY_FAIL && euid == -1 && !use_real
+ && !just_group && !just_group_list && !just_context)
+ error (EXIT_FAILURE, errno, _("cannot get effective UID"));
+
ruid = getuid ();
+ if (GETID_MAY_FAIL && ruid == -1 && use_real
+ && !just_group && !just_group_list && !just_context)
+ error (EXIT_FAILURE, errno, _("cannot get real UID"));
+
egid = getegid ();
+ if (GETID_MAY_FAIL && egid == -1 && !use_real && !just_user)
+ error (EXIT_FAILURE, errno, _("cannot get effective GID"));
+
rgid = getgid ();
+ if (GETID_MAY_FAIL && rgid == -1 && use_real && !just_user)
+ error (EXIT_FAILURE, errno, _("cannot get real GID"));
}
if (just_user)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 64366a491..48c33cb99 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -399,6 +399,7 @@ TESTS = \
du/slink \
du/trailing-slash \
du/two-args \
+ id/gnu-zero-uids \
id/no-context \
install/basic-1 \
install/create-leading \
diff --git a/tests/id/gnu-zero-uids b/tests/id/gnu-zero-uids
new file mode 100755
index 000000000..bc9043c56
--- /dev/null
+++ b/tests/id/gnu-zero-uids
@@ -0,0 +1,29 @@
+#!/bin/sh
+# On GNU, `id' must fail for processes with zero UIDs.
+
+# Copyright (C) 2011 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 3 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, see <http://www.gnu.org/licenses/>.
+
+. "${srcdir=.}/init.sh"; path_prepend_ ../src
+print_ver_ id
+
+require_gnu_
+
+sush - true || skip_ "the \`sush' command does not work"
+
+# Run `id' with zero UIDs. It should exit with a non-zero status.
+sush - id > out && fail=1
+
+Exit $fail
diff --git a/tests/init.cfg b/tests/init.cfg
index 915f38a8d..9b05b3418 100644
--- a/tests/init.cfg
+++ b/tests/init.cfg
@@ -499,4 +499,11 @@ print_ver_()
fi
}
+# Are we running on GNU/Hurd?
+require_gnu_()
+{
+ test "$(uname)" = GNU \
+ || skip_ 'not running on GNU/Hurd'
+}
+
sanitize_path_