From MAILER-DAEMON Sat Dec 04 04:05:59 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1POo47-00031n-Bk
	for mharc-commit-inetutils@gnu.org; Sat, 04 Dec 2010 04:05:59 -0500
Received: from [140.186.70.92] (port=36100 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1POo44-0002xY-Bq
	for commit-inetutils@gnu.org; Sat, 04 Dec 2010 04:05:57 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1POo42-0007mN-Mo
	for commit-inetutils@gnu.org; Sat, 04 Dec 2010 04:05:56 -0500
Received: from colonialone.fsf.org ([140.186.70.51]:45793
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1POo42-0007mI-L9
	for commit-inetutils@gnu.org; Sat, 04 Dec 2010 04:05:54 -0500
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <simon@josefsson.org>) id 1POo4F-0008SB-A5
	for commit-inetutils@gnu.org; Sat, 04 Dec 2010 09:06:07 +0000
Received: from jas by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <jas@savannah.gnu.org>) id 1POo4F-0005XT-4F
	for commit-inetutils@gnu.org; Sat, 04 Dec 2010 09:06:07 +0000
To: commit-inetutils@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 4543b88b71d4598a3c9e49d44c59ab5ae54c4848
X-Git-Newrev: 17819c31287e09170f7f8ac81987078f35175b1a
Message-Id: <E1POo4F-0005XT-4F@vcs-noshell.in.savannah.gnu.org>
From: Simon Josefsson <simon@josefsson.org>
Date: Sat, 04 Dec 2010 09:06:07 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-72-g17819c3
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
	<commit-inetutils.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 04 Dec 2010 09:05:57 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
       via  17819c31287e09170f7f8ac81987078f35175b1a (commit)
       via  f8e234b23ae3296d34f943290a9feacdab1ea33a (commit)
       via  6e41c83785f48dcfc1937015e01e3a3e4884dad0 (commit)
      from  4543b88b71d4598a3c9e49d44c59ab5ae54c4848 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=17819c31287e09170f7f8ac81987078f35175b1a


commit 17819c31287e09170f7f8ac81987078f35175b1a
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Mon Nov 22 16:54:34 2010 +0100

    traceroute: Make immune against `RES_OPTIONS=inet6'.
    
    Signed-off-by: Simon Josefsson <simon@josefsson.org>

diff --git a/ChangeLog b/ChangeLog
index bf7ab0b..e5eebd9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2010-11-22  Mats Erik Andersson <gnu@gisladisker.se>
 
+	* src/traceroute.c: Include "xalloc.h".
+	* src/traceroute.c (host): Deleted variable.
+	(hostname, addrstr): New variables;
+	(parse_opt) [ARGP_KEY_ARG]: Abolish gethostbyname. Only use
+	xstrdup to copy argument.
+	(main): Use getaddrinfo and getnameinfo for name resolving.
+	New variables HINTS and *RES of type `struct addrinfo'.
+
+2010-11-22  Mats Erik Andersson <gnu@gisladisker.se>
+
 	Resolve a double free issue.  Leads to segmentation faults.
 
 	* src/inetd.c (nextconfig): Do not use `freeconfig' unconditionally.
diff --git a/src/traceroute.c b/src/traceroute.c
index 432e6e1..9caeb00 100644
--- a/src/traceroute.c
+++ b/src/traceroute.c
@@ -47,6 +47,7 @@
 #include <argp.h>
 #include <icmp.h>
 
+#include "xalloc.h"
 #include "libinetutils.h"
 
 #define TRACE_UDP_PORT 33434
@@ -87,7 +88,8 @@ char *get_hostname (struct in_addr *addr);
 
 int stop = 0;
 int pid = 0;
-struct hostent *host;
+static char *hostname = NULL;
+char addrstr[INET6_ADDRSTRLEN];
 struct sockaddr_in dest;
 
 static enum trace_type opt_type = TRACE_ICMP;
@@ -158,9 +160,7 @@ parse_opt (int key, char *arg, struct argp_state *state)
 
     case ARGP_KEY_ARG:
       host_is_given = true;
-      host = gethostbyname (arg);
-      if (host == NULL)
-        error (EXIT_FAILURE, 0, "unknown host");
+      hostname = xstrdup(arg);
       break;
 
     case ARGP_KEY_SUCCESS:
@@ -180,6 +180,7 @@ static struct argp argp = {argp_options, parse_opt, args_doc, doc};
 int
 main (int argc, char **argv)
 {
+  struct addrinfo hints, *res;
   trace_t trace;
 
   set_program_name (argv[0]);
@@ -188,15 +189,28 @@ main (int argc, char **argv)
   iu_argp_init ("traceroute", program_authors);
   argp_parse (&argp, argc, argv, 0, NULL, NULL);
 
+  /* Hostname lookup first for better information */
+  memset (&hints, 0, sizeof (hints));
+  hints.ai_family = AF_INET;
+  hints.ai_flags = AI_CANONNAME;
+
+  if ((hostname == NULL) || (*hostname == '\0')
+      || getaddrinfo (hostname, NULL, &hints, &res))
+    error (EXIT_FAILURE, 0, "unknown host");
+
   if (geteuid () != 0)
     error (EXIT_FAILURE, EPERM, "insufficient permissions");
 
-  dest.sin_addr = *(struct in_addr *) host->h_addr;
-  dest.sin_family = AF_INET;
+  memcpy (&dest, res->ai_addr, res->ai_addrlen);
   dest.sin_port = htons (opt_port);
 
+  getnameinfo (res->ai_addr, res->ai_addrlen, addrstr, sizeof (addrstr),
+                  NULL, 0, NI_NUMERICHOST);
+
   printf ("traceroute to %s (%s), %d hops max\n",
-	  host->h_name, inet_ntoa (dest.sin_addr), opt_max_hops);
+	  res->ai_canonname, addrstr, opt_max_hops);
+
+  freeaddrinfo (res);
 
   trace_init (&trace, dest, opt_type);
 

http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=f8e234b23ae3296d34f943290a9feacdab1ea33a


commit f8e234b23ae3296d34f943290a9feacdab1ea33a
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Mon Nov 22 15:55:16 2010 +0100

    inetd: Registration of services with multiple nodes.
    
    Signed-off-by: Simon Josefsson <simon@josefsson.org>

diff --git a/ChangeLog b/ChangeLog
index 05b7e56..bf7ab0b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2010-11-22  Mats Erik Andersson <gnu@gisladisker.se>
 
+	Resolve a double free issue.  Leads to segmentation faults.
+
+	* src/inetd.c (nextconfig): Do not use `freeconfig' unconditionally.
+	Condition on SERV_NODE, which needs partial memory deallocation.
+
+2010-11-22  Mats Erik Andersson <gnu@gisladisker.se>
+
 	Partially revert changes introduced in fd64a202.
 
 	* src/inetd.c (nextconfig): Call `enter' for TCPMUX services,
diff --git a/src/inetd.c b/src/inetd.c
index 1af29d4..c3cec04 100644
--- a/src/inetd.c
+++ b/src/inetd.c
@@ -1168,7 +1168,10 @@ nextconfig (const char *file)
       else
 	expand_enter (sep);
 
-      freeconfig (sep);
+      if (serv_node)
+	free (sep->se_node);
+      else
+	freeconfig (sep);
     }
   endconfig (fconfig);
   /*

http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=6e41c83785f48dcfc1937015e01e3a3e4884dad0


commit 6e41c83785f48dcfc1937015e01e3a3e4884dad0
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Mon Nov 22 15:43:53 2010 +0100

    inetd: Distinct service registration for TCPMUX.
    
    Signed-off-by: Simon Josefsson <simon@josefsson.org>

diff --git a/ChangeLog b/ChangeLog
index daf9708..05b7e56 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2010-11-22  Mats Erik Andersson <gnu@gisladisker.se>
 
+	Partially revert changes introduced in fd64a202.
+
+	* src/inetd.c (nextconfig): Call `enter' for TCPMUX services,
+	but `expand_enter' for every other service.
+
+2010-11-22  Mats Erik Andersson <gnu@gisladisker.se>
+
 	* src/inetd.c (inetd_getaddrinfo): Do not use AI_V4MAPPED with
 	address family AF_INET.  FreeBSD fails otherwise.
 
diff --git a/src/inetd.c b/src/inetd.c
index ce7592e..1af29d4 100644
--- a/src/inetd.c
+++ b/src/inetd.c
@@ -1163,8 +1163,11 @@ nextconfig (const char *file)
 	{
 	  sep->se_fd = -1;
 	  sep->se_checked = 1;
+	  enter (sep);
 	}
-      expand_enter (sep);
+      else
+	expand_enter (sep);
+
       freeconfig (sep);
     }
   endconfig (fconfig);

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog        |   24 ++++++++++++++++++++++++
 src/inetd.c      |   10 ++++++++--
 src/traceroute.c |   28 +++++++++++++++++++++-------
 3 files changed, 53 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Sat Dec 04 04:08:50 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1POo6s-00048D-76
	for mharc-commit-inetutils@gnu.org; Sat, 04 Dec 2010 04:08:50 -0500
Received: from [140.186.70.92] (port=46748 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1POo6p-00047q-FT
	for commit-inetutils@gnu.org; Sat, 04 Dec 2010 04:08:48 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1POo6n-0008Mf-UO
	for commit-inetutils@gnu.org; Sat, 04 Dec 2010 04:08:47 -0500
Received: from colonialone.fsf.org ([140.186.70.51]:45794
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1POo6n-0008MY-Pn
	for commit-inetutils@gnu.org; Sat, 04 Dec 2010 04:08:45 -0500
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <simon@josefsson.org>) id 1POo70-0008Sj-D9
	for commit-inetutils@gnu.org; Sat, 04 Dec 2010 09:08:58 +0000
Received: from jas by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <jas@savannah.gnu.org>) id 1POo70-0005gZ-89
	for commit-inetutils@gnu.org; Sat, 04 Dec 2010 09:08:58 +0000
To: commit-inetutils@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 17819c31287e09170f7f8ac81987078f35175b1a
X-Git-Newrev: 0d25bc27e33926f8794fd823f5ebea54d16c3084
Message-Id: <E1POo70-0005gZ-89@vcs-noshell.in.savannah.gnu.org>
From: Simon Josefsson <simon@josefsson.org>
Date: Sat, 04 Dec 2010 09:08:58 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-73-g0d25bc2
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
	<commit-inetutils.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 04 Dec 2010 09:08:48 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
       via  0d25bc27e33926f8794fd823f5ebea54d16c3084 (commit)
      from  17819c31287e09170f7f8ac81987078f35175b1a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=0d25bc27e33926f8794fd823f5ebea54d16c3084


commit 0d25bc27e33926f8794fd823f5ebea54d16c3084
Author: Mike Frysinger <vapier@gentoo.org>
Date:   Fri Dec 3 16:12:01 2010 -0500

    man: fix install of section 8 pages
    
    Using dist_man1_MANS automatically renames all pages to foo.1 and installs
    them into man1.  So for all the section 8 pages (e.g. ftpd.8), they get
    installed into the wrong location (e.g. man1/ftpd.1).  So use the common
    dist_man_MANS var to let automake figure out the right place based on the
    suffix of the man page.
    
    Signed-off-by: Mike Frysinger <vapier@gentoo.org>
    Signed-off-by: Simon Josefsson <simon@josefsson.org>

diff --git a/ChangeLog b/ChangeLog
index e5eebd9..b8e5b12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-12-04  Mike Frysinger <vapier@gentoo.org>  (tiny change)
+
+	* man/Makefile.am (dist_man1_MANS): Renamed to dist_man_MANS.
+
 2010-11-22  Mats Erik Andersson <gnu@gisladisker.se>
 
 	* src/traceroute.c: Include "xalloc.h".
diff --git a/man/Makefile.am b/man/Makefile.am
index 1afd843..727a5e0 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -21,106 +21,106 @@ all = hostname.1 ifconfig.1 inetd.8 ftp.1 ftpd.8 logger.1 ping.1	\
       syslogd.8 talk.1 talkd.8 telnet.1 telnetd.8 tftp.1 tftpd.8	\
       traceroute.1 uucpd.8 whois.1
 
-dist_man1_MANS =
+dist_man_MANS =
 
 if ENABLE_hostname
-dist_man1_MANS += hostname.1
+dist_man_MANS += hostname.1
 endif
 
 if ENABLE_ifconfig
-dist_man1_MANS += ifconfig.1
+dist_man_MANS += ifconfig.1
 endif
 
 if ENABLE_inetd
-dist_man1_MANS += inetd.8
+dist_man_MANS += inetd.8
 endif
 
 if ENABLE_ftp
-dist_man1_MANS += ftp.1
+dist_man_MANS += ftp.1
 endif
 
 if ENABLE_ftpd
-dist_man1_MANS += ftpd.8
+dist_man_MANS += ftpd.8
 endif
 
 if ENABLE_logger
-dist_man1_MANS += logger.1
+dist_man_MANS += logger.1
 endif
 
 if ENABLE_ping
-dist_man1_MANS += ping.1
+dist_man_MANS += ping.1
 endif
 
 if ENABLE_ping6
-dist_man1_MANS += ping6.1
+dist_man_MANS += ping6.1
 endif
 
 if ENABLE_rcp
-dist_man1_MANS += rcp.1
+dist_man_MANS += rcp.1
 endif
 
 if ENABLE_rexec
-dist_man1_MANS += rexec.1
+dist_man_MANS += rexec.1
 endif
 
 if ENABLE_rexecd
-dist_man1_MANS += rexecd.8
+dist_man_MANS += rexecd.8
 endif
 
 if ENABLE_rlogin
-dist_man1_MANS += rlogin.1
+dist_man_MANS += rlogin.1
 endif
 
 if ENABLE_rlogind
-dist_man1_MANS += rlogind.8
+dist_man_MANS += rlogind.8
 endif
 
 if ENABLE_rsh
-dist_man1_MANS += rsh.1
+dist_man_MANS += rsh.1
 endif
 
 if ENABLE_rshd
-dist_man1_MANS += rshd.8
+dist_man_MANS += rshd.8
 endif
 
 if ENABLE_syslogd
-dist_man1_MANS += syslogd.8
+dist_man_MANS += syslogd.8
 endif
 
 if ENABLE_talk
-dist_man1_MANS += talk.1
+dist_man_MANS += talk.1
 endif
 
 if ENABLE_talkd
-dist_man1_MANS += talkd.8
+dist_man_MANS += talkd.8
 endif
 
 if ENABLE_telnet
-dist_man1_MANS += telnet.1
+dist_man_MANS += telnet.1
 endif
 
 if ENABLE_telnetd
-dist_man1_MANS += telnetd.8
+dist_man_MANS += telnetd.8
 endif
 
 if ENABLE_tftp
-dist_man1_MANS += tftp.1
+dist_man_MANS += tftp.1
 endif
 
 if ENABLE_tftpd
-dist_man1_MANS += tftpd.8
+dist_man_MANS += tftpd.8
 endif
 
 if ENABLE_traceroute
-dist_man1_MANS += traceroute.1
+dist_man_MANS += traceroute.1
 endif
 
 if ENABLE_uucpd
-dist_man1_MANS += uucpd.8
+dist_man_MANS += uucpd.8
 endif
 
 if ENABLE_whois
-dist_man1_MANS += whois.1
+dist_man_MANS += whois.1
 endif
 
 EXTRA_DIST = $(all) $(all:.1=.h2m) $(all:.8=.h2m)

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog       |    4 ++++
 man/Makefile.am |   52 ++++++++++++++++++++++++++--------------------------
 2 files changed, 30 insertions(+), 26 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Tue Dec 21 11:33:58 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1PV59y-0003Gh-Dy
	for mharc-commit-inetutils@gnu.org; Tue, 21 Dec 2010 11:33:58 -0500
Received: from [140.186.70.92] (port=60658 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1PV59u-0003F2-Qz
	for commit-inetutils@gnu.org; Tue, 21 Dec 2010 11:33:56 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1PV59s-0007D8-RR
	for commit-inetutils@gnu.org; Tue, 21 Dec 2010 11:33:54 -0500
Received: from colonialone.fsf.org ([140.186.70.51]:59316
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1PV59s-0007D4-Nw
	for commit-inetutils@gnu.org; Tue, 21 Dec 2010 11:33:52 -0500
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gnu@gisladisker.se>) id 1PV59z-00078E-2W
	for commit-inetutils@gnu.org; Tue, 21 Dec 2010 16:33:59 +0000
Received: from meand by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <meand@savannah.gnu.org>) id 1PV59y-0008UO-Vl
	for commit-inetutils@gnu.org; Tue, 21 Dec 2010 16:33:59 +0000
To: commit-inetutils@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 0d25bc27e33926f8794fd823f5ebea54d16c3084
X-Git-Newrev: 3954dfe0534fe9f7394abe5f71794b28fdfa1c94
Message-Id: <E1PV59y-0008UO-Vl@vcs-noshell.in.savannah.gnu.org>
From: Mats Erik Andersson <gnu@gisladisker.se>
Date: Tue, 21 Dec 2010 16:33:58 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-78-g3954dfe
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
	<commit-inetutils.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Dec 2010 16:33:56 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
       via  3954dfe0534fe9f7394abe5f71794b28fdfa1c94 (commit)
       via  674b822746eb05faf72142a4b4bad1be41315b74 (commit)
       via  87657d8463be936fa813ca970064bb442c8a69ee (commit)
       via  202092b67d010d5d7b259bcf8b452052c6814b69 (commit)
       via  791329d9b2cf8c5237939782a0d6aae4adfa0487 (commit)
      from  0d25bc27e33926f8794fd823f5ebea54d16c3084 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=3954dfe0534fe9f7394abe5f71794b28fdfa1c94


commit 3954dfe0534fe9f7394abe5f71794b28fdfa1c94
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Tue Dec 21 16:08:11 2010 +0100

    inetd: Replaceable path for PID file.

diff --git a/ChangeLog b/ChangeLog
index fe1e866..47d34e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2010-12-21  Mats Erik Andersson <gnu@gisladisker.se>
 
+	* src/inetd.c (pidfile_option): New variable.
+	(pid_file): New variable.
+	(argp_options): Add an option for replacing path of PID file.
+	(parse_opt): Handle option `p'.
+	(main): Condition PID file use on PIDFILE_OPTION. Replace the
+	macro PATH_INETDPID by variable PID_FILE.
+
+2010-12-21  Mats Erik Andersson <gnu@gisladisker.se>
+
 	* src/inetd.c (inetd_getaddrinfo): If IPV6, then add a flag
 	AI_NUMERICHOST if the node is a numeric address string.
 	New variable NUMERIC_ADDRESS.  Debug symbolic addresses.
diff --git a/src/inetd.c b/src/inetd.c
index 3d87867..8d2a915 100644
--- a/src/inetd.c
+++ b/src/inetd.c
@@ -163,6 +163,8 @@ char **config_files;
 
 static bool env_option = false;	       /* Set environment variables */
 static bool resolve_option = false;    /* Resolve IP addresses */
+static bool pidfile_option = true;     /* Record the PID in a file */
+static const char *pid_file = PATH_INETDPID;
 
 const char args_doc[] = "[CONF-FILE [CONF-DIR]]...";
 const char doc[] = "Internet super-server.";
@@ -185,6 +187,9 @@ static struct argp_option argp_options[] = {
    "turn on debugging, run in foreground mode", GRP+1},
   {"environment", OPT_ENVIRON, NULL, 0,
    "pass local and remote socket information in environment variables", GRP+1},
+  { "pidfile", 'p', "PIDFILE", OPTION_ARG_OPTIONAL,
+    "replace the default path \"" PATH_INETDPID "\"",
+    GRP+1 },
   {"rate", 'R', "NUMBER", 0,
    "maximum invocation rate (per minute)", GRP+1},
   {"resolve", OPT_RESOLVE, NULL, 0,
@@ -211,6 +216,13 @@ parse_opt (int key, char *arg, struct argp_state *state)
       env_option = true;
       break;
 
+    case 'p':
+      if (arg && strlen (arg))
+	pid_file = arg;
+      else
+	pidfile_option = false;
+      break;
+
     case 'R':
       number = strtol (arg, &p, 0);
       if (number < 1 || *p)
@@ -1859,15 +1871,18 @@ main (int argc, char *argv[], char *envp[])
 
   openlog ("inetd", LOG_PID | LOG_NOWAIT, LOG_DAEMON);
 
+  if (pidfile_option)
   {
-    FILE *fp = fopen (PATH_INETDPID, "w");
+    FILE *fp = fopen (pid_file, "w");
     if (fp != NULL)
       {
+	if (debug)
+	  fprintf(stderr, "Using pid-file at \"%s\".\n", pid_file);
 	fprintf (fp, "%d\n", getpid ());
 	fclose (fp);
       }
     else
-      syslog (LOG_CRIT, "can't open %s: %s\n", PATH_INETDPID,
+      syslog (LOG_CRIT, "can't open %s: %s\n", pid_file,
 	      strerror (errno));
   }
 

http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=674b822746eb05faf72142a4b4bad1be41315b74


commit 674b822746eb05faf72142a4b4bad1be41315b74
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Tue Dec 21 16:04:50 2010 +0100

    inetd: Adapt service nodes to IPv6.

diff --git a/ChangeLog b/ChangeLog
index d326942..fe1e866 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2010-12-21  Mats Erik Andersson <gnu@gisladisker.se>
 
+	* src/inetd.c (inetd_getaddrinfo): If IPV6, then add a flag
+	AI_NUMERICHOST if the node is a numeric address string.
+	New variable NUMERIC_ADDRESS.  Debug symbolic addresses.
+	(getconfigent): Replace `strchr' with `strrchr'.
+
+2010-12-21  Mats Erik Andersson <gnu@gisladisker.se>
+
 	* src/inetd.c (print_service): If `ISMUX(SEP)' then present the
 	node name as `tcpmux' or as `tcpmuxplus'.  Make 'builtin=' show
 	actual service name, or `no' for non-builtins.
diff --git a/src/inetd.c b/src/inetd.c
index 7f7adbb..3d87867 100644
--- a/src/inetd.c
+++ b/src/inetd.c
@@ -737,10 +737,33 @@ enter (struct servtab *cp)
   return sep;
 }
 
+#define IPV4_NUMCHARS ".0123456789"
+#define IPV6_NUMCHARS ".:0123456789abcdefABCDEF"
+
 int
 inetd_getaddrinfo (struct servtab *sep, int proto, struct addrinfo **result)
 {
   struct addrinfo hints;
+#ifdef IPV6
+  bool numeric_address = false;
+
+  /* In case a numerical address is supplied, which does not
+     apply to the indicated domain, a non-local resolver
+     will wait in vain until time out occurs, thus blocking.
+     Avoid this by falling back to numerical host resolving
+     when address string seems to be numerical.  */
+
+  /* Purely numeric address?  Separate criteria for IPv4 and IPv6,
+     since IPv6 allows hexadecimal coding and IPv4 mapping!  */
+  if (sep->se_node
+      && (strspn (sep->se_node, IPV4_NUMCHARS) == strlen (sep->se_node)
+	  || (strchr (sep->se_node, ':')
+	      && strspn (sep->se_node, IPV6_NUMCHARS)) ) )
+    numeric_address = true;
+  else
+    if (debug && sep->se_node)
+      fprintf (stderr, "Resolving address: %s\n", sep->se_node);
+#endif /* IPV6 */
 
   memset (&hints, 0, sizeof (hints));
 
@@ -749,6 +772,10 @@ inetd_getaddrinfo (struct servtab *sep, int proto, struct addrinfo **result)
   if (sep->se_v4mapped && (sep->se_family != AF_INET))
     hints.ai_flags |= AI_V4MAPPED;
 #endif
+#ifdef IPV6
+  if (numeric_address)
+    hints.ai_flags |= AI_NUMERICHOST;
+#endif
   hints.ai_family = sep->se_family;
   hints.ai_socktype = sep->se_socktype;
   hints.ai_protocol = proto;
@@ -944,7 +971,7 @@ getconfigent (FILE *fconfig, const char *file, size_t *line)
       sep->se_line = *line;
 
       node = argv[INETD_SERVICE];
-      service = strchr (node, ':');
+      service = strrchr (node, ':');
       if (!service)
         {
 	  if (global_serv_node)

http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=87657d8463be936fa813ca970064bb442c8a69ee


commit 87657d8463be936fa813ca970064bb442c8a69ee
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Tue Dec 21 15:57:25 2010 +0100

    inetd: Improve printout of service changes.

diff --git a/ChangeLog b/ChangeLog
index ed27d79..d326942 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2010-12-21  Mats Erik Andersson <gnu@gisladisker.se>
 
+	* src/inetd.c (print_service): If `ISMUX(SEP)' then present the
+	node name as `tcpmux' or as `tcpmuxplus'.  Make 'builtin=' show
+	actual service name, or `no' for non-builtins.
+	(fix_tcpmux): Let SERV.se_file report `fix_tcpmux' as origin.
+	Correct some spelling mistakes in error message.
+
+2010-12-21  Mats Erik Andersson <gnu@gisladisker.se>
+
 	* tests/addrpeek.c: New file.
 	* tests/Makefile.am: Register `addrpeek' using
 	`check_PROGRAMS', but conditioned on `ENABLE_inetd'.
diff --git a/src/inetd.c b/src/inetd.c
index 625ebff..7f7adbb 100644
--- a/src/inetd.c
+++ b/src/inetd.c
@@ -523,12 +523,15 @@ void
 print_service (const char *action, struct servtab *sep)
 {
   fprintf (stderr,
-	   "%s:%d: %s: %s:%s proto=%s, wait=%d, max=%u, user=%s builtin=%lx server=%s\n",
+	   "%s:%d: %s: %s:%s proto=%s, wait=%d, max=%u, user=%s builtin=%s server=%s\n",
 	   sep->se_file, sep->se_line,
 	   action,
-	   sep->se_node ? sep->se_node : "*", sep->se_service, sep->se_proto,
+	   ISMUX (sep) ? (ISMUXPLUS (sep) ? "tcpmuxplus" : "tcpmux")
+		      : (sep->se_node ? sep->se_node : "*"),
+	   sep->se_service, sep->se_proto,
 	   sep->se_wait, sep->se_max, sep->se_user,
-	   (long) sep->se_bi, sep->se_server);
+	   sep->se_bi ? sep->se_bi->bi_service : "no",
+	   sep->se_server);
 }
 
 
@@ -1227,6 +1230,7 @@ fix_tcpmux (void)
       struct servtab serv;
       memset (&serv, 0, sizeof (serv));
 
+      serv.se_file = "fix_tcpmux";
       serv.se_service = newstr ("tcpmux");
       serv.se_socktype = SOCK_STREAM;
       serv.se_checked = 1;
@@ -1237,8 +1241,8 @@ fix_tcpmux (void)
 	  /* Should not happen */
 	  freeconfig (&serv);
 	  if (debug)
-	    fprintf (stderr, "INETERNAL ERROR: could not found tcpmux built-in");
-	  syslog (LOG_ERR, "INETERNAL ERROR: could not found tcpmux built-in");
+	    fprintf (stderr, "INTERNAL ERROR: could not find tcpmux built-in");
+	  syslog (LOG_ERR, "INTERNAL ERROR: could not find tcpmux built-in");
 	  return;
 	}
       serv.se_wait = serv.se_bi->bi_wait;

http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=202092b67d010d5d7b259bcf8b452052c6814b69


commit 202092b67d010d5d7b259bcf8b452052c6814b69
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Tue Dec 21 15:50:50 2010 +0100

    addrpeek: New test service for Inetd.

diff --git a/ChangeLog b/ChangeLog
index b1ea660..ed27d79 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2010-12-21  Mats Erik Andersson <gnu@gisladisker.se>
 
+	* tests/addrpeek.c: New file.
+	* tests/Makefile.am: Register `addrpeek' using
+	`check_PROGRAMS', but conditioned on `ENABLE_inetd'.
+
+2010-12-21  Mats Erik Andersson <gnu@gisladisker.se>
+
 	* src/inetd.c (prepenv): New prototype:
 	`prepenv(int, struct sockaddr *, socklen_t)'.
 	(prepenv): Change type of IP to `char []' of fixed length.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index cce19ee..1327c5e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -21,6 +21,10 @@ AM_CPPFLAGS = -I$(top_srcdir)/libinetutils -I$(top_srcdir)/lib
 LDADD = -L../libinetutils -linetutils  ../lib/libgnu.a
 
 check_PROGRAMS = localhost
+if ENABLE_inetd
+check_PROGRAMS += addrpeek
+endif
+
 dist_check_SCRIPTS =
 if ENABLE_ping
 dist_check_SCRIPTS += ping-localhost.sh
diff --git a/tests/addrpeek.c b/tests/addrpeek.c
new file mode 100644
index 0000000..02319b2
--- /dev/null
+++ b/tests/addrpeek.c
@@ -0,0 +1,135 @@
+/* addrpeek - testing service for Inetd: remote address, environment vars
+  Copyright (C) 2010 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/* Written by Mats Erik Andersson.  */
+
+/* Addrpeek is a test client for examining Inetd, primarily TCP traffic.
+ * The client executes all those tasks that were listed as server
+ * arguments in the configuration file for Inetd:
+ *
+ *    addr : Reply with "Your address is $IP."
+ *    env  : Reply with all known environment variables and their values.
+ *
+ * Reasonable entries in `inetf.conf' could be
+ *
+ *    # Return numerical address of the calling client.
+ *    #
+ *    7890 stream tcp nowait nobody /tmp/addrpeek addrpeek addr
+ *    7890 stream tcp6 nowait nobody /tmp/addrpeek addrpeek addr
+ *    #
+ *    # Display all environment variables in use, and append
+ *    # the client's address at the end.
+ *    #
+ *    tcpmux stream tcp nowait nobody internal
+ *    tcpmux stream tcp6 nowait nobody internal
+ *    tcpmux/env stream tcp nowait nobody /tmp/addrpeek addrkeep env addr
+ */
+
+#include "config.h"
+#include <stdio.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <netdb.h>
+
+#ifndef SEPARATOR
+# define SEPARATOR "\n"
+#endif
+
+/* TODO Develop some reliable test for the existence of ENVIRON.
+ * It is detectable using HAVE_DECL_ENVIRON for GNU/Linux and
+ * GNU/kFreeBSD. It is present, but not detectable for OpenBSD
+ * and FreeBSD.
+ */
+extern char **environ;
+
+static void
+write_address (int fd)
+{
+  int type;
+  size_t len;
+  socklen_t sslen;
+  char addr[INET6_ADDRSTRLEN], answer[128];
+  struct sockaddr_storage ss;
+
+  sslen = sizeof (type);
+  getsockopt (fd, SOL_SOCKET, SO_TYPE, &type, &sslen);
+
+  if (type == SOCK_STREAM)
+    {
+      sslen = sizeof (ss);
+      getpeername (fd, (struct sockaddr *) &ss, &sslen);
+    }
+  else if (type == SOCK_DGRAM)
+    {
+      sslen = sizeof (ss);
+      recvfrom (fd, answer, sizeof (answer), 0,
+                  (struct sockaddr *) &ss, &sslen);
+      shutdown (fd, SHUT_RD);
+    }
+  else
+      return;
+
+  getnameinfo ((struct sockaddr *) &ss, sslen, addr, sizeof (addr),
+                NULL, 0, NI_NUMERICHOST);
+
+  len = snprintf (answer, sizeof (answer),
+                  "Your address is %s." SEPARATOR, addr);
+
+  sendto (fd, answer, len, 0, (struct sockaddr *) &ss, sslen);
+}
+
+void
+write_environment (int fd, char *envp[])
+{
+  for ( ; *envp; ++envp)
+    {
+      write (fd, *envp, strlen (*envp));
+      write (fd, SEPARATOR, strlen (SEPARATOR));
+    }
+}
+
+int
+main (int argc, char *argv[])
+{
+  int j;
+
+  for (j = 1; j < argc; ++j)
+    {
+      if (strncmp (argv[j], "addr", strlen ("addr")) == 0)
+        {
+          write_address (STDOUT_FILENO);
+          continue;
+        }
+
+      if (strncmp (argv[j], "env", strlen ("env")) == 0)
+        {
+          write_environment (STDOUT_FILENO, environ);
+          continue;
+        }
+    }
+
+  close (STDIN_FILENO);
+  close (STDOUT_FILENO);
+  close (STDERR_FILENO);
+
+  return EXIT_SUCCESS;
+}

http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=791329d9b2cf8c5237939782a0d6aae4adfa0487


commit 791329d9b2cf8c5237939782a0d6aae4adfa0487
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Tue Dec 21 15:45:24 2010 +0100

    inetd: Environment variables also for IPv6.

diff --git a/ChangeLog b/ChangeLog
index b8e5b12..b1ea660 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2010-12-21  Mats Erik Andersson <gnu@gisladisker.se>
+
+	* src/inetd.c (prepenv): New prototype:
+	`prepenv(int, struct sockaddr *, socklen_t)'.
+	(prepenv): Change type of IP to `char []' of fixed length.
+	Delete HOST.  New integer variable RET.
+	Make type of SA_SERVER depend on macro IPV6, either
+	`struct sockaddr_storage' or `struct sockaddr_in'.
+	(prepenv): Eliminate use of `inet_ntoa' and `gethostbyaddr'
+	by new calls to `getnameinfo', with and without restiction
+	to numeric results.  Debugging output for three select
+	environment variables.
+	(main): Make type of SA_CLIENT depend on macro IPV6, either
+	`struct sockaddr_storage' or `struct sockaddr_in'.  Adaptions
+	to the new prototype for `prepenv'.
+
 2010-12-04  Mike Frysinger <vapier@gentoo.org>  (tiny change)
 
 	* man/Makefile.am (dist_man1_MANS): Renamed to dist_man_MANS.
diff --git a/src/inetd.c b/src/inetd.c
index c3cec04..625ebff 100644
--- a/src/inetd.c
+++ b/src/inetd.c
@@ -1696,15 +1696,21 @@ tcpmux (int s, struct servtab *sep)
 
 /* Set TCP environment variables, modelled after djb's ucspi-tcp tools:
    http://cr.yp.to/ucspi-tcp/environment.html
-   FIXME: This needs support for IPv6.
 */
 void
-prepenv (int ctrl, struct sockaddr_in sa_client)
+prepenv (int ctrl, struct sockaddr *sa_client, socklen_t sa_len)
 {
   char str[16];
-  char *ip;
-  struct hostent *host;
+  /* IP is used both for numeric addresses and for symbolic ones.
+   * Being statically allocated, and only for logging purposes,
+   * a full MAXPATHLEN is exaggerated, so a compromise is made.  */
+  char ip[4 * INET6_ADDRSTRLEN];
+  int ret;
+#ifdef IPV6
+  struct sockaddr_storage sa_server;
+#else
   struct sockaddr_in sa_server;
+#endif
   socklen_t len = sizeof (sa_server);
 
   setenv ("PROTO", "TCP", 1);
@@ -1719,47 +1725,58 @@ prepenv (int ctrl, struct sockaddr_in sa_client)
     syslog (LOG_WARNING, "getsockname(): %m");
   else
     {
-      ip = inet_ntoa (sa_server.sin_addr);
-      if (ip)
+      ret = getnameinfo ((struct sockaddr *) &sa_server, len,
+			  ip, sizeof (ip), str, sizeof (str),
+			  NI_NUMERICHOST | NI_NUMERICSERV);
+      if (ret == 0)
 	{
 	  if (setenv ("TCPLOCALIP", ip, 1) < 0)
 	    syslog (LOG_WARNING, "setenv (TCPLOCALIP): %m");
-	}
+	  else if (debug)
+	    fprintf (stderr, "Assigned TCPLOCALIP = %s\n", ip);
 
-      snprintf (str, sizeof (str), "%d", ntohs (sa_server.sin_port));
-      setenv ("TCPLOCALPORT", str, 1);
+	  if (setenv ("TCPLOCALPORT", str, 1) < 0)
+	    syslog (LOG_WARNING, "setenv (TCPLOCALPORT): %m");
+	}
+      else
+	syslog (LOG_WARNING, "getnameinfo: %s", gai_strerror (ret));
 
       if (resolve_option)
 	{
-	  if ((host = gethostbyaddr ((char *) &sa_server.sin_addr,
-				     sizeof (sa_server.sin_addr),
-				     AF_INET)) == NULL)
-	    syslog (LOG_WARNING, "gethostbyaddr: %m");
-	  else if (setenv ("TCPLOCALHOST", host->h_name, 1) < 0)
+	  ret = getnameinfo ((struct sockaddr *) &sa_server, len,
+			      ip, sizeof (ip), NULL, 0, 0);
+	  if (ret != 0)
+	    syslog (LOG_WARNING, "getnameinfo: %s", gai_strerror (ret));
+	  else if (setenv ("TCPLOCALHOST", ip, 1) < 0)
 	    syslog (LOG_WARNING, "setenv(TCPLOCALHOST): %m");
 	}
     }
 
-  ip = inet_ntoa (sa_client.sin_addr);
-  if (ip)
+  ret = getnameinfo (sa_client, sa_len, ip, sizeof (ip), str, sizeof (str),
+		      NI_NUMERICHOST | NI_NUMERICSERV);
+  if (ret == 0)
     {
       if (setenv ("TCPREMOTEIP", ip, 1) < 0)
 	syslog (LOG_WARNING, "setenv(TCPREMOTEIP): %m");
-    }
+      else if (debug)
+	fprintf (stderr, "Assigned TCPREMOTEIP = %s\n", ip);
 
-  snprintf (str, sizeof (str), "%d", ntohs (sa_client.sin_port));
-  if (setenv ("TCPREMOTEPORT", str, 1) < 0)
-    syslog (LOG_WARNING, "setenv(TCPREMOTEPORT): %m");
+      if (setenv ("TCPREMOTEPORT", str, 1) < 0)
+	syslog (LOG_WARNING, "setenv(TCPREMOTEPORT): %m");
 
-  if (resolve_option)
-    {
-      if ((host = gethostbyaddr ((char *) &sa_client.sin_addr,
-				 sizeof (sa_client.sin_addr),
-				 AF_INET)) == NULL)
-	syslog (LOG_WARNING, "gethostbyaddr: %m");
-      else if (setenv ("TCPREMOTEHOST", host->h_name, 1) < 0)
-	syslog (LOG_WARNING, "setenv(TCPREMOTEHOST): %m");
+      if (resolve_option)
+	{
+	  ret = getnameinfo (sa_client, sa_len, ip, sizeof (ip), NULL, 0, 0);
+	  if (ret != 0)
+	    syslog (LOG_WARNING, "getnameinfo: %s", gai_strerror (ret));
+	  else if (setenv ("TCPREMOTEHOST", ip, 1) < 0)
+	    syslog (LOG_WARNING, "setenv(TCPREMOTEHOST): %m");
+	  else if (debug)
+	    fprintf (stderr, "Assigned TCPREMOTEHOST = %s\n", ip);
+	}
     }
+  else
+    syslog (LOG_WARNING, "getnameinfo: %s", gai_strerror (ret));
 }
 
 
@@ -1870,7 +1887,11 @@ main (int argc, char *argv[], char *envp[])
 	      fprintf (stderr, "someone wants %s\n", sep->se_service);
 	    if (!sep->se_wait && sep->se_socktype == SOCK_STREAM)
 	      {
+#ifdef IPV6
+		struct sockaddr_storage sa_client;
+#else
 		struct sockaddr_in sa_client;
+#endif
 		socklen_t len = sizeof (sa_client);
 
 		ctrl = accept (sep->se_fd, (struct sockaddr *) &sa_client,
@@ -1885,7 +1906,7 @@ main (int argc, char *argv[], char *envp[])
 		    continue;
 		  }
 		if (env_option)
-		  prepenv (ctrl, sa_client);
+		  prepenv (ctrl, (struct sockaddr *) &sa_client, len);
 	      }
 	    else
 	      ctrl = sep->se_fd;

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog         |   46 +++++++++++++++++
 src/inetd.c       |  141 +++++++++++++++++++++++++++++++++++++++--------------
 tests/Makefile.am |    4 ++
 tests/addrpeek.c  |  135 ++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 289 insertions(+), 37 deletions(-)
 create mode 100644 tests/addrpeek.c


hooks/post-receive
-- 
GNU Inetutils 


