* lib/prototypes.h, libmisc/Makefile.am, libmisc/root_flag.c,

	po/POTFILES.in: Add process_root_flag() to process the --root
	option and chroot so that the chroot config is used and changes
	are applied to the chroot.

diff --git a/ChangeLog b/ChangeLog
index 8f2ed2e2916e9621f200f3eca4013e06db86c9cf..1c1b9b06e39190e316411fd86e6f0f44c154c1b3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-10-29  Nicolas François  <nicolas.francois@centraliens.net>
+
+       * lib/prototypes.h, libmisc/Makefile.am, libmisc/root_flag.c,
+       po/POTFILES.in: Add process_root_flag() to process the --root
+       option and chroot so that the chroot config is used and changes
+       are applied to the chroot.
+
 2011-10-22  Nicolas François  <nicolas.francois@centraliens.net>
 
        * man/ja/Makefile.am, man/fr/Makefile.am, man/ru/Makefile.am,

diff --git a/README b/README
index 5a05783f1c6e446628ffe4dd303503ff4f599a05..0619ac75d7e2a0c1c14bb28d52b94ae697999659 100644 (file)
--- a/README
+++ b/README
@@ -80,6 +80,7 @@ Joshua Cowan <jcowan@hermit.reslife.okstate.edu>
 Judd Bourgeois <shagboy@bluesky.net>
 Juergen Heinzl <unicorn@noris.net>
 Juha Virtanen <jiivee@iki.fi>
+Julian Pidancet <julian.pidancet@gmail.com>
 Julianne Frances Haugh <jockgrrl@ix.netcom.com>
 Leonard N. Zubkoff <lnz@dandelion.com>
 Luca Berra <bluca@www.polimi.it>
@@ -99,6 +100,7 @@ Phillip Street
 Rafał Maszkowski <rzm@icm.edu.pl>
 Rani Chouha <ranibey@smartec.com>
 Sami Kerola <kerolasa@rocketmail.com>
+Scott Garman <scott.a.garman@intel.com>
 Sebastian Rick Rijkers <srrijkers@gmail.com>
 Seraphim Mellos <mellos@ceid.upatras.gr>
 Shane Watts <shane@nexus.mlckew.edu.au>

diff --git a/lib/prototypes.h b/lib/prototypes.h
index 7a0bb2f787270903ac2f388b48996a4ea40900b6..e2a0129b2fe6c40a2ad14e22556912e9f601c431 100644 (file)
--- a/lib/prototypes.h
+++ b/lib/prototypes.h
@@ -291,6 +291,9 @@ extern int remove_tree (const char *root, bool remove_root);
 extern int do_rlogin (const char *remote_host, char *name, size_t namelen,
                       char *term, size_t termlen);
 
+/* root_flag.c */
+extern void process_root_flag (const char* short_opt, int argc, char **argv);
+
 /* salt.c */
 extern /*@observer@*/const char *crypt_make_salt (/*@null@*//*@observer@*/const char *meth, /*@null@*/void *arg);
 

diff --git a/libmisc/Makefile.am b/libmisc/Makefile.am
index a8afc177f2d4dec300f639776bf86a6e18d73a57..41c9e9010fe41b6fbbc8a96c63f11848ee839a90 100644 (file)
--- a/libmisc/Makefile.am
+++ b/libmisc/Makefile.am
@@ -45,6 +45,7 @@ libmisc_a_SOURCES = \
        pwd_init.c \
        remove_tree.c \
        rlogin.c \
+       root_flag.c \
        salt.c \
        setugid.c \
        setupenv.c \

diff --git a/libmisc/root_flag.c b/libmisc/root_flag.c
new file mode 100644 (file)
index 0000000..1d54fb3
--- /dev/null
+++ b/libmisc/root_flag.c
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2011       , Julian Pidancet
+ * Copyright (c) 2011       , Nicolas François
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the copyright holders or contributors may not be used to
+ *    endorse or promote products derived from this software without
+ *    specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <config.h>
+
+#ident "$Id$"
+
+#include <assert.h>
+#include "defines.h"
+#include "prototypes.h"
+#include "exitcodes.h"
+
+static void change_root (const char* newroot);
+
+/*
+ * process_root_flag - chroot if given the --root option
+ *
+ * This shall be called before accessing the passwd, group, shadow,
+ * gshadow, useradd's default, login.defs files (non exhaustive list)
+ * or authenticating the caller.
+ *
+ * The audit, syslog, or locale files shall be open before
+ */
+extern void process_root_flag (const char* short_opt, int argc, char **argv)
+{
+       /*
+        * Parse the command line options.
+        */
+       int i;
+       const char *newroot = NULL;
+
+       for (i = 0; i < argc; i++) {
+               if (   (strcmp (argv[i], "--root") == 0)
+                   || (strcmp (argv[i], short_opt) == 0)) {
+                       if (NULL != newroot) {
+                               fprintf (stderr,
+                                        _("%s: multiple --root options\n"),
+                                        Prog);
+                               exit (E_BAD_ARG);
+                       }
+
+                       if (i + 1 == argc) {
+                               fprintf (stderr,
+                                        _("%s: option '%s' requires an argument\n"),
+                                        Prog, argv[i]);
+                               exit (E_BAD_ARG);
+                       }
+                       newroot = argv[i + 1];
+               }
+       }
+
+       if (NULL != newroot) {
+               change_root (newroot);
+       }
+}
+
+static void change_root (const char* newroot)
+{
+       if ('/' != newroot[0]) {
+               fprintf (stderr,
+                        _("%s: invalid chroot path '%s'\n"),
+                        Prog, newroot);
+               exit (E_BAD_ARG);
+       }
+
+       if (access (newroot, F_OK) != 0) {
+               fprintf(stderr,
+                       _("%s: chroot directory %s does not exist\n"),
+                       Prog, newroot);
+               exit (E_BAD_ARG);
+       }
+       if (chroot (newroot) != 0) {
+               fprintf(stderr,
+                       _("%s: unable to chroot to directory %s\n"),
+                       Prog, newroot);
+               exit (E_BAD_ARG);
+       }
+}
+

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 4fa02f98750437d04ad36eff0e3b1e265b298559..b90be8884d78f21aa6b8ff5734714df87e471bbe 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -62,6 +62,7 @@ libmisc/pwdcheck.c
 libmisc/pwd_init.c
 libmisc/remove_tree.c
 libmisc/rlogin.c
+libmisc/root_flag.c
 libmisc/salt.c
 libmisc/setugid.c
 libmisc/setupenv.c