[meta-mentor] [PATCH 2/3] shadow-native: Add --root option in groupmems
mikhail_durnev at mentor.com
mikhail_durnev at mentor.com
Mon Jun 24 17:15:21 PDT 2013
From: Mikhail Durnev <mikhail_durnev at mentor.com>
Patch add_root_cmd_groupmems.patch that we apply to shadow-native
allows program groupmems from the shadow utility package to chroot()
so it can be used to modify etc/passwd and etc/group if they are
located in a sysroot.
The --root option in groupmems is needed for class useradd.
Signed-off-by: Mikhail Durnev <mikhail_durnev at mentor.com>
---
recipes/shadow/files/add_root_cmd_groupmems.patch | 75 +++++++++++++++++++++
recipes/shadow/shadow-native_4.1.4.3.bbappend | 5 ++
2 files changed, 80 insertions(+)
create mode 100644 recipes/shadow/files/add_root_cmd_groupmems.patch
create mode 100644 recipes/shadow/shadow-native_4.1.4.3.bbappend
diff --git a/recipes/shadow/files/add_root_cmd_groupmems.patch b/recipes/shadow/files/add_root_cmd_groupmems.patch
new file mode 100644
index 0000000..a59d89e
--- /dev/null
+++ b/recipes/shadow/files/add_root_cmd_groupmems.patch
@@ -0,0 +1,75 @@
+Add a --root command option to groupmems utility.
+
+This option allows the utility to be chrooted when run under pseudo.
+
+Signed-off-by: Mikhail Durnev <mikhail_durnev at mentor.com>
+
+diff -Naur old/src/groupmems.c new/src/groupmems.c
+--- old/src/groupmems.c 2011-02-13 11:58:16.000000000 -0600
++++ new/src/groupmems.c 2013-05-30 04:45:38.000000000 -0500
+@@ -60,6 +60,7 @@
+ #define EXIT_MEMBER_EXISTS 7 /* member of group already exists */
+ #define EXIT_INVALID_USER 8 /* specified user does not exist */
+ #define EXIT_INVALID_GROUP 9 /* specified group does not exist */
++#define EXIT_BAD_ARG 10 /* invalid argument to option */
+
+ /*
+ * Global variables
+@@ -79,6 +80,7 @@
+ static bool is_shadowgrp;
+ static bool sgr_locked = false;
+ #endif
++static const char *newroot = "";
+
+ /* local function prototypes */
+ static char *whoami (void);
+@@ -368,6 +370,7 @@
+ "Options:\n"
+ " -g, --group groupname change groupname instead of the user's group\n"
+ " (root only)\n"
++ " -R, --root CHROOT_DIR directory to chroot into\n"
+ "\n"
+ "Actions:\n"
+ " -a, --add username add username to the members of the group\n"
+@@ -391,10 +394,11 @@
+ {"group", required_argument, NULL, 'g'},
+ {"list", no_argument, NULL, 'l'},
+ {"purge", no_argument, NULL, 'p'},
++ {"root", required_argument, NULL, 'R'},
+ {NULL, 0, NULL, '\0'}
+ };
+
+- while ((arg = getopt_long (argc, argv, "a:d:g:lp", long_options,
++ while ((arg = getopt_long (argc, argv, "a:d:g:lpR:", long_options,
+ &option_index)) != EOF) {
+ switch (arg) {
+ case 'a':
+@@ -416,6 +420,28 @@
+ purge = true;
+ ++exclusive;
+ break;
++ case 'R':
++ if ('/' != optarg[0]) {
++ fprintf (stderr,
++ _("%s: invalid chroot path '%s'\n"),
++ Prog, optarg);
++ exit (EXIT_BAD_ARG);
++ }
++ newroot = optarg;
++
++ if (access (newroot, F_OK) != 0) {
++ fprintf(stderr,
++ _("%s: chroot directory %s does not exist\n"),
++ Prog, newroot);
++ exit (EXIT_BAD_ARG);
++ }
++ if ( chroot(newroot) != 0 ) {
++ fprintf(stderr,
++ _("%s: unable to chroot to directory %s\n"),
++ Prog, newroot);
++ exit (EXIT_BAD_ARG);
++ }
++ break;
+ default:
+ usage ();
+ }
diff --git a/recipes/shadow/shadow-native_4.1.4.3.bbappend b/recipes/shadow/shadow-native_4.1.4.3.bbappend
new file mode 100644
index 0000000..de6e40f
--- /dev/null
+++ b/recipes/shadow/shadow-native_4.1.4.3.bbappend
@@ -0,0 +1,5 @@
+PRINC := "${@int(PRINC) + 1}"
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+
+SRC_URI += "file://add_root_cmd_groupmems.patch"
--
1.7.9.5
More information about the meta-mentor
mailing list