s-s-d: Clarify in help output that --name is one of the required options

Closes: #354999

diff --git a/ChangeLog b/ChangeLog
index 4392d28b823ef5a1b08acacc8e26f8e2cafe24cc..774a5c239e9db74c8c96ece6e5506228281d7eb0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-18  Guillem Jover  <guillem@debian.org>
+
+       * utils/start-stop-daemon.c (do_help): Coalesce mandatory options
+       into a single paragraph, and state that at least one is required.
+
 2008-01-18  Guillem Jover  <guillem@debian.org>
 
        * configure.ac (AC_CHECK_SIZEOF): Quote parameters.

diff --git a/debian/changelog b/debian/changelog
index d69001938b1434a6e4269f9375af849bea0c8139..e2e34093855cb19b10fac2103aca2cc5cd842da6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,8 @@ dpkg (1.14.16) UNRELEASED; urgency=low
   * Additionally check if errno is EEXIST after rmdir(2), as SUSv3 specifies
     that on non-empty directories it can either return that or ENOTEMPTY.
     This fixes run time problems on Solaris.
+  * Fix start-stop-daemon --help output to state that --name is one of the
+    possible required options to use. Closes: #354999
 
   [ Frank Lichtenheld ]
   * Make the -L option of dpkg-parsechangelog actually work (it's

diff --git a/utils/start-stop-daemon.c b/utils/start-stop-daemon.c
index 2fb7574c7bac8e3cd7aa79c4b3949a58f48dfd7c..1fd0e87477d76293a1dafc33bd69ccc6d7c1bc0b 100644 (file)
--- a/utils/start-stop-daemon.c
+++ b/utils/start-stop-daemon.c
@@ -346,15 +346,17 @@ do_help(void)
 "  -H|--help                     print help information\n"
 "  -V|--version                  print version\n"
 "\n"
-"Options (at least one of --exec|--pidfile|--user is required):\n"
-"  -x|--exec <executable>        program to start/check if it is running\n"
+"Mandatory options (at least one is required):\n"
 "  -p|--pidfile <pid-file>       pid file to check\n"
+"  -x|--exec <executable>        program to start/check if it is running\n"
+"  -n|--name <process-name>      stop processes with this name\n"
+"  -u|--user <username|uid>      stop processes owned by this user\n"
+"\n"
+"Options:\n"
+"  -g|--group <group|gid>        run process as this group\n"
 "  -c|--chuid <name|uid[:group|gid]>\n"
 "                                change to this user/group before starting\n"
 "                                  process\n"
-"  -u|--user <username>|<uid>    stop processes owned by this user\n"
-"  -g|--group <group|gid>        run process as this group\n"
-"  -n|--name <process-name>      stop processes with this name\n"
 "  -s|--signal <signal>          signal to send (default TERM)\n"
 "  -a|--startas <pathname>       program to start (default is <executable>)\n"
 "  -r|--chroot <directory>       chroot to <directory> before starting\n"