[Pkg-shadow-commits] r3534 - in upstream/trunk: . lib libmisc po
Nicolas FRANÇOIS
nekral-guest at alioth.debian.org
Sun Nov 6 18:37:20 UTC 2011
Author: nekral-guest
Date: 2011-11-06 18:37:19 +0000 (Sun, 06 Nov 2011)
New Revision: 3534
Added:
upstream/trunk/libmisc/root_flag.c
Modified:
upstream/trunk/ChangeLog
upstream/trunk/README
upstream/trunk/lib/prototypes.h
upstream/trunk/libmisc/Makefile.am
upstream/trunk/po/POTFILES.in
Log:
* 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.
Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog 2011-10-31 22:54:38 UTC (rev 3533)
+++ upstream/trunk/ChangeLog 2011-11-06 18:37:19 UTC (rev 3534)
@@ -1,3 +1,10 @@
+2011-10-29 Nicolas François <nicolas.francois at 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 at centraliens.net>
* man/ja/Makefile.am, man/fr/Makefile.am, man/ru/Makefile.am,
Modified: upstream/trunk/README
===================================================================
--- upstream/trunk/README 2011-10-31 22:54:38 UTC (rev 3533)
+++ upstream/trunk/README 2011-11-06 18:37:19 UTC (rev 3534)
@@ -80,6 +80,7 @@
Judd Bourgeois <shagboy at bluesky.net>
Juergen Heinzl <unicorn at noris.net>
Juha Virtanen <jiivee at iki.fi>
+Julian Pidancet <julian.pidancet at gmail.com>
Julianne Frances Haugh <jockgrrl at ix.netcom.com>
Leonard N. Zubkoff <lnz at dandelion.com>
Luca Berra <bluca at www.polimi.it>
@@ -99,6 +100,7 @@
Rafał Maszkowski <rzm at icm.edu.pl>
Rani Chouha <ranibey at smartec.com>
Sami Kerola <kerolasa at rocketmail.com>
+Scott Garman <scott.a.garman at intel.com>
Sebastian Rick Rijkers <srrijkers at gmail.com>
Seraphim Mellos <mellos at ceid.upatras.gr>
Shane Watts <shane at nexus.mlckew.edu.au>
Modified: upstream/trunk/lib/prototypes.h
===================================================================
--- upstream/trunk/lib/prototypes.h 2011-10-31 22:54:38 UTC (rev 3533)
+++ upstream/trunk/lib/prototypes.h 2011-11-06 18:37:19 UTC (rev 3534)
@@ -291,6 +291,9 @@
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);
Modified: upstream/trunk/libmisc/Makefile.am
===================================================================
--- upstream/trunk/libmisc/Makefile.am 2011-10-31 22:54:38 UTC (rev 3533)
+++ upstream/trunk/libmisc/Makefile.am 2011-11-06 18:37:19 UTC (rev 3534)
@@ -45,6 +45,7 @@
pwd_init.c \
remove_tree.c \
rlogin.c \
+ root_flag.c \
salt.c \
setugid.c \
setupenv.c \
Added: upstream/trunk/libmisc/root_flag.c
===================================================================
--- upstream/trunk/libmisc/root_flag.c (rev 0)
+++ upstream/trunk/libmisc/root_flag.c 2011-11-06 18:37:19 UTC (rev 3534)
@@ -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);
+ }
+}
+
Modified: upstream/trunk/po/POTFILES.in
===================================================================
--- upstream/trunk/po/POTFILES.in 2011-10-31 22:54:38 UTC (rev 3533)
+++ upstream/trunk/po/POTFILES.in 2011-11-06 18:37:19 UTC (rev 3534)
@@ -62,6 +62,7 @@
libmisc/pwd_init.c
libmisc/remove_tree.c
libmisc/rlogin.c
+libmisc/root_flag.c
libmisc/salt.c
libmisc/setugid.c
libmisc/setupenv.c
More information about the Pkg-shadow-commits
mailing list