diff options
| author | Guillem Jover <guillem@debian.org> | 2006-10-23 07:32:43 +0000 |
|---|---|---|
| committer | Guillem Jover <guillem@hadrons.org> | 2010-06-10 23:21:21 +0200 |
| commit | 5ebecf93978ef8f5c033be7cdc2485fce2cb7e51 (patch) | |
| tree | 17cc4d52642c28fe722f5a93dec9dada775ee8ef | |
| parent | 9a7e35322d83dffa31feaeca5f9b2c069e032ade (diff) | |
| download | inetutils-5ebecf93978ef8f5c033be7cdc2485fce2cb7e51.tar.gz | |
Disable syslogd forwarding by default
Which was enabling inet connections.
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/inetutils-syslogd.dirs | 1 | ||||
| -rw-r--r-- | debian/inetutils-syslogd.init | 7 | ||||
| -rwxr-xr-x | debian/rules | 3 |
4 files changed, 11 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index aca2fb8..7d49fbb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ inetutils (2:1.5.dfsg.1-1) UNRELEASED; urgency=low - debian/patches/11_inetd_doc.patch: Remove. Merged upstream. * Do not Build-Depend on texinfo anymore, there's not info docs anymore. * Enable telnet authentication ShiShi support. (Closes: #300282) + * Disable syslogd forwarding by default, which was enabling inet + connections. * Fix Jeff Bailey's email address. -- Guillem Jover <guillem@debian.org> Thu, 5 Oct 2006 01:02:39 +0300 diff --git a/debian/inetutils-syslogd.dirs b/debian/inetutils-syslogd.dirs index e9faee6..ec5210c 100644 --- a/debian/inetutils-syslogd.dirs +++ b/debian/inetutils-syslogd.dirs @@ -1 +1,2 @@ +/etc/default /var/log/news diff --git a/debian/inetutils-syslogd.init b/debian/inetutils-syslogd.init index 90210d9..f57cbcb 100644 --- a/debian/inetutils-syslogd.init +++ b/debian/inetutils-syslogd.init @@ -11,6 +11,7 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin DAEMON=/usr/sbin/syslogd NAME=syslogd +CONFIGFILE=/etc/default/syslogd PIDFILE=/var/run/syslog.pid DESC="system log daemon" @@ -20,6 +21,8 @@ set -e . /lib/lsb/init-functions +test -r $CONFIGFILE && . $CONFIGFILE + # Create a xconsole pipe if it does not exist. # Don't create it if Linux's devfs is used, and symlink it on kFreeBSD as it # does not allow pipes on /dev. @@ -45,7 +48,7 @@ case "$1" in start) log_daemon_msg "Starting $DESC" "$NAME" start-stop-daemon --start --quiet --oknodo --pidfile $PIDFILE \ - --exec $DAEMON + --exec $DAEMON -- $SYSLOGD_OPTS log_end_msg $? ;; stop) @@ -66,7 +69,7 @@ case "$1" in --exec $DAEMON sleep 1 start-stop-daemon --start --quiet --pidfile $PIDFILE \ - --exec $DAEMON + --exec $DAEMON -- $SYSLOGD_OPTS log_end_msg $? ;; *) diff --git a/debian/rules b/debian/rules index e7a5235..9407f41 100755 --- a/debian/rules +++ b/debian/rules @@ -121,6 +121,9 @@ binary-arch: install mv $(D)/usr/bin/ping6 \ $(CURDIR)/debian/inetutils-ping/bin/; \ fi + # Install the syslogd default file + cp $(CURDIR)/debian/inetutils-syslogd.default \ + $(CURDIR)/debian/inetutils-syslogd/etc/default/syslogd # This should be in some dh_installoverrides cp $(CURDIR)/debian/inetutils-ping.overrides \ $(CURDIR)/debian/inetutils-ping/usr/share/lintian/overrides/inetutils-ping |