From MAILER-DAEMON Thu Dec 01 05:27:39 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RW3rf-0004aq-Dq
	for mharc-commit-inetutils@gnu.org; Thu, 01 Dec 2011 05:27:39 -0500
Received: from eggs.gnu.org ([140.186.70.92]:35921)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RW3rX-0004Zb-W9
	for commit-inetutils@gnu.org; Thu, 01 Dec 2011 05:27:37 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RW3rQ-0001vK-Lp
	for commit-inetutils@gnu.org; Thu, 01 Dec 2011 05:27:31 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:43791)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RW3rQ-0001vG-KE
	for commit-inetutils@gnu.org; Thu, 01 Dec 2011 05:27:24 -0500
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1RW3rP-00014J-S8
	for commit-inetutils@gnu.org; Thu, 01 Dec 2011 10:27:24 +0000
Date: Thu, 01 Dec 2011 10:27:23 +0000
Message-Id: <E1RW3rP-00014J-S8@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-187-g66e35f3
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: d53944dca6544de38238e950f382de621fdc407e
X-Git-Newrev: 66e35f34292651c34e5347a1707772df73c2eef3
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.72
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, 01 Dec 2011 10:27: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  66e35f34292651c34e5347a1707772df73c2eef3 (commit)
      from  d53944dca6544de38238e950f382de621fdc407e (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=66e35f34292651c34e5347a1707772df73c2eef3


commit 66e35f34292651c34e5347a1707772df73c2eef3
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Thu Dec 1 11:23:50 2011 +0100

    Incomplete header inclusion. Fixes in syslogd test.

diff --git a/ChangeLog b/ChangeLog
index 74d415c..f48cbed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-12-01  Mats Erik Andersson <gnu@gisladisker.se>
+
+	* ifconfig/ifconfig.c: Include <netinet/in.h>.
+	* ifconfig/printif.h: Likewise.
+	* ping/libping.c: Likewise.
+	* src/hostname.c: Include <arpa/inet.h> after <netinet/in.h>.
+	* tests/syslogd.sh: Extra long socket name only for known cases.
+	Delay verbose version printing.  Clean up when port was busy.
+
 2011-11-30  Mats Erik Andersson <gnu@gisladisker.se>
 
 	OpenBSD 4.9 has changed <syslog.h>.  Relax configuration.
diff --git a/ifconfig/ifconfig.c b/ifconfig/ifconfig.c
index b180b17..18375f8 100644
--- a/ifconfig/ifconfig.c
+++ b/ifconfig/ifconfig.c
@@ -42,6 +42,7 @@
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <net/if.h>
+#include <netinet/in.h>
 #include <arpa/inet.h>
 #include <progname.h>
 #include "ifconfig.h"
diff --git a/ifconfig/printif.h b/ifconfig/printif.h
index bf5852e..5b518fa 100644
--- a/ifconfig/printif.h
+++ b/ifconfig/printif.h
@@ -22,6 +22,7 @@
 #ifndef IFCONFIG_PRINTIF_H
 # define IFCONFIG_PRINTIF_H
 
+# include <netinet/in.h>
 # include <net/if.h>
 # include <arpa/inet.h>
 # include "ifconfig.h"
diff --git a/ping/libping.c b/ping/libping.c
index 4302584..99b5cd5 100644
--- a/ping/libping.c
+++ b/ping/libping.c
@@ -23,6 +23,7 @@
 #include <sys/file.h>
 #include <sys/time.h>
 
+#include <netinet/in.h>
 /*#include <netinet/ip_icmp.h> -- deliberately not including this */
 #include <arpa/inet.h>
 #include <netdb.h>
diff --git a/src/hostname.c b/src/hostname.c
index 3974737..3e62df5 100644
--- a/src/hostname.c
+++ b/src/hostname.c
@@ -26,8 +26,8 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <arpa/inet.h>
 #include <netinet/in.h>
+#include <arpa/inet.h>
 #include <progname.h>
 #include "libinetutils.h"
 #include "xalloc.h"
diff --git a/tests/syslogd.sh b/tests/syslogd.sh
index 16daae4..1546ea7 100755
--- a/tests/syslogd.sh
+++ b/tests/syslogd.sh
@@ -87,7 +87,8 @@ IU_GOOD_BASE=/tmp/$(date +%y-%m-%d)_socket_iu
 IU_BAD_BASE=/tmp/X$(date +%y-%m-%d)_socket_iu
 
 IU_OS=$(uname -s)
-if [ "${IU_OS}" != "OpenBSD" -a "${IU_OS}" != "FreeBSD" ]; then
+if [ "${IU_OS}" = "Linux" -o "${IU_OS}" = "GNU/kFreeBSD" \
+     -o "${IU_OS}" = "SunOS" ]; then
 	# Aim at the boundary of 108 characters.
 	IU_GOOD_BASE=${IU_GOOD_BASE}_lnx
 	IU_BAD_BASE=${IU_BAD_BASE}_lnx
@@ -110,17 +111,17 @@ TAG="syslogd-test"
 IU_SYSLOGD=./src/syslogd$EXEEXT
 IU_LOGGER=./src/logger$EXEEXT
 
+# Step out of `tests/', should the invokation
+# have been made there.
+#
+[ -d ../src ] && cd ..
+
 if [ $VERBOSE ]; then
     set -x
     $IU_SYSLOGD --version
     $IU_LOGGER --version
 fi
 
-# Step out of `tests/', should the invokation
-# have been made there.
-#
-[ -d ../src ] && cd ..
-
 if [ ! -x $IU_SYSLOGD ]; then
 	echo "Missing executable 'syslogd'. Failing."
 	clean_testdir
@@ -150,6 +151,7 @@ else
 	if [ $? -eq 0 ]; then
 		echo "The INET port $PORT/$PROTO is already in use."
 		echo "No reliable test is possible."
+		clean_testdir
 		exit 77
 	fi
 fi

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

Summary of changes:
 ChangeLog           |    9 +++++++++
 ifconfig/ifconfig.c |    1 +
 ifconfig/printif.h  |    1 +
 ping/libping.c      |    1 +
 src/hostname.c      |    2 +-
 tests/syslogd.sh    |   14 ++++++++------
 6 files changed, 21 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Thu Dec 01 20:19:13 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RWHmT-0002lu-FE
	for mharc-commit-inetutils@gnu.org; Thu, 01 Dec 2011 20:19:13 -0500
Received: from eggs.gnu.org ([140.186.70.92]:38467)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RWHmQ-0002l6-0S
	for commit-inetutils@gnu.org; Thu, 01 Dec 2011 20:19:11 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RWHmO-0005cd-M6
	for commit-inetutils@gnu.org; Thu, 01 Dec 2011 20:19:09 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:42637)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RWHmO-0005cT-Iv
	for commit-inetutils@gnu.org; Thu, 01 Dec 2011 20:19:08 -0500
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1RWHmN-0004wH-QI
	for commit-inetutils@gnu.org; Fri, 02 Dec 2011 01:19:08 +0000
Date: Fri, 02 Dec 2011 01:19:07 +0000
Message-Id: <E1RWHmN-0004wH-QI@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-188-g7e8209f
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 66e35f34292651c34e5347a1707772df73c2eef3
X-Git-Newrev: 7e8209fa387fdd109b63ad00ef6a9dc8662646a6
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.72
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: Fri, 02 Dec 2011 01:19:11 -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  7e8209fa387fdd109b63ad00ef6a9dc8662646a6 (commit)
      from  66e35f34292651c34e5347a1707772df73c2eef3 (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=7e8209fa387fdd109b63ad00ef6a9dc8662646a6


commit 7e8209fa387fdd109b63ad00ef6a9dc8662646a6
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Fri Dec 2 02:16:55 2011 +0100

    Portability fix for <arpa/telnet.h> in NetBSD.

diff --git a/ChangeLog b/ChangeLog
index f48cbed..ac2fd0b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-12-02  Mats Erik Andersson <gnu@gisladisker.se>
+
+	* configure.ac: Check for external declarations of `telcmds'
+	and `telopts'.  Define UTMPX for NetBSD.
+	* telnet/commands.c (send_tncmd) [!HAVE_DECL_TELOPTS]: Make the
+	external declaration conditional.
+	[HAVE_DECL_TELOPTS]: Enforce a cast `char **' on system's TELOPTS.
+
 2011-12-01  Mats Erik Andersson <gnu@gisladisker.se>
 
 	* ifconfig/ifconfig.c: Include <netinet/in.h>.
diff --git a/configure.ac b/configure.ac
index e4af8a6..5828951 100644
--- a/configure.ac
+++ b/configure.ac
@@ -670,6 +670,16 @@ if test "$ac_cv_func_hstrerror" = yes \
   AC_DEFINE([HAVE_HSTRERROR], 1, [Define to one if you have hstrerror.])
 fi
 
+dnl OpenSolaris does not provide an external reference.
+AC_CHECK_DECLS(telcmds, , ,
+  [IU_FLUSHLEFT([#undef TELCMDS
+                 #include <arpa/telnet.h>])])
+
+dnl NetBSD does include an external reference.
+AC_CHECK_DECLS(telopts, , ,
+  [IU_FLUSHLEFT([#undef TELOPTS
+                 #include <arpa/telnet.h>])])
+
 ## Checks for function declarations.
 
 AC_DECL_SYS_SIGLIST
@@ -789,8 +799,7 @@ case "$host" in
   AC_DEFINE([UTMPX], 1, [FIXME])
   AC_DEFINE([HAVE_STREAMSPTY], 1, [FIXME])
   ;;
-*irix* | *hpux*)
-  AC_DEFINE([UTMPX], 1, [FIXME])
+*irix* | *hpux* | *netbsd*)
   AC_DEFINE([UTMPX], 1, [FIXME])
   ;;
 esac
diff --git a/telnet/commands.c b/telnet/commands.c
index a2db7fe..260bcad 100644
--- a/telnet/commands.c
+++ b/telnet/commands.c
@@ -429,7 +429,9 @@ int
 send_tncmd (void (*func) (), char *cmd, char *name)
 {
   char **cpp;
+#if !HAVE_DECL_TELOPTS
   extern char *telopts[];
+#endif
   register int val = 0;
 
   if (isprefix (name, "help") || isprefix (name, "?"))
@@ -464,7 +466,11 @@ send_tncmd (void (*func) (), char *cmd, char *name)
     }
   if (cpp)
     {
+#if HAVE_DECL_TELOPTS
+      val = cpp - (char **) telopts;
+#else /* !HAVE_DECL_TELOPTS */
       val = cpp - telopts;
+#endif
     }
   else
     {

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

Summary of changes:
 ChangeLog         |    8 ++++++++
 configure.ac      |   13 +++++++++++--
 telnet/commands.c |    6 ++++++
 3 files changed, 25 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Thu Dec 01 21:09:46 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RWIZO-0005OX-8A
	for mharc-commit-inetutils@gnu.org; Thu, 01 Dec 2011 21:09:46 -0500
Received: from eggs.gnu.org ([140.186.70.92]:51311)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RWIZL-0005Nz-CB
	for commit-inetutils@gnu.org; Thu, 01 Dec 2011 21:09:44 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RWIZK-0006o5-5t
	for commit-inetutils@gnu.org; Thu, 01 Dec 2011 21:09:43 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:40298)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RWIZK-0006nz-2g
	for commit-inetutils@gnu.org; Thu, 01 Dec 2011 21:09:42 -0500
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1RWIZJ-0001dO-5t
	for commit-inetutils@gnu.org; Fri, 02 Dec 2011 02:09:41 +0000
Date: Fri, 02 Dec 2011 02:09:41 +0000
Message-Id: <E1RWIZJ-0001dO-5t@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-189-ge0c1862
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 7e8209fa387fdd109b63ad00ef6a9dc8662646a6
X-Git-Newrev: e0c18623f33b9fdf074772e0d1fe9684859b36c4
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.72
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: Fri, 02 Dec 2011 02:09:44 -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  e0c18623f33b9fdf074772e0d1fe9684859b36c4 (commit)
      from  7e8209fa387fdd109b63ad00ef6a9dc8662646a6 (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=e0c18623f33b9fdf074772e0d1fe9684859b36c4


commit e0c18623f33b9fdf074772e0d1fe9684859b36c4
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Fri Dec 2 03:08:19 2011 +0100

    tests/ftp-localhost.sh: Portability fix.
    
    GNU, BSD, and Solaris.

diff --git a/ChangeLog b/ChangeLog
index ac2fd0b..ee6a1cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-12-02  Mats Erik Andersson <gnu@gisladisker.se>
 
+	* tests/ftp-localhost.sh: Portable invokation of mktemp(1).
+
+2011-12-02  Mats Erik Andersson <gnu@gisladisker.se>
+
 	* configure.ac: Check for external declarations of `telcmds'
 	and `telopts'.  Define UTMPX for NetBSD.
 	* telnet/commands.c (send_tncmd) [!HAVE_DECL_TELOPTS]: Make the
diff --git a/tests/ftp-localhost.sh b/tests/ftp-localhost.sh
index 0a589dd..37374e3 100755
--- a/tests/ftp-localhost.sh
+++ b/tests/ftp-localhost.sh
@@ -46,7 +46,7 @@ fi
 # Note that inetd changes directory to / when --debug is not given so
 # all paths must be absolute for things to work.
 
-TMPDIR=`mktemp --tmpdir=$PWD -d`
+TMPDIR=`mktemp -d $PWD/tmp.XXXXXXXXXX`
 trap 'rm -rf "$TMPDIR"' 0 1 2 3 15
 
 echo "4711 stream tcp nowait root $PWD/$FTPD ftpd -A -l" > $TMPDIR/inetd.conf

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

Summary of changes:
 ChangeLog              |    4 ++++
 tests/ftp-localhost.sh |    2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Fri Dec 02 15:33:53 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RWZnt-0002eT-Im
	for mharc-commit-inetutils@gnu.org; Fri, 02 Dec 2011 15:33:53 -0500
Received: from eggs.gnu.org ([140.186.70.92]:40251)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RWZnq-0002dJ-HA
	for commit-inetutils@gnu.org; Fri, 02 Dec 2011 15:33:51 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RWZnp-0001FK-A3
	for commit-inetutils@gnu.org; Fri, 02 Dec 2011 15:33:50 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:42290)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RWZnp-0001FG-8R
	for commit-inetutils@gnu.org; Fri, 02 Dec 2011 15:33:49 -0500
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1RWZnp-0002uc-1h
	for commit-inetutils@gnu.org; Fri, 02 Dec 2011 20:33:49 +0000
Date: Fri, 02 Dec 2011 20:33:49 +0000
Message-Id: <E1RWZnp-0002uc-1h@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-190-g02cef70
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: e0c18623f33b9fdf074772e0d1fe9684859b36c4
X-Git-Newrev: 02cef70810800aaf04fc1744a69803e1ba64a310
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.72
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: Fri, 02 Dec 2011 20:33:51 -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  02cef70810800aaf04fc1744a69803e1ba64a310 (commit)
      from  e0c18623f33b9fdf074772e0d1fe9684859b36c4 (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=02cef70810800aaf04fc1744a69803e1ba64a310


commit 02cef70810800aaf04fc1744a69803e1ba64a310
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Fri Dec 2 21:31:37 2011 +0100

    Regex pattern with exact port number.

diff --git a/ChangeLog b/ChangeLog
index ee6a1cb..63712cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2011-12-02  Mats Erik Andersson <gnu@gisladisker.se>
 
+	* tests/syslogd.sh: Match exact port number in regex pattern.
+	* tests/tftp.sh: Likewise.
+
+2011-12-02  Mats Erik Andersson <gnu@gisladisker.se>
+
 	* tests/ftp-localhost.sh: Portable invokation of mktemp(1).
 
 2011-12-02  Mats Erik Andersson <gnu@gisladisker.se>
diff --git a/tests/syslogd.sh b/tests/syslogd.sh
index 1546ea7..d29f253 100755
--- a/tests/syslogd.sh
+++ b/tests/syslogd.sh
@@ -147,7 +147,7 @@ if [ "$USER" != "root" ]; then
 else
 	# Is the INET port already in use? If so,
 	# skip the test in its entirety.
-	netstat -na | grep -q -E "^$PROTO(4|6|46)? .*$PORT "
+	netstat -na | grep -q -E "^$PROTO(4|6|46)?.*[^0-9]$PORT[^0-9]"
 	if [ $? -eq 0 ]; then
 		echo "The INET port $PORT/$PROTO is already in use."
 		echo "No reliable test is possible."
diff --git a/tests/tftp.sh b/tests/tftp.sh
index b880581..453e9e8 100755
--- a/tests/tftp.sh
+++ b/tests/tftp.sh
@@ -51,7 +51,7 @@ if [ "$VERBOSE" ]; then
 fi
 
 # Check that the port is still available
-netstat -na | grep -q -E "^$PROTO(4|6|46)? .*$PORT "
+netstat -na | grep -q -E "^$PROTO(4|6|46)?.*[^0-9]$PORT[^0-9]"
 if test $? -eq 0; then
     echo "Desired port $PORT/$PROTO is already in use."
     exit 77
@@ -75,7 +75,7 @@ test -z "$VERBOSE" || echo "Launched Inetd as process $inetd_pid." >&2
 sleep 1
 
 # Did `inetd' really succeed in establishing a listener?
-netstat -na | grep -q -E "^$PROTO(4|6|46)? .*$PORT "
+netstat -na | grep -q -E "^$PROTO(4|6|46)?.*[^0-9]$PORT[^0-9]"
 if test $? -ne 0; then
     # No it did not.
     ps "$inetd_pid" >/dev/null 2>&1 && kill "$inetd_pid"

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

Summary of changes:
 ChangeLog        |    5 +++++
 tests/syslogd.sh |    2 +-
 tests/tftp.sh    |    4 ++--
 3 files changed, 8 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Fri Dec 02 18:03:47 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RWc8x-00081Y-43
	for mharc-commit-inetutils@gnu.org; Fri, 02 Dec 2011 18:03:47 -0500
Received: from eggs.gnu.org ([140.186.70.92]:36945)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RWc8t-00081P-O1
	for commit-inetutils@gnu.org; Fri, 02 Dec 2011 18:03:45 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RWc8s-0005bW-JM
	for commit-inetutils@gnu.org; Fri, 02 Dec 2011 18:03:43 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:60068)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RWc8s-0005bP-F6
	for commit-inetutils@gnu.org; Fri, 02 Dec 2011 18:03:42 -0500
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1RWc8r-0005Pr-7N
	for commit-inetutils@gnu.org; Fri, 02 Dec 2011 23:03:41 +0000
Date: Fri, 02 Dec 2011 23:03:41 +0000
Message-Id: <E1RWc8r-0005Pr-7N@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-191-g23da8c3
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 02cef70810800aaf04fc1744a69803e1ba64a310
X-Git-Newrev: 23da8c3a7f92394db007ee19ad7b7609fe6290aa
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.72
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: Fri, 02 Dec 2011 23:03: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  23da8c3a7f92394db007ee19ad7b7609fe6290aa (commit)
      from  02cef70810800aaf04fc1744a69803e1ba64a310 (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=23da8c3a7f92394db007ee19ad7b7609fe6290aa


commit 23da8c3a7f92394db007ee19ad7b7609fe6290aa
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Sat Dec 3 00:03:17 2011 +0100

    tests/syslogd.sh: Better attack resilience.

diff --git a/ChangeLog b/ChangeLog
index 63712cc..c3417ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-03  Mats Erik Andersson <gnu@gisladisker.se>
+
+	* tests/syslogd.sh: Random test directory.  Identity from id(1).
+	Trap exit conditions for clean up.
+
 2011-12-02  Mats Erik Andersson <gnu@gisladisker.se>
 
 	* tests/syslogd.sh: Match exact port number in regex pattern.
diff --git a/tests/syslogd.sh b/tests/syslogd.sh
index d29f253..86cd9fd 100755
--- a/tests/syslogd.sh
+++ b/tests/syslogd.sh
@@ -19,6 +19,8 @@
 
 # Tests to establish functionality of SYSLOG daemon.
 #
+# Written by Mats Erik Andersson.
+
 
 # Is usage explanation in demand?
 #
@@ -41,18 +43,13 @@ HERE
 fi
 
 # Keep any external assignment of testing directory.
-# Otherwise a randomisation is included if NOCLEAN
-# has been set.
+# Otherwise a randomisation is included.
 #
-if [ -n "${NOCLEAN+yes}" ]; then
-	: ${IU_TESTDIR:=/tmp/iu_syslog}
-else
-	: ${IU_TESTDIR:=/tmp/iu_syslog$$}
-fi
+: ${IU_TESTDIR:=$PWD/iu_syslog.XXXXXX}
 
 if [ ! -d $IU_TESTDIR ]; then
 	IU_DO_CLEANDIR=yes
-	mkdir -p $IU_TESTDIR
+	IU_TESTDIR=$(mktemp -d $IU_TESTDIR)
 fi
 
 # Erase the testing directory.
@@ -63,6 +60,11 @@ clean_testdir () {
 	fi
 }
 
+# Clean artifacts as execution stops.
+#
+trap clean_testdir EXIT HUP INT QUIT TERM
+
+
 CONF=$IU_TESTDIR/syslog.conf
 PID=$IU_TESTDIR/syslogd.pid
 OUT=$IU_TESTDIR/messages
@@ -124,13 +126,11 @@ fi
 
 if [ ! -x $IU_SYSLOGD ]; then
 	echo "Missing executable 'syslogd'. Failing."
-	clean_testdir
 	exit 77
 fi
 
 if [ ! -x $IU_LOGGER ]; then
 	echo "Missing executable 'logger'. Failing."
-	clean_testdir
 	exit 77
 fi
 
@@ -138,7 +138,7 @@ fi
 rm -f $OUT $PID
 
 # Full testing needs a superuser.  Report this.
-if [ "$USER" != "root" ]; then
+if [ $(id -u) -ne 0 ]; then
 	cat <<-EOT
 	WARNING!!
 	Disabling INET server tests since you seem
@@ -151,7 +151,6 @@ else
 	if [ $? -eq 0 ]; then
 		echo "The INET port $PORT/$PROTO is already in use."
 		echo "No reliable test is possible."
-		clean_testdir
 		exit 77
 	fi
 fi
@@ -186,7 +185,7 @@ IU_OPTIONS="--rcfile=$CONF --pidfile=$PID --socket=$SOCKET"
 IU_OPTIONS="$IU_OPTIONS -a $IU_LONG_SOCKET -a $IU_EXCESSIVE_SOCKET"
 
 ## Enable INET service when running as root.
-if [ "$USER" = "root" ]; then
+if [ $(id -u) -eq 0 ]; then
 	IU_OPTIONS="$IU_OPTIONS --ipany --inet --hop"
 fi
 ## Bring in additional options from command line.
@@ -208,7 +207,6 @@ sleep 1
 #
 if [ ! -r $PID ]; then
 	echo "The service daemon never started. Failing."
-	clean_testdir
 	exit 1
 fi
 
@@ -231,7 +229,7 @@ TESTCASES=$((TESTCASES + 2))
 $IU_LOGGER -h $SOCKET -p user.info -t $TAG "Sending BSD message. (pid $$)"
 $IU_LOGGER -h $IU_LONG_SOCKET -p user.info -t $TAG "Sending via long socket name. (pid $$)"
 
-if [ "$USER" = "root" ]; then
+if [ $(id -u) -eq 0 ]; then
 	TESTCASES=$((TESTCASES + 2))
 	$IU_LOGGER -4 -h 127.0.0.1 -p user.info -t $TAG "Sending IPv4 message. (pid $$)"
 	$IU_LOGGER -6 -h "[::1]" -p user.info -t $TAG "Sending IPv6 message. (pid $$)"
@@ -257,6 +255,4 @@ fi
 # Remove the daemon process.
 [ -r $PID ] && kill "$(cat $PID)"
 
-clean_testdir
-
 exit $EXITCODE

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

Summary of changes:
 ChangeLog        |    5 +++++
 tests/syslogd.sh |   30 +++++++++++++-----------------
 2 files changed, 18 insertions(+), 17 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Fri Dec 09 10:19:37 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RZ2Eb-0002YQ-Ix
	for mharc-commit-inetutils@gnu.org; Fri, 09 Dec 2011 10:19:37 -0500
Received: from eggs.gnu.org ([140.186.70.92]:32832)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RZ2EZ-0002YK-7s
	for commit-inetutils@gnu.org; Fri, 09 Dec 2011 10:19:36 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RZ2EQ-0001pZ-8C
	for commit-inetutils@gnu.org; Fri, 09 Dec 2011 10:19:35 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:34759)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RZ2EQ-0001pV-5P
	for commit-inetutils@gnu.org; Fri, 09 Dec 2011 10:19:26 -0500
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1RZ2EP-0004Zr-KA
	for commit-inetutils@gnu.org; Fri, 09 Dec 2011 15:19:25 +0000
Date: Fri, 09 Dec 2011 15:19:25 +0000
Message-Id: <E1RZ2EP-0004Zr-KA@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-192-gc310f11
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 23da8c3a7f92394db007ee19ad7b7609fe6290aa
X-Git-Newrev: c310f1175dc34175bf0b38e8007dcb4412ff1df1
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.72
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: Fri, 09 Dec 2011 15:19:36 -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  c310f1175dc34175bf0b38e8007dcb4412ff1df1 (commit)
      from  23da8c3a7f92394db007ee19ad7b7609fe6290aa (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=c310f1175dc34175bf0b38e8007dcb4412ff1df1


commit c310f1175dc34175bf0b38e8007dcb4412ff1df1
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Fri Dec 9 16:17:08 2011 +0100

    telnet,telnetd: Fix ncurses/termio for Solaris.

diff --git a/ChangeLog b/ChangeLog
index c3417ee..d7ce537 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-12-09  Mats Erik Andersson <gnu@gisladisker.se>
+
+	* telnet/Makefile.am (INCLUDES): Add $(NCURSES_INCLUDE) to list.
+	* telnetd/Makefile.am: Likewise.
+	* telnetd/utility.c (readstream) [HAVE_STREAMSPTY && HAVE_TERMIO_H]:
+	Make use of `struct termio' conditioned on HAVE_TERMIO_H.
+
 2011-12-03  Mats Erik Andersson <gnu@gisladisker.se>
 
 	* tests/syslogd.sh: Random test directory.  Identity from id(1).
diff --git a/telnet/Makefile.am b/telnet/Makefile.am
index 9ea0935..8d10f8c 100644
--- a/telnet/Makefile.am
+++ b/telnet/Makefile.am
@@ -26,7 +26,7 @@ telnet_SOURCES = authenc.c commands.c main.c network.c ring.c sys_bsd.c \
 
 noinst_HEADERS = defines.h externs.h general.h ring.h types.h
 
-INCLUDES = $(iu_INCLUDES)
+INCLUDES = $(iu_INCLUDES) $(NCURSES_INCLUDE)
 AM_CPPFLAGS = -DTERMCAP -DLINEMODE -DKLUDGELINEMODE -DENV_HACK
 
 LDADD = $(iu_LIBRARIES) $(top_builddir)/libtelnet/libtelnet.a $(LIBTERMCAP) $(LIBCRYPT) $(LIBAUTH) $(LIBREADLINE)
diff --git a/telnetd/Makefile.am b/telnetd/Makefile.am
index be08ada..df497a6 100644
--- a/telnetd/Makefile.am
+++ b/telnetd/Makefile.am
@@ -29,6 +29,6 @@ noinst_HEADERS = telnetd.h
 @PATHDEFS_MAKE@
 
 AM_CPPFLAGS = $(PATHDEF_DEV) $(PATHDEF_TTY) $(PATHDEF_LOGIN)
-INCLUDES = $(iu_INCLUDES) -I$(top_srcdir) $(INCAUTH)
+INCLUDES = $(iu_INCLUDES) -I$(top_srcdir) $(INCAUTH) $(NCURSES_INCLUDE)
 
 LDADD = $(iu_LIBRARIES) $(top_builddir)/libtelnet/libtelnet.a $(LIBTERMCAP) $(LIBUTIL) $(LIBCRYPT) $(LIBAUTH) $(LIBREADLINE)
diff --git a/telnetd/utility.c b/telnetd/utility.c
index bb49298..c9dbeeb 100644
--- a/telnetd/utility.c
+++ b/telnetd/utility.c
@@ -72,7 +72,9 @@ readstream (int p, char *ibuf, int bufsize)
   int flags = 0;
   int ret = 0;
   struct termios *tsp;
+#ifdef HAVE_TERMIO_H
   struct termio *tp;
+#endif
   struct iocblk *ip;
   char vstop, vstart;
   int ixon;
@@ -130,6 +132,7 @@ readstream (int p, char *ibuf, int bufsize)
 	  ixon = tsp->c_iflag & IXON;
 	  break;
 
+#ifdef HAVE_TERMIO_H
 	case TCSETA:
 	case TCSETAW:
 	case TCSETAF:
@@ -138,6 +141,7 @@ readstream (int p, char *ibuf, int bufsize)
 	  vstart = tp->c_cc[VSTART];
 	  ixon = tp->c_iflag & IXON;
 	  break;
+#endif /* HAVE_TERMIO_H */
 
 	default:
 	  errno = EAGAIN;

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

Summary of changes:
 ChangeLog           |    7 +++++++
 telnet/Makefile.am  |    2 +-
 telnetd/Makefile.am |    2 +-
 telnetd/utility.c   |    4 ++++
 4 files changed, 13 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Sat Dec 10 17:49:14 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RZVjG-0007IK-Gu
	for mharc-commit-inetutils@gnu.org; Sat, 10 Dec 2011 17:49:14 -0500
Received: from eggs.gnu.org ([140.186.70.92]:44567)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RZVjC-0007Hl-T4
	for commit-inetutils@gnu.org; Sat, 10 Dec 2011 17:49:12 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RZVjB-0003MA-48
	for commit-inetutils@gnu.org; Sat, 10 Dec 2011 17:49:10 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:37870)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RZVjB-0003M6-2Y
	for commit-inetutils@gnu.org; Sat, 10 Dec 2011 17:49:09 -0500
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1RZVjA-0004mV-AW
	for commit-inetutils@gnu.org; Sat, 10 Dec 2011 22:49:08 +0000
Date: Sat, 10 Dec 2011 22:49:08 +0000
Message-Id: <E1RZVjA-0004mV-AW@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-193-g683e8b2
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: c310f1175dc34175bf0b38e8007dcb4412ff1df1
X-Git-Newrev: 683e8b2a7eceef34c48ac57bbf0007f6e0f91629
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.72
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, 10 Dec 2011 22:49:12 -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  683e8b2a7eceef34c48ac57bbf0007f6e0f91629 (commit)
      from  c310f1175dc34175bf0b38e8007dcb4412ff1df1 (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=683e8b2a7eceef34c48ac57bbf0007f6e0f91629


commit 683e8b2a7eceef34c48ac57bbf0007f6e0f91629
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Sat Dec 10 23:47:51 2011 +0100

    Improve incident recovery in test scripts.

diff --git a/ChangeLog b/ChangeLog
index d7ce537..0a2d888 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-12-10  Mats Erik Andersson <gnu@gisladisker.se>
+
+	* tests/ftp-localhost.sh: Expand trapping to kill inetd process.
+	* tests/syslogd.sh: Likewise.
+	* tests/tftp.sh: Use a random testing directory and implement
+	cleanup in a trapping function.
+
 2011-12-09  Mats Erik Andersson <gnu@gisladisker.se>
 
 	* telnet/Makefile.am (INCLUDES): Add $(NCURSES_INCLUDE) to list.
diff --git a/tests/ftp-localhost.sh b/tests/ftp-localhost.sh
index 37374e3..374d6b1 100755
--- a/tests/ftp-localhost.sh
+++ b/tests/ftp-localhost.sh
@@ -47,7 +47,14 @@ fi
 # all paths must be absolute for things to work.
 
 TMPDIR=`mktemp -d $PWD/tmp.XXXXXXXXXX`
-trap 'rm -rf "$TMPDIR"' 0 1 2 3 15
+
+posttesting () {
+    test -f "$TMPDIR/inetd.pid" -a -r "$TMPDIR/inetd.pid" \
+	&& kill -9 "$(cat $TMPDIR/inetd.pid)"
+    rm -rf "$TMPDIR"
+}
+
+trap posttesting 0 1 2 3 15
 
 echo "4711 stream tcp nowait root $PWD/$FTPD ftpd -A -l" > $TMPDIR/inetd.conf
 echo "machine 127.0.0.1 login ftp password foobar" > $TMPDIR/.netrc
@@ -76,7 +83,4 @@ if ! grep 'FTP server status' $TMPDIR/ftp.stdout; then
     exit 1
 fi
 
-inetd_pid=`cat $TMPDIR/inetd.pid`
-kill -9 $inetd_pid
-
 exit 0
diff --git a/tests/syslogd.sh b/tests/syslogd.sh
index 86cd9fd..fac8545 100755
--- a/tests/syslogd.sh
+++ b/tests/syslogd.sh
@@ -58,6 +58,8 @@ clean_testdir () {
 	if [ -z "${NOCLEAN+no}" -a "$IU_DO_CLEANDIR" = "yes" ]; then
 		rm -fR $IU_TESTDIR
 	fi
+	test -f "$PID" && ps "$(cat $PID)" >/dev/null 2>&1 \
+		&& kill -9 "$(cat $PID)"
 }
 
 # Clean artifacts as execution stops.
diff --git a/tests/tftp.sh b/tests/tftp.sh
index 453e9e8..cf3be17 100755
--- a/tests/tftp.sh
+++ b/tests/tftp.sh
@@ -31,8 +31,22 @@ IFCONFIG="${IFCONFIG:-../ifconfig/ifconfig$EXEEXT --format=unix}"
 AF=${AF:-inet}
 PROTO=${PROTO:-udp}
 PORT=${PORT:-7777}
-INETD_CONF="$PWD/inetd.conf.tmp"
-INETD_PID="$PWD/inetd.pid.$$"
+
+# Random base diractory at testing time.
+TMPDIR=`mktemp -d $PWD/tmp.XXXXXXXXXX`
+INETD_CONF="$TMPDIR/inetd.conf.tmp"
+INETD_PID="$TMPDIR/inetd.pid.$$"
+
+posttesting () {
+    if test -f "$INETD_PID" -a -r "$INETD_PID" \
+	&& ps "$(cat $INETD_PID)" >/dev/null 2>&1
+    then
+	kill -9 "$(cat $INETD_PID)"
+    fi
+    rm -rf "$TMPDIR" tftp-test-file
+}
+
+trap posttesting EXIT HUP INT QUIT TERM
 
 ADDRESSES="`$IFCONFIG | sed -e "/$AF /!d" \
      -e "s/^.*$AF[[:blank:]]\([:.0-9]\{1,\}\)[[:blank:]].*$/\1/g"`"
@@ -61,7 +75,7 @@ fi
 # name because `inetd' chdirs to `/' in daemon mode; ditto for
 # $INETD_CONF.
 cat > "$INETD_CONF" <<EOF
-$PORT dgram $PROTO wait $USER $TFTPD   tftpd -l `pwd`/tftp-test
+$PORT dgram $PROTO wait $USER $TFTPD   tftpd -l $TMPDIR/tftp-test
 EOF
 
 # Launch `inetd', assuming it's reachable at all $ADDRESSES.
@@ -89,9 +103,10 @@ 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 2>/dev/null
+rm -fr $TMPDIR/tftp-test tftp-test-file
+mkdir -p $TMPDIR/tftp-test && \
+    dd if="$input" of="$TMPDIR/tftp-test/tftp-test-file" \
+	bs=1024 count=170 2>/dev/null
 
 echo "Looks into $ADDRESSES."
 
@@ -101,7 +116,7 @@ for addr in $ADDRESSES; do
     rm -f tftp-test-file
     echo "get tftp-test-file" | "$TFTP" $addr $PORT
 
-    cmp tftp-test/tftp-test-file tftp-test-file
+    cmp $TMPDIR/tftp-test/tftp-test-file tftp-test-file
     result=$?
 
     if [ "$result" -ne 0 ]; then
@@ -113,11 +128,7 @@ for addr in $ADDRESSES; do
     fi
 done
 
-ps "$inetd_pid" >/dev/null 2>&1 && kill "$inetd_pid"
-
-rm -rf tftp-test tftp-test-file "$INETD_CONF" "$INETD_PID"
-
-# Minimal clean up
+# Minimal clean up. Main work in posttesting().
 echo
 
 exit $result

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

Summary of changes:
 ChangeLog              |    7 +++++++
 tests/ftp-localhost.sh |   12 ++++++++----
 tests/syslogd.sh       |    2 ++
 tests/tftp.sh          |   35 +++++++++++++++++++++++------------
 4 files changed, 40 insertions(+), 16 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Sat Dec 10 20:09:04 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RZXua-0003Yl-V5
	for mharc-commit-inetutils@gnu.org; Sat, 10 Dec 2011 20:09:04 -0500
Received: from eggs.gnu.org ([140.186.70.92]:53833)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RZXuY-0003YE-DY
	for commit-inetutils@gnu.org; Sat, 10 Dec 2011 20:09:03 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RZXuX-0006mQ-2q
	for commit-inetutils@gnu.org; Sat, 10 Dec 2011 20:09:02 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:60147)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RZXuX-0006mM-1D
	for commit-inetutils@gnu.org; Sat, 10 Dec 2011 20:09:01 -0500
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1RZXuW-0004ai-DA
	for commit-inetutils@gnu.org; Sun, 11 Dec 2011 01:09:00 +0000
Date: Sun, 11 Dec 2011 01:09:00 +0000
Message-Id: <E1RZXuW-0004ai-DA@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-194-g0d725f8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 683e8b2a7eceef34c48ac57bbf0007f6e0f91629
X-Git-Newrev: 0d725f8b366b69c389503bf006ba2de058025336
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.72
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, 11 Dec 2011 01:09:03 -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  0d725f8b366b69c389503bf006ba2de058025336 (commit)
      from  683e8b2a7eceef34c48ac57bbf0007f6e0f91629 (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=0d725f8b366b69c389503bf006ba2de058025336


commit 0d725f8b366b69c389503bf006ba2de058025336
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Sun Dec 11 02:06:11 2011 +0100

    tests/ftp-localhost.sh: Shell portability issue.

diff --git a/ChangeLog b/ChangeLog
index 0a2d888..dd036a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-12-11  Mats Erik Andersson <gnu@gisladisker.se>
+
+	* tests/ftp-localhost.sh: Replace `echo' with portable construct.
+
 2011-12-10  Mats Erik Andersson <gnu@gisladisker.se>
 
 	* tests/ftp-localhost.sh: Expand trapping to kill inetd process.
diff --git a/tests/ftp-localhost.sh b/tests/ftp-localhost.sh
index 374d6b1..793a14d 100755
--- a/tests/ftp-localhost.sh
+++ b/tests/ftp-localhost.sh
@@ -65,8 +65,12 @@ $INETD --pidfile=$TMPDIR/inetd.pid $TMPDIR/inetd.conf
 # Wait for inetd to write pid and open socket
 sleep 2
 
-echo "rstatus\ndir\n" \
-    | HOME=$TMPDIR $FTP $TARGET 4711 -v -p -t | tee $TMPDIR/ftp.stdout
+cat <<STOP |
+rstatus
+dir
+STOP
+HOME=$TMPDIR $FTP $TARGET 4711 -v -p -t | tee $TMPDIR/ftp.stdout
+
 errno=$?
 if [ $errno != 0 ]; then
     echo running ftp failed? errno $errno

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

Summary of changes:
 ChangeLog              |    4 ++++
 tests/ftp-localhost.sh |    8 ++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Sun Dec 11 12:52:04 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RZnZE-0007PM-7q
	for mharc-commit-inetutils@gnu.org; Sun, 11 Dec 2011 12:52:04 -0500
Received: from eggs.gnu.org ([140.186.70.92]:35992)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RZnZB-0007PE-3T
	for commit-inetutils@gnu.org; Sun, 11 Dec 2011 12:52:02 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RZnZ9-0003jc-JK
	for commit-inetutils@gnu.org; Sun, 11 Dec 2011 12:52:01 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:49989)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RZnZ9-0003jY-H1
	for commit-inetutils@gnu.org; Sun, 11 Dec 2011 12:51:59 -0500
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1RZnZ9-0005P2-6n
	for commit-inetutils@gnu.org; Sun, 11 Dec 2011 17:51:59 +0000
Date: Sun, 11 Dec 2011 17:51:59 +0000
Message-Id: <E1RZnZ9-0005P2-6n@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-195-g2106a3e
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 0d725f8b366b69c389503bf006ba2de058025336
X-Git-Newrev: 2106a3ea5028ac3d2c84503a0b89a66de5c6d5e2
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.72
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, 11 Dec 2011 17:52:02 -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  2106a3ea5028ac3d2c84503a0b89a66de5c6d5e2 (commit)
      from  0d725f8b366b69c389503bf006ba2de058025336 (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=2106a3ea5028ac3d2c84503a0b89a66de5c6d5e2


commit 2106a3ea5028ac3d2c84503a0b89a66de5c6d5e2
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Sun Dec 11 18:49:22 2011 +0100

    Portability of test and of build.
    
    * tests/ftp-localhost.sh: Strict IPv4-calls.
    * configure.ac: Building rshd/rlogind needs iruserok.

diff --git a/ChangeLog b/ChangeLog
index dd036a9..86e02dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2011-12-11  Mats Erik Andersson <gnu@gisladisker.se>
 
+	* tests/ftp-localhost.sh: Use strict IPv4 options for portability.
+	* configure.ac: Check for iruserok.  Disable building of rshd and
+	rlogind if it is missing.
+	* NEWS,TODO: Updated.
+
+2011-12-11  Mats Erik Andersson <gnu@gisladisker.se>
+
 	* tests/ftp-localhost.sh: Replace `echo' with portable construct.
 
 2011-12-10  Mats Erik Andersson <gnu@gisladisker.se>
diff --git a/NEWS b/NEWS
index f0a7624..9ba0d28 100644
--- a/NEWS
+++ b/NEWS
@@ -15,9 +15,15 @@ Support is still new, so please report any bugs to
 
 * Many OpenBSD fixes.
 
-* tftp
+* ftp, tftp, tftpd
+
+Handle IPv6 connections.  (Ftpd is IPv4-only until next release.)
+
+* syslogd, logger
 
-Handle IPv6 connections.
+Handle IPv6 connections.  The server can forward messages
+without using a listening INET socket.  It can also bind
+to a single INET/INET6 address.
 
 * ifconfig
 
diff --git a/TODO b/TODO
index 325307d..5ee5012 100644
--- a/TODO
+++ b/TODO
@@ -134,6 +134,9 @@ Ability to ping multiple host in one go.
 ** Make sure it is a drop in replacement at least for the most
    common options on Linux and BSD.
 
+** Parse options before taking actions: `ifconfig --down -i gif0'
+   segfaults, but `ifconfig -i gif0 --down' does not.
+
 ** Some systems can provide more interfaces than
   SIOCGIFCONF/if_nameindex, interfaces which are usually not UP but
   registered nevertheless.  (linux: /prov/net/dev). Some support for
@@ -151,6 +154,10 @@ Ability to ping multiple host in one go.
   For example, if a system specific option shadows a normal option?
   Allow this?
 
+* ftpd
+
+Complete the initiated rewrite for supporting IPv6.
+
 * tftpd
 
 OpenSolaris is only able to transmit a single package of
diff --git a/configure.ac b/configure.ac
index 5828951..817fecc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -219,6 +219,17 @@ else
   talk_BUILD=''
 fi
 
+dnl FIXME: Presently rshd and rlogind need iruserok(3),
+dnl which is not univerally available.  Replacement code?
+AC_CHECK_FUNC(iruserok, , , [#include <netdb.h>])
+if test "$ac_cv_func_iruserok" = no; then
+  enable_rlogind=no
+  rlogind_BUILD=''
+  enable_rshd=no
+  rshd_BUILD=''
+fi
+
+
 dnl FIXME: Make this test case a bit more robust. Remove KRB4
 LIBAUTH=
 INCAUTH=
diff --git a/tests/ftp-localhost.sh b/tests/ftp-localhost.sh
index 793a14d..e50c5cb 100755
--- a/tests/ftp-localhost.sh
+++ b/tests/ftp-localhost.sh
@@ -19,6 +19,10 @@
 
 # Written by Simon Josefsson
 
+# FIXME: Strict IPv4 setup, until Mats has completed the migration
+# of ftpd to support IPv6.  Address mapping IPv4-to-IPv6 is not
+# uniform an all platforms, thus `tcp4' for inetd and '-4' for ftp.
+
 set -e
 
 FTP=${FTP:-../ftp/ftp$EXEEXT}
@@ -56,8 +60,8 @@ posttesting () {
 
 trap posttesting 0 1 2 3 15
 
-echo "4711 stream tcp nowait root $PWD/$FTPD ftpd -A -l" > $TMPDIR/inetd.conf
-echo "machine 127.0.0.1 login ftp password foobar" > $TMPDIR/.netrc
+echo "4711 stream tcp4 nowait root $PWD/$FTPD ftpd -A -l" > $TMPDIR/inetd.conf
+echo "machine $TARGET login ftp password foobar" > $TMPDIR/.netrc
 chmod 600 $TMPDIR/.netrc
 
 $INETD --pidfile=$TMPDIR/inetd.pid $TMPDIR/inetd.conf
@@ -69,9 +73,11 @@ cat <<STOP |
 rstatus
 dir
 STOP
-HOME=$TMPDIR $FTP $TARGET 4711 -v -p -t | tee $TMPDIR/ftp.stdout
+HOME=$TMPDIR $FTP $TARGET 4711 -4 -v -p -t >$TMPDIR/ftp.stdout
 
 errno=$?
+cat $TMPDIR/ftp.stdout
+
 if [ $errno != 0 ]; then
     echo running ftp failed? errno $errno
     exit 77

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

Summary of changes:
 ChangeLog              |    7 +++++++
 NEWS                   |   10 ++++++++--
 TODO                   |    7 +++++++
 configure.ac           |   11 +++++++++++
 tests/ftp-localhost.sh |   12 +++++++++---
 5 files changed, 42 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Mon Dec 12 19:34:42 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RaGKQ-0004k4-QM
	for mharc-commit-inetutils@gnu.org; Mon, 12 Dec 2011 19:34:42 -0500
Received: from eggs.gnu.org ([140.186.70.92]:59043)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RaGKO-0004jY-3f
	for commit-inetutils@gnu.org; Mon, 12 Dec 2011 19:34:41 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RaGKM-0001u0-KP
	for commit-inetutils@gnu.org; Mon, 12 Dec 2011 19:34:40 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:43957)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RaGKM-0001tt-Ea
	for commit-inetutils@gnu.org; Mon, 12 Dec 2011 19:34:38 -0500
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1RaGKL-0005WZ-JD
	for commit-inetutils@gnu.org; Tue, 13 Dec 2011 00:34:37 +0000
Date: Tue, 13 Dec 2011 00:34:37 +0000
Message-Id: <E1RaGKL-0005WZ-JD@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-196-gae08f03
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 2106a3ea5028ac3d2c84503a0b89a66de5c6d5e2
X-Git-Newrev: ae08f03b3de1101120aaf287ceb6f7b63981968a
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.72
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, 13 Dec 2011 00:34:41 -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  ae08f03b3de1101120aaf287ceb6f7b63981968a (commit)
      from  2106a3ea5028ac3d2c84503a0b89a66de5c6d5e2 (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=ae08f03b3de1101120aaf287ceb6f7b63981968a


commit ae08f03b3de1101120aaf287ceb6f7b63981968a
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Tue Dec 13 00:11:37 2011 +0100

    tests/tftp.sh: Better testing coverage.
    
    Several payload sizes; adaptions for Solaris.
    Test only 127.0.0.1 by default, but configurable.

diff --git a/ChangeLog b/ChangeLog
index 86e02dd..c8f960c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-13  Mats Erik Andersson <gnu@gisladisker.se>
+
+	* tests/tftp.sh: Subtests for differing data transfer size.
+	Portability fix for Solaris.
+
 2011-12-11  Mats Erik Andersson <gnu@gisladisker.se>
 
 	* tests/ftp-localhost.sh: Use strict IPv4 options for portability.
diff --git a/tests/tftp.sh b/tests/tftp.sh
index cf3be17..0f9c6c0 100755
--- a/tests/tftp.sh
+++ b/tests/tftp.sh
@@ -19,6 +19,8 @@
 
 # Run `inetd' with `tftpd' and try to fetch a file from there using `tftp'.
 
+# FIXME: Presently tailored for IPv4.
+
 if [ "$VERBOSE" ]; then
     set -x
 fi
@@ -31,6 +33,7 @@ IFCONFIG="${IFCONFIG:-../ifconfig/ifconfig$EXEEXT --format=unix}"
 AF=${AF:-inet}
 PROTO=${PROTO:-udp}
 PORT=${PORT:-7777}
+USER=${USER:-$LOGNAME}
 
 # Random base diractory at testing time.
 TMPDIR=`mktemp -d $PWD/tmp.XXXXXXXXXX`
@@ -43,13 +46,23 @@ posttesting () {
     then
 	kill -9 "$(cat $INETD_PID)"
     fi
-    rm -rf "$TMPDIR" tftp-test-file
+    rm -rf "$TMPDIR" $FILELIST
 }
 
 trap posttesting EXIT HUP INT QUIT TERM
 
-ADDRESSES="`$IFCONFIG | sed -e "/$AF /!d" \
-     -e "s/^.*$AF[[:blank:]]\([:.0-9]\{1,\}\)[[:blank:]].*$/\1/g"`"
+# Use only "127.0.0.1" as default address list.
+# Other configured addresses might be set under
+# strict filter policies, thus might block.
+#
+# Allow a setting "ADDRESSES=sense" to compute the
+# available addresses and then to test them all.
+ADDRESSES="${ADDRESSES:-127.0.0.1}"
+
+if [ "$ADDRESSES" = "sense" ]; then
+    ADDRESSES="`$IFCONFIG | sed -e "/$AF /!d" \
+	-e "s/^.*$AF[[:blank:]]\([:.0-9]\{1,\}\)[[:blank:]].*$/\1/g"`"
+fi
 
 # Check that netstat works before proceeding.
 netstat -na > /dev/null
@@ -58,6 +71,18 @@ if [ ! $? -eq 0 ]; then
     exit 77
 fi
 
+# Work around the peculiar output of netstat(1m,solaris).
+#
+# locate_port family proto port
+#
+locate_port () {
+    if [ "$(uname -s)" = "SunOS" ]; then
+	netstat -na -f$1 -P$2 | grep -q -E "\.$3[^0-9]"
+    else
+	netstat -na | grep -q -E "^$2(4|6|46)?.*[^0-9]$3[^0-9]"
+    fi
+}
+
 if [ "$VERBOSE" ]; then
     "$TFTP" --version
     "$TFTPD" --version
@@ -65,7 +90,7 @@ if [ "$VERBOSE" ]; then
 fi
 
 # Check that the port is still available
-netstat -na | grep -q -E "^$PROTO(4|6|46)?.*[^0-9]$PORT[^0-9]"
+locate_port inet $PROTO $PORT
 if test $? -eq 0; then
     echo "Desired port $PORT/$PROTO is already in use."
     exit 77
@@ -75,7 +100,7 @@ fi
 # name because `inetd' chdirs to `/' in daemon mode; ditto for
 # $INETD_CONF.
 cat > "$INETD_CONF" <<EOF
-$PORT dgram $PROTO wait $USER $TFTPD   tftpd -l $TMPDIR/tftp-test
+$PORT dgram ${PROTO}4 wait $USER $TFTPD   tftpd -l $TMPDIR/tftp-test
 EOF
 
 # Launch `inetd', assuming it's reachable at all $ADDRESSES.
@@ -89,7 +114,7 @@ test -z "$VERBOSE" || echo "Launched Inetd as process $inetd_pid." >&2
 sleep 1
 
 # Did `inetd' really succeed in establishing a listener?
-netstat -na | grep -q -E "^$PROTO(4|6|46)?.*[^0-9]$PORT[^0-9]"
+locate_port inet $PROTO $PORT
 if test $? -ne 0; then
     # No it did not.
     ps "$inetd_pid" >/dev/null 2>&1 && kill "$inetd_pid"
@@ -103,32 +128,59 @@ else
     input="/dev/zero"
 fi
 
-rm -fr $TMPDIR/tftp-test tftp-test-file
-mkdir -p $TMPDIR/tftp-test && \
-    dd if="$input" of="$TMPDIR/tftp-test/tftp-test-file" \
-	bs=1024 count=170 2>/dev/null
+rm -fr $TMPDIR/tftp-test tftp-test-file*
+mkdir -p $TMPDIR/tftp-test
 
-echo "Looks into $ADDRESSES."
+# It is important to test data of differing sizes.
+#
+# Input format:
+#
+#  name  block-size  count
+
+FILEDATA="file-small 320 1
+file-medium 320 2
+tftp-test-file 1024 170
+"
+
+echo "$FILEDATA" |
+while read name bsize count; do
+    test -z "$name" && continue
+    dd if="$input" of="$TMPDIR/tftp-test/$name" \
+	bs=$bsize count=$count 2>/dev/null
+done
 
-for addr in $ADDRESSES; do
-    echo "trying with address \`$addr'..." >&2
+FILELIST="$(echo "$FILEDATA" | sed 's/[[:space:]].*//' | tr "\n" ' ')"
 
-    rm -f tftp-test-file
-    echo "get tftp-test-file" | "$TFTP" $addr $PORT
+SUCCESSES=0
+EFFORTS=0
+RESULT=0
 
-    cmp $TMPDIR/tftp-test/tftp-test-file tftp-test-file
-    result=$?
+echo "Looking into \"$(echo $ADDRESSES | tr "\n" " ")\"."
 
-    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
+for addr in $ADDRESSES; do
+    echo "trying with address \`$addr'..." >&2
+
+    for name in $FILELIST; do
+	EFFORTS=$((EFFORTS + 1))
+	rm -f $name
+	echo "get $name" | "$TFTP" $addr $PORT
+
+	cmp "$TMPDIR/tftp-test/$name" "$name"
+	result=$?
+
+	if [ "$result" -ne 0 ]; then
+	    # Failure.
+	    test -z "$VERBOSE" || echo "Failed comparison for $addr/$name." >&2
+	    RESULT=$result
+	else
+	    SUCCESSES=$((SUCCESSES + 1))
+	    test -z "$VERBOSE" || echo "Successful comparison for $addr/$name." >&2
+	fi
+   done
 done
 
 # Minimal clean up. Main work in posttesting().
 echo
+echo Tests in $0 had $SUCCESSES successes out of $EFFORTS cases.
 
-exit $result
+exit $RESULT

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

Summary of changes:
 ChangeLog     |    5 +++
 tests/tftp.sh |  102 +++++++++++++++++++++++++++++++++++++++++++--------------
 2 files changed, 82 insertions(+), 25 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Mon Dec 12 20:57:57 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RaHcz-0004nq-OA
	for mharc-commit-inetutils@gnu.org; Mon, 12 Dec 2011 20:57:57 -0500
Received: from eggs.gnu.org ([140.186.70.92]:52968)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RaHcw-0004nC-JM
	for commit-inetutils@gnu.org; Mon, 12 Dec 2011 20:57:55 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RaHcv-0002mV-1V
	for commit-inetutils@gnu.org; Mon, 12 Dec 2011 20:57:54 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:50258)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RaHcu-0002mL-WB
	for commit-inetutils@gnu.org; Mon, 12 Dec 2011 20:57:53 -0500
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1RaHcu-0000pd-F2
	for commit-inetutils@gnu.org; Tue, 13 Dec 2011 01:57:52 +0000
Date: Tue, 13 Dec 2011 01:57:52 +0000
Message-Id: <E1RaHcu-0000pd-F2@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-197-g14059fd
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: ae08f03b3de1101120aaf287ceb6f7b63981968a
X-Git-Newrev: 14059fd60135323938a926a5d6793234f179de12
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.72
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, 13 Dec 2011 01:57: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  14059fd60135323938a926a5d6793234f179de12 (commit)
      from  ae08f03b3de1101120aaf287ceb6f7b63981968a (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=14059fd60135323938a926a5d6793234f179de12


commit 14059fd60135323938a926a5d6793234f179de12
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Tue Dec 13 02:56:16 2011 +0100

    tests/ftp-localhost.sh: Sanity check.

diff --git a/ChangeLog b/ChangeLog
index c8f960c..4fd9ce9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-12-13  Mats Erik Andersson <gnu@gisladisker.se>
 
+	* tests/ftp-localhost.sh: Check presence of directory `~ftp'.
+
+2011-12-13  Mats Erik Andersson <gnu@gisladisker.se>
+
 	* tests/tftp.sh: Subtests for differing data transfer size.
 	Portability fix for Solaris.
 
diff --git a/tests/ftp-localhost.sh b/tests/ftp-localhost.sh
index e50c5cb..39307c6 100755
--- a/tests/ftp-localhost.sh
+++ b/tests/ftp-localhost.sh
@@ -47,6 +47,11 @@ if ! id -u ftp > /dev/null; then
     exit 77
 fi
 
+if [ ! -d ~ftp ]; then
+    echo "the user 'ftp' must have a home directory"
+    exit 77
+fi
+
 # Note that inetd changes directory to / when --debug is not given so
 # all paths must be absolute for things to work.
 

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

Summary of changes:
 ChangeLog              |    4 ++++
 tests/ftp-localhost.sh |    5 +++++
 2 files changed, 9 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Tue Dec 13 14:47:31 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RaYK3-0004kb-UO
	for mharc-commit-inetutils@gnu.org; Tue, 13 Dec 2011 14:47:31 -0500
Received: from eggs.gnu.org ([140.186.70.92]:40164)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RaYJx-0004k9-Vc
	for commit-inetutils@gnu.org; Tue, 13 Dec 2011 14:47:31 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RaYJw-0004dd-6j
	for commit-inetutils@gnu.org; Tue, 13 Dec 2011 14:47:25 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:53983)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RaYJv-0004dV-W8
	for commit-inetutils@gnu.org; Tue, 13 Dec 2011 14:47:24 -0500
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1RaYJv-0006xU-LR
	for commit-inetutils@gnu.org; Tue, 13 Dec 2011 19:47:23 +0000
Date: Tue, 13 Dec 2011 19:47:23 +0000
Message-Id: <E1RaYJv-0006xU-LR@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-198-g5051e7b
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 14059fd60135323938a926a5d6793234f179de12
X-Git-Newrev: 5051e7b67b04324d26186d39b1954a524e74f7d3
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.72
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, 13 Dec 2011 19:47:31 -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  5051e7b67b04324d26186d39b1954a524e74f7d3 (commit)
      from  14059fd60135323938a926a5d6793234f179de12 (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=5051e7b67b04324d26186d39b1954a524e74f7d3


commit 5051e7b67b04324d26186d39b1954a524e74f7d3
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Tue Dec 13 12:32:41 2011 +0100

    Termcap and readline portability.
    
    Refine readline and tgetent autodetection
    to achieve full support for NetBSD.

diff --git a/ChangeLog b/ChangeLog
index 4fd9ce9..3ec4e7b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
 2011-12-13  Mats Erik Andersson <gnu@gisladisker.se>
 
+	* am/libcurses.m4 (IU_LIB_TERMCAP): Check libtermcap before libcurses.
+	New macros HAVE_TGETENT, HAVE_TERMCAP_TGETENT, HAVE_CURSES_TGETENT,
+	and HAVE_TERMINFO_TGETENT.
+	* am/readline.m4 (gl_FUNC_READLINE): In case libreadline is absent,
+	check whether libedit is present and suffices.
+	* telnet/telnet.c [HAVE_TERMCAP_TGETENT]: Include <termcap.h>.
+	[HAVE_CURSES_TGETENT]: Include <curses.h> and <term.h>.
+	(init_term) [HAVE_TGETENT]: Replace HAVE_READLINE by HAVE_TGETENT.
+	* telnetd/utility.c [HAVE_TERMCAP_TGETENT]: Likewise.
+	[HAVE_CURSES_TGETENT]: Likewise.
+	(terminaltypeok) [HAVE_TGETENT]: Likewise.
+
+2011-12-13  Mats Erik Andersson <gnu@gisladisker.se>
+
 	* tests/ftp-localhost.sh: Check presence of directory `~ftp'.
 
 2011-12-13  Mats Erik Andersson <gnu@gisladisker.se>
diff --git a/am/libcurses.m4 b/am/libcurses.m4
index 3dd1259..fe09781 100644
--- a/am/libcurses.m4
+++ b/am/libcurses.m4
@@ -88,19 +88,37 @@ AC_DEFUN([IU_LIB_TERMCAP], [
   if test "$LIBNCURSES"; then
     LIBTERMCAP="$LIBNCURSES"
   else
-    AC_CHECK_LIB(curses, tgetent, LIBTERMCAP=-lcurses)
-    if test "$ac_cv_lib_curses_tgetent" = no; then
-      AC_CHECK_LIB(termcap, tgetent, LIBTERMCAP=-ltermcap)
+    AC_CHECK_LIB(termcap, tgetent, LIBTERMCAP=-ltermcap)
+    AC_CHECK_HEADERS([termcap.h])
+    if test "$ac_cv_lib_termcap_tgetent" = yes \
+	|| test "$ac_cv_header_termcap_h" = yes; then
+      AC_DEFINE([HAVE_TERMCAP_TGETENT], 1,
+		[Define to 1 if tgetent() exists in <termcap.h>.])
+    else
+      AC_CHECK_LIB(curses, tgetent, LIBTERMCAP=-lcurses)
     fi
-    if test "$ac_cv_lib_termcap_tgetent" = no; then
+    if test "$ac_cv_lib_curses_tgetent" = yes \
+	&& test "$ac_cv_lib_termcap_tgetent" = no; then
+      AC_DEFINE([HAVE_CURSES_TGETENT], 1,
+		[Define to 1 if tgetent() exists in <curses.h>.])
+    fi
+    if test "$ac_cv_lib_curses_tgetent" = no \
+	&& test "$ac_cv_lib_termcap_tgetent" = no; then
       AC_CHECK_LIB(termlib, tgetent, LIBTERMCAP=-ltermlib)
+      if "$ac_cv_lib_termlib_tgetent" = yes; then
+	AC_DEFINE([HAVE_TERMINFO_TGETENT], 1,
+		  [Define to 1 if tgetent() exists in libterminfo.])
+      fi
+    fi
+    if test -n "$LIBTERMCAP"; then
+      AC_DEFINE([HAVE_TGETENT], 1, [Define to 1 if tgetent() exists.])
     fi
   fi
   AC_SUBST(LIBTERMCAP)])dnl
 
-dnl IU_LIB_CURSES -- checke for curses, and associated libraries
+dnl IU_LIB_CURSES -- check for curses, and associated libraries
 dnl
-dnl Checks for varions libraries implementing the curses interface, and if
+dnl Checks for various libraries implementing the curses interface, and if
 dnl found, defines LIBCURSES to be the appropriate linker specification,
 dnl *including* any termcap libraries if needed (some versions of curses
 dnl don't need termcap).
diff --git a/am/readline.m4 b/am/readline.m4
index b7ce9e4..1279c00 100644
--- a/am/readline.m4
+++ b/am/readline.m4
@@ -53,6 +53,20 @@ AC_DEFUN([gl_FUNC_READLINE],
     LIBS="$am_save_LIBS"
   ])
 
+  dnl In case of failure, examine whether libedit can act
+  dnl as replacement. Small NetBSD systems use editline
+  dnl as wrapper for readline.
+  if test "$gl_cv_lib_readline" = no; then
+    am_save_LIBS="$LIBS"
+    LIBS="$am_save_LIBS -ledit"
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
+#include <readline/readline.h>]],
+        [[readline((char*)0);]])],
+      [gl_cv_lib_readline="yes"])
+    LIBS="$am_save_LIBS"
+    LIBREADLINE=-ledit
+  fi
+
   if test "$gl_cv_lib_readline" != no; then
     AC_DEFINE([HAVE_READLINE], [1], [Define if you have the readline library.])
     extra_lib=`echo "$gl_cv_lib_readline" | sed -n -e 's/yes, requires //p'`
diff --git a/telnet/telnet.c b/telnet/telnet.c
index c5b4b19..d0e33d3 100644
--- a/telnet/telnet.c
+++ b/telnet/telnet.c
@@ -73,7 +73,9 @@
 #include "types.h"
 #include "general.h"
 
-#ifdef HAVE_READLINE
+#ifdef HAVE_TERMCAP_TGETENT
+# include <termcap.h>
+#elif defined HAVE_CURSES_TGETENT
 # include <curses.h>
 # include <term.h>
 #endif
@@ -729,7 +731,7 @@ int
 init_term (char *tname, int fd, int *errp)
 {
   int err = -1;
-#ifdef HAVE_READLINE
+#ifdef HAVE_TGETENT
   err = tgetent (termbuf, tname);
 #endif
   if (err == 1)
diff --git a/telnetd/utility.c b/telnetd/utility.c
index c9dbeeb..0101331 100644
--- a/telnetd/utility.c
+++ b/telnetd/utility.c
@@ -37,7 +37,9 @@
 # define NET_ENCRYPT()
 #endif
 
-#ifdef HAVE_READLINE
+#ifdef HAVE_TERMCAP_TGETENT
+# include <termcap.h>
+#elif defined HAVE_CURSES_TGETENT
 # include <curses.h>
 # include <term.h>
 #endif
@@ -830,7 +832,7 @@ terminaltypeok (char *s)
   if (terminaltype == NULL)
     return 1;
 
-#ifdef HAVE_READLINE
+#ifdef HAVE_TGETENT
   if (tgetent (buf, s) == 0)
 #endif
     return 0;

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

Summary of changes:
 ChangeLog         |   14 ++++++++++++++
 am/libcurses.m4   |   30 ++++++++++++++++++++++++------
 am/readline.m4    |   14 ++++++++++++++
 telnet/telnet.c   |    6 ++++--
 telnetd/utility.c |    6 ++++--
 5 files changed, 60 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Sat Dec 17 07:23:23 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RbtIR-0000tz-8f
	for mharc-commit-inetutils@gnu.org; Sat, 17 Dec 2011 07:23:23 -0500
Received: from eggs.gnu.org ([140.186.70.92]:38907)
	by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1RbtIO-0000tX-EY
	for commit-inetutils@gnu.org; Sat, 17 Dec 2011 07:23:21 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ams@gnu.org>) id 1RbtIM-00032Z-KC
	for commit-inetutils@gnu.org; Sat, 17 Dec 2011 07:23:20 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:58466)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1RbtIM-00032R-HP
	for commit-inetutils@gnu.org; Sat, 17 Dec 2011 07:23:18 -0500
Received: from ams by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <ams@gnu.org>) id 1RbtIL-0000gb-Kl
	for commit-inetutils@gnu.org; Sat, 17 Dec 2011 12:23:17 +0000
Date: Sat, 17 Dec 2011 12:23:17 +0000
Message-Id: <E1RbtIL-0000gb-Kl@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-199-gb1c19ec
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 5051e7b67b04324d26186d39b1954a524e74f7d3
X-Git-Newrev: b1c19ecb2408659f68b5cae8eaa1c6c938d35112
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.72
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, 17 Dec 2011 12:23: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  b1c19ecb2408659f68b5cae8eaa1c6c938d35112 (commit)
      from  5051e7b67b04324d26186d39b1954a524e74f7d3 (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=b1c19ecb2408659f68b5cae8eaa1c6c938d35112


commit b1c19ecb2408659f68b5cae8eaa1c6c938d35112
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Tue Dec 13 21:07:48 2011 +0100

    Require automake 1.11.1.

diff --git a/ChangeLog b/ChangeLog
index 3ec4e7b..27b948c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-12-13  Alfred M. Szmidt  <ams@gnu.org>
+
+	Require automake 1.11.1.
+
+	* bootstrap: Updated from gnulib.
+
+	* bootstrap.conf (buildreq): Require automake 1.11.1.
+	* configure.ac: Likewise.
+
 2011-12-13  Mats Erik Andersson <gnu@gisladisker.se>
 
 	* am/libcurses.m4 (IU_LIB_TERMCAP): Check libtermcap before libcurses.
diff --git a/bootstrap b/bootstrap
index f76db9a..3c39f4a 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Print a version string.
-scriptversion=2011-08-11.17; # UTC
+scriptversion=2011-12-07.20; # UTC
 
 # Bootstrap this package from checked-out sources.
 
@@ -473,6 +473,26 @@ if test $use_libtool = 1; then
   find_tool LIBTOOLIZE glibtoolize libtoolize
 fi
 
+case $buildreq in
+  automake) ;;
+  *) buildreq="automake 1.9
+$buildreq" ;;
+esac
+case $buildreq in
+  autoconf) ;;
+  *) buildreq="autoconf 2.59
+$buildreq" ;;
+esac
+if test ! -d "$local_gl_dir" \
+    || find "$local_gl_dir" -name '*.diff' -exec false {} +; then
+  :
+else
+  case $buildreq in
+    patch) ;;
+    *) buildreq="patch -
+$buildreq" ;;
+  esac
+fi
 if ! printf "$buildreq" | check_versions; then
   echo >&2
   if test -f README-prereq; then
diff --git a/bootstrap.conf b/bootstrap.conf
index 02235c1..5b9020c 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -20,7 +20,7 @@
 # Build prerequisites.
 buildreq="\
 autoconf   2.59
-automake   1.11
+automake   1.11.1
 bison      2.3
 m4         -
 makeinfo   -
diff --git a/configure.ac b/configure.ac
index 817fecc..f418175 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,7 +29,7 @@ AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_HEADER([config.h:config.hin])
 AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE([1.11])
+AM_INIT_AUTOMAKE([1.11.1])
 
 # config.h turns this on, so make sure it's on for our tests too
 #CPPFLAGS=-D_BSD_SOURCE

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

Summary of changes:
 ChangeLog      |    9 +++++++++
 bootstrap      |   22 +++++++++++++++++++++-
 bootstrap.conf |    2 +-
 configure.ac   |    2 +-
 4 files changed, 32 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Mon Dec 19 16:22:54 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Rckfe-00053A-Kq
	for mharc-commit-inetutils@gnu.org; Mon, 19 Dec 2011 16:22:54 -0500
Received: from eggs.gnu.org ([140.186.70.92]:42636)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1Rckfb-00052b-Lk
	for commit-inetutils@gnu.org; Mon, 19 Dec 2011 16:22:52 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RckfZ-0003t8-LY
	for commit-inetutils@gnu.org; Mon, 19 Dec 2011 16:22:51 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:55718)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RckfZ-0003sy-JG
	for commit-inetutils@gnu.org; Mon, 19 Dec 2011 16:22:49 -0500
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1RckfY-0000cI-J3
	for commit-inetutils@gnu.org; Mon, 19 Dec 2011 21:22:48 +0000
Date: Mon, 19 Dec 2011 21:22:48 +0000
Message-Id: <E1RckfY-0000cI-J3@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-200-g2c22913
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: b1c19ecb2408659f68b5cae8eaa1c6c938d35112
X-Git-Newrev: 2c229134277513cdd826a843a7b65fa021b77b4a
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.72
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, 19 Dec 2011 21:22: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  2c229134277513cdd826a843a7b65fa021b77b4a (commit)
      from  b1c19ecb2408659f68b5cae8eaa1c6c938d35112 (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=2c229134277513cdd826a843a7b65fa021b77b4a


commit 2c229134277513cdd826a843a7b65fa021b77b4a
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Mon Dec 19 22:20:34 2011 +0100

    rcp,rshd: Missing EUID check; minor corrections.

diff --git a/ChangeLog b/ChangeLog
index 27b948c..36562f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-12-19  Mats Erik Andersson <gnu@gisladisker.se>
+
+	* src/rcp.c (main) [!KERBEROS]: Exit at non-zero geteuid().
+	(toremote): After setting IPTOS_THROUGHPUT, print warning
+	only for ERRNO not equal to ENOPROTOOPT.
+	(tolocal): Likewise.
+	* src/rshd.c (doit): Remove misplaced syslog message.
+	Improve comments on port usage.
+
 2011-12-13  Alfred M. Szmidt  <ams@gnu.org>
 
 	Require automake 1.11.1.
diff --git a/src/rcp.c b/src/rcp.c
index a89ed91..b4801b4 100644
--- a/src/rcp.c
+++ b/src/rcp.c
@@ -309,6 +309,12 @@ main (int argc, char *argv[])
   if (argc > 2)
     targetshouldbedirectory = 1;
 
+#ifndef KERBEROS
+  /* We must be setuid root.  */
+  if (geteuid ())
+    error (EXIT_FAILURE, 0, "must be setuid root.");
+#endif
+
   /* Command to be executed on remote system using "rsh". */
 #ifdef	KERBEROS
   rc = asprintf (&command, "rcp%s%s%s%s", iamrecursive ? " -r" : "",
@@ -427,7 +433,8 @@ toremote (char *targ, int argc, char *argv[])
 	      tos = IPTOS_THROUGHPUT;
 	      if (setsockopt (rem, IPPROTO_IP, IP_TOS,
 			      (char *) &tos, sizeof (int)) < 0)
-		error (0, errno, "TOS (ignored)");
+		if (errno != ENOPROTOOPT)
+		  error (0, errno, "TOS (ignored)");
 #endif
 	      if (response () < 0)
 		exit (EXIT_FAILURE);
@@ -496,7 +503,8 @@ tolocal (int argc, char *argv[])
       tos = IPTOS_THROUGHPUT;
       if (setsockopt (rem, IPPROTO_IP, IP_TOS, (char *) &tos, sizeof (int)) <
 	  0)
-	error (0, errno, "TOS (ignored)");
+	if (errno != ENOPROTOOPT)
+	  error (0, errno, "TOS (ignored)");
 #endif
       sink (1, argv + argc - 1);
       seteuid (0);
diff --git a/src/rshd.c b/src/rshd.c
index aae3cf7..f57e576 100644
--- a/src/rshd.c
+++ b/src/rshd.c
@@ -414,12 +414,12 @@ doit (int sockfd, struct sockaddr_in *fromp)
   alarm (0);
   if (port != 0)
     {
-      /* If the secondary port# is nonzero, the we have to
+      /* If the secondary port# is non-zero, then we have to
        * connect to that port (which the client has already
        * created and is listening on).  The secondary port#
-       * that the client tells us to connect to has to also be
+       * that the client tells us to connect to has also to be
        * a reserved port#.  Also, our end of this secondary
-       * connection has to also have a reserved TCP port bond
+       * connection has also to have a reserved TCP port bound
        * to it, plus.
        */
       int lport = IPPORT_RESERVED - 1;
@@ -437,13 +437,11 @@ doit (int sockfd, struct sockaddr_in *fromp)
 	    syslog (LOG_ERR, "2nd port not reserved\n");
 	    exit (EXIT_FAILURE);
 	  }
-      /* Use the fromp structure taht we already have.
+      /* Use the fromp structure that we already have available.
        * The 32-bit Internet address is obviously that of the
-       * client's, just change the port# to the one specified
-       * by the clent as the secondary port.
+       * client; just change the port# to the one specified
+       * as secondary port by the client.
        */
-      syslog (LOG_ERR, "2nd port not reserved %d\n", port);
-
       fromp->sin_port = htons (port);
       if (connect (s, (struct sockaddr *) fromp, sizeof (*fromp)) < 0)
 	{

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

Summary of changes:
 ChangeLog  |    9 +++++++++
 src/rcp.c  |   12 ++++++++++--
 src/rshd.c |   14 ++++++--------
 3 files changed, 25 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Mon Dec 19 20:28:01 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RcoUr-00046O-Kd
	for mharc-commit-inetutils@gnu.org; Mon, 19 Dec 2011 20:28:01 -0500
Received: from eggs.gnu.org ([140.186.70.92]:35832)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RcoUo-00045r-Ba
	for commit-inetutils@gnu.org; Mon, 19 Dec 2011 20:28:00 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RcoUl-0000yh-T8
	for commit-inetutils@gnu.org; Mon, 19 Dec 2011 20:27:58 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:33389)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RcoUl-0000yd-Ny
	for commit-inetutils@gnu.org; Mon, 19 Dec 2011 20:27:55 -0500
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1RcoUl-0002eR-KY
	for commit-inetutils@gnu.org; Tue, 20 Dec 2011 01:27:55 +0000
Date: Tue, 20 Dec 2011 01:27:55 +0000
Message-Id: <E1RcoUl-0002eR-KY@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-201-g59fafc0
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 2c229134277513cdd826a843a7b65fa021b77b4a
X-Git-Newrev: 59fafc02de4ca165428fffdef8fd5d2a63824b67
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.72
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, 20 Dec 2011 01:28:00 -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  59fafc02de4ca165428fffdef8fd5d2a63824b67 (commit)
      from  2c229134277513cdd826a843a7b65fa021b77b4a (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=59fafc02de4ca165428fffdef8fd5d2a63824b67


commit 59fafc02de4ca165428fffdef8fd5d2a63824b67
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Tue Dec 20 01:42:10 2011 +0100

    rlogind,rshd: Protect against source route spoofing.
    
    An old attack vector was open in the legacy code.

diff --git a/AUTHORS b/AUTHORS
index 581aa55..dc610c0 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -23,6 +23,7 @@ Karl Berry
 Kaveh R. Ghazi
 Ludovic Courtès
 Marcus Brinkmann
+Mats Erik Andersson
 Matt Roberds
 Michael Weiser
 Michal Svoboda
diff --git a/ChangeLog b/ChangeLog
index 36562f5..6a15c71 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2011-12-20  Mats Erik Andersson <gnu@gisladisker.se>
+
+	* src/rlogind.c (rlogind_auth) [IP_OPTIONS]: Abort connection as soon
+	either of IPOPT_SSRR or IPOPT_LSRR is found.  Other options are recorded,
+	and reported, but immediately erased.
+	* src/rshd.c (doit) [IP_OPTIONS]: Likewise.
+	[HAVE_NETINET_IN_SYSTM_H]: Include <netinet/in_systm.h>.
+	[HAVE_NETINET_IP_H]: Include <netinet/ip.h>.
+	* NEWS: Mention security issue inherent in source routing.
+	* AUTHORS: Mention myself as contributing author.
+
 2011-12-19  Mats Erik Andersson <gnu@gisladisker.se>
 
 	* src/rcp.c (main) [!KERBEROS]: Exit at non-zero geteuid().
diff --git a/NEWS b/NEWS
index 9ba0d28..306ce33 100644
--- a/NEWS
+++ b/NEWS
@@ -25,6 +25,14 @@ Handle IPv6 connections.  The server can forward messages
 without using a listening INET socket.  It can also bind
 to a single INET/INET6 address.
 
+* rlogind, rshd
+
+This legacy code was vulnerable to an attack based on source routing.
+Whenever either of IPOPT_SSRR or IPOPT_LSRR is encountered, the newly
+initiated connection is now server-side aborted.  The advisory issued
+by Secure Networks, Inc., February 1997, was adapted.  It was found at
+http://www.citi.umich.edu/u/provos/papers/secnet-spoof.txt
+
 * ifconfig
 
 Now under GNU/Linux "ifconfig -a" shows also interfaces without an address.
diff --git a/src/rlogind.c b/src/rlogind.c
index 6a0f08b..63cbe8f 100644
--- a/src/rlogind.c
+++ b/src/rlogind.c
@@ -599,8 +599,33 @@ rlogind_auth (int fd, struct auth_data *ap)
 			&optsize) == 0 && optsize != 0)
 	  {
 	    lp = lbuf;
-	    for (cp = optbuf; optsize > 0; cp++, optsize--, lp += 3)
-	      sprintf (lp, " %2.2x", *cp);
+	    for (cp = optbuf; optsize > 0; )
+	      {
+		sprintf (lp, " %2.2x", *cp);
+		lp += 3;
+
+		/* These two open an attack vector.  */
+		if (*cp == IPOPT_SSRR || *cp == IPOPT_LSRR)
+		  {
+		    syslog (LOG_NOTICE,
+			    "Discarding connection from %s with set source routing",
+			    inet_ntoa (ap->from.sin_addr));
+		    exit (EXIT_FAILURE);
+		  }
+		if (*cp == IPOPT_EOL)
+		  break;
+		if (*cp == IPOPT_NOP)
+		  cp++, optsize--;
+		else
+		  {
+		    /* Options using a length octet, see RFC 791.  */
+		    int inc = cp[1];
+
+		    optsize -= inc;
+		    cp += inc;
+		  }
+	      }
+
 	    syslog (LOG_NOTICE, "Ignoring IP options: %s", lbuf);
 	    if (setsockopt (0, ipproto, IP_OPTIONS, (char *) NULL, optsize))
 	      {
diff --git a/src/rshd.c b/src/rshd.c
index f57e576..c1a572a 100644
--- a/src/rshd.c
+++ b/src/rshd.c
@@ -48,7 +48,7 @@
  */
 
 /*
- * remote shell server:
+ * remote shell server exchange protocol:
  *	[port]\0
  *	remuser\0
  *	locuser\0
@@ -69,6 +69,12 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
+#ifdef HAVE_NETINET_IN_SYSTM_H
+# include <netinet/in_systm.h>	/* n_time */
+#endif
+#ifdef HAVE_NETINET_IP_H
+# include <netinet/ip.h>	/* IPOPT_* */
+#endif
 
 #include <unistd.h>
 #include <errno.h>
@@ -353,16 +359,46 @@ doit (int sockfd, struct sockaddr_in *fromp)
 		     &optsize) && optsize != 0)
       {
 	lp = lbuf;
-	/* The clent has set IP options.  This isn't allowd.
-	 * Use syslog() to record the fact.
+	/* The client has set IP options.  This isn't allowed.
+	 * Use syslog() to record the fact.  Only the option
+	 * types are printed, not their contents.
 	 */
-	for (cp = optbuf; optsize > 0; cp++, optsize--, lp += 3)
-	  sprintf (lp, " %2.2x", *cp);
+	for (cp = optbuf; optsize > 0; )
+	  {
+	    sprintf (lp, " %2.2x", *cp);
+	    lp += 3;
+
+	    if (*cp == IPOPT_SSRR || *cp == IPOPT_LSRR)
+	      {
+		/* Already the TCP handshake suffices for
+		 * a man-in-the-middle attack vector.
+		 */
+		syslog (LOG_NOTICE,
+			"Discarding connection from %s with set source routing",
+			inet_ntoa (fromp->sin_addr));
+		exit (EXIT_FAILURE);
+	      }
+	    if (*cp == IPOPT_EOL)
+	      break;
+	    if (*cp == IPOPT_NOP)
+	      cp++, optsize--;
+	    else
+	      {
+		/* Options using a length octet, see RFC 791.  */
+		int inc = cp[1];
+
+		optsize -= inc;
+		cp += inc;
+	      }
+	  }
+
+	/* At this point presumably harmless options are present.
+	 * Make a report about them, erase them, and continue.  */
 	syslog (LOG_NOTICE,
-		"Connection received from %s using IP options (ignored):%s",
+		"Connection received from %s using IP options (erased):%s",
 		inet_ntoa (fromp->sin_addr), lbuf);
 
-	/* Turn off the options.  If this doesn't work, we quit */
+	/* Turn off the options.  If this doesn't work, we quit.  */
 	if (setsockopt (sockfd, ipproto, IP_OPTIONS,
 			(char *) NULL, optsize) != 0)
 	  {

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

Summary of changes:
 AUTHORS       |    1 +
 ChangeLog     |   11 +++++++++++
 NEWS          |    8 ++++++++
 src/rlogind.c |   29 +++++++++++++++++++++++++++--
 src/rshd.c    |   50 +++++++++++++++++++++++++++++++++++++++++++-------
 5 files changed, 90 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Wed Dec 21 18:58:24 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RdW3E-0002P3-Av
	for mharc-commit-inetutils@gnu.org; Wed, 21 Dec 2011 18:58:24 -0500
Received: from eggs.gnu.org ([140.186.70.92]:54216)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RdW3C-0002OW-0H
	for commit-inetutils@gnu.org; Wed, 21 Dec 2011 18:58:22 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RdW3A-0000s0-Eg
	for commit-inetutils@gnu.org; Wed, 21 Dec 2011 18:58:21 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:54839)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RdW3A-0000rw-AL
	for commit-inetutils@gnu.org; Wed, 21 Dec 2011 18:58:20 -0500
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1RdW39-0000Nx-UD
	for commit-inetutils@gnu.org; Wed, 21 Dec 2011 23:58:20 +0000
Date: Wed, 21 Dec 2011 23:58:19 +0000
Message-Id: <E1RdW39-0000Nx-UD@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-202-g9476515
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 59fafc02de4ca165428fffdef8fd5d2a63824b67
X-Git-Newrev: 9476515fd31e416739d850c1948e9222a53deea9
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.72
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, 21 Dec 2011 23:58:23 -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  9476515fd31e416739d850c1948e9222a53deea9 (commit)
      from  59fafc02de4ca165428fffdef8fd5d2a63824b67 (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=9476515fd31e416739d850c1948e9222a53deea9


commit 9476515fd31e416739d850c1948e9222a53deea9
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Thu Dec 22 00:53:58 2011 +0100

    libinetutils/setsig.c: Incomplete replacement code.
    
    No error checking; unjustified assumption on recovery
    of old signal mask; dropping of signal flags when
    activating SA_RESTART.  All are portability issues.

diff --git a/ChangeLog b/ChangeLog
index 6a15c71..12aefbe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-12-22  Mats Erik Andersson <gnu@gisladisker.se>
+
+	* libinetutils/setsig.c (setsig) [HAVE_SIGACTION]: New variable OSA.
+	Superpose SA_RESTART on SA_FLAGS, no replacement!  Use OSA for old
+	signal mask in calling sigaction.  Return SIG_ERR on error, or fetch
+	old signal handler from OSA upon success.
+	[HAVE_SIGVEC]: Likewise:  New variable OSV.  Use OSV in call to sigvec.
+	Return SIG_ERR on error, or old handler brought in from OSV.
+
 2011-12-20  Mats Erik Andersson <gnu@gisladisker.se>
 
 	* src/rlogind.c (rlogind_auth) [IP_OPTIONS]: Abort connection as soon
diff --git a/libinetutils/setsig.c b/libinetutils/setsig.c
index 3fa3c08..3a60906 100644
--- a/libinetutils/setsig.c
+++ b/libinetutils/setsig.c
@@ -31,21 +31,23 @@ sighandler_t
 setsig (int sig, sighandler_t handler)
 {
 #ifdef HAVE_SIGACTION
-  struct sigaction sa;
+  struct sigaction sa, osa;
   sigemptyset (&sa.sa_mask);
 # ifdef SA_RESTART
-  sa.sa_flags = SA_RESTART;
+  sa.sa_flags |= SA_RESTART;
 # endif
   sa.sa_handler = handler;
-  sigaction (sig, &sa, &sa);
-  return sa.sa_handler;
+  if (sigaction (sig, &sa, &osa) < 0)
+    return SIG_ERR;
+  return osa.sa_handler;
 #else /* !HAVE_SIGACTION */
 # ifdef HAVE_SIGVEC
-  struct sigvec sv;
+  struct sigvec sv, osv;
   sigemptyset (&sv.sv_mask);
   sv.sv_handler = handler;
-  sigvec (sig, &sv, &sv);
-  return sv.sv_handler;
+  if (sigvec (sig, &sv, &osv) < 0)
+    return SIG_ERR;
+  return osv.sv_handler;
 # else /* !HAVE_SIGVEC */
   return signal (sig, handler);
 # endif	/* HAVE_SIGVEC */

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

Summary of changes:
 ChangeLog             |    9 +++++++++
 libinetutils/setsig.c |   16 +++++++++-------
 2 files changed, 18 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Wed Dec 21 22:44:01 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RdZZZ-0006gk-8c
	for mharc-commit-inetutils@gnu.org; Wed, 21 Dec 2011 22:44:01 -0500
Received: from eggs.gnu.org ([140.186.70.92]:32774)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RdZZV-0006fn-PG
	for commit-inetutils@gnu.org; Wed, 21 Dec 2011 22:43:59 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RdZZT-000442-5c
	for commit-inetutils@gnu.org; Wed, 21 Dec 2011 22:43:57 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:45480)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RdZZT-00043y-1L
	for commit-inetutils@gnu.org; Wed, 21 Dec 2011 22:43:55 -0500
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1RdZZS-0006U8-HU
	for commit-inetutils@gnu.org; Thu, 22 Dec 2011 03:43:54 +0000
Date: Thu, 22 Dec 2011 03:43:54 +0000
Message-Id: <E1RdZZS-0006U8-HU@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-203-gb48e61c
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 9476515fd31e416739d850c1948e9222a53deea9
X-Git-Newrev: b48e61c52c10955ca2cc848834c2de306cf0d157
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.72
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, 22 Dec 2011 03:43: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  b48e61c52c10955ca2cc848834c2de306cf0d157 (commit)
      from  9476515fd31e416739d850c1948e9222a53deea9 (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=b48e61c52c10955ca2cc848834c2de306cf0d157


commit b48e61c52c10955ca2cc848834c2de306cf0d157
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Thu Dec 22 04:40:47 2011 +0100

    src/rlogin.c: Partial portability fix.
    
    Improve sigmask handling, and exit messages.
    Signal handlers must still be cleaned from heavy
    calls that cause system dependent race conditions.

diff --git a/ChangeLog b/ChangeLog
index 12aefbe..dd381d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
 2011-12-22  Mats Erik Andersson <gnu@gisladisker.se>
 
+	* libinetutils/setsig.c (setsig) [HAVE_SIGACTION]: Initialize
+	`osa.sa_mask' just to be sure.
+	[HAVE_SIGVEC]: Likewise with `osv.sv_mask'.
+	* src/rlogin.c: Many rewritten comments.
+	(main): New variable OSMASK, used for old, saved signal mask.
+	(setsignal): New variable OSIGS, likewise.
+	(done): Use waitpid() instead of wait().
+	(catch_child): Detect errno equal to EINTR.
+	(doit,lostpeer): Let exit messages explain better.  Add host
+	name to them, and append CR for correct printout.
+
+2011-12-22  Mats Erik Andersson <gnu@gisladisker.se>
+
 	* libinetutils/setsig.c (setsig) [HAVE_SIGACTION]: New variable OSA.
 	Superpose SA_RESTART on SA_FLAGS, no replacement!  Use OSA for old
 	signal mask in calling sigaction.  Return SIG_ERR on error, or fetch
diff --git a/libinetutils/setsig.c b/libinetutils/setsig.c
index 3a60906..24c57db 100644
--- a/libinetutils/setsig.c
+++ b/libinetutils/setsig.c
@@ -33,6 +33,7 @@ setsig (int sig, sighandler_t handler)
 #ifdef HAVE_SIGACTION
   struct sigaction sa, osa;
   sigemptyset (&sa.sa_mask);
+  sigemptyset (&osa.sa_mask);
 # ifdef SA_RESTART
   sa.sa_flags |= SA_RESTART;
 # endif
@@ -44,6 +45,7 @@ setsig (int sig, sighandler_t handler)
 # ifdef HAVE_SIGVEC
   struct sigvec sv, osv;
   sigemptyset (&sv.sv_mask);
+  sigemptyset (&osv.sv_mask);
   sv.sv_handler = handler;
   if (sigvec (sig, &sv, &osv) < 0)
     return SIG_ERR;
diff --git a/src/rlogin.c b/src/rlogin.c
index aca8c23..14f3765 100644
--- a/src/rlogin.c
+++ b/src/rlogin.c
@@ -315,7 +315,7 @@ main (int argc, char *argv[])
 {
   struct passwd *pw;
   struct servent *sp;
-  sigset_t smask;
+  sigset_t smask, osmask;
   uid_t uid;
   int index;
   int term_speed;
@@ -323,9 +323,9 @@ main (int argc, char *argv[])
 
   set_program_name (argv[0]);
 
-  /* Traditionnaly, if a symbolic link was made to the rlogin binary
-     rlogin --> hostname
-     hostname will be use as the name of the server to login too.  */
+  /* Traditionally, if a symbolic link was made to the rlogin binary
+         hostname --> rlogin
+     then hostname will be used as the name of the server to access.  */
   {
     char *p = strrchr (argv[0], '/');
     if (p)
@@ -389,8 +389,8 @@ main (int argc, char *argv[])
     error (EXIT_FAILURE, 0, "login/tcp: unknown service.");
 
   /* Get the name of the terminal from the environment.  Also get the
-     terminal's spee.  Both the name and the spee are passed to the server
-     as the "cmd" argument of the rcmd() function.  This is something like
+     terminal's speed.  The name and the speed are passed to the server
+     as the argument "cmd" of the rcmd() function.  This is something like
      "vt100/9600".  */
   term_speed = speed (0);
   if (term_speed == SPEED_NOTATTY)
@@ -409,13 +409,14 @@ main (int argc, char *argv[])
 
   setsig (SIGPIPE, lostpeer);
 
-  /* Block SIGURG and SIGUSR1 signals.  This will be handled by the
+  /* Block SIGURG and SIGUSR1 signals.  These will be handled by the
      parent and the child after the fork.  */
-  /* Will use SIGUSR1 for window size hack, so hold it off.  */
+  /* Will be using SIGUSR1 for window size hack, so hold it off.  */
   sigemptyset (&smask);
+  sigemptyset (&osmask);
   sigaddset (&smask, SIGURG);
   sigaddset (&smask, SIGUSR1);
-  sigprocmask (SIG_SETMASK, &smask, &smask);
+  sigprocmask (SIG_SETMASK, &smask, &osmask);
 
   /*
    * We set SIGURG and SIGUSR1 below so that an
@@ -432,7 +433,7 @@ try_connect:
     {
       struct hostent *hp;
 
-      /* Fully qualify hostname (needed for krb_realmofhost).  */
+      /* Fully qualified hostname (needed for krb_realmofhost).  */
       hp = gethostbyname (host);
       if (hp != NULL && !(host = strdup (hp->h_name)))
 	error (EXIT_FAILURE, errno, "strdup");
@@ -570,22 +571,23 @@ try_connect:
 #endif
 
   /* Now change to the real user ID.  We have to be set-user-ID root
-     to get the privileged port that rcmd () uses,  however we now want to
-     run as the real user who invoked us.  */
+     to get the privileged port that rcmd () uses.  We now want, however,
+     to run as the real user who invoked us.  */
   seteuid (uid);
   setuid (uid);
 
-  doit (&smask);
+  doit (&osmask);
 
   return 0;
 }
 
-/* Some systems, like QNX/Neutrino , The constant B0, B50,.. maps straigth to
-   the actual speed, 0, 50, ..., where on other system like GNU/Linux
-   it maps to a const 0, 1, ... i.e the value are encoded.
-   cfgetispeed(), according to posix should return a constant value reprensenting the Baud.
-   So to be portable we have to the conversion ourselves.  */
-/* Some values are not not define by POSIX.  */
+/* On some systems, like QNX/Neutrino, the constants B0, B50, etcetera,
+ * map straight to the actual speed (0, 50, etcetera), whereas on other
+ * systems like GNU/Linux, they map to ordered constants (0, 1, etcetera),
+ * i.e, the values are only order encoded.  cfgetispeed() should according
+ * to POSIX return a constant value representing the numerical speed.
+ * To be portable we need to do the conversion ourselves.  */
+/* Some values are not defined by POSIX.  */
 #ifndef B7200
 # define B7200   B4800
 #endif
@@ -664,8 +666,8 @@ speed_translate (unsigned int sym)
   return 0;
 }
 
-/* Returns the terminal speed for the file descriptor FD, or
-   SPEED_NOTATTY if FD is not associated with a terminal.  */
+/* Returns the terminal speed for the file descriptor FD,
+   or SPEED_NOTATTY if FD is not associated with a terminal.  */
 int
 speed (int fd)
 {
@@ -711,17 +713,17 @@ doit (sigset_t * smask)
       mode (1);
       if (reader (smask) == 0)
 	{
-	  /* If the reader () return 0, the socket to the server returned an
-	     EOF, meaning the client logged out of the remote system.
+	  /* If the reader returns zero, the socket to the server returned
+	     an EOF, meaning the client logged out of the remote system.
 	     This is the normal termination.  */
-          error (0, 0, "connection closed");
+          error (0, 0, "Connection to %s closed normally.\r", host);
           /* EXIT_SUCCESS is usually zero. So error might not exit.  */
           exit (EXIT_SUCCESS);
 	}
-      /* If the reader () returns nonzero, the socket to the server
-         returned an error.  Somethingg went wrong.  */
+      /* If the reader returns non-zero, the socket to the server
+         returned an error.  Something went wrong.  */
       sleep (1);
-      error (EXIT_FAILURE, 0, "\007connection closed");
+      error (EXIT_FAILURE, 0, "\007Connection to %s closed with error.\r", host);
     }
 
   /*
@@ -733,18 +735,18 @@ doit (sigset_t * smask)
    * signals to the child. We can now unblock SIGURG and SIGUSR1
    * that were set above.
    */
-  /* Reenables SIGURG and SIUSR1.  */
+  /* Reenable SIGURG and SIGUSR1.  */
   sigprocmask (SIG_SETMASK, smask, (sigset_t *) 0);
 
   setsig (SIGCHLD, catch_child);
 
   writer ();
 
-  /* If the write returns, it means the user entered "~." on the terminal.
+  /* If the writer returns, it means the user entered "~." on the terminal.
      In this case we terminate and the server will eventually get an EOF
      on its end of the network connection.  This should cause the server to
      log you out on the remote system.  */
-  error (0, 0, "closed connection");
+  error (0, 0, "Connection to %s aborted.\r", host);
 
 #ifdef SHISHI
   if (use_kerberos)
@@ -768,28 +770,28 @@ doit (sigset_t * smask)
 
 /* Enable a signal handler, unless the signal is already being ignored.
    This function is called before the fork (), for SIGHUP and SIGQUIT.  */
-/* Trap a signal, unless it is being ignored. */
 void
 setsignal (int sig)
 {
   sighandler_t handler;
-  sigset_t sigs;
+  sigset_t sigs, osigs;
 
   sigemptyset (&sigs);
+  sigemptyset (&osigs);
   sigaddset (&sigs, sig);
-  sigprocmask (SIG_BLOCK, &sigs, &sigs);
+  sigprocmask (SIG_BLOCK, &sigs, &osigs);
 
   handler = setsig (sig, exit);
   if (handler == SIG_IGN)
     setsig (sig, handler);
 
-  sigprocmask (SIG_SETMASK, &sigs, (sigset_t *) 0);
+  sigprocmask (SIG_SETMASK, &osigs, (sigset_t *) 0);
 }
 
 /* This function is called by the parent:
    (1) at the end (user terminates the client end);
-   (2) SIGCLD signal - the sigcld_parent () function.
-   (3) SIGPPE signal - the connection has dropped.
+   (2) SIGCHLD signal - the catch_child () function.
+   (3) SIGPIPE signal - the connection was lost.
 
    We send the child a SIGKILL signal, which it can't ignore, then
    wait for it to terminate.  */
@@ -799,13 +801,13 @@ done (int status)
   pid_t w;
   int wstatus;
 
-  mode (0);
+  mode (0);	/* FIXME: Calls tcgetattr/tcsetattr in signal handler.  */
   if (child > 0)
     {
       /* make sure catch_child does not snap it up */
       setsig (SIGCHLD, SIG_DFL);
       if (kill (child, SIGKILL) >= 0)
-	while ((w = wait (&wstatus)) > 0 && w != child)
+	while ((w = waitpid (-1, &wstatus, WNOHANG)) > 0 && w != child)
 	  continue;
     }
   exit (status);
@@ -816,6 +818,8 @@ int dosigwinch;
 /*
  * This is called when the reader process gets the out-of-band (urgent)
  * request to turn on the window-changing protocol.
+ *
+ * FIXME: Race condition due to sendwindow() in signal handler?
  */
 void
 writeroob (int signo _GL_UNUSED_PARAMETER)
@@ -828,6 +832,8 @@ writeroob (int signo _GL_UNUSED_PARAMETER)
   dosigwinch = 1;
 }
 
+/* FIXME: System dependent race condition due to done().
+ */
 void
 catch_child (int signo _GL_UNUSED_PARAMETER)
 {
@@ -840,6 +846,8 @@ catch_child (int signo _GL_UNUSED_PARAMETER)
       if (pid == 0)
 	return;
       /* if the child (reader) dies, just quit */
+      if (pid < 0 && errno == EINTR)
+	continue;
       if (pid < 0 || (pid == child && !WIFSTOPPED (status)))
 	done (WEXITSTATUS (status) | WTERMSIG (status));
     }
@@ -1006,6 +1014,8 @@ sigwinch (int signo _GL_UNUSED_PARAMETER)
 
 /*
  * Send the window size to the server via the magic escape
+ *
+ * FIXME: Used in signal handler. Race condition?
  */
 void
 sendwindow (void)
@@ -1258,11 +1268,13 @@ mode (int f)
     }
 }
 
+/* FIXME: Race condition due to done() in signal handler?
+ */
 void
 lostpeer (int signo _GL_UNUSED_PARAMETER)
 {
   setsig (SIGPIPE, SIG_IGN);
-  error (0, 0, "\007connection closed.");
+  error (0, 0, "\007Connection to %s lost.\r", host);
   done (1);
 }
 

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

Summary of changes:
 ChangeLog             |   13 +++++++
 libinetutils/setsig.c |    2 +
 src/rlogin.c          |   90 +++++++++++++++++++++++++++---------------------
 3 files changed, 66 insertions(+), 39 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Sun Dec 25 07:26:45 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RenA5-0001mb-US
	for mharc-commit-inetutils@gnu.org; Sun, 25 Dec 2011 07:26:45 -0500
Received: from eggs.gnu.org ([140.186.70.92]:38807)
	by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1RenA1-0001m2-5e
	for commit-inetutils@gnu.org; Sun, 25 Dec 2011 07:26:43 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ams@gnu.org>) id 1Ren9z-0000PW-5j
	for commit-inetutils@gnu.org; Sun, 25 Dec 2011 07:26:41 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:40093)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1Ren9z-0000PS-3s
	for commit-inetutils@gnu.org; Sun, 25 Dec 2011 07:26:39 -0500
Received: from ams by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <ams@gnu.org>) id 1Ren9y-0002wV-PD
	for commit-inetutils@gnu.org; Sun, 25 Dec 2011 12:26:39 +0000
Date: Sun, 25 Dec 2011 12:26:38 +0000
Message-Id: <E1Ren9y-0002wV-PD@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-205-g0db09b4
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: b48e61c52c10955ca2cc848834c2de306cf0d157
X-Git-Newrev: 0db09b449c8a03807a91ddc51abf7368bcc46d3b
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.72
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, 25 Dec 2011 12:26: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  0db09b449c8a03807a91ddc51abf7368bcc46d3b (commit)
       via  665f1e73cdd9b38e2d2e11b8db9958a315935592 (commit)
      from  b48e61c52c10955ca2cc848834c2de306cf0d157 (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=0db09b449c8a03807a91ddc51abf7368bcc46d3b


commit 0db09b449c8a03807a91ddc51abf7368bcc46d3b
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Sun Dec 25 13:22:26 2011 +0100

    Fix indentation, and stop using `register' keyword.

diff --git a/ChangeLog b/ChangeLog
index f4e4457..db6610a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2011-12-25  Alfred M. Szmidt  <ams@gnu.org>
 
+	* libtelnet/encrypt.c: Fix indentation, and Use ANSI style
+	declarations for prototypes.
+	(EncryptDisable, EncryptType, EncryptStart, encrypt_support)
+	(encrypt_is, encrypt_reply, encrypt_keyid, encrypt_start_output)
+	(encrypt_send_request_start, encrypt_wait, encrypt_printsub):
+	Don't declare any variables as `register'.
+
+2011-12-25  Alfred M. Szmidt  <ams@gnu.org>
+
 	* libtelnet/encrypt.c (encrypt_keyid): Make sure that LEN never is
 	greater than MAXKEYLEN.
 
diff --git a/libtelnet/encrypt.c b/libtelnet/encrypt.c
index abfa6d4..1f2bb97 100644
--- a/libtelnet/encrypt.c
+++ b/libtelnet/encrypt.c
@@ -102,61 +102,50 @@ static char *Name = "Noname";
 
 # define typemask(x)	((x) > 0 ? 1 << ((x)-1) : 0)
 
-static long i_support_encrypt = typemask (ENCTYPE_DES_CFB64)
-  | typemask (ENCTYPE_DES_OFB64);
-     static long
-       i_support_decrypt = typemask (ENCTYPE_DES_CFB64)
-  | typemask (ENCTYPE_DES_OFB64);
-     static long
-       i_wont_support_encrypt = 0;
-     static long
-       i_wont_support_decrypt = 0;
+static long i_support_encrypt = typemask (ENCTYPE_DES_CFB64) | typemask (ENCTYPE_DES_OFB64);
+static long i_support_decrypt = typemask (ENCTYPE_DES_CFB64) | typemask (ENCTYPE_DES_OFB64);
+static long i_wont_support_encrypt = 0;
+static long i_wont_support_decrypt = 0;
 # define I_SUPPORT_ENCRYPT	(i_support_encrypt & ~i_wont_support_encrypt)
 # define I_SUPPORT_DECRYPT	(i_support_decrypt & ~i_wont_support_decrypt)
 
-     static long
-       remote_supports_encrypt = 0;
-     static long
-       remote_supports_decrypt = 0;
+static long remote_supports_encrypt = 0;
+static long remote_supports_decrypt = 0;
 
-     static
-       Encryptions
-       encryptions[] = {
+static Encryptions encryptions[] = {
 # if defined DES_ENCRYPTION || defined SHISHI
-       {"DES_CFB64", ENCTYPE_DES_CFB64,
-	cfb64_encrypt,
-	cfb64_decrypt,
-	cfb64_init,
-	cfb64_start,
-	cfb64_is,
-	cfb64_reply,
-	cfb64_session,
-	cfb64_keyid,
-	cfb64_printsub},
-       {"DES_OFB64", ENCTYPE_DES_OFB64,
-	ofb64_encrypt,
-	ofb64_decrypt,
-	ofb64_init,
-	ofb64_start,
-	ofb64_is,
-	ofb64_reply,
-	ofb64_session,
-	ofb64_keyid,
-	ofb64_printsub},
+  {"DES_CFB64", ENCTYPE_DES_CFB64,
+   cfb64_encrypt,
+   cfb64_decrypt,
+   cfb64_init,
+   cfb64_start,
+   cfb64_is,
+   cfb64_reply,
+   cfb64_session,
+   cfb64_keyid,
+   cfb64_printsub},
+  {"DES_OFB64", ENCTYPE_DES_OFB64,
+   ofb64_encrypt,
+   ofb64_decrypt,
+   ofb64_init,
+   ofb64_start,
+   ofb64_is,
+   ofb64_reply,
+   ofb64_session,
+   ofb64_keyid,
+   ofb64_printsub},
 # endif	/* DES_ENCRYPTION */
-       {0,},
-     };
-
-static unsigned char str_send[64] = { IAC, SB, TELOPT_ENCRYPT,
-  ENCRYPT_SUPPORT
+  {0,},
 };
+
+static unsigned char str_send[64] =
+  { IAC, SB, TELOPT_ENCRYPT, ENCRYPT_SUPPORT };
 static unsigned char str_suplen = 0;
 static unsigned char str_start[72] = { IAC, SB, TELOPT_ENCRYPT };
 static unsigned char str_end[] = { IAC, SB, TELOPT_ENCRYPT, 0, IAC, SE };
 
 Encryptions *
-findencryption (type)
-     int type;
+findencryption (int type)
 {
   Encryptions *ep = encryptions;
 
@@ -168,8 +157,7 @@ findencryption (type)
 }
 
 Encryptions *
-finddecryption (type)
-     int type;
+finddecryption (int type)
 {
   Encryptions *ep = encryptions;
 
@@ -189,19 +177,13 @@ static struct key_info
   int dir;
   int *modep;
   Encryptions *(*getcrypt) ();
-} ki[2] =
-{
-  {
-    {
-  0}, 0, DIR_ENCRYPT, &encrypt_mode, findencryption},
-  {
-    {
-0}, 0, DIR_DECRYPT, &decrypt_mode, finddecryption},};
+} ki[2] = {
+  {{0}, 0, DIR_ENCRYPT, &encrypt_mode, findencryption},
+  {{0}, 0, DIR_DECRYPT, &decrypt_mode, finddecryption},
+};
 
 void
-encrypt_init (name, server)
-     char *name;
-     int server;
+encrypt_init (char *name, int server)
 {
   Encryptions *ep = encryptions;
 
@@ -234,7 +216,7 @@ encrypt_init (name, server)
 }
 
 void
-encrypt_list_types ()
+encrypt_list_types (void)
 {
   Encryptions *ep = encryptions;
 
@@ -247,8 +229,7 @@ encrypt_list_types ()
 }
 
 int
-EncryptEnable (type, mode)
-     char *type, *mode;
+EncryptEnable (char *type, *mode)
 {
   if (isprefix (type, "help") || isprefix (type, "?"))
     {
@@ -262,10 +243,9 @@ EncryptEnable (type, mode)
 }
 
 int
-EncryptDisable (type, mode)
-     char *type, *mode;
+EncryptDisable (char *type, *mode)
 {
-  register Encryptions *ep;
+  Encryptions *ep;
   int ret = 0;
 
   if (isprefix (type, "help") || isprefix (type, "?"))
@@ -275,13 +255,9 @@ EncryptDisable (type, mode)
     }
   else if ((ep = (Encryptions *) genget (type, encryptions,
 					 sizeof (Encryptions))) == 0)
-    {
-      printf ("%s: invalid encryption type\n", type);
-    }
+    printf ("%s: invalid encryption type\n", type);
   else if (Ambiguous (ep))
-    {
-      printf ("Ambiguous type '%s'\n", type);
-    }
+    printf ("Ambiguous type '%s'\n", type);
   else
     {
       if ((mode == 0) || (isprefix (mode, "input") ? 1 : 0))
@@ -305,11 +281,9 @@ EncryptDisable (type, mode)
 }
 
 int
-EncryptType (type, mode)
-     char *type;
-     char *mode;
+EncryptType (char *type, char *mode)
 {
-  register Encryptions *ep;
+  Encryptions *ep;
   int ret = 0;
 
   if (isprefix (type, "help") || isprefix (type, "?"))
@@ -319,13 +293,9 @@ EncryptType (type, mode)
     }
   else if ((ep = (Encryptions *) genget (type, encryptions,
 					 sizeof (Encryptions))) == 0)
-    {
-      printf ("%s: invalid encryption type\n", type);
-    }
+    printf ("%s: invalid encryption type\n", type);
   else if (Ambiguous (ep))
-    {
-      printf ("Ambiguous type '%s'\n", type);
-    }
+    printf ("Ambiguous type '%s'\n", type);
   else
     {
       if ((mode == 0) || isprefix (mode, "input"))
@@ -347,10 +317,9 @@ EncryptType (type, mode)
 }
 
 int
-EncryptStart (mode)
-     char *mode;
+EncryptStart (char *mode)
 {
-  register int ret = 0;
+  int ret = 0;
   if (mode)
     {
       if (isprefix (mode, "input"))
@@ -372,7 +341,7 @@ EncryptStart (mode)
 }
 
 int
-EncryptStartInput ()
+EncryptStartInput (void)
 {
   if (decrypt_mode)
     {
@@ -384,7 +353,7 @@ EncryptStartInput ()
 }
 
 int
-EncryptStartOutput ()
+EncryptStartOutput (void)
 {
   if (encrypt_mode)
     {
@@ -396,8 +365,7 @@ EncryptStartOutput ()
 }
 
 int
-EncryptStop (mode)
-     char *mode;
+EncryptStop (char *mode)
 {
   int ret = 0;
   if (mode)
@@ -421,21 +389,21 @@ EncryptStop (mode)
 }
 
 int
-EncryptStopInput ()
+EncryptStopInput (void)
 {
   encrypt_send_request_end ();
   return (1);
 }
 
 int
-EncryptStopOutput ()
+EncryptStopOutput (void)
 {
   encrypt_send_end ();
   return (1);
 }
 
 void
-encrypt_display ()
+encrypt_display (void)
 {
   if (encrypt_output)
     printf ("Currently encrypting output with %s\r\n",
@@ -446,7 +414,7 @@ encrypt_display ()
 }
 
 int
-EncryptStatus ()
+EncryptStatus (void)
 {
   if (encrypt_output)
     printf ("Currently encrypting output with %s\r\n",
@@ -457,10 +425,8 @@ EncryptStatus ()
       printf ("Last encryption mode was %s\r\n", ENCTYPE_NAME (encrypt_mode));
     }
   if (decrypt_input)
-    {
-      printf ("Currently decrypting input with %s\r\n",
-	      ENCTYPE_NAME (decrypt_mode));
-    }
+    printf ("Currently decrypting input with %s\r\n",
+	    ENCTYPE_NAME (decrypt_mode));
   else if (decrypt_mode)
     {
       printf ("Currently input is clear text.\r\n");
@@ -470,7 +436,7 @@ EncryptStatus ()
 }
 
 void
-encrypt_send_support ()
+encrypt_send_support (void)
 {
   if (str_suplen)
     {
@@ -488,8 +454,7 @@ encrypt_send_support ()
 }
 
 int
-EncryptDebug (on)
-     int on;
+EncryptDebug (int on)
 {
   if (on < 0)
     encrypt_debug_mode ^= 1;
@@ -501,8 +466,7 @@ EncryptDebug (on)
 }
 
 int
-EncryptVerbose (on)
-     int on;
+EncryptVerbose (int on)
 {
   if (on < 0)
     encrypt_verbose ^= 1;
@@ -513,8 +477,7 @@ EncryptVerbose (on)
 }
 
 int
-EncryptAutoEnc (on)
-     int on;
+EncryptAutoEnc (int on)
 {
   encrypt_auto (on);
   printf ("Automatic encryption of output is %s\r\n",
@@ -523,8 +486,7 @@ EncryptAutoEnc (on)
 }
 
 int
-EncryptAutoDec (on)
-     int on;
+EncryptAutoDec (int on)
 {
   decrypt_auto (on);
   printf ("Automatic decryption of input is %s\r\n",
@@ -536,11 +498,9 @@ EncryptAutoDec (on)
  * Called when ENCRYPT SUPPORT is received.
  */
 void
-encrypt_support (typelist, cnt)
-     unsigned char *typelist;
-     int cnt;
+encrypt_support (unsigned char *typelist, int cnt)
 {
-  register int type, use_type = 0;
+  int type, use_type = 0;
   Encryptions *ep;
 
   /*
@@ -578,12 +538,10 @@ encrypt_support (typelist, cnt)
 }
 
 void
-encrypt_is (data, cnt)
-     unsigned char *data;
-     int cnt;
+encrypt_is (unsigned char *data, int cnt)
 {
   Encryptions *ep;
-  register int type, ret;
+  int type, ret;
 
   if (--cnt < 0)
     return;
@@ -617,9 +575,7 @@ encrypt_is (data, cnt)
 		(ret == 0) ? "SUCCESS " : "MORE_TO_DO ", ret);
     }
   if (ret < 0)
-    {
-      autodecrypt = 0;
-    }
+    autodecrypt = 0;
   else
     {
       decrypt_mode = type;
@@ -629,12 +585,10 @@ encrypt_is (data, cnt)
 }
 
 void
-encrypt_reply (data, cnt)
-     unsigned char *data;
-     int cnt;
+encrypt_reply (unsigned char *data, int cnt)
 {
   Encryptions *ep;
-  register int ret, type;
+  int ret, type;
 
   if (--cnt < 0)
     return;
@@ -669,9 +623,7 @@ encrypt_reply (data, cnt)
   if (encrypt_debug_mode)
     printf (">>>%s: encrypt_reply returned %d\n", Name, ret);
   if (ret < 0)
-    {
-      autoencrypt = 0;
-    }
+    autoencrypt = 0;
   else
     {
       encrypt_mode = type;
@@ -684,9 +636,7 @@ encrypt_reply (data, cnt)
  * Called when a ENCRYPT START command is received.
  */
 void
-encrypt_start (data, cnt)
-     unsigned char *data;
-     int cnt;
+encrypt_start (unsigned char *data, int cnt)
 {
   Encryptions *ep;
 
@@ -724,9 +674,7 @@ encrypt_start (data, cnt)
 }
 
 void
-encrypt_session_key (key, server)
-     Session_Key *key;
-     int server;
+encrypt_session_key (Session_Key *key, int server)
 {
   Encryptions *ep = encryptions;
 
@@ -744,7 +692,7 @@ encrypt_session_key (key, server)
  * Called when ENCRYPT END is received.
  */
 void
-encrypt_end ()
+encrypt_end (void)
 {
   decrypt_input = 0;
   if (encrypt_debug_mode)
@@ -757,7 +705,7 @@ encrypt_end ()
  * Called when ENCRYPT REQUEST-END is received.
  */
 void
-encrypt_request_end ()
+encrypt_request_end (void)
 {
   encrypt_send_end ();
 }
@@ -769,9 +717,7 @@ encrypt_request_end ()
  * can.
  */
 void
-encrypt_request_start (data, cnt)
-     unsigned char *data;
-     int cnt;
+encrypt_request_start (unsigned char *data, int cnt)
 {
   if (encrypt_mode == 0)
     {
@@ -786,15 +732,12 @@ static unsigned char str_keyid[(MAXKEYLEN * 2) + 5] =
   { IAC, SB, TELOPT_ENCRYPT };
 
 static void
-encrypt_keyid (kp, keyid, len)
-     struct key_info *kp;
-     unsigned char *keyid;
-     int len;
+encrypt_keyid (struct key_info *kp, unsigned char *keyid, int len)
 {
   Encryptions *ep;
   unsigned char *strp, *cp;
   int dir = kp->dir;
-  register int ret = 0;
+  int ret = 0;
 
   if (len > MAXKEYLEN)
     len = MAXKEYLEN;
@@ -840,27 +783,19 @@ encrypt_keyid (kp, keyid, len)
 }
 
 void
-encrypt_enc_keyid (keyid, len)
-     unsigned char *keyid;
-     int len;
+encrypt_enc_keyid (unsigned char *keyid, int len)
 {
   encrypt_keyid (&ki[1], keyid, len);
 }
 
 void
-encrypt_dec_keyid (keyid, len)
-     unsigned char *keyid;
-     int len;
+encrypt_dec_keyid (unsigned char *keyid, int len)
 {
   encrypt_keyid (&ki[0], keyid, len);
 }
 
 void
-encrypt_send_keyid (dir, keyid, keylen, saveit)
-     int dir;
-     unsigned char *keyid;
-     int keylen;
-     int saveit;
+encrypt_send_keyid (int dir, unsigned char *keyid, int keylen, int saveit)
 {
   unsigned char *strp;
 
@@ -884,8 +819,7 @@ encrypt_send_keyid (dir, keyid, keylen, saveit)
 }
 
 void
-encrypt_auto (on)
-     int on;
+encrypt_auto (int on)
 {
   if (on < 0)
     autoencrypt ^= 1;
@@ -894,8 +828,7 @@ encrypt_auto (on)
 }
 
 void
-decrypt_auto (on)
-     int on;
+decrypt_auto (int on)
 {
   if (on < 0)
     autodecrypt ^= 1;
@@ -904,12 +837,11 @@ decrypt_auto (on)
 }
 
 void
-encrypt_start_output (type)
-     int type;
+encrypt_start_output (int type)
 {
   Encryptions *ep;
-  register unsigned char *p;
-  register int i;
+  unsigned char *p;
+  int i;
 
   if (!(ep = findencryption (type)))
     {
@@ -964,7 +896,7 @@ encrypt_start_output (type)
 }
 
 void
-encrypt_send_end ()
+encrypt_send_end (void)
 {
   if (!encrypt_output)
     return;
@@ -985,10 +917,10 @@ encrypt_send_end ()
 }
 
 void
-encrypt_send_request_start ()
+encrypt_send_request_start (void)
 {
-  register unsigned char *p;
-  register int i;
+  unsigned char *p;
+  int i;
 
   p = &str_start[3];
   *p++ = ENCRYPT_REQSTART;
@@ -1006,7 +938,7 @@ encrypt_send_request_start ()
 }
 
 void
-encrypt_send_request_end ()
+encrypt_send_request_end (void)
 {
   str_end[3] = ENCRYPT_REQEND;
   net_write (str_end, sizeof (str_end));
@@ -1017,9 +949,9 @@ encrypt_send_request_end ()
 }
 
 void
-encrypt_wait ()
+encrypt_wait (void)
 {
-  register int encrypt, decrypt;
+  int encrypt, decrypt;
   if (encrypt_debug_mode)
     printf (">>>%s: in encrypt_wait\r\n", Name);
   if (!havesessionkey || !(I_SUPPORT_ENCRYPT & remote_supports_decrypt))
@@ -1030,16 +962,14 @@ encrypt_wait ()
 }
 
 void
-encrypt_debug (mode)
-     int mode;
+encrypt_debug (int mode)
 {
   encrypt_debug_mode = mode;
 }
 
 void
-encrypt_gen_printsub (data, cnt, buf, buflen)
-     unsigned char *data, *buf;
-     int cnt, buflen;
+encrypt_gen_printsub (unsigned char *data, unsigned char *buf,
+		      int cnt, int buflen)
 {
   char tbuf[16], *cp;
 
@@ -1060,12 +990,11 @@ encrypt_gen_printsub (data, cnt, buf, buflen)
 }
 
 void
-encrypt_printsub (data, cnt, buf, buflen)
-     unsigned char *data, *buf;
-     int cnt, buflen;
+encrypt_printsub (unsigned char *data, unsigned char *buf,
+		  int cnt, int buflen)
 {
   Encryptions *ep;
-  register int type = data[1];
+  int type = data[1];
 
   for (ep = encryptions; ep->type && ep->type != type; ep++)
     ;

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


commit 665f1e73cdd9b38e2d2e11b8db9958a315935592
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Sun Dec 25 13:11:52 2011 +0100

    libtelnet/encrypt.c (encrypt_keyid): Make sure that LEN never is greater than MAXKEYLEN.

diff --git a/ChangeLog b/ChangeLog
index dd381d1..f4e4457 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-25  Alfred M. Szmidt  <ams@gnu.org>
+
+	* libtelnet/encrypt.c (encrypt_keyid): Make sure that LEN never is
+	greater than MAXKEYLEN.
+
 2011-12-22  Mats Erik Andersson <gnu@gisladisker.se>
 
 	* libinetutils/setsig.c (setsig) [HAVE_SIGACTION]: Initialize
diff --git a/libtelnet/encrypt.c b/libtelnet/encrypt.c
index 06827d9..abfa6d4 100644
--- a/libtelnet/encrypt.c
+++ b/libtelnet/encrypt.c
@@ -796,6 +796,9 @@ encrypt_keyid (kp, keyid, len)
   int dir = kp->dir;
   register int ret = 0;
 
+  if (len > MAXKEYLEN)
+    len = MAXKEYLEN;
+
   if (!(ep = (*kp->getcrypt) (*kp->modep)))
     {
       if (len == 0)

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

Summary of changes:
 ChangeLog           |   14 +++
 libtelnet/encrypt.c |  274 +++++++++++++++++++--------------------------------
 2 files changed, 117 insertions(+), 171 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Sun Dec 25 07:30:32 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RenDk-0002GM-La
	for mharc-commit-inetutils@gnu.org; Sun, 25 Dec 2011 07:30:32 -0500
Received: from eggs.gnu.org ([140.186.70.92]:42795)
	by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1RenDi-0002GF-TP
	for commit-inetutils@gnu.org; Sun, 25 Dec 2011 07:30:31 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ams@gnu.org>) id 1RenDh-00017C-Fj
	for commit-inetutils@gnu.org; Sun, 25 Dec 2011 07:30:30 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:40151)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1RenDh-000178-Cx
	for commit-inetutils@gnu.org; Sun, 25 Dec 2011 07:30:29 -0500
Received: from ams by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <ams@gnu.org>) id 1RenDg-0003Mc-6e
	for commit-inetutils@gnu.org; Sun, 25 Dec 2011 12:30:29 +0000
Date: Sun, 25 Dec 2011 12:30:28 +0000
Message-Id: <E1RenDg-0003Mc-6e@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-206-g1f40280
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 0db09b449c8a03807a91ddc51abf7368bcc46d3b
X-Git-Newrev: 1f40280ae3dd4096daa3ad86044bb65ac8a21194
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.72
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, 25 Dec 2011 12:30:32 -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  1f40280ae3dd4096daa3ad86044bb65ac8a21194 (commit)
      from  0db09b449c8a03807a91ddc51abf7368bcc46d3b (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=1f40280ae3dd4096daa3ad86044bb65ac8a21194


commit 1f40280ae3dd4096daa3ad86044bb65ac8a21194
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Sun Dec 25 13:29:54 2011 +0100

    Fix typo in previous change.  (silent change)

diff --git a/libtelnet/encrypt.c b/libtelnet/encrypt.c
index 1f2bb97..69e3465 100644
--- a/libtelnet/encrypt.c
+++ b/libtelnet/encrypt.c
@@ -229,7 +229,7 @@ encrypt_list_types (void)
 }
 
 int
-EncryptEnable (char *type, *mode)
+EncryptEnable (char *type, char *mode)
 {
   if (isprefix (type, "help") || isprefix (type, "?"))
     {
@@ -243,7 +243,7 @@ EncryptEnable (char *type, *mode)
 }
 
 int
-EncryptDisable (char *type, *mode)
+EncryptDisable (char *type, char *mode)
 {
   Encryptions *ep;
   int ret = 0;

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

Summary of changes:
 libtelnet/encrypt.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Fri Dec 30 05:00:41 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RgZGT-0005LX-Dg
	for mharc-commit-inetutils@gnu.org; Fri, 30 Dec 2011 05:00:41 -0500
Received: from eggs.gnu.org ([140.186.70.92]:44261)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RgZGQ-0005LF-8c
	for commit-inetutils@gnu.org; Fri, 30 Dec 2011 05:00:39 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RgZGO-0002UJ-QO
	for commit-inetutils@gnu.org; Fri, 30 Dec 2011 05:00:38 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:50170)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RgZGO-0002UF-OZ
	for commit-inetutils@gnu.org; Fri, 30 Dec 2011 05:00:36 -0500
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1RgZGJ-0007sn-JZ
	for commit-inetutils@gnu.org; Fri, 30 Dec 2011 10:00:34 +0000
Date: Fri, 30 Dec 2011 10:00:31 +0000
Message-Id: <E1RgZGJ-0007sn-JZ@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-207-g4a11f3a
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 1f40280ae3dd4096daa3ad86044bb65ac8a21194
X-Git-Newrev: 4a11f3a095f23a28b7ab2ee3f81fdfc6d2bf5fd5
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.72
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: Fri, 30 Dec 2011 10:00:39 -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  4a11f3a095f23a28b7ab2ee3f81fdfc6d2bf5fd5 (commit)
      from  1f40280ae3dd4096daa3ad86044bb65ac8a21194 (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=4a11f3a095f23a28b7ab2ee3f81fdfc6d2bf5fd5


commit 4a11f3a095f23a28b7ab2ee3f81fdfc6d2bf5fd5
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Fri Dec 30 10:58:18 2011 +0100

    ftp,ftpd,rcp: Portable format string for long long.

diff --git a/ChangeLog b/ChangeLog
index db6610a..2b0c970 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-12-30  Mats Erik Andersson <gnu@gisladisker.se>
+
+	* ftp/cmds.c (restart): Use `%lld' as format for long long int.
+	* ftpd/ftpcmd.y (rcmd,sizecmd): Likewise; also `%llu'.
+	* ftpd/ftpd.c (off_to_str): Likewise.
+	* src/rcp.c (source): Likewise.
+
 2011-12-25  Alfred M. Szmidt  <ams@gnu.org>
 
 	* libtelnet/encrypt.c: Fix indentation, and Use ANSI style
diff --git a/ftp/cmds.c b/ftp/cmds.c
index 9ecb408..260cfd0 100644
--- a/ftp/cmds.c
+++ b/ftp/cmds.c
@@ -2364,7 +2364,7 @@ restart (int argc, char **argv)
     {
       restart_point = atol (argv[1]);
       printf ((sizeof (restart_point) > sizeof (long)
-	       ? "restarting at %qd. %s\n"
+	       ? "restarting at %lld. %s\n"
 	       : "restarting at %ld. %s\n"), restart_point,
 	      "execute get, put or append to initiate transfer");
     }
diff --git a/ftpd/ftpcmd.y b/ftpd/ftpcmd.y
index ecb392c..a9cce3a 100644
--- a/ftpd/ftpcmd.y
+++ b/ftpd/ftpcmd.y
@@ -582,7 +582,7 @@ rcmd
 			restart_point = $3;	/* XXX $3 is only "int" */
 			reply(350,
 			      (sizeof(restart_point) > sizeof(long)
-			       ? "Restarting at %qd. %s"
+			       ? "Restarting at %lld. %s"
 			       : "Restarting at %ld. %s"), restart_point,
 			    "Send STORE or RETRIEVE to initiate transfer.");
 		}
@@ -1276,7 +1276,7 @@ sizecmd(char *filename)
 		else
 			reply(213,
 			      (sizeof (stbuf.st_size) > sizeof(long)
-			       ? "%qu" : "%lu"), stbuf.st_size);
+			       ? "%llu" : "%lu"), stbuf.st_size);
 		break; }
 	case TYPE_A: {
 		FILE *fin;
@@ -1302,7 +1302,7 @@ sizecmd(char *filename)
 		}
 		 fclose(fin);
 
-		reply(213, sizeof(count) > sizeof(long) ? "%qd" : "%ld",
+		reply(213, sizeof(count) > sizeof(long) ? "%lld" : "%ld",
 		      count);
 		break; }
 	default:
diff --git a/ftpd/ftpd.c b/ftpd/ftpd.c
index e4e7b2b..0cce865 100644
--- a/ftpd/ftpd.c
+++ b/ftpd/ftpd.c
@@ -182,7 +182,7 @@ off_to_str (off_t off)
     next_buf = bufs;
 
   if (sizeof (off) > sizeof (long))
-    sprintf (*next_buf, "%qd", (long long int) off);
+    sprintf (*next_buf, "%lld", (long long int) off);
   else if (sizeof (off) == sizeof (long))
     sprintf (*next_buf, "%ld", off);
   else
diff --git a/src/rcp.c b/src/rcp.c
index b4801b4..3d54fc6 100644
--- a/src/rcp.c
+++ b/src/rcp.c
@@ -588,7 +588,7 @@ source (int argc, char *argv[])
 #define RCP_MODEMASK	(S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO)
       snprintf (buf, sizeof buf,
 		(sizeof (stb.st_size) > sizeof (long)
-		 ? "C%04o %qd %s\n"
+		 ? "C%04o %lld %s\n"
 		 : "C%04o %ld %s\n"),
 		stb.st_mode & RCP_MODEMASK, stb.st_size, last);
       write (rem, buf, strlen (buf));

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

Summary of changes:
 ChangeLog     |    7 +++++++
 ftp/cmds.c    |    2 +-
 ftpd/ftpcmd.y |    6 +++---
 ftpd/ftpd.c   |    2 +-
 src/rcp.c     |    2 +-
 5 files changed, 13 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Fri Dec 30 12:04:26 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RgfsY-0003h7-DA
	for mharc-commit-inetutils@gnu.org; Fri, 30 Dec 2011 12:04:26 -0500
Received: from eggs.gnu.org ([140.186.70.92]:43466)
	by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1RgfsD-0003gM-4z
	for commit-inetutils@gnu.org; Fri, 30 Dec 2011 12:04:22 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ams@gnu.org>) id 1Rgfrt-0004Iu-GT
	for commit-inetutils@gnu.org; Fri, 30 Dec 2011 12:04:05 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:36157)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1Rgfrt-0004Iq-8N
	for commit-inetutils@gnu.org; Fri, 30 Dec 2011 12:03:45 -0500
Received: from ams by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <ams@gnu.org>) id 1Rgfrq-0003iq-TY
	for commit-inetutils@gnu.org; Fri, 30 Dec 2011 17:03:44 +0000
Date: Fri, 30 Dec 2011 17:03:43 +0000
Message-Id: <E1Rgfrq-0003iq-TY@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-210-g7715cda
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 4a11f3a095f23a28b7ab2ee3f81fdfc6d2bf5fd5
X-Git-Newrev: 7715cda342f7c93cd21ef7627428de39fbf44e59
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.72
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: Fri, 30 Dec 2011 17:04:22 -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  7715cda342f7c93cd21ef7627428de39fbf44e59 (commit)
       via  6a5696aea571be5af07d9178796e6ff6c5a3c3e5 (commit)
       via  a173748fb67c6871522857372574da4311dc0145 (commit)
      from  4a11f3a095f23a28b7ab2ee3f81fdfc6d2bf5fd5 (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=7715cda342f7c93cd21ef7627428de39fbf44e59


commit 7715cda342f7c93cd21ef7627428de39fbf44e59
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Fri Dec 30 18:03:05 2011 +0100

    NEWS: Formating.  (silent change)

diff --git a/NEWS b/NEWS
index 306ce33..c6a7520 100644
--- a/NEWS
+++ b/NEWS
@@ -17,13 +17,13 @@ Support is still new, so please report any bugs to
 
 * ftp, tftp, tftpd
 
-Handle IPv6 connections.  (Ftpd is IPv4-only until next release.)
+Handle IPv6 connections.  ftpd is still IPv4-only until next release.
 
 * syslogd, logger
 
-Handle IPv6 connections.  The server can forward messages
-without using a listening INET socket.  It can also bind
-to a single INET/INET6 address.
+Handle IPv6 connections.  The server can forward messages without
+using a listening INET socket.  It can also bind to a single
+INET/INET6 address.
 
 * rlogind, rshd
 
@@ -35,7 +35,8 @@ http://www.citi.umich.edu/u/provos/papers/secnet-spoof.txt
 
 * ifconfig
 
-Now under GNU/Linux "ifconfig -a" shows also interfaces without an address.
+Now under GNU/Linux "ifconfig -a" shows also interfaces without an
+address.
 
 Adjusted output formating for "unix".
 

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


commit 6a5696aea571be5af07d9178796e6ff6c5a3c3e5
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Fri Dec 30 18:01:57 2011 +0100

    ChangeLog: Beutify.  (silent change)

diff --git a/ChangeLog b/ChangeLog
index 243161a..b294c71 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,7 +6,7 @@
 2011-12-30  Mats Erik Andersson <gnu@gisladisker.se>
 
 	* ftp/cmds.c (restart): Use `%lld' as format for long long int.
-	* ftpd/ftpcmd.y (rcmd,sizecmd): Likewise; also `%llu'.
+	* ftpd/ftpcmd.y (rcmd, sizecmd): Likewise; also `%llu'.
 	* ftpd/ftpd.c (off_to_str): Likewise.
 	* src/rcp.c (source): Likewise.
 
@@ -34,23 +34,24 @@
 	(setsignal): New variable OSIGS, likewise.
 	(done): Use waitpid() instead of wait().
 	(catch_child): Detect errno equal to EINTR.
-	(doit,lostpeer): Let exit messages explain better.  Add host
-	name to them, and append CR for correct printout.
+	(doit, lostpeer): Let exit messages explain better.  Add host name
+	to them, and append CR for correct printout.
 
 2011-12-22  Mats Erik Andersson <gnu@gisladisker.se>
 
-	* libinetutils/setsig.c (setsig) [HAVE_SIGACTION]: New variable OSA.
-	Superpose SA_RESTART on SA_FLAGS, no replacement!  Use OSA for old
-	signal mask in calling sigaction.  Return SIG_ERR on error, or fetch
-	old signal handler from OSA upon success.
-	[HAVE_SIGVEC]: Likewise:  New variable OSV.  Use OSV in call to sigvec.
-	Return SIG_ERR on error, or old handler brought in from OSV.
+	* libinetutils/setsig.c (setsig) [HAVE_SIGACTION]: New variable
+	OSA.  Superpose SA_RESTART on SA_FLAGS, no replacement!  Use OSA
+	for old signal mask in calling sigaction.  Return SIG_ERR on
+	error, or fetch old signal handler from OSA upon success.
+	[HAVE_SIGVEC]: Likewise: New variable OSV.  Use OSV in call to
+	sigvec.  Return SIG_ERR on error, or old handler brought in from
+	OSV.
 
 2011-12-20  Mats Erik Andersson <gnu@gisladisker.se>
 
-	* src/rlogind.c (rlogind_auth) [IP_OPTIONS]: Abort connection as soon
-	either of IPOPT_SSRR or IPOPT_LSRR is found.  Other options are recorded,
-	and reported, but immediately erased.
+	* src/rlogind.c (rlogind_auth) [IP_OPTIONS]: Abort connection as
+	soon either of IPOPT_SSRR or IPOPT_LSRR is found.  Other options
+	are recorded, and reported, but immediately erased.
 	* src/rshd.c (doit) [IP_OPTIONS]: Likewise.
 	[HAVE_NETINET_IN_SYSTM_H]: Include <netinet/in_systm.h>.
 	[HAVE_NETINET_IP_H]: Include <netinet/ip.h>.
@@ -60,11 +61,11 @@
 2011-12-19  Mats Erik Andersson <gnu@gisladisker.se>
 
 	* src/rcp.c (main) [!KERBEROS]: Exit at non-zero geteuid().
-	(toremote): After setting IPTOS_THROUGHPUT, print warning
-	only for ERRNO not equal to ENOPROTOOPT.
+	(toremote): After setting IPTOS_THROUGHPUT, print warning only for
+	ERRNO not equal to ENOPROTOOPT.
 	(tolocal): Likewise.
-	* src/rshd.c (doit): Remove misplaced syslog message.
-	Improve comments on port usage.
+	* src/rshd.c (doit): Remove misplaced syslog message.  Improve
+	comments on port usage.
 
 2011-12-13  Alfred M. Szmidt  <ams@gnu.org>
 
@@ -77,11 +78,11 @@
 
 2011-12-13  Mats Erik Andersson <gnu@gisladisker.se>
 
-	* am/libcurses.m4 (IU_LIB_TERMCAP): Check libtermcap before libcurses.
-	New macros HAVE_TGETENT, HAVE_TERMCAP_TGETENT, HAVE_CURSES_TGETENT,
-	and HAVE_TERMINFO_TGETENT.
-	* am/readline.m4 (gl_FUNC_READLINE): In case libreadline is absent,
-	check whether libedit is present and suffices.
+	* am/libcurses.m4 (IU_LIB_TERMCAP): Check libtermcap before
+	libcurses.  New macros HAVE_TGETENT, HAVE_TERMCAP_TGETENT,
+	HAVE_CURSES_TGETENT, and HAVE_TERMINFO_TGETENT.
+	* am/readline.m4 (gl_FUNC_READLINE): In case libreadline is
+	absent, check whether libedit is present and suffices.
 	* telnet/telnet.c [HAVE_TERMCAP_TGETENT]: Include <termcap.h>.
 	[HAVE_CURSES_TGETENT]: Include <curses.h> and <term.h>.
 	(init_term) [HAVE_TGETENT]: Replace HAVE_READLINE by HAVE_TGETENT.
@@ -103,7 +104,7 @@
 	* tests/ftp-localhost.sh: Use strict IPv4 options for portability.
 	* configure.ac: Check for iruserok.  Disable building of rshd and
 	rlogind if it is missing.
-	* NEWS,TODO: Updated.
+	* NEWS, TODO: Updated.
 
 2011-12-11  Mats Erik Andersson <gnu@gisladisker.se>
 
@@ -120,8 +121,9 @@
 
 	* telnet/Makefile.am (INCLUDES): Add $(NCURSES_INCLUDE) to list.
 	* telnetd/Makefile.am: Likewise.
-	* telnetd/utility.c (readstream) [HAVE_STREAMSPTY && HAVE_TERMIO_H]:
-	Make use of `struct termio' conditioned on HAVE_TERMIO_H.
+	* telnetd/utility.c (readstream) [HAVE_STREAMSPTY &&
+	HAVE_TERMIO_H]: Make use of `struct termio' conditioned on
+	HAVE_TERMIO_H.
 
 2011-12-03  Mats Erik Andersson <gnu@gisladisker.se>
 
@@ -139,8 +141,8 @@
 
 2011-12-02  Mats Erik Andersson <gnu@gisladisker.se>
 
-	* configure.ac: Check for external declarations of `telcmds'
-	and `telopts'.  Define UTMPX for NetBSD.
+	* configure.ac: Check for external declarations of `telcmds' and
+	`telopts'.  Define UTMPX for NetBSD.
 	* telnet/commands.c (send_tncmd) [!HAVE_DECL_TELOPTS]: Make the
 	external declaration conditional.
 	[HAVE_DECL_TELOPTS]: Enforce a cast `char **' on system's TELOPTS.
@@ -158,14 +160,16 @@
 
 	OpenBSD 4.9 has changed <syslog.h>.  Relax configuration.
 
-	* configure.ac (syslog internal macros): Remove check of LOG_MAKEPRI.
+	* configure.ac (syslog internal macros): Remove check of
+	LOG_MAKEPRI.
 	* src/syslogd.c (LOG_MAKEPRI) [!LOG_MAKEPRI]: New macro.
 
 2011-11-29  Alfred M. Szmidt  <ams@gnu.org>
 
 	Basic test case for `hostname'.
 
-	* tests/Makefile.am (dist_check_SCRIPTS) [ENABLE_hostname]: Added hostname.sh.
+	* tests/Makefile.am (dist_check_SCRIPTS) [ENABLE_hostname]: Added
+	hostname.sh.
 	* tests/hostname.sh: New file.
 
 2011-11-29  Alfred M. Szmidt  <ams@gnu.org>
@@ -183,28 +187,28 @@
 
 2011-11-29  Giuseppe Scrivano  <gscrivano@gnu.org>
 
-	* tests/syslogd.sh: Use 127.0.0.1 and [::1] instead of localhost as
-	arguments to logger.
+	* tests/syslogd.sh: Use 127.0.0.1 and [::1] instead of localhost
+	as arguments to logger.
 
 2011-11-29  Mats Erik Andersson <gnu@gisladisker.se>
 
-	* whois/make_ip_del.pl: Compute netmasks correctly
-	also with 64-bit arithmetic.
+	* whois/make_ip_del.pl: Compute netmasks correctly also with
+	64-bit arithmetic.
 
 2011-11-26  Mats Erik Andersson <gnu@gisladisker.se>
 
 	* tests/tftp.sh: Return skip code if INET port is already in use.
-	* tests/syslogd.sh: Likewise. Implement the corresponding test.
+	* tests/syslogd.sh: Likewise.  Implement the corresponding test.
 	(PORT, PROTO): New variables.
 
 2011-11-26  Mats Erik Andersson <gnu@gisladisker.se>
 
-	* tests/tftp.sh (INETD_PID): New variable; allows better robustness.
-	Improve patterns to fit also BSD.
+	* tests/tftp.sh (INETD_PID): New variable; allows better
+	robustness.  Improve patterns to fit also BSD.
 
 2011-11-26  Mats Erik Andersson <gnu@gisladisker.se>
 
-	* configure.ac: Check presence of <protocols/talkd.h>. Disable
+	* configure.ac: Check presence of <protocols/talkd.h>.  Disable
 	building of `talk' and `talkd' if it is missing.
 	* ftpd/Makefile.am (ftpd_SOURCES): Exclude unused `logwtmp.c'.
 	* libinetutils/logwtmpko.c [HAVE_UTMPX_H && SOLARIS]: Include
@@ -220,8 +224,8 @@
 
 2011-11-21  Mats Erik Andersson <gnu@gisladisker.se>
 
-	* telnetd/telnetd.c (login_invocation) [SOLARIS]: Changes for terminal
-	and user name.
+	* telnetd/telnetd.c (login_invocation) [SOLARIS]: Changes for
+	terminal and user name.
 	* TODO: Updated.
 
 2011-11-21  Mats Erik Andersson <gnu@gisladisker.se>
@@ -297,8 +301,10 @@
 
 	* telnet/telnet.c [HAVE_LIBREADLINE]: Include <curses.h>.
 	* telnetd/utility.c [HAVE_LIBREADLINE]: Likewise.
-	[HAVE_STREAMSPTY && HAVE_GETMSG && HAVE_STROPTS_H]: Include <stropts.h>.
-	* telnetd/state.c [HAVE_STREAMSPTY && TIOCSIGNAL && HAVE_STROPTS_H]: Likewise.
+	[HAVE_STREAMSPTY && HAVE_GETMSG && HAVE_STROPTS_H]: Include
+	<stropts.h>.
+	* telnetd/state.c [HAVE_STREAMSPTY && TIOCSIGNAL &&
+	HAVE_STROPTS_H]: Likewise.
 	(NTELOPTS) [!NTELOPTS]: New macro.
 
 2011-11-14  Simon Josefsson  <simon@josefsson.org>
@@ -339,11 +345,11 @@
 
 2011-11-09  Mats Erik Andersson <gnu@gisladisker.se>
 
-	* src/syslogd.c (create_unix_socket): Avoid buffer
-	overrun for very long UNIX socket names.  Return proper
-	error codes also when bind() or chmod() fail.
-	* tests/syslogd.sh: Implement tests for the boundary
-	cases of very long UNIX socket names.
+	* src/syslogd.c (create_unix_socket): Avoid buffer overrun for
+	very long UNIX socket names.  Return proper error codes also when
+	bind() or chmod() fail.
+	* tests/syslogd.sh: Implement tests for the boundary cases of very
+	long UNIX socket names.
 
 2011-10-31  Simon Josefsson  <simon@josefsson.org>
 
@@ -368,23 +374,23 @@
 	(peerlen): New variable.
 	(port): Changed to use host byte order.
 	(get_port, set_port): New functions.
-	(main): Remove SIN. Do not initiate F as a socket.
-	(resolve_name): New signature `int r_n (char *)'.
-	Remove unused return state RESOLVE_NOT_RESOLVED.  Replace use
-	of gethostbyname() by code based on getaddrinfo().
+	(main): Remove SIN.  Do not initiate F as a socket.
+	(resolve_name): New signature `int r_n (char *)'.  Remove unused
+	return state RESOLVE_NOT_RESOLVED.  Replace use of gethostbyname()
+	by code based on getaddrinfo().
 	(setpeer): Simplifications brought in by resolve_name() and PORT.
-	(put): Handle square bracket escaping of host address.
-	Use new function set_port().
+	(put): Handle square bracket escaping of host address.  Use new
+	function set_port().
 	(get): Likewise.
-	(send_file): Change FROM to be `struct sockaddr_storage'.
-	Use PEERLEN in sendto().  Use set_port() and get_port().
+	(send_file): Change FROM to be `struct sockaddr_storage'.  Use
+	PEERLEN in sendto().  Use set_port() and get_port().
 	(recvfile): Likewise.
 	(nak): Use PEERLEN in sendto().
 	* doc/inetutils.texi (tftp): Mention escaping of IPv6 addresses.
 
 2011-10-29  Mats Erik Andersson <gnu@gisladisker.se>
 
-	* src/tftp.c (main): New variable SP. Set default value for PORT.
+	* src/tftp.c (main): New variable SP.  Set default value for PORT.
 
 2011-10-28  Simon Josefsson  <simon@josefsson.org>
 
@@ -393,17 +399,18 @@
 
 2011-10-27  Mats Erik Andersson <gnu@gisladisker.se>
 
-	* src/tftpd.c (main) [HAVE_STRUCT_SOCKADDR_SA_LEN]: Assign
-	value to `sin.ss_len'.
+	* src/tftpd.c (main) [HAVE_STRUCT_SOCKADDR_SA_LEN]: Assign value
+	to `sin.ss_len'.
 	(main): Do not use connect() on the socket.
 	(send_file, recvfile, nak): Replace send() by sendto().
 
 2011-10-27  Mats Erik Andersson <gnu@gisladisker.se>
 
-	* configure.ac (HAVE_STRUCT_TFTPHDR_TH_U): Detect whether
-	`struct tftphdr' contains a member `th_u'.
+	* configure.ac (HAVE_STRUCT_TFTPHDR_TH_U): Detect whether `struct
+	tftphdr' contains a member `th_u'.
 	* src/tftp.c (makerequest, tpacket) [HAVE_STRUCT_TFTPHDR_TH_U]:
-	Use pointer variable `tp->th_stuff', or generate a correct pointer.
+	Use pointer variable `tp->th_stuff', or generate a correct
+	pointer.
 	* src/tftpd.c (tftp) [HAVE_STRUCT_TFTPHDR_TH_U]: Likewise.
 
 2011-10-27  Alfred M. Szmidt  <ams@gnu.org>
@@ -444,10 +451,12 @@
 	* talk/Makefile.am (INCLUDES, LDADD): Likewise.
 
 	* telnetd/Makefile.am (INCLUDES): Use $(iu_INCLUDES).
-	(LDADD): Use $(iu_LIBRARIES) and explicitly use static version of libtelnet.
+	(LDADD): Use $(iu_LIBRARIES) and explicitly use static version of
+	libtelnet.
 	* telnet/Makefile.am (INCLUDES, LDADD): Likewise.
 	* src/Makefile.am (INCLUDES): Use $(iu_INCLUDES).
-	(LDADD): Use $(iu_LIBRARIES) and explicitly use static version of libicmp.
+	(LDADD): Use $(iu_LIBRARIES) and explicitly use static version of
+	libicmp.
 	* ping/Makefile.am (ping_LDADD): Use $(iu_LIBRARIES) and
 	explicitly use static version of libicmp.
 	(INCLUDES, ping6_LDADD): Use $(iu_INCLUDES) and $(iu_LIBRARIES),
@@ -455,7 +464,8 @@
 
 	* libtelnet/Makefile.am (INCLUDES): Use $(iu_INCLUDES).
 	* libls/Makefile.am (INCLUDES): Likewise.
-	* libinetutils/Makefile.am (libinetutils_a_LIBADD): Variable removed.
+	* libinetutils/Makefile.am (libinetutils_a_LIBADD): Variable
+	removed.
 	(INCLUDES): Use $(iu_INCLUDES).
 
 2011-10-25  Alfred M. Szmidt  <ams@gnu.org>
@@ -498,7 +508,8 @@
 
 2011-10-21  Alfred M. Szmidt  <ams@gnu.org>
 
-	* libinetutils/tftpsubs.c (PKTSIZE) [PKTSIZE]: Only define PKTSIZE if needed.
+	* libinetutils/tftpsubs.c (PKTSIZE) [PKTSIZE]: Only define PKTSIZE
+	if needed.
 	* src/tftp.c, src/tftpd.c: Likewise.
 
 2011-10-19  Alfred M. Szmidt  <ams@gnu.org>
@@ -509,7 +520,7 @@
 2011-10-15  Alfred M. Szmidt  <ams@gnu.org>
 
 	* .gitignore (gnulib, gnulib/, .sc-start-sc_bindtextdomain)
-	(.sc-start-sc_prohibit_have_config_h,lib/, !lib/Makefile.am):
+	(.sc-start-sc_prohibit_have_config_h, lib/, !lib/Makefile.am):
 	Added to list.
 
 2011-10-15  Alfred M. Szmidt  <ams@gnu.org>
@@ -519,7 +530,8 @@
 	* src/syslogd.c (init): Removed redundant if statment before free
 	call (was reintroduced 2011-06-20).
 	* libicmp/icmp_timestamp.c: Don't include <stddef.h>.
-	* src/syslogd.c (cfline): Removed redundant parentehsis around macros.
+	* src/syslogd.c (cfline): Removed redundant parentehsis around
+	macros.
 
 2011-10-15  Alfred M. Szmidt  <ams@gnu.org>
 
@@ -538,7 +550,7 @@
 	(parse_opt): Likewise.
 	(main): Adaptions to the vector `finet[2]'.
 	(create_inet_socket): New prototype `void c_i_s (int, int [2])'.
-	Separate address families. Use BINDADDRESS at resolve time.
+	Separate address families.  Use BINDADDRESS at resolve time.
 	(fprintlog): Temporary socket by family; use descriptor pointer.
 	(die): Close both internet sockets.
 	* doc/inetutils.texi (syslogd): Update capabilities and options
@@ -547,11 +559,11 @@
 
 2011-08-20  Mats Erik Andersson <gnu@gisladisker.se>
 
-	* src/logger.c (send_to_syslog, parse_opt) [LOG_PERROR]: Enclose every
-	reference to LOG_PERROR in a compiler conditional.
+	* src/logger.c (send_to_syslog, parse_opt) [LOG_PERROR]: Enclose
+	every reference to LOG_PERROR in a compiler conditional.
 	* src/logprio.h: New file.
-	* src/logger.c [!HAVE_SYSLOG_INTERNAL]: Include "logprio.h" instead of
-	the irregularly present <syslog-int.h>.
+	* src/logger.c [!HAVE_SYSLOG_INTERNAL]: Include "logprio.h"
+	instead of the irregularly present <syslog-int.h>.
 	* src/syslogd.c: Likewise.
 
 2011-08-20  Mats Erik Andersson <gnu@gisladisker.se>
@@ -561,8 +573,9 @@
 	* src/rexec.c: Include "minmax.h".
 	* libls/fts.c (fts_load): Replace `rindex' with `strrchr'.
 	* ping/ping_echo.c (ping_echo): Write non-empty error text.
-	* ping/ping6.c (parse_opt,ping_init): Likewise.
-	* ping/ping6.c [__sun__]: Define _XPG4_2 for access to `msg_control'.
+	* ping/ping6.c (parse_opt, ping_init): Likewise.
+	* ping/ping6.c [__sun__]: Define _XPG4_2 for access to
+	`msg_control'.
 
 2011-08-18  Mats Erik Andersson <gnu@gisladisker.se>
 
@@ -571,8 +584,8 @@
 
 2011-08-17  Giuseppe Scrivano  <gscrivano@gnu.org>
 
-	* bootstrap.conf (gnulib_modules): Use snippet/unused-parameter instead
-	of unused-parameter.  It tracks a gnulib change.
+	* bootstrap.conf (gnulib_modules): Use snippet/unused-parameter
+	instead of unused-parameter.  It tracks a gnulib change.
 
 2011-07-28  Mats Erik Andersson <gnu@gisladisker.se>
 
@@ -602,21 +615,21 @@
 
 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'.
+	* 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'.
+	(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.
+	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>
@@ -685,8 +698,8 @@
 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>.
+	* 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.
@@ -695,8 +708,8 @@
 
 2011-06-15  Mats Erik Andersson <gnu@gisladisker.se>
 
-	* src/syslogd.c (fprintlog): Sanity check on `f->f_prevhost'
-	to avoid deferencing NULL.
+	* 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 &&
@@ -750,19 +763,19 @@
 
 2011-05-06  Mats Erik Andersson <gnu@gisladisker.se>
 
-	* ftp/extern.h (setipany,setipv4,setipv6): New prototypes.
-	* ftp/cmdtab.c (ipanyhelp,ipv4help,ipv6help): New help texts.
+	* ftp/extern.h (setipany, setipv4, setipv6): New prototypes.
+	* ftp/cmdtab.c (ipanyhelp, ipv4help, ipv6help): New help texts.
 	(cmdtab): Register commands `ipany', `ipv4', and `ipv6'.
 	* ftp/cmds.c (status): Report address family.
-	(setipany,setipv4,setipv6): New functions.
+	(setipany, setipv4, setipv6): New functions.
 
 2011-05-06  Mats Erik Andersson <gnu@gisladisker.se>
 
-	* src/syslogd.c (fprintlog): Deallocate pointers F_HNAME or F_FNAME
-	when F_TYPE is invalidated as F_UNUSED.
+	* src/syslogd.c (fprintlog): Deallocate pointers F_HNAME or
+	F_FNAME when F_TYPE is invalidated as F_UNUSED.
 	(cfline): Likewise.
-	(init): Deallocate F_FNAME, F_HNAME, F_UNAMES, and F_PREVHOST before
-	reclaiming the pointer F.
+	(init): Deallocate F_FNAME, F_HNAME, F_UNAMES, and F_PREVHOST
+	before reclaiming the pointer F.
 
 2011-04-17  Mats Erik Andersson <gnu@gisladisker.se>
 
@@ -772,8 +785,8 @@
 	(main): Initialize USEFAMILY to `AF_UNSPEC`.
 	* ftp/ftp.c (hookup): Resolve addresses according to USEFAMILY.
 	Use macro AI_ADDRCONFIG only with family `AF_UNSPEC`.
-	(initconn): New IPv6 protocol methods `EPSV` and `LPSV`.
-	New variable DATA_ADDR_SA6.
+	(initconn): New IPv6 protocol methods `EPSV` and `LPSV`.  New
+	variable DATA_ADDR_SA6.
 	(initconn) [noport]: New IPv6 methods `EPRT` and `LPRT`.
 
 2011-04-08  Mats Erik Andersson <gnu@gisladisker.se>
@@ -786,21 +799,23 @@
 	* ftp/extern.h (setepsv4): New declaration.
 	* ftp/ftp_var.h (doepsv4): New variable.
 	* ftp/main.c (main): Initiate DOEPSV4 to `off`.
-	* ftp/ftp.c: Explicitly condition IP_TOS on address family AF_INET.
-	Replace `struct sockaddr_in` by `struct sockaddr_storage`. Always
-	use CTLADDRLEN when referencing address lengths.
+	* ftp/ftp.c: Explicitly condition IP_TOS on address family
+	AF_INET.  Replace `struct sockaddr_in` by `struct
+	sockaddr_storage`.  Always use CTLADDRLEN when referencing address
+	lengths.
 	(ctladdrlen, ia, portstr): New variables.
 	(FTP_CONNECT_TIMEOUT): New macro.
-	(hookup): Replace resolver `gethostbyname` by `getaddrinfo`.
-	A timed alarm interrupts any slow connection attempt.
+	(hookup): Replace resolver `gethostbyname` by `getaddrinfo`.  A
+	timed alarm interrupts any slow connection attempt.
 	(getreply): New server return codes for `LPSV` and `EPSV`.
 	(initconn): New protocol methods `EPSV` and `LPSV`.
-	(initconn) [noport]: Trivial switch statement on `AF_INET`.
-	New protocol methods `EPRT` and `LPRT`.
+	(initconn) [noport]: Trivial switch statement on `AF_INET`.  New
+	protocol methods `EPRT` and `LPRT`.
 
 2011-03-27  Mike Frysinger  <vapier@gentoo.org>
 
-	* configure.ac: Use AC_CANONICAL_HOST instead of AC_CANONICAL_SYSTEM.
+	* configure.ac: Use AC_CANONICAL_HOST instead of
+	AC_CANONICAL_SYSTEM.
 
 2011-03-27  Mike Frysinger  <vapier@gentoo.org>
 
@@ -823,10 +838,11 @@
 
 2011-01-25  Mats Erik Andersson <gnu@gisladisker.se>
 
-	* src/logger.c (host_family) [HAVE_DECL_GETADDRINFO]: New variable.
+	* src/logger.c (host_family) [HAVE_DECL_GETADDRINFO]: New
+	variable.
 	(struct logger_sockaddr) [HAVE_IPV6]: New component SINET6.
-	(open_socket) [HAVE_DECL_GETADDRINFO]: Implement new code based
-	on getaddrinfo.  Reorganize old handler of port specification.
+	(open_socket) [HAVE_DECL_GETADDRINFO]: Implement new code based on
+	getaddrinfo.  Reorganize old handler of port specification.
 	(argp_options): New options `--ipv4' and `--ipv6`.
 	(parse_opt): Implement parsing of new options.
 	* doc/inetutils.texi (logger): Describe implications of
@@ -838,14 +854,14 @@
 	(pid_file): New variable.
 	(argp_options): Add an option for replacing file name of PID file.
 	(parse_opt): Handle option `p'.
-	(main): Condition PID file use on PIDFILE_OPTION. Replace the
+	(main): Condition PID file use on PIDFILE_OPTION.  Replace the
 	macro PATH_INETDPID by variable PID_FILE.
 
 2010-12-21  Mats Erik Andersson <gnu@gisladisker.se>
 
 	* src/inetd.c (inetd_getaddrinfo): If IPV6, then add a flag
-	AI_NUMERICHOST if the node is a numeric address string.
-	New variable NUMERIC_ADDRESS.  Debug symbolic addresses.
+	AI_NUMERICHOST if the node is a numeric address string.  New
+	variable NUMERIC_ADDRESS.  Debug symbolic addresses.
 	(getconfigent): Replace `strchr' with `strrchr'.
 
 2010-12-21  Mats Erik Andersson <gnu@gisladisker.se>
@@ -859,24 +875,23 @@
 2010-12-21  Mats Erik Andersson <gnu@gisladisker.se>
 
 	* tests/addrpeek.c: New file.
-	* tests/Makefile.am: Register `addrpeek' using
-	`check_PROGRAMS', but conditioned on `ENABLE_inetd'.
+	* tests/Makefile.am: Register `addrpeek' using `check_PROGRAMS',
+	but conditioned on `ENABLE_inetd'.
 
 2010-12-21  Mats Erik Andersson <gnu@gisladisker.se>
 
-	* src/inetd.c (prepenv): New prototype:
-	`prepenv(int, struct sockaddr *, socklen_t)'.
-	(prepenv): Change type of IP to `char []' of fixed length.
-	Delete HOST.  New integer variable RET.
-	Make type of SA_SERVER depend on macro IPV6, either
-	`struct sockaddr_storage' or `struct sockaddr_in'.
-	(prepenv): Eliminate use of `inet_ntoa' and `gethostbyaddr'
-	by new calls to `getnameinfo', with and without restiction
-	to numeric results.  Debugging output for three select
-	environment variables.
+	* src/inetd.c (prepenv): New prototype: `prepenv(int, struct
+	sockaddr *, socklen_t)'.
+	(prepenv): Change type of IP to `char []' of fixed length.  Delete
+	HOST.  New integer variable RET.  Make type of SA_SERVER depend on
+	macro IPV6, either `struct sockaddr_storage' or `struct
+	sockaddr_in'.
+	(prepenv): Eliminate use of `inet_ntoa' and `gethostbyaddr' by new
+	calls to `getnameinfo', with and without restiction to numeric
+	results.  Debugging output for three select environment variables.
 	(main): Make type of SA_CLIENT depend on macro IPV6, either
-	`struct sockaddr_storage' or `struct sockaddr_in'.  Adaptions
-	to the new prototype for `prepenv'.
+	`struct sockaddr_storage' or `struct sockaddr_in'.  Adaptions to
+	the new prototype for `prepenv'.
 
 2010-12-04  Mike Frysinger <vapier@gentoo.org>  (tiny change)
 
@@ -887,24 +902,25 @@
 	* src/traceroute.c: Include "xalloc.h".
 	* src/traceroute.c (host): Deleted variable.
 	(hostname, addrstr): New variables;
-	(parse_opt) [ARGP_KEY_ARG]: Abolish gethostbyname. Only use
+	(parse_opt) [ARGP_KEY_ARG]: Abolish gethostbyname.  Only use
 	xstrdup to copy argument.
-	(main): Use getaddrinfo and getnameinfo for name resolving.
-	New variables HINTS and *RES of type `struct addrinfo'.
+	(main): Use getaddrinfo and getnameinfo for name resolving.  New
+	variables HINTS and *RES of type `struct addrinfo'.
 
 2010-11-22  Mats Erik Andersson <gnu@gisladisker.se>
 
 	Resolve a double free issue.  Leads to segmentation faults.
 
-	* src/inetd.c (nextconfig): Do not use `freeconfig' unconditionally.
-	Condition on SERV_NODE, which needs partial memory deallocation.
+	* src/inetd.c (nextconfig): Do not use `freeconfig'
+	unconditionally.  Condition on SERV_NODE, which needs partial
+	memory deallocation.
 
 2010-11-22  Mats Erik Andersson <gnu@gisladisker.se>
 
 	Partially revert changes introduced in fd64a202.
 
-	* src/inetd.c (nextconfig): Call `enter' for TCPMUX services,
-	but `expand_enter' for every other service.
+	* src/inetd.c (nextconfig): Call `enter' for TCPMUX services, but
+	`expand_enter' for every other service.
 
 2010-11-22  Mats Erik Andersson <gnu@gisladisker.se>
 
@@ -920,10 +936,10 @@
 
 	Regression caused by fe539ae9...797d881c
 
-	* src/traceroute.c: Revert change from 2010-10-31.
-	Change element `ttl' in `struct trace' to be plain `int'.
-	(trace_init): Change type of TTLP to be `const int *'.
-	Use `sizeof (*ttlp)' in both calls to setsockopt.
+	* src/traceroute.c: Revert change from 2010-10-31.  Change element
+	`ttl' in `struct trace' to be plain `int'.
+	(trace_init): Change type of TTLP to be `const int *'.  Use
+	`sizeof (*ttlp)' in both calls to setsockopt.
 	(trace_inc_ttl): Likewise.
 
 2010-11-21  Mike Frysinger <vapier@gentoo.org>
@@ -952,7 +968,8 @@
 	(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().
+	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
@@ -1015,7 +1032,8 @@
 
 2010-10-26  Mats Erik Andersson <gnu@gisladisker.se>
 
-	* telnetd/telnetd.c (telnetd_setup): Really use LEN as size of address.
+	* telnetd/telnetd.c (telnetd_setup): Really use LEN as size of
+	address.
 
 2010-10-19  Alfred M. Szmidt  <ams@gnu.org>
 
@@ -1132,8 +1150,10 @@
 
 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/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>
@@ -1144,12 +1164,12 @@
 2010-09-28  Mats Erik Andersson <gnu@gisladisker.se>
 
 	* configure.ac: Unconditionally include <sys/types.h> when
-	checking for `struct sockaddr_in6'. Needed for OpenBSD.
+	checking for `struct sockaddr_in6'.  Needed for OpenBSD.
 
 2010-09-15  Mats Erik Andersson <gnu@gisladisker.se>
 
-	* telnetd/telnetd.c (login_invocation, argp_options):
-	Access login(1) by detected PATH_LOGIN.
+	* telnetd/telnetd.c (login_invocation, argp_options): Access
+	login(1) by detected PATH_LOGIN.
 
 2010-09-15  Mats Erik Andersson <gnu@gisladisker.se>
 
@@ -1165,8 +1185,8 @@
 
 	* src/tftp.c (peeraddr, f, trace, verbose, rexmtval)
 	(maxtimeout): Remove external scope.
-	(peeraddr, f, port, trace, verbose, connected): Upgrade
-	to static scope in file.
+	(peeraddr, f, port, trace, verbose, connected): Upgrade to static
+	scope in file.
 	(rexmtval, maxtimeout): Static scope and new positioning.
 
 2010-09-03  Simon Josefsson  <simon@josefsson.org>
@@ -1672,7 +1692,7 @@
 	* tests/Makefile.am (dist_check_SCRIPTS): Make testing ping and
 	traceroute conditioned on ENABLE_ping and ENABLE_traceroute.
 	Reported by Adam Sampson <ats@offog.org>.
-
+
 2010-05-15  Alfred M. Szmidt  <ams@gnu.org>
 
 	* configure.ac: Bump version number to 1.8.
@@ -1801,14 +1821,16 @@
 	* telnetd/telnetd.c: Include <sys/utsname.h>, <strings.h>
 	unconditionally.
 
-	* telnet/utilities.c: Include <sys/time.h>, <time.h> unconditionally.
-	Don't include "fdset.h".
+	* telnet/utilities.c: Include <sys/time.h>, <time.h>
+	unconditionally.  Don't include "fdset.h".
 	* telnet/tn3270.c: Don't include "fdset.h".
 	* telnet/telnet.c: Include <stdlib.h> unconditionally.
-	* telnet/sys_bsd.c: Include <sys/time.h>, <time.h>, <sys/select.h> unconditionally.
-	Don't include "fdset.h".
-	* telnet/network.c: Include <sys/time.h>, <time.h>, <sys/select.h> unconditionally.
-	* telnet/commands.c: Include <fcntl.h>, <stdarg.h>, <stdlib.h> unconditionally.
+	* telnet/sys_bsd.c: Include <sys/time.h>, <time.h>, <sys/select.h>
+	unconditionally.  Don't include "fdset.h".
+	* telnet/network.c: Include <sys/time.h>, <time.h>, <sys/select.h>
+	unconditionally.
+	* telnet/commands.c: Include <fcntl.h>, <stdarg.h>, <stdlib.h>
+	unconditionally.
 	(call): Don't use K&R variable arguments.
 	* telnet/fdset.h: File removed.
 
@@ -1816,13 +1838,16 @@
 
 	Silence makefile_at_at_check_exceptions from `make syntax-check'.
 
-	* telnetd/Makefile.am (INCLUDES, LDADD): Use $() variables, instead of @@.
+	* telnetd/Makefile.am (INCLUDES, LDADD): Use $() variables,
+	instead of @@.
 	(LIBTERMCAP, LIBCRYPT, LIBUTIL): Removed variables.
 	* telnet/Makefile.am (noinst_HEADERS): Removed fdset.h from list.
 	(LIBTERMCAP, LIBCRYPT): Removed variables.
 	* src/Makefile.am (LDADD): Use $() variables, instead of @@.
-	* libtelnet/Makefile.am (INCLUDES): Use $() variables, instead of @@.
-	* ftpd/Makefile.am (LIBCRYPT, LIBWRAP, LIBPAM, LIBLS): Variables removed.
+	* libtelnet/Makefile.am (INCLUDES): Use $() variables, instead of
+	@@.
+	* ftpd/Makefile.am (LIBCRYPT, LIBWRAP, LIBPAM, LIBLS): Variables
+	removed.
 	* ftp/Makefile.am (READLINE): Use $() variables, instead of @@.
 	* cfg.mk (_makefile_at_at_check_exceptions): New variable.
 
@@ -1843,8 +1868,8 @@
 
 2010-05-14  Giuseppe Scrivano  <gscrivano@gnu.org>
 
-	* bootstrap (gnulib_path): Default to "gnulib" if it doesn't have a
-	value.  Redirect "git clone" stderr to stdout.
+	* bootstrap (gnulib_path): Default to "gnulib" if it doesn't have
+	a value.  Redirect "git clone" stderr to stdout.
 
 2010-05-12  Giuseppe Scrivano  <gscrivano@gnu.org>
 
@@ -1973,9 +1998,8 @@
 
 	Implement -a option; correctly print interface metric.
 
-	* ifconfig/options.c (formats) <gnu-one-entry>
-	<net-tools,unix,osf>: Use ${ifdisplay?} to select interfaces to be
-	displayed.
+	* ifconfig/options.c (formats) <gnu-one-entry> <net-tools, unix,
+	osf>: Use ${ifdisplay?} to select interfaces to be displayed.
 	(ifs_cmdline): New global.
 	(parse_opt_new_ifs): Set ifs_cmdline.
 	* ifconfig/options.h (all_option, ifs_cmdline): New externs.
@@ -2076,8 +2100,8 @@
 	programs, documentation, tests, misc.).
 	* Makefile.am (SUBDIRS): Removed hostname, inetd, logger, rcp,
 	rexec, rexecd, rlogin, rlogind, rsh, rshd, syslogd, tftp, tftpd,
-	traceroute, and uucpd from list.  Added src to list.  Sorted
-	list (in the order: libraries, programs, documentation, tests).
+	traceroute, and uucpd from list.  Added src to list.  Sorted list
+	(in the order: libraries, programs, documentation, tests).
 
 	* hostname/.gitignore, hostname/Makefile.am: Files removed.
 	* hostname/hostname.c: File renamed to ...
@@ -2228,7 +2252,7 @@
 
 	* tests/Makefile.am (TESTS): Change $(check_SCRIPTS) to
 	$(dist_check_SCRIPTS).
-
+
 2009-12-13  Alfred M. Szmidt  <ams@gnu.org>
 
 	* configure.ac: Bump version number to 1.7.
@@ -2248,8 +2272,8 @@
 2009-12-11  Simon Josefsson  <simon@josefsson.org>
 
 	* tests/Makefile.am (EXTRA_DIST): Remove variable.
-	(check_SCRIPTS): Renamed to dist_check_SCRIPTS.
-	Reported by ludo@gnu.org (Ludovic Courtès).
+	(check_SCRIPTS): Renamed to dist_check_SCRIPTS.  Reported by
+	ludo@gnu.org (Ludovic Courtès).
 
 2009-12-10  Simon Josefsson  <simon@josefsson.org>
 
@@ -2569,7 +2593,7 @@
 	* rshd/rshd.c (iruserok): Add prototype.
 	(main): Change type of `addrlen' to size_t.  Remove unused
 	variable.
-	(doit): Change type of `optsize' to size_t.  Add parentheses. Use
+	(doit): Change type of `optsize' to size_t.  Add parentheses.  Use
 	NULL as sentinel to execl instead of 0.
 	* talk/ctl.c (open_sockt): Change `length' type to size_t.  Add
 	return statement.
@@ -2668,8 +2692,8 @@
 
 2009-11-15  Alfred M. Szmidt  <ams@gnu.org>
 
-	* configure.ac: Quote first argument in AC_DEFINE macro
-	calls. (fixes sc_m4_quote_check)
+	* configure.ac: Quote first argument in AC_DEFINE macro calls.
+	(fixes sc_m4_quote_check)
 	* am/config_paths.m4: Likewise.
 	* am/check_weak_refs.m4: Likewise.
 
@@ -2993,8 +3017,8 @@
 
 	rexec: show all missing arguments before exit.
 
-	* rexec/rexec.c (main): Show all missing arguments before exit from the
-	process.
+	* rexec/rexec.c (main): Show all missing arguments before exit
+	from the process.
 
 2009-08-20  Giuseppe Scrivano  <gscrivano@gnu.org>
 
@@ -3010,14 +3034,14 @@
 
 	Fix possible array overflow in ping.
 
-	* ping/ping.h (_C_BIT,_C_MASK)
-	(_PING_SET,_PING_CLR,_PING_TST): Remove in favor of
+	* ping/ping.h (_C_BIT, _C_MASK)
+	(_PING_SET, _PING_CLR, _PING_TST): Remove in favor of
 	ping_common.h
 	* ping/ping6.h: Likewise.
-	* ping/ping_common.h (_C_BIT,_C_MASK): Moved from ping.h
+	* ping/ping_common.h (_C_BIT, _C_MASK): Moved from ping.h
 	(_C_IND): New macro.
-	(_PING_SET,_PING_CLR,_PING_TST): Modified versions of
-	macros from ping.h.
+	(_PING_SET, _PING_CLR, _PING_TST): Modified versions of macros
+	from ping.h.
 	* ping/libping.c, ping/ping6.c: Update calls to _PING macros.
 
 2009-07-19  Sergey Poznyakoff  <gray@gnu.org.ua>
@@ -3033,15 +3057,15 @@
 	* ifconfig/printif.c: New macros: map?, irq?, irq, baseaddr?,
 	baseaddr, memstart?, memstart, memend?, memend, dma?, dma.
 	* ifconfig/printif.h (put_ulong): New prototype.
-	(fh_map_query,fh_irq_query,fh_irq,fh_baseaddr_query)
-	(fh_baseaddr,fh_memstart_query,fh_memstart,fh_memend_query)
-	(fh_memend,fh_dma_query,fh_dma): New prototypes.
+	(fh_map_query, fh_irq_query, fh_irq, fh_baseaddr_query)
+	(fh_baseaddr, fh_memstart_query, fh_memstart, fh_memend_query)
+	(fh_memend, fh_dma_query, fh_dma): New prototypes.
 	* ifconfig/system/linux.c: Implement reading /proc/net/dev.
 	* ifconfig/system/linux.h: Declare /proc/net/dev-related
 	functions.
 
-	* ping/ping_address.c: Rearrange includes to fix compilation
-	on FreeBSD
+	* ping/ping_address.c: Rearrange includes to fix compilation on
+	FreeBSD
 	* ping/ping_echo.c: Likewise.
 	* ping/ping_router.c: Likewise.
 	* ping/ping_timestamp.c: Likewise.
@@ -3056,8 +3080,8 @@
 
 2009-07-03  Sergey Poznyakoff  <gray@mirddin.farlep.net>
 
-	Use separate sources for autoconf macros, as recommended
-	by Autoconf.
+	Use separate sources for autoconf macros, as recommended by
+	Autoconf.
 
 	* acinclude.m4: Remove
 	* am: New directory.
@@ -3080,8 +3104,8 @@
 
 2009-06-28  Sergey Poznyakoff  <gray@gnu.org.ua>
 
-	* logger/logger.c: Rewritten from scratch, not using the
-	libc syslog function.
+	* logger/logger.c: Rewritten from scratch, not using the libc
+	syslog function.
 	* doc/inetutils.texi: Update logger description.
 	* NEWS: Update.
 
@@ -3095,10 +3119,10 @@
 
 	* ftp/main.c, ftpd/ftpd.c, hostname/hostname.c, inetd/inetd.c,
 	logger/logger.c, ping/ping.c, ping/ping6.c, rcp/rcp.c,
-	rexecd/rexecd.c, rlogin/rlogin.c, rlogind/rlogind.c,
-	rsh/rsh.c, rshd/rshd.c, syslogd/syslogd.c, talk/talk.c,
-	talkd/talkd.c, telnet/main.c, telnetd/telnetd.c, tftpd/tftpd.c,
-	traceroute/traceroute.c, uucpd/uucpd.c:  Use iu_argp_init. Rewrite
+	rexecd/rexecd.c, rlogin/rlogin.c, rlogind/rlogind.c, rsh/rsh.c,
+	rshd/rshd.c, syslogd/syslogd.c, talk/talk.c, talkd/talkd.c,
+	telnet/main.c, telnetd/telnetd.c, tftpd/tftpd.c,
+	traceroute/traceroute.c, uucpd/uucpd.c: Use iu_argp_init.  Rewrite
 	option descriptions to conform to standards.texi.
 
 	* ifconfig/Makefile.am (INCLUDES): Add libinetutils
@@ -3107,10 +3131,9 @@
 	* ifconfig/ifconfig.c: Likewise.
 	(main): Call parse_cmdline.
 	* ifconfig/ifconfig.h: Include error.h, argp.h and libinetutils.h.
-	* ifconfig/options.c: Use argp.
-	"check-existence": fix typo (was *check-existance).
-	(usage): Remove.
-	Use error() for diagnostics.
+	* ifconfig/options.c: Use argp.  "check-existence": fix typo (was
+	*check-existance).
+	(usage): Remove.  Use error() for diagnostics.
 	* ifconfig/options.h (parse_opt): Rename to parse_cmdline.
 	* ifconfig/system.h (system_argp_child): New extern.
 	(system_help_options, SYSTEM_SHORT_OPTIONS)
@@ -3135,9 +3158,9 @@
 	Use argp in r* utils, telnet, talk and uucpd.
 
 	* inetd/inetd.c: Remove unused forward decl.
-	* rlogind/rlogind.c, rsh/rsh.c, rshd/rshd.c,
-	telnet/main.c, telnetd/telnetd.c, tftpd/tftpd.c,
-	uucpd/uucpd.c: Use argp to parse command line.
+	* rlogind/rlogind.c, rsh/rsh.c, rshd/rshd.c, telnet/main.c,
+	telnetd/telnetd.c, tftpd/tftpd.c, uucpd/uucpd.c: Use argp to parse
+	command line.
 
 	* talk/talk.c: Use argp to parse command line.
 	* talk/get_names.c (get_names): Argv no longer include program
@@ -3164,13 +3187,11 @@
 
 	Use argp-version-etc module from gnulib
 
-	* bootstrap.conf: Add argp-version-etc;
-	Remove deprecated modules.
-	* ftp/main.c, ftpd/ftpd.c, hostname/hostname.c,
-	inetd/inetd.c, logger/logger.c, ping/ping.c,
-	ping/ping6.c, rlogin/rlogin.c, syslogd/syslogd.c,
-	talkd/talkd.c, traceroute/traceroute.c: Use argp-version-etc
-	instead of ARGP_PROGRAM_DATA.
+	* bootstrap.conf: Add argp-version-etc; Remove deprecated modules.
+	* ftp/main.c, ftpd/ftpd.c, hostname/hostname.c, inetd/inetd.c,
+	logger/logger.c, ping/ping.c, ping/ping6.c, rlogin/rlogin.c,
+	syslogd/syslogd.c, talkd/talkd.c, traceroute/traceroute.c: Use
+	argp-version-etc instead of ARGP_PROGRAM_DATA.
 
 	* libinetutils/defauthors.c: New file.
 	* libinetutils/Makefile.am (libinetutils_a_SOURCES): Add
@@ -3180,12 +3201,12 @@
 	(ARGP_PROGRAM_DATA_SIMPLE, ARGP_PROGRAM_DATA): Removed.
 
 	* rcp/Makefile.am (INCLUDES): Add libinetutils.
-	* rcp/rcp.c: Use argp and asprintf. Remove obsolete varargs
-	stuff. Use error to display error messages on tty.
+	* rcp/rcp.c: Use argp and asprintf.  Remove obsolete varargs
+	stuff.  Use error to display error messages on tty.
 
 	* rexecd/Makefile.am (INCLUDES): Add libinetutils.
-	* rexecd/rexecd.c: Use argp. Remove obsolete varargs stuff.
-	Use error to display error messages on tty.
+	* rexecd/rexecd.c: Use argp.  Remove obsolete varargs stuff.  Use
+	error to display error messages on tty.
 
 2009-06-15  Simon Josefsson  <simon@josefsson.org>
 
@@ -3202,7 +3223,8 @@
 	* libtelnet/enc_des.c: Add include for memcpy, etc.  Make type of
 	encrypt_debug_mode explicit.
 	* libtelnet/encrypt.c: Add includes for printf, isprefix, etc.
-	(encrypt_send_keyid, encrypt_dec_keyid): Make return type explicit.
+	(encrypt_send_keyid, encrypt_dec_keyid): Make return type
+	explicit.
 	(encrypt_keyid): Make return type explicit and mark as static.
 	* libtelnet/misc.c: Add includes for auth_init and encrypt_init.
 
@@ -3220,8 +3242,8 @@
 	* bootstrap.conf (gnulib_modules): Import fdl-1.3 instead of fdl,
 	we want a version specific import.
 	* doc/Makefile.am: Rename fdl.texi to fdl-1.3.texi.
-	* doc/inetutils.texi: Use FDLv1.3+.
-	Reported by Karl Berry <karl@freefriends.org>.
+	* doc/inetutils.texi: Use FDLv1.3+.  Reported by Karl Berry
+	<karl@freefriends.org>.
 
 2009-04-30  Simon Josefsson  <simon@josefsson.org>
 
@@ -3294,7 +3316,7 @@
 2009-01-23  Rakesh Pandit <rakesh.pandit@gmail.com>
 
 	* ftpd/ftpcmd.y: Fix typo.
-
+
 2008-12-27  Sergey Poznyakoff  <gray@gnu.org.ua>
 
 	* bootstrap.conf: Add xgethostname and xgetdomainname.
@@ -3304,8 +3326,8 @@
 	* libinetutils/libinetutils.h (ARGP_PROGRAM_DATA_SIMPLE): New
 	macro.
 	(ARGP_PROGRAM_DATA): Rewrite using ARGP_PROGRAM_DATA_SIMPLE.
-	* ftp/main.c, logger/logger.c, rlogin/rlogin.c,
-	syslogd/syslogd.c: Use ARGP_PROGRAM_DATA_SIMPLE.
+	* ftp/main.c, logger/logger.c, rlogin/rlogin.c, syslogd/syslogd.c:
+	Use ARGP_PROGRAM_DATA_SIMPLE.
 	* libls/fts.c: Fix bsdisms.
 	* ping/ping.c: Include netinet/in.h
 	* ping/ping_common.c: Include sys/socket.h and string.h.
@@ -3361,18 +3383,17 @@
 	* talk/init_disp.c: Include unistd.h
 	* talk/invite.c: Fix order of function definitions.
 	* talk/io.c: Include unistd.h
-	* talk/look_up.c: Include unistd.h. Fix order of function
+	* talk/look_up.c: Include unistd.h.  Fix order of function
 	definitions.
-	* talk/talk.h: Include progname.h.
-	Add missing prototypes.
+	* talk/talk.h: Include progname.h.  Add missing prototypes.
 	* talk/talk_ctl.h (ctl_transact): New proto.
-	* telnet/commands.c: Include sys/wait.h. Reorder function
+	* telnet/commands.c: Include sys/wait.h.  Reorder function
 	definitions.
 	* telnet/externs.h, telnet/ring.h: Add missing prototypes.
 	* telnet/telnet.c: Reorder function definitions.
 	* telnet/utilities.c: Include sys/socket.h
-	* telnetd/telnetd.h: Include sys/stat.h and ctype.h.
-	Add missing prototypes.
+	* telnetd/telnetd.h: Include sys/stat.h and ctype.h.  Add missing
+	prototypes.
 	* traceroute/Makefile.am (INCLUDES): Add ../lib.
 	(LDADD): Add ../libgnu.a
 	* uucpd/uucpd.c: Reorder function definitions.
@@ -3399,57 +3420,59 @@
 2008-12-12  Sergey Poznyakoff  <gray@gnu.org.ua>
 
 	* bootstrap.conf: Add version-etc-fsf.
-	* inetd/inetd.c: Restore (approximate) list of authors from
-	the ChangeLog.
-	Fix memory allocation. Use getline for reading config files.
-	Reorder stuff in a logical manner.
+	* inetd/inetd.c: Restore (approximate) list of authors from the
+	ChangeLog.  Fix memory allocation.  Use getline for reading config
+	files.  Reorder stuff in a logical manner.
 
 2008-12-11  Sergey Poznyakoff  <gray@gnu.org.ua>
 
-	* README-alpha: Rewrite. Add information on how to get sources
+	* README-alpha: Rewrite.  Add information on how to get sources
 	from CVS and Git.
 	* README-hacking: New file.
-	* bootstrap.conf: Update copyright year. Remove checkout_only_file
-	override.
+	* bootstrap.conf: Update copyright year.  Remove
+	checkout_only_file override.
 
 	* bootstrap: New file.
 	* bootstrap.conf: Read in the options from .bootstrap, if it is
 	present.
 	* configure.ac: Always check for getaddrinfo.
 
-	* inetd/inetd.c: Support optional address specifications.
-	Use getaddrinfo wherever it is available, otherwise fall back
-	to gethostbyname/getservbyname approach.
-	Improve debugging diagnostics.
+	* inetd/inetd.c: Support optional address specifications.  Use
+	getaddrinfo wherever it is available, otherwise fall back to
+	gethostbyname/getservbyname approach.  Improve debugging
+	diagnostics.
 
-	* doc/inetd.texi: Rewrite in a manual fashion. Document new
+	* doc/inetd.texi: Rewrite in a manual fashion.  Document new
 	features.
 	* inetd/inetd.8: Provide a reference to texinfo docs.
 
 2008-10-14  Rakesh Pandit  <rakesh.pandit@gmail.com>
 
-	* ping/ping_impl.h, ping/ping.h, ping/ping_common.h,
-	ping/ping6.h (ping_stat, PEV_RESPONSE, PEV_DUPLICATE, PEV_NOECHO,
-	PING_INTERVAL, PING_CKTABSIZE, MAXWAIT, OPT_FLOOD, OPT_INTERVAL,
-	OPT_NUMERIC, OPT_QUIET, OPT_RROUTE, OPT_VERBOSE, PING_TIMING,
-	PING_HEADER_LEN, PING_DATALEN): Moved all these common macros and
-	structures from ping_impl.h , ping6.h and ping_ping.h to ping_common.h.
-	Removed PING_INTERVAL.
+	* ping/ping_impl.h, ping/ping.h, ping/ping_common.h, ping/ping6.h
+	(ping_stat, PEV_RESPONSE, PEV_DUPLICATE, PEV_NOECHO)
+	(PING_INTERVAL, PING_CKTABSIZE, MAXWAIT, OPT_FLOOD, OPT_INTERVAL)
+	(OPT_NUMERIC, OPT_QUIET, OPT_RROUTE, OPT_VERBOSE, PING_TIMING)
+	(PING_HEADER_LEN, PING_DATALEN): Moved all these common macros and
+	structures from ping_impl.h , ping6.h and ping_ping.h to
+	ping_common.h.  Removed PING_INTERVAL.
 	* ping/ping6.c (ping_run): Used PING_SET_INTERVAL similar to
-	libping.c and used PING_DEFAULT_INTERVAL in place of PING_INTERVAL.
+	libping.c and used PING_DEFAULT_INTERVAL in place of
+	PING_INTERVAL.
 
 	* ping/libping.c (ping_set_datalen): Removed.
 
-	* ping/libping.c, ping/ping_common.c (_ping_freebuf, ping_unset_data):
-	Moved _ping_freebuf, ping_unset_data from libping.c to ping_common.c.
-	* ping/ping6.c (ping_run): Free memory with call to ping_unset_data.
+	* ping/libping.c, ping/ping_common.c (_ping_freebuf,
+	ping_unset_data): Moved _ping_freebuf, ping_unset_data from
+	libping.c to ping_common.c.
+	* ping/ping6.c (ping_run): Free memory with call to
+	ping_unset_data.
 
 2008-10-14  Rakesh Pandit  <rakesh.pandit@gmail.com>
 
 	* ping/libping.c, ping/ping_common.c, ping/ping_common.h
-	(ping_set_count, ping_set_sockopt, ping_set_interval):
-	Moved functions from libping.c to ping_common.c and made
-	corresponding entries in ping_common.h
+	(ping_set_count, ping_set_sockopt, ping_set_interval): Moved
+	functions from libping.c to ping_common.c and made corresponding
+	entries in ping_common.h
 
 	* ping/ping6.c (main): Used ping_set_interval, ping_set_sockopt,
 	ping_set_count in place of directly modifying struct p.
@@ -3458,42 +3481,42 @@
 
 	* ping/ping_common.h, ping/ping.c, ping/ping_address.c,
 	ping/ping_echo.c, ping/ping_router.c, ping/ping_timestamp.c,
-	ping/libping.c: Added common headers from ping related
-	files (ping.c, ping_address.c, ping_echo.c, ping_router.c,
-	ping_timestamp.c, libping.c) and ping6.c to ping/ping_common.h.
+	ping/libping.c: Added common headers from ping related files
+	(ping.c, ping_address.c, ping_echo.c, ping_router.c)
+	(ping_timestamp.c, libping.c) and ping6.c to ping/ping_common.h.
 
 	* ping/ping.h, ping/ping6.h, ping/ping_common.h (ping_data,
-	ping_efp): Moved ping_data, ping_efp from ping.h & ping6.h
-	to ping_common.h
+	ping_efp): Moved ping_data, ping_efp from ping.h & ping6.h to
+	ping_common.h
 
 	* ping/libping.c, ping/ping6.c, ping/ping_common.c (_ping_setbuf,
-	ping_set_data): Moved _ping_setbuf and ping_set_data from libping.c
-	& ping6.c to ping_common.c
+	ping_set_data): Moved _ping_setbuf and ping_set_data from
+	libping.c & ping6.c to ping_common.c
 
-	* ping/ping_common.h (ping_address, event, ping_data): Introduced new
-	unions ping_address and event in ping_common.h. Replaced ping efp
-	handler(ping_efp/ping_efp6) with event union and socket
+	* ping/ping_common.h (ping_address, event, ping_data): Introduced
+	new unions ping_address and event in ping_common.h.  Replaced ping
+	efp handler(ping_efp/ping_efp6) with event union and socket
 	address(sockaddr_in sockaddr_in6) with ping_address union.
 
-	* ping/ping_common.h (_PING_BUFLEN, _ping_setbuf, ping_set_data): New
-	argument use_ipv6 and all callers changed.
+	* ping/ping_common.h (_PING_BUFLEN, _ping_setbuf, ping_set_data):
+	New argument use_ipv6 and all callers changed.
 
 2008-10-14  Rakesh Pandit  <rakesh.pandit@gmail.com>
 
-	* libicmp/Makefile.am (libicmp_a_SOURCES): Removed libping.c
-	and ping.h
+	* libicmp/Makefile.am (libicmp_a_SOURCES): Removed libping.c and
+	ping.h
 
 	* ping/Makefile.am (ping_SOURCES): Added libping.c and ping.h
 
 2008-10-14  Rakesh Pandit  <rakesh.pandit@gmail.com>
 
-	* ping/ping6.c (is_root, count, interval, socket_type):
-	New global variables count, interval & socket_type, similar to ping.c
+	* ping/ping6.c (is_root, count, interval, socket_type): New global
+	variables count, interval & socket_type, similar to ping.c
 	Initialize to is_root and count to false and DEFAULT_PING_COUNT
 	respectively.
 
-	* ping/ping6.c (parse_opt): Replaced ping structure usage with global
-	variables.
+	* ping/ping6.c (parse_opt): Replaced ping structure usage with
+	global variables.
 
 	* ping/ping6.c (main): Assigned parsed values to ping structure.
 
@@ -3550,8 +3573,8 @@
 
 	* hostname/hostname.c (hostname_options): New structure to
 	encapsulate command line options.
-	(hostname_file, hostname_new, hostname_alias, hostname_fqdn,
-	hostname_ip_address, hostname_dns_domain, hostname_short):
+	(hostname_file, hostname_new, hostname_alias, hostname_fqdn)
+	(hostname_ip_address, hostname_dns_domain, hostname_short):
 	Variables removed.
 	(get_name): Changed type to `void get_name (const hostname_options
 	*const options)'.  All users changed accordingly.
@@ -3566,8 +3589,8 @@
 2008-08-12  Debarshi Ray  <rishi@gnu.org>
 
 	* hostname/hostname.c: Include arpa/inet.h and netinet/in.h.
-	Added new switches --alias, --ip-address and removed
-	OPTION_HIDDEN from --file.
+	Added new switches --alias, --ip-address and removed OPTION_HIDDEN
+	from --file.
 	(hostname_alias, hostname_ip_address): New variables.
 	(get_aliases, get_ip_addresses, parse_file): New functions.
 	(main): Replace printf with puts.
@@ -3602,12 +3625,13 @@
 
 2008-06-11  Debarshi Ray  <rishi@gnu.org>
 
-	* rlogin/Makefile.am (INCLUDES): Added `-I$(top_srcdir)/libinetutils'.
+	* rlogin/Makefile.am (INCLUDES): Added
+	`-I$(top_srcdir)/libinetutils'.
 
-	* rlogin/rlogin.c: Include <argp.h>.  Remove include for <getopt.h>.
-	Include "libinetutils.h".
+	* rlogin/rlogin.c: Include <argp.h>.  Remove include for
+	<getopt.h>.  Include "libinetutils.h".
 	(dflag, host, user): New variables.
-	(msg, usage): Functions removed. Use argp_error or error in all
+	(msg, usage): Functions removed.  Use argp_error or error in all
 	callers accordingly.
 	(short_options, long_options): Variables removed.
 	(ARGP_PROGRAM_DATA): Call macro.
@@ -3615,8 +3639,8 @@
 	(program_name): Variable removed.
 	(parse_opt): New function.
 	(argp): New variable.
-	(main): Added new variable INDEX.  Removed variables CH, DFLAG, HOST
-	and USER.  Use argp to parse program options.
+	(main): Added new variable INDEX.  Removed variables CH, DFLAG,
+	HOST and USER.  Use argp to parse program options.
 
 2008-06-05  Debarshi Ray  <rishi@gnu.org>
 
@@ -3634,17 +3658,17 @@
 	(ping_run): Avoid decrementing PRELOAD.  Replaced free with
 	ping_unset_data.
 
-	* ping/ping6.c (main): Added new variable STATUS. Multiple host
+	* ping/ping6.c (main): Added new variable STATUS.  Multiple host
 	support implemented.
 	(ping_run): Avoid decrementing PRELOAD.
-	(ping_echo): Changed type to `static int ping_echo (char *hostname)`.
-	All callers and declarations changed accordingly.  Added new variable
-	STATUS.  Free PING->ping_hostname.
+	(ping_echo): Changed type to `static int ping_echo (char
+	*hostname)`.  All callers and declarations changed accordingly.
+	Added new variable STATUS.  Free PING->ping_hostname.
 	(ping_reset): New function.
 	(echo_finish): Call return instead of exit.
 
-	* ping/ping_address.c (ping_address): Changed type to
-	`int ping_address (char *hostname)'.  All callers and extern
+	* ping/ping_address.c (ping_address): Changed type to `int
+	ping_address (char *hostname)'.  All callers and extern
 	declarations changed accordingly.
 
 	* ping/ping_echo.c (ping_echo): Likewise.
@@ -3676,8 +3700,8 @@
 
 2008-04-20  Michal Svoboda <pht@spatium.org> (tiny change)
 
-	* ping/ping6.c (print_echo): Cast ICMP6+1 and not ICMP6 to
-	`struct timeval *'.
+	* ping/ping6.c (print_echo): Cast ICMP6+1 and not ICMP6 to `struct
+	timeval *'.
 
 2008-04-19  Debarshi Ray  <rishi@gnu.org>
 
@@ -3692,8 +3716,8 @@
 
 2008-04-17  Debarshi Ray  <rishi@gnu.org>
 
-	* traceroute/traceroute.c: Include <error.h>.  Added new
-	switch --tries.
+	* traceroute/traceroute.c: Include <error.h>.  Added new switch
+	--tries.
 	(opt_max_tries): Declared static.
 
 2008-04-17  Alfred M. Szmidt  <ams@gnu.org>
@@ -3708,13 +3732,15 @@
 	(ARGP_PROGRAM_DATA): Call macro.
 	(args_doc, doc): New variables.
 	(usage): Function removed.
-	(OPT_NO_FORWARD, OPT_NO_KLOG, OPT_NO_UNIXAF, OPT_PIDFILE): New enums.
+	(OPT_NO_FORWARD, OPT_NO_KLOG, OPT_NO_UNIXAF, OPT_PIDFILE): New
+	enums.
 	(argp_options): New variable.
 	(short_options, long_options): Variables removed.
 	(parse_opt): New function.
 	(argp): New variable.
-	(main): Removed variable OPTION.  Use argp to parse program options.
-	Use error instead of "output message; exit;" concoction's.
+	(main): Removed variable OPTION.  Use argp to parse program
+	options.  Use error instead of "output message; exit;"
+	concoction's.
 	(add_funix): Use error instead of "output message; exit;"
 	concoction's.
 	(crunch_list): Use error instead of "output message; exit;"
@@ -3723,7 +3749,8 @@
 
 2008-04-16  Debarshi Ray  <rishi@gnu.org>
 
-	* logger/Makefile.am (INCLUDES): Added `-I$(top_srcdir)/libinetutils'.
+	* logger/Makefile.am (INCLUDES): Added
+	`-I$(top_srcdir)/libinetutils'.
 
 	* logger/logger.c: Include <argp.h>, and <error.h>.  Remove
 	include for <getopt.h>.  Include "libinetutils.h".
@@ -3755,21 +3782,22 @@
 
 2007-09-06  Debarshi Ray  <rishi@gnu.org>
 
-	* ftp/cmds.c (setpeer): If HOSTNAME is set, try to reconnect to it.
+	* ftp/cmds.c (setpeer): If HOSTNAME is set, try to reconnect to
+	it.
 
 2007-09-02  Debarshi Ray  <rishi@gnu.org>
 
 	* bootstrap.conf (gnulib_modules): Added `readline'.
 
-	* configure.ac: Check for add_history libhistory and
-	libreadline.
+	* configure.ac: Check for add_history libhistory and libreadline.
 
 	* ftp/Makefile.am (READLINE): Added `@LIBHISTORY@'.
 
-	* ftp/extern.h (another): Changed type of PROMPT to `const char *'.
+	* ftp/extern.h (another): Changed type of PROMPT to `const char
+	*'.
 
-	* ftp/cmds.c (another): Added new variables BUFFER and ARG.
-	Use readline for input.  Use better error handling.
+	* ftp/cmds.c (another): Added new variables BUFFER and ARG.  Use
+	readline for input.  Use better error handling.
 	(another) [HAVE_LIBHISTORY]: Use add_history.
 
 	* ftp/ftp.c (login): Removed all references to HAVE_LIBREADLINE.
@@ -3882,10 +3910,11 @@
 
 	* inetd/inetd.8: Fix typo.
 
-	* inetd/Makefile.am (INCLUDES): Added -I$(top_srcdir)/libinetutils.
+	* inetd/Makefile.am (INCLUDES): Added
+	-I$(top_srcdir)/libinetutils.
 
-	* inetd/inetd.c: Include <stdbool.h>,  <argp.h> and "libinetutils.h".
-	Don't include <getopt.h>
+	* inetd/inetd.c: Include <stdbool.h>, <argp.h> and
+	"libinetutils.h".  Don't include <getopt.h>
 	(program_name): Variable removed.
 	(debug, env_option, resolve_option): Changed type to bool.
 	(ARGP_PROGRAM_DATA): Call macro.
@@ -3927,8 +3956,8 @@
 
 	* libtelnet/kerberos.c (prkey) [notdef]: Function removed.
 
-	* libtelnet/encrypt.c (encrypt_init,
-	encrypt_session_key) [notdef]: Removed unused code.
+	* libtelnet/encrypt.c (encrypt_init, encrypt_session_key)
+	[notdef]: Removed unused code.
 
 	* libls/fts.c (fts_build) [notdef]: Removed unused code.
 
@@ -4016,10 +4045,11 @@
 	(dataconn): Changed type of S and FROMLEN to socklen_t.
 	(passive): Changed type of LEN to socklen_t.
 
-	* inetd/inetd.c (set_proc_title, echo_dg, chargen_dg, machtime_dg,
-	daytime_dg): Changed type of SIZE to socklen_t.
+	* inetd/inetd.c (set_proc_title, echo_dg, chargen_dg, machtime_dg)
+	(daytime_dg): Changed type of SIZE to socklen_t.
 
-	* telnetd/state.c (doopt, dont, will, wont): Changed type to char [].
+	* telnetd/state.c (doopt, dont, will, wont): Changed type to char
+	[].
 
 2007-05-24  Alfred M. Szmidt  <ams@gnu.org>
 
@@ -4302,7 +4332,8 @@
 	* ping/ping6.c (ping_init): Set default ping count to
 	DEFAULT_PING_COUNT.
 	(show_usage): Mention the default.
-	* ping/ping.c (main): Set default ping count to DEFAULT_PING_COUNT.
+	* ping/ping.c (main): Set default ping count to
+	DEFAULT_PING_COUNT.
 	(show_usage): Mention the default.
 	* NEWS: Mention new behaviour.
 
@@ -4347,13 +4378,13 @@
 
 2006-10-21  Guillem Jover  <guillem@hadrons.org>
 
-	* ftpd/ftpd.c (store): Do not overwrite `name' with gunique's return
-	value, to avoid passing NULL to LOGCMD.
+	* ftpd/ftpd.c (store): Do not overwrite `name' with gunique's
+	return value, to avoid passing NULL to LOGCMD.
 
 2006-10-21  Guillem Jover  <guillem@hadrons.org>
 
-	* libinetutils/localhost.c (localhost): Determine the FQDN only
-	if gethostname did not fail.
+	* libinetutils/localhost.c (localhost): Determine the FQDN only if
+	gethostname did not fail.
 
 2006-10-21  Alfred M. Szmidt  <ams@gnu.org>
 
@@ -4393,7 +4424,7 @@
 	telnet/commands.c, rlogind/rlogind.c, libtelnet/encrypt.h,
 	libtelnet/kerberos.c, libtelnet/read_passwd.c: Remove all
 	references to P().
-
+
 2006-10-21  Sergey Poznyakoff  <gray@gnu.org.ua>
 
 	* configure.ac: Version 1.5
@@ -4436,8 +4467,8 @@
 	rsh/Makefile.am, rshd/Makefile.am, syslogd/Makefile.am,
 	talk/Makefile.am, talkd/Makefile.am, telnet/Makefile.am,
 	telnetd/Makefile.am, tftp/Makefile.am, tftpd/Makefile.am,
-	uucpd/Makefile.am, whois/Makefile.am: Move pathdefs to AM_CPPFLAGS.
-	Load libgnu after libinetutils.
+	uucpd/Makefile.am, whois/Makefile.am: Move pathdefs to
+	AM_CPPFLAGS.  Load libgnu after libinetutils.
 
 	* lib/Makefile.am: Fresh import from the CVS gnulib
 	* lib/alloca.c, lib/alloca_.h, lib/allocsa.c, lib/allocsa.h,
@@ -4467,11 +4498,12 @@
 	m4/signed.m4, m4/size_max.m4, m4/stdbool.m4, m4/stdint.m4,
 	m4/stdint_h.m4, m4/stdio-safer.m4, m4/strdup.m4, m4/strndup.m4,
 	m4/strnlen.m4, m4/ulonglong.m4, m4/unistd-safer.m4,
-	m4/unlocked-io.m4, m4/xalloc.m4, m4/xgetcwd.m4:	Update from gnulib
+	m4/unlocked-io.m4, m4/xalloc.m4, m4/xgetcwd.m4: Update from gnulib
 
 	* lib/wcwidth.h, m4/absolute-header.m4, m4/getcwd-abort-bug.m4,
 	m4/getndelim2.m4, m4/inttypes-h.m4, m4/lock.m4, m4/ssize_t.m4,
-	m4/unistd_h.m4, m4/visibility.m4, m4/wcwidth.m4: New files from gnulib
+	m4/unistd_h.m4, m4/visibility.m4, m4/wcwidth.m4: New files from
+	gnulib
 
 	* ftp/extern.h, ftp/ftp.c, ftp/ftp_var.h, ftp/main.c,
 	ftp/ruserpass.c, ftpd/auth.c, ftpd/extern.h, ftpd/ftpcmd.y,
@@ -4481,7 +4513,7 @@
 	libinetutils/kcmd.c, libinetutils/krcmd.c,
 	libinetutils/tftpsubs.c, libinetutils/ttymsg.c, libls/extern.h,
 	libls/fts.c, libls/fts.h, libls/ls.c, libls/print.c,
-	libtelnet/auth-proto.h, libtelnet/misc.c,  logger/logger.c,
+	libtelnet/auth-proto.h, libtelnet/misc.c, logger/logger.c,
 	ping/ping.c, ping/ping6.c, ping/ping_common.c, rcp/extern.h,
 	rcp/rcp.c, rexecd/rexecd.c, rlogin/rlogin.c, rlogind/rlogind.c,
 	rsh/rsh.c, rshd/rshd.c, talk/talk.c, talkd/talkd.c,
@@ -4495,15 +4527,13 @@
 	ifconfig/system/hpux.c, ifconfig/system/linux.c,
 	ifconfig/system/osf.c, ifconfig/system/solaris.c: Include
 	sys/types.h before sys/socket.h and netinet/in.h before
-	arpa/inet.h
-	Use program_name instead of __progname.
+	arpa/inet.h Use program_name instead of __progname.
 
-	* libicmp/icmp_address.c,
-	libicmp/icmp_echo.c, libicmp/icmp_timestamp.c: Include
-	sys/types.h before sys/socket.h
+	* libicmp/icmp_address.c, libicmp/icmp_echo.c,
+	libicmp/icmp_timestamp.c: Include sys/types.h before sys/socket.h
 
 	* syslogd/syslogd.c: Use read_utmp instead of manually fiddling
-	with utmp(x) subtleties. Remove __P wrappers, use program_name
+	with utmp(x) subtleties.  Remove __P wrappers, use program_name
 	instead of __progname.
 	* talkd/process.c: Likewise
 
@@ -4513,8 +4543,8 @@
 	based on the patch by Dirk Jagdmann <doj@cubic.org>
 
 	* inetd/inetd.c: New options: --environment, to enable passing
-	client/server data via environment variables, and --resolve,
-	to resolve IP addresses when doing so.
+	client/server data via environment variables, and --resolve, to
+	resolve IP addresses when doing so.
 	(prepenv): New function
 	(nextconfig): Allow numeric port values as service names.
 	* inetd/inetd.8: Document new options
@@ -4578,8 +4608,8 @@
 
 2006-04-20  Sergey Poznyakoff  <gray@gnu.org.ua>
 
-	* inetd/inetd.c (main): Use sigsuspend in favor of sigpause. Change
-	proposed by Guillem Jover <guillem@hadrons.org>
+	* inetd/inetd.c (main): Use sigsuspend in favor of sigpause.
+	Change proposed by Guillem Jover <guillem@hadrons.org>
 
 2006-04-20  Guillem Jover  <guillem@hadrons.org>
 
@@ -4593,7 +4623,8 @@
 
 2006-04-20  Sergey Poznyakoff  <gray@gnu.org.ua>
 
-	* ftp/main.c [HAVE_READLINE_READLINE_H]: Include <readline/readline.h>
+	* ftp/main.c [HAVE_READLINE_READLINE_H]: Include
+	<readline/readline.h>
 
 	* ftp/Makefile.am (INCLUDES): Add -I$(top_srcdir)/libinetutils
 	* ftp/ruserpass.c: Include libinetutils.h and xalloc.h
@@ -4607,8 +4638,8 @@
 
 2006-01-14  Sergey Poznyakoff  <gray@gnu.org.ua>
 
-	* rcp/rcp.c (write_stat_time): Pass modification times first. Patch by
-	Tim Adye <T.J.Adye@rl.ac.uk>
+	* rcp/rcp.c (write_stat_time): Pass modification times first.
+	Patch by Tim Adye <T.J.Adye@rl.ac.uk>
 
 2005-12-08  Alfred M. Szmidt  <ams@gnu.org>
 
@@ -4661,139 +4692,129 @@
 
 2005-10-11  Sergey Poznyakoff  <gray@gnu.org.ua>
 
-	* uucpd/uucpd.c: Remove leftover BSD-isms:
-	err,errx,warn,warnx, cast to (void) before function calls. Use GNU
-	error() uniformly.
-	* uucpd/Makefile.am: Remove ansi2knr. Add copyleft header. Update
-	INCLUDES.
+	* uucpd/uucpd.c: Remove leftover BSD-isms: err, errx, warn, warnx,
+	cast to (void) before function calls.  Use GNU error() uniformly.
+	* uucpd/Makefile.am: Remove ansi2knr.  Add copyleft header.
+	Update INCLUDES.
 
 2005-10-11  Sergey Poznyakoff  <gray@gnu.org.ua>
 
-	* tftpd/tftpd.c: Remove leftover BSD-isms:
-	err,errx,warn,warnx, cast to (void) before function calls. Use GNU
-	error() uniformly.
-	* tftpd/Makefile.am: Remove ansi2knr. Add copyleft header. Update
-	INCLUDES.
+	* tftpd/tftpd.c: Remove leftover BSD-isms: err, errx, warn, warnx,
+	cast to (void) before function calls.  Use GNU error() uniformly.
+	* tftpd/Makefile.am: Remove ansi2knr.  Add copyleft header.
+	Update INCLUDES.
 
 2005-10-11  Sergey Poznyakoff  <gray@gnu.org.ua>
 
-	* tftp/main.c: Remove leftover BSD-isms:
-	err,errx,warn,warnx, cast to (void) before function calls. Use GNU
-	error() uniformly.
-	* tftp/Makefile.am: Remove ansi2knr. Add copyleft header. Update
+	* tftp/main.c: Remove leftover BSD-isms: err, errx, warn, warnx,
+	cast to (void) before function calls.  Use GNU error() uniformly.
+	* tftp/Makefile.am: Remove ansi2knr.  Add copyleft header.  Update
 	INCLUDES.
 
 2005-10-11  Sergey Poznyakoff  <gray@gnu.org.ua>
 
-	* telnetd/Makefile.am: Remove ansi2knr. Add copyleft header. Update
-	INCLUDES.
+	* telnetd/Makefile.am: Remove ansi2knr.  Add copyleft header.
+	Update INCLUDES.
 
 2005-10-11  Sergey Poznyakoff  <gray@gnu.org.ua>
 
-	* telnet/commands.c: Remove leftover BSD-isms:
-	err,errx,warn,warnx, cast to (void) before function calls. Use GNU
-	error() uniformly.
+	* telnet/commands.c: Remove leftover BSD-isms: err, errx, warn,
+	warnx, cast to (void) before function calls.  Use GNU error()
+	uniformly.
 	* telnet/sys_bsd.c: Likewise
 	* telnet/telnet.c: Likewise
 	* telnet/tn3270.c: Likewise
-	* telnet/Makefile.am: Move defines to AM_CPPFLAGS. Add INCLUDES.
+	* telnet/Makefile.am: Move defines to AM_CPPFLAGS.  Add INCLUDES.
 
 2005-10-11  Sergey Poznyakoff  <gray@gnu.org.ua>
 
-	* talkd/table.c: Remove leftover BSD-isms:
-	err,errx,warn,warnx, cast to (void) before function calls. Use GNU
-	error() uniformly.
+	* talkd/table.c: Remove leftover BSD-isms: err, errx, warn, warnx,
+	cast to (void) before function calls.  Use GNU error() uniformly.
 	* talkd/talkd.c: Likewise
-	* talkd/Makefile.am: Remove ansi2knr. Add copyleft header. Update
-	INCLUDES.
+	* talkd/Makefile.am: Remove ansi2knr.  Add copyleft header.
+	Update INCLUDES.
 
 2005-10-11  Sergey Poznyakoff  <gray@gnu.org.ua>
 
-	* talk/init_disp.c: Remove leftover BSD-isms:
-	err,errx,warn,warnx, cast to (void) before function calls. Use GNU
-	error() uniformly.
-	Signal handlers return RETSIGTYPE.
-	* talk/Makefile.am: Remove ansi2knr. Add copyleft header. Update
+	* talk/init_disp.c: Remove leftover BSD-isms: err, errx, warn,
+	warnx, cast to (void) before function calls.  Use GNU error()
+	uniformly.  Signal handlers return RETSIGTYPE.
+	* talk/Makefile.am: Remove ansi2knr.  Add copyleft header.  Update
 	INCLUDES.
 
 2005-10-11  Sergey Poznyakoff  <gray@gnu.org.ua>
 
-	* syslogd/syslogd.c: Remove leftover BSD-isms:
-	err,errx,warn,warnx, cast to (void) before function calls. Use GNU
-	error() uniformly.
-	Signal handlers return RETSIGTYPE.
-	* syslogd/Makefile.am: Remove ansi2knr. Add copyleft header. Update
-	INCLUDES.
+	* syslogd/syslogd.c: Remove leftover BSD-isms: err, errx, warn,
+	warnx, cast to (void) before function calls.  Use GNU error()
+	uniformly.  Signal handlers return RETSIGTYPE.
+	* syslogd/Makefile.am: Remove ansi2knr.  Add copyleft header.
+	Update INCLUDES.
 
 2005-10-11  Sergey Poznyakoff  <gray@gnu.org.ua>
 
-	* rshd/rshd.c: Remove leftover BSD-isms:
-	err,errx,warn,warnx, cast to (void) before function calls. Use GNU
-	error() uniformly.
-	Signal handlers return RETSIGTYPE.
-	Add Shishi support. Patch by Simon Josefsson
-	* rshd/Makefile.am: Remove ansi2knr. Add copyleft header. Update
+	* rshd/rshd.c: Remove leftover BSD-isms: err, errx, warn, warnx,
+	cast to (void) before function calls.  Use GNU error() uniformly.
+	Signal handlers return RETSIGTYPE.  Add Shishi support.  Patch by
+	Simon Josefsson
+	* rshd/Makefile.am: Remove ansi2knr.  Add copyleft header.  Update
 	INCLUDES.
 
 2005-10-11  Sergey Poznyakoff  <gray@gnu.org.ua>
 
-	* rsh/rsh.c: Remove leftover BSD-isms:
-	err,errx,warn,warnx, cast to (void) before function calls. Use GNU
-	error() uniformly.
-	Signal handlers return RETSIGTYPE.
-	Add Shishi support. Patch by Simon Josefsson
-	* rsh/Makefile.am: Remove ansi2knr. Add copyleft header. Update
+	* rsh/rsh.c: Remove leftover BSD-isms: err, errx, warn, warnx,
+	cast to (void) before function calls.  Use GNU error() uniformly.
+	Signal handlers return RETSIGTYPE.  Add Shishi support.  Patch by
+	Simon Josefsson
+	* rsh/Makefile.am: Remove ansi2knr.  Add copyleft header.  Update
 	INCLUDES.
 
 2005-10-11  Sergey Poznyakoff  <gray@gnu.org.ua>
 
-	* rlogind/rlogind.c: Signal handlers return RETSIGTYPE.
-	Add Shishi support based on patch by Simon Josefsson
-	* rlogind/Makefile.am: Remove ansi2knr. Add copyleft header. Update
-	INCLUDES.
+	* rlogind/rlogind.c: Signal handlers return RETSIGTYPE.  Add
+	Shishi support based on patch by Simon Josefsson
+	* rlogind/Makefile.am: Remove ansi2knr.  Add copyleft header.
+	Update INCLUDES.
 
 2005-10-11  Sergey Poznyakoff  <gray@gnu.org.ua>
 
-	* rlogin/rlogin.c: Remove leftover BSD-isms:
-	err,errx,warn,warnx, cast to (void) before function calls. Use GNU
-	error() uniformly.
-	Signal handlers return RETSIGTYPE.
-	Add Shishi support based on patch by Simon Josefsson
-	* rlogin/Makefile.am: Remove ansi2knr. Add copyleft header. Update
-	INCLUDES.
+	* rlogin/rlogin.c: Remove leftover BSD-isms: err, errx, warn,
+	warnx, cast to (void) before function calls.  Use GNU error()
+	uniformly.  Signal handlers return RETSIGTYPE.  Add Shishi support
+	based on patch by Simon Josefsson
+	* rlogin/Makefile.am: Remove ansi2knr.  Add copyleft header.
+	Update INCLUDES.
 
 2005-10-11  Sergey Poznyakoff  <gray@gnu.org.ua>
 
-	* rexecd/Makefile.am: Remove ansi2knr. Add copyleft header. Update
-	INCLUDES.
+	* rexecd/Makefile.am: Remove ansi2knr.  Add copyleft header.
+	Update INCLUDES.
 
 2005-10-11  Sergey Poznyakoff  <gray@gnu.org.ua>
 
-	* rcp/rcp.c: Remove leftover BSD-isms:
-	err,errx,warn,warnx, cast to (void) before function calls. Use GNU
-	error() uniformly
+	* rcp/rcp.c: Remove leftover BSD-isms: err, errx, warn, warnx,
+	cast to (void) before function calls.  Use GNU error() uniformly
 	* rcp/util.c: Likewise.
-	* rcp/Makefile.am: Remove ansi2knr. Add copyleft header. Update
+	* rcp/Makefile.am: Remove ansi2knr.  Add copyleft header.  Update
 	INCLUDES.
 
 2005-10-11  Sergey Poznyakoff  <gray@gnu.org.ua>
 
-	* ping/Makefile.am: Remove ansi2knr. Add copyleft header. Update
+	* ping/Makefile.am: Remove ansi2knr.  Add copyleft header.  Update
 	INCLUDES.
 
 2005-10-11  Sergey Poznyakoff  <gray@gnu.org.ua>
 
-	* logger/logger.c: Remove leftover BSD-isms:
-	err,errx,warn,warnx, cast to (void) before function calls. Use GNU
-	error() uniformly
-	* logger/Makefile.am: Remove ansi2knr. Add copyleft header. Update
-	INCLUDES.
+	* logger/logger.c: Remove leftover BSD-isms: err, errx, warn,
+	warnx, cast to (void) before function calls.  Use GNU error()
+	uniformly
+	* logger/Makefile.am: Remove ansi2knr.  Add copyleft header.
+	Update INCLUDES.
 
 2005-10-11  Sergey Poznyakoff  <gray@gnu.org.ua>
 
-	* libtelnet/auth.c: Signal handlers return RETSIGTYPE
-	Add Shishi support. Patch by Simon Josefsson.
-	* libtelnet/auth-proto.h: Add Shishi support. Patch by Simon
+	* libtelnet/auth.c: Signal handlers return RETSIGTYPE Add Shishi
+	support.  Patch by Simon Josefsson.
+	* libtelnet/auth-proto.h: Add Shishi support.  Patch by Simon
 	Josefsson.
 	* libtelnet/auth.h: Likewise.
 	* libtelnet/enc_des.c: Likewise.
@@ -4804,33 +4825,34 @@
 
 2005-10-11  Sergey Poznyakoff  <gray@gnu.org.ua>
 
-	* libls/Makefile.am: Remove ansi2knr. Add copyleft header.
+	* libls/Makefile.am: Remove ansi2knr.  Add copyleft header.
 
 2005-10-11  Sergey Poznyakoff  <gray@gnu.org.ua>
 
 	* libinetutils/daemon.c: Signal handlers return RETSIGTYPE
-	* libinetutils/kcmd.c: Do not include <kerberosIV/kparse.h>
-	Add Shishi support based on patch by Simon Josefsson
-	* libinetutils/krcmd.c: Add Shishi support. Patch by Simon Josefsson.
-	* libinetutils/ttymsg.c: Remove leftover BSD-isms:
-	err,errx,warn,warnx, cast to (void) before function calls. Use GNU
+	* libinetutils/kcmd.c: Do not include <kerberosIV/kparse.h> Add
+	Shishi support based on patch by Simon Josefsson
+	* libinetutils/krcmd.c: Add Shishi support.  Patch by Simon
+	Josefsson.
+	* libinetutils/ttymsg.c: Remove leftover BSD-isms: err, errx,
+	warn, warnx, cast to (void) before function calls.  Use GNU
 	error() uniformly
 	* libinetutils/shishi.c: New file
 	* libinetutils/Makefile.am (libinetutils_a_SOURCES): Add shishi.c
 
 2005-10-11  Sergey Poznyakoff  <gray@gnu.org.ua>
 
-	* inetd/inetd.c: Remove leftover BSD-isms: err,errx,warn,warnx, cast
-	to (void) before function calls. Use GNU error() uniformly.
-	* inetd/Makefile.am: Remove ansi2knr. Add copyleft header. Update
-	INCLUDES.
+	* inetd/inetd.c: Remove leftover BSD-isms: err, errx, warn, warnx,
+	cast to (void) before function calls.  Use GNU error() uniformly.
+	* inetd/Makefile.am: Remove ansi2knr.  Add copyleft header.
+	Update INCLUDES.
 
 2005-10-11  Sergey Poznyakoff  <gray@gnu.org.ua>
 
-	* ifconfig/Makefile.am: Remove ansi2knr. Add copyleft header. Update
-	INCLUDES.
-	* ifconfig/system/Makefile.am: Remove ansi2knr. Add copyleft header.
+	* ifconfig/Makefile.am: Remove ansi2knr.  Add copyleft header.
 	Update INCLUDES.
+	* ifconfig/system/Makefile.am: Remove ansi2knr.  Add copyleft
+	header.  Update INCLUDES.
 
 2005-10-11  Sergey Poznyakoff  <gray@gnu.org.ua>
 
@@ -4841,49 +4863,49 @@
 
 	* gwhois/whois.c (main): Change --version output.
 	* gwhois/whois.h: Signal handlers return RETSIGTYPE
-	* gwhois/Makefile.am: Remove ansi2knr. Add copyleft header. Update
-	INCLUDES.
+	* gwhois/Makefile.am: Remove ansi2knr.  Add copyleft header.
+	Update INCLUDES.
 
 2005-10-11  Sergey Poznyakoff  <gray@gnu.org.ua>
 
-	* glob/Makefile.am: Remove ansi2knr. Add copyleft header. Update
+	* glob/Makefile.am: Remove ansi2knr.  Add copyleft header.  Update
 	INCLUDES.
 
 2005-10-11  Sergey Poznyakoff  <gray@gnu.org.ua>
 
-	* ftpd/conf.c: Remove leftover BSD-isms: err,errx,warn,warnx, cast
-	to (void) before function calls. Use GNU error() uniformly
+	* ftpd/conf.c: Remove leftover BSD-isms: err, errx, warn, warnx,
+	cast to (void) before function calls.  Use GNU error() uniformly
 	* ftpd/ftpd.c: Likewise
 	* ftpd/server_mode.c: Likewise
-	* ftpd/Makefile.am: Remove ansi2knr. Add copyleft header. Update
+	* ftpd/Makefile.am: Remove ansi2knr.  Add copyleft header.  Update
 	INCLUDES.
 
 2005-10-11  Sergey Poznyakoff  <gray@gnu.org.ua>
 
-	* ftp/cmds.c: Remove leftover BSD-isms: err,errx,warn,warnx, cast
-	to (void) before function calls. Use GNU error() uniformly
+	* ftp/cmds.c: Remove leftover BSD-isms: err, errx, warn, warnx,
+	cast to (void) before function calls.  Use GNU error() uniformly
 	* ftp/ftp.c: Likewise.
 	* ftp/main.c: Likewise.
 	* ftp/ruserpass.c: Likewise.
-	* ftp/domacro.c: Likewise. Use do while loop instead of goto.
-	* ftp/Makefile.am: Remove ansi2knr. Add copyleft header. Update
+	* ftp/domacro.c: Likewise.  Use do while loop instead of goto.
+	* ftp/Makefile.am: Remove ansi2knr.  Add copyleft header.  Update
 	INCLUDES.
 
 2005-10-11  Sergey Poznyakoff  <gray@gnu.org.ua>
 
-	* doc/Makefile.am: Remove ansi2knr. Add copyleft header. Update
+	* doc/Makefile.am: Remove ansi2knr.  Add copyleft header.  Update
 	INCLUDES.
 
 2005-10-11  Sergey Poznyakoff  <gray@gnu.org.ua>
 
 	* acinclude.m4: Properly quote arguments to AC_ARG_ENABLE and
-	AC_ARG_WITH. Use AC_HELP_STRING where appropriate.
-	* configure.ac: Likewise.
-	Add --with-shishi options. Patch by Simon Josefsson
+	AC_ARG_WITH.  Use AC_HELP_STRING where appropriate.
+	* configure.ac: Likewise.  Add --with-shishi options.  Patch by
+	Simon Josefsson
 	* THANKS: Add Simon Joseffson
-	* lib/getpass.c: Remove leftover BSD-isms: err,errx,warn,warnx, cast
-	to (void) before function calls. Use GNU error() uniformly
-	* Makefile.am: Remove ansi2knr. Add copyleft header. Update
+	* lib/getpass.c: Remove leftover BSD-isms: err, errx, warn, warnx,
+	cast to (void) before function calls.  Use GNU error() uniformly
+	* Makefile.am: Remove ansi2knr.  Add copyleft header.  Update
 	INCLUDES.
 
 2005-09-22  Sergey Poznyakoff  <gray@gnu.org.ua>
@@ -4946,8 +4968,8 @@
 
 2005-09-08  Sergey Poznyakoff  <gray@gnu.org.ua>
 
-	* ftp/main.c (getcmd,help): Moved to cmdtab.c
-	* ftp/cmdtab.c (getcmd,help): Moved from main.c
+	* ftp/main.c (getcmd, help): Moved to cmdtab.c
+	* ftp/cmdtab.c (getcmd, help): Moved from main.c
 	* ftp/extern.h (cmdtab): Remove declaration
 
 2005-08-27  Alfred M. Szmidt  <ams@gnu.org>
@@ -4957,8 +4979,8 @@
 2005-07-31  Sergey Poznyakoff  <gray@gnu.org.ua>
 
 	* telnetd/pty.c, telnetd/telnetd.c, telnetd/telnetd.h,
-	telnetd/term.c, telnetd/utility.c: Updated FSF postal
-	mail address.
+	telnetd/term.c, telnetd/utility.c: Updated FSF postal mail
+	address.
 
 2005-07-31  Sergey Poznyakoff  <gray@gnu.org.ua>
 
@@ -4974,8 +4996,8 @@
 
 	* ping/ping.c, ping/ping6.c, ping/ping6.h, ping/ping_address.c,
 	ping/ping_common.c, ping/ping_common.h, ping/ping_echo.c,
-	ping/ping_router.c, ping/ping_timestamp.c: Updated
-	FSF postal mail address.
+	ping/ping_router.c, ping/ping_timestamp.c: Updated FSF postal mail
+	address.
 
 2005-07-31  Sergey Poznyakoff  <gray@gnu.org.ua>
 
@@ -4988,10 +5010,10 @@
 2005-07-31  Sergey Poznyakoff  <gray@gnu.org.ua>
 
 	* libicmp/icmp.h, libicmp/icmp_address.c, libicmp/icmp_cksum.c,
-	libicmp/icmp_echo.c,  libicmp/icmp_timestamp.c, libicmp/libping.c,
+	libicmp/icmp_echo.c, libicmp/icmp_timestamp.c, libicmp/libping.c,
 	libicmp/ping.h: Updated FSF postal mail address.
-	* libicmp/Makefile.am: Remove ansi2knr. Add copyleft header. Update
-	INCLUDES.
+	* libicmp/Makefile.am: Remove ansi2knr.  Add copyleft header.
+	Update INCLUDES.
 
 2005-07-31  Sergey Poznyakoff  <gray@gnu.org.ua>
 
@@ -5001,63 +5023,63 @@
 
 	* COPYING: Updated FSF postal mail address.
 	* lib/Makefile.am: Removed unused argp
-	* lib/getcwd.c,lib/getcwd.h,lib/regex.c,lib/regex.h
-	m4/getcwd-path-max.m4,m4/getcwd.m4,m4/getopt.m4,m4/gnulib.m4
-	m4/poll.m4,m4/regex.m4,m4/size_max.m4: Updated from gnulib
-	* lib/dup-safer.c,lib/fd-safer.c,lib/fopen-safer.c,
-	lib/regcomp.c,lib/regex_internal.c,lib/regex_internal.h,
-	lib/regexec.c,lib/size_max.h,lib/stdio-safer.h,
-	lib/unistd-safer.h,m4/glibc2.m4,m4/minmax.m4,
-	m4/stdio-safer.m4,m4/unistd-safer.m4: Likewise
-	* lib/argp-ba.c,lib/argp-eexst.c,lib/argp-fmtstream.c,
-	lib/argp-fmtstream.h,lib/argp-fs-xinl.c,lib/argp-help.c,
-	lib/argp-namefrob.h,lib/argp-parse.c,lib/argp-pv.c,
-	lib/argp-pvh.c,lib/argp-xinl.c,lib/argp.h: Removed unused files.
+	* lib/getcwd.c, lib/getcwd.h, lib/regex.c, lib/regex.h
+	m4/getcwd-path-max.m4, m4/getcwd.m4, m4/getopt.m4, m4/gnulib.m4
+	m4/poll.m4, m4/regex.m4, m4/size_max.m4: Updated from gnulib
+	* lib/dup-safer.c, lib/fd-safer.c, lib/fopen-safer.c,
+	lib/regcomp.c, lib/regex_internal.c, lib/regex_internal.h,
+	lib/regexec.c, lib/size_max.h, lib/stdio-safer.h,
+	lib/unistd-safer.h, m4/glibc2.m4, m4/minmax.m4, m4/stdio-safer.m4,
+	m4/unistd-safer.m4: Likewise
+	* lib/argp-ba.c, lib/argp-eexst.c, lib/argp-fmtstream.c,
+	lib/argp-fmtstream.h, lib/argp-fs-xinl.c, lib/argp-help.c,
+	lib/argp-namefrob.h, lib/argp-parse.c, lib/argp-pv.c,
+	lib/argp-pvh.c, lib/argp-xinl.c, lib/argp.h: Removed unused files.
 
 2005-07-30  Sergey Poznyakoff  <gray@gnu.org.ua>
 
-	* ping/ping.c (main,ping_run): Handle ping intervals with millisecond
-	precision.
+	* ping/ping.c (main, ping_run): Handle ping intervals with
+	millisecond precision.
 
 2005-07-30  Sergey Poznyakoff  <gray@gnu.org.ua>
 
 	* libicmp/libping.c (ping_init): Use PING_DEFAULT_INTERVAL
 	* libicmp/ping.h (PING_INTERVAL): Renamed to to
 	PING_DEFAULT_INTERVAL
-	(PING_PRECISION,PING_SET_INTERVAL): New defines
+	(PING_PRECISION, PING_SET_INTERVAL): New defines
 
 2005-07-29  Alfred M. Szmidt  <ams@gnu.org>
 
-	* ping/ping_common.h (ping_cvt_number): Prototype restored (but with
-	updated types).
+	* ping/ping_common.h (ping_cvt_number): Prototype restored (but
+	with updated types).
 
-	* ping/ping_common.c (ping_cvt_number): Changed return type to size_t,
-	changed type of argument maxval to size_t.
+	* ping/ping_common.c (ping_cvt_number): Changed return type to
+	size_t, changed type of argument maxval to size_t.
 
 	* ping/ping.c (ping_cvt_number): Removed (once again).
 
 2005-07-29  Sergey Poznyakoff  <gray@gnu.org.ua>
 
 	* ping/ping.c (main): Changed types of count and interval
-	(ping_cvt_number): Restored function. atoi should not be
-	used to convert to size_t. According to POSIX "The atoi() function
-	is subsumed by strtol() but is retained because it is used
-	extensively in existing code. If the number is not known to be in
+	(ping_cvt_number): Restored function.  atoi should not be used to
+	convert to size_t.  According to POSIX "The atoi() function is
+	subsumed by strtol() but is retained because it is used
+	extensively in existing code.  If the number is not known to be in
 	range, strtol() should be used because atoi() is not required to
 	perform any error checking.
 	* ping/ping_common.h (ping_cvt_number): Remove prototype
 
 2005-07-29  Sergey Poznyakoff  <gray@gnu.org.ua>
 
-	* libicmp/libicmp/libping.c (ping_set_count,ping_set_interval)
+	* libicmp/libicmp/libping.c (ping_set_count, ping_set_interval)
 	(ping_set_packetsize): Second argument is size_t
 	* libicmp/libicmp/ping.h: Likewise
 
 2005-07-29  Sergey Poznyakoff  <gray@gnu.org.ua>
 
-	* ftp/extern.h: Reverted changes made 2005-05-01. Initializing a
-	scalar type (struct cmd *cmdtab) with a vector is an error, which leads
-	to coredump when trying to access cmdtab.
+	* ftp/extern.h: Reverted changes made 2005-05-01.  Initializing a
+	scalar type (struct cmd *cmdtab) with a vector is an error, which
+	leads to coredump when trying to access cmdtab.
 	* ftp/cmdtab.c: Likewise
 
 2005-07-29  Sergey Poznyakoff  <gray@gnu.org.ua>
@@ -5065,40 +5087,42 @@
 	* configure.ac: Remove AC_AIX, AC_MINIX, these are called by
 	gl_USE_SYSTEM_EXTENSIONS, invoked by gl_EARLY
 	* lib/Makefile.am: Updated
-	* lib/alloca_.h,lib/allocsa.c,lib/allocsa.h,lib/argp-ba.c,
-	lib/argp-eexst.c,lib/argp-fmtstream.c,lib/argp-fmtstream.h,
-	lib/argp-fs-xinl.c,lib/argp-help.c,lib/argp-namefrob.h,
-	lib/argp-parse.c,lib/argp-pv.c,lib/argp-pvh.c,lib/argp-xinl.c,
-	lib/argp.h,lib/asnprintf.c,lib/error.c,lib/error.h,lib/exit.h,
-	lib/exitfail.c,lib/exitfail.h,lib/getcwd.c,lib/getcwd.h,lib/getline.c,
-	lib/getline.h,lib/getndelim2.c,lib/getndelim2.h,lib/getopt.c,
-	lib/getopt1.c,lib/getopt_.h,lib/getopt_int.h,lib/getpass.c,
-	lib/getpass.h,lib/gettext.h,lib/getusershell.c,lib/malloc.c,
-	lib/memcmp.c,lib/memcpy.c,lib/mempcpy.c,lib/mempcpy.h,lib/memset.c,
-	lib/minmax.h,lib/obstack.c,lib/obstack.h,lib/poll.c,lib/poll_.h,
-	lib/printf-args.c,lib/printf-args.h,lib/printf-parse.c,
-	lib/printf-parse.h,lib/readutmp.c,lib/readutmp.h,lib/realloc.c,
-	lib/regex.c,lib/regex.h,lib/setenv.c,lib/setenv.h,lib/snprintf.c,
-	lib/snprintf.h,lib/stdbool_.h,lib/strcase.h,lib/strcasecmp.c,
-	lib/strchrnul.c,lib/strchrnul.h,lib/strdup.c,lib/strdup.h,
-	lib/strerror.c,lib/strndup.clib/strndup.h,lib/strnlen.c,
-	lib/sysexit_.h,lib/unlocked-io.h,lib/unsetenv.c,lib/vasnprintf.c,
-	lib/vasnprintf.h,lib/vsnprintf.c,lib/vsnprintf.h,lib/xalloc.h,
-	lib/xgetcwd.c,lib/xgetcwd.h,lib/xmalloc.c,lib/xsize.h: Updated
-	from the recent gnulib
-
-	* m4/alloca.m4,m4/argp.m4,m4/d-ino.m4,m4/error.m4,m4/exitfail.m4,
-	m4/extensions.m4,m4/getcwd-path-max.m4,m4/getcwd.m4,m4/getline.m4,
-	m4/getndelim2.m4,m4/getopt.m4,m4/getpass.m4,m4/gettext.m4,
-	m4/getusershell.m4,m4/gnulib.m4,m4/intdiv0.m4,m4/intmax.m4,
-	m4/inttypes-pri.m4,m4/inttypes.m4,m4/isc-posix.m4,m4/lcmessage.m4,
-	m4/lib-link.m4,m4/lib-prefix.m4,m4/memcmp.m4,m4/memcpy.m4,
-	m4/memmove.m4,m4/memset.m4,m4/nls.m4,m4/obstack.m4,m4/po.m4,
-	m4/poll.m4,m4/printf-posix.m4,m4/progtest.m4,m4/readutmp.m4,
-	m4/regex.m4,m4/restrict.m4,m4/snprintf.m4,m4/strchrnul.m4,
-	m4/strdup.m4,m4/strerror.m4,m4/strerror_r.m4,m4/strndup.m4,
-	m4/strnlen.m4,m4/sysexits.m4,m4/unlocked-io.m4,m4/vsnprintf.m4,
-	m4/xalloc.m4,m4/xgetcwd.m4: Updated from the recent gnulib
+	* lib/alloca_.h, lib/allocsa.c, lib/allocsa.h, lib/argp-ba.c,
+	lib/argp-eexst.c, lib/argp-fmtstream.c, lib/argp-fmtstream.h,
+	lib/argp-fs-xinl.c, lib/argp-help.c, lib/argp-namefrob.h,
+	lib/argp-parse.c, lib/argp-pv.c, lib/argp-pvh.c, lib/argp-xinl.c,
+	lib/argp.h, lib/asnprintf.c, lib/error.c, lib/error.h, lib/exit.h,
+	lib/exitfail.c, lib/exitfail.h, lib/getcwd.c, lib/getcwd.h,
+	lib/getline.c, lib/getline.h, lib/getndelim2.c, lib/getndelim2.h,
+	lib/getopt.c, lib/getopt1.c, lib/getopt_.h, lib/getopt_int.h,
+	lib/getpass.c, lib/getpass.h, lib/gettext.h, lib/getusershell.c,
+	lib/malloc.c, lib/memcmp.c, lib/memcpy.c, lib/mempcpy.c,
+	lib/mempcpy.h, lib/memset.c, lib/minmax.h, lib/obstack.c,
+	lib/obstack.h, lib/poll.c, lib/poll_.h, lib/printf-args.c,
+	lib/printf-args.h, lib/printf-parse.c, lib/printf-parse.h,
+	lib/readutmp.c, lib/readutmp.h, lib/realloc.c, lib/regex.c,
+	lib/regex.h, lib/setenv.c, lib/setenv.h, lib/snprintf.c,
+	lib/snprintf.h, lib/stdbool_.h, lib/strcase.h, lib/strcasecmp.c,
+	lib/strchrnul.c, lib/strchrnul.h, lib/strdup.c, lib/strdup.h,
+	lib/strerror.c, lib/strndup.clib/strndup.h, lib/strnlen.c,
+	lib/sysexit_.h, lib/unlocked-io.h, lib/unsetenv.c,
+	lib/vasnprintf.c, lib/vasnprintf.h, lib/vsnprintf.c,
+	lib/vsnprintf.h, lib/xalloc.h, lib/xgetcwd.c, lib/xgetcwd.h,
+	lib/xmalloc.c, lib/xsize.h: Updated from the recent gnulib
+
+	* m4/alloca.m4, m4/argp.m4, m4/d-ino.m4, m4/error.m4,
+	m4/exitfail.m4, m4/extensions.m4, m4/getcwd-path-max.m4,
+	m4/getcwd.m4, m4/getline.m4, m4/getndelim2.m4, m4/getopt.m4,
+	m4/getpass.m4, m4/gettext.m4, m4/getusershell.m4, m4/gnulib.m4,
+	m4/intdiv0.m4, m4/intmax.m4, m4/inttypes-pri.m4, m4/inttypes.m4,
+	m4/isc-posix.m4, m4/lcmessage.m4, m4/lib-link.m4,
+	m4/lib-prefix.m4, m4/memcmp.m4, m4/memcpy.m4, m4/memmove.m4,
+	m4/memset.m4, m4/nls.m4, m4/obstack.m4, m4/po.m4, m4/poll.m4,
+	m4/printf-posix.m4, m4/progtest.m4, m4/readutmp.m4, m4/regex.m4,
+	m4/restrict.m4, m4/snprintf.m4, m4/strchrnul.m4, m4/strdup.m4,
+	m4/strerror.m4, m4/strerror_r.m4, m4/strndup.m4, m4/strnlen.m4,
+	m4/sysexits.m4, m4/unlocked-io.m4, m4/vsnprintf.m4, m4/xalloc.m4,
+	m4/xgetcwd.m4: Updated from the recent gnulib
 
 2005-06-19  Jeroen Dekkers  <jeroen@dekkers.cx>
 
@@ -5106,14 +5130,14 @@
 
 2005-06-19  Jeroen Dekkers  <jeroen@dekkers.cx>
 
-	* telnet/commands.c: Include <arpa/telnet.h>. Remove variable tos and
-	_hostname.
-	(tn): Rewritten. Removed support for source routing and added
+	* telnet/commands.c: Include <arpa/telnet.h>.  Remove variable tos
+	and _hostname.
+	(tn): Rewritten.  Removed support for source routing and added
 	support for IPv6.
 	(sourceroute): Function removed.
 	* telnet/main.c (help): Add "-4" and "-6", remove "-S".
 	(long_options): Add "ipv4" and "ipv6", remove "tos".
-	(main): New variable family. Implement "-4" and "-6" options and
+	(main): New variable family.  Implement "-4" and "-6" options and
 	remove "-S" option.
 
 2005-06-19  Jeroen Dekkers  <jeroen@dekkers.cx>
@@ -5124,10 +5148,10 @@
 	* ping/ping6.h: Likewise.
 	* ping/ping_common.c: Likewise.
 	* ping/ping_common.h: Likewise.
-	* ping/ping.c: Include "ping_common.h". Remove __P macro in
+	* ping/ping.c: Include "ping_common.h".  Remove __P macro in
 	prototypes.
-	(ping_cvt_number, init_data_buffer,
-	 decode_pattern, show_license): Move to ...
+	(ping_cvt_number, init_data_buffer, decode_pattern, show_license):
+	Move to ...
 	* ping/ping_common.c: ... here.
 	* ping/ping_echo.c: Include "ping_common.h".
 	(tvsub, nabs, nsqrt): Move to ...
@@ -5136,14 +5160,14 @@
 2005-06-19  Jeroen Dekkers  <jeroen@dekkers.cx>
 
 	* inetd/inetd.c: Move global variable sp to...
-	(nextconfig): Here. Only use the getservbyname code when
-	[!IPV6]. Remove unused variable i.
-	(struct servtab): Change type of to pid_t. Add se_family.
-	[IPV6] Add se_v4mapped. Change se_ctrladdr to struct
+	(nextconfig): Here.  Only use the getservbyname code when
+	[!IPV6].  Remove unused variable i.
+	(struct servtab): Change type of to pid_t.  Add se_family.
+	[IPV6] Add se_v4mapped.  Change se_ctrladdr to struct
 	sockaddr_storage.
 	(setup): Add support for IPv6.
 	(INETD_FIELDS_MIN): Define to 6.
-	(getconfigent): Add support for IPv6. Remove unused variable arg.
+	(getconfigent): Add support for IPv6.  Remove unused variable arg.
 	(set_proc_title): Add support for IPv6.
 	(echo_dg): Likewise.
 	(chargen_dg): Likewise.
@@ -5189,8 +5213,8 @@
 
 2005-01-22  Alfred M. Szmidt  <ams@gnu.org>
 
-	* telnet/telnet.c (init_term): New variable err.  Only do tgetent if we
-	HAVE_LIBREADLINE is defined.
+	* telnet/telnet.c (init_term): New variable err.  Only do tgetent
+	if we HAVE_LIBREADLINE is defined.
 	(termbuf) [!TERMCAP]: Removede termbuf and ttytype.
 
 	* telnet/Makefile.am (LDADD): Added `-L../lib -lgnu'.
@@ -5232,7 +5256,8 @@
 
 2005-01-22  Alfred M. Szmidt  <ams@gnu.org>
 
-	* libinetutils/Makefile.am (noinst_HEADERS, EXTRA_DIST): New variables.
+	* libinetutils/Makefile.am (noinst_HEADERS, EXTRA_DIST): New
+	variables.
 
 2005-01-22  Alfred M. Szmidt  <ams@gnu.org>
 
@@ -5254,10 +5279,10 @@
 
 2005-01-22  Alfred M. Szmidt  <ams@gnu.org>
 
-	* ftp/ftp.c (recvrequest): Removed unused variable `st'.  Don't use
-	ST_BLKSIZE when setting blksiz, just set blksiz to BUFSIZ
+	* ftp/ftp.c (recvrequest): Removed unused variable `st'.  Don't
+	use ST_BLKSIZE when setting blksiz, just set blksiz to BUFSIZ
 	unconditionally.
-
+
 2005-01-22  Alfred M. Szmidt  <ams@gnu.org>
 
 	* configure.ac: Bump version to 1.4.3.
@@ -5274,12 +5299,13 @@
 
 	* uucpd/uucpd.c (doit): Use `crypt' instead of `CRYPT'.
 
-	* uucpd/Makefile.am (INCLUDES): Removed `-I$(top_builddir)/include'.
+	* uucpd/Makefile.am (INCLUDES): Removed
+	`-I$(top_builddir)/include'.
 
 2005-01-21  Alfred M. Szmidt  <ams@gnu.org>
 
-	* tftpd/Makefile.am (INCLUDES): Removed `-I$(top_builddir)/include'.
-	Added `-I$(top_srcdir)/headers'.
+	* tftpd/Makefile.am (INCLUDES): Removed
+	`-I$(top_builddir)/include'.  Added `-I$(top_srcdir)/headers'.
 
 2005-01-21  Alfred M. Szmidt  <ams@gnu.org>
 
@@ -5288,7 +5314,8 @@
 	`-I$(top_srcdir)/lib'.
 	(LDADD): Added `-L../lib -lgnu'.
 
-	* tftp/main.c: Use "xalloc.h" instead of <xalloc.h> when including it.
+	* tftp/main.c: Use "xalloc.h" instead of <xalloc.h> when including
+	it.
 
 2005-01-21  Alfred M. Szmidt  <ams@gnu.org>
 
@@ -5300,23 +5327,28 @@
 
 2005-01-21  Alfred M. Szmidt  <ams@gnu.org>
 
-	* telnet/Makefile.am (INCLUDES): Removed `-I$(top_builddir)/include'.
+	* telnet/Makefile.am (INCLUDES): Removed
+	`-I$(top_builddir)/include'.
 
 2005-01-21  Alfred M. Szmidt  <ams@gnu.org>
 
-	* talkd/Makefile.am (INCLUDES): Removed `-I$(top_builddir)/include'.
+	* talkd/Makefile.am (INCLUDES): Removed
+	`-I$(top_builddir)/include'.
 
 2005-01-21  Alfred M. Szmidt  <ams@gnu.org>
 
-	* talk/Makefile.am (INCLUDES): Removed `-I$(top_builddir)/include'.
+	* talk/Makefile.am (INCLUDES): Removed
+	`-I$(top_builddir)/include'.
 
 2005-01-21  Alfred M. Szmidt  <ams@gnu.org>
 
-	* syslogd/Makefile.am (INCLUDES): Removed `-I$(top_builddir)/include'.
+	* syslogd/Makefile.am (INCLUDES): Removed
+	`-I$(top_builddir)/include'.
 
 2005-01-21  Alfred M. Szmidt  <ams@gnu.org>
 
-	* rshd/Makefile.am (INCLUDES): Removed `-I$(top_builddir)/include'.
+	* rshd/Makefile.am (INCLUDES): Removed
+	`-I$(top_builddir)/include'.
 
 2005-01-21  Alfred M. Szmidt  <ams@gnu.org>
 
@@ -5324,7 +5356,8 @@
 
 2005-01-21  Alfred M. Szmidt  <ams@gnu.org>
 
-	* rlogind/Makefile.am (INCLUDES): Removed `-I$(top_builddir)/include'.
+	* rlogind/Makefile.am (INCLUDES): Removed
+	`-I$(top_builddir)/include'.
 
 2005-01-21  Alfred M. Szmidt  <ams@gnu.org>
 
@@ -5334,7 +5367,8 @@
 
 	* rexecd/rexecd.c (endpwent): Use `crypt' instead of `CRYPT'.
 
-	* rexecd/Makefile.am (INCLUDES): Removed `-I$(top_builddir)/include'.
+	* rexecd/Makefile.am (INCLUDES): Removed
+	`-I$(top_builddir)/include'.
 
 2005-01-21  Alfred M. Szmidt  <ams@gnu.org>
 
@@ -5342,7 +5376,8 @@
 
 2005-01-21  Alfred M. Szmidt  <ams@gnu.org>
 
-	* ping/Makefile.am (INCLUDES): Removed `-I$(top_builddir)/include'.
+	* ping/Makefile.am (INCLUDES): Removed
+	`-I$(top_builddir)/include'.
 	(LDADD): Added `-L../lib -lgnu'.
 
 2005-01-21  Alfred M. Szmidt  <ams@gnu.org>
@@ -5386,8 +5421,7 @@
 	libinetutils/xstrdup.c: Files removed.
 
 	* libinetutils/localhost.c (localhost): Removed extern declaration
-	of `xrealloc'.
-	Use `realloc' instead of `xrealloc'.
+	of `xrealloc'.  Use `realloc' instead of `xrealloc'.
 
 	* libinetutils/xalloc_die.c: New file.
 	* libinetutils/Makefile.am (libinetutils_a_SOURCES): Added
@@ -5398,7 +5432,7 @@
 	(libinetutils_a_LIBADD): Removed `@LIBOBJS@'.  Added
 	`$(top_builddir)/lib/libgnu.a'.
 	(noinst_HEADERS, EXTRA_DIST): Variable removed.
-	(INCLUDES): Removed `-I$(top_builddir)/include'. Added
+	(INCLUDES): Removed `-I$(top_builddir)/include'.  Added
 	`-I$(top_srcdir)/headers', and `-I$(top_srcdir)/lib'.
 
 2005-01-21  Alfred M. Szmidt  <ams@gnu.org>
@@ -5407,7 +5441,8 @@
 
 2005-01-21  Alfred M. Szmidt  <ams@gnu.org>
 
-	* inetd/Makefile.am (INCLUDES): Removed `-I$(top_builddir)/include'.
+	* inetd/Makefile.am (INCLUDES): Removed
+	`-I$(top_builddir)/include'.
 
 2005-01-21  Alfred M. Szmidt  <ams@gnu.org>
 
@@ -5415,7 +5450,7 @@
 	(header_dirs): Variable removed.
 	(EXTRA_DIST): Variable removed.
 
-	* headers/confpaths.h.in,  headers/crypt.h,  headers/err.h,
+	* headers/confpaths.h.in, headers/crypt.h, headers/err.h,
 	headers/getopt.h, headers/obstack.h, headers/osockaddr.h,
 	headers/paths.h, headers/poll.h, headers/syslog-int.h,
 	headers/arpa/DISTFILES, headers/arpa/ftp.h, headers/arpa/telnet.h,
@@ -5434,7 +5469,8 @@
 
 	* ftpd/auth.c (auth_pass): Use `crypt' instead of `CRYPT'.
 
-	* ftpd/Makefile.am (INCLUDES): Removed `-I$(top_builddir)/include'.
+	* ftpd/Makefile.am (INCLUDES): Removed
+	`-I$(top_builddir)/include'.
 	(LDADD): Added `-L../lib -lgnu'.
 
 2005-01-21  Alfred M. Szmidt  <ams@gnu.org>
@@ -5531,11 +5567,11 @@
 	valid, do it manually.  Set them accordingly after ping_init() is
 	done.
 
-	* ping/ping.c (main): Changed type of `is_root' to `bool'.  Update all
-	usage accordingly.
+	* ping/ping.c (main): Changed type of `is_root' to `bool'.  Update
+	all usage accordingly.
 
-	* ping/ping.c (main): Moved ping startup code to after the parsing of
-	the command line.  (and no, this should not be done before any
+	* ping/ping.c (main): Moved ping startup code to after the parsing
+	of the command line.  (and no, this should not be done before any
 	command line parsing!)
 
 2005-01-20  Alfred M. Szmidt  <ams@gnu.org>
@@ -5545,8 +5581,8 @@
 
 2005-01-13  Alfred M. Szmidt  <ams@gnu.org>
 
-	* ftp/cmds.c (setpeer): Changed type of PORT to `int'.  Check that the
-	port number isn't strictly greater than 65535.
+	* ftp/cmds.c (setpeer): Changed type of PORT to `int'.  Check that
+	the port number isn't strictly greater than 65535.
 
 2004-12-28  Simon Josefsson  <jas@extundo.com>
 
@@ -5564,8 +5600,8 @@
 
 2004-09-29  Alfred M. Szmidt  <ams@kemisten.nu>
 
-	* tftp/Makefile.am (LDADD): Use `$(top_srcdir)' instead of relative
-	path.
+	* tftp/Makefile.am (LDADD): Use `$(top_srcdir)' instead of
+	relative path.
 	(INCLUDES): Search for headers in `$(top_srcdir)/libinetutils'
 	instead of `$(top_builddir)/libinetutils'.
 
@@ -5585,10 +5621,10 @@
 
 2004-07-14  Sergey Poznyakoff  <gray@Mirddin.farlep.net>
 
-	* rshd/rshd.c (doit): Use cached copy of hp->h_name, since
-	it may be overwritten by local_domain(). Fix proposed
-	by Andrew Klossner <andrew@cesa.opbu.xerox.com> and
-	Martin J. Evans <martin@easysoft.com>.
+	* rshd/rshd.c (doit): Use cached copy of hp->h_name, since it may
+	be overwritten by local_domain().  Fix proposed by Andrew Klossner
+	<andrew@cesa.opbu.xerox.com> and Martin J.  Evans
+	<martin@easysoft.com>.
 
 2004-07-14  Sergey Poznyakoff  <gray@Mirddin.farlep.net>
 
@@ -5601,8 +5637,8 @@
 
 2004-06-16  Sergey Poznyakoff  <gray@Mirddin.farlep.net>
 
-	* rsh/rsh.c (short_options): Prefix with '+' to disable
-	reordering by getopt_long. Proposed by Todd R. Eigenschink
+	* rsh/rsh.c (short_options): Prefix with '+' to disable reordering
+	by getopt_long.  Proposed by Todd R.  Eigenschink
 	<todd@tekinteractive.com>
 	* rsh/Makefile.am: Conditional install-exec-hook
 
@@ -5610,8 +5646,8 @@
 
 	* rlogin/rlogin.c: Handle ^S/^Q without using -8:
 	(ixon_state): New variable
-	(mode): Save and restore ixon state.
-	Patch by Todd R. Eigenschink <todd@tekinteractive.com>
+	(mode): Save and restore ixon state.  Patch by Todd R.
+	Eigenschink <todd@tekinteractive.com>
 	* rlogin/Makefile.am: Conditional install-exec-hook
 
 2004-03-03  Sergey Poznyakoff  <gray@Mirddin.farlep.net>
@@ -5624,20 +5660,19 @@
 
 	* ping/ping.c (ping_cvt_number): New function.
 	(main): Check numeric options for validity.
-	* ping/ping_echo.c: Rewritten diagnostic output.
-	Use original returned IP header.
+	* ping/ping_echo.c: Rewritten diagnostic output.  Use original
+	returned IP header.
 	* ping/ping_impl.h (PING_MAX_DATALEN): New define.
 
 2003-11-10  Sergey Poznyakoff  <gray@Mirddin.farlep.net>
 
-	* libicmp/libping.c (ping_recv): Check icmp ID only
-	for replies. Use more detailed check for other
-	packet types.
+	* libicmp/libping.c (ping_recv): Check icmp ID only for replies.
+	Use more detailed check for other packet types.
 
 2003-11-01  Jeff Bailey  <jbailey@raspberryginger.com>
 
-	* ftp/ftp_var.h (MAXLINE): New define.
-	Define line and argbuf in terms of MAXLINE.
+	* ftp/ftp_var.h (MAXLINE): New define.  Define line and argbuf in
+	terms of MAXLINE.
 
 	* ftp/main.c: Make sure line from readline isn't larger than
 	MAXLINE.
@@ -5673,8 +5708,7 @@
 2003-11-11  Sergey Poznyakoff  <gray@Mirddin.farlep.net>
 
 	* inetd/inetd.c: Use argcv_get to parse configuration files.
-	Improved config error diagnostics.
-	Removed obvious bsdisms.
+	Improved config error diagnostics.  Removed obvious bsdisms.
 
 2003-08-29  Jeff Bailey <jbailey@raspberryginger.com>
 
@@ -5688,9 +5722,9 @@
 
 2004-06-16  Sergey Poznyakoff  <gray@Mirddin.farlep.net>
 
-	* configure.ac: Check for termcap before checking for
-	readline, since the latter might depend on the former.
-	Patch by Todd R. Eigenschink <todd@tekinteractive.com>
+	* configure.ac: Check for termcap before checking for readline,
+	since the latter might depend on the former.  Patch by Todd R.
+	Eigenschink <todd@tekinteractive.com>
 	* acinclude.m4 (IU_ENABLE_FOO): Define $1_INSTALL_HOOK
 	(IU_CHECK_KRB5): Quote the definition
 
@@ -5699,8 +5733,8 @@
 2004-01-30  Sergey Poznyakoff  <gray@Mirddin.farlep.net>
 
 	* acinclude.m4 (IU_CONFIG_LINKS): New macro
-	* configure.ac: Use IU_CONFIG_LINKS. Raised autoconf
-	requirement to 2.59
+	* configure.ac: Use IU_CONFIG_LINKS.  Raised autoconf requirement
+	to 2.59
 	* Makefile.am: Require automake 1.8
 
 	* headers/Makefile.am: Fixed disthook
@@ -5727,28 +5761,28 @@
 
 	* syslogd/syslogd.c (main): Call init before opening the sockets.
 	(Thanks Peter Rehley <peter@rehley.net> for the patch)
-	(logmsg,cfline): Fixed handling of INTERNAL_NOPRI.
+	(logmsg, cfline): Fixed handling of INTERNAL_NOPRI.
 
 2003-05-21  Sergey Poznyakoff  <gray@Mirddin.farlep.net>
 
-	* libinetutils/libinetutils/ttymsg.c (ttymsg): Bugfix: typecast is not
-	a valid lvalue
+	* libinetutils/libinetutils/ttymsg.c (ttymsg): Bugfix: typecast is
+	not a valid lvalue
 
 2003-04-21  Sergey Poznyakoff  <gray@Mirddin.farlep.net>
 
-	* ping/ping.c (ping_run): Bugfix. Thanks Jim Balter
+	* ping/ping.c (ping_run): Bugfix.  Thanks Jim Balter
 	<Jim.Balter@cw.com> for the patch.
 
 2003-04-21  Sergey Poznyakoff  <gray@Mirddin.farlep.net>
 
-	* libinetutils/setenv.c: Provide an extern declaration of
-	environ if necessary
+	* libinetutils/setenv.c: Provide an extern declaration of environ
+	if necessary
 	* libinetutils/xmalloc.c: Use err() instead of error().
 
 2003-04-21  Sergey Poznyakoff  <gray@Mirddin.farlep.net>
 
-	* libicmp/libping.c (ping_recv): Placed checksum and id
-	test before the switch.
+	* libicmp/libping.c (ping_recv): Placed checksum and id test
+	before the switch.
 
 2003-04-05  Sergey Poznyakoff  <gray@Noldor.runasimi.org>
 
@@ -5784,33 +5818,32 @@
 
 2003-04-05  Sergey Poznyakoff  <gray@Noldor.runasimi.org>
 
-	* ping/ping.c: Bugfix: ping.ping_count means the maximum
-	number of packets to send.
+	* ping/ping.c: Bugfix: ping.ping_count means the maximum number of
+	packets to send.
 	* ping/ping_echo.c (nabs): New function.
 
 2003-04-05  Sergey Poznyakoff  <gray@Noldor.runasimi.org>
 
 	* libinetutils/Makefile.am: Added malloc.c and realloc.c
-	* libinetutils/xmalloc.c: Removed checks for HAVE_MALLOC
-	and HAVE_REALLOC: configure takes care that malloc and
-	realloc be always POSIX-compliant.
+	* libinetutils/xmalloc.c: Removed checks for HAVE_MALLOC and
+	HAVE_REALLOC: configure takes care that malloc and realloc be
+	always POSIX-compliant.
 
 2003-04-05  Sergey Poznyakoff  <gray@gnu.org>
 
-	* acinclude.m4 (IU_CHECK_KRB5): Check for libresolv.
-	Minor bugfix: LIBS and LDFLAGS were not properly
-	restored.
-	* configure.ac: Removed KERBEROS_IV and KERBEROS_V defines.
-	Added check for socklen_t.
+	* acinclude.m4 (IU_CHECK_KRB5): Check for libresolv.  Minor
+	bugfix: LIBS and LDFLAGS were not properly restored.
+	* configure.ac: Removed KERBEROS_IV and KERBEROS_V defines.  Added
+	check for socklen_t.
 
 2003-02-08  Simon Josefsson  <jas@extundo.com>
 
 	* telnet/commands.c (tn): Don't set hostname to DNS canonicalized
-	  value. Attackers may control DNS and fool the Kerberos
-	  authentication code to use the wrong realm for the server, and
-	  consequently the wrong KDC for the server, which the attackers
-	  could also control. Ultimately the attacker can fool the server
-	  authentication check in the client.
+	value.  Attackers may control DNS and fool the Kerberos
+	authentication code to use the wrong realm for the server, and
+	consequently the wrong KDC for the server, which the attackers
+	could also control.  Ultimately the attacker can fool the server
+	authentication check in the client.
 
 2003-01-15  Sergey Poznyakoff  <gray@Mirddin.farlep.net>
 
@@ -5820,7 +5853,7 @@
 2002-12-22  Jeff Bailey  <jbailey@gnu.org>
 
 	* libinetutils/Makefile.am: Include new files in dist rules.
-
+
 2002-12-22  Jeff Bailey  <jbailey@gnu.org>
 
 	* configure.ac: Bump version to 1.4.2
@@ -5865,27 +5898,27 @@
 
 2002-12-06  Sergey Poznyakoff  <gray@Mirddin.farlep.net>
 
-	* ping/ping.c (main): Added spaces between cases in a switch
-	to conform to the GCS.
+	* ping/ping.c (main): Added spaces between cases in a switch to
+	conform to the GCS.
 
 2002-12-06  Sergey Poznyakoff
 
 	* libtelnet/auth-proto.h: Renamed Authenticator to
-	TN_Authenticator to avoid name collisions when compiling
-	with Heimdal implementation of Kerberos.
+	TN_Authenticator to avoid name collisions when compiling with
+	Heimdal implementation of Kerberos.
 	* libtelnet/auth.h: Likewise.
 	* libtelnet/kerberos.c: Likewise.
 
-	* libtelnet/kerberos5.c: Likewise. Improved debugging
-	output (patch courtesy of Simon Josefsson <jas@extundo.com>)
+	* libtelnet/kerberos5.c: Likewise.  Improved debugging output
+	(patch courtesy of Simon Josefsson <jas@extundo.com>)
 	* libtelnet/auth.c: Likewise.
 
 	* libtelnet/misc.c: Removed unused variable.
 
 2002-12-06  Sergey Poznyakoff  <gray@Mirddin.farlep.net>
 
-	* libinetutils/iruserok.c (iruserok): Removed unneded
-	  typecasts to (void).
+	* libinetutils/iruserok.c (iruserok): Removed unneded typecasts to
+	(void).
 
 2002-11-15  Alfred M. Szmidt  <ams@kemisten.nu>
 
@@ -5901,13 +5934,13 @@
 2002-09-30  Sergey Poznyakoff
 
 	* syslogd/syslogd.c: Fix processing accumulated messages from
-	  /proc/kmsg (patch provided by Michael Deutschmann).
+	/proc/kmsg (patch provided by Michael Deutschmann).
 
 2002-09-20 Alain Magloire
 
 	* ftpd/server_mode.c: getservbyname() returns the port number in
-	network  byte order, use ntohs(sv->s_port) for the conversion.
-	Patch From  Paul Poh <paul@paulpoh.com>
+	network byte order, use ntohs(sv->s_port) for the conversion.
+	Patch From Paul Poh <paul@paulpoh.com>
 
 2002-09-13  Sergey Poznyakoff  <gray@Mirddin.farlep.net>
 
@@ -5925,37 +5958,33 @@
 2002-09-13  Sergey Poznyakoff  <gray@Mirddin.farlep.net>
 
 	* acinclude.m4 (IU_CHECK_KRB5): Fixed.
-	* configure.ac: Define KRB5 as well as KERBEROS_V. When
-	  kerberos support is finally rewritten one of these will
-	  disappear.
+	* configure.ac: Define KRB5 as well as KERBEROS_V.  When kerberos
+	support is finally rewritten one of these will disappear.
 
 2002-09-09  Sergey Poznyakoff  <gray@Mirddin.farlep.net>
 
-	* rshd/rshd.c: Change to the user's directory after
-	  switching to the user privileges. Thanks to
-	  Alex Muntada <alexm@ac.upc.es> for the idea.
-	  Removed unneded casts to (void).
-	  Create a local copy of hostname, lest it be spoiled
-	  by a call to localhost().
-	  Thanks to Chris Ulherr for reporting.
+	* rshd/rshd.c: Change to the user's directory after switching to
+	the user privileges.  Thanks to Alex Muntada <alexm@ac.upc.es> for
+	the idea.  Removed unneded casts to (void).  Create a local copy
+	of hostname, lest it be spoiled by a call to localhost().  Thanks
+	to Chris Ulherr for reporting.
 
 2002-09-09  Sergey Poznyakoff  <gray@Mirddin.farlep.net>
 
-	* rexecd/rexecd.c: Change to the user's directory after
-	  switching to the user privileges. Thanks to
-	  Alex Muntada <alexm@ac.upc.es> for the idea.
-	  Removed unneded casts to (void).
+	* rexecd/rexecd.c: Change to the user's directory after switching
+	to the user privileges.  Thanks to Alex Muntada <alexm@ac.upc.es>
+	for the idea.  Removed unneded casts to (void).
 
 2002-09-06  Sergey Poznyakoff  <gray@Noldor.runasimi.org>
 
 	* ping/ping.c (main): Removed duplicate startup introduced
-	  2002-06-24. Should have been more careful!
+	2002-06-24.  Should have been more careful!
 
 2002-09-02  Sergey Poznyakoff
 
 	* syslogd/syslogd.c: '**' extension (Michael Deutschmann
-	  <michael@talamasca.ocis.net> allows to catch all facilities
-	  not specified explicitely in the configuration file.
+	<michael@talamasca.ocis.net> allows to catch all facilities not
+	specified explicitely in the configuration file.
 
 2002-09-02  Jeff Bailey  <jbailey@outpost.dnsalias.org>
 
@@ -5970,9 +5999,9 @@
 
 2002-09-02  Sergey Poznyakoff  <gray@Mirddin.farlep.net>
 
-	* doc/doc/syslogd.texi: Documented ** extensions, provided
-	  by Michael Deutschmann <michael@talamasca.ocis.net>.
-
+	* doc/doc/syslogd.texi: Documented ** extensions, provided by
+	Michael Deutschmann <michael@talamasca.ocis.net>.
+
 2002-09-02  Jeff Bailey  <jbailey@outpost.dnsalias.org>
 
 	* configure.ac: Bump version to 1.4.1
@@ -5993,8 +6022,8 @@
 2002-08-21  Sergey Poznyakoff  <gray@Mirddin.farlep.net>
 
 	* syslogd/syslogd.c (main): Fixed memory overrun when writing long
-	  data blocks from /proc/kmsg. Thanks to Michael Deutschmann
-	  <michael@talamasca.ocis.net>
+	data blocks from /proc/kmsg.  Thanks to Michael Deutschmann
+	<michael@talamasca.ocis.net>
 
 2002-08-09  Sergey Poznyakoff  <gray@Mirddin.farlep.net>
 
@@ -6006,15 +6035,14 @@
 
 2002-08-04  Sergey Poznyakoff  <Mirddin.farlep.net>
 
-	* acinclude.m4 (IU_CHECK_MEMBER,IU_CHECK_MEMBERS): added new
-	  macros to override the autoconf bug noted on 2002-05-14.
-	  The old workaround didn't work for some cases (namely,
-	  utmp.ut_exit, whose members are named differently on
-	  different systems). When the autoconf is updated, the
-	  need for these macros will disappear.
+	* acinclude.m4 (IU_CHECK_MEMBER, IU_CHECK_MEMBERS): added new
+	macros to override the autoconf bug noted on 2002-05-14.  The old
+	workaround didn't work for some cases (namely, utmp.ut_exit, whose
+	members are named differently on different systems).  When the
+	autoconf is updated, the need for these macros will disappear.
 	* configure.ac: Use IU_CHECK_MEMBER(S) instead of AC_CHECK_MEMBERS
-	  throughout the file.
-
+	throughout the file.
+
 2002-07-31  Jeff Bailey  <jbailey@outpost.dnsalias.org>
 
 	* configure.ac: Update version to 1.4
@@ -6043,47 +6071,47 @@
 
 2002-05-14  Sergey Poznyakoff  <gray@Mirddin.farlep.net>
 
-	* tftp/tftp.c: Checks for HAVE_DECL variables must read
-	  #if !HAVE_DECL_something, since AC_CHECK_DECLS always
-	  declares HAVE_DECL, either to 0 or to 1.
+	* tftp/tftp.c: Checks for HAVE_DECL variables must read #if
+	!HAVE_DECL_something, since AC_CHECK_DECLS always declares
+	HAVE_DECL, either to 0 or to 1.
 	* tftpd/tftpd.c: Likewise.
 
 2002-05-14  Sergey Poznyakoff  <gray@Mirddin.farlep.net>
 
-	* telnet/authenc.c: Checks for HAVE_DECL variables must read
-	  #if !HAVE_DECL_something, since AC_CHECK_DECLS always
-	  declares HAVE_DECL, either to 0 or to 1.
+	* telnet/authenc.c: Checks for HAVE_DECL variables must read #if
+	!HAVE_DECL_something, since AC_CHECK_DECLS always declares
+	HAVE_DECL, either to 0 or to 1.
 	* telnet/commands.c: Likewise.
 
 2002-05-14  Sergey Poznyakoff  <gray@Mirddin.farlep.net>
 
-	* talk/ctl.c: Use HAVE_STRUCT_type_member instead
-	  of HAVE_type_member.
+	* talk/ctl.c: Use HAVE_STRUCT_type_member instead of
+	HAVE_type_member.
 
 2002-05-14  Sergey Poznyakoff  <gray@Mirddin.farlep.net>
 
-	* rexecd/rexecd.c: Use HAVE_STRUCT_type_member instead
-	  of HAVE_type_member.
+	* rexecd/rexecd.c: Use HAVE_STRUCT_type_member instead of
+	HAVE_type_member.
 
 2002-05-14  Sergey Poznyakoff  <gray@Mirddin.farlep.net>
 
-	* rcp/rcp.c: Checks for HAVE_DECL variables must read
-	  #if !HAVE_DECL_something, since AC_CHECK_DECLS always
-	  declares HAVE_DECL, either to 0 or to 1.
+	* rcp/rcp.c: Checks for HAVE_DECL variables must read #if
+	!HAVE_DECL_something, since AC_CHECK_DECLS always declares
+	HAVE_DECL, either to 0 or to 1.
 	  (tolocal): Removed redefinitions of IP_TOS et al.
 
 2002-05-14  Sergey Poznyakoff  <gray@Mirddin.farlep.net>
 
 	* libinetutils/herror.c: Checks for HAVE_DECL variables must read
-	  #if !HAVE_DECL_something, since AC_CHECK_DECLS always
-	  declares HAVE_DECL, either to 0 or to 1.
+	#if !HAVE_DECL_something, since AC_CHECK_DECLS always declares
+	HAVE_DECL, either to 0 or to 1.
 	* libinetutils/hstrerror.c: Likewise.
 	* libinetutils/logwtmp.c: Likewise.
 	* libinetutils/revoke.c: Likewise.
 	* libinetutils/setenv.c: Likewise.
 
-	* libinetutils/iruserok.c: Use HAVE_STRUCT_type_member instead
-	  of HAVE_type_member.
+	* libinetutils/iruserok.c: Use HAVE_STRUCT_type_member instead of
+	HAVE_type_member.
 	* libinetutils/logout.c: Likewise.
 	* libinetutils/ruserok.c: Likewise.
 	* libinetutils/utmp_init.c: Likewise.
@@ -6093,40 +6121,40 @@
 
 	* ifconfig/Makefile.am: Removed obsolete OMIT_DEPENDENCIES.
 	* ifconfig/system.h: Use HAVE_STRUCT_type_member instead of
-	  HAVE_type_member.
+	HAVE_type_member.
 
 2002-05-14  Sergey Poznyakoff  <gray@Mirddin.farlep.net>
 
-	* headers/crypt.h: Checks for HAVE_DECL variables must read
-	  #if !HAVE_DECL_something, since AC_CHECK_DECLS always
-	  declares HAVE_DECL, either to 0 or to 1.
+	* headers/crypt.h: Checks for HAVE_DECL variables must read #if
+	!HAVE_DECL_something, since AC_CHECK_DECLS always declares
+	HAVE_DECL, either to 0 or to 1.
 
 2002-05-14  Sergey Poznyakoff  <gray@Mirddin.farlep.net>
 
-	* ftpd/ftp.c: Checks for HAVE_DECL variables must read
-	  #if !HAVE_DECL_something, since AC_CHECK_DECLS always
-	  declares HAVE_DECL, either to 0 or to 1.
+	* ftpd/ftp.c: Checks for HAVE_DECL variables must read #if
+	!HAVE_DECL_something, since AC_CHECK_DECLS always declares
+	HAVE_DECL, either to 0 or to 1.
 	* ftpd/extern.h: Likewise.
 	* ftpd/ftpd.c: Likewise.
 
 2002-05-14  Sergey Poznyakoff  <gray@Mirddin.farlep.net>
 
 	* configure.ac: AC_CHECK_MEMBERS (as of version 2.53 ) fails to
-	  recognize the presense of a structure member which is itself
-	  of an aggregate type. Thus, tests for struct ifreq.ifr_netmask
-	  and struct ifreq.ifr_broadaddr always fail. To work around the
-	  bug, first check for a non-aggregate sub-member of the member
-	  in question and then create an appropriate HAVE_ define.
-
-	  Use AC_CHECK_DECLS on crypt and errno, as AC_CHECK_DECL does
-	  not generate HAVE_DECL_ define.
-
-	  (AH_BOTTOMs): Checks for HAVE_DECL variables must read
-	  #if !HAVE_DECL_something, since AC_CHECK_DECLS always
-	  declares HAVE_DECL, either to 0 or to 1. The only
-	  exception is HAVE_DECL_HSTRERROR, whose AC_CHECK_DECLS
-	  is under a conditional expression, so we have to
-	  check for !defined(HAVE_DECL_HSTRERROR) first.
+	recognize the presense of a structure member which is itself of an
+	aggregate type.  Thus, tests for struct ifreq.ifr_netmask and
+	struct ifreq.ifr_broadaddr always fail.  To work around the bug,
+	first check for a non-aggregate sub-member of the member in
+	question and then create an appropriate HAVE_ define.
+
+	Use AC_CHECK_DECLS on crypt and errno, as AC_CHECK_DECL does not
+	generate HAVE_DECL_ define.
+
+	(AH_BOTTOMs): Checks for HAVE_DECL variables must read #if
+	!HAVE_DECL_something, since AC_CHECK_DECLS always declares
+	HAVE_DECL, either to 0 or to 1.  The only exception is
+	HAVE_DECL_HSTRERROR, whose AC_CHECK_DECLS is under a conditional
+	expression, so we have to check for !defined(HAVE_DECL_HSTRERROR)
+	first.
 
 2002-04-29  Alfred M. Szmidt  <ams@kemisten.nu>
 
@@ -6190,8 +6218,8 @@
 
 2002-04-29  Alfred M. Szmidt  <ams@kemisten.nu>
 
-	* ping/ping_timestamp.c, ping_router.c, ping_echo.c, ping_address.c
-	<version.h>: Include removed.
+	* ping/ping_timestamp.c, ping_router.c, ping_echo.c,
+	ping_address.c <version.h>: Include removed.
 
 	* ping/ping.c <version.h>: Include removed.
 	(inetutils_package): Renamed to PACKAGE_NAME.
@@ -6214,9 +6242,9 @@
 
 2002-04-29  Alfred M. Szmidt  <ams@kemisten.nu>
 
-	* ifconfig/system/solaris.c, system/qnx.c, system/osf.c, system/linux.c,
-	system/hpux.c, system/generic.c, printif.c, ifconfig.c, changeif.c,
-	options.c <version.h>: Include removed.
+	* ifconfig/system/solaris.c, system/qnx.c, system/osf.c,
+	system/linux.c, system/hpux.c, system/generic.c, printif.c,
+	ifconfig.c, changeif.c, options.c <version.h>: Include removed.
 
 	* ifconfig/options.c (inetutils_package): Renamed to PACKAGE_NAME.
 	(inetutils_version): Renamed to PACKAGE_VERSION.
@@ -6224,7 +6252,8 @@
 
 2002-04-29  Alfred M. Szmidt  <ams@kemisten.nu>
 
-	* headers/Makefile.am (EXTRA_DIST): Removed version.h.in from the list.
+	* headers/Makefile.am (EXTRA_DIST): Removed version.h.in from the
+	list.
 	* headers/version.h.in: Removed.
 
 2002-04-29  Alfred M. Szmidt  <ams@kemisten.nu>
@@ -6264,58 +6293,59 @@
 
 2002-04-21  Alfred M. Szmidt <ams@kemisten.nu>
 
-	* uucpd/Makefile.am (inetdaemon_PROGRAMS): Use uucpd_BUILD instead of
-	BUILD_UUCPD.
+	* uucpd/Makefile.am (inetdaemon_PROGRAMS): Use uucpd_BUILD instead
+	of BUILD_UUCPD.
 
 2002-04-21  Alfred M. Szmidt <ams@kemisten.nu>
 
-	* tftpd/Makefile.am (inetdaemon_PROGRAMS): Use tftpd_BUILD instead of
-	BUILD_TFTPD.
-	* tftpd/tftpd.c [HAVE_STRERROR_DECL]: Renamed to HAVE_DECL_STRERROR.
+	* tftpd/Makefile.am (inetdaemon_PROGRAMS): Use tftpd_BUILD instead
+	of BUILD_TFTPD.
+	* tftpd/tftpd.c [HAVE_STRERROR_DECL]: Renamed to
+	HAVE_DECL_STRERROR.
 
 2002-04-21  Alfred M. Szmidt <ams@kemisten.nu>
 
-	* tftp/Makefile.am (inetdaemon_PROGRAMS): Use tftpd_BUILD instead of
-	BUILD_TFTPD.
+	* tftp/Makefile.am (inetdaemon_PROGRAMS): Use tftpd_BUILD instead
+	of BUILD_TFTPD.
 	* tftp/tftp.c [HAVE_STRERROR_DECL]: Renamed to HAVE_DECL_STRERROR.
 
 2002-04-21  Alfred M. Szmidt <ams@kemisten.nu>
 
 	* telnet/Makefile.am (bin_PROGRAMS): Use telnet_BUILD instead of
 	BUILD_TELNET.
-	* telnet/authenc.c [HAVE_GETPASS_DECL]: Renamed to HAVE_DECL_GETPASS.
+	* telnet/authenc.c [HAVE_GETPASS_DECL]: Renamed to
+	HAVE_DECL_GETPASS.
 	* telnet/commands.c [HAVE_HTONS_DECL]: Renamed to HAVE_DECL_HTONS.
 
 2002-04-21  Alfred M. Szmidt <ams@kemisten.nu>
 
-	* talkd/Makefile.am (inetdaemon_PROGRAMS): Use talkd_BUILD instead of
-	BUILD_TALKD.
+	* talkd/Makefile.am (inetdaemon_PROGRAMS): Use talkd_BUILD instead
+	of BUILD_TALKD.
 
 2002-04-21  Alfred M. Szmidt <ams@kemisten.nu>
 
-	* talk/Makefile.am (bin_PROGRAMS): Use talk_BUILD instead
-	of BUILD_TALK.
+	* talk/Makefile.am (bin_PROGRAMS): Use talk_BUILD instead of
+	BUILD_TALK.
 
 2002-04-21  Alfred M. Szmidt <ams@kemisten.nu>
 
 	* syslogd/Makefile.am (inetdaemon_PROGRAMS): Use syslogd_BUILD
-	instead of
-	BUILD_SYSLOGD.
+	instead of BUILD_SYSLOGD.
 
 2002-04-21  Alfred M. Szmidt <ams@kemisten.nu>
 
-	* rshd/Makefile.am (inetdaemon_PROGRAMS): Use rshd_BUILD instead of
-	BUILD_RSHD.
+	* rshd/Makefile.am (inetdaemon_PROGRAMS): Use rshd_BUILD instead
+	of BUILD_RSHD.
 
 2002-04-21  Alfred M. Szmidt <ams@kemisten.nu>
 
-	* rsh/Makefile.am (bin_PROGRAMS): Use rsh_BUILD instead of BUILD_RSH.
+	* rsh/Makefile.am (bin_PROGRAMS): Use rsh_BUILD instead of
+	BUILD_RSH.
 
 2002-04-21  Alfred M. Szmidt <ams@kemisten.nu>
 
 	* rlogind/Makefile.am (inetdaemon_PROGRAMS): Use rlogind_BUILD
-	instead of
-	BUILD_RLOGIND.
+	instead of BUILD_RLOGIND.
 
 2002-04-21  Alfred M. Szmidt <ams@kemisten.nu>
 
@@ -6324,12 +6354,13 @@
 
 2002-04-21  Alfred M. Szmidt <ams@kemisten.nu>
 
-	* rexecd/Makefile.am (inetdaemon_PROGRAMS): Use rexecd_BUILD instead of
-	BUILD_REXECD.
+	* rexecd/Makefile.am (inetdaemon_PROGRAMS): Use rexecd_BUILD
+	instead of BUILD_REXECD.
 
 2002-04-21  Alfred M. Szmidt <ams@kemisten.nu>
 
-	* rcp/Makefile.am (bin_PROGRAMS): Use rcp_BUILD instead of BUILD_RCP.
+	* rcp/Makefile.am (bin_PROGRAMS): Use rcp_BUILD instead of
+	BUILD_RCP.
 	* rcp/rcp.c [HAVE_STRERROR_DECL]: Renamed to HAVE_DECL_STRERROR.
 
 2002-04-21  Alfred M. Szmidt <ams@kemisten.nu>
@@ -6361,13 +6392,13 @@
 
 2002-04-21  Alfred M. Szmidt <ams@kemisten.nu>
 
-	* inetd/Makefile.am (inetdaemon_PROGRAMS): Use inetd_BUILD instead of
-	BUILD_INETD.
+	* inetd/Makefile.am (inetdaemon_PROGRAMS): Use inetd_BUILD instead
+	of BUILD_INETD.
 
 2002-04-21  Alfred M. Szmidt <ams@kemisten.nu>
 
-	* ifconfig/Makefile.am (bin_PROGRAMS): Use ifconfig_BUILD instead of
-	BUILD_IFCONFIG.
+	* ifconfig/Makefile.am (bin_PROGRAMS): Use ifconfig_BUILD instead
+	of BUILD_IFCONFIG.
 
 2002-04-21  Alfred M. Szmidt <ams@kemisten.nu>
 
@@ -6375,23 +6406,26 @@
 
 2002-04-21  Alfred M. Szmidt <ams@kemisten.nu>
 
-	* gwhois/Makefile.am (bin_PROGRAMS): Use whois_BUILD instead of BUILD_WHOIS.
+	* gwhois/Makefile.am (bin_PROGRAMS): Use whois_BUILD instead of
+	BUILD_WHOIS.
 
 2002-04-21  Alfred M. Szmidt <ams@kemisten.nu>
 
 	* glob/Makefile.am (noinst_LIBRARIES) Use libglob_BUILD instead of
-	  BUILD_LIBGLOB.
+	BUILD_LIBGLOB.
 
 2002-04-21  Alfred M. Szmidt <ams@kemisten.nu>
 
-	* ftpd/Makefile.am (inetdaemon_PROGRAMS): Use ftpd_BUILD instead of
-	BUILD_FTPD.
-	* ftpd/extern.h [HAVE_GETUSERSHELL_DECL]: Renamed to HAVE_DECL_GETUSERSHELL.
+	* ftpd/Makefile.am (inetdaemon_PROGRAMS): Use ftpd_BUILD instead
+	of BUILD_FTPD.
+	* ftpd/extern.h [HAVE_GETUSERSHELL_DECL]: Renamed to
+	HAVE_DECL_GETUSERSHELL.
 	* ftpd/ftpd.c [HAVE_FCLOSE_DECL]: Renamed to HAVE_DECL_FCLOSE.
 
 2002-04-21  Alfred M. Szmidt <ams@kemisten.nu>
 
-	* ftp/Makefile.am (bin_PROGRAMS): Use ftp_BUILD instead of BUILD_FTP.
+	* ftp/Makefile.am (bin_PROGRAMS): Use ftp_BUILD instead of
+	BUILD_FTP.
 	* ftp/ftp.c [HAVE_FCLOSE_DECL]: Renamed to HAVE_DECL_FCLOSE.
 	[HAVE_PCLOSE_DECL]: Renamed to HAVE_DECL_PCLOSE.
 
@@ -6400,9 +6434,10 @@
 	* Makefile.am (AUTOMAKE_OPTIONS): Require GNU Automake 1.6.
 
 	* acinclude.m4 (IU_UCASE, iu_lcase): Variables removed.
-	(IU_RESULT_ACTIONS, IU_CHECK_WEAK_REFS): Use the new AC_DEFINE syntax.
-	(IU_CHECK_DECL, IU_CHECK_TYPE, IU_CHECK_STRUCT_FIELD):
-	Functions removed.
+	(IU_RESULT_ACTIONS, IU_CHECK_WEAK_REFS): Use the new AC_DEFINE
+	syntax.
+	(IU_CHECK_DECL, IU_CHECK_TYPE, IU_CHECK_STRUCT_FIELD): Functions
+	removed.
 	(IU_ENABLE_FOO): Use name_BUILD instead of BUILD_NAME.
 	(IU_INCLUDED_REGEX): Replaced with..
 	(jm_INCLUDED_REGEX): this.
@@ -6425,10 +6460,10 @@
 2002-04-08  Sergey Poznyakoff  <gray@Mirddin.farlep.net>
 
 	* acconfig.h: #undef's for KERBEROS_IV and KERBEROS_V
-	* acinclude.m4 (IU_CHECK_KRB5): New macro: check for the
-	  presense of kerberos v.5
+	* acinclude.m4 (IU_CHECK_KRB5): New macro: check for the presense
+	of kerberos v.5
 	* configure.ac: New options: --with-krb4[=PATH],
-	  --with-krb5[=PATH]
+	--with-krb5[=PATH]
 
 2002-04-07  Sergey Poznyakoff  <gray@Mirddin.farlep.net>
 
@@ -6437,14 +6472,14 @@
 
 2002-04-07  Sergey Poznyakoff  <gray@Mirddin.farlep.net>
 
-	* telnetd/telnetd.c: Initialize login_invocation. Fixed calls
-	  to inet_ntoa.
-	  (print_hostinfo): Implemented.
+	* telnetd/telnetd.c: Initialize login_invocation.  Fixed calls to
+	inet_ntoa.
+	(print_hostinfo): Implemented.
 	* telnetd/pty.c: Use new expand_line to create login command line.
 	* telnetd/telnetd.h: Added missing prototypes.
 	* telnetd/utility.c: Added line expansion code.
-	  (io_setup): Initialize ptyip.
-	  (pty_input_putback): new function.
+	(io_setup): Initialize ptyip.
+	(pty_input_putback): new function.
 
 2002-04-07  Sergey Poznyakoff
 
@@ -6452,10 +6487,10 @@
 
 2002-04-07  Sergey Poznyakoff  <gray@Mirddin.farlep.net>
 
-	* libinetutils/utmp_logout.c (utmp_logout): Bugfix: gettimeofday() (and
-	  time()) was used over a member of utx, instead of ut.
-	  Consequently, all sessions were recorded in wtmp as having
-	  zero duration.
+	* libinetutils/utmp_logout.c (utmp_logout): Bugfix: gettimeofday()
+	(and time()) was used over a member of utx, instead of ut.
+	Consequently, all sessions were recorded in wtmp as having zero
+	duration.
 
 2002-04-05  Sergey Poznyakoff  <gray@Mirddin.farlep.net>
 
@@ -6472,10 +6507,11 @@
 	* telnetd/telnetd.h: Rewritten.
 	* telnetd/utility.c: Rewritten.
 
-	* telnetd/pty.c: Use obstack instead of manually allocating memory.
+	* telnetd/pty.c: Use obstack instead of manually allocating
+	memory.
 
-	* telnetd/slc.c: Lots of fixes: Removed conditional dependencies on
-	  LINEMODE, reduced number of global variables.
+	* telnetd/slc.c: Lots of fixes: Removed conditional dependencies
+	on LINEMODE, reduced number of global variables.
 	* telnetd/state.c: Likewise.
 	* telnetd/termstat.c: Likewise.
 
@@ -6484,10 +6520,11 @@
 	* libinetutils/libinetutils/obstack.c: new
 	* libinetutils/libinetutils/Makefile.am: Added obstack.c
 
-	* libinetutils/libinetutils/utmp_init.c: Use ifdef UTMPX, instead of
-	  HAVE_UTMPX_H.
-	* libinetutils/libinetutils/utmp_logout.c: Likewise. (utmp_logout): fallback
-	  to logwtmp() if updwtmp() is not available.
+	* libinetutils/libinetutils/utmp_init.c: Use ifdef UTMPX, instead
+	of HAVE_UTMPX_H.
+	* libinetutils/libinetutils/utmp_logout.c: Likewise.
+	(utmp_logout): fallback to logwtmp() if updwtmp() is not
+	available.
 
 2002-04-05  Sergey Poznyakoff  <gray@Mirddin.farlep.net>
 
@@ -6500,46 +6537,45 @@
 
 2002-04-05  Sergey Poznyakoff  <gray@Mirddin.farlep.net>
 
-	* acconfig.h: Removed extra HAVE_UTMPX_H. Added HAVE_CC_T
-	  and HAVE_LIBREADLINE.
-	* configure.ac: Check for obstack functions. Modified
-	  readline check: assign -lreadline to the separate AC_SUBST
-	  variable, instead of appending it to LIBS. Check for cc_t
-	  type.
-	  Raised patchlevel.
+	* acconfig.h: Removed extra HAVE_UTMPX_H.  Added HAVE_CC_T and
+	HAVE_LIBREADLINE.
+	* configure.ac: Check for obstack functions.  Modified readline
+	check: assign -lreadline to the separate AC_SUBST variable,
+	instead of appending it to LIBS.  Check for cc_t type.  Raised
+	patchlevel.
 
 2002-03-14  Sergey Poznyakoff  <gray@Mirddin.farlep.net>
 
-	Started fixing horrible mess in telnetd. To begin with,
-	segregated pty-related functions from tty-related ones.
-	Use forkpty instead of manually fiddling with lots of ifdefs.
-	The stuff has been tested on GNU/Linux and Solaris.
+	Started fixing horrible mess in telnetd.  To begin with,
+	segregated pty-related functions from tty-related ones.  Use
+	forkpty instead of manually fiddling with lots of ifdefs.  The
+	stuff has been tested on GNU/Linux and Solaris.
 
 	* telnetd/pty.c (new): PTY-related functions.
 	* telnetd/Makefile.am: Added pty.c
 	* telnetd/ext.h: Changed definition of line.
-	* telnetd/sys_term.c: Removed unneeded functions. Some of them
-	  are re-implemented in pty.c
+	* telnetd/sys_term.c: Removed unneeded functions.  Some of them
+	are re-implemented in pty.c
 	* telnetd/telnetd.c (doit, telnet, readstream): Reorganized.
 
 2002-03-14  Sergey Poznyakoff  <gray@Mirddin.farlep.net>
 
-	* configure.ac: Added AC_CANONICAL_SYSTEM to set $host
-	  properly. Additional AC_DEFINEs for Solaris.
+	* configure.ac: Added AC_CANONICAL_SYSTEM to set $host properly.
+	Additional AC_DEFINEs for Solaris.
 
 2002-03-05  Marcus Brinkmann  <marcus@gnu.org>
 
-	* syslogd/syslogd.c (main): New variables KLINE and KLINE_LEN, to store
-	partial lines from the kernel log device.  Collect partial lines
-	until we either have a maximum partial line or a full line.  Log
-	that, and all following lines collected so far, and in the case of
-	the maximum partial line skip the remainder of the current line.
-	Reported by Davin McCall <davmac@iname.com>.
+	* syslogd/syslogd.c (main): New variables KLINE and KLINE_LEN, to
+	store partial lines from the kernel log device.  Collect partial
+	lines until we either have a maximum partial line or a full line.
+	Log that, and all following lines collected so far, and in the
+	case of the maximum partial line skip the remainder of the current
+	line.  Reported by Davin McCall <davmac@iname.com>.
 
 2002-02-13  Sergey Poznyakoff  <gray@Mirddin.farlep.net>
 
-	* glob/Makefile.am (INCLUDES): Added -I$(top_builddir)/include (needed
-	  for fnmatch.h and confpaths.h)
+	* glob/Makefile.am (INCLUDES): Added -I$(top_builddir)/include
+	(needed for fnmatch.h and confpaths.h)
 
 2002-02-12  Jeff Bailey  <jbailey@outpost.dnsalias.org>
 
@@ -6627,7 +6663,8 @@
 
 2002-02-10  Jeff Bailey  <jbailey@outpost.dnsalias.org>
 
-	* libinetutils/Makefile.am: Add -I$(top_builddir)/include to INCLUDES
+	* libinetutils/Makefile.am: Add -I$(top_builddir)/include to
+	INCLUDES
 
 2002-02-10  Jeff Bailey  <jbailey@outpost.dnsalias.org>
 
@@ -6673,12 +6710,12 @@
 	* headers/acconfig.h: Move to ...
 	* acconfig.h: Here
 
-	* Makefile.am: Require Automake 1.5.  Add doc and doc/rfc to
-	build tree.  Don't tell autoheader to look in headers/
+	* Makefile.am: Require Automake 1.5.  Add doc and doc/rfc to build
+	tree.  Don't tell autoheader to look in headers/
 
-	I moved config.h to the top_builddir to overcome a bug in
-	autoconf that requires the config.h to be in the same
-	directory as aclocal.m4
+	I moved config.h to the top_builddir to overcome a bug in autoconf
+	that requires the config.h to be in the same directory as
+	aclocal.m4
 
 	This meant that I also had to add
 	INCLUDES=-I$(top_builddir)/include.  The upshot is that make
@@ -6690,8 +6727,8 @@
 2001-12-25  Alain Magloire
 
 	* libinetutils/poll.c: Added <time.h>
-	* libinetutils/getpass.c: New file, getpass().
-	Bert De Knuydt <Bert.Deknuydt@esat.kuleuven.ac.be>.
+	* libinetutils/getpass.c: New file, getpass().  Bert De Knuydt
+	<Bert.Deknuydt@esat.kuleuven.ac.be>.
 
 2001-12-25  Alain Magloire
 
@@ -6700,18 +6737,17 @@
 
 2001-12-25  Alain Magloire
 
-	* configure.in:  Add check for mkstemp ().
-	Check for getpass().
+	* configure.in: Add check for mkstemp ().  Check for getpass().
 	Note from Bert De Knuydt <Bert.Deknuydt@esat.kuleuven.ac.be>.
 
 2001-11-22  Sergey Poznyakoff
 
-	* rlogin/rlogin.c: Fixed syntax error: sizeof int. Should be:
+	* rlogin/rlogin.c: Fixed syntax error: sizeof int.  Should be:
 	sizeof(int).
 
 2001-11-22  Sergey Poznyakoff
 
-	* rcp/rcp.c: Fixed syntax error: sizeof int. Should be:
+	* rcp/rcp.c: Fixed syntax error: sizeof int.  Should be:
 	sizeof(int).
 
 2001-11-21  Sergey Poznyakoff
@@ -6732,8 +6768,8 @@
 
 2001-11-10  Alain Magloire
 
-	* rcp/rcp.c (help): New function.
-	Convert to getopt_long () for long options support.
+	* rcp/rcp.c (help): New function.  Convert to getopt_long () for
+	long options support.
 
 2001-11-10  Alain Magloire
 
@@ -6786,67 +6822,61 @@
 2001-11-04  Sergey Poznyakoff
 
 	* rlogind/rlogind.c: The second argument for daemon() should be 0:
-	close all descriptors and reserve first three ones. Otherwise
-	master/slave ptys could get all messed up.
-	Also changed first argument to 0, i.e. perform chdir("/"), so
-	we don't keep cwd used.
+	close all descriptors and reserve first three ones.  Otherwise
+	master/slave ptys could get all messed up.  Also changed first
+	argument to 0, i.e. perform chdir("/"), so we don't keep cwd
+	used.
 
 2001-11-03  Alain Magloire
 
-	* rsh/rsh.c: Removed copyright and sccsid variable.
-	Changes to follow GNU coding style.
-	#include <version.h>.
-	In long_options add options from rlogin.
+	* rsh/rsh.c: Removed copyright and sccsid variable.  Changes to
+	follow GNU coding style.  #include <version.h>.  In long_options
+	add options from rlogin.
 	(help): Put info about rlogin options.
-	(main): Change the code to use getop_long()
-	correctly.  Added option -V and -h.
+	(main): Change the code to use getop_long() correctly.  Added
+	option -V and -h.
 
 2001-11-03  Alain Magloire
 
 	* rlogind/rlogind.c: A little indentation work 8-).
-	(rlogin_daemon): Use function daemon(1,1) to daemonize.
-	More portable and any bug fix will benefit all.
+	(rlogin_daemon): Use function daemon(1, 1) to daemonize.  More
+	portable and any bug fix will benefit all.
 
 2001-11-03  Alain Magloire
 
-	* rlogin/rlogin.c: Removed copyryght and sccsid.
-	#include <err.h>.
-	short_options add -V.
-	(main): Check if we are setuid root, if not
-	bail out early.
+	* rlogin/rlogin.c: Removed copyryght and sccsid.  #include
+	<err.h>.  short_options add -V.
+	(main): Check if we are setuid root, if not bail out early.
 	(usage): Add -l, -V and -h info.
 
 2001-11-03  Alain Magloire
 
-	* rlogin/rlogin.c: #include <version.h>
-	Reindent to comply to GNU coding style.
-	Implemented long version options.
-	Call seteeuid() not only setuid() when rcmd is finish.
-	Get rid of __STDC__ for function prototype, it was not
-	use consistently anyways.
-	Nuked -L option 'litout' the code was commented out
-	and nowadays nobody cares.
+	* rlogin/rlogin.c: #include <version.h> Reindent to comply to GNU
+	coding style.  Implemented long version options.  Call seteeuid()
+	not only setuid() when rcmd is finish.  Get rid of __STDC__ for
+	function prototype, it was not use consistently anyways.  Nuked -L
+	option 'litout' the code was commented out and nowadays nobody
+	cares.
 	(usage): Changed for long option output.
 
 2001-11-03  Alain Magloire
 
 	* libinetutils/daemon.c: GNU coding style changes.
-	(waitdaemon): Try to find the number of file descriptor,
-	check _SC_OPEN_MAX, getdtablsize() before falling to the default.
+	(waitdaemon): Try to find the number of file descriptor, check
+	_SC_OPEN_MAX, getdtablsize() before falling to the default.
 
 2001-11-03  Alain Magloire
 
-	* ftpd/server_mode.c: [DEFPORT] defiine to 21.
-	Fallback to DEFPORT if getservbyname() failed.
-	Lots of site does not configure the /etc/services
-	correctly.
+	* ftpd/server_mode.c: [DEFPORT] defiine to 21.  Fallback to
+	DEFPORT if getservbyname() failed.  Lots of site does not
+	configure the /etc/services correctly.
 
 2001-11-03  Alain Magloire
 
 	* doc/rlogind.texi: New file.
 	* doc/rlogin.texi: New file.
-	* doc/Makefile.am: Add rlogin.texi and rlogind.texi in dependencies.
-	SUBDIRS added rfc.
+	* doc/Makefile.am: Add rlogin.texi and rlogind.texi in
+	dependencies.  SUBDIRS added rfc.
 	* doc/inetutils.texi: Enable rlogin and rlogind.
 	* doc/rfc/1282.txt: New file.
 
@@ -6883,8 +6913,8 @@
 
 2001-11-02  Marcus Brinkmann  <marcus@gnu.org>
 
-	* headers/acconfig.h: Add macros for HAVE_UTMP_UT_PID, HAVE_UTMP_UT_ID,
-	HAVE_UTMP_UT_USER.
+	* headers/acconfig.h: Add macros for HAVE_UTMP_UT_PID,
+	HAVE_UTMP_UT_ID, HAVE_UTMP_UT_USER.
 
 2001-11-02  Marcus Brinkmann  <marcus@gnu.org>
 
@@ -6892,8 +6922,8 @@
 
 2001-11-02  Marcus Brinkmann  <marcus@gnu.org>
 
-	* doc/inetutils.texi: Fix dir entries and the menu.  Remove all those
-	nonexisting nodes, and replace them by include directives.
+	* doc/inetutils.texi: Fix dir entries and the menu.  Remove all
+	those nonexisting nodes, and replace them by include directives.
 	Comment out missing nodes.  Fix some minor formatting.
 	* doc/syslogd.texi: Add node and chapter directives.
 	* doc/logger.texi: Likewise.
@@ -6904,7 +6934,8 @@
 
 	* doc/syslogd.texi: A lot of small formatting fixes.
 	* doc/logger.texi: New file.
-	* doc/inetutils.texi: Rename syslog to logger and add entry for it.
+	* doc/inetutils.texi: Rename syslog to logger and add entry for
+	it.
 
 2001-11-02  Marcus Brinkmann  <marcus@gnu.org>
 
@@ -6928,10 +6959,10 @@
 
 2001-10-30  Alain Magloire
 
-	* talkd/Makefile.am:  Add -I ../libinetutils to have the argvc_xx()
+	* talkd/Makefile.am: Add -I ../libinetutils to have the argvc_xx()
 	prototypes.
-	* talkd/acl.c: Add <ctype.h> we use isdigit().
-	Add "argv.h" we use argv_xx() functions.
+	* talkd/acl.c: Add <ctype.h> we use isdigit().  Add "argv.h" we
+	use argv_xx() functions.
 	(read_address): Declared static and variable addr unused nuked.
 	(netdef_parse): Declared static.
 	(open_users_acl): Declared static.
@@ -6944,12 +6975,12 @@
 	* talkd/print.c (messages_types): Array declared const and static.
 	(answers): Array declared const and static.
 	(_xlat_num): Declared static.
-	(print_request): First argument declared const and should
-	have a return value.
-	(print_response): First argument declared const and should
-	have a return value.
-	* talkd/process.c (process_request): Bug, process did not have
-	a return value.
+	(print_request): First argument declared const and should have a
+	return value.
+	(print_response): First argument declared const and should have a
+	return value.
+	* talkd/process.c (process_request): Bug, process did not have a
+	return value.
 	* talkd/table.c (lookup_request): Declared static and function
 	pointer with proper prototypes.
 	(fuzzy_comp): Declared static.
@@ -6961,9 +6992,9 @@
 
 2001-10-29  Sergey Poznyakoff
 
-	* talkd/acl.c: Fixed declaration of read_address(). Bugfix
-	in discard_acl(): it was discarding the extra entry.
-	acl_match(): Set default action to ACT_ALLOW.
+	* talkd/acl.c: Fixed declaration of read_address().  Bugfix in
+	discard_acl(): it was discarding the extra entry.  acl_match():
+	Set default action to ACT_ALLOW.
 	* talkd/intalkd.h: Macro os2sin_addr: extract struct in_addr from
 	struct osockaddr.
 	* talkd/process.c: do_announce(): use os2sin_addr for readability.
@@ -6972,31 +7003,31 @@
 
 2001-10-28  Alain Magloire
 
-	* talkd/talkd/process.c (open_users_acl):  free (filename);
+	* talkd/talkd/process.c (open_users_acl): free (filename);
 	* talkd/talkd/talkd.c (talkd_init): Do not bail out if not root,
 	Do we have to be root?
 
 2001-10-28  Alain Magloire
 
-	Unfortunately some platforms, like QNX/Neutrino does not implement flow
-	control packet mode TIOCPKT.  If it is not defined, provide the
-	constant. It should not affect the functionnality, but the server
-	will not be able to process CTRL-Q CTRL-S.
+	Unfortunately some platforms, like QNX/Neutrino does not implement
+	flow control packet mode TIOCPKT.  If it is not defined, provide
+	the constant.  It should not affect the functionnality, but the
+	server will not be able to process CTRL-Q CTRL-S.
 
-	* rlogin/rlogin/rlogin.c: Define the  macros TIOCPKT_XXX.
-	(speed_translate): This did not work on QNX/Neutrino, since we were
-	assuming things that does not hold true.  We were assuming that B0,
-	B50 etc .. were ascending constant corresponding to 0, 1, etc ...
-	This is not portable POSIX only says that cfgetispeed() return
-	symbolic functions. To correct use approximatively the same code in
-	telnet/sys_bsd.c.
+	* rlogin/rlogin/rlogin.c: Define the macros TIOCPKT_XXX.
+	(speed_translate): This did not work on QNX/Neutrino, since we
+	were assuming things that does not hold true.  We were assuming
+	that B0, B50 etc ..  were ascending constant corresponding to 0,
+	1, etc ... This is not portable POSIX only says that
+	cfgetispeed() return symbolic functions.  To correct use
+	approximatively the same code in telnet/sys_bsd.c.
 
 2001-10-28  Alain Magloire
 
-	Certain programs __MUST__ be install root to work properly. There is
-	a hook in the installation to warn the user.  But maybe in the future
-	we should try to install as root and failed the installation if it
-	does not work?
+	Certain programs __MUST__ be install root to work properly.  There
+	is a hook in the installation to warn the user.  But maybe in the
+	future we should try to install as root and failed the
+	installation if it does not work?
 
 	* ping/Makefile.am: Rules to try install setuid root.
 	* rcp/Makefile.am: Rules to try install setuid root.
@@ -7005,33 +7036,33 @@
 
 2001-10-27  Sergey Poznyakoff
 
-	* talkd/acl.c: read_acl(): Initialize `head' to NULL (in case
-	the acl contains null hostlist).
+	* talkd/acl.c: read_acl(): Initialize `head' to NULL (in case the
+	acl contains null hostlist).
 
 2001-10-25  Alain Magloire
 
-	* telnetd/telnetd/telnetd.c: Remove stupid/obsolete hack, if an array
-	is declare const char *, you can not write(readonly) to it.  This
-	the way ISO C defines it, even if some compiler let it trough. Do
-	the right thing everytime not only for GCC.
+	* telnetd/telnetd/telnetd.c: Remove stupid/obsolete hack, if an
+	array is declare const char *, you can not write(readonly) to it.
+	This the way ISO C defines it, even if some compiler let it
+	trough.  Do the right thing everytime not only for GCC.
 
 2001-10-25  Alain Magloire
 
-	* telnet/telnet/telnet.c: jmp_buf is an opaque struct/object we should
-	not try to initialize it, and in any case globals and static
-	variables are initialize to zeros, a prerequesite of ISO C.
+	* telnet/telnet/telnet.c: jmp_buf is an opaque struct/object we
+	should not try to initialize it, and in any case globals and
+	static variables are initialize to zeros, a prerequesite of ISO C.
 
 2001-10-25  Alain Malgoire
 
 	* talkd/announce.c: Add <sys/uio.h> for "struct iovec" definition.
-	#undef MAX before redefining it.  It was set in different
-	system includes.
+	#undef MAX before redefining it.  It was set in different system
+	includes.
 
 2001-10-25  Sergey Poznyakoff
 
-	Talkd essencially rewritten. New feature: system-wide and
-	user-specific access-control lists allow for controlling
-	who and from where is able to request talks.
+	Talkd essencially rewritten.  New feature: system-wide and
+	user-specific access-control lists allow for controlling who and
+	from where is able to request talks.
 
 	* talkd/intalkd.h: (new) Implementation-specific defines.
 	* talkd/acl.c: (new) Access-control lists.
@@ -7044,22 +7075,23 @@
 
 2001-10-25  Alain Magloire
 
-	* syslogd/syslogd.c:  Use the same code in talkd/talkd.c to handle
+	* syslogd/syslogd.c: Use the same code in talkd/talkd.c to handle
 	utmp vs utmpx.
-	(wallmesg):  Use the macros when manipulating utmp functions.
+	(wallmesg): Use the macros when manipulating utmp functions.
 
 2001-10-25  Alain Magloire
 
-	* rlogind/rlogind.c (topdomain):  In badly configure systems (like
+	* rlogind/rlogind.c (topdomain): In badly configure systems (like
 	mine 8), there is no domainame, this case will cause a sigsegv.
 	Because, we take for granted that local_domain_name, will be
-	initialized correctly:
-	local_domain_name = topdomain()  // will return NULL.
-	Change topdomain() to return the original name on failure.
+	initialized correctly: local_domain_name = topdomain() // will
+	return NULL.  Change topdomain() to return the original name on
+	failure.
 
 2001-10-25  Sergey Poznyakoff
 
-	* libinetutils/argcv.c: (new) Simple string tokenizer. Needed by talkd acls.
+	* libinetutils/argcv.c: (new) Simple string tokenizer.  Needed by
+	talkd acls.
 	* libinetutils/argcv.h: (new) Definitions for argcv.c
 	* libinetutils/regex.c: (new) Regex functions.
 	* libinetutils/regex.h: (new) Definitions for regex functions.
@@ -7072,7 +7104,7 @@
 2001-10-25  Sergey Poznyakoff
 
 	* ftpd/pam.c: Provide replacements for PAM_CONV_AGAIN and
-	PAM_INCOMPLETE for systems that miss them (e.g. Solaris)
+	PAM_INCOMPLETE for systems that miss them (e.g.  Solaris)
 
 2001-10-25  Alain Magloire
 
@@ -7096,16 +7128,16 @@
 2001-09-05 Sergey Poznyakoff
 
 	* gwhois/Makefile.am: List built headers in BUILT_SOURCES so the
-	autodependency code works. Removed $(srcdir)/ prefix from
-	targets: the source directory might not be writable, so its
-	better to build headers in the build directory
-	if they are not present in srcdir. Restored EXTRA_DIST.
+	autodependency code works.  Removed $(srcdir)/ prefix from
+	targets: the source directory might not be writable, so its better
+	to build headers in the build directory if they are not present in
+	srcdir.  Restored EXTRA_DIST.
 
 2001-09-04  Michael Weiser <mweiser@robin.imn.htwk-leipzig.de>
 
 	* talkd/process.c: Guard <utmp.h> utmpx.h> properly.
-	(find_user): Guard calls to setutent() or setutxent().
-	Use sizeof(PATH_DEV) instead of hardcoded numbers.
+	(find_user): Guard calls to setutent() or setutxent().  Use
+	sizeof(PATH_DEV) instead of hardcoded numbers.
 
 2001-08-29  Marcus Brinkmann  <marcus@gnu.org>
 
@@ -7115,8 +7147,8 @@
 2001-08-27  Alain Magloire
 
 	* ftpd/Makefile.am: Add EXTRA_DIST = ftpcmd.c.  To force the
-	generation of the file when doing the distribution.  This way
-	YACC is no longer an requirement.
+	generation of the file when doing the distribution.  This way YACC
+	is no longer an requirement.
 
 2001-08-26   Alain Magloire
 
@@ -7129,19 +7161,19 @@
 
 2001-08-26  Alain Magloire
 
-	The idea is to provide an easy way to add services without
-	mocking around with inetd.conf.  It is possible to just
-	drop a file in PATH_INETDDIR, and the file will be pick
-	and merge like if it was a configuration file.  For example,
+	The idea is to provide an easy way to add services without mocking
+	around with inetd.conf.  It is possible to just drop a file in
+	PATH_INETDDIR, and the file will be pick and merge like if it was
+	a configuration file.  For example,
 
 	/etc/inetd.d/telnet
 	/etc/inetd.d/ftp
 	/etc/inetd.d/login
 	/etc/inetd.d/shell
 
-	will contain the entries to start telnet/ftp/rlogin/shell
-	without having to put them in /etc/inetd.conf.
-	The idea was submitted by Jakob.
+	will contain the entries to start telnet/ftp/rlogin/shell without
+	having to put them in /etc/inetd.conf.  The idea was submitted by
+	Jakob.
 
 	The code had a face lift to comply with GNU coding style.
 
@@ -7155,31 +7187,31 @@
 	char          *sskip __P((char **, FILE *, const char *));
 	char          *skip __P((char **, FILE *));
 	(usage): Updated.
-	(main): Localised the variables.
-	Read the line configuration files in to an array.
-	(config):  Go through the configuration files arrays and
-	call nextconfig on each file for parsing.
-	(nextconfig): Parse the configuration file and construct
-	an service entry.
+	(main): Localised the variables.  Read the line configuration
+	files in to an array.
+	(config): Go through the configuration files arrays and call
+	nextconfig on each file for parsing.
+	(nextconfig): Parse the configuration file and construct an
+	service entry.
 
 	* inetd/inetd.8: Update to document the new PATH_INETDDIR feature.
 
 2001-08-26  Alain Magloire
 
 	* gwhois/ChangeLog: New File.
-	* gwhois/Makefile.am: EXTRA_DIST = as_del.h ip_del.h tld_serv.h
-	So no need to have PERL in the distribution.
-	Add missing dependencies.
-	* gwhois/whois.c: Guard <config.h> with the appropriate HAVE_CONFIG_H
-	Remove macors GETOP_LONG and HAVE_GETOPT_LONG.  inetutils always
-	provide a version even for platforms missing it.
+	* gwhois/Makefile.am: EXTRA_DIST = as_del.h ip_del.h tld_serv.h So
+	no need to have PERL in the distribution.  Add missing
+	dependencies.
+	* gwhois/whois.c: Guard <config.h> with the appropriate
+	HAVE_CONFIG_H Remove macors GETOP_LONG and HAVE_GETOPT_LONG.
+	inetutils always provide a version even for platforms missing it.
 
 	* gwhois/config.h: remove and merge in whois.h
 
 2001-08-26  Alain Magloire
 
-	Marco D'Itri whois is much more complete then the original
-	one provided by Joel N. Weber II (devnull).  So it is enable.
+	Marco D'Itri whois is much more complete then the original one
+	provided by Joel N.  Weber II (devnull).  So it is enable.
 
 	* configure.in: use gwhois instead whois
 	* Makefile.am: SUBDIRS have gwhois instead of whois.
@@ -7191,19 +7223,19 @@
 2001-08-25  Alain Magloire
 
 	* ftpd/Makefile.am: Check for LIBLS and add it to the link.
-	* ftpd/popen.c:  WITH_LIBLS check.
+	* ftpd/popen.c: WITH_LIBLS check.
 
 2001-08-25  Alain Magloire
 
-	* configure.in: AC_ARG_ENABLE(libls ..) libls will not work
-	on all platforms, make it possible to disable it.
-	LIBLS, BUILD_LIBLS, WITH_LIBLS, new variable.s
+	* configure.in: AC_ARG_ENABLE(libls ..) libls will not work on all
+	platforms, make it possible to disable it.  LIBLS, BUILD_LIBLS,
+	WITH_LIBLS, new variable.s
 	* header/acconfig.h: WITH_LIBLS new.
 
 2001-08-17  Marcus Brinkmann  <marcus@gnu.org>
 
-	* telnet/sys_bsd.c (TerminalFlushOutput): New variable FLAGS.  Pass
-	pointers to it to the ioctls.
+	* telnet/sys_bsd.c (TerminalFlushOutput): New variable FLAGS.
+	Pass pointers to it to the ioctls.
 
 2001-08-11  Sergey Poznyakoff  <gray@farlep.net>
 
@@ -7231,9 +7263,8 @@
 
 2001-07-26  Alain Magloire
 
-	The patch was provided by Eric Gillespie, Jr., it addresses
-	a vulnerability in telnetd:
-	TESO Security Advisory 06/10/2001
+	The patch was provided by Eric Gillespie, Jr., it addresses a
+	vulnerability in telnetd: TESO Security Advisory 06/10/2001
 
 	Multiple vendor Telnet Daemon vulnerability
 
@@ -7287,29 +7318,28 @@
 	with other options by default, changing memory layout.
 
 	* telnetd/ext.h (output_data): Add prototypes for output_data.
-	* telnetd/state.c (output_data): Implement output_data().
-	Patch provided by "Eric Gillespie, Jr.".
+	* telnetd/state.c (output_data): Implement output_data().  Patch
+	provided by "Eric Gillespie, Jr.".
 
 2001-07-18  Alain Magloire
 
-	Much of the changes where indentation to follow GNU
-	coding style.  Use of "const" where appropriate.
-	atoi() is not ANSI C nor POSIX. Preferable to use
-	strto(u)l().  The same for bcopy() moving to POSIX
-	mem*() functions.
+	Much of the changes where indentation to follow GNU coding style.
+	Use of "const" where appropriate.  atoi() is not ANSI C nor POSIX.
+	Preferable to use strto(u)l().  The same for bcopy() moving to
+	POSIX mem*() functions.
 
 	* rlogind/rlogind.c:#include <sys/stat.h> is needed for chmod ().
-	#include <sys/ioctl.h> is needed for the ioctl() calls.
-	Remove the "static" scope since the functions were define whithout
-	the static qualificator.
+	#include <sys/ioctl.h> is needed for the ioctl() calls.  Remove
+	the "static" scope since the functions were define whithout the
+	static qualificator.
 	(main): atoi() replace by strtoul() where needed.
-	(rlogind_mainloop): Need to return a value since it is use
-	as an argument to exit () add return 0.
+	(rlogind_mainloop): Need to return a value since it is use as an
+	argument to exit () add return 0.
 	(getstr): argument is now const.
 	(protocol): Initialize variables pdp and fpb gcc was complaining
 	about it.
-	(protocol): n was shadowed by another n previosuly declared
-	rename the variable len and change its scope.
+	(protocol): n was shadowed by another n previosuly declared rename
+	the variable len and change its scope.
 	(protocol): bcopy() replace by memmove().
 	(control): argument change to size_t.
 	(fatal): second argument now is const char *.
@@ -7321,25 +7351,25 @@
 
 2001-07-14  Sergey Poznyakoff  <gray@farlep.net>
 
-	* rlogind/rlogind.c: Rewritten from scratch. Implemented -a
-	(verify hostname) option. Added --reverse-required and
-	--daemon options. Kerberos code is not tested, though.
+	* rlogind/rlogind.c: Rewritten from scratch.  Implemented -a
+	(verify hostname) option.  Added --reverse-required and --daemon
+	options.  Kerberos code is not tested, though.
 
 2001-07-14  Sergey Poznyakoff  <gray@farlep.net>
 
-	* ping/ping.c: Use inetutils_package instead of PACKAGE. Same for
+	* ping/ping.c: Use inetutils_package instead of PACKAGE.  Same for
 	VERSION.
 
 2001-07-14  Sergey Poznyakoff  <gray@farlep.net>
 
-	* libinetutils/openpty.c: Set RMSGN|RPROTDAT on master side of pty pair, so it
-	can be read using read() call.
+	* libinetutils/openpty.c: Set RMSGN|RPROTDAT on master side of pty
+	pair, so it can be read using read() call.
 
 2001-07-14  Sergey Poznyakoff  <gray@farlep.net>
 
 	* libinetutils/localhost.c: Return fully qualified domain name.
-	* libinetutils/login_tty.c: Rewritten from scratch. This version
-	works on systems lacking TIOCSCTTY ioctl (eg. Solaris).
+	* libinetutils/login_tty.c: Rewritten from scratch.  This version
+	works on systems lacking TIOCSCTTY ioctl (eg.  Solaris).
 
 2001-07-14  Sergey Poznyakoff  <gray@farlep.net>
 
@@ -7353,24 +7383,24 @@
 2001-07-10  Sergey Poznyakoff
 
 	* ifconfig/if_index.c: Include ifconfig.h instead of if_index.h.
-	Reason: ifconfig.h includes system.h which contains
-	definition of ifr_index member for systems lacking it.
-	It also includes if_index.h. Thanks to Alain.
+	Reason: ifconfig.h includes system.h which contains definition of
+	ifr_index member for systems lacking it.  It also includes
+	if_index.h.  Thanks to Alain.
 
 2001-06-30  Sergey Poznyakoff
 
-	* ifconfig/if_index.c: if_nameindex(): Actually fall back :^). Besides,
-	the return value was unspecified if socked() failed.
-	Removed # define ifr_ifindex ifr_index.
-	Use ifr_index instead of ifr_ifindex throughout the module, since
-	the check for its presence is already made in configure.in and
-	appropriate define is in system.h.
-	if_nameindex(): reverted condition on ioctl() return.
+	* ifconfig/if_index.c: if_nameindex(): Actually fall back :^).
+	Besides, the return value was unspecified if socked() failed.
+	Removed # define ifr_ifindex ifr_index.  Use ifr_index instead of
+	ifr_ifindex throughout the module, since the check for its
+	presence is already made in configure.in and appropriate define is
+	in system.h.  if_nameindex(): reverted condition on ioctl()
+	return.
 
 2001-06-26  Alain Magloire
 
-	* ifconfig/if_index.c: Solaris does not define ifr_index but rather
-	ifr_ifindex ... sigh ..  redefine it to ifr_index to be
+	* ifconfig/if_index.c: Solaris does not define ifr_index but
+	rather ifr_ifindex ... sigh ..  redefine it to ifr_index to be
 	consistent.
 	(if_indextoname): Typo missing closing bracket.
 
@@ -7378,35 +7408,34 @@
 	should be an int not a char since on many OS for example
 	QNX4/Watcomm C char is unsigned.
 
-	* ifconfig/system.c:  Use __QNX__
-	* ifconfig/system.h:  Use __QNX__
+	* ifconfig/system.c: Use __QNX__
+	* ifconfig/system.h: Use __QNX__
 	* ifconfig/system/qnx.h: remove qfh_netmask and qfh_brdaddr, the
 	generic versions will work fine.
 
 2001-06-25  Alain Magloire
 
 	* ifconfig/if_index.c: Fall back to the generic version if
-	SIOCGIFINDEX and SIOCGIFNAME fail.
-	Note from Sergey.
-	Define BSD_COMP for solaris machines to include
-	the ioctl definitions.
+	SIOCGIFINDEX and SIOCGIFNAME fail.  Note from Sergey.  Define
+	BSD_COMP for solaris machines to include the ioctl definitions.
 
 	* ifconfig/options.c (usage): Terminate the string with '\n\'.
-	* ifconfig/printif.c (print_interfaceX): Use alloca() instead
-	of dynamique allocated arrays, may compiler can not
-	cope with this yet.
+	* ifconfig/printif.c (print_interfaceX): Use alloca() instead of
+	dynamique allocated arrays, may compiler can not cope with this
+	yet.
 
 2001-06-23  Marcus Brinkmann  <marcus@gnu.org>
 
-	* ifconfig/system/qnx.c (qfh_brdaddr, qfh_netmask): Functions removed,
-	the generic ones will work fine with the changes to system.h.
+	* ifconfig/system/qnx.c (qfh_brdaddr, qfh_netmask): Functions
+	removed, the generic ones will work fine with the changes to
+	system.h.
 	* ifconfig/system/qnx.h: Prototypes for these functions removed.
 
 	* ifconfig/system/qnx.h: Do not define ifr_netmask.
 
 	* ifconfig/printif.h: Move check for HAVE_* introduced in last
 	change to ...
-	system.h: ... here.
+	* system.h: ... here.
 
 	* ifconfig/options.c: Revert change from Alain.
 
@@ -7414,7 +7443,7 @@
 
 	Patches by Alain:
 	* ping/ping_address.c, ping/ping_echo.c, ping/ping_router.c,
-	ping/ping_timestamp.c:	<signal.h> -> <sys/signal.h>
+	ping/ping_timestamp.c: <signal.h> -> <sys/signal.h>
 
 
 2001-06-20  Sergey Poznyakoff  <gray@farlep.net>
@@ -7422,14 +7451,16 @@
 	Patches by Alain:
 	* libicmp/icmp_cksum.c, libicmp/icmp_echo.c,
 	libicmp/icmp_timestamp.c, libicmp/libping.c: use <signal.h>
-	instead of <sys/signal.h>, truncate pid_t before using as ping_ident.
+	instead of <sys/signal.h>, truncate pid_t before using as
+	ping_ident.
 
 2001-06-20  Sergey Poznyakoff  <gray@farlep.net>
 
 	Patches by Alain:
 	* libicmp/icmp_cksum.c, libicmp/icmp_echo.c,
 	libicmp/icmp_timestamp.c, libicmp/libping.c: use <signal.h>
-	instead of <sys/signal.h>, truncate pid_t before using as ping_ident.
+	instead of <sys/signal.h>, truncate pid_t before using as
+	ping_ident.
 	* libicmp/ping.h: changed type of ping_datalen to size_t.
 	* libicmp/icmp_address.c: icmp was used unitialized.
 	* ping/ping_address.c, ping/ping_echo.c, ping/ping_router.c,
@@ -7441,7 +7472,8 @@
 
 	* libicmp/icmp_cksum.c, libicmp/icmp_echo.c,
 	libicmp/icmp_timestamp.c, libicmp/libping.c: use <signal.h>
-	instead of <sys/signal.h>, truncate pid_t before using as ping_ident.
+	instead of <sys/signal.h>, truncate pid_t before using as
+	ping_ident.
 	* libicmp/ping.h: changed type of ping_datalen to size_t.
 	* libicmp/icmp_address.c: icmp was used unitialized.
 	* ping/ping_address.c, ping/ping_echo.c, ping/ping_router.c,
@@ -7449,31 +7481,33 @@
 
 2001-06-19  Sergey Poznyakoff  <gray@farlep.net>
 
-	* ping/Makefile.am: use @BUILD_PING@ instead of directly
-	  assigning bin_PROGRAMS.
+	* ping/Makefile.am: use @BUILD_PING@ instead of directly assigning
+	bin_PROGRAMS.
 	* ping/ping.h: changed counters in struct PING from int to longs.
 	* ping/ping.c, ping/ping_address.c, ping/ping_echo.c,
 	ping/ping_impl.h, ping/ping_router.c, ping/ping_timestamp.c: Fixed
-	a bunch of inconsistencies (thanks to Alain). Changes to make gcc
+	a bunch of inconsistencies (thanks to Alain).  Changes to make gcc
 	-Wall less verbose.
 
 2001-06-19  Sergey Poznyakoff  <gray@farlep.net>
 
 	* libicmp/icmp_timestamp.c: forgotten to commit yesterday :^)
-	* libicmp/ping.h: changed counters in struct PING from int to longs.
-	* libicmp/icmp.h,libping.c,
+	* libicmp/ping.h: changed counters in struct PING from int to
+	longs.
+	* libicmp/icmp.h, libping.c,
 
 2001-06-19  Sergey Poznyakoff  <gray@farlep.net>
 
 	* configure.in, Makefile.am: added libicmp and ping to build.
-	* ping/Makefile.am: use @BUILD_PING@ instead of directly
-	  assigning bin_PROGRAMS.
+	* ping/Makefile.am: use @BUILD_PING@ instead of directly assigning
+	bin_PROGRAMS.
 	* libicmp/icmp_timestamp.c: forgotten to commit yesterday :^)
-	* libicmp/ping.h: changed counters in struct PING from int to longs.
+	* libicmp/ping.h: changed counters in struct PING from int to
+	longs.
 	* libicmp/icmp.h, libicmp/libping.c, ping/ping.c,
 	ping/ping_address.c, ping/ping_echo.c, ping/ping_impl.h,
-	ping/ping_router.c,ping/ping_timestamp.c: Fixed a bunch of
-	inconsistencies (thanks to Alain). Changes to make gcc -Wall less
+	ping/ping_router.c, ping/ping_timestamp.c: Fixed a bunch of
+	inconsistencies (thanks to Alain).  Changes to make gcc -Wall less
 	verbose.
 
 2001-06-18  Sergey Poznyakoff  <gray@farlep.net>
@@ -7496,20 +7530,20 @@
 	* ping/Makefile.am: added OMIT_DEPENDENCIES
 	* ping/ping.c, ping/ping_address.c, ping/ping_echo.c,
 	ping/ping_impl.h, ping/ping_timestamp.c: Implemented
-	ICMP_TIMESTAMP and ICMP_ADDRESSMASK requests. None of existing
+	ICMP_TIMESTAMP and ICMP_ADDRESSMASK requests.  None of existing
 	routers answers the latter, though.
 
 2001-06-13  Sergey Poznyakoff  <gray@farlep.net>
 
 	* ping/ping.c: implemented
-	* ping/ping_address.c,  ping/ping_echo.c,  ping/ping_impl.h,
-	ping/ping_router.c,  ping/ping_timestamp.c: added to repository.
+	* ping/ping_address.c, ping/ping_echo.c, ping/ping_impl.h,
+	ping/ping_router.c, ping/ping_timestamp.c: added to repository.
 
 2001-06-13  Sergey Poznyakoff  <gray@farlep.net>
 
 	* libicmp/Makefile.am, libicmp/icmp.h, libicmp/icmp_cksum.c,
 	libicmp/icmp_echo.c, libicmp/icmp_timestamp.c, libicmp/libping.c,
-	libicmp/ping.h: added to repository. Currently it is more libping
+	libicmp/ping.h: added to repository.  Currently it is more libping
 	than libicmp, I will be adding required functionality latter.
 	* ping/ping.c: implemented
 	* ping/ping_address.c, ping/ping_echo.c, ping/ping_impl.h,
@@ -7518,13 +7552,14 @@
 
 2001-06-05  Sergey Poznyakoff  <gray@farlep.net>
 
-	* libinetutils/ttymsg.c (normalize_path): Define static and provide
-	a prototype and it was call with the wrong number of arguments.
+	* libinetutils/ttymsg.c (normalize_path): Define static and
+	provide a prototype and it was call with the wrong number of
+	arguments.
 
 2001-06-05  Sergey Poznyakoff  <gray@farlep.net>
 
 	* ftpd/ftpd.c: MAP_FAILED is not defined on some systems
-	(e.g. Solaris, SunOS)
+	(e.g.  Solaris, SunOS)
 	* headers/paths.h: Added missing _PATH_LOGCONF, _PATH_LOGPID,
 	_PATH_LOG
 	* libls/print.c: Provided defaults for major() and minor() macros
@@ -7537,14 +7572,16 @@
 	* ifconfig/if_index.h: New file, prototypes for if_nameindex().
 	* ifconfig/if_index.c: New version base on the one in GLIBC.
 	* ifconfig/Makefile.am: Added if_index.c unconditionnaly.
-	* ifconfig/changeif.c(configure_if): memset(0) ifr, it helps debugging.
+	* ifconfig/changeif.c(configure_if): memset(0) ifr, it helps
+	debugging.
 	* ifconfig/flags.c: const consistencies.
 	* ifconfig/ifconfig.h: include if_index.h
-	* ifconfig/options.c: Defined SYSTEM_SHORT_OPTIONS SYSTEM_LONG_OPTIONS.
+	* ifconfig/options.c: Defined SYSTEM_SHORT_OPTIONS
+	SYSTEM_LONG_OPTIONS.
 	* ifconfig/options.h: const consistencies.
 	* ifconfig/printif.c: const consistencies.
-	* ifconfig/printif.h: const consistencies.
-	Check for HAVE_IFREQ_IFR_INDEX HAVE_IFREQ_IFR_NETMASK
+	* ifconfig/printif.h: const consistencies.  Check for
+	HAVE_IFREQ_IFR_INDEX HAVE_IFREQ_IFR_NETMASK
 	HAVE_IFREQ_IFR_BROADADDR.
 	* ifconfig/system.c: Use marcor processor #elif for clarity.
 	* ifconfig/system.h: const consistencies.
@@ -7554,8 +7591,8 @@
 
 2001-06-04  Marcus Brinkmann  <marcus@gnu.org>
 
-	* options.c (long_options): Only add SYSTEM_LONG_OPTIONS
-	if it is defined.
+	* options.c (long_options): Only add SYSTEM_LONG_OPTIONS if it is
+	defined.
 
 	Lots of small fixes submitted Sergey Poznyakoff
 	<gray@Mirddin.farlep.net>:
@@ -7575,8 +7612,8 @@
 	* ifconfig/system/hpux.c (system_configure): Likewise.
 	* ifconfig/system/solaris.c (system_parse_opt_rest): Fix order of
 	operators.
-	(system_default_format): Fix syntax.
-	Include <sys/socket.h>, <netinet/in.h>, <netinet/if_ether.h>
+	(system_default_format): Fix syntax.  Include <sys/socket.h>,
+	<netinet/in.h>, <netinet/if_ether.h>
 	(rather than <linux/if_ether.h>).
 	* ifconfig/system.h: Change __solaris__ to __sun__.
 	* ifconfig/system.c: Likewise.
@@ -7585,33 +7622,33 @@
 
 	* libinetutils/ttymsg.c: Simple check for '/' in the line name is
 	way too week: it doesn't work for tty names like pts/2, which are
-	perfectly OK. Changed to more sophisticated one: all "./", "../"
+	perfectly OK.  Changed to more sophisticated one: all "./", "../"
 	references in the name are resolved and the resulting name is
-	compared with PATH_TTY_PFX. If it lies under it, everything's
-	Ok. Otherwise we just bail out and quit.
+	compared with PATH_TTY_PFX.  If it lies under it, everything's Ok.
+	Otherwise we just bail out and quit.
 	* talk/display.c: Added check for *text == '\a' to produce audible
 	bell.
 	* talk/io.c: changed \007's in initial message to beep() after
-	message(). On solaris's AT386 those \007 just produce ^G on
-	the screen.
-	Changed read(0, buf, nb) to getch() in loop. Reason: read()
-	returns raw data from console, thus pressing <enter> returns
-	'\r' which gets displayed on console as ^M, because display.c
-	is expecting to get '\n'. getch() returns '\n' and everything
-	goes smooth.
-	* talk/announce.c: syslog error message from ttymsg(). One never
+	message().  On solaris's AT386 those \007 just produce ^G on the
+	screen.  Changed read(0, buf, nb) to getch() in loop.  Reason:
+	read() returns raw data from console, thus pressing <enter>
+	returns '\r' which gets displayed on console as ^M, because
+	display.c is expecting to get '\n'.  getch() returns '\n' and
+	everything goes smooth.
+	* talk/announce.c: syslog error message from ttymsg().  One never
 	knows...
-	* talkd/process.c: changed find_user(). Previous version returned
-	first console the remote party was logged onto. This one returns
-	the one where he currently is. This is a slightly modified version
-	of berkeley's find_user() dated 1997/04/06.
+	* talkd/process.c: changed find_user().  Previous version returned
+	first console the remote party was logged onto.  This one returns
+	the one where he currently is.  This is a slightly modified
+	version of berkeley's find_user() dated 1997/04/06.
 
 2001-05-07  Jeff Bailey  <jbailey@oasis.zugzug.com>
 
 	* ifconfig/system/Makefile.am: New File, for 'make dist' derived
 	targets.
 
-	* ifconfig/Makefile.am: Add printif.h and system.h to noinst_HEADERS.
+	* ifconfig/Makefile.am: Add printif.h and system.h to
+	noinst_HEADERS.
 
 2001-05-07  Jeff Bailey  <jbailey@oasis.zugzug.com>
 
@@ -7631,26 +7668,27 @@
 
 	* ifconfig/printif.h: Declare had_output.
 	* ifconfig/printif.c (had_output): New global variable.
-	(many functions): Whereever we output something, set had_output to 1.
-	(join): Remove variable first. New variable had_output_saved.
-	Clear had_output after storing it in had_output_saved. Use that to
-	determine if to print delimiter. Later on, restore had_output.
+	(many functions): Whereever we output something, set had_output to
+	1.
+	(join): Remove variable first.  New variable had_output_saved.
+	Clear had_output after storing it in had_output_saved.  Use that
+	to determine if to print delimiter.  Later on, restore had_output.
 	* ifconfig/system/linux.c (some functions): Whereever we output
 	something, set had_output to 1.
 
 2001-02-26  Alain Magloire
 
-	* libinetutils/openpty.c (ptys_open) : ioctl of "pckt" should be done
-	on the master file descriptor.
-	Found by Joachim Gabler <Joachim.Gabler@germany.sun.com>
+	* libinetutils/openpty.c (ptys_open) : ioctl of "pckt" should be
+	done on the master file descriptor.  Found by Joachim Gabler
+	<Joachim.Gabler@germany.sun.com>
 
 2001-02-26  Alain Magloire
 
 	* ftp/domacro.c : Check if the margv is not NULL and return.
 	* ftp/ftp.c (login) : The variable "line" is used as a target of
-	strcpy. Unfortunately, the readline() changes cause this to be
-	NULL when processing an automatic login via $HOME/.netrc.
-	Bug and patch for ftp.c provided by "B. D. Elliott" <bde@nwlink.com>.
+	strcpy.  Unfortunately, the readline() changes cause this to be
+	NULL when processing an automatic login via $HOME/.netrc.  Bug and
+	patch for ftp.c provided by "B.  D.  Elliott" <bde@nwlink.com>.
 
 2001-02-22  Marcus Brinkmann  <marcus@gnu.org>
 
@@ -7675,8 +7713,8 @@
 
 2001-01-16  Marcus Brinkmann  <marcus@gnu.org>
 
-	* whois/main.c: Terminate array longopts with an element containing all
-	zeros.
+	* whois/main.c: Terminate array longopts with an element
+	containing all zeros.
 
 2001-01-03  Alain Magloire
 
@@ -7694,13 +7732,13 @@
 	support missing (most -> many).
 
 	* TODO: Update the entry about long options support (we can now
-	list those which are missing, instead those which have it).
-	Add internationalization/gettext to the list. Uppercase the Hurd.
+	list those which are missing, instead those which have it).  Add
+	internationalization/gettext to the list.  Uppercase the Hurd.
 
 2000-11-03 Alain Magloire
 
-	* rshd/rshd.c: #include <version.h> added.
-	Removed copyright and sccsid variables.
+	* rshd/rshd.c: #include <version.h> added.  Removed copyright and
+	sccsid variables.
 	(help): New function to display info.
 	(short_options): New variable.
 	(long_options): New variable.
@@ -7720,20 +7758,21 @@
 
 2000-10-31  Marcus Brinkmann  <marcus@gnu.org>
 
-	* inetd/inetd.c: Remove COPYRIGHT (it's in the header)
-	and "#if 0"-out SCCSID.
-	Declare __PROGNAME.
-	New variables SHORT_OPTIONS and LONG_OPTIONS.
-	(main): Initialize __progname if not HAVE___PROGNAME.
-	Rename CH to OPTION. Rework option parsing to use getopt_long.
+	* inetd/inetd.c: Remove COPYRIGHT (it's in the header) and "#if
+	0"-out SCCSID.  Declare __PROGNAME.  New variables SHORT_OPTIONS
+	and LONG_OPTIONS.
+	(main): Initialize __progname if not HAVE___PROGNAME.  Rename CH
+	to OPTION.  Rework option parsing to use getopt_long.
 	(usage): Completely new and conforming to the others.
 
 2000-10-31  Marcus Brinkmann  <marcus@gnu.org>
 
-	* ftpd/ftpd.c: Remove PROGRAM, declare __PROGNAME. Remove COPYRIGHT
+	* ftpd/ftpd.c: Remove PROGRAM, declare __PROGNAME.  Remove
+	COPYRIGHT
 	(it's in the header) and "#if 0"-out SCCSID.
 	(usage): Replace PROGRAM with __PROGNAME.
-	(main): Likewise. Also initialize __PROGNAME if not HAVE___PROGNAME.
+	(main): Likewise.  Also initialize __PROGNAME if not
+	HAVE___PROGNAME.
 
 2000-10-30  Marcus Brinkmann
 
@@ -7743,11 +7782,11 @@
 2000-10-30  Marcus Brinkmann  <marcus@gnu.org>
 
 	* syslogd/syslogd.c: Remove PROGRAM, declare __PROGNAME.
-	Prototype waitdaemon(). Remove COPYRIGHT (it's in the
-	comment at the top). Replace "#ifndef lint" with "#if 0"
-	for SCCSID to avoid gcc warning.
-	(main): Initialize __PROGNAME if not HAVE___PROGNAME.
-	Use __PROGNAME instead PROGRAM.
+	Prototype waitdaemon().  Remove COPYRIGHT (it's in the comment at
+	the top).  Replace "#ifndef lint" with "#if 0" for SCCSID to avoid
+	gcc warning.
+	(main): Initialize __PROGNAME if not HAVE___PROGNAME.  Use
+	__PROGNAME instead PROGRAM.
 	(usage): Likewise.
 	(crunch_list): Likewise.
 	(die): Likewise.
@@ -7755,23 +7794,22 @@
 2000-10-30  Marcus Brinkmann  <marcus@gnu.org>
 
 	* rcp/rcp.c (rsource): Don't take the address of a pointer when
-	the pointer
-	is what we need, so change &statp to statp.
+	the pointer is what we need, so change &statp to statp.
 
 2000-10-30  Marcus Brinkmann  <marcus@gnu.org>
 
-	* logger/logger.c: Declare __PROGNAME. Remove PROGRAM.
-	Remove COPYRIGHT (it's in the header) and replace "#ifndef lint"
-	with "#if 0" for SCCSID.
-	(main): Initialize __PROGNAME if not HAVE___PROGNAME.
-	Use __PROGNAME instead PROGRAM.
+	* logger/logger.c: Declare __PROGNAME.  Remove PROGRAM.  Remove
+	COPYRIGHT (it's in the header) and replace "#ifndef lint" with
+	"#if 0" for SCCSID.
+	(main): Initialize __PROGNAME if not HAVE___PROGNAME.  Use
+	__PROGNAME instead PROGRAM.
 	(pencode): Likewise.
 	(usage): Likewise.
 
 2000-10-30  Marcus Brinkmann  <marcus@gnu.org>
 
-	* libtelnet/getent.c: Define AREA only when HAVE_CGETENT, to silence
-	compiler warning.
+	* libtelnet/getent.c: Define AREA only when HAVE_CGETENT, to
+	silence compiler warning.
 
 2000-10-30  Marcus Brinkmann  <marcus@gnu.org>
 
@@ -7792,31 +7830,31 @@
 2000-10-30  Marcus Brinkmann  <marcus@gnu.org>
 
 	* ftpd/ftpd.c: New variable PROGRAM.
-	(usage): Frob it to behave like the syslogd usage(),
-	so it gives the correct output.
-	(main): Beautify option parsing code (more comments, proper
-	use of usage). Reject unknown options instead ignoring them.
-	Initialize PROGRAM and use it instead of argv.
+	(usage): Frob it to behave like the syslogd usage(), so it gives
+	the correct output.
+	(main): Beautify option parsing code (more comments, proper use of
+	usage).  Reject unknown options instead ignoring them.  Initialize
+	PROGRAM and use it instead of argv.
 
 2000-10-30  Marcus Brinkmann  <marcus@gnu.org>
 
 	* ftp/main.c: Convert to GNU coding standards.
 
-	* ftp/main.c: Remove COPYRIGHT (it's in the header) and
-	"#if 0"-out SCCSID.
+	* ftp/main.c: Remove COPYRIGHT (it's in the header) and "#if
+	0"-out SCCSID.
 	(ohelp): Removed.
 	(try_help): Removed.
-	(usage): Incorporate functionality of ohelp and try_help,
-	and accept new argument ERR.
+	(usage): Incorporate functionality of ohelp and try_help, and
+	accept new argument ERR.
 
-	* ftp/main.c (getcmd): Add parenthese around assignment used as truth
-	value to silence gcc warning.
+	* ftp/main.c (getcmd): Add parenthese around assignment used as
+	truth value to silence gcc warning.
 	(makeargv): Likewise.
 
 2000-10-30  Marcus Brinkmann  <marcus@gnu.org>
 
-	* ftp/cmds.c (remglob): New variable fd, use it to create temporary
-	file with mkstemp(), and not insecure mktemp().
+	* ftp/cmds.c (remglob): New variable fd, use it to create
+	temporary file with mkstemp(), and not insecure mktemp().
 
 2000-08-24  Alain Magloire
 
@@ -7837,33 +7875,33 @@
 
 2000-08-22  Alain Magloire
 
-	* rcp/util.c: Define the roundup() macro if not define
-	by the OS.
+	* rcp/util.c: Define the roundup() macro if not define by the OS.
 
 2000-08-22  Alain Magloire
 
-	* configure.in:  Options --with-pam and --with-wrap
-	so far they are only usefull for ftpd.
+	* configure.in: Options --with-pam and --with-wrap so far they are
+	only usefull for ftpd.
 	* Makefile.am: Syslog change for logger.
 
 2000-08-21  Alain Magloire
 
-	The idea is to reduce the number of side effects i.e. reducing the
-	number of global variables.  To help we regroup some of them in a
-	structure call credentials, that is pass around.  The second approach
-	to help detect side effects; when possible the variables are pass by
-	parameter. All the gots of the authentication have move out
-	elsewere(auth.c, pam.c) this will save us from the pesky #ifdef's.
+	The idea is to reduce the number of side effects i.e. reducing
+	the number of global variables.  To help we regroup some of them
+	in a structure call credentials, that is pass around.  The second
+	approach to help detect side effects; when possible the variables
+	are pass by parameter.  All the gots of the authentication have
+	move out elsewere(auth.c, pam.c) this will save us from the pesky
+	#ifdef's.
 
 	* ftpd/ftpd.c: Passwd handling code removed.  PAM code removed.
-	Variables guess, pw, logged_in, remotehost part of
-	the credential structure.
+	Variables guess, pw, logged_in, remotehost part of the credential
+	structure.
 	(end_login): Take the credential as an argument.
 	(dolog): Likewise.
 	(user): Call auth_user() to do the job.
 	(pass): Call auth_pass() to do the job.
-	(complete_login): Draft support for guest chroot.
-	Do not display passwd part of setproctitle() and syslog() messages.
+	(complete_login): Draft support for guest chroot.  Do not display
+	passwd part of setproctitle() and syslog() messages.
 	(main): Remove on anonymous-name, was not use.
 	* ftpd/auth.c: New file.
 	* ftpd/Makefile.am: PATHDEF_FTPCHROOT in INCLUDES.
@@ -7871,9 +7909,8 @@
 
 2000-08-16  Marcus Brinkmann  <marcus@gnu.org>
 
-	* syslogd/syslogd.c (usage): If err != 0, print Usage: ... line to
-	stdout.
-	Uppercase all sentences.
+	* syslogd/syslogd.c (usage): If err != 0, print Usage: ... line
+	to stdout.  Uppercase all sentences.
 	(main): Fix indentation in while condition and add a newline after
 	a break statement.
 
@@ -7885,14 +7922,15 @@
 
 2000-08-16  Marcus Brinkmann  <marcus@gnu.org>
 
-	* logger/syslog.c: Include version.h.
-	New global variables program, short_options, long_options.
-	(usage): New argument err. Make usage and help message GNU compliant.
-	(main): Use short_options, long_options, getopt_long instead getopt,
-	memcpy instead bcopy.
-	Add options --help and --version.
-	Remove "register" attribute. Rename ch to option.
-	(pencode): Remove "register" attribute, format to GNU coding standard.
+	* logger/syslog.c: Include version.h.  New global variables
+	program, short_options, long_options.
+	(usage): New argument err.  Make usage and help message GNU
+	compliant.
+	(main): Use short_options, long_options, getopt_long instead
+	getopt, memcpy instead bcopy.  Add options --help and --version.
+	Remove "register" attribute.  Rename ch to option.
+	(pencode): Remove "register" attribute, format to GNU coding
+	standard.
 	(decode): Likewise.
 
 2000-08-16  Alain Magloire
@@ -7903,35 +7941,32 @@
 
 2000-08-15  Alain Magloire
 
-	* libinetutils/iruserok.c: use <signal> not <sys/signal.h>
-	Remove ruserok().
+	* libinetutils/iruserok.c: use <signal> not <sys/signal.h> Remove
+	ruserok().
 
 	* libinetutils/ruserok.c: new funtion.
 
 2000-08-15  Alain Magloire
 
-	* configure.in: Check for fchdir().
-	Check for ruserok().
+	* configure.in: Check for fchdir().  Check for ruserok().
 
 2000-08-13  Alain Magloire
 
-	* syslogd/syslogd.c (main): Error in the code the inet file descriptor
-	was not initialize correctely.
+	* syslogd/syslogd.c (main): Error in the code the inet file
+	descriptor was not initialize correctely.
 
 2000-08-13  Alain Magloire
 
-	* syslogd/syslogd.c (main):  New variable short_options.
-	Removed of reap_child() and SIGCHLD signal handler.
-	ttymsg() now double fork() and do itself the waitpid()
-	to clean up.
-	Remove all those little loops that uses tolower()
-	to bring the string to loser case for a comparison
-	and use strcasecmp() when comparison are needed.
+	* syslogd/syslogd.c (main): New variable short_options.  Removed
+	of reap_child() and SIGCHLD signal handler.  ttymsg() now double
+	fork() and do itself the waitpid() to clean up.  Remove all those
+	little loops that uses tolower() to bring the string to loser case
+	for a comparison and use strcasecmp() when comparison are needed.
 
 2000-08-13  Alain Magloire
 
-	* libinetutils/ttymsg.c (fork2):  New function, that is doing a double
-	fork() when I/O is non-bloclking.
+	* libinetutils/ttymsg.c (fork2): New function, that is doing a
+	double fork() when I/O is non-bloclking.
 
 2000-08-11  Alain Magloire
 
@@ -7944,26 +7979,27 @@
 
 2000-08-10  Alain Magloire
 
-	* syslogd/syslogd.c (wallmsg):  Only check for the type USER_PROCESS
-	The others on GNU/Linux generate errors.  And we only need
-	to alert legitimate users that are login.
-	* syslogd/syslogd.c : New option '-S, --sync' to behave like GNU/Linux
-	syslogd that sync on every line.  Syncing on every lines can
-	bring a machine to its knees if an application is trying to
-	be malicious.
+	* syslogd/syslogd.c (wallmsg): Only check for the type
+	USER_PROCESS The others on GNU/Linux generate errors.  And we only
+	need to alert legitimate users that are login.
+	* syslogd/syslogd.c : New option '-S, --sync' to behave like
+	GNU/Linux syslogd that sync on every line.  Syncing on every lines
+	can bring a machine to its knees if an application is trying to be
+	malicious.
 
 2000-08-10  Marcus Brinkmann  <marcus@gnu.org>
 
-	* syslogd/syslogd.c (main): When -d option is given, set NoDetach to 1.
-	Only test for !NoDetach when daemonising, and no longer for !Debug.
+	* syslogd/syslogd.c (main): When -d option is given, set NoDetach
+	to 1.  Only test for !NoDetach when daemonising, and no longer for
+	!Debug.
 
 2000-08-09  Marcus Brinkmann  <marcus@gnu.org>
 
 	Fix ChangeLog weirdness.
 	* syslogd/syslogd.c: "New" prototype reap_childs.
 	(main): Install SIGCHLD handler.
-	(reap_childs): Function back. We do fork for blocking I/O.
-	This time use waitpid unconditionally.
+	(reap_childs): Function back.  We do fork for blocking I/O.  This
+	time use waitpid unconditionally.
 
 2000-08-09 Alain Magloire
 
@@ -7971,20 +8007,21 @@
 
 2000-08-09  Alain Magloire
 
-	* configure.in: Check for poll() and link headers/poll.h
-	to include/poll.h if the OS does not have poll.
+	* configure.in: Check for poll() and link headers/poll.h to
+	include/poll.h if the OS does not have poll.
 
 2000-08-08  Alain Magloire
 
-	* telnetd/extern.h: rename interrupt() to interrupts() since it use
-	as a reserve word by the some C compiler.
+	* telnetd/extern.h: rename interrupt() to interrupts() since it
+	use as a reserve word by the some C compiler.
 	* telnetd/state.c: Likewise.
 	* telnetd/telnetd.c: Likewise.
 	* telnetd/sys_term.c: L_SET rename to SEEK_SET for portability.
 
 2000-08-08 Alain Magloire
 
-	* talkd/announce.c: Uncoditionnaly undef max before use it as a macro.
+	* talkd/announce.c: Uncoditionnaly undef max before use it as a
+	macro.
 
 2000-08-08  Alain Magloire
 
@@ -7994,16 +8031,16 @@
 	(usage): Some of the strings where missing newlines.
 	[IOVCNT]: new macro to define the size of the iovec array.
 	(fprintlog): Clear the iovec before using it.
-	(logmsg): get rid of ugly hardcode and use sizeof (f->f_lastime) - 1
-	intead for the len of the f_lastime string.
+	(logmsg): get rid of ugly hardcode and use sizeof (f->f_lastime) -
+	1 intead for the len of the f_lastime string.
 	(fprintlog): use sizeof(f->lastime) - 1.
 
 2000-08-08  Marcus Brinkmann <marcus@gnu.org>
 
 	* syslogd/syslogd.c: Don't prototype reapchild.
 	(main): Don't install SIGCHLD handler.
-	(reapchild): Function removed. It is cruft needed for
-	the linux wallmsg implementation, which we don't useb.
+	(reapchild): Function removed.  It is cruft needed for the linux
+	wallmsg implementation, which we don't useb.
 
 2000-08-08 Alain Magloire
 
@@ -8015,36 +8052,36 @@
 
 2000-08-08 Alain Magloire
 
-	* rexecd/rexecd.c:  Let ansi2knr take care of the vararg/stdarg
-	issues.  Add prototype for error(). Guard [HAVE_INITGROUPS].
+	* rexecd/rexecd.c: Let ansi2knr take care of the vararg/stdarg
+	issues.  Add prototype for error().  Guard [HAVE_INITGROUPS].
 
 2000-08-08  Alain Magloire
 
-	* rcp/rcp.c: Non portable d_ino for the DIR readdir() pointer removed.
+	* rcp/rcp.c: Non portable d_ino for the DIR readdir() pointer
+	removed.
 
 2000-08-08  Alain Magloire
 
-	* libinetutils/ttymsg.c: Formatting, bcopy() to memcpy().
-	Just check for '/' in the path for security attempts.
+	* libinetutils/ttymsg.c: Formatting, bcopy() to memcpy().  Just
+	check for '/' in the path for security attempts.
 
-	* libinetutils/poll.c: Typo in prototypes. Not including <sys/select.h>
+	* libinetutils/poll.c: Typo in prototypes.  Not including
+	<sys/select.h>
 	* libinetutils/poll.h: Typos.
 
 2000-08-08 Alain Magloire
 
-	* ftp/extern.h: Remove empty() declaration, one the arg
-	is fd_set and <select.h> is not included in extern.h.
+	* ftp/extern.h: Remove empty() declaration, one the arg is fd_set
+	and <select.h> is not included in extern.h.
 
 2000-08-08  Marcus Brinkmann <marcus@gnu.org>
 
-	* doc/: Fix some factual errors, and one typo.
-	We don't have a limit on 19 sockets anymore, and we allow many -l
-	and -s options.
+	* doc/: Fix some factual errors, and one typo.  We don't have a
+	limit on 19 sockets anymore, and we allow many -l and -s options.
 
 2000-08-07  Alain Magloire
 
-	* doc/doc/inetutils.texi doc/syslogd.texi
-	First draft.
+	* doc/doc/inetutils.texi doc/syslogd.texi First draft.
 
 2000-08-06 Alain Magloire
 
@@ -8052,39 +8089,37 @@
 
 2000-08-05  Alain Magloire
 
-	* libinetutils/daemon.c (waitdaemon):  We are using the double trick
-	to avoid zombies and control terminals.  So we're going
+	* libinetutils/daemon.c (waitdaemon): We are using the double
+	trick to avoid zombies and control terminals.  So we're going
 	simply to pause() to avoid messing with waitpid().
 
 2000-08-05  Alain Magloire
 
 	* libinetutils/localhost.c: No longer use static buffers to cache
-	the result.
-	This cause subtil bugs and make it impossible in non-threaded
-	environment if we ever move to it.
+	the result.  This cause subtil bugs and make it impossible in
+	non-threaded environment if we ever move to it.
 
 2000-08-05 Alain Magloire
 
 	* ftp/ruserpass.c (ruserpass): When calling localhost() make sure
-	we free().
-	Various formating to GNU coding style.
+	we free().  Various formating to GNU coding style.
 
 2000-08-05  Alain Magloire
 
-	* configure.in: Remove the check for setlinebuf(), it
-	was for syslogd.  We use the more portable:
-	setvbuf (stream, 0, _IOLBF, 0);
+	* configure.in: Remove the check for setlinebuf(), it was for
+	syslogd.  We use the more portable: setvbuf (stream, 0, _IOLBF,
+	0);
 	* header/config.h.in: remove HAVE_SETLINEBUF
 
 2000-08-04  Alain Magloire
 
-	* libinetutils/iruserok.c (iruserok):  Typo in prototype.
+	* libinetutils/iruserok.c (iruserok): Typo in prototype.
 
 2000-08-03  Marcus Brinkmann  <marcus@gnu.org>
 
 	* libinetutils/daemon.c (waitdaemon): Add comment.
-	(waitdaemon_timeout): If child told us to go away, use _exit rather
-	than exit.
+	(waitdaemon_timeout): If child told us to go away, use _exit
+	rather than exit.
 
 2000-08-03  Marcus Brinkmann  <marcus@gnu.org>
 
@@ -8120,8 +8155,8 @@
 2000-08-14 Alain Magloire
 
 	* libls/print.c: Define [howmany] macro.
-	* libls/bsdport.c: Remove [_XOPEN_SOURCE], [_BSD_SOURCE], [_GNU_SOURCE]
-	we have no business defining this.
+	* libls/bsdport.c: Remove [_XOPEN_SOURCE], [_BSD_SOURCE],
+	[_GNU_SOURCE] we have no business defining this.
 	* libls/bsdport.h: Do not include <config.h> here.
 	* libls/ls.c: Include <termios.h> not <sys/termios.h>
 
@@ -8153,7 +8188,7 @@
 2000-07-31 Michael Vogt
 
 	* libls/fts.c, libls/ls.c, libls/print.c: portability changes
-	(solaris lacks warn,warnx,err)
+	(solaris lacks warn, warnx, err)
 
 2000-07-30 Alain Magloire
 
@@ -8161,8 +8196,8 @@
 
 2000-07-30 Michel Vogt
 
-	* libls/fts.c: Change GNU Lib C specifics functions for
-	their standard counterpart example: __opendir() --> opendir().
+	* libls/fts.c: Change GNU Lib C specifics functions for their
+	standard counterpart example: __opendir() --> opendir().
 
 2000-07-30 Alain Magloire
 
@@ -8180,7 +8215,8 @@
 2000-07-26 Alain Magloire
 
 	* configure.in: check for libpam and <security/pam_appl.h>.
-	* headers/config.h.in: new marcros HAVE_LIBPAM, HAVE_SECURITY_APPL_H.
+	* headers/config.h.in: new marcros HAVE_LIBPAM,
+	HAVE_SECURITY_APPL_H.
 
 2000-07-18 Alain Magloire
 
@@ -8190,24 +8226,24 @@
 2000-07-18 Alain Magloire
 
 	* inetd/inetd.c(main): Check for SIGPIPE too.
-	* inetd/inetd.c(run_service): New function, This the same code when
-	fork()ing in main(), but it put here so it could be reuse for tcpmux.
+	* inetd/inetd.c(run_service): New function, This the same code
+	when fork()ing in main(), but it put here so it could be reuse for
+	tcpmux.
 	* inetd/inetd.c(tcpmux): better support and change of prototype.
 
 2000-07-18 Alain Magloire
 
-	* all C files and header files, we make a bold move
-	and translate the prototypes to ANSI C, instead of K&R
-	for better compile time warnings etc ..
-	ansi2knr will the massaging for old C compilers.
+	* all C files and header files, we make a bold move and translate
+	the prototypes to ANSI C, instead of K&R for better compile time
+	warnings etc ..  ansi2knr will the massaging for old C compilers.
 
 2000-07-14 Alain Magloire
 
 	* libinetutils/openpty.c: ptys_open() call wrong arguments ...
 
-	* libinetutils/Makefile.am: AUTOMAKE_OPTIONS = ansi2knr
-	all the files are now prototype and we rely on ansi2knr
-	to the right thing.
+	* libinetutils/Makefile.am: AUTOMAKE_OPTIONS = ansi2knr all the
+	files are now prototype and we rely on ansi2knr to the right
+	thing.
 
 2000-07-14 Alain Magloire
 
@@ -8227,7 +8263,8 @@
 	* ftp/cmds.c/sethash(): read the optionnal argument for hash.
 	* ftp/ftp.1: update man page, hash take optional argument.
 	* ftp/ftp.c/sendrequests(): print hasbyte.
-	* ftp/ftp_var.h: hashbytes global var: number of bytes per # printed.
+	* ftp/ftp_var.h: hashbytes global var: number of bytes per #
+	printed.
 
 2000-07-07  Alain Magloire
 
@@ -8241,313 +8278,293 @@
 2000-07-06 Michel Vogt
 
 	This is a Linux port of the BSD ls program.  You probably aren't
-	interested in this, since GNU ls is much better (IMHO).  But this port
-	is needed for internal ls on inetutils-ftpd.
+	interested in this, since GNU ls is much better (IMHO).  But this
+	port is needed for internal ls on inetutils-ftpd.
 
 2000-07-06  Jeff Bailey  <jbailey@nisa.net>
 
-	* autogen.sh: New file for generating build environment for
-	the first time from a CVS checkout.  Not added to Makefile.am
-	for distribution.
+	* autogen.sh: New file for generating build environment for the
+	first time from a CVS checkout.  Not added to Makefile.am for
+	distribution.
 
 2000-07-05 Alain Magloire
 
-	* whois/*: Clause 3 removed.
-	excerpt from email with RMS:
-	"UCB has agreed to drop the advertising clause from the license for all
+	* whois/*: Clause 3 removed.  excerpt from email with RMS: "UCB
+	has agreed to drop the advertising clause from the license for all
 	BSD software.  The advertising clause is this one:
 
-	3. All advertising materials mentioning features or use of this software
-		must display the following acknowledgement:
-		This product includes software developed by the University of
-		California, Berkeley and its contributors.
+	  3. All advertising materials mentioning features or use of this
+	     software must display the following acknowledgement: This product
+	     includes software developed by the University of California,
+	     Berkeley and its contributors.
 
-	This means that we can delete that paragraph from all files which give
-	the University of California as the only copyright holder."
+	This means that we can delete that paragraph from all files which
+	give the University of California as the only copyright holder."
 
 2000-07-05 Alain Magloire
 
-	* uucpd/*: Clause 3 removed.
-	excerpt from email with RMS:
-	"UCB has agreed to drop the advertising clause from the license for all
+	* uucpd/*: Clause 3 removed.  excerpt from email with RMS: "UCB
+	has agreed to drop the advertising clause from the license for all
 	BSD software.  The advertising clause is this one:
 
-	3. All advertising materials mentioning features or use of this software
-		must display the following acknowledgement:
-		This product includes software developed by the University of
-		California, Berkeley and its contributors.
+	  3. All advertising materials mentioning features or use of this
+	     software must display the following acknowledgement: This product
+	     includes software developed by the University of California,
+	     Berkeley and its contributors.
 
-	This means that we can delete that paragraph from all files which give
-	the University of California as the only copyright holder."
+	This means that we can delete that paragraph from all files which
+	give the University of California as the only copyright holder."
 
 2000-07-05 Alain Magloire
 
-	* tftpd/*: Clause 3 removed.
-	excerpt from email with RMS:
-	"UCB has agreed to drop the advertising clause from the license for all
+	* tftpd/*: Clause 3 removed.  excerpt from email with RMS: "UCB
+	has agreed to drop the advertising clause from the license for all
 	BSD software.  The advertising clause is this one:
 
-	3. All advertising materials mentioning features or use of this software
-		must display the following acknowledgement:
-		This product includes software developed by the University of
-		California, Berkeley and its contributors.
+	  3. All advertising materials mentioning features or use of this
+	     software must display the following acknowledgement: This product
+	     includes software developed by the University of California,
+	     Berkeley and its contributors.
 
-	This means that we can delete that paragraph from all files which give
-	the University of California as the only copyright holder."
+	This means that we can delete that paragraph from all files which
+	give the University of California as the only copyright holder."
 
 2000-07-05 Alain Magloire
 
-	* tftp/*: Clause 3 removed.
-	excerpt from email with RMS:
-	"UCB has agreed to drop the advertising clause from the license for all
-	BSD software.  The advertising clause is this one:
+	* tftp/*: Clause 3 removed.  excerpt from email with RMS: "UCB has
+	agreed to drop the advertising clause from the license for all BSD
+	software.  The advertising clause is this one:
 
-	3. All advertising materials mentioning features or use of this software
-		must display the following acknowledgement:
-		This product includes software developed by the University of
-		California, Berkeley and its contributors.
+	  3. All advertising materials mentioning features or use of this
+	     software must display the following acknowledgement: This product
+	     includes software developed by the University of California,
+	     Berkeley and its contributors.
 
-	This means that we can delete that paragraph from all files which give
-	the University of California as the only copyright holder."
+	This means that we can delete that paragraph from all files which
+	give the University of California as the only copyright holder."
 2000-07-05  Alain Magloire
 
-	* telnetd/*: Clause 3 removed.
-	excerpt from email with RMS:
-	"UCB has agreed to drop the advertising clause from the license for all
+	* telnetd/*: Clause 3 removed.  excerpt from email with RMS: "UCB
+	has agreed to drop the advertising clause from the license for all
 	BSD software.  The advertising clause is this one:
 
-	3. All advertising materials mentioning features or use of this software
-		must display the following acknowledgement:
-		This product includes software developed by the University of
-		California, Berkeley and its contributors.
+	  3. All advertising materials mentioning features or use of this
+	     software must display the following acknowledgement: This product
+	     includes software developed by the University of California,
+	     Berkeley and its contributors.
 
-	This means that we can delete that paragraph from all files which give
-	the University of California as the only copyright holder."
+	This means that we can delete that paragraph from all files which
+	give the University of California as the only copyright holder."
 
 2000-07-05 Alain Magloire
 
-	* telnet/*: Clause 3 removed.
-	excerpt from email with RMS:
-	"UCB has agreed to drop the advertising clause from the license for all
+	* telnet/*: Clause 3 removed.  excerpt from email with RMS: "UCB
+	has agreed to drop the advertising clause from the license for all
 	BSD software.  The advertising clause is this one:
 
-	3. All advertising materials mentioning features or use of this software
-		must display the following acknowledgement:
-		This product includes software developed by the University of
-		California, Berkeley and its contributors.
+	  3. All advertising materials mentioning features or use of this
+	     software must display the following acknowledgement: This product
+	     includes software developed by the University of California,
+	     Berkeley and its contributors.
 
-	This means that we can delete that paragraph from all files which give
-	the University of California as the only copyright holder."
+	This means that we can delete that paragraph from all files which
+	give the University of California as the only copyright holder."
 
 2000-07-05 Alain Magloire
 
-	* talkd/*: Clause 3 removed.
-	excerpt from email with RMS:
-	"UCB has agreed to drop the advertising clause from the license for all
+	* talkd/*: Clause 3 removed.  excerpt from email with RMS: "UCB
+	has agreed to drop the advertising clause from the license for all
 	BSD software.  The advertising clause is this one:
 
-	3. All advertising materials mentioning features or use of this software
-		must display the following acknowledgement:
-		This product includes software developed by the University of
-		California, Berkeley and its contributors.
+	  3. All advertising materials mentioning features or use of this
+	     software must display the following acknowledgement: This product
+	     includes software developed by the University of California,
+	     Berkeley and its contributors.
 
-	This means that we can delete that paragraph from all files which give
-	the University of California as the only copyright holder."
+	This means that we can delete that paragraph from all files which
+	give the University of California as the only copyright holder."
 
 2000-07-05 Alain Magloire
 
-	* talk/*: Clause 3 removed.
-	excerpt from email with RMS:
-	"UCB has agreed to drop the advertising clause from the license for all
-	BSD software.  The advertising clause is this one:
+	* talk/*: Clause 3 removed.  excerpt from email with RMS: "UCB has
+	agreed to drop the advertising clause from the license for all BSD
+	software.  The advertising clause is this one:
 
-	3. All advertising materials mentioning features or use of this software
-		must display the following acknowledgement:
-		This product includes software developed by the University of
-		California, Berkeley and its contributors.
+	  3. All advertising materials mentioning features or use of this
+	     software must display the following acknowledgement: This product
+	     includes software developed by the University of California,
+	     Berkeley and its contributors.
 
-	This means that we can delete that paragraph from all files which give
-	the University of California as the only copyright holder."
+	This means that we can delete that paragraph from all files which
+	give the University of California as the only copyright holder."
 
 2000-07-05 Alain Magloire
 
-	* rshd/*: Clause 3 removed.
-	excerpt from email with RMS:
-	"UCB has agreed to drop the advertising clause from the license for all
-	BSD software.  The advertising clause is this one:
+	* rshd/*: Clause 3 removed.  excerpt from email with RMS: "UCB has
+	agreed to drop the advertising clause from the license for all BSD
+	software.  The advertising clause is this one:
 
-	3. All advertising materials mentioning features or use of this software
-		must display the following acknowledgement:
-		This product includes software developed by the University of
-		California, Berkeley and its contributors.
+	  3. All advertising materials mentioning features or use of this
+	     software must display the following acknowledgement: This product
+	     includes software developed by the University of California,
+	     Berkeley and its contributors.
 
-	This means that we can delete that paragraph from all files which give
-	the University of California as the only copyright holder."
+	This means that we can delete that paragraph from all files which
+	give the University of California as the only copyright holder."
 
 2000-07-05  Alain Magloire
 
-	* rsh/*: Clause 3 removed.
-	excerpt from email with RMS:
-	"UCB has agreed to drop the advertising clause from the license for all
-	BSD software.  The advertising clause is this one:
+	* rsh/*: Clause 3 removed.  excerpt from email with RMS: "UCB has
+	agreed to drop the advertising clause from the license for all BSD
+	software.  The advertising clause is this one:
 
-	3. All advertising materials mentioning features or use of this software
-		must display the following acknowledgement:
-		This product includes software developed by the University of
-		California, Berkeley and its contributors.
+	  3. All advertising materials mentioning features or use of this
+	     software must display the following acknowledgement: This product
+	     includes software developed by the University of California,
+	     Berkeley and its contributors.
 
-	This means that we can delete that paragraph from all files which give
-	the University of California as the only copyright holder."
+	This means that we can delete that paragraph from all files which
+	give the University of California as the only copyright holder."
 
 2000-07-05 Alain Magloire
 
-	* rlogind/*: Clause 3 removed.
-	excerpt from email with RMS:
-	"UCB has agreed to drop the advertising clause from the license for all
+	* rlogind/*: Clause 3 removed.  excerpt from email with RMS: "UCB
+	has agreed to drop the advertising clause from the license for all
 	BSD software.  The advertising clause is this one:
 
-	3. All advertising materials mentioning features or use of this software
-		must display the following acknowledgement:
-		This product includes software developed by the University of
-		California, Berkeley and its contributors.
+	  3. All advertising materials mentioning features or use of this
+	     software must display the following acknowledgement: This product
+	     includes software developed by the University of California,
+	     Berkeley and its contributors.
 
-	This means that we can delete that paragraph from all files which give
-	the University of California as the only copyright holder."
+	This means that we can delete that paragraph from all files which
+	give the University of California as the only copyright holder."
 
 2000-07-05 Alain Magloire
 
-	* rlogin/*: Clause 3 removed.
-	excerpt from email with RMS:
-	"UCB has agreed to drop the advertising clause from the license for all
+	* rlogin/*: Clause 3 removed.  excerpt from email with RMS: "UCB
+	has agreed to drop the advertising clause from the license for all
 	BSD software.  The advertising clause is this one:
 
-	3. All advertising materials mentioning features or use of this software
-		must display the following acknowledgement:
-		This product includes software developed by the University of
-		California, Berkeley and its contributors.
+	  3. All advertising materials mentioning features or use of this
+	     software must display the following acknowledgement: This product
+	     includes software developed by the University of California,
+	     Berkeley and its contributors.
 
-	This means that we can delete that paragraph from all files which give
-	the University of California as the only copyright holder."
+	This means that we can delete that paragraph from all files which
+	give the University of California as the only copyright holder."
 
 2000-07-05 Alain Magloire
 
-	* rexecd/*: Clause 3 removed.
-	excerpt from email with RMS:
-	"UCB has agreed to drop the advertising clause from the license for all
+	* rexecd/*: Clause 3 removed.  excerpt from email with RMS: "UCB
+	has agreed to drop the advertising clause from the license for all
 	BSD software.  The advertising clause is this one:
 
-	3. All advertising materials mentioning features or use of this software
-		must display the following acknowledgement:
-		This product includes software developed by the University of
-		California, Berkeley and its contributors.
+	  3. All advertising materials mentioning features or use of this
+	     software must display the following acknowledgement: This product
+	     includes software developed by the University of California,
+	     Berkeley and its contributors.
 
-	This means that we can delete that paragraph from all files which give
-	the University of California as the only copyright holder."
+	This means that we can delete that paragraph from all files which
+	give the University of California as the only copyright holder."
 
 2000-07-05  Alain Magloire
 
-	* rcp/*: Clause 3 removed.
-	excerpt from email with RMS:
-	"UCB has agreed to drop the advertising clause from the license for all
-	BSD software.  The advertising clause is this one:
+	* rcp/*: Clause 3 removed.  excerpt from email with RMS: "UCB has
+	agreed to drop the advertising clause from the license for all BSD
+	software.  The advertising clause is this one:
 
-	3. All advertising materials mentioning features or use of this software
-		must display the following acknowledgement:
-		This product includes software developed by the University of
-		California, Berkeley and its contributors.
+	  3. All advertising materials mentioning features or use of this
+	     software must display the following acknowledgement: This product
+	     includes software developed by the University of California,
+	     Berkeley and its contributors.
 
-	This means that we can delete that paragraph from all files which give
-	the University of California as the only copyright holder."
+	This means that we can delete that paragraph from all files which
+	give the University of California as the only copyright holder."
 
 2000-07-05 Alain Magloire
 
-	* logger/*: Clause 3 removed.
-	excerpt from email with RMS:
-	"UCB has agreed to drop the advertising clause from the license for all
+	* logger/*: Clause 3 removed.  excerpt from email with RMS: "UCB
+	has agreed to drop the advertising clause from the license for all
 	BSD software.  The advertising clause is this one:
 
-	3. All advertising materials mentioning features or use of this software
-		must display the following acknowledgement:
-		This product includes software developed by the University of
-		California, Berkeley and its contributors.
+	  3. All advertising materials mentioning features or use of this
+	     software must display the following acknowledgement: This product
+	     includes software developed by the University of California,
+	     Berkeley and its contributors.
 
-	This means that we can delete that paragraph from all files which give
-	the University of California as the only copyright holder."
+	This means that we can delete that paragraph from all files which
+	give the University of California as the only copyright holder."
 
 2000-07-05 Alain Magloire
 
-	* libtelnet/*: Clause 3 removed.
-	excerpt from email with RMS:
-	"UCB has agreed to drop the advertising clause from the license for all
-	BSD software.  The advertising clause is this one:
+	* libtelnet/*: Clause 3 removed.  excerpt from email with RMS:
+	"UCB has agreed to drop the advertising clause from the license
+	for all BSD software.  The advertising clause is this one:
 
-	3. All advertising materials mentioning features or use of this software
-		must display the following acknowledgement:
-		This product includes software developed by the University of
-		California, Berkeley and its contributors.
+	  3. All advertising materials mentioning features or use of this
+	     software must display the following acknowledgement: This product
+	     includes software developed by the University of California,
+	     Berkeley and its contributors.
 
-	This means that we can delete that paragraph from all files which give
-	the University of California as the only copyright holder."
+	This means that we can delete that paragraph from all files which
+	give the University of California as the only copyright holder."
 
 2000-07-05 Alain Magloire
 
-	* libinetutils/*: Clause 3 removed.
-	excerpt from email with RMS:
-	"UCB has agreed to drop the advertising clause from the license for all
-	BSD software.  The advertising clause is this one:
+	* libinetutils/*: Clause 3 removed.  excerpt from email with RMS:
+	"UCB has agreed to drop the advertising clause from the license
+	for all BSD software.  The advertising clause is this one:
 
-	3. All advertising materials mentioning features or use of this software
-		must display the following acknowledgement:
-		This product includes software developed by the University of
-		California, Berkeley and its contributors.
+	  3. All advertising materials mentioning features or use of this
+	     software must display the following acknowledgement: This product
+	     includes software developed by the University of California,
+	     Berkeley and its contributors.
 
-	This means that we can delete that paragraph from all files which give
-	the University of California as the only copyright holder."
+	This means that we can delete that paragraph from all files which
+	give the University of California as the only copyright holder."
 
 2000-07-05 Alain Magloire
 
-	* inetd/*: Clause 3 removed.
-	excerpt from email with RMS:
-	"UCB has agreed to drop the advertising clause from the license for all
+	* inetd/*: Clause 3 removed.  excerpt from email with RMS: "UCB
+	has agreed to drop the advertising clause from the license for all
 	BSD software.  The advertising clause is this one:
 
-	3. All advertising materials mentioning features or use of this software
-		must display the following acknowledgement:
-		This product includes software developed by the University of
-		California, Berkeley and its contributors.
+	  3. All advertising materials mentioning features or use of this
+	     software must display the following acknowledgement: This product
+	     includes software developed by the University of California,
+	     Berkeley and its contributors.
 
-	This means that we can delete that paragraph from all files which give
-	the University of California as the only copyright holder."
+	This means that we can delete that paragraph from all files which
+	give the University of California as the only copyright holder."
 
 2000-07-05 Alain Magloire
 
-	* headers/*: Clause 3 removed.
-	excerpt from email with RMS:
-	"UCB has agreed to drop the advertising clause from the license for all
+	* headers/*: Clause 3 removed.  excerpt from email with RMS: "UCB
+	has agreed to drop the advertising clause from the license for all
 	BSD software.  The advertising clause is this one:
 
-	3. All advertising materials mentioning features or use of this software
-		must display the following acknowledgement:
-		This product includes software developed by the University of
-		California, Berkeley and its contributors.
+	  3. All advertising materials mentioning features or use of this
+	     software must display the following acknowledgement: This product
+	     includes software developed by the University of California,
+	     Berkeley and its contributors.
 
-	This means that we can delete that paragraph from all files which give
-	the University of California as the only copyright holder."
+	This means that we can delete that paragraph from all files which
+	give the University of California as the only copyright holder."
 
 2000-07-05 Alain Magloire
 
-	* ftp/*: Clause 3 removed.
-	excerpt from email with RMS:
-	"UCB has agreed to drop the advertising clause from the license for all
-	BSD software.  The advertising clause is this one:
+	* ftp/*: Clause 3 removed.  excerpt from email with RMS: "UCB has
+	agreed to drop the advertising clause from the license for all BSD
+	software.  The advertising clause is this one:
 
-	3. All advertising materials mentioning features or use of this software
-		must display the following acknowledgement:
-		This product includes software developed by the University of
-		California, Berkeley and its contributors.
+	  3. All advertising materials mentioning features or use of this
+	     software must display the following acknowledgement: This product
+	     includes software developed by the University of California,
+	     Berkeley and its contributors.
 
-	This means that we can delete that paragraph from all files which give
-	the University of California as the only copyright holder."
+	This means that we can delete that paragraph from all files which
+	give the University of California as the only copyright holder."
 
 2000-06-23  Jakob 'sparky' Kaivo  <jkaivo@timothy.nodomainname.net>
 
@@ -8564,21 +8581,21 @@
 
 2000-06-15 David O'Shea
 
-	* rlogin/rlogin.c (speed): the fd may not be associated with
-	a terminal, when checking for speed(), take appropriate actions
-	to handle the error case.
+	* rlogin/rlogin.c (speed): the fd may not be associated with a
+	terminal, when checking for speed(), take appropriate actions to
+	handle the error case.
 
 2000-06-14 Joachim Gabler
 
 	* configure.in: add check for element ut_exit in struct utmp
 	* lininetutils/utmp_logout: check for HAVE_UTMP_UT_EXIT
-	* libinetutils/openpty.c: smaller fixes (missing ';',
-	structure element gr_pid of struct group replaced by gr_gid
+	* libinetutils/openpty.c: smaller fixes (missing ';', structure
+	element gr_pid of struct group replaced by gr_gid
 
 2000-03-28  Alain Magloire
 
-	* telnetd/sys_term.c: STREAMSPTY change for HAVE_STREAMSPTY
-	UTMPX change for HAVE_UTMPX.
+	* telnetd/sys_term.c: STREAMSPTY change for HAVE_STREAMSPTY UTMPX
+	change for HAVE_UTMPX.
 	* telnetd/sys_term.c: modutx() change for updwtmpx().
 	* telnetd/telnetd: STREAMSPTY change to HAVE_STREAMSPTY
 
@@ -8593,33 +8610,31 @@ inside init(), this has the unfortunate side effect of close()ing
 and  recreating the sockets at every SIGHUP.  This was done to
 speedup initialization of syslogd, since on GNU/Linux the rc.*
 files would start klogd also.  This is also the reason for a waitdaemon():
-"Wed Feb 14 12:42:09 CST 1996:  Dr. Wettstein
+"Wed Feb 14 12:42:09 CST 1996: Dr. Wettstein
 Parent process of syslogd does not exit until child process has
 finished initialization process.  This allows rc.* startup to
 pause until syslogd facility is up and operating."
 
-	* syslogd/syslogd.c (init): Remove call to creation of sockets
-	and move it to the main() before going in the loop.
+	* syslogd/syslogd.c (init): Remove call to creation of sockets and
+	move it to the main() before going in the loop.
 
 2000-08-06  Marcus Brinkmann  <marcus@gnu.org>
 
-	* syslogd/syslogd.c (add_funix): New function to add new
-	unix sockets.
+	* syslogd/syslogd.c (add_funix): New function to add new unix
+	sockets.
 
 2000-08-06  Alain Magloire
 
-	* syslogd/syslogd.c (init): Remove restriction of LINE_MAX
-	by reallocating the buffer when the line is too long,
-	by doing this the continuation line feature was more
-	straightforward.  The downfall is dealing with out of
-	memory errors.  But the code, so far, does not deal
-	with this anywhere.
+	* syslogd/syslogd.c (init): Remove restriction of LINE_MAX by
+	reallocating the buffer when the line is too long, by doing this
+	the continuation line feature was more straightforward.  The
+	downfall is dealing with out of memory errors.  But the code, so
+	far, does not deal with this anywhere.
 	(domark): signo ignored.
 	(init): signo ignored.
 	(dbg_toggle): signo ignored.
-	(trigger_restart): signo ignored.
-	Remove superfluous initializations of global
-	and static variables.
+	(trigger_restart): signo ignored.  Remove superfluous
+	initializations of global and static variables.
 
 2000-08-05  Alain Magloire
 
@@ -8629,59 +8644,55 @@ Code indenting to conform to GNU style.
 
 	* syslogd/syslogd.c: Use ``const'' consistenly for readonly
 	strings; cfline(), dbg_printf(), logerror(), etc ...
-	Prototypes/declarations use ``void'' for consistency.
-	Standardise all function definitions, so ansi2knr could
-	do its job properly.
+	Prototypes/declarations use ``void'' for consistency.  Standardise
+	all function definitions, so ansi2knr could do its job properly.
 	(create_inet_socket): Variable ``on'' unuse.
-	(usage): try_help() and help() merge to usage (int).
-	usage() is pass an integer and exit(err);
+	(usage): try_help() and help() merge to usage (int).  usage() is
+	pass an integer and exit(err);
 	(main): Remove setlinebuf() use setvbuf() only.
-	(main): Regroup unix sockets and fd's into the same
-	structure easier to carry. Remove restriction
-	on 19 + 1 possible open unix sockets.
-	(crunch_list): Take one more argument, the oldlist
-	so it can be reallocated for new entries.  This removed
-	the restrictions of the number of LocalHosts and StripDomains.
+	(main): Regroup unix sockets and fd's into the same structure
+	easier to carry.  Remove restriction on 19 + 1 possible open unix
+	sockets.
+	(crunch_list): Take one more argument, the oldlist so it can be
+	reallocated for new entries.  This removed the restrictions of the
+	number of LocalHosts and StripDomains.
 
 2000-08-05  Marcus Brinkmann  <marcus@gnu.org>
 
-	* syslogd/syslogd.c (help): --no-forward does not override -r,
-	but -h.
-	(init): Create inet socket if either AcceptRemote or
-	Forwarding is true, but with Forwarding only if not
-	--no-forward was provided. This is less restrictive than
-	before, where --no-forward would prevent incoming messages
-	allowed with -r, which was documented but not intended.
+	* syslogd/syslogd.c (help): --no-forward does not override -r, but
+	-h.
+	(init): Create inet socket if either AcceptRemote or Forwarding is
+	true, but with Forwarding only if not --no-forward was provided.
+	This is less restrictive than before, where --no-forward would
+	prevent incoming messages allowed with -r, which was documented
+	but not intended.
 	* syslogd/syslogd.8: Document (badly) all the new options from
 	last change.
 
 2000-08-04  Marcus Brinkmann  <marcus@gnu.org>
 
-	* syslogd/syslogd.c: In the whole file, change the formatting
-	to conform to the GNU coding standards. Also clean up
-	some debug and error messages. All further functional
-	changes are listed below.
+	* syslogd/syslogd.c: In the whole file, change the formatting to
+	conform to the GNU coding standards.  Also clean up some debug and
+	error messages.  All further functional changes are listed below.
 
-	Initialize finet and fklog to -1.
-	New variables NoKLog, NoUnixAF, NoForward, long_options,
-	program_name. New symbols USAGE, TTYMSGTIME.
+	Initialize finet and fklog to -1.  New variables NoKLog, NoUnixAF,
+	NoForward, long_options, program_name.  New symbols USAGE,
+	TTYMSGTIME.
 	(help): New function.
 	(try_help): New function.
 	(usage): Use try_help.
-	(main): Don't initialize finet, fklog here.
-	Initialize program_name. Use getopt_long instead getopt.
-	Handle option '&' (--help). Handle unknown options with try_help
-	and usage. Handle long options 'P' (--pidfile), 'F' (--no-foward),
-	'K' (--no-klog), 'U' (--no-unixaf).
-	Move initialization of tv into the main loop. select meddles with
-	the timeval on some systems (Linux) and we don't want to take any
-	risk.
-	(init): (Re-) Initialize fklog here if not NoKLog.
-	Only open unix sockets if not NoUnixAF. Failing to open
-	the primary socket is fatal.
-	Only open inet socket if not NoForward.
-	(fprintlog): More diagnostic in case F_FORW: Show debug info
-	when forwarding is disabled or finet is invalid for other reasons.
+	(main): Don't initialize finet, fklog here.  Initialize
+	program_name.  Use getopt_long instead getopt.  Handle option '&'
+	(--help).  Handle unknown options with try_help and usage.  Handle
+	long options 'P' (--pidfile), 'F' (--no-foward), 'K' (--no-klog),
+	'U' (--no-unixaf).  Move initialization of tv into the main loop.
+	select meddles with the timeval on some systems (Linux) and we
+	don't want to take any risk.
+	(init): (Re-) Initialize fklog here if not NoKLog.  Only open unix
+	sockets if not NoUnixAF.  Failing to open the primary socket is
+	fatal.  Only open inet socket if not NoForward.
+	(fprintlog): More diagnostic in case F_FORW: Show debug info when
+	forwarding is disabled or finet is invalid for other reasons.
 	(wallmsg): Use TTYMSGTIME instead hard coded default.
 	(cfline): In case '|' fix nasty bug in if clause.
 
@@ -8693,108 +8704,98 @@ Code indenting to conform to GNU style.
 2000-08-03  Marcus Brinkmann  <marcus@gnu.org>
 
 	* syslogd/syslogd.c: If HAVE_SYS_TYPES_H, include <sys/types> for
-	pid_t.
-	New global variable fklog.
-	(main): Fix comment. Remove local variables fklog, sunx, sin.
+	pid_t.  New global variable fklog.
+	(main): Fix comment.  Remove local variables fklog, sunx, sin.
 	(die): Close fklog if open.
 	(waitdaemon): Ansify.
-	(timedout): Likewise. Drop __unused attribute.
+	(timedout): Likewise.  Drop __unused attribute.
 
 2000-08-03  Marcus Brinkmann  <marcus@gnu.org>
 
-	* syslogd/syslogd.c (waitdaemon, timedout): New prototype and functions
-	from FreeBSD syslogd (rev 1.66).
-	(main): Remove conditional MSG_BSIZE on line variable.
-	New variables tv, tvp, ppid.
-	Call waitdaemon instead daemon to fork into background.
-	Before main loop, initialize tv and tvp to zero.
-	In main loop, pass tvp to select. This will make syslogd return
-	immediately until we set tvp to NULL.
-	Check return value of select. If it is zero (no messages),
-	and tvp is not NULL, set it to NULL and send parent a SIGALRM.
-	This will be its signal to terminate.
+	* syslogd/syslogd.c (waitdaemon, timedout): New prototype and
+	functions from FreeBSD syslogd (rev 1.66).
+	(main): Remove conditional MSG_BSIZE on line variable.  New
+	variables tv, tvp, ppid.  Call waitdaemon instead daemon to fork
+	into background.  Before main loop, initialize tv and tvp to zero.
+	In main loop, pass tvp to select.  This will make syslogd return
+	immediately until we set tvp to NULL.  Check return value of
+	select.  If it is zero (no messages), and tvp is not NULL, set it
+	to NULL and send parent a SIGALRM.  This will be its signal to
+	terminate.
 
 2000-08-03  Marcus Brinkmann  <marcus@gnu.org>
 
 	* syslogd/syslogd.c: Include <stdarg.h>.
 	(struct msg_part): Fix type declaration.
-	(main): Rename variable c to l.
-	Initialize all of funix, finet to -1.
-	Remove dangling closing brace.
-	Main loop: Declare variable nfds.
-	Pass argument to init.
-	Add missing parentheses to if-clause.
-	Back out from using printchopped in unix and inet socket handling,
-	not only because it doesn't work, but also because it is utterly
-	nonsense without the S_STREAM patch.
+	(main): Rename variable c to l.  Initialize all of funix, finet to
+	-1.  Remove dangling closing brace.  Main loop: Declare variable
+	nfds.  Pass argument to init.  Add missing parentheses to
+	if-clause.  Back out from using printchopped in unix and inet
+	socket handling, not only because it doesn't work, but also
+	because it is utterly nonsense without the S_STREAM patch.
 	(make_part): Add missing brace.
 	(die): Add missing variable i.
 
 2000-08-03  Marcus Brinkmann  <marcus@gnu.org>
 
 This covers the following Linux changes:
-Thu Jan  6 12:07:36 CST 1994:  Dr. Wettstein
+Thu Jan  6 12:07:36 CST 1994: Dr. Wettstein
 Also thanks to Juha for a patch to exclude users with a class
 of LOGIN from receiving messages.
 Mon Oct 12 20:22:59 CEST 1998: Martin Schulze <joey@infodrom.north.de>
 Added support for setutent()/getutent()/endutend() instead of
 binary reading the UTMP file.  This is the the most portable
 way.  This allows /var/run/utmp format to change, even to a
-real database or utmp daemon. Also if utmp file locking is
+real database or utmp daemon.  Also if utmp file locking is
 implemented in libc, syslog will use it immediately.  Thanks
 to Topi Miettinen <tom@medialab.sonera.net>.
 
 	* syslogd/syslogd.c: Include <utmpx.h> instead <utmp.h>.
-	(wallmsg): Use pointer to struct utmpx, not struct utmp.
-	Fix the size of line accoridngly.
-	Use setutxent instead opening the utmp file ourself.
-	Use getutxent instead fread.
-	Don't log to ut_type LOGIN_PROCESS, and don't log to
-	ut_user LOGIN (paranoia check).
-	Use ut_user instead ut_name.
-	Use endutxent instead fclose.
+	(wallmsg): Use pointer to struct utmpx, not struct utmp.  Fix the
+	size of line accoridngly.  Use setutxent instead opening the utmp
+	file ourself.  Use getutxent instead fread.  Don't log to ut_type
+	LOGIN_PROCESS, and don't log to ut_user LOGIN (paranoia check).
+	Use ut_user instead ut_name.  Use endutxent instead fclose.
 
 2000-08-02  Marcus Brinkmann  <marcus@gnu.org>
 
 This is among others the equivalent to the following Linux change:
-Thu Jan  6 12:07:36 CST 1994:  Dr. Wettstein
+Thu Jan  6 12:07:36 CST 1994: Dr. Wettstein
 Added support for proper decomposition and re-assembly of
 fragment messages on UNIX domain sockets.  Lack of this capability
 was causing 'partial' messages to be output.  Since facility and
 priority information is encoded as a leader on the messages this
 was causing lines to be placed in erroneous files.
 
-	* syslogd/syslogd.c: New symbol INITIAL_PARTS.
-	New struct msg_part, new global variables parts, nparts.
+	* syslogd/syslogd.c: New symbol INITIAL_PARTS.  New struct
+	msg_part, new global variables parts, nparts.
 	(get_part): New prototype, new function.
 	(free_part): Likewise.
 	(make_part): Likewise.
 	(printchopped): Likewise.
-	(main): New variable c. Allocate initial parts table
-	after installing signal handlers. In main loop,
-	use c instead i to count through funices. If a read
-	from a unx domain socket returns 0, close this fd.
-	Use printchopped instead printline to support partial
-	messages (a bit messy though).
+	(main): New variable c.  Allocate initial parts table after
+	installing signal handlers.  In main loop, use c instead i to
+	count through funices.  If a read from a unx domain socket returns
+	0, close this fd.  Use printchopped instead printline to support
+	partial messages (a bit messy though).
 
 2000-08-02  Marcus Brinkmann  <marcus@gnu.org>
 
 	* syslogd/syslogd.c: Remove global variable InetInuse.
 	(main): Check finet instead InetInuse.
-	(fprintlog): Case F_FORW: Only try to forward message
-	when finet is valid.
+	(fprintlog): Case F_FORW: Only try to forward message when finet
+	is valid.
 	(die): Check finet instead InetInuse.
 	(init): Don't fiddle InetInuse.
-	(cfline): Case '@': Don't check InetInuse (instead we
-	check finet in fprintlog, see above).
+	(cfline): Case '@': Don't check InetInuse (instead we check finet
+	in fprintlog, see above).
 
 2000-08-02  Marcus Brinkmann  <marcus@gnu.org>
 
 	Merged from the Linux source (sysklogd 1.3):
 	* syslogd/syslogd.c: New global variable restart.
-	(main): Main loop: If restart is set, call init()
-	and reset restart.
-	Install sighup_handler as SIGHUP handler.
+	(main): Main loop: If restart is set, call init() and reset
+	restart.  Install sighup_handler as SIGHUP handler.
 	(sighup_handler): New prototype, new function.
 
 2000-08-02  Marcus Brinkmann  <marcus@gnu.org>
@@ -8809,23 +8810,20 @@ the network.
 	* syslogd/syslogd.c (FDMASK): Removed.
 	(create_unix_socket): New prototype, new function.
 	(create_inet_socket): Likewise.
-	(main): Remove variables funix, inetm, klogm.
-	Move SUN_LEN and creation of unix domaim sockets/inet socket
-	to create_*_socket and init().
-	When opening PATH_KLOG, use fklog to store result.
-	Main loop: Rediddle code to use a fd_set and FD_*
-	operations instead an int and bit operations.
-	New variable maxfds to store highest fd.
-	Check fklog before checking fklog fd bit.
-	Check InetInuse before checking inet fd bit.
-	Clear buffer line before reading inet message.
+	(main): Remove variables funix, inetm, klogm.  Move SUN_LEN and
+	creation of unix domaim sockets/inet socket to create_*_socket and
+	init().  When opening PATH_KLOG, use fklog to store result.  Main
+	loop: Rediddle code to use a fd_set and FD_* operations instead an
+	int and bit operations.  New variable maxfds to store highest fd.
+	Check fklog before checking fklog fd bit.  Check InetInuse before
+	checking inet fd bit.  Clear buffer line before reading inet
+	message.
 	(die): Close inet socket.
-	(init): New variable Forwarding and sp.
-	Check here for service syslog/udp instead in main.
-	Set Forwarding when appropriate (one of F_FORW* types).
-	Looping over funix here, closing and (re)opening unix
-	sockets using create_unix_socket.
-	Closing and opening inet socet as appropriate.
+	(init): New variable Forwarding and sp.  Check here for service
+	syslog/udp instead in main.  Set Forwarding when appropriate (one
+	of F_FORW* types).  Looping over funix here, closing and
+	(re)opening unix sockets using create_unix_socket.  Closing and
+	opening inet socet as appropriate.
 
 2000-08-02  Marcus Brinkmann  <marcus@gnu.org>
 
@@ -8841,21 +8839,18 @@ example.  See for http://www.psionic.com/papers/dns.html
 	* syslogd/syslogd.c (LogName): Remove global variable.
 	(nfunix, funixn, funix): New global variables.
 	(MAXFUNIX): New symbol.
-	(main): Add option '-a' to getopt() invocation.
-	Learn the alphabet.
-	Add '-a' option processing.
-	Convert '-p' option to funixn.
-	Don't unlink LogName (doesn't exist anymore).
-	Create nfunix unix sockets in funix (using funixn)
-	(also unlink funixn here).
-	Main loop: Diddle the readfds initialization a bit.
-	Initialize nfds on the way.
-	Loop over all funix sockets and add their descriptors.
-	In select call, use nfds+1 and not arbitrary 20.
-	Later, check all funix for available reads.
+	(main): Add option '-a' to getopt() invocation.  Learn the
+	alphabet.  Add '-a' option processing.  Convert '-p' option to
+	funixn.  Don't unlink LogName (doesn't exist anymore).  Create
+	nfunix unix sockets in funix (using funixn)
+	(also unlink funixn here).  Main loop: Diddle the readfds
+	initialization a bit.  Initialize nfds on the way.  Loop over all
+	funix sockets and add their descriptors.  In select call, use
+	nfds+1 and not arbitrary 20.  Later, check all funix for available
+	reads.
 	(usage): Document '-a' option.
-	(die): Don't unlink LogName, instead close and unlink
-	all unix sockets in funix.
+	(die): Don't unlink LogName, instead close and unlink all unix
+	sockets in funix.
 
 2000-08-01  Marcus Brinkmann  <marcus@gnu.org>
 
@@ -8864,45 +8859,48 @@ Mon Oct 12 20:49:18 MET DST 1998: Martin Schulze <joey@infodrom.north.de>
 Avoid logging of SIGCHLD when syslogd is in the process of
 exiting and closing its files.  Again thanks to Topi.
 
-	* syslogd/syslogd.c (init): New variable was_initialized.
-	Set Initialize to 0 temporarily to avoid logging of SIGCHLD.
+	* syslogd/syslogd.c (init): New variable was_initialized.  Set
+	Initialize to 0 temporarily to avoid logging of SIGCHLD.
 
 2000-08-01  Marcus Brinkmann  <marcus@gnu.org>
 
 	* syslogd/syslogd.c (main): Really fix getopt argument this time.
 	Break after acting on option '-n'.
-	(crunch_list): Remove semicolon that makes a prototype from
-	the implementation (doh!).
+	(crunch_list): Remove semicolon that makes a prototype from the
+	implementation (doh!).
 
 2000-08-01  Marcus Brinkmann  <marcus@gnu.org>
 
-	* syslogd/syslogd.c (usage): Beautify with package name and version number.
+	* syslogd/syslogd.c (usage): Beautify with package name and
+	version number.
 
 2000-08-01  Marcus Brinkmann  <marcus@gnu.org>
 
-	* syslogd/syslogd.c (cvthname): Fix some really stupid errors in last change.
+	* syslogd/syslogd.c (cvthname): Fix some really stupid errors in
+	last change.
 
 2000-08-01  Marcus Brinkmann  <marcus@gnu.org>
 
-	* syslogd/syslogd.c (domark): Don't log mark if MarkInterval is <= 0.
-	* syslogd/syslogd.8 (SYNOPSIS): Add '-l', '-r', '-n' and '-s' (oops).
-	Document behaviour of '-m 0'.
+	* syslogd/syslogd.c (domark): Don't log mark if MarkInterval is <=
+	0.
+	* syslogd/syslogd.8 (SYNOPSIS): Add '-l', '-r', '-n' and '-s'
+	(oops).  Document behaviour of '-m 0'.
 
 2000-08-01  Marcus Brinkmann  <marcus@gnu.org>
 
 	* syslogd/syslogd.c: Fix prototype of debug_switch.
-	(cfline): In case '|', check for terminal and console.
-	In case '/', rearrange this very check.
-	(debug_switch): Fix parameter list to match prototype.
-	Don't install signal handler here.
+	(cfline): In case '|', check for terminal and console.  In case
+	'/', rearrange this very check.
+	(debug_switch): Fix parameter list to match prototype.  Don't
+	install signal handler here.
 
-	* syslogd/syslogd.c (repeatinterval): Shorten from 30, 120, 600
-	to 30, 60. This is what Linux sysklogd 1.3 uses.
+	* syslogd/syslogd.c (repeatinterval): Shorten from 30, 120, 600 to
+	30, 60.  This is what Linux sysklogd 1.3 uses.
 
 2000-07-31  Marcus Brinkmann  <marcus@gnu.org>
 
 This is the equivalent to the following Linux change:
-Mon Feb 10 00:09:11 MET DST 1997:  Martin Schulze
+Mon Feb 10 00:09:11 MET DST 1997: Martin Schulze
 Improved debug code to decode the numeric facility/priority
 pair into textual information.
 
@@ -8916,12 +8914,12 @@ pair into textual information.
 
 2000-07-31  Marcus Brinkmann  <marcus@gnu.org>
 
-	* syslogd/syslogd.c (init): Replace hard coded "/dev/console"
-	by PATH_CONSOLE.
+	* syslogd/syslogd.c (init): Replace hard coded "/dev/console" by
+	PATH_CONSOLE.
 
 2000-07-31  Marcus Brinkmann  <marcus@gnu.org>
 
-	* syslogd/syslogd.c (cfline): Fix off-by-one error. We have to
+	* syslogd/syslogd.c (cfline): Fix off-by-one error.  We have to
 	take into account "LOG_MARK" which has facility number
 	LOG_NFACILITIES.
 
@@ -8932,21 +8930,20 @@ pair into textual information.
 2000-07-31  Marcus Brinkmann  <marcus@gnu.org>
 
 This is based on the equivalent Linux change:
-Thu Oct 19 00:02:07 MET 1995:  Martin Schulze
-The default behavior has changed for security reasons. The
+Thu Oct 19 00:02:07 MET 1995: Martin Schulze
+The default behavior has changed for security reasons.  The
 syslogd will not receive any remote message unless you turn
 reception on with the "-r" option.
 
 	* syslogd/syslogd.c (AllowRemote): New global variable.
-	(main): New option "-r" to set AllowRemote.
-	Only if AllowRemote is true add inetm to readfds
-	and check for messages from there.
+	(main): New option "-r" to set AllowRemote.  Only if AllowRemote
+	is true add inetm to readfds and check for messages from there.
 	(usage): Document new option "-r".
 	(init): In start-up message, show if we allow remote messages.
 	* syslogd/syslogd.8: Document new option "-r".
 
-	(init): In start-up message, show package name and version
-	number (like: "GNU inetutils 1.3.2c").
+	(init): In start-up message, show package name and version number
+	(like: "GNU inetutils 1.3.2c").
 
 2000-07-31  Marcus Brinkmann  <marcus@gnu.org>
 
@@ -8965,36 +8962,34 @@ portable of setproctitle() and get configure to the rigth thing, with
 AC_REPLACE_FUNC (setproctitle).
 
 	* ftpd/ftpd.c: allow_severity, deny_severity should be guarded
-	with [HAVE_TCPD_H].
-	Move all globals to <extern.h>.
-	Remove [SETPROCTITLE] add [HAVE_SETPROCTITLE]
+	with [HAVE_TCPD_H].  Move all globals to <extern.h>.  Remove
+	[SETPROCTITLE] add [HAVE_SETPROCTITLE]
 	[HAVE_INITSETPROCTITLE], remove setproctitle () definition.
-	(main): SA_LEN () macro not portable remove.
-	Variable "quiet" change for "no_version".
+	(main): SA_LEN () macro not portable remove.  Variable "quiet"
+	change for "no_version".
 	(reapchild): Use waitpid ().
-	(user): Remove previous code handling of PAM.
-	and move the relevant pieces to sgetpwnam ().
-	(user): when strncpy ()ing curname make sure we
-	null terminate the string.
+	(user): Remove previous code handling of PAM.  and move the
+	relevant pieces to sgetpwnam ().
+	(user): when strncpy ()ing curname make sure we null terminate the
+	string.
 	(user): complete_login () call removed form user ().
 	(delete): Use the portable S_ISDIR () marcro.
 	(main): Don't typecast signal () use SIG_ERR.
 	(display_file): New function.
-	(statcmd): Global variable mode, rename to the
-	more informative stru_mode, it was also shadowing a lot
-	of local variable mode, for fopen ().
-	(main):  Remove initialization of global
-	variables and initialize when defined.
+	(statcmd): Global variable mode, rename to the more informative
+	stru_mode, it was also shadowing a lot of local variable mode, for
+	fopen ().
+	(main): Remove initialization of global variables and initialize
+	when defined.
 	(main): New option '-p' to override pid file.
-	(main): Adding SO_KEEPALIVE, to let the tcp/ip stack
-	detect when the connection been drop, IPTOS_LOWDELAY
-	for the control connection and IPTOS_THROUGHPUT for
-	the data connection.
+	(main): Adding SO_KEEPALIVE, to let the tcp/ip stack detect when
+	the connection been drop, IPTOS_LOWDELAY for the control
+	connection and IPTOS_THROUGHPUT for the data connection.
 
-	* ftpd/ftpcmd.y: Remove definition of yyerror () from ftpd.c
-	and move it to ftpcmd.y, result "cbuf" static scope.
-	Move all globals to <extern.h>.
-	Move declaration of cmdtab[] and sitetab[] to <extern.h>.
+	* ftpd/ftpcmd.y: Remove definition of yyerror () from ftpd.c and
+	move it to ftpcmd.y, result "cbuf" static scope.  Move all globals
+	to <extern.h>.  Move declaration of cmdtab[] and sitetab[] to
+	<extern.h>.
 
 	* ftpd/conf.c: New file, define checkuser () and display_file ().
 
@@ -9003,7 +8998,8 @@ AC_REPLACE_FUNC (setproctitle).
 	* ftpd/wrap.c: New file, define TCPD related functions.
 
 	* ftpd/server.c: New file, move all related standalone function to
-	this module reapchild (), server_mode () and tcpd wrapper handling.
+	this module reapchild (), server_mode () and tcpd wrapper
+	handling.
 
 2000-08-10  Michael Vogt <mvo@debian.org>
 
@@ -9024,12 +9020,12 @@ AC_REPLACE_FUNC (setproctitle).
 2000-07-08  Michael Vogt  <mvo@debian.org>
 
 	* ftpd/ftpd.c (main): added new option "-A" anonymous login only
-	added new option "-q" quiet to  do not print ftpd version.
+	added new option "-q" quiet to do not print ftpd version.
 
 2000-07-08  Michael Vogt  <mvo@debian.org>
 
-	* ftpd/ftpd.c (main): added new option "-D" for daemon-mode,
-	ftpd can now run without inetd.
+	* ftpd/ftpd.c (main): added new option "-D" for daemon-mode, ftpd
+	can now run without inetd.
 
 2000-07-07 Alain Magloire
 
@@ -9045,37 +9041,36 @@ AC_REPLACE_FUNC (setproctitle).
 
 2000-07-05 Alain Magloire
 
-	* ftpd/*: Clause 3 removed.
-	excerpt from email with RMS:
-	"UCB has agreed to drop the advertising clause from the license for all
-	BSD software.  The advertising clause is this one:
+	* ftpd/*: Clause 3 removed.  excerpt from email with RMS: "UCB has
+	agreed to drop the advertising clause from the license for all BSD
+	software.  The advertising clause is this one:
 
-	3. All advertising materials mentioning features or use of this software
-		must display the following acknowledgement:
-		This product includes software developed by the University of
-		California, Berkeley and its contributors.
+	  3. All advertising materials mentioning features or use of this
+	     software must display the following acknowledgement: This product
+	     includes software developed by the University of California,
+	     Berkeley and its contributors.
 
-	This means that we can delete that paragraph from all files which give
-	the University of California as the only copyright holder."
+	This means that we can delete that paragraph from all files which
+	give the University of California as the only copyright holder."
 
 1999-17-02 Alain Magloire
 
-	* tftpd/It has to do with handling of files with more than 32766 blocks. The
-	TFTP packets should be able to handle up to 65535 blocks. But many
-	tftpd's seem to treat the block# as a short instead of an unsigned
-	short. This appears to be caused by the arpa/tftp.h header declaring it
-	as a short. The relevant RFC's do not indicate that this is supposed to
-	be the case.
-	Patch and Email exchange from Nathan Neulinger.
+	* tftpd/It has to do with handling of files with more than 32766
+	blocks.  The TFTP packets should be able to handle up to 65535
+	blocks.  But many tftpd's seem to treat the block# as a short
+	instead of an unsigned short.  This appears to be caused by the
+	arpa/tftp.h header declaring it as a short.  The relevant RFC's do
+	not indicate that this is supposed to be the case.  Patch and
+	Email exchange from Nathan Neulinger.
 
 1999-17-02 Alain Magloire
 
-	* rexecd/rexecd.c : check HAVE_SOCKADDR_IN_SIN_LEN before
-	doing static initialization.
+	* rexecd/rexecd.c : check HAVE_SOCKADDR_IN_SIN_LEN before doing
+	static initialization.
 
-	* rexecd/Use STD{IN,OUT,ERR}_FILENO.
+	* rexecd/Use STD{IN, OUT, ERR}_FILENO.
 
-	* rexecd/Set also sete{g,u}id(pw->{g,u}id).
+	* rexecd/Set also sete{g, u}id(pw->{g, u}id).
 
 	* rexecd/Set the number of file desc. for select() correctly.
 
@@ -9091,15 +9086,17 @@ AC_REPLACE_FUNC (setproctitle).
 
 1999-09-13  Jeff Bailey
 
-	* COPYING, INSTALL, aclocal.m4, install-sh, missing, mkinstalldirs:
-	Remove from CVS repository - They are automatically generated.
+	* COPYING, INSTALL, aclocal.m4, install-sh, missing,
+	mkinstalldirs: Remove from CVS repository - They are automatically
+	generated.
 
 1999-06-12 Jeff Smith
 
 	* ftp/cmds.c/getit(): Y2K problem with MDTM.
-	* ftp/cmds.c/{setntrans,dotrans}(): use sizeof(ntin)/sizeof(ntout)
-	instead of hardcoded numbers(was 16).
-	* ftp/cmds.c/account(): occurences of 49 change for sizeof(acct) - 1
+	* ftp/cmds.c/{setntrans, dotrans}(): use
+	sizeof(ntin)/sizeof(ntout) instead of hardcoded numbers(was 16).
+	* ftp/cmds.c/account(): occurences of 49 change for sizeof(acct) -
+	1
 	* ftp/cmds.c: Typos in comments corrected.
 
 1999-05-19  Jeff Bailey
@@ -9108,8 +9105,8 @@ AC_REPLACE_FUNC (setproctitle).
 
 1999-05-19 Alain Magloire
 
-	* telnetd/telnetd.h: If HAVE_PTSNAME is defined, we assume that the
-	platform can handle SYSVR4 pseudo ttys and define STREAMSPTY.
+	* telnetd/telnetd.h: If HAVE_PTSNAME is defined, we assume that
+	the platform can handle SYSVR4 pseudo ttys and define STREAMSPTY.
 
 1999-05-19 Alain Magloire
 
@@ -9122,42 +9119,41 @@ AC_REPLACE_FUNC (setproctitle).
 
 1999-05-19  Alain Magloire
 
-	* ftp/ruserpass.c: MACH was define on Hurd.  We protect
-	the defines before using them, MACH was change to MACHINE.
-	Noted by the Hurd people (Jeff Bailey, Marcus Brinkmann)
+	* ftp/ruserpass.c: MACH was define on Hurd.  We protect the
+	defines before using them, MACH was change to MACHINE.  Noted by
+	the Hurd people (Jeff Bailey, Marcus Brinkmann)
 	* cmds.c: use xgetcwd().
 
 1999-05-19 Alain Magloire
 
-	* configure.in : check for ptsname(), this will give
-	a hint to use SYSVR4 pseudo ptys handling.  particularly
-	for telnetd and rlogind.
-	* libinetutls/utmp_{init,logout} : new files.
-	* libinetutils/openpty.c : a new version that should be
-	compatible with SYSV STREAM.
+	* configure.in : check for ptsname(), this will give a hint to use
+	SYSVR4 pseudo ptys handling.  particularly for telnetd and
+	rlogind.
+	* libinetutls/utmp_{init, logout} : new files.
+	* libinetutils/openpty.c : a new version that should be compatible
+	with SYSV STREAM.
 	* paths : add check for PATH_UTMPX and PATH_WTMPX
 	* configure.in : add check for getcwd, since we use xgetcwd.
 
 1999-05-18 Dan Stromberg
 
 	* headers/arpa/tftp.h : changing tu_clock to be unsigned to handle
-	larger files (twice as big), without sacrificing anything.
-	We need this to allow sgis to roboinst from a sun tftp server.
+	larger files (twice as big), without sacrificing anything.  We
+	need this to allow sgis to roboinst from a sun tftp server.
 
 1999-05-16 Alain Magloire
 
-	* config.guess, config.sub: files removed from the repository.
-	We let automake -a create a newer version when releasing
-	From Jeff Bailey.
-	* Makefile.am : added ChangeLog.0 in EXTRA_DIST
-	Noted by Jeff Bailey.
+	* config.guess, config.sub: files removed from the repository.  We
+	let automake -a create a newer version when releasing From Jeff
+	Bailey.
+	* Makefile.am : added ChangeLog.0 in EXTRA_DIST Noted by Jeff
+	Bailey.
 
 1999-05-14 Alain Magloire
 
 	* libinetutils/opentty.c : writing on a constant string
-	"/dev/ptyXX" would cause the server to sigsegv.  Change
-	to be an array.
-	Problem first noted by Frederic Goudal.
+	"/dev/ptyXX" would cause the server to sigsegv.  Change to be an
+	array.  Problem first noted by Frederic Goudal.
 
 1999-04-18 Alain Magloire
 
@@ -9167,26 +9163,26 @@ AC_REPLACE_FUNC (setproctitle).
 
 	* configure.in: ping disable.
 	* configure.in: make links for fnmatch
-	* libinetutils/snprintf.[ch] : support for "%ul".
-	patch from  Gerald Combs <gerald@unicom.net>
+	* libinetutils/snprintf.[ch] : support for "%ul".  patch from
+	Gerald Combs <gerald@unicom.net>
 
 1999-03-13 Alain Magloire
 
 	* rshd/ChangeLog : New file.
 
-	* rshd/Use STD{IN,OUT,ERR}_FILENO.
+	* rshd/Use STD{IN, OUT, ERR}_FILENO.
 
 	* rshd/Use memcmp() instead of bcmp().
 
 	* rshd/Add LOGNAME to environment variable exported to child.
 
-	* rshd/Restricted port to > IPPORT_RESERVED/2 && >= IPPORT_RESERVED
+	* rshd/Restricted port to > IPPORT_RESERVED/2 && >=
+	IPPORT_RESERVED
 
-	* rshd/Set also sete{g,u}id(pwd->{g,u}id).
+	* rshd/Set also sete{g, u}id(pwd->{g, u}id).
 
-	* rshd/change doit() signature to pass the socket.
-	It was done in case we change and the server is not started
-	via inetd.
+	* rshd/change doit() signature to pass the socket.  It was done in
+	case we change and the server is not started via inetd.
 
 	* rshd/initialise s(socket descriptor) s = (sockfd).
 
@@ -9202,17 +9198,17 @@ AC_REPLACE_FUNC (setproctitle).
 
 1999-02-26 Alain Magloire
 
-	The security fixes are gather from different sources:
-	folks of OpenBSD, FreeBSD, Debian, Redhat and wu-ftpd.
-	Heads-up for their nice work.
+	The security fixes are gather from different sources: folks of
+	OpenBSD, FreeBSD, Debian, Redhat and wu-ftpd.  Heads-up for their
+	nice work.
 
 
 	* ftpd/popen.c : overflow in argv[] and gargv[] fix.
 
 1999-02-17 Alain Magloire
 
-	* telnetd/rexecd.c : check HAVE_SOCKADDR_IN_SIN_LEN before
-	doing static initialization.
+	* telnetd/rexecd.c : check HAVE_SOCKADDR_IN_SIN_LEN before doing
+	static initialization.
 
 1999-02-17 Alain Magloire
 
@@ -9221,16 +9217,17 @@ AC_REPLACE_FUNC (setproctitle).
 	* ftpd/ftpcmnd.y : toolong() no longer a static function.
 	* ftpd/ftpd.c : Set the alarm(timeout) when doing an accept() for
 	the data port and use signal(SIGALRM, toolong).
-	* ftpd/ftpd.c(maing): tzset(), in case no timezone database in ~ftp.
+	* ftpd/ftpd.c(maing): tzset(), in case no timezone database in
+	~ftp.
 	* ftpd/ftpd.c(datacon) : Use snprintf() instead of sprintf() for
-	fix array buffers. Assign *sizebuf ='\0' instead of
-	strcpy (sizebuf, "");
+	fix array buffers.  Assign *sizebuf ='\0' instead of strcpy
+	(sizebuf, "");
 	* ftpd/Use xgetcwd() from libinetutils instead of getcwd();
 
 1999-02-17 Alain Magloire
 
-	* configure.in: Force the check of HAVE_SOCKADDR_IN_SIN_LEN
-	all the time not just for talk.
+	* configure.in: Force the check of HAVE_SOCKADDR_IN_SIN_LEN all
+	the time not just for talk.
 	* configure.in: Check for mmap(), HAVE_MMAP.
 	* configure.in: Check for tzset(), HAVE_TZSET.
 	* configure.in: Check for strcasecmp().
@@ -9240,34 +9237,36 @@ AC_REPLACE_FUNC (setproctitle).
 
 1999-02-13 Alain Magloire
 
-	* ftpd/ftpcmd.y : PORT command disallow PORT if :
-		- port <= 1023 || data_addr.sin_addr != his_addr.sin_addr
-	This will take care of FTP bounce. See README.sec
+	* ftpd/ftpcmd.y : PORT command disallow PORT if: - port <= 1023 ||
+	data_addr.sin_addr != his_addr.sin_addr This will take care of FTP
+	bounce.  See README.sec
 	* ftpd/ftpcmd.y : PASS clear passwd var(memset) asap.
 	* ftpd/ftpcmd.y : PASV check if loggin.
 	* ftpd/ftpcmd.y : RNTO check loggin and free $4 pointer.
 	* ftpd/ftpcmd.y : HELP free $3 pointer.
 	* ftpd/ftpcmd.y : SITE free $5 pointer.
 	* ftpd/ftpcmd.y : RNFR free $4 pointer.
-	* ftpd/ftpcmd.y : MDTM year 2000 compliant use %04d (tm_year + 1900).
+	* ftpd/ftpcmd.y : MDTM year 2000 compliant use %04d (tm_year +
+	1900).
 	* ftpd/ftpcmd.y : SITE IDLE not permit to disable timeout and
-		check login.
+	check login.
 
 1999-02-13 Alain Magloire
 
-	* ChangeLog.0 : New file, mv ChangeLog ChangeLog.0.
-	Since inetutils is such an heteroclite package, it is
-	more manageable for each utility to have their own ChangLog.
+	* ChangeLog.0 : New file, mv ChangeLog ChangeLog.0.  Since
+	inetutils is such an heteroclite package, it is more manageable
+	for each utility to have their own ChangLog.
 
 	* */ChangeLog : New files.
 
 Sat Jul 20 21:55:31 1996  Roland McGrath  <roland@delasyd.gnu.ai.mit.edu>
 
 	Win32 hacks from <Rob_Tulloh@tivoli.com>.
-	* glob/posix/glob.c [WIN32]: Don't include <pwd.h>; don't use d_ino;
-	use void * for my_realloc; include <malloc.h> for alloca.
+	* glob/posix/glob.c [WIN32]: Don't include <pwd.h>; don't use
+	d_ino; use void * for my_realloc; include <malloc.h> for alloca.
 	(glob) [WIN32]: Use "c:/users/default" for ~ if no HOME variable.
-	* glob/posix/fnmatch.h [WIN32]: Use prototypes even if [!__STDC__].
+	* glob/posix/fnmatch.h [WIN32]: Use prototypes even if
+	[!__STDC__].
 	* glob/posix/glob.h: Likewise.
 
 Fri Jul 19 16:56:41 1996  Roland McGrath  <roland@delasyd.gnu.ai.mit.edu>
@@ -9289,75 +9288,75 @@ Wed Nov 22 22:32:55 1995  Martin Schulze
 
 Added the fabulous strip-domain feature that allows us to
 strip off (several) domain names from the fqdn and only log
-the simple hostname. This is useful if you're in a LAN that
+the simple hostname.  This is useful if you're in a LAN that
 has a central log server and also different domains.
 
 I have also also added the -l switch do define hosts as
-local. These will get logged with their simple hostname, too.
+local.  These will get logged with their simple hostname, too.
 
 	* syslogd/syslogd.c (LIST_DELIMITER): New symbol.
 	(StripDomains, LocalHosts): New variables.
 	(crunch_list): New prototype and function.
 	(main): New options "-s" and "-l".
 	(usage): Document "-s" and "-l".
-	(cvthname): Use StripDomains and LocalHosts to frob
-	the hostname before returning.
+	(cvthname): Use StripDomains and LocalHosts to frob the hostname
+	before returning.
 	* syslogd/syslogd.8: Document new options "-s" and "-l".
 
 2000-07-31  Marcus Brinkmann  <marcus@gnu.org>
 
 	Merged from the Linux source (sysklogd 1.3):
 	* syslogd/syslogd.c (F_FORW_SUSP): New symbol.
-	(F_FORW_UNKN, F_PIPE): Increment value, to make space for F_FORW_SUSP.
+	(F_FORW_UNKN, F_PIPE): Increment value, to make space for
+	F_FORW_SUSP.
 	(TypeNames): Insert name for F_FORW_SUSP.
-	(fprintlog): Add case for F_FORW_SUSP.
-	In case F_FORW use F_FORW_SUSP on error (and not F_FORW_UNKN).
-	Add debug message.
+	(fprintlog): Add case for F_FORW_SUSP.  In case F_FORW use
+	F_FORW_SUSP on error (and not F_FORW_UNKN).  Add debug message.
 	(init): Handle case F_FORW_SUSP in debug output like F_FORW.
 
 2000-07-31  Marcus Brinkmann  <marcus@gnu.org>
 
 	* syslogd/syslogd.c (NoDetach): New global variable.
-	(main): New option "-n". If NoDetach is true, don't
-	background and detach from controlling terminal.
+	(main): New option "-n".  If NoDetach is true, don't background
+	and detach from controlling terminal.
 	(usage): Document new option n.
 	* syslogd/syslogd.8: Document new option "-n".
 
 2000-07-05 Alain Magloire
 
-	*syslogd/: Clause 3 removed.
-	excerpt from email with RMS:
-	"UCB has agreed to drop the advertising clause from the license for all
+	*syslogd/: Clause 3 removed.  excerpt from email with RMS: "UCB
+	has agreed to drop the advertising clause from the license for all
 	BSD software.  The advertising clause is this one:
 
-	3.All advertising materials mentioning features or use of this software
-	must display the following acknowledgement:
-	This product includes software developed by the University of
-	California, Berkeley and its contributors.
+	  3. All advertising materials mentioning features or use of
+	     this software must display the following acknowledgement:
+	     This product includes software developed by the
+	     University of California, Berkeley and its contributors.
 
-	This means that we can delete that paragraph from all files which give
-	the University of California as the only copyright holder."
+	This means that we can delete that paragraph from all files which
+	give the University of California as the only copyright holder."
 
 1999-10-01  Marcus Brinkmann  <brinkmd@debian.org>
 
-	* syslogd/syslogd.c (main): Type of len changed from int to size_t.
-	(usage): Add -V option, make output consistent with other GNU tools.
+	* syslogd/syslogd.c (main): Type of len changed from int to
+	size_t.
+	(usage): Add -V option, make output consistent with other GNU
+	tools.
 
 	* syslogd/syslogd.8: Document "-V" option.
 
-	* syslogd/syslogd.c (logmsg): Only accept priority if the exact bit
-	is set (instead of an inequality).
+	* syslogd/syslogd.c (logmsg): Only accept priority if the exact
+	bit is set (instead of an inequality).
 	(cfline): negate_pri, excl_pri, pri_set, pri_clear: New variables.
 	Allow '!' and '=' prepended to priority specification to exclude
-	these resp. higher priorities.
+	these resp.  higher priorities.
 
 	* syslogd/syslogd.c (printline): Add SYNC_FILE to logmsg
 	invocation for more reliability.
 	(struct filed): New member f_flags to hold new macro OMIT_SYNC.
 	(logmsg): Only fsync if OMIT_SYNC is not set.
-	(cfline): Clear f_flags at initialization.
-	Set OMIT_SYNC in f_flags if action is prepended by `-' in
-	the conf file.
+	(cfline): Clear f_flags at initialization.  Set OMIT_SYNC in
+	f_flags if action is prepended by `-' in the conf file.
 
 	* syslogd/syslog.conf.5: Document level modifiers '!' and '='.
 	Add `-' rule.
@@ -9366,7 +9365,7 @@ local. These will get logged with their simple hostname, too.
 
 This is the equivalent to the following Linux change:
 
-Wed Feb 14 12:42:09 CST 1996:  Dr. Wettstein
+Wed Feb 14 12:42:09 CST 1996: Dr. Wettstein
 Allowed forwarding of messages received from remote hosts to
 be controlled by a command-line switch.  Specifying -h allows
 forwarding.  The default behavior is to disable forwarding of
@@ -9375,9 +9374,8 @@ messages which were received from a remote host.
 	* syslogd/syslogd.c: New global variable "NoHops".
 	(main): New option "-h" to clear NoHops.
 	(usage): Document new "-h" option.
-	(fprintlog): New argument (char *) from.
-	If from != LocalHostName and NoHops set, don't forward
-	message.
+	(fprintlog): New argument (char *) from.  If from != LocalHostName
+	and NoHops set, don't forward message.
 	(logmsg): Add from argument to fprintlog invocation.
 	(domark): Likewise.
 	(die): Likewise.
@@ -9388,7 +9386,7 @@ messages which were received from a remote host.
 1999-10-01  Marcus Brinkmann  <brinkmd@debian.org>
 
 This is the equivalent to the following Linux change:
-Wed Jul 26 18:57:23 MET DST 1995:  Martin Schulze
+Wed Jul 26 18:57:23 MET DST 1995: Martin Schulze
 The 'LocalDomain' and the hostname of a remote machine is
 converted to lower case, because the original caused some
 inconsistency, because the (at least my) nameserver did respond an
@@ -9397,15 +9395,15 @@ fqdn containing of upper- _and_ lowercase letters while
 match.
 
 	* syslogd/syslogd.c (main): Try harder to get the FQDN of
-	localhost and convert LocalDomain to lowercase. (This should
+	localhost and convert LocalDomain to lowercase.  (This should
 	probably be in libinetutils).
-	(cvthname): Add "." to output strings.
-	Convert hostname to lowercase before comparing with LocalDomain.
+	(cvthname): Add "." to output strings.  Convert hostname to
+	lowercase before comparing with LocalDomain.
 
 1999-10-01  Marcus Brinkmann  <brinkmd@debian.org>
 
 This is the equivalent to the following Linux change:
-Tue May 28 00:58:45 MET DST 1996:  Martin Schulze
+Tue May 28 00:58:45 MET DST 1996: Martin Schulze
 Corrected behaviour of blocking pipes - i.e. the whole system
 hung.  Michael Nonweiler <mrn20@hermes.cam.ac.uk> has sent us
 a patch to correct this.  A new logfile type F_PIPE has been
@@ -9416,15 +9414,15 @@ introduced.
 	(fprintlog): Support for F_PIPE added.
 	(init): Likewise.
 	(cfline): Likewise, use '|' in conf file.
-	(cfline): Open log files with O_CREAT and
-	permission 0644.
+	(cfline): Open log files with O_CREAT and permission 0644.
 
-	* syslogd/syslog.conf.5: Add documentation for new logfile type PIPE.
+	* syslogd/syslog.conf.5: Add documentation for new logfile type
+	PIPE.
 
 1999-10-01  Marcus Brinkmann  <brinkmd@debian.org>
 
 This is the equivalent to the following Linux change:
-Mon May 20 13:29:32 MET DST 1996:  Miquel van Smoorenburg <miquels@cistron.nl>
+Mon May 20 13:29:32 MET DST 1996: Miquel van Smoorenburg <miquels@cistron.nl>
 Added continuation line support.
 
 	* syslogd/syslogd.c (init): Add support for continuated lines
@@ -9435,11 +9433,11 @@ Added continuation line support.
 1999-10-01  Marcus Brinkmann  <brinkmd@debian.org>
 
 This is the equivalent to the following Linux change:
-Mon Aug 21 22:10:35 MET DST 1995:  Martin Schulze
+Mon Aug 21 22:10:35 MET DST 1995: Martin Schulze
 Corrected a strange behavior during parsing of configuration
-file. The original BSD syslogd doesn't understand spaces as
-separators between specifier and action. This syslogd now
-understands them. The old behavior caused some confusion over
+file.  The original BSD syslogd doesn't understand spaces as
+separators between specifier and action.  This syslogd now
+understands them.  The old behavior caused some confusion over
 the Linux community.
 
 	* syslogd/syslogd.c (cfline): Allow space as delimiter.
@@ -9449,7 +9447,7 @@ the Linux community.
 1999-10-01  Marcus Brinkmann  <brinkmd@debian.org>
 
 This is the equivalent to the following Linux change:
-Thu Oct 26 13:14:06 MET 1995:  Martin Schulze
+Thu Oct 26 13:14:06 MET 1995: Martin Schulze
 Added another logfile type F_FORW_UNKN.  The problem I ran into
 was a name server that runs on my machine and a forwarder of
 kern.crit to another host.  The hosts address can only be
@@ -9463,16 +9461,16 @@ Fixed small bugs in F_FORW_UNKN meachanism.  Thanks to Torsten
 Neumann <torsten@londo.rhein-main.de> for pointing me to it.
 
 	* syslogd/syslogd.c: INET_SUSPEND_TIME, INET_RETRY_MAX,
-	F_FORW_UNKN: New macros.
-	TypeNames: Add "FORW(UNKNOWN)". If gethostbyname fails for some host,
-	this type will retry INET_RETRY_TIMES times before it finally fails.
-	(fprintlog): New variable hp. Move clearing f_time inside every
-	case it is appropriate for. Add new case F_FORW_UNKN. New goto
-	target f_forw. Only clear f_prevcount if appropriate.
-	(init): Do not close f_file for F_FORW. Add debug output for
+	F_FORW_UNKN: New macros.  TypeNames: Add "FORW(UNKNOWN)".  If
+	gethostbyname fails for some host, this type will retry
+	INET_RETRY_TIMES times before it finally fails.
+	(fprintlog): New variable hp.  Move clearing f_time inside every
+	case it is appropriate for.  Add new case F_FORW_UNKN.  New goto
+	target f_forw.  Only clear f_prevcount if appropriate.
+	(init): Do not close f_file for F_FORW.  Add debug output for
 	F_FORW_UNKN.
-	(cfline): If gethostbyname fails, set f_type to F_FORW_UNKN instead
-	giving up instantly.
+	(cfline): If gethostbyname fails, set f_type to F_FORW_UNKN
+	instead giving up instantly.
 
 1999-06-08  Marcus Brinkmann  <brinkmd@debian.org>
 
@@ -9483,8 +9481,8 @@ Neumann <torsten@londo.rhein-main.de> for pointing me to it.
 
 199-08-07  Marcus Brinkmann  <brinkmd@debian.org>
 
-	* syslogd/syslogd/syslogd.c (usage): Add -V option,
-	make output consistent with other GNU tools.
+	* syslogd/syslogd/syslogd.c (usage): Add -V option, make output
+	consistent with other GNU tools.
 
 1999-08-07  Marcus Brinkmann  <brinkmd@debian.org>
 
@@ -9493,8 +9491,8 @@ Mon Oct 12 22:18:34 CEST 1998: Martin Schulze <joey@infodrom.north.de>
 Modified printline() to support 8bit characters - such as
 russion letters.  Thanks to Vladas Lapinskas <lapinskas@mail.iae.lt>.
 
-	* syslogd/syslogd/syslogd.c (printline): Make eight bit clean for our
-	friends in Russia (and other).
+	* syslogd/syslogd/syslogd.c (printline): Make eight bit clean for
+	our friends in Russia (and other).
 
 1999-06-08  Marcus Brinkmann  <brinkmd@debian.org>
 

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


commit a173748fb67c6871522857372574da4311dc0145
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Fri Dec 30 16:10:27 2011 +0100

    bootstrap: Updated from gnulib.

diff --git a/ChangeLog b/ChangeLog
index 2b0c970..243161a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-30  Alfred M. Szmidt  <ams@gnu.org>
+
+	* bootstrap: Updated from gnulib.
+	* lib/Makefile.am: File removed.
+
 2011-12-30  Mats Erik Andersson <gnu@gisladisker.se>
 
 	* ftp/cmds.c (restart): Use `%lld' as format for long long int.
diff --git a/bootstrap b/bootstrap
index 3c39f4a..505a05e 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Print a version string.
-scriptversion=2011-12-07.20; # UTC
+scriptversion=2011-12-21.09; # UTC
 
 # Bootstrap this package from checked-out sources.
 
@@ -38,10 +38,6 @@ export LC_ALL
 
 local_gl_dir=gl
 
-# Temporary directory names.
-bt='._bootmp'
-bt_regex=`echo "$bt"| sed 's/\./[.]/g'`
-bt2=${bt}2
 me=$0
 
 usage() {
@@ -88,6 +84,9 @@ gnulib_modules=
 # Any gnulib files needed that are not in modules.
 gnulib_files=
 
+: ${AUTOPOINT=autopoint}
+: ${AUTORECONF=autoreconf}
+
 # A function to be called to edit gnulib.mk right after it's created.
 # Override it via your own definition in bootstrap.conf.
 gnulib_mk_hook() { :; }
@@ -105,6 +104,11 @@ po_download_command_format=\
 "rsync --delete --exclude '*.s1' -Lrtvz \
  'translationproject.org::tp/latest/%s/' '%s'"
 
+# Fallback for downloading .po files (if rsync fails).
+po_download_command_format2=\
+"wget --mirror -nd -q -np -A.po -P '%s' \
+ http://translationproject.org/latest/%s/"
+
 extract_package_name='
   /^AC_INIT(/{
      /.*,.*,.*, */{
@@ -473,26 +477,32 @@ if test $use_libtool = 1; then
   find_tool LIBTOOLIZE glibtoolize libtoolize
 fi
 
+# gnulib-tool requires at least automake and autoconf.
+# If either is not listed, add it (with minimum version) as a prerequisite.
 case $buildreq in
-  automake) ;;
+  *automake*) ;;
   *) buildreq="automake 1.9
 $buildreq" ;;
 esac
 case $buildreq in
-  autoconf) ;;
+  *autoconf*) ;;
   *) buildreq="autoconf 2.59
 $buildreq" ;;
 esac
+
+# When we can deduce that gnulib-tool will require patch,
+# and when patch is not already listed as a prerequisite, add it, too.
 if test ! -d "$local_gl_dir" \
     || find "$local_gl_dir" -name '*.diff' -exec false {} +; then
   :
 else
   case $buildreq in
-    patch) ;;
+    *patch*) ;;
     *) buildreq="patch -
 $buildreq" ;;
   esac
 fi
+
 if ! printf "$buildreq" | check_versions; then
   echo >&2
   if test -f README-prereq; then
@@ -603,6 +613,9 @@ download_po_files() {
   domain=$2
   echo "$me: getting translations into $subdir for $domain..."
   cmd=`printf "$po_download_command_format" "$domain" "$subdir"`
+  eval "$cmd" && return
+  # Fallback to HTTP.
+  cmd=`printf "$po_download_command_format2" "$subdir" "$domain"`
   eval "$cmd"
 }
 
@@ -723,56 +736,32 @@ symlink_to_dir()
   }
 }
 
-cp_mark_as_generated()
-{
-  cp_src=$1
-  cp_dst=$2
+# NOTE: we have to be careful to run both autopoint and libtoolize
+# before gnulib-tool, since gnulib-tool is likely to provide newer
+# versions of files "installed" by these two programs.
+# Then, *after* gnulib-tool (see below), we have to be careful to
+# run autoreconf in such a way that it does not run either of these
+# two just-pre-run programs.
 
-  if cmp -s "$cp_src" "$GNULIB_SRCDIR/$cp_dst"; then
-    symlink_to_dir "$GNULIB_SRCDIR" "$cp_dst"
-  elif cmp -s "$cp_src" "$local_gl_dir/$cp_dst"; then
-    symlink_to_dir $local_gl_dir "$cp_dst"
-  else
-    case $cp_dst in
-      *.[ch])             c1='/* '; c2=' */';;
-      *.texi)             c1='@c '; c2=     ;;
-      *.m4|*/Make*|Make*) c1='# ' ; c2=     ;;
-      *)                  c1=     ; c2=     ;;
-    esac
+# Import from gettext.
+with_gettext=yes
+grep '^[	 ]*AM_GNU_GETTEXT_VERSION(' configure.ac >/dev/null || \
+    with_gettext=no
 
-    # If the destination directory doesn't exist, create it.
-    # This is required at least for "lib/uniwidth/cjk.h".
-    dst_dir=`dirname "$cp_dst"`
-    test -d "$dst_dir" || mkdir -p "$dst_dir"
-
-    if test -z "$c1"; then
-      cmp -s "$cp_src" "$cp_dst" || {
-        # Copy the file first to get proper permissions if it
-        # doesn't already exist.  Then overwrite the copy.
-        echo "$me: cp -f $cp_src $cp_dst" &&
-        rm -f "$cp_dst" &&
-        cp "$cp_src" "$cp_dst-t" &&
-        sed "s!$bt_regex/!!g" "$cp_src" > "$cp_dst-t" &&
-        mv -f "$cp_dst-t" "$cp_dst"
-      }
-    else
-      # Copy the file first to get proper permissions if it
-      # doesn't already exist.  Then overwrite the copy.
-      cp "$cp_src" "$cp_dst-t" &&
-      (
-        echo "$c1-*- buffer-read-only: t -*- vi: set ro:$c2" &&
-        echo "${c1}DO NOT EDIT! GENERATED AUTOMATICALLY!$c2" &&
-        sed "s!$bt_regex/!!g" "$cp_src"
-      ) > $cp_dst-t &&
-      if cmp -s "$cp_dst-t" "$cp_dst"; then
-        rm -f "$cp_dst-t"
-      else
-        echo "$me: cp $cp_src $cp_dst # with edits" &&
-        mv -f "$cp_dst-t" "$cp_dst"
-      fi
-    fi
-  fi
-}
+if test $with_gettext = yes; then
+  # Released autopoint has the tendency to install macros that have been
+  # obsoleted in current gnulib, so run this before gnulib-tool.
+  echo "$0: $AUTOPOINT --force"
+  $AUTOPOINT --force || exit
+fi
+
+# Autoreconf runs aclocal before libtoolize, which causes spurious
+# warnings if the initial aclocal is confused by the libtoolized
+# (or worse out-of-date) macro directory.
+if grep '^[    ]*LT_INIT' configure.ac >/dev/null; then
+  echo "running: $LIBTOOLIZE --copy --install"
+  $LIBTOOLIZE --copy --install
+fi
 
 version_controlled_file() {
   dir=$1
@@ -791,83 +780,17 @@ version_controlled_file() {
   test $found = yes
 }
 
-slurp() {
-  for dir in . `(cd $1 && find * -type d -print)`; do
-    copied=
-    sep=
-    for file in `ls -a $1/$dir`; do
-      case $file in
-      .|..) continue;;
-      # FIXME: should all file names starting with "." be ignored?
-      .*) continue;;
-      esac
-      test -d $1/$dir/$file && continue
-      for excluded_file in $excluded_files; do
-        test "$dir/$file" = "$excluded_file" && continue 2
-      done
-      if test $file = Makefile.am && test "X$gnulib_mk" != XMakefile.am; then
-        copied=$copied${sep}$gnulib_mk; sep=$nl
-        remove_intl='/^[^#].*\/intl/s/^/#/;'"s!$bt_regex/!!g"
-        sed "$remove_intl" $1/$dir/$file |
-        cmp - $dir/$gnulib_mk > /dev/null || {
-          echo "$me: Copying $1/$dir/$file to $dir/$gnulib_mk ..." &&
-          rm -f $dir/$gnulib_mk &&
-          sed "$remove_intl" $1/$dir/$file >$dir/$gnulib_mk &&
-          gnulib_mk_hook $dir/$gnulib_mk
-        }
-      elif { test "${2+set}" = set && test -r $2/$dir/$file; } ||
-           version_controlled_file $dir $file; then
-        echo "$me: $dir/$file overrides $1/$dir/$file"
-      else
-        copied=$copied$sep$file; sep=$nl
-        cp_mark_as_generated $1/$dir/$file $dir/$file
-      fi || exit
-    done
-
-    for dot_ig in x $vc_ignore; do
-      test $dot_ig = x && continue
-      ig=$dir/$dot_ig
-      if test -n "$copied"; then
-        insert_vc_ignore $ig "$copied"
-        # If an ignored file name ends with .in.h, then also add
-        # the name with just ".h".  Many gnulib headers are generated,
-        # e.g., stdint.in.h -> stdint.h, dirent.in.h ->..., etc.
-        # Likewise for .gperf -> .h, .y -> .c, and .sin -> .sed
-        f=`echo "$copied" |
-          sed '
-            s/\.in\.h$/.h/
-            s/\.sin$/.sed/
-            s/\.y$/.c/
-            s/\.gperf$/.h/
-          '
-        `
-        insert_vc_ignore $ig "$f"
-
-        # For files like sys_stat.in.h and sys_time.in.h, record as
-        # ignorable the directory we might eventually create: sys/.
-        f=`echo "$copied"|sed 's/sys_.*\.in\.h$/sys/'`
-        insert_vc_ignore $ig "$f"
-      fi
-    done
-  done
-}
-
-
-# Create boot temporary directories to import from gnulib and gettext.
-rm -fr $bt $bt2 &&
-mkdir $bt $bt2 || exit
-
 # Import from gnulib.
 
 gnulib_tool_options="\
  --import\
  --no-changelog\
- --aux-dir $bt/$build_aux\
- --doc-base $bt/$doc_base\
+ --aux-dir $build_aux\
+ --doc-base $doc_base\
  --lib $gnulib_name\
- --m4-base $bt/$m4_base/\
- --source-base $bt/$source_base/\
- --tests-base $bt/$tests_base\
+ --m4-base $m4_base/\
+ --source-base $source_base/\
+ --tests-base $tests_base\
  --local-dir $local_gl_dir\
  $gnulib_tool_option_extras\
 "
@@ -879,26 +802,11 @@ if test $use_libtool = 1; then
 fi
 echo "$0: $gnulib_tool $gnulib_tool_options --import ..."
 $gnulib_tool $gnulib_tool_options --import $gnulib_modules &&
-slurp $bt || exit
 
 for file in $gnulib_files; do
   symlink_to_dir "$GNULIB_SRCDIR" $file || exit
 done
 
-
-# Import from gettext.
-with_gettext=yes
-grep '^[	 ]*AM_GNU_GETTEXT_VERSION(' configure.ac >/dev/null || \
-    with_gettext=no
-
-if test $with_gettext = yes; then
-  echo "$0: (cd $bt2; ${AUTOPOINT-autopoint}) ..."
-  cp configure.ac $bt2 &&
-  (cd $bt2 && ${AUTOPOINT-autopoint} && rm configure.ac) &&
-  slurp $bt2 $bt || exit
-fi
-rm -fr $bt $bt2 || exit
-
 # Remove any dangling symlink matching "*.m4" or "*.[ch]" in some
 # gnulib-populated directories.  Such .m4 files would cause aclocal to fail.
 # The following requires GNU find 4.2.3 or newer.  Considering the usual
@@ -911,28 +819,12 @@ find "$m4_base" "$source_base" \
   -depth \( -name '*.m4' -o -name '*.[ch]' \) \
   -type l -xtype l -delete > /dev/null 2>&1
 
-# Reconfigure, getting other files.
-
-# Skip autoheader if it's not needed.
-grep -E '^[	 ]*AC_CONFIG_HEADERS?\>' configure.ac >/dev/null ||
-  AUTOHEADER=true
-
-for command in \
-  libtool \
-  "${ACLOCAL-aclocal} --force -I '$m4_base' $ACLOCAL_FLAGS" \
-  "${AUTOCONF-autoconf} --force" \
-  "${AUTOHEADER-autoheader} --force" \
-  "${AUTOMAKE-automake} --add-missing --copy --force-missing"
-do
-  if test "$command" = libtool; then
-    test $use_libtool = 0 \
-      && continue
-    command="${LIBTOOLIZE-libtoolize} -c -f"
-  fi
-  echo "$0: $command ..."
-  eval "$command" || exit
-done
-
+# Tell autoreconf not to invoke autopoint or libtoolize; they were run above.
+echo "running: AUTOPOINT=true LIBTOOLIZE=true " \
+    "$AUTORECONF --verbose --install --no-recursive -I $m4_base $ACLOCAL_FLAGS"
+AUTOPOINT=true LIBTOOLIZE=true \
+    $AUTORECONF --verbose --install --no-recursive -I $m4_base $ACLOCAL_FLAGS \
+  || exit 1
 
 # Get some extra files from gnulib, overriding existing files.
 for file in $gnulib_extra_files; do
diff --git a/lib/Makefile.am b/lib/Makefile.am
deleted file mode 100644
index a67a007..0000000
--- a/lib/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-# Makefile for gnulib/lib				-*-Makefile-*-
-# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 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/'.
-
-include gnulib.mk

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

Summary of changes:
 ChangeLog       | 3311 ++++++++++++++++++++++++++++---------------------------
 NEWS            |   11 +-
 bootstrap       |  220 +---
 lib/Makefile.am |   20 -
 4 files changed, 1719 insertions(+), 1843 deletions(-)
 delete mode 100644 lib/Makefile.am


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Fri Dec 30 12:20:59 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Rgg8Z-0005HQ-8u
	for mharc-commit-inetutils@gnu.org; Fri, 30 Dec 2011 12:20:59 -0500
Received: from eggs.gnu.org ([140.186.70.92]:38646)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1Rgg8V-0005G5-MP
	for commit-inetutils@gnu.org; Fri, 30 Dec 2011 12:20:57 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1Rgg8T-00072q-7T
	for commit-inetutils@gnu.org; Fri, 30 Dec 2011 12:20:55 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:38063)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1Rgg8T-00072m-3o
	for commit-inetutils@gnu.org; Fri, 30 Dec 2011 12:20:53 -0500
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1Rgg8S-000511-Dz
	for commit-inetutils@gnu.org; Fri, 30 Dec 2011 17:20:52 +0000
Date: Fri, 30 Dec 2011 17:20:52 +0000
Message-Id: <E1Rgg8S-000511-Dz@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-211-gf548b94
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 7715cda342f7c93cd21ef7627428de39fbf44e59
X-Git-Newrev: f548b94ec57a637045c412a01679da3427d50414
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.72
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: Fri, 30 Dec 2011 17:20:57 -0000

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

The branch, master has been updated
       via  f548b94ec57a637045c412a01679da3427d50414 (commit)
      from  7715cda342f7c93cd21ef7627428de39fbf44e59 (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=f548b94ec57a637045c412a01679da3427d50414


commit f548b94ec57a637045c412a01679da3427d50414
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Fri Dec 30 18:18:38 2011 +0100

    rlogind,rshd: Fall back to ruserok.
    
    Test and express dependency of __check_rhosts_file.

diff --git a/ChangeLog b/ChangeLog
index b294c71..e316fa7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,31 @@
+2011-12-30  Mats Erik Andersson <gnu@gisladisker.se>
+
+	* configure.ac: Check for ruserok.  If iruserok exists, then define
+	WITH_IRUSEROK, else if ruserok exists, then define WITH_RUSEROK.
+	Disable rlogind and rshd otherwise.  Check for __check_rhosts_file.
+	* src/rlogind.c [HAVE___CHECK_RHOSTS_FILE] (__check_rhosts_file):
+	Protect declaration as extern variable.
+	[__GLIBC__ && WITH_IRUSEROK] (iruserok): Protect declaration
+	as extern.
+	(options) [HAVE___CHECK_RHOSTS_FILE]: Conditionally include the
+	option `-l/--no-rhosts'.
+	(parse_opt) [HAVE___CHECK_RHOSTS_FILE]: Likewise.
+	(exec_login) [SOLARIS]: Contemporary arguments for execle.
+	(do_rlogin) [WITH_IRUSEROK]: Protect usage of iruserok.
+	[!WITH_IRUSEROK && WITH_RUSEROK]: Do authorization with ruserok
+	composed with inet_ntoa.
+	* src/rshd.c (options) [HAVE___CHECK_RHOSTS_FILE]: Conditionally
+	include the option `-l/--no-rhosts'.
+	[HAVE___CHECK_RHOSTS_FILE] (__check_rhosts_file): Protect declaration
+	as extern variable.
+	[__GLIBC__ && WITH_IRUSEROK] (iruserok): Protect declaration
+	as extern.
+	(parse_opt) [HAVE___CHECK_RHOSTS_FILE]: Conditional detection of
+	`-l/--no-rhosts'.
+	(doit) [WITH_IRUSEROK]: Protect call to iruserok.
+	[!WITH_IRUSEROK && WITH_RUSEROK]: Do authorization with ruserok
+	composed with inet_ntoa.
+
 2011-12-30  Alfred M. Szmidt  <ams@gnu.org>
 
 	* bootstrap: Updated from gnulib.
diff --git a/configure.ac b/configure.ac
index f418175..8ff47e2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -219,14 +219,24 @@ else
   talk_BUILD=''
 fi
 
-dnl FIXME: Presently rshd and rlogind need iruserok(3),
-dnl which is not univerally available.  Replacement code?
+dnl FIXME: Presently rshd and rlogind prefer iruserok(3),
+dnl which is not universally available.  Replacement code?
+dnl A fallback is being built from ruserok(3) and inet_ntoa(3).
 AC_CHECK_FUNC(iruserok, , , [#include <netdb.h>])
-if test "$ac_cv_func_iruserok" = no; then
-  enable_rlogind=no
-  rlogind_BUILD=''
-  enable_rshd=no
-  rshd_BUILD=''
+AC_CHECK_FUNC(ruserok, , , [#include <netdb.h>])
+if test "$ac_cv_func_iruserok" = yes; then
+  AC_DEFINE([WITH_IRUSEROK], 1, [Define to one if you can use iruserok.])
+else
+  if test "$ac_cv_func_ruserok" = yes; then
+    AC_DEFINE([WITH_RUSEROK], 1, [Define to one if you can use ruserok.])
+    AC_MSG_WARN([iruserok is not available, falling back to ruserok.])
+  else
+    AC_MSG_WARN([Disabling rlogind and rshd, since no iruserok and no ruserok.])
+    enable_rlogind=no
+    rlogind_BUILD=''
+    enable_rshd=no
+    rshd_BUILD=''
+  fi
 fi
 
 
@@ -616,7 +626,8 @@ AC_CHECK_FUNCS(cfsetspeed cgetent dirfd fchdir flock \
                setsid setregid setreuid setresgid setresuid setutent_r \
                sigaction sigvec strchr setproctitle tcgetattr tzset utimes \
                utime uname \
-               updwtmp updwtmpx vhangup wait3 wait4 opendir2 __rcmd_errstr)
+               updwtmp updwtmpx vhangup wait3 wait4 opendir2 \
+	       __rcmd_errstr __check_rhosts_file )
 
 dnl Functions that we will define if necessary.
 AC_REPLACE_FUNCS(getpass getusershell memcmp memcpy memmove memset \
diff --git a/src/rlogind.c b/src/rlogind.c
index 63cbe8f..0a78cb5 100644
--- a/src/rlogind.c
+++ b/src/rlogind.c
@@ -127,7 +127,10 @@
 #ifndef DEFPORT
 # define DEFPORT 513
 #endif
+
+#ifdef HAVE___CHECK_RHOSTS_FILE
 extern int __check_rhosts_file;
+#endif
 
 #ifndef SHISHI
 struct auth_data
@@ -180,7 +183,7 @@ int local_dot_count;
 
 struct winsize win = { 0, 0, 0, 0 };
 
-#ifdef __GLIBC__
+#if defined __GLIBC__ && defined WITH_IRUSEROK
 extern int iruserok (uint32_t raddr, int superuser,
                      const char *ruser, const char *luser);
 #endif
@@ -262,8 +265,10 @@ static struct argp_option options[] = {
     "ask hostname for verification" },
   { "daemon", 'd', NULL, 0,
     "daemon mode" },
+#ifdef HAVE___CHECK_RHOSTS_FILE
   { "no-rhosts", 'l', NULL, 0,
     "ignore .rhosts file" },
+#endif
   { "no-keepalive", 'n', NULL, 0,
     "do not set SO_KEEPALIVE" },
   { "local-domain", 'L', "NAME", 0,
@@ -307,9 +312,11 @@ parse_opt (int key, char *arg, struct argp_state *state)
 	maxchildren = DEFMAXCHILDREN;
       break;
 
+#ifdef HAVE___CHECK_RHOSTS_FILE
     case 'l':
       __check_rhosts_file = 0;	/* FIXME: extern var? */
       break;
+#endif
 
     case 'L':
       local_domain_name = arg;
@@ -706,8 +713,8 @@ exec_login (int authenticated, struct auth_data *ap)
   if (authenticated)
     {
 #ifdef SOLARIS
-      execle (path_login, "login", "-p",
-	      "-h", ap->hostname, ap->term, "-f", "--",
+      execle (path_login, "login", "-p", "-s", "rlogin",
+	      "-r", ap->hostname, "-U", ap->rusername,
 	      ap->lusername, NULL, ap->env);
 #else
       execle (path_login, "login", "-p",
@@ -717,8 +724,8 @@ exec_login (int authenticated, struct auth_data *ap)
   else
     {
 #ifdef SOLARIS
-      execle (path_login, "login", "-p",
-	      "-h", ap->hostname, ap->term, "--",
+      execle (path_login, "login", "-p", "-s", "rlogin",
+	      "-r", ap->hostname, "-U", ap->rusername,
 	      ap->lusername, NULL, ap->env);
 #else
       execle (path_login, "login", "-p",
@@ -861,10 +868,20 @@ do_rlogin (int infd, struct auth_data *ap)
       fatal (infd, "Permission denied", 0);
     }
 
+#ifdef WITH_IRUSEROK
   rc = iruserok (ap->from.sin_addr.s_addr, 0, ap->rusername, ap->lusername);
   if (rc)
     syslog (LOG_ERR, "iruserok failed: rusername=%s, lusername=%s",
 	    ap->rusername, ap->lusername);
+#elif defined WITH_RUSEROK
+  rc = ruserok (inet_ntoa (ap->from.sin_addr), 0, ap->rusername, ap->lusername);
+  if (rc)
+    syslog (LOG_ERR, "ruserok failed: rusername=%s, lusername=%s",
+	    ap->rusername, ap->lusername);
+#else /* !WITH_IRUSEROK && !WITH_RUSEROK */
+#error Unable to use mandatory iruserok/ruserok.  This should not happen.
+#endif /* !WITH_IRUSEROK && !WITH_RUSEROK */
+
   return rc;
 }
 
diff --git a/src/rshd.c b/src/rshd.c
index c1a572a..e27cc4f 100644
--- a/src/rshd.c
+++ b/src/rshd.c
@@ -134,8 +134,10 @@ int doencrypt, use_kerberos, vacuous;
 static struct argp_option options[] = {
   { "verify-hostname", 'a', NULL, 0,
     "ask hostname for verification" },
+#ifdef HAVE___CHECK_RHOSTS_FILE
   { "no-rhosts", 'l', NULL, 0,
     "ignore .rhosts file" },
+#endif
   { "no-keepalive", 'n', NULL, 0,
     "do not set SO_KEEPALIVE" },
   { "log-sessions", 'L', NULL, 0,
@@ -151,9 +153,11 @@ static struct argp_option options[] = {
   { NULL }
 };
 
+#ifdef HAVE___CHECK_RHOSTS_FILE
 extern int __check_rhosts_file;	/* hook in rcmd(3) */
+#endif
 
-#ifdef __GLIBC__
+#if defined __GLIBC__ && defined WITH_IRUSEROK
 extern int iruserok (uint32_t raddr, int superuser,
                      const char *ruser, const char *luser);
 #endif
@@ -167,9 +171,11 @@ parse_opt (int key, char *arg, struct argp_state *state)
       check_all = 1;
       break;
 
+#ifdef HAVE___CHECK_RHOSTS_FILE
     case 'l':
       __check_rhosts_file = 0;	/* don't check .rhosts file */
       break;
+#endif
 
     case 'n':
       keepalive = 0;	/* don't enable SO_KEEPALIVE */
@@ -789,9 +795,17 @@ doit (int sockfd, struct sockaddr_in *fromp)
     }
   else
 #endif
+#ifdef WITH_IRUSEROK
     if (errorstr || (pwd->pw_passwd != 0 && *pwd->pw_passwd != '\0'
                      && (iruserok (fromp->sin_addr.s_addr, pwd->pw_uid == 0,
                                    remuser, locuser)) < 0))
+#elif defined WITH_RUSEROK
+    if (errorstr || (pwd->pw_passwd != 0 && *pwd->pw_passwd != '\0'
+                     && (ruserok (inet_ntoa (fromp->sin_addr),
+				  pwd->pw_uid == 0, remuser, locuser)) < 0))
+#else /* !WITH_IRUSEROK && !WITH_RUSEROK */
+#error Unable to use mandatory iruserok/ruserok.  This should not happen.
+#endif /* !WITH_IRUSEROK && !WITH_RUSEROK */
     {
 #ifdef HAVE___RCMD_ERRSTR
       if (__rcmd_errstr)

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

Summary of changes:
 ChangeLog     |   28 ++++++++++++++++++++++++++++
 configure.ac  |   27 +++++++++++++++++++--------
 src/rlogind.c |   27 ++++++++++++++++++++++-----
 src/rshd.c    |   16 +++++++++++++++-
 4 files changed, 84 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Fri Dec 30 12:50:34 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RggbC-0007lV-1u
	for mharc-commit-inetutils@gnu.org; Fri, 30 Dec 2011 12:50:34 -0500
Received: from eggs.gnu.org ([140.186.70.92]:57800)
	by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1Rggb5-0007kX-Mk
	for commit-inetutils@gnu.org; Fri, 30 Dec 2011 12:50:32 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ams@gnu.org>) id 1Rggb1-00037K-CE
	for commit-inetutils@gnu.org; Fri, 30 Dec 2011 12:50:27 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:60566)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1Rggb1-00037F-86
	for commit-inetutils@gnu.org; Fri, 30 Dec 2011 12:50:23 -0500
Received: from ams by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <ams@gnu.org>) id 1Rggb0-0000e9-E1
	for commit-inetutils@gnu.org; Fri, 30 Dec 2011 17:50:22 +0000
Date: Fri, 30 Dec 2011 17:50:22 +0000
Message-Id: <E1Rggb0-0000e9-E1@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-215-g1a343be
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: f548b94ec57a637045c412a01679da3427d50414
X-Git-Newrev: 1a343be8d0fdf635f96d9d5cc20972a72f6688d3
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.72
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: Fri, 30 Dec 2011 17:50:32 -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  1a343be8d0fdf635f96d9d5cc20972a72f6688d3 (commit)
       via  0e7ee45b08bc380c6b1e5d2c7f7ee6fda886b069 (commit)
       via  8008ec320c046d73d73cb18b8a95a20d7bea9d29 (commit)
       via  662029bbc3eb4fc931c1a50e4a3fd125046843e9 (commit)
      from  f548b94ec57a637045c412a01679da3427d50414 (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=1a343be8d0fdf635f96d9d5cc20972a72f6688d3


commit 1a343be8d0fdf635f96d9d5cc20972a72f6688d3
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Fri Dec 30 18:40:12 2011 +0100

    Fix prohibit_dirent_without_use, sc_unsigned_short, sc_unsigned_long sc_unsigned_char checks.

diff --git a/ChangeLog b/ChangeLog
index 8400b42..25fdf5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,6 +28,25 @@
 
 2011-12-30  Alfred M. Szmidt  <ams@gnu.org>
 
+	Fix prohibit_dirent_without_use, sc_unsigned_short,
+	sc_unsigned_long sc_unsigned_char checks.
+
+	* ftpd/ftpd.c, libicmp/icmp.h, libicmp/icmp_address.c,
+	libicmp/icmp_cksum.c, libicmp/icmp_echo.c,
+	libicmp/icmp_timestamp.c, libinetutils/des_rw.c,
+	libinetutils/kcmd.c, libinetutils/krcmd.c, libinetutils/ttymsg.c,
+	libls/fts.c, libls/fts.h, libls/ls.c, libls/ls.h, libls/print.c,
+	libtelnet/kerberos.c, ping/libping.c, ping/ping.c, ping/ping.h,
+	ping/ping6.c, ping/ping_common.c, ping/ping_common.h,
+	ping/ping_echo.c, ping/ping_impl.h, src/inetd.c, src/rcp.c,
+	src/rexecd.c, src/rlogin.c, src/rlogind.c, src/rshd.c,
+	src/syslogd.c, src/tftp.c, src/tftpd.c, src/traceroute.c,
+	talk/ctl.c, talk/talk_ctl.h, telnet/krb4-proto.h, telnet/ring.c,
+	telnet/ring.h: Silence Fix prohibit_dirent_without_use,
+	sc_unsigned_short, sc_unsigned_long sc_unsigned_char checks.
+
+2011-12-30  Alfred M. Szmidt  <ams@gnu.org>
+
 	Fix sc_prohibit_test_minus_ao check.
 
 	* tests/tftp.sh: Fix sc_prohibit_test_minus_ao check.
diff --git a/ftpd/ftpd.c b/ftpd/ftpd.c
index 0cce865..b1bc070 100644
--- a/ftpd/ftpd.c
+++ b/ftpd/ftpd.c
@@ -1419,7 +1419,7 @@ void
 statcmd (void)
 {
   struct sockaddr_in *sin;
-  u_char *a, *p;
+  unsigned char *a, *p;
 
   lreply (211, "%s FTP server status:", hostname);
   if (!no_version)
@@ -1467,8 +1467,8 @@ statcmd (void)
       printf ("     PORT");
       sin = &data_dest;
     printaddr:
-      a = (u_char *) & sin->sin_addr;
-      p = (u_char *) & sin->sin_port;
+      a = (unsigned char *) & sin->sin_addr;
+      p = (unsigned char *) & sin->sin_port;
 #define UC(b) (((int) b) & 0xff)
       printf (" (%d,%d,%d,%d,%d,%d)\r\n", UC (a[0]),
 	      UC (a[1]), UC (a[2]), UC (a[3]), UC (p[0]), UC (p[1]));
diff --git a/libicmp/icmp.h b/libicmp/icmp.h
index 5bd0fcc..6f84674 100644
--- a/libicmp/icmp.h
+++ b/libicmp/icmp.h
@@ -24,33 +24,33 @@ typedef struct icmp_header icmphdr_t;
 
 struct icmp_header
 {
-  u_char icmp_type;		/* type of message, see below */
-  u_char icmp_code;		/* type sub code */
-  u_short icmp_cksum;		/* ones complement cksum of struct */
+  unsigned char icmp_type;		/* type of message, see below */
+  unsigned char icmp_code;		/* type sub code */
+  unsigned short icmp_cksum;		/* ones complement cksum of struct */
   union
   {
-    u_char ih_pptr;		/* ICMP_PARAMPROB */
+    unsigned char ih_pptr;		/* ICMP_PARAMPROB */
     struct in_addr ih_gwaddr;	/* ICMP_REDIRECT */
     struct ih_idseq
     {
-      u_short icd_id;
-      u_short icd_seq;
+      unsigned short icd_id;
+      unsigned short icd_seq;
     } ih_idseq;
     int ih_void;
 
     /* ICMP_UNREACH_NEEDFRAG -- Path MTU discovery as per rfc 1191 */
     struct ih_pmtu
     {
-      u_short ipm_void;
-      u_short ipm_nextmtu;
+      unsigned short ipm_void;
+      unsigned short ipm_nextmtu;
     } ih_pmtu;
 
     /* ICMP_ROUTERADV -- RFC 1256 */
     struct ih_rtradv
     {
-      u_char irt_num_addrs;	/* Number of addresses following the msg */
-      u_char irt_wpa;		/* Address Entry Size (32-bit words) */
-      u_short irt_lifetime;	/* Lifetime */
+      unsigned char irt_num_addrs;	/* Number of addresses following the msg */
+      unsigned char irt_wpa;		/* Address Entry Size (32-bit words) */
+      unsigned short irt_lifetime;	/* Lifetime */
     } ih_rtradv;
 
   } icmp_hun;
@@ -78,7 +78,7 @@ struct icmp_header
       struct ip idi_ip;
       /* options and then 64 bits of data */
     } id_ip;
-    u_long id_mask;		/* ICMP_ADDRESS, ICMP_ADDRESSREPLY */
+    unsigned long id_mask;		/* ICMP_ADDRESS, ICMP_ADDRESSREPLY */
     char id_data[1];
   } icmp_dun;
 #define icmp_otime	icmp_dun.id_ts.its_otime
@@ -140,22 +140,22 @@ struct icmp_header
 #define MAXIPLEN	60
 #define MAXICMPLEN	76
 #define ICMP_MINLEN	8	/* abs minimum */
-#define ICMP_TSLEN	(8 + 3 * sizeof (u_long))	/* timestamp */
+#define ICMP_TSLEN	(8 + 3 * sizeof (unsigned long))	/* timestamp */
 #define ICMP_MASKLEN	12	/* address mask */
 #define ICMP_ADVLENMIN	(8 + sizeof (struct ip) + 8)	/* min */
 #define ICMP_ADVLEN(p)	(8 + ((p)->icmp_ip.ip_hl << 2) + 8)
 	/* N.B.: must separately check that ip_hl >= 5 */
 
-u_short icmp_cksum (u_char * addr, int len);
-int icmp_generic_encode (u_char * buffer, size_t bufsize, int type, int ident,
+unsigned short icmp_cksum (unsigned char * addr, int len);
+int icmp_generic_encode (unsigned char * buffer, size_t bufsize, int type, int ident,
 			 int seqno);
-int icmp_generic_decode (u_char * buffer, size_t bufsize,
+int icmp_generic_decode (unsigned char * buffer, size_t bufsize,
 			 struct ip **ipp, icmphdr_t ** icmpp);
 
-int icmp_echo_encode (u_char * buffer, size_t bufsize, int ident, int seqno);
-int icmp_echo_decode (u_char * buffer, size_t bufsize,
+int icmp_echo_encode (unsigned char * buffer, size_t bufsize, int ident, int seqno);
+int icmp_echo_decode (unsigned char * buffer, size_t bufsize,
 		      struct ip **ip, icmphdr_t ** icmp);
-int icmp_timestamp_encode (u_char * buffer, size_t bufsize,
+int icmp_timestamp_encode (unsigned char * buffer, size_t bufsize,
 			   int ident, int seqno);
-int icmp_address_encode (u_char * buffer, size_t bufsize, int ident,
+int icmp_address_encode (unsigned char * buffer, size_t bufsize, int ident,
 			 int seqno);
diff --git a/libicmp/icmp_address.c b/libicmp/icmp_address.c
index 9a9ebc3..8b7a8ee 100644
--- a/libicmp/icmp_address.c
+++ b/libicmp/icmp_address.c
@@ -31,7 +31,7 @@
 #include <icmp.h>
 
 int
-icmp_address_encode (u_char * buffer, size_t bufsize, int ident, int seqno)
+icmp_address_encode (unsigned char * buffer, size_t bufsize, int ident, int seqno)
 {
   icmphdr_t *icmp;
 
diff --git a/libicmp/icmp_cksum.c b/libicmp/icmp_cksum.c
index fa2557f..35fba4e 100644
--- a/libicmp/icmp_cksum.c
+++ b/libicmp/icmp_cksum.c
@@ -22,20 +22,20 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-u_short
-icmp_cksum (u_char * addr, int len)
+unsigned short
+icmp_cksum (unsigned char * addr, int len)
 {
   register int sum = 0;
-  u_short answer = 0;
-  u_short *wp;
+  unsigned short answer = 0;
+  unsigned short *wp;
 
-  for (wp = (u_short *) addr; len > 1; wp++, len -= 2)
+  for (wp = (unsigned short *) addr; len > 1; wp++, len -= 2)
     sum += *wp;
 
   /* Take in an odd byte if present */
   if (len == 1)
     {
-      *(u_char *) & answer = *(u_char *) wp;
+      *(unsigned char *) & answer = *(unsigned char *) wp;
       sum += answer;
     }
 
diff --git a/libicmp/icmp_echo.c b/libicmp/icmp_echo.c
index 477af6f..30d0b18 100644
--- a/libicmp/icmp_echo.c
+++ b/libicmp/icmp_echo.c
@@ -31,7 +31,7 @@
 #include <icmp.h>
 
 int
-icmp_generic_encode (u_char * buffer, size_t bufsize, int type, int ident,
+icmp_generic_encode (unsigned char * buffer, size_t bufsize, int type, int ident,
 		     int seqno)
 {
   icmphdr_t *icmp;
@@ -50,11 +50,11 @@ icmp_generic_encode (u_char * buffer, size_t bufsize, int type, int ident,
 }
 
 int
-icmp_generic_decode (u_char * buffer, size_t bufsize,
+icmp_generic_decode (unsigned char * buffer, size_t bufsize,
 		     struct ip **ipp, icmphdr_t ** icmpp)
 {
   size_t hlen;
-  u_short cksum;
+  unsigned short cksum;
   struct ip *ip;
   icmphdr_t *icmp;
 
@@ -74,20 +74,20 @@ icmp_generic_decode (u_char * buffer, size_t bufsize,
   /* Recompute checksum */
   cksum = icmp->icmp_cksum;
   icmp->icmp_cksum = 0;
-  icmp->icmp_cksum = icmp_cksum ((u_char *) icmp, bufsize - hlen);
+  icmp->icmp_cksum = icmp_cksum ((unsigned char *) icmp, bufsize - hlen);
   if (icmp->icmp_cksum != cksum)
     return 1;
   return 0;
 }
 
 int
-icmp_echo_encode (u_char * buffer, size_t bufsize, int ident, int seqno)
+icmp_echo_encode (unsigned char * buffer, size_t bufsize, int ident, int seqno)
 {
   return icmp_generic_encode (buffer, bufsize, ICMP_ECHO, ident, seqno);
 }
 
 int
-icmp_echo_decode (u_char * buffer, size_t bufsize,
+icmp_echo_decode (unsigned char * buffer, size_t bufsize,
 		  struct ip **ipp, icmphdr_t ** icmpp)
 {
   return icmp_generic_decode (buffer, bufsize, ipp, icmpp);
diff --git a/libicmp/icmp_timestamp.c b/libicmp/icmp_timestamp.c
index 3e6305d..c21310d 100644
--- a/libicmp/icmp_timestamp.c
+++ b/libicmp/icmp_timestamp.c
@@ -33,7 +33,7 @@
 #include <icmp.h>
 
 int
-icmp_timestamp_encode (u_char * buffer, size_t bufsize, int ident, int seqno)
+icmp_timestamp_encode (unsigned char * buffer, size_t bufsize, int ident, int seqno)
 {
   icmphdr_t *icmp;
   struct timeval tv;
diff --git a/libinetutils/des_rw.c b/libinetutils/des_rw.c
index e84c32c..a3c3a53 100644
--- a/libinetutils/des_rw.c
+++ b/libinetutils/des_rw.c
@@ -62,7 +62,7 @@
 
 static unsigned char des_inbuf[10240], storage[10240], *store_ptr;
 static bit_64 *key;
-static u_char *key_schedule;
+static unsigned char *key_schedule;
 
 /* XXX these should be in a kerberos include file */
 int krb_net_read (int, char *, int);
diff --git a/libinetutils/kcmd.c b/libinetutils/kcmd.c
index c0ab3f2..8bb30bc 100644
--- a/libinetutils/kcmd.c
+++ b/libinetutils/kcmd.c
@@ -86,14 +86,14 @@ int getport (int *);
 
 # if defined KERBEROS
 int
-kcmd (int *sock, char **ahost, u_short rport, char *locuser,
+kcmd (int *sock, char **ahost, unsigned short rport, char *locuser,
       char *remuser, char *cmd, int *fd2p, KTEXT ticket,
       char *service, char *realm,
       CREDENTIALS * cred, Key_schedule schedule, MSG_DAT * msg_data,
       struct sockaddr_in *laddr, struct sockaddr_in *faddr, long authopts)
 # elif defined(SHISHI)
 int
-kcmd (Shishi ** h, int *sock, char **ahost, u_short rport, char *locuser,
+kcmd (Shishi ** h, int *sock, char **ahost, unsigned short rport, char *locuser,
       char **remuser, char *cmd, int *fd2p, char *service, char *realm,
       Shishi_key ** key,
       struct sockaddr_in *laddr, struct sockaddr_in *faddr, long authopts)
@@ -229,7 +229,7 @@ kcmd (Shishi ** h, int *sock, char **ahost, u_short rport, char *locuser,
 	  goto bad;
 	}
       *fd2p = s3;
-      from.sin_port = ntohs ((u_short) from.sin_port);
+      from.sin_port = ntohs ((unsigned short) from.sin_port);
       if (from.sin_family != AF_INET || from.sin_port >= IPPORT_RESERVED)
 	{
 	  fprintf (stderr,
@@ -349,7 +349,7 @@ getport (int *alport)
     return (-1);
   for (;;)
     {
-      sin.sin_port = htons ((u_short) * alport);
+      sin.sin_port = htons ((unsigned short) * alport);
       if (bind (s, (struct sockaddr *) &sin, sizeof (sin)) >= 0)
 	return (s);
       if (errno != EADDRINUSE)
diff --git a/libinetutils/krcmd.c b/libinetutils/krcmd.c
index 338f627..59d0bf7 100644
--- a/libinetutils/krcmd.c
+++ b/libinetutils/krcmd.c
@@ -69,11 +69,11 @@
 # define SERVICE_NAME	"rcmd"
 
 # if defined SHISHI
-int kcmd (Shishi **, int *, char **, u_short, char *, char **,
+int kcmd (Shishi **, int *, char **, unsigned short, char *, char **,
 	  char *, int *, char *, char *, Shishi_key **,
 	  struct sockaddr_in *, struct sockaddr_in *, long);
 # else
-int kcmd (int *, char **, u_short, char *, char *, char *, int *,
+int kcmd (int *, char **, unsigned short, char *, char *, char *, int *,
 	  KTEXT, char *, char *, CREDENTIALS *, Key_schedule,
 	  MSG_DAT *, struct sockaddr_in *, struct sockaddr_in *, long);
 # endif
@@ -86,7 +86,7 @@ int kcmd (int *, char **, u_short, char *, char *, char *, int *,
 
 # if defined SHISHI
 int
-krcmd (Shishi ** h, char **ahost, u_short rport, char **remuser, char *cmd,
+krcmd (Shishi ** h, char **ahost, unsigned short rport, char **remuser, char *cmd,
        int *fd2p, char *realm)
 {
   int sock = -1, err = 0;
@@ -110,7 +110,7 @@ krcmd (Shishi ** h, char **ahost, u_short rport, char **remuser, char *cmd,
 
 # elif defined(KERBEROS)
 int
-krcmd (char **ahost, u_short rport, char *remuser, char *cmd, int *fd2p,
+krcmd (char **ahost, unsigned short rport, char *remuser, char *cmd, int *fd2p,
        char *realm)
 {
   int sock = -1, err = 0;
@@ -140,7 +140,7 @@ krcmd (char **ahost, u_short rport, char *remuser, char *cmd, int *fd2p,
 
 #  if defined SHISHI
 int
-krcmd_mutual (Shishi ** h, char **ahost, u_short rport, char **remuser,
+krcmd_mutual (Shishi ** h, char **ahost, unsigned short rport, char **remuser,
 	      char *cmd, int *fd2p, char *realm, Shishi_key ** key)
 {
   int sock = -1, err = 0;
@@ -166,7 +166,7 @@ krcmd_mutual (Shishi ** h, char **ahost, u_short rport, char **remuser,
 
 #  elif defined(KERBEROS)
 int
-krcmd_mutual (char **ahost, u_short rport, char *remuser, char *cmd,
+krcmd_mutual (char **ahost, unsigned short rport, char *remuser, char *cmd,
 	      int *fd2p, char *realm, CREDENTIALS * cred, Key_schedule sched)
 {
   int sock, err;
diff --git a/libinetutils/ttymsg.c b/libinetutils/ttymsg.c
index d6cebaa..e91b056 100644
--- a/libinetutils/ttymsg.c
+++ b/libinetutils/ttymsg.c
@@ -53,7 +53,6 @@
 #include <sys/uio.h>
 #include <signal.h>
 #include <fcntl.h>
-#include <dirent.h>
 #include <errno.h>
 #include <unistd.h>
 #include <stdio.h>
diff --git a/libls/fts.c b/libls/fts.c
index 80e8abf..f5f5bc9 100644
--- a/libls/fts.c
+++ b/libls/fts.c
@@ -66,7 +66,7 @@ static size_t fts_maxarglen (char *const *);
 static void fts_padjust (FTS *, void *);
 static int fts_palloc (FTS *, size_t);
 static FTSENT *fts_sort (FTS *, FTSENT *, int);
-static u_short fts_stat (FTS *, struct dirent *, FTSENT *, int);
+static unsigned short fts_stat (FTS *, struct dirent *, FTSENT *, int);
 
 #ifndef MAX
 # define MAX(a, b)	(((a) > (b)) ? (a) : (b))
@@ -852,7 +852,7 @@ fts_build (register FTS *sp, int type)
   return (head);
 }
 
-static u_short
+static unsigned short
 fts_stat (FTS *sp, struct dirent *dp, register FTSENT *p, int follow)
 {
   register FTSENT *t;
diff --git a/libls/fts.h b/libls/fts.h
index f799342..01d3468 100644
--- a/libls/fts.h
+++ b/libls/fts.h
@@ -92,8 +92,8 @@ typedef struct _ftsent
   char *fts_path;		/* root path */
   int fts_errno;		/* errno for this node */
   int fts_symfd;		/* fd for symlink */
-  u_short fts_pathlen;		/* strlen(fts_path) */
-  u_short fts_namelen;		/* strlen(fts_name) */
+  unsigned short fts_pathlen;		/* strlen(fts_path) */
+  unsigned short fts_namelen;		/* strlen(fts_name) */
 
   ino_t fts_ino;		/* inode */
   dev_t fts_dev;		/* device */
@@ -117,17 +117,17 @@ typedef struct _ftsent
 # define FTS_SL		12	/* symbolic link */
 # define FTS_SLNONE	13	/* symbolic link without target */
 # define FTS_W		14	/* whiteout object */
-  u_short fts_info;		/* user flags for FTSENT structure */
+  unsigned short fts_info;		/* user flags for FTSENT structure */
 
 # define FTS_DONTCHDIR	 0x01	/* don't chdir .. to the parent */
 # define FTS_SYMFOLLOW	 0x02	/* followed a symlink to get here */
-  u_short fts_flags;		/* private flags for FTSENT structure */
+  unsigned short fts_flags;		/* private flags for FTSENT structure */
 
 # define FTS_AGAIN	 1	/* read node again */
 # define FTS_FOLLOW	 2	/* follow symbolic link */
 # define FTS_NOINSTR	 3	/* no instructions */
 # define FTS_SKIP	 4	/* discard node */
-  u_short fts_instr;		/* fts_set() instructions */
+  unsigned short fts_instr;		/* fts_set() instructions */
 
   struct stat *fts_statp;	/* stat(2) information */
   char fts_name[1];		/* file name */
diff --git a/libls/ls.c b/libls/ls.c
index 426d6ff..cc6e4bd 100644
--- a/libls/ls.c
+++ b/libls/ls.c
@@ -55,7 +55,6 @@
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 
-#include <dirent.h>
 #include <errno.h>
 #include "fts.h"
 #include <stdio.h>
@@ -427,7 +426,7 @@ display (FTSENT *p, FTSENT *list)
   FTSENT *cur;
   NAMES *np;
   unsigned long long maxsize;
-  u_long btotal, maxblock, maxinode, maxlen, maxnlink;
+  unsigned long btotal, maxblock, maxinode, maxlen, maxnlink;
   int bcfile, flen, glen, ulen, maxflags, maxgroup, maxuser;
   int entries, needstats;
   char *user = NULL, *group = NULL, buf[INT_BUFSIZE_BOUND (uintmax_t)];
diff --git a/libls/ls.h b/libls/ls.h
index 6ce46cd..aa376f8 100644
--- a/libls/ls.h
+++ b/libls/ls.h
@@ -67,7 +67,7 @@ extern int f_typedir;		/* add type character for directories */
 typedef struct
 {
   FTSENT *list;
-  u_long btotal;
+  unsigned long btotal;
   int bcfile;
   int entries;
   int maxlen;
diff --git a/libls/print.c b/libls/print.c
index 6ec5999..e851244 100644
--- a/libls/print.c
+++ b/libls/print.c
@@ -88,7 +88,7 @@
 # define minor(x)        ((int)((x)&0377))
 #endif
 
-static int printaname (FTSENT *, u_long, u_long);
+static int printaname (FTSENT *, unsigned long, unsigned long);
 static void printlink (FTSENT *);
 static void printtime (time_t);
 static int printtype (u_int);
@@ -246,7 +246,7 @@ printcol (DISPLAY *dp)
  * return # of characters printed, no trailing characters.
  */
 static int
-printaname (FTSENT *p, u_long inodefield, u_long sizefield)
+printaname (FTSENT *p, unsigned long inodefield, unsigned long sizefield)
 {
   struct stat *sp;
   int chcnt;
diff --git a/libtelnet/kerberos.c b/libtelnet/kerberos.c
index cce39bc..e9d1c29 100644
--- a/libtelnet/kerberos.c
+++ b/libtelnet/kerberos.c
@@ -83,8 +83,8 @@
 # include "misc.h"
 
 int kerberos4_cksum (unsigned char *, int);
-int krb_mk_req (KTEXT, char *, char *, char *, u_long);
-int krb_rd_req (KTEXT, char *, char *, u_long, AUTH_DAT *, char *);
+int krb_mk_req (KTEXT, char *, char *, char *, unsigned long);
+int krb_rd_req (KTEXT, char *, char *, unsigned long, AUTH_DAT *, char *);
 int krb_kntoln (AUTH_DAT *, char *);
 int krb_get_cred (char *, char *, char *, CREDENTIALS *);
 int krb_get_lrealm (char *, int);
diff --git a/ping/libping.c b/ping/libping.c
index 99b5cd5..6746564 100644
--- a/ping/libping.c
+++ b/ping/libping.c
@@ -83,7 +83,7 @@ ping_init (int type, int ident)
   p->ping_count = 0;
   p->ping_interval = PING_DEFAULT_INTERVAL;
   p->ping_datalen = sizeof (icmphdr_t);
-  /* Make sure we use only 16 bits in this field, id for icmp is a u_short.  */
+  /* Make sure we use only 16 bits in this field, id for icmp is a unsigned short.  */
   p->ping_ident = ident & 0xFFFF;
   p->ping_cktab_size = PING_CKTABSIZE;
   gettimeofday (&p->ping_start_time, NULL);
diff --git a/ping/ping.c b/ping/ping.c
index b90ebec..9135ff6 100644
--- a/ping/ping.c
+++ b/ping/ping.c
@@ -55,8 +55,8 @@ extern int ping_router (char *hostname);
 
 PING *ping;
 bool is_root = false;
-u_char *data_buffer;
-u_char *patptr;
+unsigned char *data_buffer;
+unsigned char *patptr;
 int pattern_len = 16;
 int socket_type;
 size_t count = DEFAULT_PING_COUNT;
@@ -133,7 +133,7 @@ static error_t
 parse_opt (int key, char *arg, struct argp_state *state)
 {
   char *endptr;
-  static u_char pattern[16];
+  static unsigned char pattern[16];
   double v;
 
   switch (key)
diff --git a/ping/ping.h b/ping/ping.h
index 50bf97f..d576ed6 100644
--- a/ping/ping.h
+++ b/ping/ping.h
@@ -25,7 +25,7 @@ void ping_reset (PING * p);
 void ping_set_type (PING * p, int type);
 void ping_set_packetsize (PING * ping, size_t size);
 int ping_set_dest (PING * ping, char *host);
-int ping_set_pattern (PING * p, int len, u_char * pat);
+int ping_set_pattern (PING * p, int len, unsigned char * pat);
 void ping_set_event_handler (PING * ping, ping_efp fp, void *closure);
 int ping_recv (PING * p);
 int ping_xmit (PING * p);
diff --git a/ping/ping6.c b/ping/ping6.c
index 6bb7618..2873d15 100644
--- a/ping/ping6.c
+++ b/ping/ping6.c
@@ -49,7 +49,7 @@
 static PING *ping;
 bool is_root = false;
 unsigned char *data_buffer;
-u_char *patptr;
+unsigned char *patptr;
 int one = 1;
 int pattern_len = 16;
 size_t data_length = PING_DATALEN;
@@ -102,7 +102,7 @@ static error_t
 parse_opt (int key, char *arg, struct argp_state *state)
 {
   char *endptr;
-  static u_char pattern[16];
+  static unsigned char pattern[16];
 
   switch (key)
     {
@@ -752,7 +752,7 @@ ping_init (int type, int ident)
   p->ping_count = DEFAULT_PING_COUNT;
   p->ping_interval = PING_DEFAULT_INTERVAL;
   p->ping_datalen = sizeof (struct icmp6_hdr);
-  /* Make sure we use only 16 bits in this field, id for icmp is a u_short.  */
+  /* Make sure we use only 16 bits in this field, id for icmp is a unsigned short.  */
   p->ping_ident = ident & 0xFFFF;
   p->ping_cktab_size = PING_CKTABSIZE;
   gettimeofday (&p->ping_start_time, NULL);
diff --git a/ping/ping_common.c b/ping/ping_common.c
index 7c5c5a3..c33db22 100644
--- a/ping/ping_common.c
+++ b/ping/ping_common.c
@@ -54,10 +54,10 @@ ping_cvt_number (const char *optarg, size_t maxval, int allow_zero)
 }
 
 void
-init_data_buffer (u_char * pat, int len)
+init_data_buffer (unsigned char * pat, int len)
 {
   int i = 0;
-  u_char *p;
+  unsigned char *p;
 
   if (data_length == 0)
     return;
diff --git a/ping/ping_common.h b/ping/ping_common.h
index f742164..86ef83b 100644
--- a/ping/ping_common.h
+++ b/ping/ping_common.h
@@ -110,7 +110,7 @@ struct ping_data
   int ping_cktab_size;
   char *ping_cktab;
 
-  u_char *ping_buffer;         /* I/O buffer */
+  unsigned char *ping_buffer;         /* I/O buffer */
   union ping_address ping_from;
   long ping_num_xmit;          /* Number of packets transmitted */
   long ping_num_recv;          /* Number of packets received */
diff --git a/ping/ping_echo.c b/ping/ping_echo.c
index 33680f2..f4e1176 100644
--- a/ping/ping_echo.c
+++ b/ping/ping_echo.c
@@ -282,10 +282,10 @@ static void
 print_ip_header (struct ip *ip)
 {
   int hlen;
-  u_char *cp;
+  unsigned char *cp;
 
   hlen = ip->ip_hl << 2;
-  cp = (u_char *) ip + 20;	/* point to options */
+  cp = (unsigned char *) ip + 20;	/* point to options */
 
   printf
     ("Vr HL TOS  Len   ID Flg  off TTL Pro  cks      Src      Dst Data\n");
@@ -306,13 +306,13 @@ void
 print_ip_data (icmphdr_t * icmp, void *data)
 {
   int hlen;
-  u_char *cp;
+  unsigned char *cp;
   struct ip *ip = &icmp->icmp_ip;
 
   print_ip_header (ip);
 
   hlen = ip->ip_hl << 2;
-  cp = (u_char *) ip + hlen;
+  cp = (unsigned char *) ip + hlen;
 
   if (ip->ip_p == 6)
     printf ("TCP: from port %u, to port %u (decimal)\n",
@@ -392,12 +392,12 @@ print_icmp_header (struct sockaddr_in *from,
 void
 print_ip_opt (struct ip *ip, int hlen)
 {
-  u_char *cp;
+  unsigned char *cp;
   int i, j, l;
   static int old_rrlen;
   static char old_rr[MAX_IPOPTLEN];
 
-  cp = (u_char *) (ip + 1);
+  cp = (unsigned char *) (ip + 1);
 
   for (; hlen > (int) sizeof (struct ip); --hlen, ++cp)
     switch (*cp)
@@ -449,7 +449,7 @@ print_ip_opt (struct ip *ip, int hlen)
 	if (i <= 0)
 	  continue;
 	if (i == old_rrlen
-	    && cp == (u_char *) (ip + 1) + 2
+	    && cp == (unsigned char *) (ip + 1) + 2
 	    && !memcmp ((char *) cp, old_rr, i) && !(options & OPT_FLOOD))
 	  {
 	    printf ("\t (same route)");
diff --git a/ping/ping_impl.h b/ping/ping_impl.h
index a87fa22..1c2e172 100644
--- a/ping/ping_impl.h
+++ b/ping/ping_impl.h
@@ -21,7 +21,7 @@
 
 extern unsigned options;
 extern PING *ping;
-extern u_char *data_buffer;
+extern unsigned char *data_buffer;
 extern size_t data_length;
 
 extern int ping_run (PING * ping, int (*finish) ());
diff --git a/src/inetd.c b/src/inetd.c
index 9c1f27f..b04941c 100644
--- a/src/inetd.c
+++ b/src/inetd.c
@@ -1583,7 +1583,7 @@ machtime (void)
 	fprintf (stderr, "Unable to get time of day\n");
       return 0L;
     }
-#define OFFSET ((u_long)25567 * 24*60*60)
+#define OFFSET ((unsigned long)25567 * 24*60*60)
   return (htonl ((long) (tv.tv_sec + OFFSET)));
 #undef OFFSET
 }
diff --git a/src/rcp.c b/src/rcp.c
index 3d54fc6..9b2f614 100644
--- a/src/rcp.c
+++ b/src/rcp.c
@@ -226,7 +226,7 @@ static struct argp argp = {
 };
 
 struct passwd *pwd;
-u_short port;
+unsigned short port;
 uid_t userid;
 int errs, rem;
 
diff --git a/src/rexecd.c b/src/rexecd.c
index efef4f8..487d524 100644
--- a/src/rexecd.c
+++ b/src/rexecd.c
@@ -162,7 +162,7 @@ doit (int f, struct sockaddr_in *fromp)
   char *user, *pass, *pw_password;
   struct passwd *pwd;
   int s;
-  u_short port;
+  unsigned short port;
   int pv[2], pid, cc;
   fd_set readfrom, ready;
   char buf[BUFSIZ], sig;
diff --git a/src/rlogin.c b/src/rlogin.c
index 14f3765..c62a56f 100644
--- a/src/rlogin.c
+++ b/src/rlogin.c
@@ -169,7 +169,7 @@ int dflag = 0;
 int noescape;
 char * host = NULL;
 char * user = NULL;
-u_char escapechar = '~';
+unsigned char escapechar = '~';
 
 #ifdef OLDSUN
 
diff --git a/src/rlogind.c b/src/rlogind.c
index 0a78cb5..2a893ff 100644
--- a/src/rlogind.c
+++ b/src/rlogind.c
@@ -592,7 +592,7 @@ rlogind_auth (int fd, struct auth_data *ap)
 	}
 #ifdef IP_OPTIONS
       {
-	u_char optbuf[BUFSIZ / 3], *cp;
+	unsigned char optbuf[BUFSIZ / 3], *cp;
 	char lbuf[BUFSIZ], *lp;
 	socklen_t optsize = sizeof (optbuf);
 	int ipproto;
@@ -918,8 +918,8 @@ do_krb4_login (int infd, struct auth_data *ap, const char **err_msg)
   char instance[INST_SZ], version[VERSION_SZ];
   long authopts = 0L;		/* !mutual */
   struct sockaddr_in faddr;
-  u_char auth_buf[sizeof (AUTH_DAT)];
-  u_char tick_buf[sizeof (KTEXT_ST)];
+  unsigned char auth_buf[sizeof (AUTH_DAT)];
+  unsigned char tick_buf[sizeof (KTEXT_ST)];
   Key_schedule schedule;
   AUTH_DAT *kdata;
   KTEXT ticket;
diff --git a/src/rshd.c b/src/rshd.c
index e27cc4f..9096d3c 100644
--- a/src/rshd.c
+++ b/src/rshd.c
@@ -301,7 +301,7 @@ doit (int sockfd, struct sockaddr_in *fromp)
 #endif
   struct hostent *hp;
   struct passwd *pwd;
-  u_short port;
+  unsigned short port;
   fd_set ready, readfrom;
   int cc, nfd, pv[2], pid, s = sockfd;
   int one = 1;
@@ -351,7 +351,7 @@ doit (int sockfd, struct sockaddr_in *fromp)
     }
 #ifdef IP_OPTIONS
   {
-    u_char optbuf[BUFSIZ / 3], *cp;
+    unsigned char optbuf[BUFSIZ / 3], *cp;
     char lbuf[BUFSIZ], *lp;
     socklen_t optsize = sizeof (optbuf);
     int ipproto;
@@ -416,7 +416,7 @@ doit (int sockfd, struct sockaddr_in *fromp)
 #endif
 
   /* Need host byte ordered port# to compare */
-  fromp->sin_port = ntohs ((u_short) fromp->sin_port);
+  fromp->sin_port = ntohs ((unsigned short) fromp->sin_port);
   /* Verify that the client's address was bound to a reserved port */
 #if defined KERBEROS || defined SHISHI
   if (!use_kerberos)
diff --git a/src/syslogd.c b/src/syslogd.c
index 1a660f5..b3a28cc 100644
--- a/src/syslogd.c
+++ b/src/syslogd.c
@@ -168,7 +168,7 @@ struct filed
   short f_type;			/* Entry type, see below.  */
   short f_file;			/* File descriptor.  */
   time_t f_time;		/* Time this was last written.  */
-  u_char f_pmask[LOG_NFACILITIES + 1];	/* Priority mask.  */
+  unsigned char f_pmask[LOG_NFACILITIES + 1];	/* Priority mask.  */
   union
   {
     struct
diff --git a/src/tftp.c b/src/tftp.c
index d852b56..2c724a9 100644
--- a/src/tftp.c
+++ b/src/tftp.c
@@ -969,8 +969,8 @@ send_file (int fd, char *name, char *mode)
 	      nak (errno + 100);
 	      break;
 	    }
-	  dp->th_opcode = htons ((u_short) DATA);
-	  dp->th_block = htons ((u_short) block);
+	  dp->th_opcode = htons ((unsigned short) DATA);
+	  dp->th_block = htons ((unsigned short) block);
 	}
       timeout = 0;
       setjmp (timeoutbuf);
@@ -1080,8 +1080,8 @@ recvfile (int fd, char *name, char *mode)
 	}
       else
 	{
-	  ap->th_opcode = htons ((u_short) ACK);
-	  ap->th_block = htons ((u_short) (block));
+	  ap->th_opcode = htons ((unsigned short) ACK);
+	  ap->th_block = htons ((unsigned short) (block));
 	  size = 4;
 	  block++;
 	}
@@ -1158,8 +1158,8 @@ recvfile (int fd, char *name, char *mode)
   while (size == SEGSIZE);
 
 abort:				/* ok to ack, since user */
-  ap->th_opcode = htons ((u_short) ACK);	/* has seen err msg */
-  ap->th_block = htons ((u_short) block);
+  ap->th_opcode = htons ((unsigned short) ACK);	/* has seen err msg */
+  ap->th_block = htons ((unsigned short) block);
   sendto (f, ackbuf, 4, 0, (struct sockaddr *) &peeraddr, peerlen);
   write_behind (file, convert);	/* flush last buffer */
   fclose (file);
@@ -1174,7 +1174,7 @@ makerequest (int request, const char *name, struct tftphdr *tp,
 {
   register char *cp;
 
-  tp->th_opcode = htons ((u_short) request);
+  tp->th_opcode = htons ((unsigned short) request);
 #if HAVE_STRUCT_TFTPHDR_TH_U
   cp = tp->th_stuff;
 #else
@@ -1220,8 +1220,8 @@ nak (int error)
   int length;
 
   tp = (struct tftphdr *) ackbuf;
-  tp->th_opcode = htons ((u_short) ERROR);
-  tp->th_code = htons ((u_short) error);
+  tp->th_opcode = htons ((unsigned short) ERROR);
+  tp->th_code = htons ((unsigned short) error);
   for (pe = errmsgs; pe->e_code >= 0; pe++)
     if (pe->e_code == error)
       break;
@@ -1245,7 +1245,7 @@ tpacket (const char *s, struct tftphdr *tp, int n)
 {
   static char *opcodes[] = { "#0", "RRQ", "WRQ", "DATA", "ACK", "ERROR" };
   register char *cp, *file;
-  u_short op = ntohs (tp->th_opcode);
+  unsigned short op = ntohs (tp->th_opcode);
 
   if (op < RRQ || op > ERROR)
     printf ("%s opcode=%x ", s, op);
diff --git a/src/tftpd.c b/src/tftpd.c
index 44cb333..1a8374c 100644
--- a/src/tftpd.c
+++ b/src/tftpd.c
@@ -557,8 +557,8 @@ send_file (struct formats *pf)
 	  nak (errno + 100);
 	  goto abort;
 	}
-      dp->th_opcode = htons ((u_short) DATA);
-      dp->th_block = htons ((u_short) block);
+      dp->th_opcode = htons ((unsigned short) DATA);
+      dp->th_block = htons ((unsigned short) block);
       timeout = 0;
       sigsetjmp (timeoutbuf, SIGALRM);
 
@@ -580,19 +580,19 @@ send_file (struct formats *pf)
 	      syslog (LOG_ERR, "tftpd: read: %m\n");
 	      goto abort;
 	    }
-	  ap->th_opcode = ntohs ((u_short) ap->th_opcode);
-	  ap->th_block = ntohs ((u_short) ap->th_block);
+	  ap->th_opcode = ntohs ((unsigned short) ap->th_opcode);
+	  ap->th_block = ntohs ((unsigned short) ap->th_block);
 
 	  if (ap->th_opcode == ERROR)
 	    goto abort;
 
 	  if (ap->th_opcode == ACK)
 	    {
-	      if ((u_short) ap->th_block == (u_short) block)
+	      if ((unsigned short) ap->th_block == (unsigned short) block)
 		break;
 	      /* Re-synchronize with the other side */
 	      synchnet (peer);
-	      if ((u_short) ap->th_block == (u_short) (block - 1))
+	      if ((unsigned short) ap->th_block == (unsigned short) (block - 1))
 		goto send_data;
 	    }
 
@@ -629,8 +629,8 @@ recvfile (struct formats *pf)
   do
     {
       timeout = 0;
-      ap->th_opcode = htons ((u_short) ACK);
-      ap->th_block = htons ((u_short) block);
+      ap->th_opcode = htons ((unsigned short) ACK);
+      ap->th_block = htons ((unsigned short) block);
       block++;
       sigsetjmp (timeoutbuf, SIGALRM);
     send_ack:
@@ -650,8 +650,8 @@ recvfile (struct formats *pf)
 	      syslog (LOG_ERR, "tftpd: read: %m\n");
 	      goto abort;
 	    }
-	  dp->th_opcode = ntohs ((u_short) dp->th_opcode);
-	  dp->th_block = ntohs ((u_short) dp->th_block);
+	  dp->th_opcode = ntohs ((unsigned short) dp->th_opcode);
+	  dp->th_block = ntohs ((unsigned short) dp->th_block);
 	  if (dp->th_opcode == ERROR)
 	    goto abort;
 	  if (dp->th_opcode == DATA)
@@ -681,8 +681,8 @@ recvfile (struct formats *pf)
   write_behind (file, pf->f_convert);
   fclose (file);		/* close data file */
 
-  ap->th_opcode = htons ((u_short) ACK);	/* send the "final" ack */
-  ap->th_block = htons ((u_short) (block));
+  ap->th_opcode = htons ((unsigned short) ACK);	/* send the "final" ack */
+  ap->th_block = htons ((unsigned short) (block));
   sendto (peer, ackbuf, 4, 0, (struct sockaddr *) &from, fromlen);
 
   signal (SIGALRM, justquit);	/* just quit on timeout */
@@ -744,8 +744,8 @@ nak (int error)
   register struct errmsg *pe;
 
   tp = (struct tftphdr *) buf;
-  tp->th_opcode = htons ((u_short) ERROR);
-  tp->th_code = htons ((u_short) error);
+  tp->th_opcode = htons ((unsigned short) ERROR);
+  tp->th_code = htons ((unsigned short) error);
   for (pe = errmsgs; pe->e_code >= 0; pe++)
     if (pe->e_code == error)
       break;
diff --git a/src/traceroute.c b/src/traceroute.c
index d585497..0814cfa 100644
--- a/src/traceroute.c
+++ b/src/traceroute.c
@@ -384,7 +384,7 @@ int
 trace_read (trace_t * t)
 {
   int len;
-  u_char data[56];		/* For a TIME_EXCEEDED datagram. */
+  unsigned char data[56];		/* For a TIME_EXCEEDED datagram. */
   struct ip *ip;
   icmphdr_t *ic;
   socklen_t siz;
@@ -486,7 +486,7 @@ trace_write (trace_t * t)
       {
 	icmphdr_t hdr;
 	/* FIXME: We could use the pid as the icmp seqno/ident. */
-	if (icmp_echo_encode ((u_char *) &hdr, sizeof (hdr), pid, pid))
+	if (icmp_echo_encode ((unsigned char *) &hdr, sizeof (hdr), pid, pid))
 	  return -1;
 
 	len = sendto (t->icmpfd, (char *) &hdr, sizeof (hdr),
diff --git a/talk/ctl.c b/talk/ctl.c
index f077727..ac3854b 100644
--- a/talk/ctl.c
+++ b/talk/ctl.c
@@ -76,7 +76,7 @@ struct sockaddr_in my_addr = { AF_INET };
 struct in_addr my_machine_addr;
 struct in_addr his_machine_addr;
 
-u_short daemon_port;		/* port number of the talk daemon */
+unsigned short daemon_port;		/* port number of the talk daemon */
 
 int ctl_sockt;
 int sockt;
diff --git a/talk/talk_ctl.h b/talk/talk_ctl.h
index 65a33f4..38280f9 100644
--- a/talk/talk_ctl.h
+++ b/talk/talk_ctl.h
@@ -52,7 +52,7 @@ extern struct sockaddr_in ctl_addr;
 extern struct sockaddr_in my_addr;
 extern struct in_addr my_machine_addr;
 extern struct in_addr his_machine_addr;
-extern u_short daemon_port;
+extern unsigned short daemon_port;
 extern int ctl_sockt;
 extern CTL_MSG msg;
 
diff --git a/telnet/krb4-proto.h b/telnet/krb4-proto.h
index 5734087..1a252e8 100644
--- a/telnet/krb4-proto.h
+++ b/telnet/krb4-proto.h
@@ -22,7 +22,7 @@
 int add_ticket (KTEXT, int, char *, int, char *, char *, char *, int, KTEXT);
 
 /* cr_err_reply.c */
-void cr_err_reply (KTEXT, char *, char *, char *, u_long, u_long, char *);
+void cr_err_reply (KTEXT, char *, char *, char *, unsigned long, unsigned long, char *);
 
 /* create_auth_reply.c */
 KTEXT create_auth_reply (char *, char *, char *, long, int, unsigned long,
@@ -136,10 +136,10 @@ int set_logfile (char *);
 int new_log (long, char *);
 
 /* mk_err.c */
-long krb_mk_err (u_char *, long, char *);
+long krb_mk_err (unsigned char *, long, char *);
 
 /* mk_priv.c */
-long krb_mk_priv (u_char *, u_char *, u_long, Key_schedule, C_Block,
+long krb_mk_priv (unsigned char *, unsigned char *, unsigned long, Key_schedule, C_Block,
 		  struct sockaddr_in *, struct sockaddr_in *);
 
 /* mk_req.c */
@@ -147,7 +147,7 @@ int krb_mk_req (KTEXT, char *, char *, char *, long);
 int krb_set_lifetime (int);
 
 /* mk_safe.c */
-long krb_mk_safe (u_char *, u_char *, u_long, C_Block *, struct sockaddr_in *,
+long krb_mk_safe (unsigned char *, unsigned char *, unsigned long, C_Block *, struct sockaddr_in *,
 		  struct sockaddr_in *);
 
 /* month_sname.c */
@@ -168,10 +168,10 @@ KTEXT pkt_cipher (KTEXT);
 int pkt_clen (KTEXT);
 
 /* rd_err.c */
-int krb_rd_err (u_char *, u_long, long *, MSG_DAT *);
+int krb_rd_err (unsigned char *, unsigned long, long *, MSG_DAT *);
 
 /* rd_priv.c */
-long krb_rd_priv (u_char *, u_long, Key_schedule, C_Block,
+long krb_rd_priv (unsigned char *, unsigned long, Key_schedule, C_Block,
 		  struct sockaddr_in *, struct sockaddr_in *, MSG_DAT *);
 
 /* rd_req.c */
@@ -179,7 +179,7 @@ int krb_set_key (char *, int);
 int krb_rd_req (KTEXT, char *, char *, long, AUTH_DAT *, char *);
 
 /* rd_safe.c */
-long krb_rd_safe (u_char *, u_long, C_Block *, struct sockaddr_in *,
+long krb_rd_safe (unsigned char *, unsigned long, C_Block *, struct sockaddr_in *,
 		  struct sockaddr_in *, MSG_DAT *);
 
 /* read_service_key.c */
@@ -197,7 +197,7 @@ int save_credentials (char *, char *, char *, C_Block, int, int, KTEXT, long);
 int send_to_kdc (KTEXT, KTEXT, char *);
 
 /* sendauth.c */
-int krb_sendauth (long, int, KTEXT, char *, char *, char *, u_long, MSG_DAT *,
+int krb_sendauth (long, int, KTEXT, char *, char *, char *, unsigned long, MSG_DAT *,
 		  CREDENTIALS *, Key_schedule, struct sockaddr_in *,
 		  struct sockaddr_in *, char *);
 int krb_sendsvc (int, char *);
diff --git a/telnet/ring.c b/telnet/ring.c
index 2fefa55..dc02403 100644
--- a/telnet/ring.c
+++ b/telnet/ring.c
@@ -101,7 +101,7 @@
  * to ZERO on allocation, we need to make sure, when interpreting the
  * clock, that when the times are EQUAL, then the buffer is FULL.
  */
-static u_long ring_clock = 0;
+static unsigned long ring_clock = 0;
 
 
 #define ring_empty(d) (((d)->consume == (d)->supply) && \
diff --git a/telnet/ring.h b/telnet/ring.h
index 604da10..517f19f 100644
--- a/telnet/ring.h
+++ b/telnet/ring.h
@@ -69,7 +69,7 @@ typedef struct
   unsigned char *encryyptedto;	/* Data is encrypted to here */
 #endif				/* ENCRYPTION */
   int size;			/* size in bytes of buffer */
-  u_long consumetime,		/* help us keep straight full, empty, etc. */
+  unsigned long consumetime,		/* help us keep straight full, empty, etc. */
     supplytime;
 } Ring;
 

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


commit 0e7ee45b08bc380c6b1e5d2c7f7ee6fda886b069
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Fri Dec 30 18:37:00 2011 +0100

    Fix sc_prohibit_test_minus_ao check.

diff --git a/ChangeLog b/ChangeLog
index 53936c4..8400b42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,6 +28,14 @@
 
 2011-12-30  Alfred M. Szmidt  <ams@gnu.org>
 
+	Fix sc_prohibit_test_minus_ao check.
+
+	* tests/tftp.sh: Fix sc_prohibit_test_minus_ao check.
+	* tests/syslogd.sh: Likewise.
+	* tests/ftp-localhost.sh: Likewise.
+
+2011-12-30  Alfred M. Szmidt  <ams@gnu.org>
+
 	* cfg.mk (sc_unsigned_short): New target.
 
 2011-12-30  Alfred M. Szmidt  <ams@gnu.org>
diff --git a/tests/ftp-localhost.sh b/tests/ftp-localhost.sh
index 39307c6..b0470d3 100755
--- a/tests/ftp-localhost.sh
+++ b/tests/ftp-localhost.sh
@@ -58,7 +58,7 @@ fi
 TMPDIR=`mktemp -d $PWD/tmp.XXXXXXXXXX`
 
 posttesting () {
-    test -f "$TMPDIR/inetd.pid" -a -r "$TMPDIR/inetd.pid" \
+    test -f "$TMPDIR/inetd.pid" && test -r "$TMPDIR/inetd.pid" \
 	&& kill -9 "$(cat $TMPDIR/inetd.pid)"
     rm -rf "$TMPDIR"
 }
diff --git a/tests/syslogd.sh b/tests/syslogd.sh
index fac8545..0c95574 100755
--- a/tests/syslogd.sh
+++ b/tests/syslogd.sh
@@ -24,7 +24,7 @@
 
 # Is usage explanation in demand?
 #
-if [ "$1" = "-h" -o "$1" = "--help" -o "$1" = "--usage" ]; then
+if test "$1" = "-h" || test "$1" = "--help" || test "$1" = "--usage"; then
 	cat <<HERE
 Test utility for syslogd and logger.
 
@@ -55,7 +55,7 @@ fi
 # Erase the testing directory.
 #
 clean_testdir () {
-	if [ -z "${NOCLEAN+no}" -a "$IU_DO_CLEANDIR" = "yes" ]; then
+	if test -z "${NOCLEAN+no}" && test "$IU_DO_CLEANDIR" = "yes"; then
 		rm -fR $IU_TESTDIR
 	fi
 	test -f "$PID" && ps "$(cat $PID)" >/dev/null 2>&1 \
@@ -91,8 +91,8 @@ IU_GOOD_BASE=/tmp/$(date +%y-%m-%d)_socket_iu
 IU_BAD_BASE=/tmp/X$(date +%y-%m-%d)_socket_iu
 
 IU_OS=$(uname -s)
-if [ "${IU_OS}" = "Linux" -o "${IU_OS}" = "GNU/kFreeBSD" \
-     -o "${IU_OS}" = "SunOS" ]; then
+if test "${IU_OS}" = "Linux" || test "${IU_OS}" = "GNU/kFreeBSD" \
+    || test "${IU_OS}" = "SunOS"; then
 	# Aim at the boundary of 108 characters.
 	IU_GOOD_BASE=${IU_GOOD_BASE}_lnx
 	IU_BAD_BASE=${IU_BAD_BASE}_lnx
diff --git a/tests/tftp.sh b/tests/tftp.sh
index 0f9c6c0..a99b16e 100755
--- a/tests/tftp.sh
+++ b/tests/tftp.sh
@@ -41,7 +41,7 @@ INETD_CONF="$TMPDIR/inetd.conf.tmp"
 INETD_PID="$TMPDIR/inetd.pid.$$"
 
 posttesting () {
-    if test -f "$INETD_PID" -a -r "$INETD_PID" \
+    if test -f "$INETD_PID" && test -r "$INETD_PID" \
 	&& ps "$(cat $INETD_PID)" >/dev/null 2>&1
     then
 	kill -9 "$(cat $INETD_PID)"

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


commit 8008ec320c046d73d73cb18b8a95a20d7bea9d29
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Fri Dec 30 18:34:11 2011 +0100

    NEWS: Updated. (silent change)

diff --git a/NEWS b/NEWS
index c6a7520..e9d33e0 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,11 @@ Please send inetutils bug reports to <bug-inetutils@gnu.org>.
 XXX YY, ZZ
 Version A.B:
 
+* Security fixes
+
+This release fixes a security flaw in telnetd that could lead to
+remote access.
+
 * Solaris is now a supported platform
 
 Support is still new, so please report any bugs to

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


commit 662029bbc3eb4fc931c1a50e4a3fd125046843e9
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Fri Dec 30 18:33:57 2011 +0100

    cfg.mk (sc_unsigned_short): New target.

diff --git a/ChangeLog b/ChangeLog
index e316fa7..53936c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,6 +28,10 @@
 
 2011-12-30  Alfred M. Szmidt  <ams@gnu.org>
 
+	* cfg.mk (sc_unsigned_short): New target.
+
+2011-12-30  Alfred M. Szmidt  <ams@gnu.org>
+
 	* bootstrap: Updated from gnulib.
 	* lib/Makefile.am: File removed.
 
diff --git a/cfg.mk b/cfg.mk
index efb773c..9df6883 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -59,3 +59,8 @@ sc_unsigned_long:
 	@prohibit=u''_long \
 	halt='don'\''t use u''_long; instead use unsigned long'	\
 	  $(_sc_search_regexp)
+
+sc_unsigned_short:
+	@prohibit=u''_short \
+	halt='don'\''t use u''_char; instead use unsigned short' \
+	  $(_sc_search_regexp)

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

Summary of changes:
 ChangeLog                |   31 +++++++++++++++++++++++++++++++
 NEWS                     |    5 +++++
 cfg.mk                   |    5 +++++
 ftpd/ftpd.c              |    6 +++---
 libicmp/icmp.h           |   40 ++++++++++++++++++++--------------------
 libicmp/icmp_address.c   |    2 +-
 libicmp/icmp_cksum.c     |   12 ++++++------
 libicmp/icmp_echo.c      |   12 ++++++------
 libicmp/icmp_timestamp.c |    2 +-
 libinetutils/des_rw.c    |    2 +-
 libinetutils/kcmd.c      |    8 ++++----
 libinetutils/krcmd.c     |   12 ++++++------
 libinetutils/ttymsg.c    |    1 -
 libls/fts.c              |    4 ++--
 libls/fts.h              |   10 +++++-----
 libls/ls.c               |    3 +--
 libls/ls.h               |    2 +-
 libls/print.c            |    4 ++--
 libtelnet/kerberos.c     |    4 ++--
 ping/libping.c           |    2 +-
 ping/ping.c              |    6 +++---
 ping/ping.h              |    2 +-
 ping/ping6.c             |    6 +++---
 ping/ping_common.c       |    4 ++--
 ping/ping_common.h       |    2 +-
 ping/ping_echo.c         |   14 +++++++-------
 ping/ping_impl.h         |    2 +-
 src/inetd.c              |    2 +-
 src/rcp.c                |    2 +-
 src/rexecd.c             |    2 +-
 src/rlogin.c             |    2 +-
 src/rlogind.c            |    6 +++---
 src/rshd.c               |    6 +++---
 src/syslogd.c            |    2 +-
 src/tftp.c               |   20 ++++++++++----------
 src/tftpd.c              |   28 ++++++++++++++--------------
 src/traceroute.c         |    4 ++--
 talk/ctl.c               |    2 +-
 talk/talk_ctl.h          |    2 +-
 telnet/krb4-proto.h      |   16 ++++++++--------
 telnet/ring.c            |    2 +-
 telnet/ring.h            |    2 +-
 tests/ftp-localhost.sh   |    2 +-
 tests/syslogd.sh         |    8 ++++----
 tests/tftp.sh            |    2 +-
 45 files changed, 176 insertions(+), 137 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Sat Dec 31 09:22:32 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RgzpQ-0000oE-NQ
	for mharc-commit-inetutils@gnu.org; Sat, 31 Dec 2011 09:22:32 -0500
Received: from eggs.gnu.org ([140.186.70.92]:58574)
	by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1RgzpN-0000o8-WA
	for commit-inetutils@gnu.org; Sat, 31 Dec 2011 09:22:31 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ams@gnu.org>) id 1RgzpM-0003K3-M9
	for commit-inetutils@gnu.org; Sat, 31 Dec 2011 09:22:29 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:55293)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1RgzpM-0003Jz-KW
	for commit-inetutils@gnu.org; Sat, 31 Dec 2011 09:22:28 -0500
Received: from ams by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <ams@gnu.org>) id 1RgzpM-0000hx-5z
	for commit-inetutils@gnu.org; Sat, 31 Dec 2011 14:22:28 +0000
Date: Sat, 31 Dec 2011 14:22:28 +0000
Message-Id: <E1RgzpM-0000hx-5z@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-216-g2da98e3
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 1a343be8d0fdf635f96d9d5cc20972a72f6688d3
X-Git-Newrev: 2da98e306086d9716d681c250f6f30edbf6f39c7
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.72
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, 31 Dec 2011 14:22:31 -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  2da98e306086d9716d681c250f6f30edbf6f39c7 (commit)
      from  1a343be8d0fdf635f96d9d5cc20972a72f6688d3 (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=2da98e306086d9716d681c250f6f30edbf6f39c7


commit 2da98e306086d9716d681c250f6f30edbf6f39c7
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Sat Dec 31 15:21:47 2011 +0100

    Fix prohibit_always_true_header_tests syntax-checks.

diff --git a/ChangeLog b/ChangeLog
index 25fdf5d..b180c1a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2011-12-31  Alfred M. Szmidt  <ams@gnu.org>
+
+	Fix prohibit_always_true_header_tests syntax-checks.
+
+	* ifconfig/printif.c: Don't protect inclusion of <alloca.h> with
+	HAVE_ALLOCA_H.
+
+	* configure.ac: Don't protect inclusion of <sys/types.h> with
+	HAVE_SYS_TYPES_H.
+	* libinetutils/daemon.c: Likewise.
+	* telnet/commands.c: Likewise.
+	* src/syslogd.c: Likewise.
+
 2011-12-30  Mats Erik Andersson <gnu@gisladisker.se>
 
 	* configure.ac: Check for ruserok.  If iruserok exists, then define
diff --git a/configure.ac b/configure.ac
index 8ff47e2..1a30bde 100644
--- a/configure.ac
+++ b/configure.ac
@@ -192,9 +192,7 @@ AC_SUBST(libls_BUILD)
 
 dnl At least OpenSolaris is missing <protocols/talkd.h>.
 AC_CHECK_HEADER(protocols/talkd.h, , ,
-  [IU_FLUSHLEFT([#ifdef HAVE_SYS_TYPES_H
-		 # include <sys/types.h>
-		 #endif
+  [IU_FLUSHLEFT([#include <sys/types.h>
 		 #include <sys/socket.h>])])
 
 if test "$ac_cv_header_protocols_talkd_h" = no; then
@@ -372,17 +370,13 @@ if test "$ipv6" = "no" || test "$working_ipv6" = "no";then
 else
   working_icmp6=yes
   AC_CHECK_HEADER(netinet/icmp6.h, , working_icmp6=no,
-    [IU_FLUSHLEFT([#ifdef HAVE_SYS_TYPES_H
-		   # include <sys/types.h>
-		   #endif
+    [IU_FLUSHLEFT([#include <sys/types.h>
 		   #include <sys/socket.h>
 		   #include <netinet/in.h>])])
 
   if test "$working_icmp6" = "yes"; then
     AC_CHECK_HEADER(netinet/ip6.h, , working_icmp6=no,
-      [IU_FLUSHLEFT([#ifdef HAVE_SYS_TYPES_H
-		     # include <sys/types.h>
-		     #endif
+      [IU_FLUSHLEFT([#include <sys/types.h>
 		     #include <sys/socket.h>
 		     #include <netinet/in.h>])])
 
@@ -390,9 +384,7 @@ else
 
   if test "$working_icmp6" = "yes"; then
     AC_CHECK_TYPE(struct icmp6_filter, , working_icmp6=no,
-      [IU_FLUSHLEFT([#ifdef HAVE_SYS_TYPES_H
-		     # include <sys/types.h>
-		     #endif
+      [IU_FLUSHLEFT([#include <sys/types.h>
 		     #include <sys/socket.h>
 		     #include <netinet/in.h>
 		     #include <netinet/icmp6.h>])])
@@ -400,9 +392,7 @@ else
 
   if test "$working_icmp6" = "yes"; then
     AC_CHECK_TYPE(struct icmp6_hdr, , working_icmp6=no,
-      [IU_FLUSHLEFT([#ifdef HAVE_SYS_TYPES_H
-		     # include <sys/types.h>
-		     #endif
+      [IU_FLUSHLEFT([#include <sys/types.h>
 		     #include <sys/socket.h>
 		     #include <netinet/in.h>
 		     #include <netinet/icmp6.h>])])
@@ -450,9 +440,7 @@ else
 
   if test "$working_icmp6" = "yes"; then
     IU_CHECK_MACRO(ICMP6_DST_UNREACH_BEYONDSCOPE,
-                   [#ifdef HAVE_SYS_TYPES_H
-		    # include <sys/types.h>
-		    #endif
+                   [#include <sys/types.h>
 		    #include <sys/socket.h>
 		    #include <netinet/in.h>
 		    #include <netinet/icmp6.h>], ,
@@ -738,9 +726,7 @@ AC_CHECK_DECLS([getcwd, getlogin, getpass, getusershell, ttyname], , ,
 AC_CHECK_DECLS([getgrnam, initgroups], , , [#include <grp.h>])
 
 AC_CHECK_DECLS(htons, , ,
-  [IU_FLUSHLEFT([#ifdef HAVE_SYS_TYPES_H
-                 # include <sys/types.h>
-                 #endif
+  [IU_FLUSHLEFT([# include <sys/types.h>
                  #ifdef HAVE_SYS_PARAM_H
                  # include <sys/param.h>
                  #endif
diff --git a/ifconfig/printif.c b/ifconfig/printif.c
index e87b803..1b86cf0 100644
--- a/ifconfig/printif.c
+++ b/ifconfig/printif.c
@@ -37,10 +37,7 @@
 # endif
 #endif
 
-#if HAVE_ALLOCA_H
-# include <alloca.h>
-#endif
-
+#include <alloca.h>
 #include <ctype.h>
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/libinetutils/daemon.c b/libinetutils/daemon.c
index f9c29cf..1efb1f1 100644
--- a/libinetutils/daemon.c
+++ b/libinetutils/daemon.c
@@ -53,9 +53,7 @@
 #include <signal.h>
 #include <error.h>
 #include <stdlib.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
+#include <sys/types.h>
 #include <sys/wait.h>
 
 /*
diff --git a/src/syslogd.c b/src/syslogd.c
index b3a28cc..4b7b87a 100644
--- a/src/syslogd.c
+++ b/src/syslogd.c
@@ -89,9 +89,7 @@
 #include <time.h>
 #include <sys/resource.h>
 #include <poll.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
+#include <sys/types.h>
 
 #include <netinet/in.h>
 #include <netdb.h>
diff --git a/telnet/commands.c b/telnet/commands.c
index 260bcad..1e9117d 100644
--- a/telnet/commands.c
+++ b/telnet/commands.c
@@ -52,9 +52,7 @@
 #ifdef HAVE_SYS_PARAM_H
 # include <sys/param.h>
 #endif
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
+#include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/file.h>
 

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

Summary of changes:
 ChangeLog             |   13 +++++++++++++
 configure.ac          |   28 +++++++---------------------
 ifconfig/printif.c    |    5 +----
 libinetutils/daemon.c |    4 +---
 src/syslogd.c         |    4 +---
 telnet/commands.c     |    4 +---
 6 files changed, 24 insertions(+), 34 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Sat Dec 31 09:49:08 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Rh0FA-0004AQ-M0
	for mharc-commit-inetutils@gnu.org; Sat, 31 Dec 2011 09:49:08 -0500
Received: from eggs.gnu.org ([140.186.70.92]:55141)
	by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1Rh0F8-0004AK-OK
	for commit-inetutils@gnu.org; Sat, 31 Dec 2011 09:49:07 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ams@gnu.org>) id 1Rh0F7-0006rU-Mw
	for commit-inetutils@gnu.org; Sat, 31 Dec 2011 09:49:06 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:50231)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1Rh0F7-0006rQ-KC
	for commit-inetutils@gnu.org; Sat, 31 Dec 2011 09:49:05 -0500
Received: from ams by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <ams@gnu.org>) id 1Rh0F7-0005od-Gg
	for commit-inetutils@gnu.org; Sat, 31 Dec 2011 14:49:05 +0000
Date: Sat, 31 Dec 2011 14:49:05 +0000
Message-Id: <E1Rh0F7-0005od-Gg@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-217-ge58bc9a
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 2da98e306086d9716d681c250f6f30edbf6f39c7
X-Git-Newrev: e58bc9a96b0cbaab022d8d4de9c6067d273663f7
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.72
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, 31 Dec 2011 14:49:07 -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  e58bc9a96b0cbaab022d8d4de9c6067d273663f7 (commit)
      from  2da98e306086d9716d681c250f6f30edbf6f39c7 (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=e58bc9a96b0cbaab022d8d4de9c6067d273663f7


commit e58bc9a96b0cbaab022d8d4de9c6067d273663f7
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Sat Dec 31 15:41:52 2011 +0100

    NEWS: Updated.

diff --git a/ChangeLog b/ChangeLog
index b180c1a..577b405 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2011-12-31  Alfred M. Szmidt  <ams@gnu.org>
 
+	inetutils 1.9
+
+	* NEWS: Updated.
+
+2011-12-31  Alfred M. Szmidt  <ams@gnu.org>
+
 	Fix prohibit_always_true_header_tests syntax-checks.
 
 	* ifconfig/printif.c: Don't protect inclusion of <alloca.h> with
diff --git a/NEWS b/NEWS
index e9d33e0..ea583a0 100644
--- a/NEWS
+++ b/NEWS
@@ -5,8 +5,8 @@ See the end of this file for license conditions.
 
 Please send inetutils bug reports to <bug-inetutils@gnu.org>.
 
-XXX YY, ZZ
-Version A.B:
+December 31, 2011
+Version 1.9:
 
 * Security fixes
 

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

Summary of changes:
 ChangeLog |    6 ++++++
 NEWS      |    4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Sat Dec 31 10:13:37 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Rh0cr-0007UL-5s
	for mharc-commit-inetutils@gnu.org; Sat, 31 Dec 2011 10:13:37 -0500
Received: from eggs.gnu.org ([140.186.70.92]:49959)
	by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1Rh0cp-0007UD-Dn
	for commit-inetutils@gnu.org; Sat, 31 Dec 2011 10:13:36 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ams@gnu.org>) id 1Rh0co-0001oW-6Z
	for commit-inetutils@gnu.org; Sat, 31 Dec 2011 10:13:35 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:40635)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1Rh0co-0001oQ-2W
	for commit-inetutils@gnu.org; Sat, 31 Dec 2011 10:13:34 -0500
Received: from ams by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <ams@gnu.org>) id 1Rh0co-0001mo-47
	for commit-inetutils@gnu.org; Sat, 31 Dec 2011 15:13:34 +0000
Date: Sat, 31 Dec 2011 15:13:34 +0000
Message-Id: <E1Rh0co-0001mo-47@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-218-g7f8ed19
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: e58bc9a96b0cbaab022d8d4de9c6067d273663f7
X-Git-Newrev: 7f8ed19e31d39393ca3a67f52e222f05e875625b
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.72
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, 31 Dec 2011 15:13:36 -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  7f8ed19e31d39393ca3a67f52e222f05e875625b (commit)
      from  e58bc9a96b0cbaab022d8d4de9c6067d273663f7 (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=7f8ed19e31d39393ca3a67f52e222f05e875625b


commit 7f8ed19e31d39393ca3a67f52e222f05e875625b
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Sat Dec 31 16:13:26 2011 +0100

    Makefile.am (EXTRA_DIST): Removed README-alpha from list.

diff --git a/ChangeLog b/ChangeLog
index 577b405..802c914 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 
 	inetutils 1.9
 
+	* Makefile.am (EXTRA_DIST): Removed README-alpha from list.
+
 	* NEWS: Updated.
 
 2011-12-31  Alfred M. Szmidt  <ams@gnu.org>
diff --git a/Makefile.am b/Makefile.am
index d6da45c..b403c41 100644
--- a/Makefile.am
+++ b/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/'.
 
-EXTRA_DIST = README-alpha paths ChangeLog.0
+EXTRA_DIST = paths ChangeLog.0
 
 SUBDIRS = lib \
 	libinetutils libtelnet libicmp libls \

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

Summary of changes:
 ChangeLog   |    2 ++
 Makefile.am |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Sat Dec 31 10:51:05 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Rh1D7-00044U-Sn
	for mharc-commit-inetutils@gnu.org; Sat, 31 Dec 2011 10:51:05 -0500
Received: from eggs.gnu.org ([140.186.70.92]:57547)
	by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1Rh1D4-00043y-ER
	for commit-inetutils@gnu.org; Sat, 31 Dec 2011 10:51:04 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ams@gnu.org>) id 1Rh1D1-0007AT-O0
	for commit-inetutils@gnu.org; Sat, 31 Dec 2011 10:51:02 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:42006)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1Rh1D1-0007AN-M5
	for commit-inetutils@gnu.org; Sat, 31 Dec 2011 10:50:59 -0500
Received: from ams by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <ams@gnu.org>) id 1Rh1D1-0000dY-Qn
	for commit-inetutils@gnu.org; Sat, 31 Dec 2011 15:51:00 +0000
Date: Sat, 31 Dec 2011 15:50:59 +0000
Message-Id: <E1Rh1D1-0000dY-Qn@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  annotated tag, inetutils-1_9,
	created. inetutils-1_9
X-Git-Refname: refs/tags/inetutils-1_9
X-Git-Reftype: annotated tag
X-Git-Oldrev: 0000000000000000000000000000000000000000
X-Git-Newrev: f6192fac8634d5233bfc65a542b6ec26e61e7434
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.72
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, 31 Dec 2011 15:51:04 -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 annotated tag, inetutils-1_9 has been created
        at  f6192fac8634d5233bfc65a542b6ec26e61e7434 (tag)
   tagging  7f8ed19e31d39393ca3a67f52e222f05e875625b (commit)
  replaces  inetutils-1_8
 tagged by  Alfred M. Szmidt
        on  Sat Dec 31 16:40:17 2011 +0100

- Log -----------------------------------------------------------------
inetutils 1.9

Alfred M. Szmidt (100):
      Added copyright notice to some missing files.
      * ifconfig/options.c (parse_opt_set_default_format): Abort if no
      TODO: Updated.
      ifconfig/options.c (parse_cmdline): Error out if IFNX is NULL.
      cfg.mk (local-checks-to-skip): Removed sc_obsolete_symbols from list.
      cfg.mk (local-checks-to-skip): Removed sc_prohibit_assert_without_use from list.
      Don't protect <config.h> with HAVE_CONFIG_H.
      cfg.mk (local-checks-to-skip): Removed sc_space_tab from list.
      cfg.mk (local-checks-to-skip): Removed sc_trailing_blank from list.
      Only include <signal.h> if it is used.
      Use EXIT_SUCCESS and EXIT_FAILURE macros through out.
      Removed useless C preprocessor parentehsis.
      cfg.mk (local-checks-to-skip): Removed sc_makefile_check from list.
      Use fseeko instead of fseek.
      Converted K&R style declarations to ISO C89.
      ifconfig: Removed support for HPUX and OSF.
      src/tftp.c (intr): Changed type to `void intr (int signo)'.
      ifconfig: Random fixes for the `generic' operating system.
      ifconfig/system.h [__hpux__]: Don't include "system/hpux.c".
      Clean up ChangeLog.  (silent change)
      inetd: Set default IP family for "tcp" and "udp" to IPv4.
      TODO: Updated.  (silent change)
      inetd: Set se_arv[0] to se_server name if argc == 1.
      inetd: Call expand_enter instead of expand for tcpmux services.
      configure.ac: Remove opie AC_CHECK_LIB check.
      ifconfig: Correct formating for "unix".
      tftp: Handle IPv6 connections.
      Always use <termios.h> interface.
      NEWS: Updated.  (silent change)
      Silence sc_program_name errors.
      Add `tftpd' and `tftp' test.
      Added gendocs module for generation of web manual.
      Updated.  (silent change)
      Updated.  (silent change)
      tftp: Resolve the "tftp" service only when no port is specified.
      ping, tftp, traceroute: Improve the test suite.
      inetd: Calculate socket length using sockaddr.
      traceroute: Pass integer values to IP_TTL option.
      Use git-version-gen to extract version number.
      libinetutils: UTMP fixes for OpenBSD.
      ifconfig/if_index.c (if_nametoindex, if_freenameindex, if_nameindex):
      Fix typo in previous commit: 5b174beae521f700a886911829a6a9a11cf426bd.  (silent change)
      Say `file name' instead of `path'. (silent change)
      Updated copyright years; happy 2011! (silent change)
      Handle systems that do not have fork().
      ftpd: Handle systems without fork().
      configure.ac: Use AC_CANONICAL_HOST instead of AC_CANONICAL_SYSTEM.
      talkd, talk: Remove last traces of <osockaddr.h> usage.
      Clean up `make syntax-check' errors.
      tests/tftp.sh: Skip test if we cannot execute netstat.  Enable verbose
      bootstrap.conf (gnulib_modules): Added signal to list.
      libinetutils/libinetutils.h: Don't include <config.h>; instead produce
      bootstrap.conf (gnulib_modules): Use malloc-gnu and realloc-gnu instead of the old malloc and realloc modules.
      Replace RETSIGTYPE with void; this is old K&Rism.
      Replaced all usage of ARG_UNUSED with _GL_UNUSED_PARAMETER.
      tests/syslogd.sh: Changed permission on file to be executable.
      bootstrap.conf (gnulib_modules): Added mkstemp to list.
      Fix typos.  (silent change)
      src/inetd.c (argp_options) <pidfile>: Updated doc. string.
      Fix typo.  (silent change)
      Clean up (some) `make syntax-check' errors.
      * .gitignore (gnulib, gnulib/, .sc-start-sc_bindtextdomain)
      * telnetd/telnetd.h [HAVE_STROPTS_H && !HAVE_IOCTL]: Only include <stropts.h> if HAVE_IOCTL wasn't defined.
      Only define PKTSIZE if needed.
      Updated ./bootstrap.
      Updated README-alpha, and added README-prereq.
      Let ./bootstrap take care about build requirements.
      README-alpha: Don't mention gettext and libtool as build requirements.
      Lowered build requirement of autoconf to 2.59.
      libicmp/icmp_address.c: Include <stddef.h>; reverts parts of 2011-10-15.
      configure.ac: Don't try to define ARG_UNUSED macro.
      New variables (iu_LIBRARIES and iu_INCLUDES ) for specifying core inetutils libraries and header files in Makefile.am.
      configure.ac: Pass regexp to git-version-gen to get version tag.
      configure.ac: Use AC_CONFIG_HEADER instead of AM_CONFIG_HEADER.
      Minor cleanup in ChangeLog.  (silent change)
      Fixed typo. (silent change)
      cfg.mk (sc_unsigned_char, sc_unsigned_long): New targets.
      NEWS, README: Updated.  (silent change)
      configure.ac: Add check for IPV6_2292HOPLIMIT.
      README: Updated.  (silent change)
      bootstrap.conf (gnulib_modules): Don't try to create m4/ for ./bootstrap.
      .gitignore (/m4): Added to list.
      ChangeLog: Mention am/readline.m4 (silent change)
      Be more robust in checking for IPV6_HOPLIMIT, and IPV6_RECVHOPLIMIT.
      tests/syslogd.sh: Output verbose output if VERBOSE is true.
      Basic test case for `hostname'.
      Require automake 1.11.1.
      libtelnet/encrypt.c (encrypt_keyid): Make sure that LEN never is greater than MAXKEYLEN.
      Fix indentation, and stop using `register' keyword.
      Fix typo in previous change.  (silent change)
      bootstrap: Updated from gnulib.
      ChangeLog: Beutify.  (silent change)
      NEWS: Formating.  (silent change)
      cfg.mk (sc_unsigned_short): New target.
      NEWS: Updated. (silent change)
      Fix sc_prohibit_test_minus_ao check.
      Fix prohibit_dirent_without_use, sc_unsigned_short, sc_unsigned_long sc_unsigned_char checks.
      Fix prohibit_always_true_header_tests syntax-checks.
      NEWS: Updated.
      Makefile.am (EXTRA_DIST): Removed README-alpha from list.

Giuseppe Scrivano (14):
      Fix a compiler warning.
      Do not use `bcmp', `bcopy' and `bzero'.
      Remove unused function.
      * ifconfig/if_index.c (if_nameindex): Remove local variable `len'.
      Under GNU/Linux print interfaces without an address with ifconfig -a.
      bootstrap: use snippet/unused-parameter instead of unused-parameter.
      Fix the usage of of some stack allocated variables out of their scope.
      libicmp/icmp_timeout.c: Include <stddef.h>.
      ftpd/Makefile.am (LDADD): Put iu_LIBRARIES as last element of LDADD
      libicmp/icmp_address.c: Do not include <stddef.h>.  Revert change of 2011-10-25.
      bootstrap.conf: Include module ioctl.
      telnetd/Makefile.am (INCLUDES): Add -I$(top_srcdir)/libtelnet.
      tests: fix a failure.
      Fix ChangeLog entry (silent change).

Mats Erik Andersson (72):
      src/tftp.c: Remove external scopes, making them static.
      man/Makefile.am: Use $(MAKE) instead of "make".
      telnetd/telnetd.c: Use the autodetected PATH_LOGIN.
      configure.ac: Improve test of `struct sockaddr_in6`.
      ifconfig/system/linux.c: Recalculate a search range.
      ping/ping6: Missing header and better error detection.
      src/inetd.c: Fix typos in comments.
      telnetd/telnetd.c: Reuse address length. Needed for OpenBSD.
      traceroute: Regression in handling of IP_TTL.
      ifconfig: Condition the use of IFF_NOTRAILERS.
      inetd: Sanity check before using AI_V4MAPPED.
      inetd: Distinct service registration for TCPMUX.
      inetd: Registration of services with multiple nodes.
      traceroute: Make immune against `RES_OPTIONS=inet6'.
      inetd: Environment variables also for IPv6.
      addrpeek: New test service for Inetd.
      inetd: Improve printout of service changes.
      inetd: Adapt service nodes to IPv6.
      inetd: Replaceable path for PID file.
      logger: Implement support for transport via IPv6.
      traceroute: Do not test effective-UID of caller.
      ftp: Prepare for later IPv6 support.
      ftp: Activate support for IPv6.
      syslogd: Fix memory leaks related to action fields.
      ftp: Commands for address family selection.
      inetutils.texi: Add IPv6 ability for FTP client.
      syslogd: Dereferencing NULL fault.  A test script.
      syslogd: Rewrite using getaddrinfo, preparing IPv6.
      syslogd: Error recovery at config parsing.
      syslogd: Forwarding independently of remote logging.
      ftpd: BSD systems need length value in 'sin_len'.
      ftpd: Misnamed variable in last commit.
      libinetutils.a: Missing variable in UTMPX code.
      Minor portability issues found by OpenSolaris.
      syslogd,logger: Portability of macros and names.
      syslogd: Full support for IPv6.
      tftp,tftpd: `struct tftphdr' depends on OS.
      tftpd: Use sendto() instead of send().
      tftp: Set default port for non-connected transfers.
      tftp: Full IPv6 support.
      syslogd: Prevent buffer overrun with socket names.
      inetutils.texi: Corrections to telnetd description.
      telnet,telnetd: Portability to GNU/OpenSolaris.
      telnet,telnetd: Build fix for recent readline support.
      doc: Issues with OpenSolaris; tftp speaks IPv6.
      Missing inclusion, prototype, and doc update.
      tests/syslogd.sh: Post-run cleanup.
      telnetd: Updated invocation string for Solaris.
      Remove obsolete inclusion <malloc.h>.
      Portability fixes discovered by Solaris.
      tests/tftp.sh: Improve robustness and portability.
      Allow tests to return skip code instead of failure.
      make_ip_del.pl: Arithmetic on 64-bit systems.
      Portability fix for <syslog.h> in recent OpenBSD.
      Incomplete header inclusion. Fixes in syslogd test.
      Portability fix for <arpa/telnet.h> in NetBSD.
      tests/ftp-localhost.sh: Portability fix.
      Regex pattern with exact port number.
      tests/syslogd.sh: Better attack resilience.
      telnet,telnetd: Fix ncurses/termio for Solaris.
      Improve incident recovery in test scripts.
      tests/ftp-localhost.sh: Shell portability issue.
      Portability of test and of build.
      tests/tftp.sh: Better testing coverage.
      tests/ftp-localhost.sh: Sanity check.
      Termcap and readline portability.
      rcp,rshd: Missing EUID check; minor corrections.
      rlogind,rshd: Protect against source route spoofing.
      libinetutils/setsig.c: Incomplete replacement code.
      src/rlogin.c: Partial portability fix.
      ftp,ftpd,rcp: Portable format string for long long.
      rlogind,rshd: Fall back to ruserok.

Mike Frysinger (3):
      ftp: rename ruserpass to avoid C library collision
      rshd: detect __rcmd_errstr support in the C lib
      man: fix install of section 8 pages

Sergey Poznyakoff (1):
      ifconfig/flags.c (flag_char_tab): Protect the uses of IFF_SLAVE and IFF_MASTER by #ifdefs.

Simon Josefsson (28):
      tests/Makefile.am (dist_check_SCRIPTS): Make testing ping and traceroute conditioned on ENABLE_ping and ENABLE_traceroute.
      Include sys/uio.h for writev.
      Improve telnetd manual.
      Fix typo.
      Add ChangeLog entry.
      doc/inetutils.texi (telnetd invocation): Use two spaces after end-of-sentence period.
      ifconfig/system/qnx.h: Rename pre-processor symbol IFCONFIG_SYSTEM_SOLARIS_H to IFCONFIG_SYSTEM_QNX_H.
      telnetd/telnetd.c: Reuse address length in a second place.
      bootstrap.conf (gnulib_modules): Removed 'exit' from list.
      bootstrap.conf (gnulib_modules): Remove 'strcase' from list (not needed
      Replace use of sig_t with sighandler_t.
      cfg.mk: Add variable, gnulib now needs this for syntax-check.
      cfg.mk: Silence syntax-check warnings.
      tests/.gitignore: Add addrpeek.
      doc: Some cosmetic fixes.
      Doc fixes.
      ping: Support -W parameter.
      logger: Make it build.
      Fix typo in last commit. (silent change)
      telnet, telnetd: Fix Solaris build.
      doc: Mention that non-Shishi Kerberos does not work.
      ftp: Use gnulib's readline module.
      ftp: Avoid build warnings about missing add_history prototype.
      tests: Added self-tests of ftp and ftpd (using inetd).
      ftp: require the real readline library.
      doc: Mention portability issues.
      Fix last commit.  (silent change)
      doc: Mention portability issue.

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


hooks/post-receive
-- 
GNU Inetutils 


