[Pkg-shadow-commits] r3547 - in upstream/trunk: . man src

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2011-11-06 18:38:39 +0000 (Sun, 06 Nov 2011)
New Revision: 3547

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/NEWS
   upstream/trunk/man/gpasswd.1.xml
   upstream/trunk/src/gpasswd.c
Log:
	* NEWS, src/gpasswd.c, man/gpasswd.1.xml: Add --root option.
	* src/gpasswd.c: The getopt index of long options is not used.

Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2011-11-06 18:38:32 UTC (rev 3546)
+++ upstream/trunk/ChangeLog	2011-11-06 18:38:39 UTC (rev 3547)
@@ -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 at centraliens.net>
 

Modified: upstream/trunk/NEWS
===================================================================
--- upstream/trunk/NEWS	2011-11-06 18:38:32 UTC (rev 3546)
+++ upstream/trunk/NEWS	2011-11-06 18:38:39 UTC (rev 3547)
@@ -35,6 +35,8 @@
 - 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

Modified: upstream/trunk/man/gpasswd.1.xml
===================================================================
--- upstream/trunk/man/gpasswd.1.xml	2011-11-06 18:38:32 UTC (rev 3546)
+++ upstream/trunk/man/gpasswd.1.xml	2011-11-06 18:38:39 UTC (rev 3547)
@@ -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
@@ -160,6 +160,21 @@
     <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>
 	  <option>-r</option>, <option>--remove-password</option>
 	</term>
 	<listitem>

Modified: upstream/trunk/src/gpasswd.c
===================================================================
--- upstream/trunk/src/gpasswd.c	2011-11-06 18:38:32 UTC (rev 3546)
+++ upstream/trunk/src/gpasswd.c	2011-11-06 18:38:39 UTC (rev 3547)
@@ -136,6 +136,7 @@
 	(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 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 @@
 		{"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 @@
 			}
 			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 @@
 	setbuf (stdout, NULL);
 	setbuf (stderr, NULL);
 
+	process_root_flag ("-Q", argc, argv);
+
 #ifdef SHADOWGRP
 	is_shadowgrp = sgr_file_present ();
 #endif