diff options
| author | Guillem Jover <guillem@hadrons.org> | 2010-09-08 04:26:09 +0200 |
|---|---|---|
| committer | Guillem Jover <guillem@hadrons.org> | 2010-09-12 16:29:14 +0200 |
| commit | a9bb251258c44e60035a5918576b9f48e6a3b0a7 (patch) | |
| tree | 832abfdfda5d99d369e1a9ab76ca7e20da76b827 | |
| parent | 8ac71e4137660c38d63c71b335c95b096f7b0756 (diff) | |
| download | inetutils-a9bb251258c44e60035a5918576b9f48e6a3b0a7.tar.gz | |
Make inetd listen on ports when enabling tcpmux services
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/patches/61_inetd_listen_on_tcpmux_ports.patch | 40 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 42 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 0011f72..9c770b9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -33,6 +33,7 @@ inetutils (2:1.8-1) UNRELEASED; urgency=low * Remove obsolete and unused libopie-dev Build-Depends. * Do not segfault in inetd when a service does not have any argument. (Closes: #515070, #590128) + * Make inetd listen on ports when enabling tcpmux services. -- Guillem Jover <guillem@debian.org> Tue, 08 Jun 2010 21:16:04 +0200 diff --git a/debian/patches/61_inetd_listen_on_tcpmux_ports.patch b/debian/patches/61_inetd_listen_on_tcpmux_ports.patch new file mode 100644 index 0000000..68e4a32 --- /dev/null +++ b/debian/patches/61_inetd_listen_on_tcpmux_ports.patch @@ -0,0 +1,40 @@ +From 929968ce1e0a5a72d929982e00e68a09b9a996c3 Mon Sep 17 00:00:00 2001 +From: Guillem Jover <guillem@hadrons.org> +Date: Mon, 6 Sep 2010 09:00:58 +0200 +Subject: [PATCH] inetd: Listen on ports for tcpmux services + +* src/inetd.c (nextconfig): Call expand_enter instead of enter for +tcpmux services. +(fix_tcpmux): Likewise. +--- + src/inetd.c | 6 ++---- + 1 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/src/inetd.c b/src/inetd.c +index 354ae1d..1c51a51 100644 +--- a/src/inetd.c ++++ b/src/inetd.c +@@ -1161,10 +1161,8 @@ nextconfig (const char *file) + { + sep->se_fd = -1; + sep->se_checked = 1; +- enter (sep); + } +- else +- expand_enter (sep); ++ expand_enter (sep); + freeconfig (sep); + } + endconfig (fconfig); +@@ -1249,7 +1247,7 @@ fix_tcpmux (void) + if (debug) + fprintf (stderr, "inserting default tcpmux entry\n"); + syslog (LOG_INFO, "inserting default tcpmux entry"); +- enter (&serv); ++ expand_enter (&serv); + } + } + +-- +1.7.1 + diff --git a/debian/patches/series b/debian/patches/series index 9ea855d..aea1f5e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -8,3 +8,4 @@ 53_man_inetd_max_conn.patch 54_man_fixes.patch 60_inetd_support_argless_services.patch +61_inetd_listen_on_tcpmux_ports.patch |