Bug#510406: update-inetd: Fails to remove disabled services

[Serafeim Zanikolas]

tags 510406 confirmed
tags 510406 patch
thanks

DebianNet:remove_service() fails to match commented-out entries. See attached
patch for a fix.

-- 
debtags-organised WNPP bugs: members.hellug.gr/serzan/wnpp

--- a/DebianNet.pm
+++ b/DebianNet.pm
@@ -131,7 +131,8 @@ sub remove_service {
          return(-1);
     }
 
-    if ((&scan_entries("$service") > 1) and (not defined($multi))) {
+    if (((&scan_entries("$service") > 1) or (&scan_entries("$sep$service") > 1))
+            and (not defined($multi))) {
 	set("update-inetd/ask-remove-entries", "false");
 	fset("update-inetd/ask-remove-entries", "seen", "false");
         settitle("update-inetd/title");
@@ -149,7 +150,7 @@ sub remove_service {
     open(ICREAD, "$inetdcf");
     RLOOP: while(<ICREAD>) {
         chomp;
-        unless (/^$service\s+/) {
+        unless (/^$service\s+/ or /^$sep$service\s+/) {
             print ICWRITE "$_\n";
         } else {
             &printv("Removing line: \`$_'\n");