From b082ebead2c4679aa1ed977556b8729b69159e79 Mon Sep 17 00:00:00 2001 From: nekral-guest Date: Sat, 12 Jan 2008 21:09:46 +0000 Subject: [PATCH] * 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. --- ChangeLog | 7 +++++++ NEWS | 5 +++++ man/useradd.8.xml | 2 +- src/useradd.c | 2 +- 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e6443b7e..ff4ea399 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-01-12 Nicolas François + + * 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 * src/passwd.c: Avoid setting the password to a const empty diff --git a/NEWS b/NEWS index bd075007..03f84b62 100644 --- 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 99e500cc..12c4cfb8 100644 --- a/man/useradd.8.xml +++ b/man/useradd.8.xml @@ -91,7 +91,7 @@ - + , diff --git a/src/useradd.c b/src/useradd.c index 8a856cd9..f66f4bc6 100644 --- 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'},