utils/start-stop-daemon.c: --name is now allowed on the command line

(imported from branch v1_8).

diff --git a/ChangeLog b/ChangeLog
index 21eda2675a1e0822ec78fc540a6190ae4825e086..2041bd45c4a5a773a2fe71e6022b315564b0082e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,15 @@
+=======
 Sat Dec 30 23:08:00 CET 2000 Wichert Akkerman <wakkerma@debian.org>
 
   * doc/Makefile.in: add fr to SUBDIRS
   * doc/fr: new directory with French manpages
   * THANKS: add philippe batailler who translated the manpages to French
 
+Sat Dec 30 20:38:20 CST 2000 Adam Heath <doogie@debian.org>
+  
+  * utils/start-stop-daemon.c: --name is now allowed on the command
+    line.
+
 Fri Dec 29 12:39:09 CST 2000 Adam Heath <doogie@debian.org>
 
   * lib/parse.c: Properly parse control files that only have one

diff --git a/debian/changelog b/debian/changelog
index e317c0ab501bc5544029516cfff7a4f39089149e..6777ba437eecb4253b1c8c404a5994fdcff66bda 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,12 @@ dpkg (1.9.0) unstable; urgency=low
 
  -- Wichert Akkerman <wakkerma@debian.org>  UNRELEASED
 
+dpkg (1.8.1) unstable; urgency=low
+
+  * Make --name a valid option.  Closes: #31206, #51953.
+
+ -- Wichert Akkerman <wakkerma@debian.org>  UNRELEASED
+
 dpkg (1.8.0) unstable; urgency=low
 
   * Add -k|--symlink option to dpkg-name.  Closes: #35040

diff --git a/utils/start-stop-daemon.c b/utils/start-stop-daemon.c
index 067a6b55879f3a3333c3b427a01c5c08c2bc3c84..7906620f8432c152a44c7c2987715fc50515fe5a 100644 (file)
--- a/utils/start-stop-daemon.c
+++ b/utils/start-stop-daemon.c
@@ -348,8 +348,8 @@ parse_options(int argc, char * const *argv)
        if (start == stop)
                badusage("need one of --start or --stop");
 
-       if (!execname && !pidfile && !userspec)
-               badusage("need at least one of --exec, --pidfile or --user");
+       if (!execname && !pidfile && !userspec && !cmdname)
+               badusage("need at least one of --exec, --pidfile, --user or --name");
 
        if (!startas)
                startas = execname;