* 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.

diff --git a/ChangeLog b/ChangeLog
index e6443b7e15bef034960be233f25b2602cc4ba9e2..ff4ea399d2bd92e77f3e089de084bf4c760e94b2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-01-12  Nicolas François  <nicolas.francois@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@centraliens.net>
 
        * src/passwd.c: Avoid setting the password to a const empty

diff --git a/NEWS b/NEWS
index bd07500780fa4095502c6859f76d9cac95407469..03f84b62c121c2ef5145bea4cc02d99209ea5b52 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,11 @@ shadow-4.1.0 -> shadow-4.1.1                                           UNRELEASED
 *** 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.

diff --git a/man/useradd.8.xml b/man/useradd.8.xml
index 99e500cccfc59092720a33fffa7fd98b04cedf0e..12c4cfb808537957e5826dd86013efb609d6d4e3 100644 (file)
--- a/man/useradd.8.xml
+++ b/man/useradd.8.xml
@@ -91,7 +91,7 @@
       </varlistentry>
       <varlistentry>
        <term>
-         <option>-D</option>
+         <option>-D</option>, <option>--defaults</option>
        </term>
        <listitem>
          <para>

diff --git a/src/useradd.c b/src/useradd.c
index 8a856cd9abb2afc4a6fbaab5cd49f42a2131b786..f66f4bc6ec7fcc5968450a020288c2e57d62d6bd 100644 (file)
--- a/src/useradd.c
+++ b/src/useradd.c
@@ -932,7 +932,7 @@ static void process_flags (int argc, char **argv)
                        {"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'},