From MAILER-DAEMON Fri Oct 01 11:08:48 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1P1hE8-0006QI-GQ
	for mharc-commit-inetutils@gnu.org; Fri, 01 Oct 2010 11:08:48 -0400
Received: from [140.186.70.92] (port=47591 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1P1hE5-0006PP-6R
	for commit-inetutils@gnu.org; Fri, 01 Oct 2010 11:08:46 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1P1hDO-0007NB-7O
	for commit-inetutils@gnu.org; Fri, 01 Oct 2010 11:08:03 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:37101
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1P1hDO-0007N7-4T
	for commit-inetutils@gnu.org; Fri, 01 Oct 2010 11:08:02 -0400
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 1P1hDN-0006jz-Nx
	for commit-inetutils@gnu.org; Fri, 01 Oct 2010 15:08:01 +0000
Received: from jas by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <jas@savannah.gnu.org>) id 1P1hDM-0004NJ-04
	for commit-inetutils@gnu.org; Fri, 01 Oct 2010 15:08:01 +0000
To: commit-inetutils@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 8646d96518913a67bdd6704b86a013de81788474
X-Git-Newrev: 0d81d7e7e886f7e788ea7191418f8327416ef246
Message-Id: <E1P1hDM-0004NJ-04@vcs-noshell.in.savannah.gnu.org>
From: Simon Josefsson <simon@josefsson.org>
Date: Fri, 01 Oct 2010 15:08:00 +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-39-g0d81d7e
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: Fri, 01 Oct 2010 15:08:46 -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  0d81d7e7e886f7e788ea7191418f8327416ef246 (commit)
      from  8646d96518913a67bdd6704b86a013de81788474 (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=0d81d7e7e886f7e788ea7191418f8327416ef246


commit 0d81d7e7e886f7e788ea7191418f8327416ef246
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Fri Oct 1 17:07:49 2010 +0200

    ping/ping6: Missing header and better error detection.
    
    Signed-off-by: Simon Josefsson <simon@josefsson.org>

diff --git a/ChangeLog b/ChangeLog
index 657874c..8544e22 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-18  Mats Erik Andersson <gnu@gisladisker.se>
+
+	* ping/ping6.c: Include <sys/uio.h> for knowing "struct iov" in BSD.
+	* ping/ping6.c (ping_init): Check for EACCES failure from socket(2).
+	* ping/libping.c (ping_init): Likewise.
+
 2010-09-23  Mats Erik Andersson <gnu@gisladisker.se>
 
 	* ifconfig/system/linux.c (linux_if_nameindex): Express the exact
diff --git a/ping/libping.c b/ping/libping.c
index a83def5..52590ba 100644
--- a/ping/libping.c
+++ b/ping/libping.c
@@ -62,7 +62,7 @@ ping_init (int type, int ident)
   fd = socket (AF_INET, SOCK_RAW, proto->p_proto);
   if (fd < 0)
     {
-      if (errno == EPERM)
+      if (errno == EPERM || errno == EACCES)
 	fprintf (stderr, "ping: ping must run as root\n");
       return NULL;
     }
diff --git a/ping/ping6.c b/ping/ping6.c
index e44cdb6..03a9f87 100644
--- a/ping/ping6.c
+++ b/ping/ping6.c
@@ -21,6 +21,7 @@
 
 #include <sys/socket.h>
 #include <sys/time.h>
+#include <sys/uio.h>
 #include <signal.h>
 
 #include <netinet/in.h>
@@ -704,7 +705,7 @@ ping_init (int type, int ident)
   fd = socket (PF_INET6, SOCK_RAW, IPPROTO_ICMPV6);
   if (fd < 0)
     {
-      if (errno == EPERM)
+      if (errno == EPERM || errno == EACCES)
         error (EXIT_FAILURE, errno, NULL);
 
       return NULL;

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

Summary of changes:
 ChangeLog      |    6 ++++++
 ping/libping.c |    2 +-
 ping/ping6.c   |    3 ++-
 3 files changed, 9 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Fri Oct 01 11:09:31 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1P1hEp-0006yY-6Y
	for mharc-commit-inetutils@gnu.org; Fri, 01 Oct 2010 11:09:31 -0400
Received: from [140.186.70.92] (port=47992 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1P1hEh-0006Z5-W5
	for commit-inetutils@gnu.org; Fri, 01 Oct 2010 11:09:29 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1P1h85-00066J-3z
	for commit-inetutils@gnu.org; Fri, 01 Oct 2010 11:02:34 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:60447
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1P1h85-00066F-1J
	for commit-inetutils@gnu.org; Fri, 01 Oct 2010 11:02:33 -0400
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 1P1h84-0006gV-Ln
	for commit-inetutils@gnu.org; Fri, 01 Oct 2010 15:02:32 +0000
Received: from jas by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <jas@savannah.gnu.org>) id 1P1h84-00048s-FC
	for commit-inetutils@gnu.org; Fri, 01 Oct 2010 15:02:32 +0000
To: commit-inetutils@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: bf3bb5197cf03faf5af35b49040a2e69193f068c
X-Git-Newrev: 8646d96518913a67bdd6704b86a013de81788474
Message-Id: <E1P1h84-00048s-FC@vcs-noshell.in.savannah.gnu.org>
From: Simon Josefsson <simon@josefsson.org>
Date: Fri, 01 Oct 2010 15:02:32 +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-38-g8646d96
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: Fri, 01 Oct 2010 15:09:29 -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  8646d96518913a67bdd6704b86a013de81788474 (commit)
      from  bf3bb5197cf03faf5af35b49040a2e69193f068c (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=8646d96518913a67bdd6704b86a013de81788474


commit 8646d96518913a67bdd6704b86a013de81788474
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Fri Oct 1 17:02:19 2010 +0200

    ifconfig/system/linux.c: Recalculate a search range.
    
    Signed-off-by: Simon Josefsson <simon@josefsson.org>

diff --git a/ChangeLog b/ChangeLog
index 6f6632b..657874c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-23  Mats Erik Andersson <gnu@gisladisker.se>
+
+	* ifconfig/system/linux.c (linux_if_nameindex): Express the exact
+	amount remaining of the string when locating next token.
+
 2010-09-28  Mats Erik Andersson <gnu@gisladisker.se>
 
 	* configure.ac: Unconditionally include <sys/types.h> when
diff --git a/ifconfig/system/linux.c b/ifconfig/system/linux.c
index 0f4e579..808d252 100644
--- a/ifconfig/system/linux.c
+++ b/ifconfig/system/linux.c
@@ -886,7 +886,7 @@ linux_if_nameindex (void)
   }
 
   for (it = memchr (content, ':', length), index = 0; it;
-       it = memchr (it, ':', it - content), index++)
+       it = memchr (it, ':', length - (it - content)), index++)
     {
       char *start = it - 1;
       *it = '\0';

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

Summary of changes:
 ChangeLog               |    5 +++++
 ifconfig/system/linux.c |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Fri Oct 01 11:12:39 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1P1hHq-0000aB-JQ
	for mharc-commit-inetutils@gnu.org; Fri, 01 Oct 2010 11:12:38 -0400
Received: from [140.186.70.92] (port=39132 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1P1hHn-0000Ya-G8
	for commit-inetutils@gnu.org; Fri, 01 Oct 2010 11:12:36 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1P1hHl-0000ZF-Sh
	for commit-inetutils@gnu.org; Fri, 01 Oct 2010 11:12:35 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:37126
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1P1hHl-0000Z9-R8
	for commit-inetutils@gnu.org; Fri, 01 Oct 2010 11:12:33 -0400
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 1P1hHl-0006nk-CE
	for commit-inetutils@gnu.org; Fri, 01 Oct 2010 15:12:33 +0000
Received: from jas by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <jas@savannah.gnu.org>) id 1P1hHl-0004cO-96
	for commit-inetutils@gnu.org; Fri, 01 Oct 2010 15:12:33 +0000
To: commit-inetutils@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 0d81d7e7e886f7e788ea7191418f8327416ef246
X-Git-Newrev: 154eba0782a693440f99830c88f2697977c1bff2
Message-Id: <E1P1hHl-0004cO-96@vcs-noshell.in.savannah.gnu.org>
From: Simon Josefsson <simon@josefsson.org>
Date: Fri, 01 Oct 2010 15:12:33 +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-40-g154eba0
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: Fri, 01 Oct 2010 15:12:37 -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  154eba0782a693440f99830c88f2697977c1bff2 (commit)
      from  0d81d7e7e886f7e788ea7191418f8327416ef246 (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=154eba0782a693440f99830c88f2697977c1bff2


commit 154eba0782a693440f99830c88f2697977c1bff2
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Fri Oct 1 17:12:13 2010 +0200

    src/inetd.c: Fix typos in comments.
    Signed-off-by: Simon Josefsson <simon@josefsson.org>

diff --git a/ChangeLog b/ChangeLog
index 8544e22..434d6d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-01  Mats Erik Andersson <gnu@gisladisker.se>
+
+	* src/inetd.c (setup, expand_enter, getconfigent, prepenv): Fix
+	comments.
+
 2010-09-18  Mats Erik Andersson <gnu@gisladisker.se>
 
 	* ping/ping6.c: Include <sys/uio.h> for knowing "struct iov" in BSD.
diff --git a/src/inetd.c b/src/inetd.c
index 6fe9adf..9a43271 100644
--- a/src/inetd.c
+++ b/src/inetd.c
@@ -547,7 +547,7 @@ setup (struct servtab *sep)
       if (errno == EAFNOSUPPORT && sep->se_family == AF_INET6
 	  && sep->se_v4mapped)
 	{
-	  /* Fall back to IPv6 silently.  */
+	  /* Fall back to IPv4 silently.  */
 	  sep->se_family = AF_INET;
 	  goto tryagain;
 	}
@@ -563,9 +563,8 @@ setup (struct servtab *sep)
   if (sep->se_family == AF_INET6)
     {
       /* Reverse the value of SEP->se_v4mapped, since otherwise if
-	 using `tcp' as a protocol type all connections will be mapped
-	 to IPv6, and with `tcp6' they get mapped IPv4 mapped to
-	 IPv6.  */
+	 using `tcp' as a protocol type, all connections will be mapped
+	 to IPv6, and with `tcp6', IPv4 get mapped to IPv6.  */
       int val = sep->se_v4mapped ? 0 : 1;
       if (setsockopt (sep->se_fd, IPPROTO_IPV6, IPV6_V6ONLY,
 		      (char *) &val, sizeof (val)) < 0)
@@ -592,7 +591,7 @@ setup (struct servtab *sep)
       if ((errno == EADDRNOTAVAIL || errno == EAFNOSUPPORT)
 	  && sep->se_family == AF_INET6 && sep->se_v4mapped)
 	{
-	  /* Fall back to IPv6 silently.  */
+	  /* Fall back to IPv4 silently.  */
 	  sep->se_family = AF_INET;
 	  close (sep->se_fd);
 	  goto tryagain;
@@ -779,7 +778,7 @@ expand_enter (struct servtab *sep)
   if (err == EAI_ADDRFAMILY
       && sep->se_family == AF_INET6 && sep->se_v4mapped)
     {
-      /* Fall back to IPv6 silently.  */
+      /* Fall back to IPv4 silently.  */
       sep->se_family = AF_INET;
       err = inetd_getaddrinfo (sep, proto->p_proto, &result);
     }
@@ -1002,7 +1001,7 @@ getconfigent (FILE *fconfig, const char *file, size_t *line)
       sep->se_proto = newstr (argv[INETD_PROTOCOL]);
 
 #ifdef IPV6
-      /* We default to IPv6, in setup() we'll fall back to IPv4 if
+      /* We default to IPv6.  In setup() we'll fall back to IPv4 if
          it doesn't work.  */
       sep->se_family = AF_INET6;
       sep->se_v4mapped = 1;
@@ -1674,7 +1673,7 @@ 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
+   FIXME: This needs support for IPv6.
 */
 void
 prepenv (int ctrl, struct sockaddr_in sa_client)

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

Summary of changes:
 ChangeLog   |    5 +++++
 src/inetd.c |   15 +++++++--------
 2 files changed, 12 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Mon Oct 18 12:37:56 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1P7sii-0001AB-Ng
	for mharc-commit-inetutils@gnu.org; Mon, 18 Oct 2010 12:37:56 -0400
Received: from [140.186.70.92] (port=42962 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1P7sif-00017B-3c
	for commit-inetutils@gnu.org; Mon, 18 Oct 2010 12:37:55 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ams@gnu.org>) id 1P7sic-00020H-Qd
	for commit-inetutils@gnu.org; Mon, 18 Oct 2010 12:37:53 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:40061
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1P7sic-00020D-O7
	for commit-inetutils@gnu.org; Mon, 18 Oct 2010 12:37:50 -0400
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 <ams@gnu.org>) id 1P7sic-0006O2-Am
	for commit-inetutils@gnu.org; Mon, 18 Oct 2010 16:37:50 +0000
Received: from ams by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <ams@savannah.gnu.org>) id 1P7sib-0002Bm-US
	for commit-inetutils@gnu.org; Mon, 18 Oct 2010 16:37:50 +0000
To: commit-inetutils@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 154eba0782a693440f99830c88f2697977c1bff2
X-Git-Newrev: a748d81646a4366402f15f13d0751386dab20291
Message-Id: <E1P7sib-0002Bm-US@vcs-noshell.in.savannah.gnu.org>
From: "Alfred M. Szmidt" <ams@gnu.org>
Date: Mon, 18 Oct 2010 16:37:49 +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-48-ga748d81
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: Mon, 18 Oct 2010 16:37:55 -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  a748d81646a4366402f15f13d0751386dab20291 (commit)
       via  14675d15752e7134d168bdb955ebe0e8fc7e8b10 (commit)
       via  dffb54c2f6f55e5d8c68cde3a888e8cdae438e34 (commit)
       via  ed0a94cd6cef9bf9ed7780fab9ae1a2b436c6f63 (commit)
       via  fd64a202d866483ac74cbc068e1c5879a933448c (commit)
       via  f21ada998e4e76e483f5bc76fe5fb2c6378e9564 (commit)
       via  26b57a041b15ae11b9fdea84c8a24b1dc62f6532 (commit)
       via  a12021ee959a88b48cd16e947c671f8f59e29c9d (commit)
      from  154eba0782a693440f99830c88f2697977c1bff2 (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=a748d81646a4366402f15f13d0751386dab20291


commit a748d81646a4366402f15f13d0751386dab20291
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Mon Oct 18 18:15:04 2010 +0200

    Always use <termios.h> interface.

diff --git a/ChangeLog b/ChangeLog
index fa045b8..2ab8b07 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+2010-10-18  Alfred M. Szmidt  <ams@gnu.org>
+
+	Always use <termios.h> interface.
+
+	* telnetd/term.c: Always use <termios.h> interface.
+	* telnetd/telnetd.h [!HAVE_TERMIO_H]: Don't include <termio.h>
+	[!HAVE_TERMIO_H && !HAVE_TERMIO_H]: Don't include <sgtty.h>.
+	* telnet/externs.h (USE_TERMIO): Uncondtionally define macro.
+	(SYSV_TERMIO) [!HAVE_TERMIOS_H && HAVE_TERMIO_H]: Undefine macro.
+
+	* talk/init_disp.c [!HAVE_TERMIOS_H]: Don't include <sys/ioctl.h>.
+	[!HAVE_TERMIOS_H && HAVE_SYS_IOCTL_COMPAT_H]: Don't include
+	<sys/ioctl_compat.h>.
+
+	* libls/ls.c: Unconditionally include <termios.h>
+
+	* src/uucpd.c: Likewise.
+
+	* configure.ac: Removed checks for termios.h and termio.h specifc
+	functions, variables and headers.
+
+	* bootstrap.conf (gnulib_modules): Added termios module.
+
 2010-10-18  Mats Erik Andersson <address@hidden>
 
 	* libinetutils/tftpsubs.c (synchnet): Changed type of FROM to be
diff --git a/bootstrap.conf b/bootstrap.conf
index facab0a..01dceda 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -69,6 +69,7 @@ strerror
 strndup
 strnlen
 sysexits
+termios
 unistd-safer
 unlocked-io
 update-copyright
diff --git a/configure.ac b/configure.ac
index dff4fd8..183275d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -466,7 +466,7 @@ AC_CHECK_HEADERS([arpa/nameser.h des.h errno.h fcntl.h features.h glob.h \
 		  sys/sockio.h sys/sysmacros.h sys/param.h sys/file.h \
 		  sys/proc.h sys/select.h sys/time.h sys/wait.h \
                   sys/resource.h \
-		  stropts.h tcpd.h termio.h termios.h utmp.h utmpx.h unistd.h \
+		  stropts.h tcpd.h utmp.h utmpx.h unistd.h \
                   vis.h], [], [], [
 #include <sys/types.h>
 #ifdef HAVE_NETINET_IN_SYSTM_H
@@ -521,16 +521,6 @@ AC_CHECK_TYPE(sig_atomic_t, , AC_DEFINE([sig_atomic_t], int, [FIXME]),
   [IU_FLUSHLEFT([#include <sys/types.h>
                  #include <signal.h> ])])
 
-dnl Check for termio-related types and defines
-AC_CHECK_TYPES(cc_t, , ,
- [IU_FLUSHLEFT([#if defined(HAVE_TERMIOS_H)
-                # include <termios.h>
-                #elif defined(HAVE_TERMIO_H)
-                # include <termio.h>
-                #else
-                # include <sgtty.h>
-                #endif ])])
-
 dnl Check for compile support for ceratin type
 AC_CHECK_TYPE(long long, , AC_DEFINE([LONG_LONG], long, [Define to long if compiler does not support]))
 AC_CHECK_TYPE(long double, , AC_DEFINE([LONG_DOUBLE], double, [Define to double if compiler does not support]))
diff --git a/libls/ls.c b/libls/ls.c
index 90f3858..c24962e 100644
--- a/libls/ls.c
+++ b/libls/ls.c
@@ -64,9 +64,7 @@
 #include <unistd.h>
 #include <pwd.h>
 #include <grp.h>
-#ifdef HAVE_TERMIOS_H
-# include <termios.h>
-#endif
+#include <termios.h>
 
 #include <intprops.h>
 #include <inttostr.h>
diff --git a/src/uucpd.c b/src/uucpd.c
index bb040fa..0abb2cf 100644
--- a/src/uucpd.c
+++ b/src/uucpd.c
@@ -76,9 +76,7 @@
 #ifdef HAVE_CRYPT_H
 # include <crypt.h>
 #endif
-#ifdef HAVE_TERMIOS_H
-# include <termios.h>
-#endif
+#include <termios.h>
 #ifdef HAVE_UTMP_H
 # include <utmp.h>
 #endif
diff --git a/talk/init_disp.c b/talk/init_disp.c
index 36ecb46..9a1cad6 100644
--- a/talk/init_disp.c
+++ b/talk/init_disp.c
@@ -56,15 +56,7 @@
  * as well as the signal handling routines.
  */
 
-#ifdef HAVE_TERMIOS_H
-# include <termios.h>
-#else
-# include <sys/ioctl.h>
-# ifdef HAVE_SYS_IOCTL_COMPAT_H
-#  include <sys/ioctl_compat.h>
-# endif
-#endif
-
+#include <termios.h>
 #include <unistd.h>
 #include <signal.h>
 #include <error.h>
diff --git a/telnet/externs.h b/telnet/externs.h
index 0c92cd5..e862bc3 100644
--- a/telnet/externs.h
+++ b/telnet/externs.h
@@ -53,14 +53,8 @@
 # define BSD 43
 #endif
 
-#ifdef HAVE_TERMIOS_H
-# define USE_TERMIO
-#else /* !HAVE_TERMIOS_H */
-# ifdef HAVE_TERMIO_H
-#  define USE_TERMIO
-#  define SYSV_TERMIO
-# endif
-#endif /* HAVE_TERMIOS_H */
+
+#define USE_TERMIO
 
 /*
  * ucb stdio.h defines BSD as something wierd
diff --git a/telnetd/telnetd.h b/telnetd/telnetd.h
index d991e59..9671ae9 100644
--- a/telnetd/telnetd.h
+++ b/telnetd/telnetd.h
@@ -51,13 +51,7 @@
 #include <arpa/telnet.h>
 #include <libtelnet/auth.h>
 
-#if defined HAVE_TERMIOS_H
-# include <termios.h>
-#elif defined(HAVE_TERMIO_H)
-# include <termio.h>
-#else
-# include <sgtty.h>
-#endif
+#include <termios.h>
 
 #define obstack_chunk_alloc malloc
 #define obstack_chunk_free free
diff --git a/telnetd/term.c b/telnetd/term.c
index 8bffcab..3371fc5 100644
--- a/telnetd/term.c
+++ b/telnetd/term.c
@@ -21,59 +21,9 @@
 
 #include <telnetd.h>
 
-#if defined HAVE_TERMIOS_H
 typedef struct termios TERMDESC;
-# define _term_getattr tcgetattr
-# define _term_setattr(fd, tp) tcsetattr (fd, TCSANOW, tp)
-
-#elif defined(HAVE_TERMIO_H)
-typedef struct termio TERMDESC;
-# define _term_getattr tcgetattr
-# define _term_setattr(fd, tp) tcsetattr (fd, TCSANOW, tp)
-
-#else
-
-# define IOCTL_INTERFACE
-
-typedef struct
-{
-  struct sgttyb sg;
-  struct tchars tc;
-  struct ltchars ltc;
-  int state;
-  int lflags;
-# define termdesc_eofc   tc.t_eofc
-# define termdesc_erase  tc.sg.sg_erase
-# define termdesc_kill   sg.sg_kill
-# define termdesc_ip     tc.t_intrc
-# define termdesc_abort  tc.t_quitc
-# define termdesc_xon    tc.t_startc
-# define termdesc_xoff   tc.t_stopc
-# define termdesc_ao     ltc.t_flushc
-# define termdesc_susp   ltc.t_suspc
-# define termdesc_ew     ltc.t_werasc
-# define termdesc_rp     ltc.t_rprntc
-# define termdesc_lnext  ltc.t_lnextc
-# define termdesc_forw1  tc.t_brkc
-} TERMDESC;
-
-# define cfsetospeed(tp, val) (tp)->sg.sg_ospeed = (val)
-# define cfsetispeed(tp, val) (tp)->sg.sg_ispeed = (val)
-# define cfgetospeed(tp)      (tp)->sg.sg_ospeed
-# define cfgetispeed(tp)      (tp)->sg.sg_ispeed
-
-int
-_term_getattr (int fd, TERMDESC * tp)
-{
-  ioctl (fd, TIOCGETP, (char *) &tp->sg);
-  ioctl (fd, TIOCGETC, (char *) &tp->tc);
-  ioctl (fd, TIOCGLTC, (char *) &tp->ltc);
-# ifdef	TIOCGSTATE
-  ioctl (fd, TIOCGSTATE, (char *) &tp->state);
-# endif
-  return 0;
-}
-#endif
+#define _term_getattr tcgetattr
+#define _term_setattr(fd, tp) tcsetattr (fd, TCSANOW, tp)
 
 TERMDESC termbuf, termbuf2;
 

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


commit 14675d15752e7134d168bdb955ebe0e8fc7e8b10
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Mon Oct 18 18:13:48 2010 +0200

    tftp: Handle IPv6 connections.

diff --git a/ChangeLog b/ChangeLog
index 6cd3749..fa045b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2010-10-18  Mats Erik Andersson <address@hidden>
+
+	* libinetutils/tftpsubs.c (synchnet): Changed type of FROM to be
+	"struct sockaddr_storage".
+
+	* src/tftpd.c: Changed all uses of "struct sockaddr_in" to be
+	"struct sockaddr_storage".
+	(fromlen): Meticulously tracks length of address structure FROM in
+	every function.
+	(verifyhost): Expanded declaration signature to be "(struct
+	sockaddr_storage *, socklen_t)".  Use getnameinfo(3) as resolver.
+	(tftp) <logging>: Now displays address family "IPv4", "IPv6", or
+	"?".
+
 2010-10-18  Mats Erik Andersson <gnu@gisladisker.se>
 
 	* ifconfig/printif.c (put_flags): Declare F as `unsigned short
diff --git a/libinetutils/tftpsubs.c b/libinetutils/tftpsubs.c
index bc1f84a..6fa78bc 100644
--- a/libinetutils/tftpsubs.c
+++ b/libinetutils/tftpsubs.c
@@ -285,7 +285,7 @@ synchnet (int f)
 {
   int i, j = 0;
   char rbuf[PKTSIZE];
-  struct sockaddr_in from;
+  struct sockaddr_storage from;
   socklen_t fromlen;
 
   while (1)
diff --git a/src/tftpd.c b/src/tftpd.c
index 70602fa..e6b5913 100644
--- a/src/tftpd.c
+++ b/src/tftpd.c
@@ -101,7 +101,7 @@ static int maxtimeout = 5 * TIMEOUT;
 #define PKTSIZE	SEGSIZE+4
 static char buf[PKTSIZE];
 static char ackbuf[PKTSIZE];
-static struct sockaddr_in from;
+static struct sockaddr_storage from;
 static socklen_t fromlen;
 
 void tftp (struct tftphdr *, int);
@@ -124,7 +124,7 @@ static int logging;
 
 static const char *errtomsg (int);
 static void nak (int);
-static const char *verifyhost (struct sockaddr_in *);
+static const char *verifyhost (struct sockaddr_storage *, socklen_t);
 
 
 
@@ -172,7 +172,7 @@ main (int argc, char *argv[])
   int index;
   register struct tftphdr *tp;
   int on, n;
-  struct sockaddr_in sin;
+  struct sockaddr_storage sin;
 
   set_program_name (argv[0]);
   iu_argp_init ("tftpd", default_program_authors);
@@ -268,24 +268,29 @@ main (int argc, char *argv[])
 	exit (EXIT_SUCCESS);
       }
   }
-  from.sin_family = AF_INET;
+
   alarm (0);
   close (0);
   close (1);
-  peer = socket (AF_INET, SOCK_DGRAM, 0);
+
+  /* The peer's address 'from' is valid at this point.
+   * 'from.ss_family' contains the correct address
+   * family for any callback connection, and 'fromlen'
+   * is the length of the corresponding address structure.  */
+  peer = socket (from.ss_family, SOCK_DGRAM, 0);
   if (peer < 0)
     {
       syslog (LOG_ERR, "socket: %m\n");
       exit (EXIT_FAILURE);
     }
   memset (&sin, 0, sizeof (sin));
-  sin.sin_family = AF_INET;
-  if (bind (peer, (struct sockaddr *) &sin, sizeof (sin)) < 0)
+  sin.ss_family = from.ss_family;
+  if (bind (peer, (struct sockaddr *) &sin, fromlen) < 0)
     {
       syslog (LOG_ERR, "bind: %m\n");
       exit (EXIT_FAILURE);
     }
-  if (connect (peer, (struct sockaddr *) &from, sizeof (from)) < 0)
+  if (connect (peer, (struct sockaddr *) &from, fromlen) < 0)
     {
       syslog (LOG_ERR, "connect: %m\n");
       exit (EXIT_FAILURE);
@@ -360,8 +365,22 @@ again:
   ecode = (*pf->f_validate) (&filename, tp->th_opcode);
   if (logging)
     {
-      syslog (LOG_INFO, "%s: %s request for %s: %s",
-	      verifyhost (&from),
+      char *family;
+
+      switch (from.ss_family)
+	{
+	case AF_INET:
+	  family = "IPv4";
+	  break;
+	case AF_INET6:
+	  /* Should mapped IPv4 addresses be reported?  */
+	  family = "IPv6";
+	  break;
+	default:
+	  family = "?";
+	}
+      syslog (LOG_INFO, "%s (%s): %s request for %s: %s",
+	      verifyhost (&from, fromlen), family,
 	      tp->th_opcode == WRQ ? "write" : "read",
 	      filename, errtomsg (ecode));
     }
@@ -737,16 +756,20 @@ nak (int error)
 }
 
 static const char *
-verifyhost (struct sockaddr_in *fromp)
+verifyhost (struct sockaddr_storage *fromp, socklen_t frlen)
 {
-  struct hostent *hp;
+  int rc;
+  static char host[NI_MAXHOST];
 
-  hp = gethostbyaddr ((char *) &fromp->sin_addr, sizeof (fromp->sin_addr),
-		      fromp->sin_family);
-  if (hp)
-    return hp->h_name;
+  rc = getnameinfo ((struct sockaddr *) fromp, frlen,
+		    host, sizeof (host), NULL, 0, 0);
+  if (rc == 0)
+    return host;
   else
-    return inet_ntoa (fromp->sin_addr);
+    {
+      syslog (LOG_ERR, "getnameinfo: %s\n", gai_strerror(rc));
+      return "0.0.0.0";
+    }
 }
 
 static const char usage_str[] =

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


commit dffb54c2f6f55e5d8c68cde3a888e8cdae438e34
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Mon Oct 18 18:12:15 2010 +0200

    ifconfig: Correct formating for "unix".

diff --git a/ChangeLog b/ChangeLog
index d3055f1..6cd3749 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-10-18  Mats Erik Andersson <gnu@gisladisker.se>
+
+	* ifconfig/printif.c (put_flags): Declare F as `unsigned short
+	int'.
+	(put_int): Parse H, h, and # modifiers.
+	* ifconfig/options.c (formats) <unix>: Fix formating.
+	* ifconfig/flags.c (flag_char_tab) [IFF_SIMPLEX]: New member
+	IFF_SIMPLEX
+
 2010-10-18  Guillem Jover  <guillem@hadrons.org>
 
 	* configure.ac: Remove opie AC_CHECK_LIB check.
diff --git a/ifconfig/flags.c b/ifconfig/flags.c
index 29b9162..279b295 100644
--- a/ifconfig/flags.c
+++ b/ifconfig/flags.c
@@ -407,6 +407,9 @@ static struct if_flag_char flag_char_tab[] = {
 #ifdef IFF_MASTER
   { IFF_MASTER,      'm' },
 #endif
+#ifdef IFF_SIMPLEX
+  { IFF_SIMPLEX,     'S' },
+#endif
   { IFF_RUNNING,     'R' },
   { IFF_UP,          'U' },
   { 0 }
diff --git a/ifconfig/options.c b/ifconfig/options.c
index 7e1c309..dcd38d9 100644
--- a/ifconfig/options.c
+++ b/ifconfig/options.c
@@ -139,10 +139,10 @@ struct format formats[] = {
    "Traditional UNIX interface listing.  Default for Solaris and HPUX.",
    "${format}{check-existence}"
    "${ifdisplay?}{"
-   "${name}: flags=${flags}{number}<${flags}{string}{,}>"
+   "${name}: flags=${flags}{number}{%hx}<${flags}{string}{,}>"
    "${mtu?}{ mtu ${mtu}}${\\n}"
    "${addr?}{${\\t}inet ${addr}"
-   " netmask ${netmask}{0}{%02x}${netmask}{1}{%02x}"
+   " netmask ${netmask}{0}{%#02x}${netmask}{1}{%02x}"
    "${netmask}{2}{%02x}${netmask}{3}{%02x}"
    "${brdaddr?}{ broadcast ${brdaddr}}${\\n}}"
    "${exists?}{hwtype?}{${hwtype?}{${\\t}${hwtype}"
diff --git a/ifconfig/printif.c b/ifconfig/printif.c
index 03cdf80..4dba348 100644
--- a/ifconfig/printif.c
+++ b/ifconfig/printif.c
@@ -153,12 +153,15 @@ put_int (format_data_t form, int argc, char *argv[], int nr)
 	{
 	  p++;
 
-	  while (isdigit (*p))
+	  if (*p == '#')
 	    p++;
 
-	  if (*p == '#')
+	  while (isdigit (*p))
 	    p++;
 
+	  if ((*p == 'h' || *p == 'H') && p[1])
+	    ++p; /* Half length modifier, go to type specifier.  */
+
 	  switch (*p)
 	    {
 	    default:
@@ -293,8 +296,7 @@ put_addr (format_data_t form, int argc, char *argv[], struct sockaddr *sa)
 void
 put_flags (format_data_t form, int argc, char *argv[], short flags)
 {
-  /* XXX */
-  short int f = 1;
+  unsigned short int f = 1;
   const char *name;
   int first = 1;
 

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


commit ed0a94cd6cef9bf9ed7780fab9ae1a2b436c6f63
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Mon Oct 18 18:11:02 2010 +0200

    configure.ac: Remove opie AC_CHECK_LIB check.

diff --git a/ChangeLog b/ChangeLog
index 3c8f9ed..d3055f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2010-10-18  Guillem Jover  <guillem@hadrons.org>
 
+	* configure.ac: Remove opie AC_CHECK_LIB check.
+
+2010-10-18  Guillem Jover  <guillem@hadrons.org>
+
 	* src/inetd.c (nextconfig): Call expand_enter instead of enter for
 	tcpmux services.
 	(fix_tcpmux): Likewise.
diff --git a/configure.ac b/configure.ac
index ec0e7df..dff4fd8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -141,7 +141,6 @@ gl_INIT
 AC_CHECK_LIB(nsl, inet_ntoa)
 AC_CHECK_LIB(resolv, gethostname)
 AC_CHECK_LIB(socket, getpeername)
-AC_CHECK_LIB(opie, opiegenerator)
 
 # See if a termcap library is available (under one of several names)
 IU_LIB_TERMCAP

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


commit fd64a202d866483ac74cbc068e1c5879a933448c
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Mon Oct 18 18:10:30 2010 +0200

    inetd: Call expand_enter instead of expand for tcpmux services.

diff --git a/ChangeLog b/ChangeLog
index 09fac43..3c8f9ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2010-10-18  Guillem Jover  <guillem@hadrons.org>
 
+	* src/inetd.c (nextconfig): Call expand_enter instead of enter for
+	tcpmux services.
+	(fix_tcpmux): Likewise.
+
+2010-10-18  Guillem Jover  <guillem@hadrons.org>
+
 	* src/inetd.c (getconfigent): If se_argc == 1 inject the
 	normalized se_server name into se_argv[0].
 
diff --git a/src/inetd.c b/src/inetd.c
index da8fb27..272e874 100644
--- a/src/inetd.c
+++ b/src/inetd.c
@@ -1110,7 +1110,7 @@ getconfigent (FILE *fconfig, const char *file, size_t *line)
 	  sep->se_argv[i] = argv[INETD_SERVER_ARGS + i];
 	  argv[INETD_SERVER_ARGS + i] = 0;
 	}
-      
+
       /* If no arguments are provided, use server name as argv[0].  */
       if (sep->se_argc == 1)
 	{
@@ -1121,7 +1121,7 @@ getconfigent (FILE *fconfig, const char *file, size_t *line)
 	    argv0 = sep->se_server;
           sep->se_argv[0] = newstr (argv0);
 	}
-      
+
       sep->se_argv[i] = NULL;
       break;
     }
@@ -1160,10 +1160,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);
     }
 }
 

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


commit f21ada998e4e76e483f5bc76fe5fb2c6378e9564
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Mon Oct 18 18:09:06 2010 +0200

    inetd: Set se_arv[0] to se_server name if argc == 1.

diff --git a/ChangeLog b/ChangeLog
index 006a679..09fac43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2010-10-18  Guillem Jover  <guillem@hadrons.org>
 
+	* src/inetd.c (getconfigent): If se_argc == 1 inject the
+	normalized se_server name into se_argv[0].
+
+2010-10-18  Guillem Jover  <guillem@hadrons.org>
+
 	* src/inetd.c (getconfigent) [IPV6]: Change default family to IPv4
 	for "tcp" and "udp".  Change "tcp6" and "udp6" to support IPv4
 	mapped addresses.  Add "tcp6only" and "udp6only" protocols for
diff --git a/src/inetd.c b/src/inetd.c
index 0f09386..da8fb27 100644
--- a/src/inetd.c
+++ b/src/inetd.c
@@ -1110,6 +1110,18 @@ getconfigent (FILE *fconfig, const char *file, size_t *line)
 	  sep->se_argv[i] = argv[INETD_SERVER_ARGS + i];
 	  argv[INETD_SERVER_ARGS + i] = 0;
 	}
+      
+      /* If no arguments are provided, use server name as argv[0].  */
+      if (sep->se_argc == 1)
+	{
+	  const char *argv0 = strrchr (sep->se_server, '/');
+	  if (argv0)
+	    argv0++;
+	  else
+	    argv0 = sep->se_server;
+          sep->se_argv[0] = newstr (argv0);
+	}
+      
       sep->se_argv[i] = NULL;
       break;
     }

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


commit 26b57a041b15ae11b9fdea84c8a24b1dc62f6532
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Mon Oct 18 18:07:30 2010 +0200

    TODO: Updated.  (silent change)

diff --git a/TODO b/TODO
index 43afcd0..0630678 100644
--- a/TODO
+++ b/TODO
@@ -1,3 +1,8 @@
+* Before release
+
+Write documentation (NEWS and manual) for how IPv6/IPv4 gets mapped by
+inetd.
+
 * General
 
 broadcasted terminals: provide a client/daemon that broadcasts a users

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


commit a12021ee959a88b48cd16e947c671f8f59e29c9d
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Mon Oct 18 18:07:06 2010 +0200

    inetd: Set default IP family for "tcp" and "udp" to IPv4.

diff --git a/ChangeLog b/ChangeLog
index 434d6d7..006a679 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-10-18  Guillem Jover  <guillem@hadrons.org>
+
+	* src/inetd.c (getconfigent) [IPV6]: Change default family to IPv4
+	for "tcp" and "udp".  Change "tcp6" and "udp6" to support IPv4
+	mapped addresses.  Add "tcp6only" and "udp6only" protocols for
+	IPv6 only addresses.
+	(fix_tcpmux) [IPV6]: Set se_proto to "tcp6".
+	[!IPV6]: Set se_proto to "tcp".
+
 2010-10-01  Mats Erik Andersson <gnu@gisladisker.se>
 
 	* src/inetd.c (setup, expand_enter, getconfigent, prepenv): Fix
diff --git a/src/inetd.c b/src/inetd.c
index 9a43271..0f09386 100644
--- a/src/inetd.c
+++ b/src/inetd.c
@@ -563,8 +563,9 @@ setup (struct servtab *sep)
   if (sep->se_family == AF_INET6)
     {
       /* Reverse the value of SEP->se_v4mapped, since otherwise if
-	 using `tcp' as a protocol type, all connections will be mapped
-	 to IPv6, and with `tcp6', IPv4 get mapped to IPv6.  */
+	 using `tcp6' as a protocol type, all connections will be
+	 mapped to IPv6, and with `tcp6only', IPv4 gets mapped to
+	 IPv6.  */
       int val = sep->se_v4mapped ? 0 : 1;
       if (setsockopt (sep->se_fd, IPPROTO_IPV6, IPV6_V6ONLY,
 		      (char *) &val, sizeof (val)) < 0)
@@ -1001,9 +1002,8 @@ getconfigent (FILE *fconfig, const char *file, size_t *line)
       sep->se_proto = newstr (argv[INETD_PROTOCOL]);
 
 #ifdef IPV6
-      /* We default to IPv6.  In setup() we'll fall back to IPv4 if
-         it doesn't work.  */
-      sep->se_family = AF_INET6;
+      /* We default to IPv4. */
+      sep->se_family = AF_INET;
       sep->se_v4mapped = 1;
 
       if ((strncmp (sep->se_proto, "tcp", 3) == 0)
@@ -1013,6 +1013,9 @@ getconfigent (FILE *fconfig, const char *file, size_t *line)
 	    {
 	      sep->se_family = AF_INET6;
 	      sep->se_v4mapped = 0;
+	      /* Check for tcp6only and udp6only.  */
+	      if (strcmp (&sep->se_proto[3], "6only") == 0)
+	        sep->se_v4mapped = 0;
 	    }
 	  else if (sep->se_proto[3] == '4')
 	    {
@@ -1207,7 +1210,6 @@ fix_tcpmux (void)
 
       serv.se_service = newstr ("tcpmux");
       serv.se_socktype = SOCK_STREAM;
-      serv.se_proto = newstr ("tcp");
       serv.se_checked = 1;
       serv.se_user = newstr ("root");
       serv.se_bi = bi_lookup (&serv);
@@ -1225,9 +1227,11 @@ fix_tcpmux (void)
       serv.se_fd = -1;
       serv.se_type = NORM_TYPE;
 #ifdef IPV6
+      serv.se_proto = newstr ("tcp6");
       serv.se_family = AF_INET6;
       serv.se_v4mapped = 1;
 #else
+      serv.se_proto = newstr ("tcp");
       serv.se_family = AF_INET;
 #endif
       if (debug)

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

Summary of changes:
 ChangeLog               |   70 +++++++++++++++++++++++++++++++++++++++++++++++
 TODO                    |    5 +++
 bootstrap.conf          |    1 +
 configure.ac            |   13 +--------
 ifconfig/flags.c        |    3 ++
 ifconfig/options.c      |    4 +-
 ifconfig/printif.c      |   10 ++++---
 libinetutils/tftpsubs.c |    2 +-
 libls/ls.c              |    4 +--
 src/inetd.c             |   34 ++++++++++++++++-------
 src/tftpd.c             |   57 +++++++++++++++++++++++++++-----------
 src/uucpd.c             |    4 +--
 talk/init_disp.c        |   10 +------
 telnet/externs.h        |   10 +-----
 telnetd/telnetd.h       |    8 +-----
 telnetd/term.c          |   54 +-----------------------------------
 16 files changed, 161 insertions(+), 128 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Mon Oct 18 13:00:49 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1P7t4r-0005bY-97
	for mharc-commit-inetutils@gnu.org; Mon, 18 Oct 2010 13:00:49 -0400
Received: from [140.186.70.92] (port=45315 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1P7t4o-0005ZG-KL
	for commit-inetutils@gnu.org; Mon, 18 Oct 2010 13:00:47 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ams@gnu.org>) id 1P7t4n-0005xO-I0
	for commit-inetutils@gnu.org; Mon, 18 Oct 2010 13:00:46 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:57643
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1P7t4n-0005xI-Ge
	for commit-inetutils@gnu.org; Mon, 18 Oct 2010 13:00:45 -0400
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 <ams@gnu.org>) id 1P7t4h-0006ht-7Z
	for commit-inetutils@gnu.org; Mon, 18 Oct 2010 17:00:44 +0000
Received: from ams by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <ams@savannah.gnu.org>) id 1P7t4Q-0003hp-L7
	for commit-inetutils@gnu.org; Mon, 18 Oct 2010 17:00:29 +0000
To: commit-inetutils@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: a748d81646a4366402f15f13d0751386dab20291
X-Git-Newrev: 0d8a14c857d85fa806587f5cb9391a7521f22bec
Message-Id: <E1P7t4Q-0003hp-L7@vcs-noshell.in.savannah.gnu.org>
From: "Alfred M. Szmidt" <ams@gnu.org>
Date: Mon, 18 Oct 2010 17:00:22 +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-49-g0d8a14c
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: Mon, 18 Oct 2010 17:00:47 -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  0d8a14c857d85fa806587f5cb9391a7521f22bec (commit)
      from  a748d81646a4366402f15f13d0751386dab20291 (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=0d8a14c857d85fa806587f5cb9391a7521f22bec


commit 0d8a14c857d85fa806587f5cb9391a7521f22bec
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Mon Oct 18 18:58:34 2010 +0200

    NEWS: Updated.  (silent change)

diff --git a/NEWS b/NEWS
index 0c2e830..8da97d1 100644
--- a/NEWS
+++ b/NEWS
@@ -8,10 +8,17 @@ Please send inetutils bug reports to <bug-inetutils@gnu.org>.
 XXX YY, ZZ
 Version A.B:
 
+Many OpenBSD fixes.
+
+* tftp
+
+Handle IPv6 connections.
+
 * ifconfig
 
 Now under GNU/Linux "ifconfig -a" shows also interfaces without an address.
 
+Adjusted output formating for "unix".
 
 May 15, 2010
 Version 1.8:

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

Summary of changes:
 NEWS |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Tue Oct 19 13:10:31 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1P8Fhn-0006c2-BR
	for mharc-commit-inetutils@gnu.org; Tue, 19 Oct 2010 13:10:31 -0400
Received: from [140.186.70.92] (port=52708 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1P8Fhh-0006Wo-6z
	for commit-inetutils@gnu.org; Tue, 19 Oct 2010 13:10:29 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ams@gnu.org>) id 1P8FhZ-0003m9-K7
	for commit-inetutils@gnu.org; Tue, 19 Oct 2010 13:10:25 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:44281
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1P8FhZ-0003m0-HV
	for commit-inetutils@gnu.org; Tue, 19 Oct 2010 13:10:17 -0400
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 <ams@gnu.org>) id 1P8FhZ-0007WU-7q
	for commit-inetutils@gnu.org; Tue, 19 Oct 2010 17:10:17 +0000
Received: from ams by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <ams@savannah.gnu.org>) id 1P8FhY-00013Z-UP
	for commit-inetutils@gnu.org; Tue, 19 Oct 2010 17:10:17 +0000
To: commit-inetutils@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 0d8a14c857d85fa806587f5cb9391a7521f22bec
X-Git-Newrev: e02ec46ff5b92f5c996665f52fceda29e3bb2f19
Message-Id: <E1P8FhY-00013Z-UP@vcs-noshell.in.savannah.gnu.org>
From: "Alfred M. Szmidt" <ams@gnu.org>
Date: Tue, 19 Oct 2010 17:10:16 +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-51-ge02ec46
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, 19 Oct 2010 17:10:29 -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  e02ec46ff5b92f5c996665f52fceda29e3bb2f19 (commit)
       via  2354c306dc5a2513ef631e5eab26118857db7640 (commit)
      from  0d8a14c857d85fa806587f5cb9391a7521f22bec (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=e02ec46ff5b92f5c996665f52fceda29e3bb2f19


commit e02ec46ff5b92f5c996665f52fceda29e3bb2f19
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Tue Oct 19 19:08:21 2010 +0200

    Add `tftpd' and `tftp' test.

diff --git a/ChangeLog b/ChangeLog
index 18c06f9..931d59f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-10-19  Ludovic Courtès  <ludo@gnu.org>
+
+	Add `tftpd' and `tftp' test.
+
+	* tests/Makefile.am (dist_check_SCRIPTS) [ENABLE_inetd &&
+	ENABLE_tftpd && ENABLE_tftp]: Add `tftp.sh'.
+	* tests/tftp.sh: New file.
+
 2010-10-19  Alfred M. Szmidt  <ams@gnu.org>
 
 	Silence sc_program_name errors.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index f64a066..cce19ee 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -28,6 +28,13 @@ endif
 if ENABLE_traceroute
 dist_check_SCRIPTS += traceroute-localhost.sh
 endif
+if ENABLE_inetd
+if ENABLE_tftpd
+if ENABLE_tftp
+dist_check_SCRIPTS += tftp.sh
+endif
+endif
+endif
 TESTS = $(check_PROGRAMS) $(dist_check_SCRIPTS)
 
 TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT)
diff --git a/tests/tftp.sh b/tests/tftp.sh
new file mode 100755
index 0000000..6b2dc80
--- /dev/null
+++ b/tests/tftp.sh
@@ -0,0 +1,80 @@
+#!/bin/sh
+
+# 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/'.
+
+# Run `inetd' with `tftpd' and try to fetch a file from there using `tftp'.
+
+TFTP="${TFTP:-../src/tftp$EXEEXT}"
+TFTPD="${TFTPD:-$PWD/../src/tftpd$EXEEXT}"
+INETD="${INETD:-../src/inetd$EXEEXT}"
+IFCONFIG="${IFCONFIG:-../ifconfig/ifconfig$EXEEXT}"
+
+PORT=7777
+INETD_CONF="$PWD/inetd.conf.tmp"
+
+ADDRESSES="`$IFCONFIG | grep 'inet addr:' | \
+  sed -e's/inet addr:\([^ ]\+\)[[:blank:]].*$/\1/g'`"
+
+if [ "$VERBOSE" ]; then
+    set -x
+    "$TFTP" --version
+    "$TFTPD" --version
+    "$INETD" --version
+fi
+
+# Create `inetd.conf'.  Note: We want $TFTPD to be an absolute file
+# name because `inetd' chdirs to `/' in daemon mode; ditto for
+# $INETD_CONF.
+cat > "$INETD_CONF" <<EOF
+$PORT dgram udp wait $USER $TFTPD   tftpd -l `pwd`/tftp-test
+EOF
+
+# Launch `inetd', assuming it's reachable at all $ADDRESSES.
+$INETD "${VERBOSE:+-d}" "$INETD_CONF" &
+inetd_pid="$!"
+
+if [ -f /dev/urandom ]; then
+    input="/dev/urandom"
+else
+    input="/dev/zero"
+fi
+
+rm -fr tftp-test tftp-test-file
+mkdir tftp-test && \
+    dd if="$input" of="tftp-test/tftp-test-file" bs=1024 count=170
+
+for addr in $ADDRESSES; do
+    echo "trying with address \`$addr'..." >&2
+
+    rm -f tftp-test-file
+    echo "get tftp-test-file" | "$TFTP" $addr $PORT
+
+    cmp tftp-test/tftp-test-file tftp-test-file
+    result=$?
+
+    if [ "$result" -ne 0 ]; then
+	# Failure.
+	break
+    fi
+done
+
+kill "$inetd_pid"
+
+rm -rf tftp-test tftp-test-file "$INETD_CONF"
+
+exit $result

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


commit 2354c306dc5a2513ef631e5eab26118857db7640
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Tue Oct 19 19:00:38 2010 +0200

    Silence sc_program_name errors.

diff --git a/ChangeLog b/ChangeLog
index 2ab8b07..18c06f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2010-10-19  Alfred M. Szmidt  <ams@gnu.org>
+
+	Silence sc_program_name errors.
+
+	* cfg.mk (local-checks-to-skip): Removed sc_program_name from
+	list.
+	* tests/localhost.c: Include <progname.h>.
+	(main): Set type to `int main (int argc, char **argv)'.  Call
+	set_program_name.
+	* talkd/talkd.c: Include <progname.h>.
+	(main): Call set_program_name.
+	* libinetutils/argcv.c: Include <progname.h>.
+	(main): Set type to `int main (int argc, char **argv)'.  Call
+	set_program_name.
+	* ifconfig/options.c (parse_cmdline): Removed call to
+	set_program_name.
+	* ifconfig/ifconfig.c: Include <progname.h>
+	(main): Call set_program_name.
+
+	* bootstrap.conf (gnulib_modules): Added git-merge-changelog to
+	list.
+
 2010-10-18  Alfred M. Szmidt  <ams@gnu.org>
 
 	Always use <termios.h> interface.
diff --git a/bootstrap.conf b/bootstrap.conf
index 01dceda..120b99f 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -43,6 +43,7 @@ getpass
 gettext
 gettext-h
 getusershell
+git-merge-changelog
 glob
 gnupload
 inttostr
diff --git a/cfg.mk b/cfg.mk
index 0a52165..88d0b75 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -25,7 +25,6 @@ local-checks-to-skip = \
 	sc_error_message_uppercase \
 	sc_immutable_NEWS \
 	sc_m4_quote_check \
-	sc_program_name \
 	sc_prohibit_atoi_atof \
 	sc_prohibit_stat_st_blocks \
 	sc_prohibit_strcmp \
diff --git a/ifconfig/ifconfig.c b/ifconfig/ifconfig.c
index e330061..5fbec62 100644
--- a/ifconfig/ifconfig.c
+++ b/ifconfig/ifconfig.c
@@ -43,6 +43,7 @@
 #include <sys/ioctl.h>
 #include <net/if.h>
 #include <arpa/inet.h>
+#include <progname.h>
 #include "ifconfig.h"
 
 int
@@ -51,7 +52,7 @@ main (int argc, char *argv[])
   int err = 0;
   int sfd;
   struct ifconfig *ifp;
-
+  set_program_name (argv[0]);
   parse_cmdline (argc, argv);
 
   sfd = socket (AF_INET, SOCK_STREAM, 0);
diff --git a/ifconfig/options.c b/ifconfig/options.c
index dcd38d9..578e664 100644
--- a/ifconfig/options.c
+++ b/ifconfig/options.c
@@ -566,7 +566,6 @@ parse_cmdline (int argc, char *argv[])
 {
   int index;
   struct ifconfig *ifp = ifs;
-  set_program_name (argv[0]);
 
   parse_opt_set_default_format (NULL);
   iu_argp_init ("ifconfig", program_authors);
diff --git a/libinetutils/argcv.c b/libinetutils/argcv.c
index b1d2862..e5a16b1 100644
--- a/libinetutils/argcv.c
+++ b/libinetutils/argcv.c
@@ -21,6 +21,7 @@
 
 #include "argcv.h"
 #include <ctype.h>
+#include <progname.h>
 
 /*
  * takes a string and splits it into several strings, breaking at ' '
@@ -177,11 +178,12 @@ argcv_string (int argc, char **argv, char **pstring)
 #if 0
 char *command = "set prompt=\"& \"";
 
-main ()
+int
+main (int argc, char **argv)
 {
   int i, argc;
   char **argv;
-
+  set_program_name (argv[0]);
   argcv_get (command, "=", &argc, &argv);
   printf ("%d args:\n", argc);
   for (i = 0; i < argc; i++)
diff --git a/talkd/talkd.c b/talkd/talkd.c
index 39063ed..ea58c54 100644
--- a/talkd/talkd.c
+++ b/talkd/talkd.c
@@ -22,6 +22,7 @@
 #include <intalkd.h>
 #include <signal.h>
 #include <libinetutils.h>
+#include <progname.h>
 
 #ifndef LOG_FACILITY
 # define LOG_FACILITY LOG_DAEMON
@@ -95,6 +96,7 @@ static struct argp argp = {argp_options, parse_opt, args_doc, doc};
 int
 main (int argc, char *argv[])
 {
+  set_program_name (argv[0]);
   /* Parse command line */
   iu_argp_init ("talkd", program_authors);
   argp_parse (&argp, argc, argv, 0, NULL, NULL);
diff --git a/tests/localhost.c b/tests/localhost.c
index 0b8e03d..1427db6 100644
--- a/tests/localhost.c
+++ b/tests/localhost.c
@@ -21,12 +21,13 @@
 #include "libinetutils.h"
 
 #include <stdio.h>
+#include <progname.h>
 
 int
-main (void)
+main (int argc, char **argv)
 {
   const char *p = localhost ();
-
+  set_program_name (argv[0]);
   if (!p)
     return 1;
 

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

Summary of changes:
 ChangeLog            |   30 ++++++++++++++++++
 bootstrap.conf       |    1 +
 cfg.mk               |    1 -
 ifconfig/ifconfig.c  |    3 +-
 ifconfig/options.c   |    1 -
 libinetutils/argcv.c |    6 ++-
 talkd/talkd.c        |    2 +
 tests/Makefile.am    |    7 ++++
 tests/localhost.c    |    5 ++-
 tests/tftp.sh        |   80 ++++++++++++++++++++++++++++++++++++++++++++++++++
 10 files changed, 129 insertions(+), 7 deletions(-)
 create mode 100755 tests/tftp.sh


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Tue Oct 19 18:03:01 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1P8KGq-00065D-Nw
	for mharc-commit-inetutils@gnu.org; Tue, 19 Oct 2010 18:03:00 -0400
Received: from [140.186.70.92] (port=35880 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1P8KGn-0005jZ-Bn
	for commit-inetutils@gnu.org; Tue, 19 Oct 2010 18:02:59 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ams@gnu.org>) id 1P8K2U-0008BN-Kp
	for commit-inetutils@gnu.org; Tue, 19 Oct 2010 17:48:11 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:49279
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1P8K2U-0008BJ-JF
	for commit-inetutils@gnu.org; Tue, 19 Oct 2010 17:48:10 -0400
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 <ams@gnu.org>) id 1P8K2U-0002Ti-BC
	for commit-inetutils@gnu.org; Tue, 19 Oct 2010 21:48:10 +0000
Received: from ams by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <ams@savannah.gnu.org>) id 1P8K2U-0000is-4H
	for commit-inetutils@gnu.org; Tue, 19 Oct 2010 21:48:10 +0000
To: commit-inetutils@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: e02ec46ff5b92f5c996665f52fceda29e3bb2f19
X-Git-Newrev: 100374d4499666e84b4ba2d070da7f765087a51b
Message-Id: <E1P8K2U-0000is-4H@vcs-noshell.in.savannah.gnu.org>
From: "Alfred M. Szmidt" <ams@gnu.org>
Date: Tue, 19 Oct 2010 21:48:10 +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-52-g100374d
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, 19 Oct 2010 22:02:59 -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  100374d4499666e84b4ba2d070da7f765087a51b (commit)
      from  e02ec46ff5b92f5c996665f52fceda29e3bb2f19 (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=100374d4499666e84b4ba2d070da7f765087a51b


commit 100374d4499666e84b4ba2d070da7f765087a51b
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Tue Oct 19 23:25:48 2010 +0200

    Added gendocs module for generation of web manual.

diff --git a/ChangeLog b/ChangeLog
index 931d59f..d2f4be6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-10-19  Alfred M. Szmidt  <ams@gnu.org>
+
+	Added gendocs module for generation of web manual.
+
+	* doc/.gitignore: Ignore gendocs_template.
+	* cfg.mk (manual_title): New variable.
+	* bootstrap.conf (gnulib_modules): Added gendocs to list.
+
 2010-10-19  Ludovic Courtès  <ludo@gnu.org>
 
 	Add `tftpd' and `tftp' test.
diff --git a/bootstrap.conf b/bootstrap.conf
index 120b99f..e4511dc 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -35,6 +35,7 @@ extensions
 fdl-1.3
 filemode
 forkpty
+gendocs
 getaddrinfo
 getcwd
 getline
diff --git a/cfg.mk b/cfg.mk
index 88d0b75..8bf3211 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -32,6 +32,8 @@ local-checks-to-skip = \
 
 htmldir = ../www-$(PACKAGE)
 
+manual_title = GNU network utilities
+
 web-coverage:
 	rm -fv `find $(htmldir)/coverage -type f | grep -v CVS`
 	cp -rv doc/coverage/* $(htmldir)/coverage/
diff --git a/doc/.gitignore b/doc/.gitignore
index a6b422f..3a21987 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -1,4 +1,5 @@
 fdl-1.3.texi
+gendocs_template
 inetutils.info*
 stamp-vti
 version.texi

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

Summary of changes:
 ChangeLog      |    8 ++++++++
 bootstrap.conf |    1 +
 cfg.mk         |    2 ++
 doc/.gitignore |    1 +
 4 files changed, 12 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Tue Oct 26 18:45:48 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1PAsH5-00034j-T5
	for mharc-commit-inetutils@gnu.org; Tue, 26 Oct 2010 18:45:47 -0400
Received: from [140.186.70.92] (port=35368 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1PAsH3-00032Q-5Q
	for commit-inetutils@gnu.org; Tue, 26 Oct 2010 18:45:46 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1PAsH2-0000gb-5a
	for commit-inetutils@gnu.org; Tue, 26 Oct 2010 18:45:45 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:49763
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1PAsH2-0000gU-3h
	for commit-inetutils@gnu.org; Tue, 26 Oct 2010 18:45:44 -0400
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 1PAsH1-0007QD-IF
	for commit-inetutils@gnu.org; Tue, 26 Oct 2010 22:45:43 +0000
Received: from jas by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <jas@savannah.gnu.org>) id 1PAsGw-0002B2-C9
	for commit-inetutils@gnu.org; Tue, 26 Oct 2010 22:45:38 +0000
To: commit-inetutils@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 100374d4499666e84b4ba2d070da7f765087a51b
X-Git-Newrev: bb5b08302663ac94707fcc4cbfac69513968590c
Message-Id: <E1PAsGw-0002B2-C9@vcs-noshell.in.savannah.gnu.org>
From: Simon Josefsson <simon@josefsson.org>
Date: Tue, 26 Oct 2010 22:45:38 +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-54-gbb5b083
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, 26 Oct 2010 22:45:46 -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  bb5b08302663ac94707fcc4cbfac69513968590c (commit)
       via  c4956d533efbc0972bf97ed66e1b867e92b4d56f (commit)
      from  100374d4499666e84b4ba2d070da7f765087a51b (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=bb5b08302663ac94707fcc4cbfac69513968590c


commit bb5b08302663ac94707fcc4cbfac69513968590c
Author: Simon Josefsson <simon@josefsson.org>
Date:   Wed Oct 27 00:45:31 2010 +0200

    telnetd/telnetd.c: Reuse address length in a second place.

diff --git a/ChangeLog b/ChangeLog
index bfef348..da358cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-10-27  Mats Erik Andersson <gnu@gisladisker.se>
+	    Simon Josefsson  <simon@josefsson.org>
+
+	* telnetd/telnetd.c (telnetd_setup): Pass correct length of saddr
+	to getnameinfo calls.
+
 2010-10-26  Mats Erik Andersson <gnu@gisladisker.se>
 
 	* telnetd/telnetd.c (telnetd_setup): Really use LEN as size of address.
diff --git a/telnetd/telnetd.c b/telnetd/telnetd.c
index b155087..bde589a 100644
--- a/telnetd/telnetd.c
+++ b/telnetd/telnetd.c
@@ -317,7 +317,7 @@ telnetd_setup (int fd)
 
   /* We use a second buffer so we don't have to call getnameinfo again
      if we need the numeric host below.  */
-  err = getnameinfo ((struct sockaddr *) &saddr, sizeof (saddr), buf2,
+  err = getnameinfo ((struct sockaddr *) &saddr, len, buf2,
 		     sizeof (buf2), NULL, 0, NI_NAMEREQD);
 
   if (reverse_lookup)

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


commit c4956d533efbc0972bf97ed66e1b867e92b4d56f
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Tue Oct 26 22:48:15 2010 +0200

    telnetd/telnetd.c: Reuse address length. Needed for OpenBSD.
    
    Signed-off-by: Simon Josefsson <simon@josefsson.org>

diff --git a/ChangeLog b/ChangeLog
index d2f4be6..bfef348 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-10-26  Mats Erik Andersson <gnu@gisladisker.se>
+
+	* telnetd/telnetd.c (telnetd_setup): Really use LEN as size of address.
+
 2010-10-19  Alfred M. Szmidt  <ams@gnu.org>
 
 	Added gendocs module for generation of web manual.
diff --git a/telnetd/telnetd.c b/telnetd/telnetd.c
index b72cd73..b155087 100644
--- a/telnetd/telnetd.c
+++ b/telnetd/telnetd.c
@@ -300,7 +300,7 @@ telnetd_setup (int fd)
     }
 
 #ifdef IPV6
-  err = getnameinfo ((struct sockaddr *) &saddr, sizeof (saddr), buf,
+  err = getnameinfo ((struct sockaddr *) &saddr, len, buf,
 		     sizeof (buf), NULL, 0, NI_NUMERICHOST);
   if (err)
     {

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

Summary of changes:
 ChangeLog         |   10 ++++++++++
 telnetd/telnetd.c |    4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Sun Oct 31 16:40:52 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1PCehw-0004Pm-9k
	for mharc-commit-inetutils@gnu.org; Sun, 31 Oct 2010 16:40:52 -0400
Received: from [140.186.70.92] (port=49681 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1PCehn-0004Pc-Pn
	for commit-inetutils@gnu.org; Sun, 31 Oct 2010 16:40:49 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ams@gnu.org>) id 1PCehg-0004EG-3R
	for commit-inetutils@gnu.org; Sun, 31 Oct 2010 16:40:43 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:51309
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1PCehf-0004E6-WE
	for commit-inetutils@gnu.org; Sun, 31 Oct 2010 16:40:36 -0400
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 <ams@gnu.org>) id 1PCehZ-0007Wt-N0
	for commit-inetutils@gnu.org; Sun, 31 Oct 2010 20:40:34 +0000
Received: from ams by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <ams@savannah.gnu.org>) id 1PCehP-0000QI-QV
	for commit-inetutils@gnu.org; Sun, 31 Oct 2010 20:40:24 +0000
To: commit-inetutils@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: bb5b08302663ac94707fcc4cbfac69513968590c
X-Git-Newrev: 82220c25850dc6f208f7319b209b0dd3df1fc00f
Message-Id: <E1PCehP-0000QI-QV@vcs-noshell.in.savannah.gnu.org>
From: "Alfred M. Szmidt" <ams@gnu.org>
Date: Sun, 31 Oct 2010 20:40:19 +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-62-g82220c2
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: Sun, 31 Oct 2010 20:40:50 -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  82220c25850dc6f208f7319b209b0dd3df1fc00f (commit)
       via  60a541619269b32b53c7c05003821b91bd1e5044 (commit)
       via  fe539ae9c3a1e6456859593ef7aa9ba4797d881c (commit)
       via  3b7ce1732f80421b8e24496e9a0be538ad11462e (commit)
       via  5b174beae521f700a886911829a6a9a11cf426bd (commit)
       via  cc3c8e7c7a75f7112f43660e93c3b8a0e1bb27c2 (commit)
       via  8698a66345bff08d1e0929703b7fd42a89e20460 (commit)
       via  08866d9632061cea2e56616497df6aa7f88ccf6a (commit)
      from  bb5b08302663ac94707fcc4cbfac69513968590c (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=82220c25850dc6f208f7319b209b0dd3df1fc00f


commit 82220c25850dc6f208f7319b209b0dd3df1fc00f
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Sun Oct 31 21:25:52 2010 +0100

    libinetutils: UTMP fixes for OpenBSD.

diff --git a/ChangeLog b/ChangeLog
index 66cc297..b22cca1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2010-10-31  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	libinetutils: UTMP fixes for OpenBSD.
+
+	* libinetutils/utmp_init.c [HAVE_UTIL_H]: Include <util.h>.
+	(utmp_init): Only use UTX.ut_host if HAVE_STRUCT_UTMP_UT_NAME ||
+	HAVE_STRUCT_UTMPX_UT_NAME are defined.
+	[HAVE_STRUCT_UTMP_UT_HOST]: Initialise USER using UTX.ut_host.
+	Call pututline()/endutent() only if HAVE_DECL_GETUTENT is defined, otherwise use login().
+	* libinetutils/cleansess.c [HAVE_UTIL_H]: Include <util.h>.
+	* libinetutils/utmp_logout.c [HAVE_UTIL_H]: Include <util.h>.
+	Call getutline() only if HAVE_DECL_GETUTENT is defined, otherwise
+	use logout().
+
 2010-10-31  Alfred M. Szmidt  <ams@gnu.org>
 
 	Use git-version-gen to extract version number.
diff --git a/libinetutils/cleansess.c b/libinetutils/cleansess.c
index 87d3de5..7757351 100644
--- a/libinetutils/cleansess.c
+++ b/libinetutils/cleansess.c
@@ -26,6 +26,9 @@
 #include <sys/time.h>
 #include <time.h>
 #ifdef HAVE_UTMP_H
+# if HAVE_UTIL_H
+#  include <util.h>
+# endif
 # include <utmp.h>
 #else
 # ifdef  HAVE_UTMPX_H
diff --git a/libinetutils/utmp_init.c b/libinetutils/utmp_init.c
index 8e4fcfd..aa4e874 100644
--- a/libinetutils/utmp_init.c
+++ b/libinetutils/utmp_init.c
@@ -52,6 +52,9 @@
 # endif
 # include <utmpx.h>
 #else
+# if HAVE_UTIL_H
+#  include <util.h>
+# endif
 # include <utmp.h>
 #endif
 #include <string.h>
@@ -77,9 +80,12 @@ utmp_init (char *line, char *user, char *id)
 #endif
 #if defined HAVE_STRUCT_UTMP_UT_USER || defined HAVE_STRUCT_UTMPX_UT_USER
   strncpy (utx.ut_user, user, sizeof (utx.ut_user));
-#else
+#elif defined HAVE_STRUCT_UTMP_UT_NAME || defined HAVE_STRUCT_UTMPX_UT_NAME
   strncpy (utx.ut_name, user, sizeof (utx.ut_name));
 #endif
+#if defined HAVE_STRUCT_UTMP_UT_HOST
+  strncpy (utx.ut_host, user, sizeof (utx.ut_host));
+#endif
   strncpy (utx.ut_line, line, sizeof (utx.ut_line));
 #if defined HAVE_STRUCT_UTMP_UT_PID
   utx.ut_pid = getpid ();
@@ -100,7 +106,7 @@ utmp_init (char *line, char *user, char *id)
   updwtmpx (PATH_WTMPX, &utx);
 # endif
   endutxent ();
-#else
+#elif HAVE_DECL_GETUTENT
   pututline (&utx);
 # ifdef HAVE_UPDWTMP
   updwtmp (PATH_WTMP, &utx);
@@ -108,6 +114,8 @@ utmp_init (char *line, char *user, char *id)
   logwtmp (line, user, id);
 # endif
   endutent ();
+#else
+  login (&utx);
 #endif
 }
 
diff --git a/libinetutils/utmp_logout.c b/libinetutils/utmp_logout.c
index 9774f3c..eb1b6b9 100644
--- a/libinetutils/utmp_logout.c
+++ b/libinetutils/utmp_logout.c
@@ -49,6 +49,9 @@
 # define __USE_GNU
 # include <utmpx.h>
 #else
+# if HAVE_UTIL_H
+#  include <util.h>
+# endif
 # include <utmp.h>
 #endif
 #include <string.h>
@@ -79,7 +82,7 @@ utmp_logout (char *line)
       updwtmpx (PATH_WTMPX, ut);
     }
   endutxent ();
-#else
+#elif HAVE_DECL_GETUTENT
   struct utmp utx;
   struct utmp *ut;
 
@@ -116,5 +119,8 @@ utmp_logout (char *line)
 # endif
     }
   endutent ();
+#else
+  if (logout (line))
+    logwtmp (line, "", "");
 #endif
 }

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


commit 60a541619269b32b53c7c05003821b91bd1e5044
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Sun Oct 31 20:59:33 2010 +0100

    Use git-version-gen to extract version number.

diff --git a/.gitignore b/.gitignore
index 1733723..a3e9634 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,8 @@
 .deps
 .emacs*
 .libs
+.tarball-version
+.version
 ABOUT-NLS
 GNUmakefile
 INSTALL
diff --git a/ChangeLog b/ChangeLog
index fe501c3..66cc297 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2010-10-31  Alfred M. Szmidt  <ams@gnu.org>
+
+	Use git-version-gen to extract version number.
+
+	* .gitignore (.tarball-version, .version): Added to list.
+	* configure.ac: Use git-version-gen to extract version number.
+	* bootstrap.conf (gnulib_modules): Added git-version-gen to list.
+
+	* Makefile.am (BUILT_SOURCES): New variable.
+	($(top_srcdir)/.version, dist-hook): New targets.
+
+	* bootstrap.conf (gnulib_modules): Removed unlocked-io from list.
+
 2010-10-31  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	traceroute: Pass integer values to IP_TTL option.
diff --git a/Makefile.am b/Makefile.am
index 7af1c56..adbfce6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,5 +31,11 @@ SUBDIRS = lib \
 
 DISTCLEANFILES = pathdefs.make paths.defs $(PACKAGE)-$(VERSION).tar.gz
 
+BUILT_SOURCES = $(top_srcdir)/.version
+$(top_srcdir)/.version:
+	echo $(VERSION) > $@-t && mv $@-t $@
+dist-hook:
+	echo $(VERSION) > $(distdir)/.tarball-version
+
 snapshot:
 	$(MAKE) dist distdir=$(PACKAGE)-`date +"%Y%m%d"`
diff --git a/bootstrap.conf b/bootstrap.conf
index e4511dc..e1158ac 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -45,6 +45,7 @@ gettext
 gettext-h
 getusershell
 git-merge-changelog
+git-version-gen
 glob
 gnupload
 inttostr
@@ -73,7 +74,6 @@ strnlen
 sysexits
 termios
 unistd-safer
-unlocked-io
 update-copyright
 vasnprintf
 version-etc-fsf
diff --git a/configure.ac b/configure.ac
index 183275d..c1ac270 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@
 
 AC_PREREQ(2.59)
 
-AC_INIT([GNU inetutils], [1.8], [bug-inetutils@gnu.org])
+AC_INIT([GNU inetutils], m4_esyscmd([build-aux/git-version-gen .tarball-version]), [bug-inetutils@gnu.org])
 
 AC_CONFIG_SRCDIR([src/inetd.c])
 AC_CONFIG_AUX_DIR([build-aux])

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


commit fe539ae9c3a1e6456859593ef7aa9ba4797d881c
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Sun Oct 31 20:16:53 2010 +0100

    traceroute: Pass integer values to IP_TTL option.

diff --git a/ChangeLog b/ChangeLog
index d0c09ca..fe501c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2010-10-31  Mats Erik Andersson  <gnu@gisladisker.se>
 
+	traceroute: Pass integer values to IP_TTL option.
+
+	* src/traceroute.c (trace_init): Renamed TTLP to TTL, and changed
+	type to `int'.
+	(trace_inc_ttl): Likewise.
+
+2010-10-31  Mats Erik Andersson  <gnu@gisladisker.se>
+
 	Calculate socket length using sockaddr.
 
 	* src/inetd.c: New element `se_addrlen' in `struct servtab'.
diff --git a/src/traceroute.c b/src/traceroute.c
index 0b02fa3..f79e747 100644
--- a/src/traceroute.c
+++ b/src/traceroute.c
@@ -311,9 +311,9 @@ void
 trace_init (trace_t * t, const struct sockaddr_in to,
 	    const enum trace_type type)
 {
-  const unsigned char *ttlp;
+  int ttl;
   assert (t);
-  ttlp = &t->ttl;
+  ttl = t->ttl;
 
   t->type = type;
   t->to = to;
@@ -325,8 +325,8 @@ trace_init (trace_t * t, const struct sockaddr_in to,
       if (t->udpfd < 0)
         error (EXIT_FAILURE, errno, "socket");
 
-      if (setsockopt (t->udpfd, IPPROTO_IP, IP_TTL, ttlp,
-		      sizeof (t->ttl)) < 0)
+      if (setsockopt (t->udpfd, IPPROTO_IP, IP_TTL, &ttl,
+		      sizeof (ttl)) < 0)
         error (EXIT_FAILURE, errno, "setsockopt");
     }
 
@@ -340,7 +340,7 @@ trace_init (trace_t * t, const struct sockaddr_in to,
             error (EXIT_FAILURE, errno, "socket");
 
 	  if (setsockopt (t->icmpfd, IPPROTO_IP, IP_TTL,
-			  ttlp, sizeof (t->ttl)) < 0)
+			  &ttl, sizeof (ttl)) < 0)
             error (EXIT_FAILURE, errno, "setsockopt");
 	}
       else
@@ -520,14 +520,14 @@ void
 trace_inc_ttl (trace_t * t)
 {
   int fd;
-  const unsigned char *ttlp;
+  int ttl;
 
   assert (t);
 
-  ttlp = &t->ttl;
+  ttl = t->ttl;
   t->ttl++;
   fd = (t->type == TRACE_UDP ? t->udpfd : t->icmpfd);
-  if (setsockopt (fd, IPPROTO_IP, IP_TTL, ttlp, sizeof (t->ttl)) < 0)
+  if (setsockopt (fd, IPPROTO_IP, IP_TTL, &ttl, sizeof (ttl)) < 0)
     error (EXIT_FAILURE, errno, "setsockopt");
 }
 

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


commit 3b7ce1732f80421b8e24496e9a0be538ad11462e
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Sun Oct 31 20:04:15 2010 +0100

    inetd: Calculate socket length using sockaddr.

diff --git a/ChangeLog b/ChangeLog
index 8b30433..d0c09ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2010-10-31  Mats Erik Andersson  <gnu@gisladisker.se>
 
+	Calculate socket length using sockaddr.
+
+	* src/inetd.c: New element `se_addrlen' in `struct servtab'.
+	(expand_enter): Record in SE_ADDRLEN the actual length of each
+	established control address.
+	(setup): Use the exact address length in call to bind(3).
+
+2010-10-31  Mats Erik Andersson  <gnu@gisladisker.se>
+
 	Improve the test suite.
 
 	* tests/tftp.sh: Make it robust and portable to GNU/Linux and BSD.
diff --git a/src/inetd.c b/src/inetd.c
index 272e874..f5f7d32 100644
--- a/src/inetd.c
+++ b/src/inetd.c
@@ -254,6 +254,7 @@ struct servtab
   sa_family_t se_family;	/* address family of the socket */
   char se_v4mapped;		/* 1 = accept v4mapped connection, 0 = don't */
   struct sockaddr_storage se_ctrladdr;	/* bound address */
+  socklen_t se_addrlen;		/* exact address length in use */
   unsigned se_refcnt;
   int se_count;			/* number started since se_time */
   struct timeval se_time;	/* start of se_count */
@@ -585,7 +586,7 @@ setup (struct servtab *sep)
     syslog (LOG_ERR, "setsockopt (SO_REUSEADDR): %m");
 
   err = bind (sep->se_fd, (struct sockaddr *) &sep->se_ctrladdr,
-	      sizeof (sep->se_ctrladdr));
+	      sep->se_addrlen);
   if (err < 0)
     {
       /* If we can't bind with AF_INET6 try again with AF_INET.  */
@@ -800,7 +801,9 @@ expand_enter (struct servtab *sep)
 
   for (rp = result; rp != NULL; rp = rp->ai_next)
     {
+      memset (&sep->se_ctrladdr, 0, sizeof (sep->se_ctrladdr));
       memcpy (&sep->se_ctrladdr, rp->ai_addr, rp->ai_addrlen);
+      sep->se_addrlen = rp->ai_addrlen;
       cp = enter (sep);
       servent_setup (cp);
     }

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


commit 5b174beae521f700a886911829a6a9a11cf426bd
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Sun Oct 31 19:56:53 2010 +0100

    ping, tftp, traceroute: Improve the test suite.

diff --git a/ChangeLog b/ChangeLog
index 39ed0e9..8b30433 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-10-31  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	Improve the test suite.
+
+	* tests/tftp.sh: Make it robust and portable to GNU/Linux and BSD.
+	* tests/ping-localhost.sh: Test `ping' and `ping6'.
+	* tests/traceroute-localhost.sh: Test UDP and ICMP.
+
 2010-10-31  Ludovic Courtès  <ludo@gnu.org>
 
 	tftp: Resolve the "tftp" service only when no port is specified.
diff --git a/tests/ping-localhost.sh b/tests/ping-localhost.sh
index 35bf87c..f363787 100755
--- a/tests/ping-localhost.sh
+++ b/tests/ping-localhost.sh
@@ -18,6 +18,10 @@
 # along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 PING=${PING:-../ping/ping$EXEEXT}
+TARGET=${TARGET:-127.0.0.1}
+
+PING6=${PING6:-../ping/ping6$EXEEXT}
+TARGET6=${TARGET6:-::1}
 
 if [ $VERBOSE ]; then
     set -x
@@ -29,6 +33,16 @@ if [ `id -u` != 0 ]; then
     exit 77
 fi
 
-$PING -c 1 127.0.0.1; errno=$?
+errno=0
+errno2=0
+
+$PING -c 1 $TARGET || errno=$?
+test $errno -eq 0 || echo "Failed at pinging $TARGET." >&2
+
+# Host might not have been built with IPv6 support..
+test -x $PING6 && $PING6 -c 1 $TARGET6 || errno2=$?
+test $errno2 -eq 0 || echo "Failed at pinging $TARGET6." >&2
+
+test $errno -eq 0 || exit $errno
 
-exit $errno
+exit $errno2
diff --git a/tests/tftp.sh b/tests/tftp.sh
index 6b2dc80..64d6eb7 100755
--- a/tests/tftp.sh
+++ b/tests/tftp.sh
@@ -22,13 +22,15 @@
 TFTP="${TFTP:-../src/tftp$EXEEXT}"
 TFTPD="${TFTPD:-$PWD/../src/tftpd$EXEEXT}"
 INETD="${INETD:-../src/inetd$EXEEXT}"
-IFCONFIG="${IFCONFIG:-../ifconfig/ifconfig$EXEEXT}"
+IFCONFIG="${IFCONFIG:-../ifconfig/ifconfig$EXEEXT --format=unix}"
 
-PORT=7777
+AF=${AF:-inet}
+PROTO=${PROTO:-udp}
+PORT=${PORT:-7777}
 INETD_CONF="$PWD/inetd.conf.tmp"
 
-ADDRESSES="`$IFCONFIG | grep 'inet addr:' | \
-  sed -e's/inet addr:\([^ ]\+\)[[:blank:]].*$/\1/g'`"
+ADDRESSES="`$IFCONFIG | sed -e "/$AF /!d" \
+     -e "s/^.*$AF[[:blank:]]\([:.0-9]\{1,\}\)[[:blank:]].*$/\1/g"`"
 
 if [ "$VERBOSE" ]; then
     set -x
@@ -37,17 +39,38 @@ if [ "$VERBOSE" ]; then
     "$INETD" --version
 fi
 
+# Check that the port is still available
+netstat -na | grep -q "^$PROTO .*$PORT "
+if test $? -eq 0; then
+    echo "Desired port $PORT/$PROTO is already in use."
+    exit 1
+fi
+
 # Create `inetd.conf'.  Note: We want $TFTPD to be an absolute file
 # name because `inetd' chdirs to `/' in daemon mode; ditto for
 # $INETD_CONF.
 cat > "$INETD_CONF" <<EOF
-$PORT dgram udp wait $USER $TFTPD   tftpd -l `pwd`/tftp-test
+$PORT dgram $PROTO wait $USER $TFTPD   tftpd -l `pwd`/tftp-test
 EOF
 
 # Launch `inetd', assuming it's reachable at all $ADDRESSES.
-$INETD "${VERBOSE:+-d}" "$INETD_CONF" &
+$INETD -d "$INETD_CONF" &
 inetd_pid="$!"
 
+test -z "$VERBOSE" || echo "Launched Inetd as process $inetd_pid." >&2
+
+# Wait somewhat for the service to settle.
+sleep 1
+
+# Did `inetd' really succeed in establishing a listener?
+netstat -na | grep "^$PROTO .*$PORT "
+if test $? -ne 0; then
+    # No it did not.
+    ps "$inetd_pid" >/dev/null 2>&1 && kill "$inetd_pid"
+    echo "Failed in starting correct Inetd instance." >&2
+    exit 1
+fi
+
 if [ -f /dev/urandom ]; then
     input="/dev/urandom"
 else
@@ -56,7 +79,9 @@ fi
 
 rm -fr tftp-test tftp-test-file
 mkdir tftp-test && \
-    dd if="$input" of="tftp-test/tftp-test-file" bs=1024 count=170
+    dd if="$input" of="tftp-test/tftp-test-file" bs=1024 count=170 2>/dev/null
+
+echo "Looks into $ADDRESSES."
 
 for addr in $ADDRESSES; do
     echo "trying with address \`$addr'..." >&2
@@ -69,12 +94,18 @@ for addr in $ADDRESSES; do
 
     if [ "$result" -ne 0 ]; then
 	# Failure.
+	test -z "$VERBOSE" || echo "Failed comparison for $addr." >&2
 	break
+    else
+	test -z "$VERBOSE" || echo "Successful comparison for $addr." >&2
     fi
 done
 
-kill "$inetd_pid"
++ps "$inetd_pid" >/dev/null 2>&1 && kill "$inetd_pid"
 
 rm -rf tftp-test tftp-test-file "$INETD_CONF"
 
+# Minimal clean up
+echo
+
 exit $result
diff --git a/tests/traceroute-localhost.sh b/tests/traceroute-localhost.sh
index 97d13dc..3b45c46 100755
--- a/tests/traceroute-localhost.sh
+++ b/tests/traceroute-localhost.sh
@@ -18,6 +18,7 @@
 # along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 TRACEROUTE=${TRACEROUTE:-../src/traceroute$EXEEXT}
+TARGET=${TARGET:-127.0.0.1}
 
 if [ $VERBOSE ]; then
     set -x
@@ -29,6 +30,15 @@ if [ `id -u` != 0 ]; then
     exit 77
 fi
 
-$TRACEROUTE 127.0.0.1; errno=$?
+errno=0
+errno2=0
 
-exit $errno
+$TRACEROUTE --type=udp $TARGET || errno=$?
+test $errno -eq 0 || echo "Failed at UDP tracing." >&2
+
+$TRACEROUTE --type=icmp $TARGET || errno2=$?
+test $errno2 -eq 0 || echo "Failed at ICMP tracing." >&2
+
+test $errno -eq 0 || exit $errno
+
+exit $errno2

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


commit cc3c8e7c7a75f7112f43660e93c3b8a0e1bb27c2
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Sun Oct 31 19:46:31 2010 +0100

    tftp: Resolve the "tftp" service only when no port is specified.

diff --git a/ChangeLog b/ChangeLog
index da358cb..39ed0e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-10-31  Ludovic Courtès  <ludo@gnu.org>
+
+	tftp: Resolve the "tftp" service only when no port is specified.
+
+	* src/tftp.c: Include <error.h>.
+	(port): Change from `short' to `int'.
+	(sp): Remove variable.
+	(main): Don't call `getservbyname'.
+	(setpeer): Call `getservbyname' when ARGC != 3.
+	(put, get): Refer to PORT instead of SP->s_port.
+
 2010-10-27  Mats Erik Andersson <gnu@gisladisker.se>
 	    Simon Josefsson  <simon@josefsson.org>
 
diff --git a/src/tftp.c b/src/tftp.c
index 6515976..f8f5582 100644
--- a/src/tftp.c
+++ b/src/tftp.c
@@ -63,6 +63,7 @@
 #include <arpa/inet.h>
 
 #include <errno.h>
+#include <error.h>
 #include <fcntl.h>
 #include <netdb.h>
 #include <setjmp.h>
@@ -99,7 +100,7 @@ static int maxtimeout = 5 * TIMEOUT;
 
 static struct sockaddr_in peeraddr;	/* filled in by main */
 static int f;			/* the opened socket */
-static short port;
+static int port; /* Port number in network byte order of the server. */
 static int trace;
 static int verbose;
 static int connected;
@@ -111,7 +112,6 @@ char *margv[20];
 char *prompt = "tftp";
 jmp_buf toplevel;
 void intr (int signo);
-struct servent *sp;
 
 void get (int, char **);
 void help (int, char **);
@@ -226,12 +226,6 @@ main (int argc, char *argv[])
   iu_argp_init ("tftp", default_program_authors);
   argp_parse (&argp, argc, argv, 0, NULL, NULL);
 
-  sp = getservbyname ("tftp", "udp");
-  if (sp == 0)
-    {
-      fprintf (stderr, "tftp: udp/tftp: unknown service\n");
-      exit (EXIT_FAILURE);
-    }
   f = socket (AF_INET, SOCK_DGRAM, 0);
   if (f < 0)
     {
@@ -345,9 +339,9 @@ setpeer (int argc, char *argv[])
       hostname = xstrdup (argv[1]);
     }
 
-  port = sp->s_port;
   if (argc == 3)
     {
+      /* Take a user-specified port number.  */
       port = atoi (argv[2]);
       if (port < 0)
 	{
@@ -357,6 +351,15 @@ setpeer (int argc, char *argv[])
 	}
       port = htons (port);
     }
+  else
+    {
+      /* Use the standard TFTP port.  */
+      struct servent *sp;
+      sp = getservbyname ("tftp", "udp");
+      if (sp == 0)
+	error (EXIT_FAILURE, 0, "udp/tftp: unknown service\n");
+      port = sp->s_port;
+    }
   connected = 1;
 }
 
@@ -483,7 +486,7 @@ put (int argc, char *argv[])
 	}
       if (verbose)
 	printf ("putting %s to %s:%s [%s]\n", cp, hostname, targ, mode);
-      peeraddr.sin_port = port ? port : sp->s_port;
+      peeraddr.sin_port = port;
       send_file (fd, targ, mode);
       return;
     }
@@ -503,7 +506,7 @@ put (int argc, char *argv[])
 	}
       if (verbose)
 	printf ("putting %s to %s:%s [%s]\n", argv[n], hostname, targ, mode);
-      peeraddr.sin_port = port ? port : sp->s_port;
+      peeraddr.sin_port = port;
       send_file (fd, targ, mode);
     }
 }
@@ -568,7 +571,7 @@ get (int argc, char *argv[])
 	  if (verbose)
 	    printf ("getting from %s:%s to %s [%s]\n",
 		    hostname, src, cp, mode);
-	  peeraddr.sin_port = port ? port : sp->s_port;
+	  peeraddr.sin_port = port;
 	  recvfile (fd, src, mode);
 	  break;
 	}
@@ -582,7 +585,7 @@ get (int argc, char *argv[])
 	}
       if (verbose)
 	printf ("getting from %s:%s to %s [%s]\n", hostname, src, cp, mode);
-      peeraddr.sin_port = port ? port : sp->s_port;
+      peeraddr.sin_port = port;
       recvfile (fd, src, mode);
     }
 }

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


commit 8698a66345bff08d1e0929703b7fd42a89e20460
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Sat Oct 23 14:15:22 2010 +0200

    Updated.  (silent change)

diff --git a/README b/README
index ffafd99..5558317 100644
--- a/README
+++ b/README
@@ -1,29 +1,10 @@
-GNU Inetutils
+GNU inetutils - The GNU Network Utilities
 
 This is a distribution of common networking utilities and servers.
 
-They are currently mostly from the 4.4BSD-Lite2 distribution, with
-some changes to make them compatible with the GNU Hurd (in particular,
-the Hurd does not define some arbitrary limits, such as MAXPATHLEN),
-and to make them more portable, using autoconf.  A GNU build
-environment has also been added.
-
-The GNU whois client reads a whois-servers file to figure out which
-whois server to use.  It won't always pick the best server;
-whois.internic.net seems to know something about nic.ddn.mil, but the
-GNU whois client will use nic.ddn.mil to look up nic.ddn.mil if you
-use the configuration file we supply.  Our configuration file probably
-also does not have a complete list of whois servers; feel free to send
-information about additional whois servers to the bug reporting
-address.
-
-There are probably many BSD dependencies remaining, but inetutils is
-believed to work on the following system types (and others may work):
-
-  i486-pc-gnu
-  i486-pc-linux-gnu
-  m68k-hp-netbsd1.2
-  sparc-sun-netbsd1.2
+The individual utilities were originally derived from the 4.4BSDLite2
+distribution.  Many features were integrated from NetBSD, OpenBSD,
+FreeBSD and GNU/Linux
 
 The file `paths' contains a list of all paths used by programs in this
 distribution, and rules to find values for them.  To change a path
@@ -39,6 +20,15 @@ if you explicitly specify whether to build a program, that will
 override the values specified by --disable-clients or
 --disable-servers.
 
+The GNU whois client reads a whois-servers file to figure out which
+whois server to use.  It won't always pick the best server;
+whois.internic.net seems to know something about nic.ddn.mil, but the
+GNU whois client will use nic.ddn.mil to look up nic.ddn.mil if you
+use the configuration file we supply.  Our configuration file probably
+also does not have a complete list of whois servers; feel free to send
+information about additional whois servers to the bug reporting
+address.
+
 Notes:
 
 1) All of the r* commands clients, rcp, rlogin, rsh, need to be

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


commit 08866d9632061cea2e56616497df6aa7f88ccf6a
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Wed Oct 20 00:01:00 2010 +0200

    Updated.  (silent change)

diff --git a/README-alpha b/README-alpha
index 3c227d0..039129a 100644
--- a/README-alpha
+++ b/README-alpha
@@ -116,6 +116,7 @@ When doing a stable release, do not forget to:
  - record the release date in NEWS
  - create a tag (inetutils-N_M)
  - post an announcment to info-gnu@gnu.org
+ - update web manual and coverage testing
 
 ** Announcement template
 

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

Summary of changes:
 .gitignore                    |    2 +
 ChangeLog                     |   63 +++++++++++++++++++++++++++++++++++++++++
 Makefile.am                   |    6 ++++
 README                        |   36 ++++++++---------------
 README-alpha                  |    1 +
 bootstrap.conf                |    2 +-
 configure.ac                  |    2 +-
 libinetutils/cleansess.c      |    3 ++
 libinetutils/utmp_init.c      |   12 ++++++-
 libinetutils/utmp_logout.c    |    8 ++++-
 src/inetd.c                   |    5 ++-
 src/tftp.c                    |   29 ++++++++++--------
 src/traceroute.c              |   16 +++++-----
 tests/ping-localhost.sh       |   18 ++++++++++-
 tests/tftp.sh                 |   47 +++++++++++++++++++++++++-----
 tests/traceroute-localhost.sh |   14 ++++++++-
 16 files changed, 202 insertions(+), 62 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Sun Oct 31 17:54:46 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1PCfrS-0003m8-ON
	for mharc-commit-inetutils@gnu.org; Sun, 31 Oct 2010 17:54:46 -0400
Received: from [140.186.70.92] (port=33959 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1PCfrD-0003ia-OM
	for commit-inetutils@gnu.org; Sun, 31 Oct 2010 17:54:45 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ams@gnu.org>) id 1PCfr3-000427-Kk
	for commit-inetutils@gnu.org; Sun, 31 Oct 2010 17:54:31 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:58026
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1PCfr3-00041s-HL
	for commit-inetutils@gnu.org; Sun, 31 Oct 2010 17:54:21 -0400
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 <ams@gnu.org>) id 1PCfr3-0008Kd-39
	for commit-inetutils@gnu.org; Sun, 31 Oct 2010 21:54:21 +0000
Received: from ams by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <ams@savannah.gnu.org>) id 1PCfr2-0004NP-PP
	for commit-inetutils@gnu.org; Sun, 31 Oct 2010 21:54:21 +0000
To: commit-inetutils@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 82220c25850dc6f208f7319b209b0dd3df1fc00f
X-Git-Newrev: 31d3b8e6a669c127fd6fbb6173a5d1a370d811af
Message-Id: <E1PCfr2-0004NP-PP@vcs-noshell.in.savannah.gnu.org>
From: "Alfred M. Szmidt" <ams@gnu.org>
Date: Sun, 31 Oct 2010 21:54:20 +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-64-g31d3b8e
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: Sun, 31 Oct 2010 21:54:45 -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  31d3b8e6a669c127fd6fbb6173a5d1a370d811af (commit)
       via  2772b79f723936f3bb2883458f734cf7bb17e97d (commit)
      from  82220c25850dc6f208f7319b209b0dd3df1fc00f (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=31d3b8e6a669c127fd6fbb6173a5d1a370d811af


commit 31d3b8e6a669c127fd6fbb6173a5d1a370d811af
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Sun Oct 31 22:42:17 2010 +0100

    Fix typo in previous commit: 5b174beae521f700a886911829a6a9a11cf426bd.  (silent change)

diff --git a/tests/tftp.sh b/tests/tftp.sh
index 64d6eb7..f2946ba 100755
--- a/tests/tftp.sh
+++ b/tests/tftp.sh
@@ -101,7 +101,7 @@ for addr in $ADDRESSES; do
     fi
 done
 
-+ps "$inetd_pid" >/dev/null 2>&1 && kill "$inetd_pid"
+ps "$inetd_pid" >/dev/null 2>&1 && kill "$inetd_pid"
 
 rm -rf tftp-test tftp-test-file "$INETD_CONF"
 

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


commit 2772b79f723936f3bb2883458f734cf7bb17e97d
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Sun Oct 31 22:14:39 2010 +0100

    ifconfig/if_index.c (if_nametoindex, if_freenameindex, if_nameindex):
    Provide functions only if HAVE_STRUCT_IF_NAMEINDEX isn't defined.

diff --git a/ChangeLog b/ChangeLog
index b22cca1..f757a82 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-10-31  Mats Erik Andersson <gnu@gisladisker.se>
+
+	* ifconfig/if_index.c (if_nametoindex, if_freenameindex)
+	(if_nameindex): Provide functions only if HAVE_STRUCT_IF_NAMEINDEX
+	isn't defined.
+
 2010-10-31  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	libinetutils: UTMP fixes for OpenBSD.
@@ -132,7 +138,7 @@
 
 	* bootstrap.conf (gnulib_modules): Added termios module.
 
-2010-10-18  Mats Erik Andersson <address@hidden>
+2010-10-18  Mats Erik Andersson <gnu@gisladisker.se>
 
 	* libinetutils/tftpsubs.c (synchnet): Changed type of FROM to be
 	"struct sockaddr_storage".
diff --git a/ifconfig/if_index.c b/ifconfig/if_index.c
index 3518b60..e1b1354 100644
--- a/ifconfig/if_index.c
+++ b/ifconfig/if_index.c
@@ -38,6 +38,7 @@
 
 #include <ifconfig.h>
 
+#ifndef HAVE_STRUCT_IF_NAMEINDEX
 unsigned int
 if_nametoindex (const char *ifname)
 {
@@ -196,3 +197,4 @@ if_nameindex (void)
   return NULL;
 #endif
 }
+#endif

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

Summary of changes:
 ChangeLog           |    8 +++++++-
 ifconfig/if_index.c |    2 ++
 tests/tftp.sh       |    2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


