* NEWS, src/gpasswd.c, man/gpasswd.1.xml: Add --root option.

	* src/gpasswd.c: The getopt index of long options is not used.

diff --git a/ChangeLog b/ChangeLog
index 533ec062feeaee83c427b0194bacf32a229e8e20..b4e9511f9d33802ebda365b949384a84ee7cae91 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -42,6 +42,8 @@
        * NEWS, src/chsh.c, man/chsh.1.xml: Add --root option.
        chsh's usage split in smaller messages.
        * src/chsh.c: The getopt index of long options is not used.
+       * NEWS, src/gpasswd.c, man/gpasswd.1.xml: Add --root option.
+       * src/gpasswd.c: The getopt index of long options is not used.
 
 2011-10-22  Nicolas François  <nicolas.francois@centraliens.net>
 

diff --git a/NEWS b/NEWS
index eba10609cfd842ae8e76190854e82ba77c536ed3..c7641f3549ed893b8f4282c7584e9b0d394bc954 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -35,6 +35,8 @@ shadow-4.1.4.3 -> shadow-4.1.5                                        UNRELEASED
 - faillog
   * The -l, -m, -r, -t options only act on the existing users, unless -a is
     specified.
+- gpasswd
+  * Add --root option.
 - groupadd
   * Add --root option.
 - groupdel

diff --git a/man/gpasswd.1.xml b/man/gpasswd.1.xml
index 678f8a26a3c5b613779d661609008c74716df247..f19630a8ff4bb25f7019162fd03a9b354d6c8923 100644 (file)
--- a/man/gpasswd.1.xml
+++ b/man/gpasswd.1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
    Copyright (c) 1996       , Rafal Maszkowski
-   Copyright (c) 2007 - 2009, Nicolas François
+   Copyright (c) 2007 - 2011, Nicolas François
    All rights reserved.
   
    Redistribution and use in source and binary forms, with or without
@@ -157,6 +157,21 @@
        </listitem>
       </varlistentry>
     </variablelist>
+    <variablelist remap='IP'>
+      <varlistentry>
+       <term>
+         <option>-Q</option>, <option>--root</option>
+         <replaceable>CHROOT_DIR</replaceable>
+       </term>
+       <listitem>
+         <para>
+           Apply changes in the <replaceable>CHROOT_DIR</replaceable>
+           directory and use the configuration files from the
+           <replaceable>CHROOT_DIR</replaceable> directory.
+         </para>
+       </listitem>
+      </varlistentry>
+    </variablelist>
     <variablelist remap='IP'>
       <varlistentry>
        <term>

diff --git a/src/gpasswd.c b/src/gpasswd.c
index 0385f3d692370716a071cb6330e9b580c2f36e17..7dd3fae77cf81b8411100ca7ab1595ab74a828a7 100644 (file)
--- a/src/gpasswd.c
+++ b/src/gpasswd.c
@@ -136,6 +136,7 @@ static void usage (int status)
        (void) fputs (_("  -a, --add USER                add USER to GROUP\n"), usageout);
        (void) fputs (_("  -d, --delete USER             remove USER from GROUP\n"), usageout);
        (void) fputs (_("  -h, --help                    display this help message and exit\n"), usageout);
+       (void) fputs (_("  -Q, --root CHROOT_DIR         directory to chroot into\n"), usageout);
        (void) fputs (_("  -r, --remove-password         remove the GROUP's password\n"), usageout);
        (void) fputs (_("  -R, --restrict                restrict access to GROUP to its members\n"), usageout);
        (void) fputs (_("  -M, --members USER,...        set the list of members of GROUP\n"), usageout);
@@ -226,8 +227,7 @@ static void failure (void)
  */
 static void process_flags (int argc, char **argv)
 {
-       int flag;
-       int option_index = 0;
+       int c;
        static struct option long_options[] = {
                {"add", required_argument, NULL, 'a'},
                {"delete", required_argument, NULL, 'd'},
@@ -236,11 +236,13 @@ static void process_flags (int argc, char **argv)
                {"restrict", no_argument, NULL, 'R'},
                {"administrators", required_argument, NULL, 'A'},
                {"members", required_argument, NULL, 'M'},
+               {"root", required_argument, NULL, 'Q'},
                {NULL, 0, NULL, '\0'}
                };
 
-       while ((flag = getopt_long (argc, argv, "a:A:d:ghM:rR", long_options, &option_index)) != -1) {
-               switch (flag) {
+       while ((c = getopt_long (argc, argv, "a:A:d:ghM:Q:rR",
+                                long_options, NULL)) != -1) {
+               switch (c) {
                case 'a':       /* add a user */
                        aflg = true;
                        user = optarg;
@@ -283,6 +285,8 @@ static void process_flags (int argc, char **argv)
                        }
                        Mflg = true;
                        break;
+               case 'Q':       /* no-op, handled in process_root_flag () */
+                       break;
                case 'r':       /* remove group password */
                        rflg = true;
                        break;
@@ -979,6 +983,8 @@ int main (int argc, char **argv)
        setbuf (stdout, NULL);
        setbuf (stderr, NULL);
 
+       process_root_flag ("-Q", argc, argv);
+
 #ifdef SHADOWGRP
        is_shadowgrp = sgr_file_present ();
 #endif