# HG changeset patch
# User godisch
# Date 1056088009 -3600
# Node ID fbdcd908aa7c1b65b7d7fcf6f3934e9c730a4e8f
# Parent  a7dbefcafc43e8f1b106a5712c94393f92b41f3d
[svn] fixed udpate-inetd

diff -r a7dbefcafc43 -r fbdcd908aa7c debian/postinst
--- a/debian/postinst	Fri Jun 20 06:46:35 2003 +0100
+++ b/debian/postinst	Fri Jun 20 06:46:49 2003 +0100
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: postinst 554 2003-06-19 22:25:30Z godisch $
+# $Id: postinst 559 2003-06-20 05:46:49Z godisch $
 
 set -e
 
@@ -32,8 +32,6 @@
 	mv -f /etc/noffle.conf.old $server_config.old 2> /dev/null || :
 fi
 
-# maybe disabled only, e.g. dpkg -r noffle
-update-inetd --remove "/usr/bin/noffle -r" || :
 if [ -e /usr/share/debconf/confmodule ]; then
 	. /usr/share/debconf/confmodule
 	db_version 2.0
@@ -44,6 +42,8 @@
 		if [ -z "$port" -o "$port" = 119 ]; then
 			port=nntp
 		fi
+		# maybe disabled only, e.g. dpkg -r noffle
+		update-inetd --remove "/usr/bin/noffle -r" || :
 		update-inetd --group MAIL --add "$port\tstream\ttcp\tnowait\tnews\t/usr/sbin/tcpd /usr/bin/noffle -r"
 		db_get noffle/server
 		server="$RET"
@@ -103,7 +103,11 @@
 		cp -f /usr/share/noffle/conf.debian $debian_config.new
 		mv -fb $debian_config.new $debian_config
 	fi
-	update-inetd --group MAIL --add "nntp\tstream\ttcp\tnowait\tnews\t/usr/sbin/tcpd /usr/bin/noffle -r"
+	if ! grep -q "/usr/bin/noffle -r" /etc/inetd.conf; then
+		# just an example, the user need to activate it himself
+		update-inetd --group MAIL --add "nntp\tstream\ttcp\tnowait\tnews\t/usr/sbin/tcpd /usr/bin/noffle -r"
+		update-inetd --disable "$port"
+	fi
 fi
 
 # sanity checks