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

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2008-01-12 21:09:46 +0000 (Sat, 12 Jan 2008)
New Revision: 1720

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/NEWS
   upstream/trunk/man/useradd.8.xml
   upstream/trunk/src/useradd.c
Log:
* NEWS, src/useradd.c: Fix the handling of the --defaults option
  (it required an argument, but should behave as -D)
* NEWS, man/useradd.8.xml: Document the --defaults option, which
  was already described in the useradd's Usage information.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2008-01-12 17:33:09 UTC (rev 1719)
+++ upstream/trunk/ChangeLog	2008-01-12 21:09:46 UTC (rev 1720)
@@ -1,3 +1,10 @@
+2008-01-12  Nicolas François  <nicolas.francois at centraliens.net>
+
+	* NEWS, src/useradd.c: Fix the handling of the --defaults option
+	(it required an argument, but should behave as -D)
+	* NEWS, man/useradd.8.xml: Document the --defaults option, which
+	was already described in the useradd's Usage information.
+
 2008-01-06  Nicolas François  <nicolas.francois at centraliens.net>
 
 	* src/passwd.c: Avoid setting the password to a const empty

Modified: upstream/trunk/NEWS
===================================================================
--- upstream/trunk/NEWS	2008-01-12 17:33:09 UTC (rev 1719)
+++ upstream/trunk/NEWS	2008-01-12 21:09:46 UTC (rev 1720)
@@ -5,6 +5,11 @@
 *** general:
 - packaging
   * Do not install the shadow library per default.
+- adduser
+  * Fix the handling of the --defaults option (it required an argument,
+    but should behave as -D)
+  * Document the --defaults option, which was already described in the
+    useradd's Usage information.
 - chage
   * Fix bug which forbid to set the aging information of an account with a
     passwd entry, but no shadow entry.

Modified: upstream/trunk/man/useradd.8.xml
===================================================================
--- upstream/trunk/man/useradd.8.xml	2008-01-12 17:33:09 UTC (rev 1719)
+++ upstream/trunk/man/useradd.8.xml	2008-01-12 21:09:46 UTC (rev 1720)
@@ -91,7 +91,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-D</option>
+	  <option>-D</option>, <option>--defaults</option>
 	</term>
 	<listitem>
 	  <para>

Modified: upstream/trunk/src/useradd.c
===================================================================
--- upstream/trunk/src/useradd.c	2008-01-12 17:33:09 UTC (rev 1719)
+++ upstream/trunk/src/useradd.c	2008-01-12 21:09:46 UTC (rev 1720)
@@ -932,7 +932,7 @@
 			{"base-dir", required_argument, NULL, 'b'},
 			{"comment", required_argument, NULL, 'c'},
 			{"home-dir", required_argument, NULL, 'd'},
-			{"defaults", required_argument, NULL, 'D'},
+			{"defaults", no_argument, NULL, 'D'},
 			{"expiredate", required_argument, NULL, 'e'},
 			{"inactive", required_argument, NULL, 'f'},
 			{"gid", required_argument, NULL, 'g'},