From MAILER-DAEMON Sun Jun 05 18:26:56 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1QTLma-0003sV-1S
	for mharc-commit-inetutils@gnu.org; Sun, 05 Jun 2011 18:26:56 -0400
Received: from eggs.gnu.org ([140.186.70.92]:41110)
	by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1QTLmX-0003sL-7C
	for commit-inetutils@gnu.org; Sun, 05 Jun 2011 18:26:54 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ams@gnu.org>) id 1QTLmU-0004jH-Pb
	for commit-inetutils@gnu.org; Sun, 05 Jun 2011 18:26:53 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:53468)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1QTLmU-0004jC-Ma
	for commit-inetutils@gnu.org; Sun, 05 Jun 2011 18:26:50 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by colonialone.fsf.org with esmtp (Exim 4.69)
	(envelope-from <ams@gnu.org>) id 1QTLmU-0007gw-3I
	for commit-inetutils@gnu.org; Sun, 05 Jun 2011 22:26:50 +0000
Received: from ams by vcs-noshell.in.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <ams@savannah.gnu.org>) id 1QTLmU-0001Fe-21
	for commit-inetutils@gnu.org; Sun, 05 Jun 2011 22:26:50 +0000
Date: Sun, 05 Jun 2011 22:26:50 +0000
Message-Id: <E1QTLmU-0001Fe-21@vcs-noshell.in.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-94-g0d208b7
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: c82c64249d4c022b6b1c96ae1a828c411be3a5aa
X-Git-Newrev: 0d208b7e07f217d2497dbc345a6606596a6379ef
From: "Alfred M. Szmidt" <ams@gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.51
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
	<commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/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: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 05 Jun 2011 22:26:54 -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  0d208b7e07f217d2497dbc345a6606596a6379ef (commit)
       via  f68e9634ac93f404808ca3f6efe6fee5bb4dc3c4 (commit)
      from  c82c64249d4c022b6b1c96ae1a828c411be3a5aa (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=0d208b7e07f217d2497dbc345a6606596a6379ef


commit 0d208b7e07f217d2497dbc345a6606596a6379ef
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Sun Jun 5 18:09:54 2011 +0200

    Clean up `make syntax-check' errors.

diff --git a/ChangeLog b/ChangeLog
index c0ca76a..64afaa3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,24 @@
 2011-06-05  Alfred M. Szmidt  <ams@gnu.org>
 
+	Clean up `make syntax-check' errors.
+
+	* tests/addrpeek.c: Include <config.h> instead of "config.h".
+	(main): Call set_program_name.
+
+	* src/syslogd.c (init): Removed redundant if statment before free
+	call.
+
+	* libls/stat_flags.c: Don't include <stddef.h>.
+
+	* ifconfig/changeif.c (set_address): Fix typo.
+	* src/logger.c (parse_opt): Likewise.
+	* src/rlogin.c: Likewise.
+	* talk/invite.c (answers): Likewise.
+
+	* ftp/ftp.c: Removed redundant parentehsis in #if guard.
+
+2011-06-05  Alfred M. Szmidt  <ams@gnu.org>
+
 	* configure.ac: Don't check for <osockaddr.h>.
 	* talkd/intalkd.h [HAVE_OSOCKADDR_H]: Don't include <osockaddr.h>.
 	* talk/look_up.c: Likewise.
diff --git a/NEWS b/NEWS
index 7fdb04c..78e651f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,7 @@
 GNU inetutils NEWS -- history of user-visible changes.
 Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
-See the end of this file for for license conditions.
+See the end of this file for license conditions.
 
 Please send inetutils bug reports to <bug-inetutils@gnu.org>.
 
diff --git a/doc/inetutils.texi b/doc/inetutils.texi
index de80015..c01ea61 100644
--- a/doc/inetutils.texi
+++ b/doc/inetutils.texi
@@ -58,8 +58,7 @@
 This manual documents version @value{VERSION} of the @sc{gnu} networking
 utilities.
 
-Copyright @copyright{} 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+Copyright @copyright{} 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/ftp/ftp.c b/ftp/ftp.c
index e8d21e1..733a268 100644
--- a/ftp/ftp.c
+++ b/ftp/ftp.c
@@ -114,7 +114,7 @@ static char portstr[10];
 
 FILE *cin, *cout;
 
-#if ! defined (FTP_CONNECT_TIMEOUT) || FTP_CONNECT_TIMEOUT < 1
+#if ! defined FTP_CONNECT_TIMEOUT || FTP_CONNECT_TIMEOUT < 1
 # define FTP_CONNECT_TIMEOUT 5
 #endif
 
diff --git a/ifconfig/changeif.c b/ifconfig/changeif.c
index 747a7db..d245733 100644
--- a/ifconfig/changeif.c
+++ b/ifconfig/changeif.c
@@ -70,7 +70,7 @@ set_address (int sfd, struct ifreq *ifr, char *address)
 
   if (!host)
     {
-      error (0, 0, "can not resolve `%s': %s", address, hstrerror (h_errno));
+      error (0, 0, "cannot resolve `%s': %s", address, hstrerror (h_errno));
       return -1;
     }
   if (host->h_addrtype != AF_INET)
diff --git a/libls/stat_flags.c b/libls/stat_flags.c
index 4c378ba..82622b5 100644
--- a/libls/stat_flags.c
+++ b/libls/stat_flags.c
@@ -51,7 +51,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include <stddef.h>
 #include <string.h>
 
 #define SAPPEND(s) {							\
diff --git a/src/logger.c b/src/logger.c
index c268276..86e7523 100644
--- a/src/logger.c
+++ b/src/logger.c
@@ -407,7 +407,7 @@ parse_opt (int key, char *arg, struct argp_state *state)
 
 #else /* !HAVE_IPV6 */
       /* Print a warning but continue with IPv4.  */
-      error (0, 0, "Warning: Falling back to IPv4, "
+      error (0, 0, "warning: Falling back to IPv4, "
 		"since IPv6 is disabled");
       /* AF_INET is set by default in this case.  */
       break;
diff --git a/src/rlogin.c b/src/rlogin.c
index 004e31f..5852edd 100644
--- a/src/rlogin.c
+++ b/src/rlogin.c
@@ -143,7 +143,7 @@ int wlen;
 # define TIOCPKT_DOSTOP          0x20
 #endif /*TIOCPKT*/
 /* The server sends us a TIOCPKT_WINDOW notification when it starts up.
-   The value for this (0x80) can not overlap the kernel defined TIOCPKT_xxx
+   The value for this (0x80) cannot overlap the kernel defined TIOCPKT_xxx
    values.  */
 #ifndef TIOCPKT_WINDOW
 # define TIOCPKT_WINDOW	0x80
diff --git a/src/syslogd.c b/src/syslogd.c
index 5927f9f..c03b687 100644
--- a/src/syslogd.c
+++ b/src/syslogd.c
@@ -1605,8 +1605,7 @@ init (int signo ARG_UNUSED)
 	  free (f->f_un.f_user.f_unames);
 	  break;
 	}
-      if (f->f_prevhost)
-	free (f->f_prevhost);
+      free (f->f_prevhost);
       next = f->f_next;
       free (f);
     }
diff --git a/talk/invite.c b/talk/invite.c
index 564685f..dbf6280 100644
--- a/talk/invite.c
+++ b/talk/invite.c
@@ -70,7 +70,7 @@ static char *answers[] = {
   "Target machine is too confused to talk to us",	/* FAILED */
   "Target machine does not recognize us",	/* MACHINE_UNKNOWN */
   "Your party is refusing messages",	/* PERMISSION_REFUSED */
-  "Target machine can not handle remote talk",	/* UNKNOWN_REQUEST */
+  "Target machine cannot handle remote talk",	/* UNKNOWN_REQUEST */
   "Target machine indicates protocol mismatch",	/* BADVERSION */
   "Target machine indicates protocol botch (addr)",	/* BADADDR */
   "Target machine indicates protocol botch (ctl_addr)",	/* BADCTLADDR */
diff --git a/telnetd/termstat.c b/telnetd/termstat.c
index 5994c8a..44445eb 100644
--- a/telnetd/termstat.c
+++ b/telnetd/termstat.c
@@ -427,7 +427,7 @@ clientstat (register int code, register int parm1, register int parm2)
 	  /*
 	   * If using kludge linemode, make sure that
 	   * we can do what the client asks.
-	   * We can not turn off linemode if alwayslinemode
+	   * We cannot turn off linemode if alwayslinemode
 	   * and the ICANON bit is set.
 	   */
 	  if (lmodetype == KLUDGE_LINEMODE)
diff --git a/tests/addrpeek.c b/tests/addrpeek.c
index 4ba9644..811dc9b 100644
--- a/tests/addrpeek.c
+++ b/tests/addrpeek.c
@@ -40,7 +40,8 @@
  *    tcpmux/env stream tcp nowait nobody /tmp/addrpeek addrkeep env addr
  */
 
-#include "config.h"
+#include <config.h>
+
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
@@ -49,6 +50,7 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netdb.h>
+#include <progname.h>
 
 #ifndef SEPARATOR
 # define SEPARATOR "\n"
@@ -111,7 +113,7 @@ int
 main (int argc, char *argv[])
 {
   int j;
-
+  set_program_name (argv[0]);
   for (j = 1; j < argc; ++j)
     {
       if (strncmp (argv[j], "addr", strlen ("addr")) == 0)

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


commit f68e9634ac93f404808ca3f6efe6fee5bb4dc3c4
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Sun Jun 5 14:46:19 2011 +0200

    talkd, talk: Remove last traces of <osockaddr.h> usage.

diff --git a/ChangeLog b/ChangeLog
index 09cdd2c..c0ca76a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2011-06-05  Alfred M. Szmidt  <ams@gnu.org>
+
+	* configure.ac: Don't check for <osockaddr.h>.
+	* talkd/intalkd.h [HAVE_OSOCKADDR_H]: Don't include <osockaddr.h>.
+	* talk/look_up.c: Likewise.
+	* talk/invite.c: Likewise.
+	* talk/get_names.c: Likewise.
+	* talk/get_addrs.c: Likewise.
+	* talk/ctl_transact.c: Likewise.
+	* talk/ctl.c: Likewise.
+
 2011-05-09  Simon Josefsson  <simon@josefsson.org>
 
 	* bootstrap.conf (gnulib_modules): Removed 'exit' from list.
diff --git a/configure.ac b/configure.ac
index 6c52213..c1fc9b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -433,7 +433,7 @@ dnl ftpd have support for it.
 
 if test "$with_wrap" = yes; then
 dnl See if we have libwrap.a
-dnl we can not use AC_CHECK_LIB reliably since for the wrap lib
+dnl we cannot use AC_CHECK_LIB reliably since for the wrap lib
 dnl you have to define some global variables
 #AC_CHECK_LIB(wrap, hosts_ctl, LIBWRAP=-lwrap)
   AC_MSG_CHECKING(hosts_ctl in -lwrap);
@@ -494,14 +494,6 @@ AC_CHECK_TYPE(socklen_t, ,
               [IU_FLUSHLEFT([#include <sys/types.h>
 	                     #include <sys/socket.h>])])
 
-dnl We may need our own definition for struct osockaddr (equivalent to the
-dnl old 4.3BSD struct sockaddr, and used in grotty bsd talk protocol)
-AC_CHECK_TYPE(struct osockaddr, ,
-              [AC_DEFINE([HAVE_OSOCKADDR_H], 1,
-                         [Define to one if you have <osockaddr.h>.])],
-	      [IU_FLUSHLEFT([#include <sys/types.h>
-                             #include <sys/socket.h> ])])
-
 AC_CHECK_TYPES(struct if_nameindex, , ,
   [IU_FLUSHLEFT([#include <sys/types.h>
                  #include <sys/socket.h>
diff --git a/talk/ctl.c b/talk/ctl.c
index 54e2aad..f077727 100644
--- a/talk/ctl.c
+++ b/talk/ctl.c
@@ -57,9 +57,6 @@
 
 #include <sys/types.h>
 #include <sys/socket.h>
-#ifdef HAVE_OSOCKADDR_H
-# include <osockaddr.h>
-#endif
 #include <protocols/talkd.h>
 #include <netinet/in.h>
 #include "talk.h"
diff --git a/talk/ctl_transact.c b/talk/ctl_transact.c
index 8fd4947..46a865f 100644
--- a/talk/ctl_transact.c
+++ b/talk/ctl_transact.c
@@ -55,9 +55,6 @@
 #include <time.h>
 #include <netinet/in.h>
 #include <sys/select.h>
-#ifdef HAVE_OSOCKADDR_H
-# include <osockaddr.h>
-#endif
 #include <protocols/talkd.h>
 #include <errno.h>
 #include "talk_ctl.h"
diff --git a/talk/get_addrs.c b/talk/get_addrs.c
index 6b3792a..b2af9a4 100644
--- a/talk/get_addrs.c
+++ b/talk/get_addrs.c
@@ -55,9 +55,6 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
-#ifdef HAVE_OSOCKADDR_H
-# include <osockaddr.h>
-#endif
 #include <protocols/talkd.h>
 #include <netdb.h>
 #include <stdio.h>
diff --git a/talk/get_names.c b/talk/get_names.c
index 0386d0b..5f458ce 100644
--- a/talk/get_names.c
+++ b/talk/get_names.c
@@ -55,9 +55,6 @@
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/socket.h>
-#ifdef HAVE_OSOCKADDR_H
-# include <osockaddr.h>
-#endif
 #include <netinet/in.h>
 #include <protocols/talkd.h>
 #include <pwd.h>
diff --git a/talk/invite.c b/talk/invite.c
index 6ba7f88..564685f 100644
--- a/talk/invite.c
+++ b/talk/invite.c
@@ -57,9 +57,6 @@
 #include <time.h>
 #include <signal.h>
 #include <netinet/in.h>
-#ifdef HAVE_OSOCKADDR_H
-# include <osockaddr.h>
-#endif
 #include <protocols/talkd.h>
 #include <errno.h>
 #include <unistd.h>
diff --git a/talk/look_up.c b/talk/look_up.c
index ade177a..f7c7665 100644
--- a/talk/look_up.c
+++ b/talk/look_up.c
@@ -54,9 +54,6 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
-#ifdef HAVE_OSOCKADDR_H
-# include <osockaddr.h>
-#endif
 #include <protocols/talkd.h>
 #include <unistd.h>
 #include <errno.h>
diff --git a/talkd/intalkd.h b/talkd/intalkd.h
index 2f32116..3cd7bec 100644
--- a/talkd/intalkd.h
+++ b/talkd/intalkd.h
@@ -22,9 +22,6 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#ifdef HAVE_OSOCKADDR_H
-# include <osockaddr.h>
-#endif
 #include <protocols/talkd.h>
 #include <netdb.h>
 #include <syslog.h>

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

Summary of changes:
 ChangeLog           |   30 ++++++++++++++++++++++++++++++
 NEWS                |    2 +-
 configure.ac        |   10 +---------
 doc/inetutils.texi  |    3 +--
 ftp/ftp.c           |    2 +-
 ifconfig/changeif.c |    2 +-
 libls/stat_flags.c  |    1 -
 src/logger.c        |    2 +-
 src/rlogin.c        |    2 +-
 src/syslogd.c       |    3 +--
 talk/ctl.c          |    3 ---
 talk/ctl_transact.c |    3 ---
 talk/get_addrs.c    |    3 ---
 talk/get_names.c    |    3 ---
 talk/invite.c       |    5 +----
 talk/look_up.c      |    3 ---
 talkd/intalkd.h     |    3 ---
 telnetd/termstat.c  |    2 +-
 tests/addrpeek.c    |    6 ++++--
 19 files changed, 44 insertions(+), 44 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Wed Jun 08 17:30:23 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1QUQKU-0005y4-Tm
	for mharc-commit-inetutils@gnu.org; Wed, 08 Jun 2011 17:30:23 -0400
Received: from eggs.gnu.org ([140.186.70.92]:48964)
	by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1QUQKR-0005x8-NR
	for commit-inetutils@gnu.org; Wed, 08 Jun 2011 17:30:21 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ams@gnu.org>) id 1QUQKM-0006aq-6F
	for commit-inetutils@gnu.org; Wed, 08 Jun 2011 17:30:18 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:53999)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1QUQKL-0006ai-TU
	for commit-inetutils@gnu.org; Wed, 08 Jun 2011 17:30:14 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by colonialone.fsf.org with esmtp (Exim 4.69)
	(envelope-from <ams@gnu.org>) id 1QUQKL-0007wR-9O
	for commit-inetutils@gnu.org; Wed, 08 Jun 2011 21:30:13 +0000
Received: from ams by vcs-noshell.in.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <ams@savannah.gnu.org>) id 1QUQKK-0001xE-LU
	for commit-inetutils@gnu.org; Wed, 08 Jun 2011 21:30:13 +0000
Date: Wed, 08 Jun 2011 21:30:12 +0000
Message-Id: <E1QUQKK-0001xE-LU@vcs-noshell.in.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-95-gdc99ec0
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 0d208b7e07f217d2497dbc345a6606596a6379ef
X-Git-Newrev: dc99ec0d54367bc2371d24a22f48743b9ef34f13
From: "Alfred M. Szmidt" <ams@gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.51
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
	<commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/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: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 08 Jun 2011 21:30:21 -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  dc99ec0d54367bc2371d24a22f48743b9ef34f13 (commit)
      from  0d208b7e07f217d2497dbc345a6606596a6379ef (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=dc99ec0d54367bc2371d24a22f48743b9ef34f13


commit dc99ec0d54367bc2371d24a22f48743b9ef34f13
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Wed Jun 8 23:26:27 2011 +0200

    tests/tftp.sh: Skip test if we cannot execute netstat.  Enable verbose
    execution of test as early as possible.

diff --git a/ChangeLog b/ChangeLog
index 64afaa3..c05fb43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-08  Alfred M. Szmidt  <ams@gnu.org>
+
+	* tests/tftp.sh: Skip test if we cannot execute netstat.  Enable
+	verbose execution of test as early as possible.
+
 2011-06-05  Alfred M. Szmidt  <ams@gnu.org>
 
 	Clean up `make syntax-check' errors.
diff --git a/tests/tftp.sh b/tests/tftp.sh
index fec5171..b670c63 100755
--- a/tests/tftp.sh
+++ b/tests/tftp.sh
@@ -19,6 +19,10 @@
 
 # Run `inetd' with `tftpd' and try to fetch a file from there using `tftp'.
 
+if [ "$VERBOSE" ]; then
+    set -x
+fi
+
 TFTP="${TFTP:-../src/tftp$EXEEXT}"
 TFTPD="${TFTPD:-$PWD/../src/tftpd$EXEEXT}"
 INETD="${INETD:-../src/inetd$EXEEXT}"
@@ -32,8 +36,14 @@ INETD_CONF="$PWD/inetd.conf.tmp"
 ADDRESSES="`$IFCONFIG | sed -e "/$AF /!d" \
      -e "s/^.*$AF[[:blank:]]\([:.0-9]\{1,\}\)[[:blank:]].*$/\1/g"`"
 
+# Check that netstat works before proceeding.
+netstat -na > /dev/null
+if [ ! $? -eq 0 ]; then
+    echo "netstat: command failed to execute successfully"
+    exit 77
+fi
+
 if [ "$VERBOSE" ]; then
-    set -x
     "$TFTP" --version
     "$TFTPD" --version
     "$INETD" --version

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

Summary of changes:
 ChangeLog     |    5 +++++
 tests/tftp.sh |   12 +++++++++++-
 2 files changed, 16 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Tue Jun 14 19:27:19 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1QWd0x-0001KB-0z
	for mharc-commit-inetutils@gnu.org; Tue, 14 Jun 2011 19:27:19 -0400
Received: from eggs.gnu.org ([140.186.70.92]:56397)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1QWd0t-0001K2-K5
	for commit-inetutils@gnu.org; Tue, 14 Jun 2011 19:27:16 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1QWd0s-0006Dj-2e
	for commit-inetutils@gnu.org; Tue, 14 Jun 2011 19:27:15 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:46460)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1QWd0r-0006Dd-Uj
	for commit-inetutils@gnu.org; Tue, 14 Jun 2011 19:27:14 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by colonialone.fsf.org with esmtp (Exim 4.69)
	(envelope-from <gnu@gisladisker.se>) id 1QWd0r-0002JM-Gf
	for commit-inetutils@gnu.org; Tue, 14 Jun 2011 23:27:13 +0000
Received: from meand by vcs-noshell.in.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <meand@savannah.gnu.org>) id 1QWd0r-0005PU-1e
	for commit-inetutils@gnu.org; Tue, 14 Jun 2011 23:27:13 +0000
Date: Tue, 14 Jun 2011 23:27:13 +0000
Message-Id: <E1QWd0r-0005PU-1e@vcs-noshell.in.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-96-ge0ecdab
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: dc99ec0d54367bc2371d24a22f48743b9ef34f13
X-Git-Newrev: e0ecdab5bebdcc5e1524005cb0029b9114709d6c
From: Mats Erik Andersson <gnu@gisladisker.se>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.51
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
	<commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/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: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 14 Jun 2011 23:27:17 -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  e0ecdab5bebdcc5e1524005cb0029b9114709d6c (commit)
      from  dc99ec0d54367bc2371d24a22f48743b9ef34f13 (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=e0ecdab5bebdcc5e1524005cb0029b9114709d6c


commit e0ecdab5bebdcc5e1524005cb0029b9114709d6c
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Wed Jun 15 00:53:32 2011 +0200

    syslogd: Dereferencing NULL fault.  A test script.

diff --git a/ChangeLog b/ChangeLog
index c05fb43..64fccbe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-06-15  Mats Erik Andersson <gnu@gisladisker.se>
+
+	* src/syslogd.c (fprintlog): Sanity check on `f->f_prevhost'
+	to avoid deferencing NULL.
+	(cfline): A permanently failed DNS lookup must produce F_UNUSED.
+	* tests/syslogd.sh: New file.
+	* tests/Makefile.am (dist_check_SCRIPTS) [ENABLE_logger &&
+	ENABLE_syslogd]: Add `syslogd.sh'.
+
 2011-06-08  Alfred M. Szmidt  <ams@gnu.org>
 
 	* tests/tftp.sh: Skip test if we cannot execute netstat.  Enable
diff --git a/src/syslogd.c b/src/syslogd.c
index c03b687..3630473 100644
--- a/src/syslogd.c
+++ b/src/syslogd.c
@@ -1148,9 +1148,12 @@ fprintlog (struct filed *f, const char *from, int flags, const char *msg)
       v->iov_len = 1;
       v++;
     }
-  v->iov_base = f->f_prevhost;
-  v->iov_len = strlen (v->iov_base);
-  v++;
+  if (f->f_prevhost)
+    {
+      v->iov_base = f->f_prevhost;
+      v->iov_len = strlen (v->iov_base);
+      v++;
+    }
   v->iov_base = (char *) " ";
   v->iov_len = 1;
   v++;
@@ -1918,7 +1921,11 @@ cfline (const char *line, struct filed *f)
       hp = gethostbyname (p);
       if (hp == NULL)
 	{
-	  f->f_type = F_FORW_UNKN;
+	  extern int h_errno;
+	  if (h_errno == NO_DATA || h_errno == HOST_NOT_FOUND)
+	    f->f_type = F_UNUSED;	/* No recovery possible.  */
+	  else
+	    f->f_type = F_FORW_UNKN;	/* Temporary failure.  */
 	  f->f_prevcount = INET_RETRY_MAX;
 	  f->f_time = time ((time_t *) 0);
 	}
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 846f24c..a70193d 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -40,6 +40,12 @@ dist_check_SCRIPTS += tftp.sh
 endif
 endif
 endif
+if ENABLE_logger
+if ENABLE_syslogd
+dist_check_SCRIPTS += syslogd.sh
+endif
+endif
+
 TESTS = $(check_PROGRAMS) $(dist_check_SCRIPTS)
 
 TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT)
diff --git a/tests/syslogd.sh b/tests/syslogd.sh
new file mode 100644
index 0000000..8b0cd88
--- /dev/null
+++ b/tests/syslogd.sh
@@ -0,0 +1,140 @@
+#!/bin/sh
+
+# Copyright (C) 2011 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/'.
+
+# Tests to establish functionality of SYSLOG daemon.
+#
+
+# Keep any external assignment.
+#
+: ${IU_TESTDIR:=/tmp/iu_syslog}
+
+mkdir -p $IU_TESTDIR
+
+CONF=$IU_TESTDIR/syslog.conf
+PID=$IU_TESTDIR/syslogd.pid
+OUT=$IU_TESTDIR/messages
+: ${SOCKET:=$IU_TESTDIR/log}
+
+IU_SYSLOGD=./src/syslogd$EXEEXT
+IU_LOGGER=./src/logger$EXEEXT
+
+# All messages intended for post-detection are
+# to be uniformly tagged.
+TAG="syslogd-test"
+
+# Step out of `tests/', should the invokation
+# have been made there.
+#
+[ -d ../src ] && cd ..
+
+if [ ! -x $IU_SYSLOGD ]; then
+	echo "Missing executable 'syslogd'. Failing."
+	exit 1;
+fi
+
+if [ ! -x $IU_LOGGER ]; then
+	echo "Missing executable 'logger'. Failing."
+	exit 1
+fi
+
+# Remove old messages.
+rm -f $OUT $PID
+
+# Full testing needs a superuser.  Report this.
+if [ "$USER" != "root" ]; then
+	cat <<-EOT
+	WARNING!!
+	Disabling INET server tests since you seem
+	to be underprivileged.
+	EOT
+fi
+
+# A minimal, catch-all configuration.
+#
+cat > $CONF <<-EOT
+	*.*	$OUT
+	*.*	@not.in.existence
+EOT
+
+# Attempt to start the server after first
+# building the desired option list.
+#
+## Base configuration.
+IU_OPTIONS="--rcfile=$CONF --pidfile=$PID --socket=$SOCKET"
+## Enable INET service when running as root.
+if [ "$USER" = "root" ]; then
+	IU_OPTIONS="$IU_OPTIONS --inet"
+fi
+## Bring in additional options from command line.
+## Disable kernel messages otherwise.
+: OPTIONS=${OPTIONS:=--no-klog}
+IU_OPTIONS="$IU_OPTIONS $OPTIONS"
+
+$IU_SYSLOGD $IU_OPTIONS
+
+# Wait a moment in order to avoid an obvious
+# race condition with the server daemon on
+# slow systems.
+#
+sleep 1
+
+# Test to see whether the service got started.
+#
+if [ ! -r $PID ]; then
+	echo "The service daemon never started. Failing."
+	exit 1
+fi
+
+# Declare the number of implemented tests,
+# as well as an exit code.
+#
+TESTCASES=0
+EXITCODE=1
+
+# Send messages on two sockets: IPv4 and UNIX.
+#
+TESTCASES=$((TESTCASES + 1))
+$IU_LOGGER -h $SOCKET -p user -t $TAG "Sending BSD message."
+
+if [ "$USER" = "root" ]; then
+	TESTCASES=$((TESTCASES + 1))
+	$IU_LOGGER -4 -h localhost -p user -t $TAG "Sending IPv4 message."
+fi
+
+# Detection of registered messages.
+#
+TEXTLINES="$(grep $TAG $OUT | wc -l)"
+
+if [ -n "${VERBOSE+yes}" ]; then
+	grep $TAG $OUT
+fi
+
+echo "Registered $TEXTLINES lines out of $TESTCASES."
+
+if [ "$TEXTLINES" -eq "$TESTCASES" ]; then
+	echo "Successful testing."
+	EXITCODE=0
+else
+	echo "Failing some tests."
+fi
+
+# Remove the daemon process.
+[ -r $PID ] && kill "$(cat $PID)"
+
+exit $EXITCODE

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

Summary of changes:
 ChangeLog         |    9 +++
 src/syslogd.c     |   15 ++++--
 tests/Makefile.am |    6 ++
 tests/syslogd.sh  |  140 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 166 insertions(+), 4 deletions(-)
 create mode 100644 tests/syslogd.sh


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Thu Jun 16 09:59:59 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1QXD70-0003wM-Bt
	for mharc-commit-inetutils@gnu.org; Thu, 16 Jun 2011 09:59:58 -0400
Received: from eggs.gnu.org ([140.186.70.92]:60380)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1QXD6k-0003qO-Te
	for commit-inetutils@gnu.org; Thu, 16 Jun 2011 09:59:51 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1QXD6d-0003eW-9X
	for commit-inetutils@gnu.org; Thu, 16 Jun 2011 09:59:42 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:41165)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1QXD6c-0003ch-RV
	for commit-inetutils@gnu.org; Thu, 16 Jun 2011 09:59:34 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by colonialone.fsf.org with esmtp (Exim 4.69)
	(envelope-from <simon@josefsson.org>) id 1QXAWW-0002WC-49
	for commit-inetutils@gnu.org; Thu, 16 Jun 2011 11:14:08 +0000
Received: from jas by vcs-noshell.in.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <jas@savannah.gnu.org>) id 1QXAWW-0000Rh-1u
	for commit-inetutils@gnu.org; Thu, 16 Jun 2011 11:14:08 +0000
Date: Thu, 16 Jun 2011 11:14:08 +0000
Message-Id: <E1QXAWW-0000Rh-1u@vcs-noshell.in.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-97-g00a01d9
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: e0ecdab5bebdcc5e1524005cb0029b9114709d6c
X-Git-Newrev: 00a01d95c1a288410d79949547cec890549512ff
From: Simon Josefsson <simon@josefsson.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.51
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
	<commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/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: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 16 Jun 2011 13:59:52 -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  00a01d95c1a288410d79949547cec890549512ff (commit)
      from  e0ecdab5bebdcc5e1524005cb0029b9114709d6c (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=00a01d95c1a288410d79949547cec890549512ff


commit 00a01d95c1a288410d79949547cec890549512ff
Author: Simon Josefsson <simon@josefsson.org>
Date:   Thu Jun 16 13:13:46 2011 +0200

    Replace use of sig_t with sighandler_t.

diff --git a/ChangeLog b/ChangeLog
index 64fccbe..60cf0ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2011-06-16  Simon Josefsson  <simon@josefsson.org>
+
+	* configure.ac: Don't check for sig_t.
+	* libinetutils/setsig.c (setsig): Use sighandler_t instead of sig_t.
+	Reported by Mats Erik Andersson <gnu@gisladisker.se>.
+	* ftp/cmds.c (mput, mget, mdelete, mls, shell, doproxy): Likewise.
+	* ftp/ftp.c (command, getreply, sendrequest, recvrequest)
+	(pswitch, proxtrans): Likewise.
+	* src/rlogin.c (setsignal): Likewise.
+	* src/rcp.c (susystem): Likewise.
+
 2011-06-15  Mats Erik Andersson <gnu@gisladisker.se>
 
 	* src/syslogd.c (fprintlog): Sanity check on `f->f_prevhost'
diff --git a/configure.ac b/configure.ac
index c1fc9b5..c818dfa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -499,11 +499,6 @@ AC_CHECK_TYPES(struct if_nameindex, , ,
                  #include <sys/socket.h>
                  #include <net/if.h>])])
 
-dnl sig_t is the type of a signal handler (4.4BSD)
-AC_CHECK_TYPES(sig_t, , ,
-  [IU_FLUSHLEFT([#include <sys/types.h>
-                 #include <signal.h> ])])
-
 dnl sigset_t is a set of signals (4.4BSD)
 AC_CHECK_TYPE(sigset_t, , AC_DEFINE([sigset_t], unsigned long, [FIXME]),
   [IU_FLUSHLEFT([#include <sys/types.h>
diff --git a/ftp/cmds.c b/ftp/cmds.c
index 4a97f26..58dd5a6 100644
--- a/ftp/cmds.c
+++ b/ftp/cmds.c
@@ -546,7 +546,7 @@ void
 mput (int argc, char **argv)
 {
   int i;
-  sig_t oldintr;
+  sighandler_t oldintr;
   int ointer;
 
   if (argc < 2 && !another (&argc, &argv, "local-files"))
@@ -862,7 +862,7 @@ mabort (int signo ARG_UNUSED)
 void
 mget (int argc, char **argv)
 {
-  sig_t oldintr;
+  sighandler_t oldintr;
   int ointer;
   char *cp, *tp;
 
@@ -1364,7 +1364,7 @@ delete (int argc, char **argv)
 void
 mdelete (int argc, char **argv)
 {
-  sig_t oldintr;
+  sighandler_t oldintr;
   int ointer;
   char *cp;
 
@@ -1475,7 +1475,7 @@ out:
 void
 mls (int argc, char **argv)
 {
-  sig_t oldintr;
+  sighandler_t oldintr;
   int ointer, i;
   char *cmd, mode[1], *dest;
 
@@ -1542,7 +1542,7 @@ void
 shell (int argc, char **argv)
 {
   pid_t pid;
-  sig_t old1, old2;
+  sighandler_t old1, old2;
   char shellnam[40], *shell, *namep;
 
   old1 = signal (SIGINT, SIG_IGN);
@@ -1965,7 +1965,7 @@ void
 doproxy (int argc, char **argv)
 {
   struct cmd *c;
-  sig_t oldintr;
+  sighandler_t oldintr;
 
   if (argc < 2 && !another (&argc, &argv, "command"))
     {
diff --git a/ftp/ftp.c b/ftp/ftp.c
index 733a268..ecf4e67 100644
--- a/ftp/ftp.c
+++ b/ftp/ftp.c
@@ -357,7 +357,7 @@ command (const char *fmt, ...)
 {
   va_list ap;
   int r;
-  sig_t oldintr;
+  sighandler_t oldintr;
 
   abrtflag = 0;
   if (debug)
@@ -403,7 +403,7 @@ getreply (int expecteof)
   int c, n;
   int dig;
   int originalcode = 0, continuation = 0;
-  sig_t oldintr;
+  sighandler_t oldintr;
   int pflag = 0;
   char *cp, *pt = pasv;
 
@@ -542,7 +542,7 @@ sendrequest (char *cmd, char *local, char *remote, int printnames)
   int c, d;
   FILE *fin, *dout = 0, *popen (const char *, const char *);
   int (*closefunc) (FILE *);
-  sig_t oldintr, oldintp;
+  sighandler_t oldintr, oldintp;
   long bytes = 0, local_hashbytes = hashbytes;
   char *lmode, buf[BUFSIZ], *bufp;
 
@@ -824,7 +824,7 @@ recvrequest (char *cmd, char *local, char *remote, char *lmode, int printnames)
 {
   FILE *fout, *din = 0;
   int (*closefunc) (FILE *);
-  sig_t oldintr, oldintp;
+  sighandler_t oldintr, oldintp;
   int c, d, is_retr, tcrflag, bare_lfs = 0, blksize;
   static int bufsize = 0;
   static char *buf;
@@ -1534,7 +1534,7 @@ psabort (int sig)
 void
 pswitch (int flag)
 {
-  sig_t oldintr;
+  sighandler_t oldintr;
   static struct comvars
   {
     int connect;
@@ -1652,7 +1652,7 @@ abortpt (int sig)
 void
 proxtrans (char *cmd, char *local, char *remote)
 {
-  sig_t oldintr;
+  sighandler_t oldintr;
   int secndflag = 0, prox_type, nfnd;
   char *cmd2;
   fd_set mask;
diff --git a/libinetutils/setsig.c b/libinetutils/setsig.c
index ff519c9..3fa3c08 100644
--- a/libinetutils/setsig.c
+++ b/libinetutils/setsig.c
@@ -27,8 +27,8 @@
 
 /* This is exactly like the traditional signal function, but turns on the
    SA_RESTART bit where possible.  */
-sig_t
-setsig (int sig, sig_t handler)
+sighandler_t
+setsig (int sig, sighandler_t handler)
 {
 #ifdef HAVE_SIGACTION
   struct sigaction sa;
diff --git a/src/rcp.c b/src/rcp.c
index 68eb147..a05145a 100644
--- a/src/rcp.c
+++ b/src/rcp.c
@@ -1169,7 +1169,7 @@ bad:
 int
 susystem (char *s, int userid)
 {
-  sig_t istat, qstat;
+  sighandler_t istat, qstat;
   int status;
   pid_t pid;
 
diff --git a/src/rlogin.c b/src/rlogin.c
index 5852edd..f709bd4 100644
--- a/src/rlogin.c
+++ b/src/rlogin.c
@@ -209,7 +209,7 @@ RETSIGTYPE writeroob (int);
 void warning (const char *, ...);
 #endif
 
-extern sig_t setsig (int, sig_t);
+extern sighandler_t setsig (int, sighandler_t);
 
 #if defined KERBEROS || defined SHISHI
 # define OPTIONS	"8EKde:k:l:xhV"
@@ -771,7 +771,7 @@ doit (sigset_t * smask)
 void
 setsignal (int sig)
 {
-  sig_t handler;
+  sighandler_t handler;
   sigset_t sigs;
 
   sigemptyset (&sigs);

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

Summary of changes:
 ChangeLog             |   11 +++++++++++
 configure.ac          |    5 -----
 ftp/cmds.c            |   12 ++++++------
 ftp/ftp.c             |   12 ++++++------
 libinetutils/setsig.c |    4 ++--
 src/rcp.c             |    2 +-
 src/rlogin.c          |    4 ++--
 7 files changed, 28 insertions(+), 22 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Sat Jun 18 12:36:20 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1QXyVQ-0002ZT-GJ
	for mharc-commit-inetutils@gnu.org; Sat, 18 Jun 2011 12:36:20 -0400
Received: from eggs.gnu.org ([140.186.70.92]:42950)
	by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1QXyVL-0002ZL-Uf
	for commit-inetutils@gnu.org; Sat, 18 Jun 2011 12:36:18 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ams@gnu.org>) id 1QXyVJ-0005Ph-Bk
	for commit-inetutils@gnu.org; Sat, 18 Jun 2011 12:36:15 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:59225)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1QXyVJ-0005Pb-9R
	for commit-inetutils@gnu.org; Sat, 18 Jun 2011 12:36:13 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by colonialone.fsf.org with esmtp (Exim 4.69)
	(envelope-from <ams@gnu.org>) id 1QXyVJ-0008TV-5I
	for commit-inetutils@gnu.org; Sat, 18 Jun 2011 16:36:13 +0000
Received: from ams by vcs-noshell.in.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <ams@savannah.gnu.org>) id 1QXyVI-000313-RA
	for commit-inetutils@gnu.org; Sat, 18 Jun 2011 16:36:13 +0000
Date: Sat, 18 Jun 2011 16:36:12 +0000
Message-Id: <E1QXyVI-000313-RA@vcs-noshell.in.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-104-gab1c6c0
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 00a01d95c1a288410d79949547cec890549512ff
X-Git-Newrev: ab1c6c0a9f6ad1aa2eeb45230fe212ee9b2ff59f
From: "Alfred M. Szmidt" <ams@gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.51
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
	<commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/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: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 18 Jun 2011 16:36:18 -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  ab1c6c0a9f6ad1aa2eeb45230fe212ee9b2ff59f (commit)
       via  c110c74ddc64e8502830755d9fc33ddcb4445c2a (commit)
       via  67ee421368925464a3c221dc279097e50988efad (commit)
       via  50adb1e3e9e52177d70eba97f00d3e648fdb1046 (commit)
       via  ab40bdd6d6db50b4f9ab621266a7e0331548a2cc (commit)
       via  e6cdeb0a4a304079893b11b63a353ba1f7fc9bec (commit)
       via  eac0b931c1545134d0027301b580c51a3dde8ca0 (commit)
      from  00a01d95c1a288410d79949547cec890549512ff (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=ab1c6c0a9f6ad1aa2eeb45230fe212ee9b2ff59f


commit ab1c6c0a9f6ad1aa2eeb45230fe212ee9b2ff59f
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Sat Jun 18 16:28:13 2011 +0200

    bootstrap.conf (gnulib_modules): Added mkstemp to list.

diff --git a/ChangeLog b/ChangeLog
index f8e867c..98cbef7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-06-18  Alfred M. Szmidt  <ams@gnu.org>
 
+	* bootstrap.conf (gnulib_modules): Added mkstemp to list.
+
+2011-06-18  Alfred M. Szmidt  <ams@gnu.org>
+
 	* tests/syslogd.sh: Changed permission on file to be executable.
 
 2011-06-18  Alfred M. Szmidt  <ams@gnu.org>
diff --git a/bootstrap.conf b/bootstrap.conf
index 6d62bbb..f4996bd 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -53,6 +53,7 @@ maintainer-makefile
 malloc-gnu
 mempcpy
 minmax
+mkstemp
 obstack
 poll
 progname

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


commit c110c74ddc64e8502830755d9fc33ddcb4445c2a
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Sat Jun 18 16:27:22 2011 +0200

    tests/syslogd.sh: Changed permission on file to be executable.

diff --git a/ChangeLog b/ChangeLog
index 3607844..f8e867c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-06-18  Alfred M. Szmidt  <ams@gnu.org>
 
+	* tests/syslogd.sh: Changed permission on file to be executable.
+
+2011-06-18  Alfred M. Szmidt  <ams@gnu.org>
+
 	* bootstrap.conf (gnulib_modules): Added unused-parameter to list.
 
 	* libtelnet/Makefile.am (INCLUDES): Added "-I$(top_srcdir)/lib
diff --git a/tests/syslogd.sh b/tests/syslogd.sh
old mode 100644
new mode 100755

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


commit 67ee421368925464a3c221dc279097e50988efad
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Sat Jun 18 16:00:25 2011 +0200

    Replaced all usage of ARG_UNUSED with _GL_UNUSED_PARAMETER.

diff --git a/ChangeLog b/ChangeLog
index 2a50f5f..3607844 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,28 @@
 2011-06-18  Alfred M. Szmidt  <ams@gnu.org>
 
+	* bootstrap.conf (gnulib_modules): Added unused-parameter to list.
+
+	* libtelnet/Makefile.am (INCLUDES): Added "-I$(top_srcdir)/lib
+	-I../lib" to list.
+	* src/Makefile.am (INCLUDES): Added -I$(top_builddir)/lib to list.
+
+	* talkd/talkd.c: Include "unused-parameter.h".  Replaced all usage
+	of ARG_UNUSED with _GL_UNUSED_PARAMETER.
+	* talkd/table.c: Likewise.
+	* talk/init_disp.c: Likewise.
+	* src/syslogd.c: Likewise.
+	* src/rlogind.c: Likewise.
+	* src/rlogin.c: Likewise.
+	* src/inetd.c: Likewise.
+	* libtelnet/auth.c: Likewise.
+	* ftpd/server_mode.c: Likewise.
+	* ftpd/ftpd.c: Likewise.
+	* ftp/main.c: Likewise.
+	* ftp/ftp.c: Likewise.
+	* ftp/cmds.c: Likewise.
+
+2011-06-18  Alfred M. Szmidt  <ams@gnu.org>
+
 	* whois/whois.h: Replace RETSIGTYPE with void; this is old K&Rism.
 	* whois/whois.c: Likewise.
 	* telnet/sys_bsd.c (ayt): Likewise.
diff --git a/bootstrap.conf b/bootstrap.conf
index f654fa6..6d62bbb 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -74,6 +74,7 @@ strnlen
 sysexits
 termios
 unistd-safer
+unused-parameter
 update-copyright
 vasnprintf
 version-etc-fsf
diff --git a/ftp/cmds.c b/ftp/cmds.c
index 5004487..f9072f4 100644
--- a/ftp/cmds.c
+++ b/ftp/cmds.c
@@ -85,6 +85,7 @@
 #endif
 
 #include "ftp_var.h"
+#include "unused-parameter.h"
 
 /* Returns true if STR is entirely lower case.  */
 static int
@@ -835,7 +836,7 @@ getit (int argc, char **argv, int restartit, char *mode)
 }
 
 void
-mabort (int signo ARG_UNUSED)
+mabort (int signo _GL_UNUSED_PARAMETER)
 {
   int ointer;
 
diff --git a/ftp/ftp.c b/ftp/ftp.c
index 7aad787..89efaf1 100644
--- a/ftp/ftp.c
+++ b/ftp/ftp.c
@@ -83,6 +83,7 @@
 #include <sys/select.h>
 
 #include "ftp_var.h"
+#include "unused-parameter.h"
 
 #if !HAVE_DECL_FCLOSE
 /* Some systems don't declare fclose in <stdio.h>, so do it ourselves.  */
@@ -342,7 +343,7 @@ login (char *host)
 }
 
 void
-cmdabort (int sig ARG_UNUSED)
+cmdabort (int sig _GL_UNUSED_PARAMETER)
 {
 
   printf ("\n");
diff --git a/ftp/main.c b/ftp/main.c
index 1655e82..5ebfbb7 100644
--- a/ftp/main.c
+++ b/ftp/main.c
@@ -75,6 +75,7 @@
 #include "ftp_var.h"
 
 #include "libinetutils.h"
+#include "unused-parameter.h"
 
 #if HAVE_LIBREADLINE
 # include <readline/readline.h>
@@ -260,13 +261,13 @@ main (int argc, char *argv[])
 }
 
 void
-intr (int sig ARG_UNUSED)
+intr (int sig _GL_UNUSED_PARAMETER)
 {
   longjmp (toplevel, 1);
 }
 
 void
-lostpeer (int sig ARG_UNUSED)
+lostpeer (int sig _GL_UNUSED_PARAMETER)
 {
   if (connected)
     {
diff --git a/ftpd/ftpd.c b/ftpd/ftpd.c
index 711acaa..1d87bd3 100644
--- a/ftpd/ftpd.c
+++ b/ftpd/ftpd.c
@@ -102,6 +102,7 @@
 #include <progname.h>
 #include <libinetutils.h>
 #include "extern.h"
+#include "unused-parameter.h"
 
 #ifndef LINE_MAX
 # define LINE_MAX 2048
@@ -584,7 +585,7 @@ sigquit (int signo)
 
 
 static void
-lostconn (int signo ARG_UNUSED)
+lostconn (int signo _GL_UNUSED_PARAMETER)
 {
   if (debug)
     syslog (LOG_DEBUG, "lost connection");
@@ -1685,7 +1686,7 @@ dologout (int status)
 }
 
 static void
-myoob (int signo ARG_UNUSED)
+myoob (int signo _GL_UNUSED_PARAMETER)
 {
   char *cp;
 
diff --git a/ftpd/server_mode.c b/ftpd/server_mode.c
index 68902b7..9e166ab 100644
--- a/ftpd/server_mode.c
+++ b/ftpd/server_mode.c
@@ -38,6 +38,7 @@
 #endif
 
 #include <libinetutils.h>
+#include "unused-parameter.h"
 
 static void reapchild (int);
 
@@ -84,7 +85,7 @@ check_host (struct sockaddr *sa)
 #endif
 
 static void
-reapchild (int signo ARG_UNUSED)
+reapchild (int signo _GL_UNUSED_PARAMETER)
 {
   int save_errno = errno;
 
diff --git a/libtelnet/Makefile.am b/libtelnet/Makefile.am
index ef829e2..f5381cd 100644
--- a/libtelnet/Makefile.am
+++ b/libtelnet/Makefile.am
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
-INCLUDES = $(INCAUTH)
+INCLUDES = $(INCAUTH) -I$(top_srcdir)/lib -I../lib
 
 noinst_LIBRARIES = libtelnet.a
 
diff --git a/libtelnet/auth.c b/libtelnet/auth.c
index 654004f..eab5458 100644
--- a/libtelnet/auth.c
+++ b/libtelnet/auth.c
@@ -69,6 +69,8 @@
 
 #include <config.h>
 
+#include "unused-parameter.h"
+
 #if defined AUTHENTICATION
 # include <stdio.h>
 # include <sys/types.h>
@@ -650,7 +652,7 @@ auth_finished (TN_Authenticator * ap, int result)
 }
 
 static void
-auth_intr (int sig ARG_UNUSED)
+auth_intr (int sig _GL_UNUSED_PARAMETER)
 {
   auth_finished (0, AUTH_REJECT);
 }
diff --git a/src/Makefile.am b/src/Makefile.am
index 796e3ec..23ab642 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -85,7 +85,7 @@ inetdaemon_PROGRAMS += @uucpd_BUILD@
 uucpd_SOURCES = uucpd.c
 EXTRA_PROGRAMS += uucpd
 
-INCLUDES = -I$(top_srcdir)/lib \
+INCLUDES = -I$(top_srcdir)/lib -I$(top_builddir)/lib \
 	-I$(top_srcdir)/libinetutils \
 	-I$(top_srcdir)/libicmp
 
diff --git a/src/inetd.c b/src/inetd.c
index 39a4e5d..7fb1216 100644
--- a/src/inetd.c
+++ b/src/inetd.c
@@ -136,6 +136,7 @@
 #include "libinetutils.h"
 #include "argcv.h"
 #include "version-etc.h"
+#include "unused-parameter.h"
 
 #ifndef EAI_ADDRFAMILY
 # define EAI_ADDRFAMILY 1
@@ -461,7 +462,7 @@ run_service (int ctrl, struct servtab *sep)
 }
 
 void
-reapchild (int signo ARG_UNUSED)
+reapchild (int signo _GL_UNUSED_PARAMETER)
 {
   int status;
   pid_t pid;
@@ -647,7 +648,7 @@ servent_setup (struct servtab *sep)
 }
 
 void
-retry (int signo ARG_UNUSED)
+retry (int signo _GL_UNUSED_PARAMETER)
 {
   struct servtab *sep;
 
diff --git a/src/rlogin.c b/src/rlogin.c
index 7cf319b..aca8c23 100644
--- a/src/rlogin.c
+++ b/src/rlogin.c
@@ -102,6 +102,7 @@
 
 #include <progname.h>
 #include "libinetutils.h"
+#include "unused-parameter.h"
 
 #ifdef SHISHI
 # define REALM_SZ 1040
@@ -817,7 +818,7 @@ int dosigwinch;
  * request to turn on the window-changing protocol.
  */
 void
-writeroob (int signo ARG_UNUSED)
+writeroob (int signo _GL_UNUSED_PARAMETER)
 {
   if (dosigwinch == 0)
     {
@@ -828,7 +829,7 @@ writeroob (int signo ARG_UNUSED)
 }
 
 void
-catch_child (int signo ARG_UNUSED)
+catch_child (int signo _GL_UNUSED_PARAMETER)
 {
   int status;
   pid_t pid;
@@ -991,7 +992,7 @@ stop (char cmdc)
 }
 
 void
-sigwinch (int signo ARG_UNUSED)
+sigwinch (int signo _GL_UNUSED_PARAMETER)
 {
   struct winsize ws;
 
@@ -1048,7 +1049,7 @@ int rcvcnt, rcvstate;
 char rcvbuf[8 * 1024];
 
 void
-oob (int signo ARG_UNUSED)
+oob (int signo _GL_UNUSED_PARAMETER)
 {
   char mark;
   struct termios tt;
@@ -1258,7 +1259,7 @@ mode (int f)
 }
 
 void
-lostpeer (int signo ARG_UNUSED)
+lostpeer (int signo _GL_UNUSED_PARAMETER)
 {
   setsig (SIGPIPE, SIG_IGN);
   error (0, 0, "\007connection closed.");
@@ -1267,7 +1268,7 @@ lostpeer (int signo ARG_UNUSED)
 
 /* copy SIGURGs to the child process. */
 void
-copytochild (int signo ARG_UNUSED)
+copytochild (int signo _GL_UNUSED_PARAMETER)
 {
   kill (child, SIGURG);
 }
diff --git a/src/rlogind.c b/src/rlogind.c
index 167c8d8..6a0f08b 100644
--- a/src/rlogind.c
+++ b/src/rlogind.c
@@ -69,6 +69,7 @@
 #include <progname.h>
 #include <argp.h>
 #include <libinetutils.h>
+#include "unused-parameter.h"
 
 /*
   The TIOCPKT_* macros may not be implemented in the pty driver.
@@ -1476,7 +1477,7 @@ control (int pty, char *cp, size_t n)
 }
 
 void
-cleanup (int signo ARG_UNUSED)
+cleanup (int signo _GL_UNUSED_PARAMETER)
 {
   char *p;
 
diff --git a/src/syslogd.c b/src/syslogd.c
index e9d32e6..305655c 100644
--- a/src/syslogd.c
+++ b/src/syslogd.c
@@ -120,6 +120,7 @@
 #include <progname.h>
 #include <libinetutils.h>
 #include <readutmp.h>
+#include "unused-parameter.h"
 
 /* A mask of all facilities mentioned explicitly in the configuration file
  *
@@ -1458,7 +1459,7 @@ cvthname (struct sockaddr_in *f)
 }
 
 void
-domark (int signo ARG_UNUSED)
+domark (int signo _GL_UNUSED_PARAMETER)
 {
   struct filed *f;
 
@@ -1503,7 +1504,7 @@ logerror (const char *type)
 }
 
 void
-doexit (int signo ARG_UNUSED)
+doexit (int signo _GL_UNUSED_PARAMETER)
 {
   _exit (0);
 }
@@ -1552,7 +1553,7 @@ die (int signo)
 
 /* INIT -- Initialize syslogd from configuration table.  */
 void
-init (int signo ARG_UNUSED)
+init (int signo _GL_UNUSED_PARAMETER)
 {
   FILE *cf;
   struct filed *f, *next, **nextp;
@@ -2021,7 +2022,7 @@ decode (const char *name, CODE * codetab)
 }
 
 void
-dbg_toggle (int signo ARG_UNUSED)
+dbg_toggle (int signo _GL_UNUSED_PARAMETER)
 {
   int dbg_save = dbg_output;
 
@@ -2053,7 +2054,7 @@ dbg_printf (const char *fmt, ...)
    set a flag variable which will tell the main loop to go through a
    restart.  */
 void
-trigger_restart (int signo ARG_UNUSED)
+trigger_restart (int signo _GL_UNUSED_PARAMETER)
 {
   restart = 1;
 }
diff --git a/talk/init_disp.c b/talk/init_disp.c
index 0accccf..c70cc61 100644
--- a/talk/init_disp.c
+++ b/talk/init_disp.c
@@ -61,9 +61,10 @@
 #include <signal.h>
 #include <error.h>
 #include "talk.h"
+#include "unused-parameter.h"
 
 static void
-sig_sent (int sig ARG_UNUSED)
+sig_sent (int sig _GL_UNUSED_PARAMETER)
 {
 
   message ("Connection closing. Exiting");
diff --git a/talkd/table.c b/talkd/table.c
index 3517d50..aad408d 100644
--- a/talkd/table.c
+++ b/talkd/table.c
@@ -21,6 +21,7 @@
 #include <config.h>
 
 #include <intalkd.h>
+#include "unused-parameter.h"
 
 typedef struct request_table table_t;
 
@@ -91,7 +92,8 @@ lookup_request (CTL_MSG * request,
 }
 
 static int
-fuzzy_comp (table_t * ptr, CTL_MSG * request, time_t * unused ARG_UNUSED)
+fuzzy_comp (table_t * ptr, CTL_MSG * request,
+	    time_t * unused _GL_UNUSED_PARAMETER)
 {
   if (ptr->request.type == LEAVE_INVITE
       && strcmp (request->l_name, ptr->request.r_name) == 0
diff --git a/talkd/talkd.c b/talkd/talkd.c
index c279a7d..060fb84 100644
--- a/talkd/talkd.c
+++ b/talkd/talkd.c
@@ -24,6 +24,7 @@
 #include <signal.h>
 #include <libinetutils.h>
 #include <progname.h>
+#include "unused-parameter.h"
 
 #ifndef LOG_FACILITY
 # define LOG_FACILITY LOG_DAEMON
@@ -123,7 +124,7 @@ talkd_init (void)
 time_t last_msg_time;
 
 static void
-alarm_handler (int err ARG_UNUSED)
+alarm_handler (int err _GL_UNUSED_PARAMETER)
 {
   if ((time (NULL) - last_msg_time) >= max_idle_time)
     exit (EXIT_SUCCESS);

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


commit 50adb1e3e9e52177d70eba97f00d3e648fdb1046
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Sat Jun 18 15:19:16 2011 +0200

    Replace RETSIGTYPE with void; this is old K&Rism.

diff --git a/ChangeLog b/ChangeLog
index cf64cab..2a50f5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,23 @@
 2011-06-18  Alfred M. Szmidt  <ams@gnu.org>
 
+	* whois/whois.h: Replace RETSIGTYPE with void; this is old K&Rism.
+	* whois/whois.c: Likewise.
+	* telnet/sys_bsd.c (ayt): Likewise.
+	* talk/invite.c (re_invite): Likewise.
+	* talk/init_disp.c (sig_sent): Likewise.
+	* src/syslogd.c (trigger_restart): Likewise.
+	* src/rsh.c: Likewise.
+	* src/rlogind.c (cleanup): Likewise.
+	* src/rlogin.c (copytochild): Likewise.
+	* src/rcp.c (lostconn): Likewise.
+	* src/inetd.c (signal_set_handler): Likewise.
+	* ping/ping6.c (sig_int): Likewise.
+	* ping/ping.c (sig_int): Likewise.
+	* libtelnet/auth.c (auth_intr): Likewise.
+	* libinetutils/daemon.c (waitdaemon_timeout): Likewise.
+
+2011-06-18  Alfred M. Szmidt  <ams@gnu.org>
+
 	* bootstrap.conf (gnulib_modules): Use malloc-gnu and realloc-gnu
 	instead of the old malloc and realloc modules.
 
diff --git a/ftp/cmds.c b/ftp/cmds.c
index 58dd5a6..5004487 100644
--- a/ftp/cmds.c
+++ b/ftp/cmds.c
@@ -834,7 +834,7 @@ getit (int argc, char **argv, int restartit, char *mode)
   return (0);
 }
 
-RETSIGTYPE
+void
 mabort (int signo ARG_UNUSED)
 {
   int ointer;
diff --git a/ftp/ftp.c b/ftp/ftp.c
index ecf4e67..7aad787 100644
--- a/ftp/ftp.c
+++ b/ftp/ftp.c
@@ -341,7 +341,7 @@ login (char *host)
   return (1);
 }
 
-RETSIGTYPE
+void
 cmdabort (int sig ARG_UNUSED)
 {
 
diff --git a/ftp/main.c b/ftp/main.c
index 38e36f0..1655e82 100644
--- a/ftp/main.c
+++ b/ftp/main.c
@@ -259,13 +259,13 @@ main (int argc, char *argv[])
     }
 }
 
-RETSIGTYPE
+void
 intr (int sig ARG_UNUSED)
 {
   longjmp (toplevel, 1);
 }
 
-RETSIGTYPE
+void
 lostpeer (int sig ARG_UNUSED)
 {
   if (connected)
diff --git a/ftpd/ftpd.c b/ftpd/ftpd.c
index b4bf1c7..711acaa 100644
--- a/ftpd/ftpd.c
+++ b/ftpd/ftpd.c
@@ -575,7 +575,7 @@ curdir (void)
   return (cred.guest ? path + 1 : path);
 }
 
-static RETSIGTYPE
+static void
 sigquit (int signo)
 {
   syslog (LOG_ERR, "got signal %s", strsignal (signo));
@@ -583,7 +583,7 @@ sigquit (int signo)
 }
 
 
-static RETSIGTYPE
+static void
 lostconn (int signo ARG_UNUSED)
 {
   if (debug)
@@ -1684,7 +1684,7 @@ dologout (int status)
   _exit (status);
 }
 
-static RETSIGTYPE
+static void
 myoob (int signo ARG_UNUSED)
 {
   char *cp;
diff --git a/ftpd/server_mode.c b/ftpd/server_mode.c
index 89e11a0..68902b7 100644
--- a/ftpd/server_mode.c
+++ b/ftpd/server_mode.c
@@ -83,7 +83,7 @@ check_host (struct sockaddr *sa)
 }
 #endif
 
-static RETSIGTYPE
+static void
 reapchild (int signo ARG_UNUSED)
 {
   int save_errno = errno;
diff --git a/libinetutils/daemon.c b/libinetutils/daemon.c
index 92a8091..f9c29cf 100644
--- a/libinetutils/daemon.c
+++ b/libinetutils/daemon.c
@@ -104,7 +104,7 @@
 
 #define MAXFD 64
 
-RETSIGTYPE
+void
 waitdaemon_timeout (int signo)
 {
   int left;
diff --git a/libtelnet/auth.c b/libtelnet/auth.c
index 831434c..654004f 100644
--- a/libtelnet/auth.c
+++ b/libtelnet/auth.c
@@ -649,7 +649,7 @@ auth_finished (TN_Authenticator * ap, int result)
   validuser = result;
 }
 
-static RETSIGTYPE
+static void
 auth_intr (int sig ARG_UNUSED)
 {
   auth_finished (0, AUTH_REJECT);
diff --git a/ping/ping.c b/ping/ping.c
index 826c0ec..9319a47 100644
--- a/ping/ping.c
+++ b/ping/ping.c
@@ -302,7 +302,7 @@ int (*decode_type (const char *arg)) (char *hostname)
 
 int volatile stop = 0;
 
-RETSIGTYPE
+void
 sig_int (int signal)
 {
   stop = 1;
diff --git a/ping/ping6.c b/ping/ping6.c
index 7d38396..2fcc9a4 100644
--- a/ping/ping6.c
+++ b/ping/ping6.c
@@ -258,7 +258,7 @@ ipaddr2str (struct sockaddr_in6 *from)
 
 static volatile int stop = 0;
 
-static RETSIGTYPE
+static void
 sig_int (int signal)
 {
   stop = 1;
diff --git a/src/inetd.c b/src/inetd.c
index 9aa76cd..39a4e5d 100644
--- a/src/inetd.c
+++ b/src/inetd.c
@@ -350,7 +350,7 @@ bi_lookup (const struct servtab *sep)
 #endif
 
 void
-signal_set_handler (int signo, RETSIGTYPE (*handler) ())
+signal_set_handler (int signo, void (*handler) ())
 {
 #if defined HAVE_SIGACTION
   struct sigaction sa;
diff --git a/src/rcp.c b/src/rcp.c
index a05145a..a89ed91 100644
--- a/src/rcp.c
+++ b/src/rcp.c
@@ -1222,7 +1222,7 @@ allocbuf (BUF * bp, int fd, int blksize)
   return (bp);
 }
 
-RETSIGTYPE
+void
 lostconn (int signo)
 {
   if (!iamremote)
diff --git a/src/rlogin.c b/src/rlogin.c
index f709bd4..7cf319b 100644
--- a/src/rlogin.c
+++ b/src/rlogin.c
@@ -186,24 +186,24 @@ int get_window_size (int, struct winsize *);
 #endif
 struct winsize winsize;
 
-RETSIGTYPE catch_child (int);
-RETSIGTYPE copytochild (int);
+void catch_child (int);
+void copytochild (int);
 void doit (sigset_t *);
 void done (int);
 void echo (char);
 u_int getescape (char *);
-RETSIGTYPE lostpeer (int);
+void lostpeer (int);
 void mode (int);
-RETSIGTYPE oob (int);
+void oob (int);
 int reader (sigset_t *);
 void sendwindow (void);
 void setsignal (int);
 int speed (int);
 unsigned int speed_translate (unsigned int);
-RETSIGTYPE sigwinch (int);
+void sigwinch (int);
 void stop (char);
 void writer (void);
-RETSIGTYPE writeroob (int);
+void writeroob (int);
 
 #if defined KERBEROS || defined SHISHI
 void warning (const char *, ...);
@@ -816,7 +816,7 @@ int dosigwinch;
  * This is called when the reader process gets the out-of-band (urgent)
  * request to turn on the window-changing protocol.
  */
-RETSIGTYPE
+void
 writeroob (int signo ARG_UNUSED)
 {
   if (dosigwinch == 0)
@@ -827,7 +827,7 @@ writeroob (int signo ARG_UNUSED)
   dosigwinch = 1;
 }
 
-RETSIGTYPE
+void
 catch_child (int signo ARG_UNUSED)
 {
   int status;
@@ -990,7 +990,7 @@ stop (char cmdc)
   sigwinch (0);			/* check for size changes */
 }
 
-RETSIGTYPE
+void
 sigwinch (int signo ARG_UNUSED)
 {
   struct winsize ws;
@@ -1047,7 +1047,7 @@ pid_t ppid;
 int rcvcnt, rcvstate;
 char rcvbuf[8 * 1024];
 
-RETSIGTYPE
+void
 oob (int signo ARG_UNUSED)
 {
   char mark;
@@ -1257,7 +1257,7 @@ mode (int f)
     }
 }
 
-RETSIGTYPE
+void
 lostpeer (int signo ARG_UNUSED)
 {
   setsig (SIGPIPE, SIG_IGN);
@@ -1266,7 +1266,7 @@ lostpeer (int signo ARG_UNUSED)
 }
 
 /* copy SIGURGs to the child process. */
-RETSIGTYPE
+void
 copytochild (int signo ARG_UNUSED)
 {
   kill (child, SIGURG);
diff --git a/src/rlogind.c b/src/rlogind.c
index eda944c..167c8d8 100644
--- a/src/rlogind.c
+++ b/src/rlogind.c
@@ -194,12 +194,12 @@ int do_krb_login (int infd, struct auth_data *ap, const char **msg);
 void getstr (int infd, char **ptr, const char *prefix);
 void protocol (int f, int p, struct auth_data *ap);
 int control (int pty, char *cp, size_t n);
-RETSIGTYPE cleanup (int signo);
+void cleanup (int signo);
 void fatal (int f, const char *msg, int syserr);
 int in_local_domain (char *hostname);
 char *topdomain (char *name, int max_dots);
 
-RETSIGTYPE
+void
 rlogind_sigchld (int sig)
 {
   pid_t pid;
@@ -1475,7 +1475,7 @@ control (int pty, char *cp, size_t n)
   return (4 + sizeof w);
 }
 
-RETSIGTYPE
+void
 cleanup (int signo ARG_UNUSED)
 {
   char *p;
diff --git a/src/rsh.c b/src/rsh.c
index dbb6c36..4a50927 100644
--- a/src/rsh.c
+++ b/src/rsh.c
@@ -115,7 +115,7 @@ int wlen;
 int rfd2;
 
 char *copyargs (char **);
-RETSIGTYPE sendsig (int);
+void sendsig (int);
 void talk (int, sigset_t *, pid_t, int);
 void warning (const char *, ...);
 
diff --git a/src/syslogd.c b/src/syslogd.c
index 3630473..e9d32e6 100644
--- a/src/syslogd.c
+++ b/src/syslogd.c
@@ -1502,13 +1502,13 @@ logerror (const char *type)
   logmsg (LOG_SYSLOG | LOG_ERR, buf, LocalHostName, ADDDATE);
 }
 
-RETSIGTYPE
+void
 doexit (int signo ARG_UNUSED)
 {
   _exit (0);
 }
 
-RETSIGTYPE
+void
 die (int signo)
 {
   struct filed *f;
@@ -1551,7 +1551,7 @@ die (int signo)
 }
 
 /* INIT -- Initialize syslogd from configuration table.  */
-RETSIGTYPE
+void
 init (int signo ARG_UNUSED)
 {
   FILE *cf;
@@ -2020,7 +2020,7 @@ decode (const char *name, CODE * codetab)
   return -1;
 }
 
-RETSIGTYPE
+void
 dbg_toggle (int signo ARG_UNUSED)
 {
   int dbg_save = dbg_output;
@@ -2052,7 +2052,7 @@ dbg_printf (const char *fmt, ...)
    not being doing this during a signal handler.  Instead we simply
    set a flag variable which will tell the main loop to go through a
    restart.  */
-RETSIGTYPE
+void
 trigger_restart (int signo ARG_UNUSED)
 {
   restart = 1;
diff --git a/talk/init_disp.c b/talk/init_disp.c
index a71765e..0accccf 100644
--- a/talk/init_disp.c
+++ b/talk/init_disp.c
@@ -62,7 +62,7 @@
 #include <error.h>
 #include "talk.h"
 
-static RETSIGTYPE
+static void
 sig_sent (int sig ARG_UNUSED)
 {
 
diff --git a/talk/invite.c b/talk/invite.c
index dbf6280..b985a80 100644
--- a/talk/invite.c
+++ b/talk/invite.c
@@ -114,7 +114,7 @@ announce_invite (void)
 /*
  * Routine called on interupt to re-invite the callee
  */
-RETSIGTYPE
+void
 re_invite (int sig)
 {
 
diff --git a/telnet/sys_bsd.c b/telnet/sys_bsd.c
index 2b01282..fc14211 100644
--- a/telnet/sys_bsd.c
+++ b/telnet/sys_bsd.c
@@ -71,7 +71,7 @@
 #include "types.h"
 
 #ifdef	SIGINFO
-extern RETSIGTYPE ayt_status ();
+extern void ayt_status ();
 #endif
 
 int tout,			/* Output file descriptor */
@@ -671,10 +671,10 @@ TerminalNewMode (register int f)
   if (f != -1)
     {
 #ifdef	SIGTSTP
-      RETSIGTYPE susp (int sig);
+      void susp (int sig);
 #endif /* SIGTSTP */
 #ifdef	SIGINFO
-      RETSIGTYPE ayt ();
+      void ayt ();
 #endif
 
 #ifdef	SIGTSTP
@@ -726,7 +726,7 @@ TerminalNewMode (register int f)
   else
     {
 #ifdef	SIGINFO
-      RETSIGTYPE ayt_status ();
+      void ayt_status ();
 
       signal (SIGINFO, ayt_status);
 #endif
@@ -938,7 +938,7 @@ NetSetPgrp (int fd)
  * Various signal handling routines.
  */
 
-RETSIGTYPE
+void
 deadpeer (int sig)
 {
   setcommandmode ();
@@ -946,7 +946,7 @@ deadpeer (int sig)
 }
 
 
-RETSIGTYPE
+void
 intr (int sig)
 {
   if (localchars)
@@ -959,7 +959,7 @@ intr (int sig)
 }
 
 
-RETSIGTYPE
+void
 intr2 (int sig)
 {
   if (localchars)
@@ -975,7 +975,7 @@ intr2 (int sig)
 }
 
 #ifdef	SIGTSTP
-RETSIGTYPE
+void
 susp (int sig)
 {
   if ((rlogin != _POSIX_VDISABLE) && rlogin_susp ())
@@ -986,7 +986,7 @@ susp (int sig)
 #endif
 
 #ifdef	SIGWINCH
-RETSIGTYPE
+void
 sendwin (int sig)
 {
   if (connected)
@@ -997,7 +997,7 @@ sendwin (int sig)
 #endif
 
 #ifdef	SIGINFO
-RETSIGTYPE
+void
 ayt (int sig)
 {
   if (connected)
diff --git a/whois/whois.c b/whois/whois.c
index f2cb2b2..88d5a75 100644
--- a/whois/whois.c
+++ b/whois/whois.c
@@ -588,7 +588,7 @@ closeconn (const int fd)
   close (fd);
 }
 
-RETSIGTYPE
+void
 sighandler (int signum)
 {
   closeconn (sockfd);
diff --git a/whois/whois.h b/whois/whois.h
index 372eeaf..c83b04d 100644
--- a/whois/whois.h
+++ b/whois/whois.h
@@ -61,7 +61,7 @@ void do_query (const int, const char *);
 const char *query_crsnic (const int, const char *);
 int openconn (const char *, const char *);
 void closeconn (const int);
-RETSIGTYPE sighandler (int);
+void sighandler (int);
 unsigned long myinet_aton (const char *);
 int domcmp (const char *, const char *);
 int domfind (const char *, const char *[]);

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


commit ab40bdd6d6db50b4f9ab621266a7e0331548a2cc
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Sat Jun 18 14:41:03 2011 +0200

    bootstrap.conf (gnulib_modules): Use malloc-gnu and realloc-gnu instead of the old malloc and realloc modules.

diff --git a/ChangeLog b/ChangeLog
index ab2d5db..cf64cab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-18  Alfred M. Szmidt  <ams@gnu.org>
+
+	* bootstrap.conf (gnulib_modules): Use malloc-gnu and realloc-gnu
+	instead of the old malloc and realloc modules.
+
 2011-06-17  Alfred M. Szmidt  <ams@gnu.org>
 
 	* libinetutils/libinetutils.h: Don't include <config.h>; instead
diff --git a/bootstrap.conf b/bootstrap.conf
index f770785..f654fa6 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -50,7 +50,7 @@ glob
 gnupload
 inttostr
 maintainer-makefile
-malloc
+malloc-gnu
 mempcpy
 minmax
 obstack
@@ -59,7 +59,7 @@ progname
 read-file
 readline
 readutmp
-realloc
+realloc-gnu
 regex
 setenv
 signal

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


commit e6cdeb0a4a304079893b11b63a353ba1f7fc9bec
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Sat Jun 18 14:27:04 2011 +0200

    libinetutils/libinetutils.h: Don't include <config.h>; instead produce
    an error if we haven't included it.

diff --git a/ChangeLog b/ChangeLog
index 590361a..ab2d5db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2011-06-17  Alfred M. Szmidt  <ams@gnu.org>
 
+	* libinetutils/libinetutils.h: Don't include <config.h>; instead
+	produce an error if we haven't included it.
+
+2011-06-17  Alfred M. Szmidt  <ams@gnu.org>
+
 	* bootstrap.conf (gnulib_modules): Added signal to list.
 
 2011-06-16  Simon Josefsson  <simon@josefsson.org>
diff --git a/libinetutils/libinetutils.h b/libinetutils/libinetutils.h
index 8cfe792..56174e1 100644
--- a/libinetutils/libinetutils.h
+++ b/libinetutils/libinetutils.h
@@ -17,7 +17,9 @@
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
-#include <config.h>
+#ifndef HAVE_CONFIG_H
+#error "<config.h> has not been included; please included it"
+#endif
 
 #include "argp-version-etc.h"
 

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


commit eac0b931c1545134d0027301b580c51a3dde8ca0
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Sat Jun 18 14:26:24 2011 +0200

    bootstrap.conf (gnulib_modules): Added signal to list.

diff --git a/ChangeLog b/ChangeLog
index 60cf0ee..590361a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-06-17  Alfred M. Szmidt  <ams@gnu.org>
+
+	* bootstrap.conf (gnulib_modules): Added signal to list.
+
 2011-06-16  Simon Josefsson  <simon@josefsson.org>
 
 	* configure.ac: Don't check for sig_t.
diff --git a/bootstrap.conf b/bootstrap.conf
index 880ce11..f770785 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -62,6 +62,7 @@ readutmp
 realloc
 regex
 setenv
+signal
 size_max
 snprintf
 stdbool

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

Summary of changes:
 ChangeLog                   |   63 +++++++++++++++++++++++++++++++++++++++++++
 bootstrap.conf              |    7 +++-
 ftp/cmds.c                  |    5 ++-
 ftp/ftp.c                   |    5 ++-
 ftp/main.c                  |    9 +++---
 ftpd/ftpd.c                 |   11 ++++---
 ftpd/server_mode.c          |    5 ++-
 libinetutils/daemon.c       |    2 +-
 libinetutils/libinetutils.h |    4 ++-
 libtelnet/Makefile.am       |    2 +-
 libtelnet/auth.c            |    6 +++-
 ping/ping.c                 |    2 +-
 ping/ping6.c                |    2 +-
 src/Makefile.am             |    2 +-
 src/inetd.c                 |    7 +++--
 src/rcp.c                   |    2 +-
 src/rlogin.c                |   37 +++++++++++++------------
 src/rlogind.c               |    9 +++---
 src/rsh.c                   |    2 +-
 src/syslogd.c               |   21 +++++++-------
 talk/init_disp.c            |    5 ++-
 talk/invite.c               |    2 +-
 talkd/table.c               |    4 ++-
 talkd/talkd.c               |    3 +-
 telnet/sys_bsd.c            |   20 +++++++-------
 whois/whois.c               |    2 +-
 whois/whois.h               |    2 +-
 27 files changed, 162 insertions(+), 79 deletions(-)
 mode change 100644 => 100755 tests/syslogd.sh


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Sat Jun 18 12:40:30 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1QXyZR-0002mf-Qr
	for mharc-commit-inetutils@gnu.org; Sat, 18 Jun 2011 12:40:29 -0400
Received: from eggs.gnu.org ([140.186.70.92]:43661)
	by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1QXyZP-0002mM-8I
	for commit-inetutils@gnu.org; Sat, 18 Jun 2011 12:40:28 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ams@gnu.org>) id 1QXyZO-0006Jp-0C
	for commit-inetutils@gnu.org; Sat, 18 Jun 2011 12:40:27 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:56681)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1QXyZN-0006Jh-JI
	for commit-inetutils@gnu.org; Sat, 18 Jun 2011 12:40:25 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by colonialone.fsf.org with esmtp (Exim 4.69)
	(envelope-from <ams@gnu.org>) id 1QXyZN-00005n-7A
	for commit-inetutils@gnu.org; Sat, 18 Jun 2011 16:40:25 +0000
Received: from ams by vcs-noshell.in.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <ams@savannah.gnu.org>) id 1QXyZN-0003KA-2A
	for commit-inetutils@gnu.org; Sat, 18 Jun 2011 16:40:25 +0000
Date: Sat, 18 Jun 2011 16:40:25 +0000
Message-Id: <E1QXyZN-0003KA-2A@vcs-noshell.in.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-105-g4db2d66
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: ab1c6c0a9f6ad1aa2eeb45230fe212ee9b2ff59f
X-Git-Newrev: 4db2d663e99916547716d69625309740abf2eee2
From: "Alfred M. Szmidt" <ams@gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.51
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
	<commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/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: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 18 Jun 2011 16:40:28 -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  4db2d663e99916547716d69625309740abf2eee2 (commit)
      from  ab1c6c0a9f6ad1aa2eeb45230fe212ee9b2ff59f (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=4db2d663e99916547716d69625309740abf2eee2


commit 4db2d663e99916547716d69625309740abf2eee2
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Sat Jun 18 18:40:14 2011 +0200

    Fix typos.  (silent change)

diff --git a/ChangeLog b/ChangeLog
index 98cbef7..e125565 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -33,19 +33,19 @@
 
 	* whois/whois.h: Replace RETSIGTYPE with void; this is old K&Rism.
 	* whois/whois.c: Likewise.
-	* telnet/sys_bsd.c (ayt): Likewise.
-	* talk/invite.c (re_invite): Likewise.
-	* talk/init_disp.c (sig_sent): Likewise.
-	* src/syslogd.c (trigger_restart): Likewise.
+	* telnet/sys_bsd.c: Likewise.
+	* talk/invite.c: Likewise.
+	* talk/init_disp.c: Likewise.
+	* src/syslogd.c: Likewise.
 	* src/rsh.c: Likewise.
-	* src/rlogind.c (cleanup): Likewise.
-	* src/rlogin.c (copytochild): Likewise.
-	* src/rcp.c (lostconn): Likewise.
-	* src/inetd.c (signal_set_handler): Likewise.
-	* ping/ping6.c (sig_int): Likewise.
-	* ping/ping.c (sig_int): Likewise.
-	* libtelnet/auth.c (auth_intr): Likewise.
-	* libinetutils/daemon.c (waitdaemon_timeout): Likewise.
+	* src/rlogind.c: Likewise.
+	* src/rlogin.c: Likewise.
+	* src/rcp.c: Likewise.
+	* src/inetd.c: Likewise.
+	* ping/ping6.c: Likewise.
+	* ping/ping.c: Likewise.
+	* libtelnet/auth.c: Likewise.
+	* libinetutils/daemon.c: Likewise.
 
 2011-06-18  Alfred M. Szmidt  <ams@gnu.org>
 

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

Summary of changes:
 ChangeLog |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Mon Jun 20 04:55:46 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1QYaGn-0006sq-D8
	for mharc-commit-inetutils@gnu.org; Mon, 20 Jun 2011 04:55:45 -0400
Received: from eggs.gnu.org ([140.186.70.92]:39071)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1QYaGj-0006ry-B2
	for commit-inetutils@gnu.org; Mon, 20 Jun 2011 04:55:43 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1QYaGg-0003ls-Tn
	for commit-inetutils@gnu.org; Mon, 20 Jun 2011 04:55:41 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:38326)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1QYaGg-0003lg-8G
	for commit-inetutils@gnu.org; Mon, 20 Jun 2011 04:55:38 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by colonialone.fsf.org with esmtp (Exim 4.69)
	(envelope-from <gnu@gisladisker.se>) id 1QYaGf-0002q2-P3
	for commit-inetutils@gnu.org; Mon, 20 Jun 2011 08:55:38 +0000
Received: from meand by vcs-noshell.in.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <meand@savannah.gnu.org>) id 1QYaGZ-0006aN-6R
	for commit-inetutils@gnu.org; Mon, 20 Jun 2011 08:55:33 +0000
Date: Mon, 20 Jun 2011 08:55:31 +0000
Message-Id: <E1QYaGZ-0006aN-6R@vcs-noshell.in.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-106-g77ca511
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 4db2d663e99916547716d69625309740abf2eee2
X-Git-Newrev: 77ca51191bd57e953a1c289290e9f5d94238ba55
From: Mats Erik Andersson <gnu@gisladisker.se>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.51
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
	<commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/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: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 20 Jun 2011 08:55:43 -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  77ca51191bd57e953a1c289290e9f5d94238ba55 (commit)
      from  4db2d663e99916547716d69625309740abf2eee2 (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=77ca51191bd57e953a1c289290e9f5d94238ba55


commit 77ca51191bd57e953a1c289290e9f5d94238ba55
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Mon Jun 20 10:48:43 2011 +0200

    syslogd: Rewrite using getaddrinfo, preparing IPv6.

diff --git a/ChangeLog b/ChangeLog
index e125565..d0ae04c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2011-06-20  Mats Erik Andersson <gnu@gisladisker.se>
+
+	* src/syslogd.c: Replace all `struct sockaddr_in' with
+	`struct sockaddr_storage'; provide `socklen_t' where needed.
+	Replace `gethostbyname', `struct hostent' with `getaddrinfo'
+	and `struct addrinfo'.
+	(struct filed): In `struct f_forw', use `struct sockaddr_storage'
+	and `socklen_t'.
+	(addrstr, addrname, usefamily, LogPortText): New variables.
+	(main): Call `create_inet_socket' with parameter USEFAMILY.
+	(create_inet_socket): New parameter list `int' with address family.
+	Enforce `IPV6_ONLY' for family `AF_INET6'.
+	(cvthname): New parameter list `struct sockaddr *, socklen_t'.
+	Replace `inet_ntoa' and `gethostbyaddr' by two applications
+	of `getnameinfo'.
+	(init): Use LOGPORTTEXT to determine listening port.  Sanity
+	check on `f->f_prevhost' before freeing memory.
+	* tests/syslogd.sh [REMOTE_LOGHOST]: Include a loghost setting.
+
 2011-06-18  Alfred M. Szmidt  <ams@gnu.org>
 
 	* bootstrap.conf (gnulib_modules): Added mkstemp to list.
diff --git a/src/syslogd.c b/src/syslogd.c
index 305655c..a56414e 100644
--- a/src/syslogd.c
+++ b/src/syslogd.c
@@ -175,7 +175,8 @@ struct filed
     struct
     {
       char *f_hname;
-      struct sockaddr_in f_addr;
+      struct sockaddr_storage f_addr;
+      socklen_t f_addrlen;
     } f_forw;			/* Forwarding address.  */
     char *f_fname;		/* Name use for Files|Pipes|TTYs.  */
   } f_un;
@@ -242,7 +243,7 @@ int repeatinterval[] = { 30, 60 };	/* Number of seconds before flush.  */
 extern int waitdaemon (int nochdir, int noclose, int maxwait);
 
 void cfline (const char *, struct filed *);
-const char *cvthname (struct sockaddr_in *);
+const char *cvthname (struct sockaddr *, socklen_t);
 int decode (const char *, CODE *);
 void die (int);
 void doexit (int);
@@ -262,13 +263,19 @@ static void dbg_printf (const char *, ...);
 void trigger_restart (int);
 static void add_funix (const char *path);
 static int create_unix_socket (const char *path);
-static int create_inet_socket (void);
+static int create_inet_socket (int af);
 
 char *LocalHostName;		/* Our hostname.  */
 char *LocalDomain;		/* Our local domain name.  */
+char addrstr[INET6_ADDRSTRLEN];	/* Common address presentation.  */
+char addrname[NI_MAXHOST];	/* Common name lookup.  */
+int usefamily = AF_INET;	/* Address family for INET services.
+				 * Each of the values `AF_INET' and `AF_INET6'
+				 * produces a single-stacked server.  */
 int finet = -1;			/* Internet datagram socket fd.  */
 int fklog = -1;			/* Kernel log device fd.  */
-int LogPort;			/* Port number for INET connections.  */
+char *LogPortText = "syslog";	/* Service/port for INET connections.  */
+int LogPort;			/* LogPortText translated to a numeric value.  */
 int Initialized;		/* True when we are initialized. */
 int MarkInterval = 20 * 60;	/* Interval between marks in seconds.  */
 int MarkSeq;			/* Mark sequence number.  */
@@ -473,21 +480,27 @@ main (int argc, char *argv[])
     }
   else
     {
-      struct hostent *host_ent;
+      struct addrinfo hints, *rp;
+      int err;
 
-      /* Try to resolve the domainname by calling DNS. */
-      host_ent = gethostbyname (LocalHostName);
-      if (host_ent)
+      memset (&hints, 0, sizeof (hints));
+      hints.ai_family = AF_UNSPEC;	/* Family is irrelevant.  */
+      hints.ai_flags = AI_CANONNAME;
+
+      /* Try to resolve the domainname by calling DNS.  */
+      err = getaddrinfo (LocalHostName, NULL, &hints, &rp);
+      if (err == 0)
 	{
 	  /* Override what we had */
 	  free (LocalHostName);
-	  LocalHostName = strdup (host_ent->h_name);
+	  LocalHostName = strdup (rp->ai_canonname);
 	  p = strchr (LocalHostName, '.');
 	  if (p != NULL)
 	    {
 	      *p++ = '\0';
 	      LocalDomain = p;
 	    }
+	  freeaddrinfo (rp);
 	}
       if (LocalDomain == NULL)
 	LocalDomain = strdup ("");
@@ -550,7 +563,7 @@ main (int argc, char *argv[])
   /* Initialize inet socket and add them to the list.  */
   if (AcceptRemote || (!NoForward))
     {
-      finet = create_inet_socket ();
+      finet = create_inet_socket (usefamily);
       if (finet >= 0)
 	{
 	  fdarray[nfds].fd = finet;
@@ -697,7 +710,7 @@ main (int argc, char *argv[])
 	      }
 	    else if (fdarray[i].fd == finet)
 	      {
-		struct sockaddr_in frominet;
+		struct sockaddr_storage frominet;
 		/*dbg_printf ("inet message\n"); */
 		len = sizeof (frominet);
 		memset (line, '\0', sizeof (line));
@@ -706,7 +719,7 @@ main (int argc, char *argv[])
 		if (result > 0)
 		  {
 		    line[result] = '\0';
-		    printline (cvthname (&frominet), line);
+		    printline (cvthname ((struct sockaddr *) &frominet, len), line);
 		  }
 		else if (result < 0 && errno != EINTR)
 		  logerror ("recvfrom inet");
@@ -783,26 +796,49 @@ create_unix_socket (const char *path)
 }
 
 static int
-create_inet_socket (void)
+create_inet_socket (int af)
 {
-  int fd;
-  struct sockaddr_in sin;
+  int err, fd = -1;
+  struct addrinfo hints, *rp, *ai;
+
+  memset (&hints, 0, sizeof (hints));
+  hints.ai_family = af;
+  hints.ai_socktype = SOCK_DGRAM;
+  hints.ai_flags = AI_PASSIVE;
 
-  fd = socket (AF_INET, SOCK_DGRAM, 0);
-  if (fd < 0)
+  err = getaddrinfo (NULL, LogPortText, &hints, &rp);
+  if (err)
     {
-      logerror ("unknown protocol, suspending inet service");
+      logerror ("lookup error, suspending inet service");
       return fd;
     }
 
-  memset (&sin, 0, sizeof (sin));
-  sin.sin_family = AF_INET;
-  sin.sin_port = LogPort;
-  if (bind (fd, (struct sockaddr *) &sin, sizeof (sin)) < 0)
+  for (ai = rp; ai; ai = ai->ai_next)
     {
-      logerror ("bind, suspending inet");
-      close (fd);
-      return -1;
+      fd = socket (ai->ai_family, ai->ai_socktype, ai->ai_protocol);
+      if (fd < 0)
+	continue;
+      if (ai->ai_family == AF_INET6)
+	{
+	  int yes = 1;
+	  /* Avoid dual stacked sockets.  Better to use distinct sockets.  */
+	  (void) setsockopt (fd, IPPROTO_IPV6, IPV6_V6ONLY, &yes, sizeof (yes));
+	}
+      if (bind (fd, ai->ai_addr, ai->ai_addrlen) < 0)
+	{
+	  close (fd);
+	  fd = -1;
+	  continue;
+	}
+      /* Success.  Only one socket at this time.  */
+      break;
+    }
+  freeaddrinfo (rp);
+
+  if (ai == NULL)
+    {
+      logerror ("inet service, failed lookup.");
+      return fd;
     }
   return fd;
 }
@@ -1123,7 +1159,6 @@ fprintlog (struct filed *f, const char *from, int flags, const char *msg)
   int l;
   char line[MAXLINE + 1], repbuf[80], greetings[200];
   time_t fwd_suspend;
-  struct hostent *hp;
 
   v = iov;
   /* Be paranoid.  */
@@ -1208,11 +1243,18 @@ fprintlog (struct filed *f, const char *from, int flags, const char *msg)
       fwd_suspend = time ((time_t *) 0) - f->f_time;
       if (fwd_suspend >= INET_SUSPEND_TIME)
 	{
-	  hp = gethostbyname (f->f_un.f_forw.f_hname);
-	  if (hp == NULL)
+	  struct addrinfo hints, *rp;
+	  int err;
+
+	  memset (&hints, 0, sizeof (hints));
+	  hints.ai_family = usefamily;
+#ifdef AI_ADDRCONFIG
+	  hints.ai_flags = AI_ADDRCONFIG;
+#endif
+	  err = getaddrinfo (f->f_un.f_forw.f_hname, LogPortText, &hints, &rp);
+	  if (err)
 	    {
-	      extern int h_errno;
-	      dbg_printf ("Failure: %s\n", hstrerror (h_errno));
+	      dbg_printf ("Failure: %s\n", gai_strerror (err));
 	      dbg_printf ("Retries: %d\n", f->f_prevcount);
 	      if (--f->f_prevcount < 0)
 		{
@@ -1224,8 +1266,9 @@ fprintlog (struct filed *f, const char *from, int flags, const char *msg)
 	  else
 	    {
 	      dbg_printf ("%s found, resuming.\n", f->f_un.f_forw.f_hname);
-	      memcpy (&f->f_un.f_forw.f_addr.sin_addr,
-		      hp->h_addr, hp->h_length);
+	      f->f_un.f_forw.f_addrlen = rp->ai_addrlen;
+	      memcpy (&f->f_un.f_forw.f_addr, rp->ai_addr, rp->ai_addrlen);
+	      freeaddrinfo (rp);
 	      f->f_prevcount = 0;
 	      f->f_type = F_FORW;
 	      goto f_forw;
@@ -1256,7 +1299,7 @@ fprintlog (struct filed *f, const char *from, int flags, const char *msg)
 	    l = MAXLINE;
 	  if (sendto (finet, line, l, 0,
 		      (struct sockaddr *) &f->f_un.f_forw.f_addr,
-		      sizeof (f->f_un.f_forw.f_addr)) != l)
+		      f->f_un.f_forw.f_addrlen) != l)
 	    {
 	      int e = errno;
 	      dbg_printf ("INET sendto error: %d = %s.\n", e, strerror (e));
@@ -1397,28 +1440,31 @@ wallmsg (struct filed *f, struct iovec *iov)
 
 /* Return a printable representation of a host address.  */
 const char *
-cvthname (struct sockaddr_in *f)
+cvthname (struct sockaddr *f, socklen_t len)
 {
-  struct hostent *hp;
+  int err;
   char *p;
 
-  dbg_printf ("cvthname(%s)\n", inet_ntoa (f->sin_addr));
-
-  if (f->sin_family != AF_INET)
+  err = getnameinfo (f, len, addrstr, sizeof (addrstr),
+		     NULL, 0, NI_NUMERICHOST);
+  if (err)
     {
-      dbg_printf ("Malformed from address.\n");
+      dbg_printf ("Malformed from address: %s.\n",
+		  gai_strerror (err));
       return "???";
     }
-  hp = gethostbyaddr ((char *) &f->sin_addr,
-		      sizeof (struct in_addr), f->sin_family);
-  if (hp == 0)
+
+  dbg_printf ("cvthname(%s)\n", addrstr);
+
+  err = getnameinfo (f, len, addrname, sizeof (addrname),
+		     NULL, 0, NI_NAMEREQD);
+  if (err)
     {
-      dbg_printf ("Host name for your address (%s) unknown.\n",
-		  inet_ntoa (f->sin_addr));
-      return inet_ntoa (f->sin_addr);
+      dbg_printf ("Host name for your address (%s) unknown.\n", addrstr);
+      return addrstr;
     }
 
-  p = strchr (hp->h_name, '.');
+  p = strchr (addrname, '.');
   if (p != NULL)
     {
       if (strcasecmp (p + 1, LocalDomain) == 0)
@@ -1435,7 +1481,7 @@ cvthname (struct sockaddr_in *f)
 		  if (strcasecmp (p + 1, StripDomains[count]) == 0)
 		    {
 		      *p = '\0';
-		      return hp->h_name;
+		      return addrname;
 		    }
 		  count++;
 		}
@@ -1445,17 +1491,17 @@ cvthname (struct sockaddr_in *f)
 	      count = 0;
 	      while (LocalHosts[count])
 		{
-		  if (strcasecmp (hp->h_name, LocalHosts[count]) == 0)
+		  if (strcasecmp (addrname, LocalHosts[count]) == 0)
 		    {
 		      *p = '\0';
-		      return hp->h_name;
+		      return addrname;
 		    }
 		  count++;
 		}
 	    }
 	}
     }
-  return hp->h_name;
+  return addrname;
 }
 
 void
@@ -1568,7 +1614,7 @@ init (int signo _GL_UNUSED_PARAMETER)
   struct servent *sp;
 
   dbg_printf ("init\n");
-  sp = getservbyname ("syslog", "udp");
+  sp = getservbyname (LogPortText, "udp");
   if (sp == NULL)
     {
       errno = 0;
@@ -1609,7 +1655,8 @@ init (int signo _GL_UNUSED_PARAMETER)
 	  free (f->f_un.f_user.f_unames);
 	  break;
 	}
-      free (f->f_prevhost);
+      if (f->f_prevhost)
+	free (f->f_prevhost);
       next = f->f_next;
       free (f);
     }
@@ -1780,8 +1827,8 @@ init (int signo _GL_UNUSED_PARAMETER)
 void
 cfline (const char *line, struct filed *f)
 {
-  struct hostent *hp;
-  int i, pri, negate_pri, excl_pri;
+  struct addrinfo hints, *rp;
+  int i, pri, negate_pri, excl_pri, err;
   unsigned int pri_set, pri_clear;
   char *bp;
   const char *p, *q;
@@ -1919,24 +1966,47 @@ cfline (const char *line, struct filed *f)
     {
     case '@':
       f->f_un.f_forw.f_hname = strdup (++p);
-      hp = gethostbyname (p);
-      if (hp == NULL)
+      memset (&hints, 0, sizeof (hints));
+      hints.ai_family = usefamily;
+      hints.ai_socktype = SOCK_DGRAM;
+#ifdef AI_ADDRCONFIG
+      hints.ai_flags = AI_ADDRCONFIG;
+#endif
+
+      f->f_un.f_forw.f_addrlen = 0;	/* Invalidate address.  */
+      memset (&f->f_un.f_forw.f_addr, 0, sizeof (f->f_un.f_forw.f_addr));
+
+      err = getaddrinfo (p, LogPortText, &hints, &rp);
+      if (err)
 	{
-	  extern int h_errno;
-	  if (h_errno == NO_DATA || h_errno == HOST_NOT_FOUND)
-	    f->f_type = F_UNUSED;	/* No recovery possible.  */
-	  else
-	    f->f_type = F_FORW_UNKN;	/* Temporary failure.  */
-	  f->f_prevcount = INET_RETRY_MAX;
+	  switch (err)
+	    {
+	      case EAI_AGAIN:	/* Known kinds of temporary error.  */
+	      case EAI_MEMORY:
+		f->f_type = F_FORW_UNKN;
+		f->f_prevcount = INET_RETRY_MAX;
+		break;
+
+	      case EAI_NONAME:	/* The most probable causes for failure.  */
+#if defined(EAI_NODATA) && (EAI_NODATA != EAI_NONAME)	/* FreeBSD complains.  */
+	      case EAI_NODATA:
+#endif
+#ifdef EAI_ADDRFAMILY
+	      case EAI_ADDRFAMILY:
+#endif
+	      default:		/* Catch system exceptions.  */
+		f->f_type = F_UNUSED;
+	    }
+
 	  f->f_time = time ((time_t *) 0);
 	}
       else
-	f->f_type = F_FORW;
-      memset (&f->f_un.f_forw.f_addr, 0, sizeof (f->f_un.f_forw.f_addr));
-      f->f_un.f_forw.f_addr.sin_family = AF_INET;
-      f->f_un.f_forw.f_addr.sin_port = LogPort;
-      if (f->f_type == F_FORW)
-	memcpy (&f->f_un.f_forw.f_addr.sin_addr, hp->h_addr, hp->h_length);
+	{
+	  f->f_type = F_FORW;
+	  f->f_un.f_forw.f_addrlen = rp->ai_addrlen;
+	  memcpy (&f->f_un.f_forw.f_addr, rp->ai_addr, rp->ai_addrlen);
+	  freeaddrinfo (rp);
+	}
       break;
 
     case '|':
diff --git a/tests/syslogd.sh b/tests/syslogd.sh
index 8b0cd88..124469d 100755
--- a/tests/syslogd.sh
+++ b/tests/syslogd.sh
@@ -72,6 +72,15 @@ cat > $CONF <<-EOT
 	*.*	@not.in.existence
 EOT
 
+# Set REMOTE_LOGHOST to activate forwarding
+#
+if [ -n "$REMOTE_LOGHOST" ]; then
+	# Append a forwarding stanza.
+	cat >> $CONF <<-EOT
+		*.*	@$REMOTE_LOGHOST
+	EOT
+fi
+
 # Attempt to start the server after first
 # building the desired option list.
 #
@@ -79,7 +88,7 @@ EOT
 IU_OPTIONS="--rcfile=$CONF --pidfile=$PID --socket=$SOCKET"
 ## Enable INET service when running as root.
 if [ "$USER" = "root" ]; then
-	IU_OPTIONS="$IU_OPTIONS --inet"
+	IU_OPTIONS="$IU_OPTIONS --inet --hop"
 fi
 ## Bring in additional options from command line.
 ## Disable kernel messages otherwise.

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

Summary of changes:
 ChangeLog        |   19 +++++
 src/syslogd.c    |  206 ++++++++++++++++++++++++++++++++++++------------------
 tests/syslogd.sh |   11 +++-
 3 files changed, 167 insertions(+), 69 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


