From MAILER-DAEMON Thu Mar 01 18:02:30 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1S3F14-0006bs-Cq
	for mharc-commit-inetutils@gnu.org; Thu, 01 Mar 2012 18:02:30 -0500
Received: from eggs.gnu.org ([208.118.235.92]:38718)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1S3F10-0006aB-9Z
	for commit-inetutils@gnu.org; Thu, 01 Mar 2012 18:02:28 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1S3F0w-0000oK-Rb
	for commit-inetutils@gnu.org; Thu, 01 Mar 2012 18:02:25 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:51956)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1S3F0w-0000oC-Nt
	for commit-inetutils@gnu.org; Thu, 01 Mar 2012 18:02:22 -0500
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1S3F0q-0001kC-N0
	for commit-inetutils@gnu.org; Thu, 01 Mar 2012 23:02:18 +0000
Date: Thu, 01 Mar 2012 23:02:17 +0000
Message-Id: <E1S3F0q-0001kC-N0@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_1-48-g590fde5
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 8173030af23ddb67c3834c79226c17a5f8175c6e
X-Git-Newrev: 590fde5934de486865b0eee54e4f1a93de2a549b
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 Mar 2012 23:02:28 -0000

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

The branch, master has been updated
       via  590fde5934de486865b0eee54e4f1a93de2a549b (commit)
       via  04707b5698de3551bba9f9bcedc9414397b6f5ed (commit)
       via  c2ca330865bc9794086dc334b1659d1d1caba84a (commit)
      from  8173030af23ddb67c3834c79226c17a5f8175c6e (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=590fde5934de486865b0eee54e4f1a93de2a549b


commit 590fde5934de486865b0eee54e4f1a93de2a549b
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Thu Mar 1 23:33:22 2012 +0100

    Tests for configuration reload.
    
    Expand two test scripts to capture reactions of
    inetd and syslogd to SIGHUP signals.

diff --git a/ChangeLog b/ChangeLog
index 1b48ecd..207eb84 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,20 @@
 2012-03-01  Mats Erik Andersson <gnu@gisladisker.se>
 
+	Subtests for SIGHUP reaction of `inetd' and `syslogd'.
+
+	* tests/syslogd.sh: Write a second configuration file after first run,
+	send SIGHUP to server, and evaluate message response.
+	(SUCCESSES): Update arithmetic expression used in evaluation.
+	(OUT_USER, OUT_DEBUG, TAG2, COUNT2, COUNT2_debug, COUNT3, COUNT3_info):
+	New variables.
+	<verbose report>: Print messages of files $OUT_USER and $OUT_DEBUG.
+
+	* tests/tftp.sh: Calculate new port after first test run, send SIGHUP
+	to server, and transmit a small file at each adress in old list.
+	(do_conf_reload): New variable.
+
+2012-03-01  Mats Erik Andersson <gnu@gisladisker.se>
+
 	Reduce external prerequisites in test scripts.
 	* tests/ftp-localhost.sh: Replace `head -1' by `sed 1q'.
 	* tests/telnet-localhost.sh, tests/tftp.sh: Likewise.  Replace `ps pid'
diff --git a/tests/syslogd.sh b/tests/syslogd.sh
index 64c3912..3a719e4 100755
--- a/tests/syslogd.sh
+++ b/tests/syslogd.sh
@@ -400,6 +400,47 @@ if $do_inet_socket; then
 	"Sending IPv6 message. (pid $$)"
 fi
 
+# Generate a more elaborate message routing, aimed at confirming
+# discrimination of severity and facility.  This is made active
+# by sending SIGHUP to the server process.
+#
+OUT_USER="$IU_TESTDIR"/user.log
+OUT_DEBUG="$IU_TESTDIR"/debug.log
+
+# Create the new files to avoid false negatives.
+: > "$OUT_USER"
+: > "$OUT_DEBUG"
+
+cat > "$CONF" <<-EOT
+	*.*;user.none	$OUT
+	user.info	$OUT_USER
+	*.=debug	$OUT_DEBUG
+EOT
+
+# Use another tag for better discrimination.
+TAG2="syslogd-reload-test"
+
+# Load the new configuration
+kill -HUP `cat "$PID"`
+
+if $do_unix_socket; then
+    # Two messages, but absence is also awarded credit.
+    TESTCASES=`expr $TESTCASES + 4`
+    $LOGGER -h "$SOCKET" -p user.info -t "$TAG2" \
+	"user.info as BSD message. (pid $$)"
+    $LOGGER -h "$SOCKET" -p user.debug -t "$TAG2" \
+	"user.debug as BSD message. (pid $$)"
+fi
+
+if $do_inet_socket; then
+    # Two messages, but absence is also awarded credit.
+    TESTCASES=`expr $TESTCASES + 4`
+    $LOGGER -4 -h "$TARGET:$PORT" -p user.info -t "$TAG2" \
+	"user.info IPv4 message. (pid $$)"
+    $LOGGER -4 -h "$TARGET:$PORT" -p user.debug -t "$TAG2" \
+	"user.debug as IPv4 message. (pid $$)"
+fi
+
 # Remove previous SYSLOG daemon.
 test -r "$PID" && kill -0 "`cat "$PID"`" >/dev/null 2>&1 &&
     kill "`cat "$PID"`"
@@ -435,14 +476,24 @@ sleep 1
 # Detection of registered messages.
 #
 COUNT=`grep -c "$TAG" "$OUT"`
-SUCCESSES=`expr $SUCCESSES + $COUNT`
+COUNT2=`grep -c "$TAG2" "$OUT_USER"`
+COUNT2_debug=`grep -c "$TAG2.*user.debug" "$OUT_USER"`
+COUNT3=`grep -c "$TAG2" "$OUT_DEBUG"`
+COUNT3_info=`grep -c "$TAG2.*user.info" "$OUT_DEBUG"`
+SUCCESSES=`expr $SUCCESSES + $COUNT + 2 \* $COUNT2 - $COUNT2_debug \
+		+ 2 \* $COUNT3 - $COUNT3_info`
 
 if [ -n "${VERBOSE+yes}" ]; then
     cat <<-EOT
 	---------- Successfully detected messages. ----------
 	`grep "$TAG" "$OUT"`
+	`grep -h "$TAG2" "$OUT_USER" "$OUT_DEBUG"`
 	---------- Full message log for syslogd. ------------
 	`cat "$OUT"`
+	---------- User message log. ------------------------
+	`cat "$OUT_USER"`
+	---------- Debug message log. -----------------------
+	`cat "$OUT_DEBUG"`
 	-----------------------------------------------------
 	EOT
 fi
diff --git a/tests/tftp.sh b/tests/tftp.sh
index 38713b3..ecea59b 100755
--- a/tests/tftp.sh
+++ b/tests/tftp.sh
@@ -96,6 +96,9 @@ AF=${AF:-inet}
 PROTO=${PROTO:-udp}
 USER=`id -u -n`
 
+# Late supplimentary subtest.
+do_conf_reload=true
+
 # Random base directory at testing time.
 TMPDIR=`mktemp -d $PWD/tmp.XXXXXXXXXX` ||
     {
@@ -324,6 +327,52 @@ for addr in $ADDRESSES; do
    done
 done
 
+# Test the ability of inetd to reload configuration:
+#
+# Assign a new port in the configuration file. Send SIGHUP
+# to inetd and check whether transmission of the small
+# file used previously still succeeds.
+#
+PORT=`expr $PORT + 1 + ${RANDOM:-$$} % 521`
+
+locate_port $PROTO $PORT &&
+    {
+	# Try a second port.
+	PORT=`expr $PORT + 97 + ${RANDOM:-$$} % 479`
+	# Disable subtest if still no free port.
+	locate_port $PROTO $PORT && do_conf_reload=false
+    }
+
+echo
+
+if $do_conf_reload; then
+    echo >&2 'Testing altered and reloaded configuration.'
+    write_conf ||
+	{
+	    echo >&2 'Could not rewrite configuration file for Inetd.  Failing.'
+	    exit 1
+	}
+
+    kill -HUP $inetd_pid
+    name=`echo "$FILELIST" | sed 's/ .*//'`
+    for addr in $ADDRESSES; do
+	EFFORTS=`expr $EFFORTS + 1`
+	test -f "$name" && rm "$name"
+	echo "get $name" | "$TFTP" ${VERBOSE+-v} "$addr" $PORT
+	cmp "$TMPDIR/tftp-test/$name" "$name" 2>/dev/null
+	result=$?
+	if test $result -ne 0; then
+	    test -z "$VERBOSE" || echo >&2 "Failed comparison for $addr/$name."
+	    RESULT=$result
+	else
+	    SUCCESSES=`expr $SUCCESSES + 1`
+	    test -z "$VERBOSE" || echo >&2 "Success at new port for $addr/$name."
+	fi
+    done
+else
+    echo >&2 'Informational: Inhibiting config reload test.'
+fi
+
 # Minimal clean up. Main work in posttesting().
 echo
 echo Tests in $0 had $SUCCESSES successes out of $EFFORTS cases.

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


commit 04707b5698de3551bba9f9bcedc9414397b6f5ed
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Thu Mar 1 23:08:26 2012 +0100

    Reduce test script prerequisites.

diff --git a/ChangeLog b/ChangeLog
index c9525b9..1b48ecd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2012-03-01  Mats Erik Andersson <gnu@gisladisker.se>
+
+	Reduce external prerequisites in test scripts.
+	* tests/ftp-localhost.sh: Replace `head -1' by `sed 1q'.
+	* tests/telnet-localhost.sh, tests/tftp.sh: Likewise.  Replace `ps pid'
+	by `kill -0 pid'.
+	* tests/syslogd.sh: Likewise.  Replace `wc -l' by `grep -c'.
+
+	* tests/tftp.sh: Do not issue `set -m', since no job control in use.
+
 2012-02-25  Alfred M. Szmidt  <ams@gnu.org>
 
 	* bootstrap.conf (gnulib_modules): Sort lexically.
diff --git a/tests/ftp-localhost.sh b/tests/ftp-localhost.sh
index 6d22d35..1122e41 100755
--- a/tests/ftp-localhost.sh
+++ b/tests/ftp-localhost.sh
@@ -23,9 +23,7 @@
 #
 #  * Shell: SVR4 Bourne shell, or newer.
 #
-#  * cat(1), chmod(1), head(1), kill(1), rm(1).
-#
-#  * id(1), grep(1), mktemp(1), netstat(8), sed(1), uname(1).
+#  * chmod(1), id(1), kill(1), mktemp(1), netstat(8), uname(1).
 #
 #  * Detection of sysctl(8) is made.  Availability will
 #    lead to better test coverage.
@@ -111,9 +109,9 @@ fi
 
 if [ $VERBOSE ]; then
     set -x
-    $FTP --version | head -1
-    $FTPD --version | head -1
-    $INETD --version | head -1
+    $FTP --version | sed '1q'
+    $FTPD --version | sed '1q'
+    $INETD --version | sed '1q'
 fi
 
 if [ `id -u` != 0 ]; then
diff --git a/tests/syslogd.sh b/tests/syslogd.sh
index add498c..64c3912 100755
--- a/tests/syslogd.sh
+++ b/tests/syslogd.sh
@@ -25,9 +25,7 @@
 #
 #  * Shell: SVR4 Bourne shell, or newer.
 #
-#  * cat(1), expr(1), head(1), kill(1), pwd(1), rm(1), rmdir(1).
-#
-#  * id(1), grep(1), mktemp(1), netstat(8), ps(1), touch(1), uname(1).
+#  * id(1), kill(1), mktemp(1), netstat(8), uname(1).
 
 
 # Is usage explanation in demand?
@@ -93,8 +91,8 @@ LOGGER=${LOGGER:-../src/logger$EXEEXT}
 
 if [ $VERBOSE ]; then
     set -x
-    $SYSLOGD --version | head -1
-    $LOGGER --version | head -1
+    $SYSLOGD --version | sed '1q'
+    $LOGGER --version | sed '1q'
 fi
 
 if [ ! -x $SYSLOGD ]; then
@@ -159,7 +157,7 @@ fi
 # Erase the testing directory.
 #
 clean_testdir () {
-    if test -f "$PID" && ps "`cat "$PID"`" >/dev/null 2>&1; then
+    if test -f "$PID" && kill -0 "`cat "$PID"`" >/dev/null 2>&1; then
 	kill "`cat "$PID"`" || kill -9 "`cat "$PID"`"
     fi
     if test -z "${NOCLEAN+no}" && $do_cleandir; then
@@ -403,7 +401,7 @@ if $do_inet_socket; then
 fi
 
 # Remove previous SYSLOG daemon.
-test -r "$PID" && ps "`cat "$PID"`" >/dev/null 2>&1 &&
+test -r "$PID" && kill -0 "`cat "$PID"`" >/dev/null 2>&1 &&
     kill "`cat "$PID"`"
 
 # Check functionality of standard port, i.e., execution
@@ -436,7 +434,7 @@ sleep 1
 
 # Detection of registered messages.
 #
-COUNT=`grep "$TAG" "$OUT" | wc -l`
+COUNT=`grep -c "$TAG" "$OUT"`
 SUCCESSES=`expr $SUCCESSES + $COUNT`
 
 if [ -n "${VERBOSE+yes}" ]; then
@@ -465,7 +463,7 @@ else
 fi
 
 # Remove the daemon process.
-test -r "$PID" && ps "`cat "$PID"`" >/dev/null 2>&1 &&
+test -r "$PID" && kill -0 "`cat "$PID"`" >/dev/null 2>&1 &&
     kill "`cat "$PID"`"
 
 exit $EXITCODE
diff --git a/tests/telnet-localhost.sh b/tests/telnet-localhost.sh
index 01cac1e..49f8614 100755
--- a/tests/telnet-localhost.sh
+++ b/tests/telnet-localhost.sh
@@ -25,9 +25,12 @@
 #
 #  * Shell: SVR4 Bourne shell, or newer.
 #
-#  * cat(1), expr(1), head(1), kill(1), pwd(1), rm(1).
+#  * id(1), kill(1), mktemp(1), tty(1).
 #
-#  * id(1), grep(1), mktemp(1), ps(1), tty(1).
+#  * Accessed by launched Inetd:
+#      /etc/nsswitch.conf, /etc/passwd, /etc/protocols.
+#
+#    OpenBSD uses /etc/services directly, not via /etc/nsswitch.conf.
 
 # Is usage explanation in demand?
 #
@@ -63,8 +66,8 @@ test -d src && test -f tests/telnet-localhost.sh && cd tests/
 
 if test -n "$VERBOSE"; then
     set -x
-    $INETD --version | head -1
-    $TELNET --version | head -1
+    $INETD --version | sed '1q'
+    $TELNET --version | sed '1q'
 fi
 
 # The use of telnet is portable only with a connected TTY.
@@ -111,7 +114,7 @@ INETD_PID="$TMPDIR/inetd.pid.$$"
 posttesting () {
     if test -n "$TMPDIR" && test -f "$INETD_PID" \
 	&& test -r "$INETD_PID" \
-	&& ps "`cat $INETD_PID`" >/dev/null 2>&1
+	&& kill -0 "`cat $INETD_PID`" >/dev/null 2>&1
     then
 	kill "`cat $INETD_PID`" >/dev/null 2>&1 ||
 	kill -9 "`cat $INETD_PID`" >/dev/null 2>&1
diff --git a/tests/tftp.sh b/tests/tftp.sh
index 2c2f4ee..38713b3 100755
--- a/tests/tftp.sh
+++ b/tests/tftp.sh
@@ -21,21 +21,15 @@
 
 # Prerequisites:
 #
-#  * Shell: SVR4 Bourne shell, or newer, and allowing job control.
+#  * Shell: SVR4 Bourne shell, or newer.
 #
-#  * cat(1), expr(1), head(1), kill(1), pwd(1), rm(1).
-#
-#  * cmp(1), dd(1), id(1), grep(1), mktemp(1), netstat(8),
-#    ps(1), sed(1), uname(1).
+#  * dd(1), id(1), kill(1), mktemp(1), netstat(8), uname(1).
 #
 #  * Accessed by launched Inetd:
 #      /etc/nsswitch.conf, /etc/passwd, /etc/protocols.
 #
 #    OpenBSD uses /etc/services directly, not via /etc/nsswitch.conf.
 
-# Need job control when spawning Inetd.
-set -m
-
 if [ "$VERBOSE" ]; then
     set -x
 fi
@@ -115,7 +109,7 @@ INETD_PID="$TMPDIR/inetd.pid.$$"
 posttesting () {
     if test -n "$TMPDIR" && test -f "$INETD_PID" \
 	&& test -r "$INETD_PID" \
-	&& ps "`cat $INETD_PID`" >/dev/null 2>&1
+	&& kill -0 "`cat $INETD_PID`" >/dev/null 2>&1
     then
 	kill "`cat $INETD_PID`" 2>/dev/null ||
 	kill -9 "`cat $INETD_PID`" 2>/dev/null
@@ -154,10 +148,10 @@ locate_port () {
 }
 
 if [ "$VERBOSE" ]; then
-    "$TFTP" --version | head -1
-    "$TFTPD" --version | head -1
-    "$INETD" --version | head -1
-    "$IFCONFIG_SIMPLE" --version | head -1
+    "$TFTP" --version | sed '1q'
+    "$TFTPD" --version | sed '1q'
+    "$INETD" --version | sed '1q'
+    "$IFCONFIG_SIMPLE" --version | sed '1q'
 fi
 
 # Find an available port number.  There will be some
@@ -229,7 +223,7 @@ sleep 1
 locate_port $PROTO $PORT
 if test $? -ne 0; then
     # No it did not.
-    ps "$inetd_pid" >/dev/null 2>&1 && kill -9 "$inetd_pid" 2>/dev/null
+    kill -0 "$inetd_pid" >/dev/null 2>&1 && kill -9 "$inetd_pid" 2>/dev/null
     rm -f "$INETD_PID"
 
     echo 'First attempt at starting Inetd has failed.' >&2
@@ -255,7 +249,7 @@ if test $? -ne 0; then
 		but loosing control whether an Inetd process is
 		still around.
 		EOT
-	    ps "$spawned_pid" >/dev/null 2>&1 && kill -9 "$spawned_pid" 2>/dev/null
+	    kill -0 "$spawned_pid" >/dev/null 2>&1 && kill -9 "$spawned_pid" 2>/dev/null
 	    exit 1
 	}
 
@@ -265,7 +259,7 @@ if test $? -ne 0; then
 	: # Successful this time.
     else
 	echo "Failed again at starting correct Inetd instance." >&2
-	ps "$spawned_pid" >/dev/null 2>&1 && kill -9 "$spawned_pid" 2>/dev/null
+	kill -0 "$spawned_pid" >/dev/null 2>&1 && kill -9 "$spawned_pid" 2>/dev/null
 	exit 1
     fi
 fi

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


commit c2ca330865bc9794086dc334b1659d1d1caba84a
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Thu Mar 1 22:13:02 2012 +0100

    Revert removal of header inclusion. (silent change)

diff --git a/telnetd/telnetd.c b/telnetd/telnetd.c
index 22f1a96..d844d37 100644
--- a/telnetd/telnetd.c
+++ b/telnetd/telnetd.c
@@ -28,6 +28,10 @@
 #include <error.h>
 #include <libinetutils.h>
 
+#if defined AUTHENTICATION || defined ENCRYPTION
+# include <libtelnet/misc.h>
+#endif
+
 static void parse_authmode (char *str);
 static void parse_linemode (char *str);
 static void parse_debug_level (char *str);

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

Summary of changes:
 ChangeLog                 |   25 +++++++++++++++
 telnetd/telnetd.c         |    4 ++
 tests/ftp-localhost.sh    |   10 ++---
 tests/syslogd.sh          |   69 +++++++++++++++++++++++++++++++++++------
 tests/telnet-localhost.sh |   13 +++++---
 tests/tftp.sh             |   75 +++++++++++++++++++++++++++++++++++---------
 6 files changed, 159 insertions(+), 37 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Fri Mar 02 15:30:54 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1S3Z7u-00077M-P4
	for mharc-commit-inetutils@gnu.org; Fri, 02 Mar 2012 15:30:54 -0500
Received: from eggs.gnu.org ([208.118.235.92]:57645)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1S3Z7r-00076k-7J
	for commit-inetutils@gnu.org; Fri, 02 Mar 2012 15:30:53 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1S3Z7p-0008LD-1z
	for commit-inetutils@gnu.org; Fri, 02 Mar 2012 15:30:50 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:34367)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1S3Z7o-0008L8-Ux
	for commit-inetutils@gnu.org; Fri, 02 Mar 2012 15:30:48 -0500
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1S3Z7o-0007MG-8N
	for commit-inetutils@gnu.org; Fri, 02 Mar 2012 20:30:48 +0000
Date: Fri, 02 Mar 2012 20:30:48 +0000
Message-Id: <E1S3Z7o-0007MG-8N@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_1-49-g69a8622
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 590fde5934de486865b0eee54e4f1a93de2a549b
X-Git-Newrev: 69a8622c614be88cbbb8552fd6a2a92384e8fc22
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 Mar 2012 20:30:53 -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  69a8622c614be88cbbb8552fd6a2a92384e8fc22 (commit)
      from  590fde5934de486865b0eee54e4f1a93de2a549b (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=69a8622c614be88cbbb8552fd6a2a92384e8fc22


commit 69a8622c614be88cbbb8552fd6a2a92384e8fc22
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Fri Mar 2 21:23:12 2012 +0100

    ftp: Relax need for service lookup.

diff --git a/ChangeLog b/ChangeLog
index 207eb84..55949bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2012-03-02  Mats Erik Andersson <gnu@gisladisker.se>
+
+	Make service lookup optional in FTP client.
+	* ftp/cmds.h [!DEFPORT] (DEFPORT): New macro.  Define as IPPORT_FTP
+	if available, otherwise as 21.
+	(another): Condition call to add_history() on FROMATTY.
+	(setpeer): Call getservbyname() for `ftp/tcp'.  Set port if successful;
+	use DEFPORT otherwise.
+	* ftp/ftp_var.h (sp): Remove external variable.
+	* ftp/main.c (main): Remove call to getservbyname() and the use of SP.
+	(cmdscanner): Condition call to add_history() on FROMATTY.
+
 2012-03-01  Mats Erik Andersson <gnu@gisladisker.se>
 
 	Subtests for SIGHUP reaction of `inetd' and `syslogd'.
diff --git a/ftp/cmds.c b/ftp/cmds.c
index 5f9fa7b..07a8252 100644
--- a/ftp/cmds.c
+++ b/ftp/cmds.c
@@ -83,6 +83,14 @@
 #include "ftp_var.h"
 #include "unused-parameter.h"
 
+#ifndef DEFPORT
+# ifdef IPPORT_FTP
+#  define DEFPORT IPPORT_FTP
+# else /* !IPPORT_FTP */
+#  define DEFPORT 21
+# endif
+#endif /* !DEFPORT */
+
 /* Returns true if STR is entirely lower case.  */
 static int
 all_lower (char *str)
@@ -143,7 +151,7 @@ another (int *pargc, char ***pargv, const char *prompt)
   arg = readline (buffer);
   free (buffer);
 
-  if (arg && *arg)
+  if (fromatty && arg && *arg)
     add_history (arg);
 
   if (!arg)
@@ -224,7 +232,12 @@ setpeer (int argc, char **argv)
 	}
     }
   else
-    port = ntohs (sp->s_port);
+    {
+      struct servent *sp;
+
+      sp = getservbyname ("ftp", "tcp");
+      port = (sp) ? ntohs (sp->s_port) : DEFPORT;
+    }
 
   host = hookup (host, port);
   if (host)
diff --git a/ftp/ftp_var.h b/ftp/ftp_var.h
index 5b95048..6afa945 100644
--- a/ftp/ftp_var.h
+++ b/ftp/ftp_var.h
@@ -110,8 +110,6 @@ FTP_EXTERN char *hostname;	/* name of host connected to */
 FTP_EXTERN int unix_server;	/* server is unix, can use binary for ascii */
 FTP_EXTERN int unix_proxy;	/* proxy is unix, can use binary for ascii */
 
-FTP_EXTERN struct servent *sp;	/* service spec for tcp/ftp */
-
 FTP_EXTERN jmp_buf toplevel;	/* non-local goto stuff for cmd scanner */
 
 FTP_EXTERN char *line;
diff --git a/ftp/main.c b/ftp/main.c
index 9ef9f79..2b6e92a 100644
--- a/ftp/main.c
+++ b/ftp/main.c
@@ -195,10 +195,6 @@ main (int argc, char *argv[])
   argc -= index;
   argv += index;
 
-  sp = getservbyname ("ftp", "tcp");
-  if (sp == 0)
-    error (EXIT_FAILURE, 0, "ftp/tcp: unknown service");
-
   fromatty = isatty (fileno (stdin));
   if (fromatty)
     {
@@ -343,7 +339,7 @@ cmdscanner (int top)
 	  break;
 	}
 
-      if (line && *line)
+      if (fromatty && line && *line)
 	add_history (line);
 
       if (l == 0)

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

Summary of changes:
 ChangeLog     |   12 ++++++++++++
 ftp/cmds.c    |   17 +++++++++++++++--
 ftp/ftp_var.h |    2 --
 ftp/main.c    |    6 +-----
 4 files changed, 28 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Sat Mar 03 18:34:44 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1S3yTM-0002jM-Bl
	for mharc-commit-inetutils@gnu.org; Sat, 03 Mar 2012 18:34:44 -0500
Received: from eggs.gnu.org ([208.118.235.92]:52917)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1S3yTJ-0002iw-HT
	for commit-inetutils@gnu.org; Sat, 03 Mar 2012 18:34:42 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1S3yTH-00069f-D6
	for commit-inetutils@gnu.org; Sat, 03 Mar 2012 18:34:41 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:33835)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1S3yTH-00069b-9l
	for commit-inetutils@gnu.org; Sat, 03 Mar 2012 18:34:39 -0500
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1S3yTG-00040Q-OX
	for commit-inetutils@gnu.org; Sat, 03 Mar 2012 23:34:38 +0000
Date: Sat, 03 Mar 2012 23:34:38 +0000
Message-Id: <E1S3yTG-00040Q-OX@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_1-50-g383dbd6
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 69a8622c614be88cbbb8552fd6a2a92384e8fc22
X-Git-Newrev: 383dbd669b7c7cb46ff83b6eba30da8a0be41ada
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, 03 Mar 2012 23:34: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  383dbd669b7c7cb46ff83b6eba30da8a0be41ada (commit)
      from  69a8622c614be88cbbb8552fd6a2a92384e8fc22 (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=383dbd669b7c7cb46ff83b6eba30da8a0be41ada


commit 383dbd669b7c7cb46ff83b6eba30da8a0be41ada
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Sat Mar 3 23:49:28 2012 +0100

    tftp: Silence prompt for non-interactive.

diff --git a/ChangeLog b/ChangeLog
index 55949bc..b30632f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-03-03  Mats Erik Andersson <gnu@gisladisker.se>
+
+	Display command prompt only in interactive mode.
+	* src/tftp.c (fromatty): New variable; true in interactive mode.
+	(main): Assign value to FROMATTY.
+	(command): Display prompt only if FROMATTY is true.
+
 2012-03-02  Mats Erik Andersson <gnu@gisladisker.se>
 
 	Make service lookup optional in FTP client.
diff --git a/src/tftp.c b/src/tftp.c
index d191b03..d85c14a 100644
--- a/src/tftp.c
+++ b/src/tftp.c
@@ -109,6 +109,7 @@ static int port; /* Port number in host byte order of the server. */
 static int trace;
 static int verbose;
 static int connected;
+static int fromatty;
 
 char mode[32];
 char line[200];
@@ -270,6 +271,8 @@ main (int argc, char *argv[])
   else
     port = ntohs (sp->s_port);
 
+  fromatty = isatty (STDIN_FILENO);
+
   strcpy (mode, "netascii");
   signal (SIGINT, intr);
   if (hostport_argc > 1)
@@ -793,7 +796,8 @@ command (void)
 
   for (;;)
     {
-      printf ("%s> ", prompt);
+      if (fromatty)
+	printf ("%s> ", prompt);
       if (fgets (line, sizeof line, stdin) == 0)
 	{
 	  if (feof (stdin))

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

Summary of changes:
 ChangeLog  |    7 +++++++
 src/tftp.c |    6 +++++-
 2 files changed, 12 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Tue Mar 06 17:53:05 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1S53Fh-0007Nw-Qi
	for mharc-commit-inetutils@gnu.org; Tue, 06 Mar 2012 17:53:05 -0500
Received: from eggs.gnu.org ([208.118.235.92]:44603)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1S53Fe-0007NQ-DT
	for commit-inetutils@gnu.org; Tue, 06 Mar 2012 17:53:04 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1S53FK-0006Zx-3Y
	for commit-inetutils@gnu.org; Tue, 06 Mar 2012 17:53:01 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:34248)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1S53FJ-0006Zp-W2
	for commit-inetutils@gnu.org; Tue, 06 Mar 2012 17:52:42 -0500
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1S53FJ-0001nf-3X
	for commit-inetutils@gnu.org; Tue, 06 Mar 2012 22:52:41 +0000
Date: Tue, 06 Mar 2012 22:52:41 +0000
Message-Id: <E1S53FJ-0001nf-3X@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_1-51-g05157b3
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 383dbd669b7c7cb46ff83b6eba30da8a0be41ada
X-Git-Newrev: 05157b367d15611f907d3070305f7ef6660802af
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, 06 Mar 2012 22:53: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 branch, master has been updated
       via  05157b367d15611f907d3070305f7ef6660802af (commit)
      from  383dbd669b7c7cb46ff83b6eba30da8a0be41ada (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=05157b367d15611f907d3070305f7ef6660802af


commit 05157b367d15611f907d3070305f7ef6660802af
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Tue Mar 6 23:41:07 2012 +0100

    ping,ping6: Host resolving issues.

diff --git a/ChangeLog b/ChangeLog
index b30632f..dc95090 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2012-03-06  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	* ping/ping6.c (print_echo): Use flag NI_NUMERICHOST in call
+	to getnameinfo() whenever the option OPT_NUMERIC is active.
+	* ping/ping_echo.c (ipaddr2str): Isolate case OPT_NUMERIC to
+	call xstrdup().  Then call xstrdup() if gethostbyaddr() fails.
+	In main body, replace every `hp->h_name' for `ipstr', and
+	conversely, since only `hp->h_name' can fail do be defined.
+	* tests/ping-localhost.sh: Insert option `-n' to ping and ping6.
+
 2012-03-03  Mats Erik Andersson <gnu@gisladisker.se>
 
 	Display command prompt only in interactive mode.
diff --git a/ping/ping6.c b/ping/ping6.c
index 2ba519a..5647ded 100644
--- a/ping/ping6.c
+++ b/ping/ping6.c
@@ -521,8 +521,9 @@ print_echo (int dupflag, int hops, struct ping_stat *ping_stat,
       return 0;
     }
 
-  err = getnameinfo ((struct sockaddr *) from, sizeof (*from), buf,
-		     sizeof (buf), NULL, 0, 0);
+  err = getnameinfo ((struct sockaddr *) from, sizeof (*from),
+		     buf, sizeof (buf), NULL, 0,
+		     (options & OPT_NUMERIC) ? NI_NUMERICHOST : 0);
   if (err)
     {
       const char *errmsg;
diff --git a/ping/ping_echo.c b/ping/ping_echo.c
index 5d600b6..0278e35 100644
--- a/ping/ping_echo.c
+++ b/ping/ping_echo.c
@@ -197,23 +197,26 @@ ipaddr2str (struct in_addr ina)
 {
   struct hostent *hp;
 
-  if (options & OPT_NUMERIC
-      || !(hp = gethostbyaddr ((char *) &ina, 4, AF_INET)))
+  if (options & OPT_NUMERIC)
+    return xstrdup (inet_ntoa (ina));
+
+  hp = gethostbyaddr ((char *) &ina, sizeof (ina), AF_INET);
+  if (hp == NULL)
     return xstrdup (inet_ntoa (ina));
   else
     {
       char *ipstr = inet_ntoa (ina);
-      int len = strlen (hp->h_name) + 1;
+      int len = strlen (ipstr) + 1;
       char *buf;
 
-      if (ipstr)
-	len += strlen (ipstr) + 3;	/* a pair of parentheses and a space */
+      if (hp->h_name)
+	len += strlen (hp->h_name) + 3;	/* a pair of parentheses and a space */
 
       buf = xmalloc (len);
-      if (ipstr)
+      if (hp->h_name)
 	snprintf (buf, len, "%s (%s)", hp->h_name, ipstr);
       else
-	snprintf (buf, len, "%s", hp->h_name);
+	snprintf (buf, len, "%s", ipstr);
       return buf;
     }
 }
diff --git a/tests/ping-localhost.sh b/tests/ping-localhost.sh
index c78fa0f..2d29f26 100755
--- a/tests/ping-localhost.sh
+++ b/tests/ping-localhost.sh
@@ -47,11 +47,11 @@ fi
 errno=0
 errno2=0
 
-$PING -c 1 $TARGET || errno=$?
+$PING -n -c 1 $TARGET || errno=$?
 test $errno -eq 0 || echo "Failed at pinging $TARGET." >&2
 
 # Host might not have been built with IPv6 support..
-test -x $PING6 && $PING6 -c 1 $TARGET6 || errno2=$?
+test -x $PING6 && $PING6 -n -c 1 $TARGET6 || errno2=$?
 test $errno2 -eq 0 || echo "Failed at pinging $TARGET6." >&2
 
 test $errno -eq 0 || exit $errno

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

Summary of changes:
 ChangeLog               |   10 ++++++++++
 ping/ping6.c            |    5 +++--
 ping/ping_echo.c        |   17 ++++++++++-------
 tests/ping-localhost.sh |    4 ++--
 4 files changed, 25 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Fri Mar 09 18:47:30 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1S69X0-0001pE-RO
	for mharc-commit-inetutils@gnu.org; Fri, 09 Mar 2012 18:47:30 -0500
Received: from eggs.gnu.org ([208.118.235.92]:36903)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1S69Ww-0001p7-73
	for commit-inetutils@gnu.org; Fri, 09 Mar 2012 18:47:29 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1S69Ws-0007Sp-KP
	for commit-inetutils@gnu.org; Fri, 09 Mar 2012 18:47:25 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:47281)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1S69Ws-0007Sl-GT
	for commit-inetutils@gnu.org; Fri, 09 Mar 2012 18:47:22 -0500
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1S69Wr-0001iJ-Pj
	for commit-inetutils@gnu.org; Fri, 09 Mar 2012 23:47:21 +0000
Date: Fri, 09 Mar 2012 23:47:21 +0000
Message-Id: <E1S69Wr-0001iJ-Pj@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_1-52-geb4b5ed
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 05157b367d15611f907d3070305f7ef6660802af
X-Git-Newrev: eb4b5ed2aa6976464eb1728ea35c2eaa89dad435
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 Mar 2012 23:47:29 -0000

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

The branch, master has been updated
       via  eb4b5ed2aa6976464eb1728ea35c2eaa89dad435 (commit)
      from  05157b367d15611f907d3070305f7ef6660802af (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=eb4b5ed2aa6976464eb1728ea35c2eaa89dad435


commit eb4b5ed2aa6976464eb1728ea35c2eaa89dad435
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Sat Mar 10 00:42:46 2012 +0100

    whois: Update TLD server list.

diff --git a/ChangeLog b/ChangeLog
index dc95090..75f184e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2012-03-10  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	* whois/tld_serv_list (.cz, .fo, .gl, .gs, .hk, .ie, .il, .in, .is)
+	(.jp, .kr, .kz, .lt, .lu, .lv, .ms, .mx, .ng, .nz, .pe, .pl, .ro, .ru)
+	(.se, .sg, .si, .sk, .sm, .su, .tf, .th, .tr, .tw, .us): Updated entry.
+	(.dz, .ec, .es, .eu, .fi, .gd, .gg, .gi, .gy, .hn, .hr, .ht, .im, .io)
+	(.ir, .je, .ke, .la, .ly, .ma, .md, .me, .mg, .mn, .mp, .mu, .my, .na)
+	(.nc, .nf, .pm, .pr, .pt, .qa, .re, .rs, .sa, .sb, .sc, .so, .sx, .tk)
+	(.tl, .tv, .tz, .ua, .uy, .uz, .vc, .ve, .wf, .yt): New or upgraded
+	from web entry.
+	(.hm, .ki, .mf, .pk, .pw, .sl, .sn, .tj, .ug, .um, .vn, .yu, .za):
+	Broken address or other comment.
+
 2012-03-06  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	* ping/ping6.c (print_echo): Use flag NI_NUMERICHOST in call
diff --git a/whois/tld_serv_list b/whois/tld_serv_list
index 8da590c..527c3b4 100644
--- a/whois/tld_serv_list
+++ b/whois/tld_serv_list
@@ -99,201 +99,207 @@
 #.cv			# NIC?
 .cx	whois.nic.cx
 .cy	whois.ripe.net
-.cz	whois.ripe.net
+.cz	whois.nic.cz
 .de	whois.denic.de
 #.dj	NONE		# NIC? http://www.intnet.dj
 .dk	whois.dk-hostmaster.dk
 #.dm			# NIC? (UPR)
 .do	WEB http://www.nic.do
-.dz	NONE
-.ec	WEB http://www.nic.ec
+.dz	whois.nic.dz
+.ec	whois.nic.ec
 .ee	NONE		# http://www.eenet.ee/services/subdomains.html
 #.eg	NONE		# NIC? http://www.frcu.eun.eg
-#.eh
+#.eh	NONE
 #.er	NONE		# do they have internet there?
-.es	WEB http://www.nic.es/whois/
+.es	whois.nic.es
 #.et	NONE		# NIC? http://www.telecom.net.et
-.fi	WEB http://cgi.thk.fi/cgi-bin/domains.pl?language=eng
+.eu	whois.eu
+.fi	whois.fi
 .fj	whois.usp.ac.fj
 .fk	NONE		# http://www.fidc.org.fk/domain-registration/home.htm
 .fm	WEB http://www.nic.fm/register.html
-.fo	whois.ripe.net
+.fo	whois.nic.fo
 .fr	whois.nic.fr
 #.ga		######### www.inet.ga	#broken
 .gb	NONE
-#.gd			# NIC? (UPR)
+.gd	whois.adamsnames.com
 .ge	WEB http://www.nic.net.ge
 .gf	whois.nplus.gf
-.gg	NONE		# http://www.isles.net
+.gg	whois.gg
 .gh	NONE		# http://www.ghana.com/domreg.html
-.gi	NONE		# http://www.gibnet.gi/nic/
-.gl	whois.ripe.net
+.gi	whois2.afilias-grs.net
+.gl	whois.nic.gl
 .gm	whois.ripe.net
 .gn	NONE		# http://www.psg.com/dns/gn/
 #.gp		######### http://www.nic.gp broken like mq
 #.gq			# NIC? http://www.getesa.gq
 .gr	whois.ripe.net	# http://www.hostmaster.gr
-.gs	whois.adamsnames.tc
+.gs	whois.nic.gs
 #.gt		######### http://www.gt/cir/cir.htm	# NIC? - broken URL
 .gu	WEB http://gadao.gov.gu/Scripts/wwsquery/wwsquery.dll?hois=guamquery
 #.gw			# no NIC?
-#.gy			# NIC? (UPR)
-.hk	whois.hknic.net.hk
-.hm	whois.nic.hm
-.hn	NONE		# www.nic.hn
-.hr	WEB http://www.CARNet.hr/DNS/
-#.ht			# NIC? http://www.haitiworld.com/
+.gy	whois.registry.gy
+.hk	whois.hkirc.hk
+.hm	NONE		# broken - whois.nic.hm
+.hn	whois2.afilias-grs.net
+.hr	whois.dns.hr
+.ht	whois.nic.ht
 .hu	whois.nic.hu
 .id	whois.idnic.net.id	# broken - WEB tukang.access.net.id/domain
 .ie	WEB http://www.domainregistry.ie/search/whois.html
-.ie	whois.ripe.net
-.il	whois.ripe.net
-.im	WEB http://www.nic.im/exist.html
-.in	whois.ncst.ernet.in
-.io	WEB http://www.io.io/whois.html
+.ie	whois.domainregistry.ie
+.il	whois.isoc.org.il
+.im	whois.nic.im
+.in	whois.inregistry.net
+.io	whois.nic.io
 #.iq			# NIC?
-.ir	WEB http://aria.nic.ir/forms/whois.html
-.is	whois.isnet.is
+.ir	whois.nic.ir
+.is	whois.isnic.is
 .it	whois.nic.it
-.je	NONE		# http://www.isles.net
+.je	whois.je
 #.jm			# NIC? uwimona.edu.jm ns.jm
 .jo	NONE		# www.nic.gov.jo
-.jp	whois.nic.ad.jp
-# there is a server run by Randy bush, but I forgot the address!
-.ke	NONE		# http://www.nbnet.co.ke/domain.htm
+.jp	whois.jprs.jp
+.ke	whois.kenic.or.ke
 .kg	whois.domain.kg
 #.kh			# NIC? http://www.camnet.com.kh
-#.ki			# NIC?
+#.ki	NONE	# broken -- whois.nic.ki
 #.km			# NIC?
 #.kn			# NIC? (UPR)
 #.kp
-.kr	whois.krnic.net
+.kr	whois.kr
 .kw	WEB http://www.domainname.net.kw
 .ky	NONE		# http://www.nic.ky
-.kz	whois.domain.kz
-#.la			# no IP connectivity
+.kz	whois.nic.kz
+.la	whois.nic.la
 .lb	WEB http://www.aub.edu.lb/lbdr/search.html
 .lc	NONE		# http://www.isisworld.lc/domains/
 .li	whois.nic.li
 .lk	whois.nic.lk
 .lr	NONE		# http://www.psg.com/dns/lr/
 .ls	NONE
-.lt	whois.ripe.net
-.lu	whois.restena.lu
-.lv	whois.ripe.net
-.ly	WEB http://www.lydomains.com/whois.asp
-#.ma		######### NIC? www.nic.ma
+.lt	whois.domreg.lt
+.lu	whois.dns.lu
+.lv	whois.nic.lv
+.ly	whois.nic.ly
+.ma	whois.iam.net.ma
 .mc	whois.ripe.net
-.md	WEB http://www.nic.md/search.html
-.mg	NONE		# www.nic.mg
+.md	whois.nic.md
+.me	whois.nic.me
+#.mf	NONE		# Not assigned
+.mg	whois.nic.mg
 .mh	NONE		# http://www.nic.net.mh
 #.mk			# NIC? http://www.mpt.com.mk
 #.ml			# NIC? sotelma.ml
 .mm	whois.nic.mm
-.mn	WEB http://www.nic.mn
+.mn	whois.nic.mn
 .mo	NONE		# http://www.umac.mo/other/
-.mp	NONE		# http://www.marketplace.mp
+.mp	whois.nic.mp
 #.mq		######## http://www.nic.mq	# broken
 .mr	NONE		# http://www.univ-nkc.mr/nic_mr.html
-.ms	whois.adamsnames.tc
+.ms	whois.nic.ms
 .mt	WEB http://www.um.edu.mt/nic/dir/
-.mu	NONE		# http://www.posix.co.za/mu/
+.mu	whois.nic.mu
 #.mv			# NIC? dhiraagu.com.mv
 .mw	WEB http://www.tarsus.net/whois/
-.mx	whois.nic.mx
-.my	NONE		# http://www.mynic.net
+.mx	whois.mx
+.my	whois.domainregistry.my
 #.mz			# NIC? dzowo.uem.mz
-.na	WEB http://www.lisse.na/cgi-bin/whois.cgi
-.nc	NONE		# http://www.orstom.nc/BASE/IRD_NOUMEA/TLD_NC/
+.na	whois.na-nic.com.na
+.nc	whois.nc
 #.ne			# NIC? http://www.intnet.ne
-.nf	NONE		# http://www.names.nf
-.ng	pgebrehiwot.iat.cnr.it
+.nf	whois.nic.net.nf
+.ng	whois.nic.net.ng
 .ni	WEB http://ns.ni/whois.htm
 .nl	whois.domain-registry.nl
 .no	whois.norid.no
 .np	WEB http://202.52.255.47/search.htm	# www.mos.com.np
 #.nr		######### NIC? cenpac.net.nr
 .nu	whois.nic.nu
-.nz	tardis.patho.gen.nz
+.nz	whois.srs.net.nz
 #.om	NONE		# NIC? http://www.gto.net.om
 .pa	WEB http://www.nic.pa
-.pe	whois.rcp.net.pe
+#.pe	whois.rcp.net.pe	# kero.yachay.pe valid 2011-03-10
+.pe	kero.yachay.pe
 #.pf			# NIC? nic.pf
 .pg	NONE	# http://www.unitech.ac.pg/Unitech_General/ITS/ITS_Dns.htm
 .ph	WEB http://www.names.ph/search.html
-.pk	whois.pknic.net.pk
-.pl	whois.ripe.net
-#.pm			# NIC-FR! http://www.nic.pm
+.pk	NONE	# broken - whois.pknic.net.pk
+.pl	whois.dns.pl
+.pm	whois.nic.pm
 .pn	NONE		# http://www.nic.pn
-.pr	NONE		# http://www.uprr.pr/main.html
+.pr	whois.nic.pr
 .ps	NONE		# no NIC yet... www.gov.ps
-.pt	WEB http://www.dns.pt/dnsinfo.htm
-.pw	whois.nic.pw
+.pt	whois.dns.pt
+.pw	NONE		# broken - whois.nic.pw
 .py	WEB http://www.nic.py/consultas/
-#.qa			# NIC? http://www.qatar.net.qa
-#.re			# NIC-FR!
-.ro	whois.ripe.net
-.ru	whois.ripn.net
+.qa	whois.registry.qa
+.re	whois.nic.re
+.ro	whois.rotld.ro
+.rs	whois.rnids.rs
+.ru	whois.tcinet.ru
 .rw	WEB http://www.nic.cd/database/rw/
-.sa	WEB http://www.saudinic.net.sa/domain/whois.htm
-.sb	WEB http://www.sbnic.net.sb/search.html
-#.sc	NONE		# NIC? http://www.sc/
+.sa	whois.nic.net.sa
+.sb	whois.nic.net.sb
+.sc	whois2.afilias-grs.net
 #.sd			# NIC? http://www.sudatel.sd
-.se	whois.nic-se.se
-.sg	whois.nic.net.sg
+.se	whois.iis.se
+.sg	whois.sgnic.sg
 .sh	whois.nic.sh
-.si	whois.arnec.si
+.si	whois.arnes.si
 .sj	NONE		# http://www.uninett.no/navn/bv-sj.html
-.sk	whois.ripe.net
-#.sl			# NIC? http://www.sierratel.sl/
-.sm	whois.ripe.net
-.sn	NONE		# www.nic.sn
-.so	NONE		# www.nic.so
+.sk	whois.sk-nic.sk
+#.sl			# NIC http://www.nic.sl/
+.sm	whois.nic.sm
+.sn	NONE		# broken - whois.nic.sn
+.so	whois.nic.so
 #.sr			# NIC? sr.net
 .st	whois.nic.st
-.su	whois.ripn.net
+.su	whois.tcinet.ru
 .sv	WEB http://www.conacyt.gob.sv/dns/
+.sx	whois.sx
 #.sy			# NIC? syriatel.net
 .sz	NONE		# http://www.iafrica.sz/domreg/
 .tc	whois.adamsnames.tc
 #.td			# NIC? http://www.tit.td
-.tf	whois.adamsnames.tc
+.tf	whois.nic.tf
 .tg	WEB www.nic.tg
-.th	whois.thnic.net
-.tj	whois.nic.tj
-.tk	NONE		# 2day.com
+.th	whois.thnic.co.th
+.tj	NONE		# broken - whois.nic.tj
+.tk	whois.dot.tk
+.tl	whois.nic.tl
 .tm	whois.nic.tm
 .tn	NONE		# http://www.ati.tn/Nic/
 .to	whois.tonic.to
 .tp	NONE		# http://www.nic.tp
-.tr	whois.metu.edu.tr
+.tr	whois.nic.tr
 .tt	WEB http://www.nic.tt/cgi-bin/whois.cgi
-.tv	NONE		# http://internet.tv
-.tw	whois.twnic.net
-.tz	NONE		# http://www.psg.com/dns/tz/
-.ua	WEB http://nic.ua.net/botik.cgi
-.ug	NONE		# http://www.nic.ug
+.tv	tvwhois.verisign-grs.com
+.tw	whois.twnic.net.tw
+.tz	whois.tznic.or.tz
+.ua	whois.ua
+.ug	NONE		# broken - whois.co.ug
 .ac.uk	whois.ja.net
 .uk	whois.nic.uk
-.um	whois.isi.edu	# not checked
+#.um	NONE		# Not assigned
 .fed.us	whois.nic.gov
-.us	whois.isi.edu
-.uy	WEB http://www.rau.edu.uy/rau/dom/reg.htm
-#.uz			# NIC? http://www.freenet.uz
+.us	whois.nic.us
+.uy	whois.nic.org.uy
+.uz	whois.cctld.uz
 .va	whois.ripe.net
-#.vc			# NIC?
-#.ve	rwhois.reacciun.ve:4321
+.vc	whois2.afilias-grs.net
+.ve	whois.nic.ve
 .ve	WEB http://www.nic.ve/nicwho01.html
 .vg	whois.adamsnames.tc
 #.vi			# NIC? http://www.usvi.net/cobex/
-#.vn		http://www.batin.com.vn/	# NIC?
+.vn	NONE		# NIC http://www.vnnic.net.vn
 .vu	WEB http://www.vunic.vu/whois
-#.wf			# NIC-FR!
+.wf	whois.nic.wf
 .ws	whois.samoanic.ws
 #.ye			# NIC? www.y.net.ye
-#.yt			# NIC-FR!
-.yu	NONE		# whois.nic.yu
-.za	whois.frd.ac.za
+.yt	whois.nic.yt
+#.yu	NONE		# Obsolete: region dissolved!
+.za	NONE		# NIC http://www.zadna.org.za
 .zm	NONE		# http://www.zamnet.zm/siteindex/Links/JoinZamnet.htm
 .zr	NONE		# obsoleted by cd
 #.zw			# NIC? zptc.co.zw http://www.zispa.co.zw/

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

Summary of changes:
 ChangeLog           |   13 ++++
 whois/tld_serv_list |  196 ++++++++++++++++++++++++++-------------------------
 2 files changed, 114 insertions(+), 95 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Mon Mar 12 17:01:17 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1S7CMn-0003U7-8O
	for mharc-commit-inetutils@gnu.org; Mon, 12 Mar 2012 17:01:17 -0400
Received: from eggs.gnu.org ([208.118.235.92]:60668)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1S7CMg-0003RN-T4
	for commit-inetutils@gnu.org; Mon, 12 Mar 2012 17:01:16 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1S7CMZ-0006An-Mq
	for commit-inetutils@gnu.org; Mon, 12 Mar 2012 17:01:10 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:36743)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1S7CMZ-0006Ae-KK
	for commit-inetutils@gnu.org; Mon, 12 Mar 2012 17:01:03 -0400
Received: from jas by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <simon@josefsson.org>) id 1S7CMY-0007D6-4j
	for commit-inetutils@gnu.org; Mon, 12 Mar 2012 21:01:03 +0000
Date: Mon, 12 Mar 2012 21:01:02 +0000
Message-Id: <E1S7CMY-0007D6-4j@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_1-53-g24587ec
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: eb4b5ed2aa6976464eb1728ea35c2eaa89dad435
X-Git-Newrev: 24587ec0fd92975adb4c29a4dfd21772ab4a2118
From: Simon Josefsson <simon@josefsson.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.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, 12 Mar 2012 21:01:16 -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  24587ec0fd92975adb4c29a4dfd21772ab4a2118 (commit)
      from  eb4b5ed2aa6976464eb1728ea35c2eaa89dad435 (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=24587ec0fd92975adb4c29a4dfd21772ab4a2118


commit 24587ec0fd92975adb4c29a4dfd21772ab4a2118
Author: Simon Josefsson <simon@josefsson.org>
Date:   Mon Mar 12 12:13:53 2012 +0100

    Add new tool dnsdomainname.

diff --git a/ChangeLog b/ChangeLog
index 75f184e..404ff16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2012-03-12  Simon Josefsson  <simon@josefsson.org>
+
+	* NEWS: Mention new dnsdomainname tool.
+	* configure.ac: Add tool dnsdomainname.
+	* doc/inetutils.texi: Document dnsdomainname.
+	* man/Makefile.am: Build dnsdomainname.1.
+	* man/dnsdomainname.h2m: New file.
+	* src/.gitignore: Ignore dnsdomainname.
+	* src/Makefile.am (bin_PROGRAMS): Add $(dnsdomainname_BUILD).
+	(dnsdomainname_SOURCES): New variable.
+	(EXTRA_PROGRAMS): Add dnsdomainname.
+	* src/dnsdomainname.c: New file.
+	* tests/dnsdomainname.sh: New file.
+
 2012-03-10  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	* whois/tld_serv_list (.cz, .fo, .gl, .gs, .hk, .ie, .il, .in, .is)
diff --git a/NEWS b/NEWS
index 46da4b8..6631509 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,9 @@ See the end of this file for license conditions.
 
 Please send inetutils bug reports to <bug-inetutils@gnu.org>.
 
+* New tool 'dnsdomainname'.
+
+
 January 6, 2012
 Version 1.9.1:
 
diff --git a/configure.ac b/configure.ac
index 017d0ac..dde3d7c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -104,6 +104,7 @@ IU_ENABLE_SERVER(tftpd)
 IU_ENABLE_SERVER(uucpd)
 
 IU_ENABLE_CLIENT(ftp)
+IU_ENABLE_CLIENT(dnsdomainname)
 IU_ENABLE_CLIENT(hostname)
 IU_ENABLE_CLIENT(ping)
 IU_ENABLE_CLIENT(ping6)
diff --git a/doc/inetutils.texi b/doc/inetutils.texi
index 0c44e0c..892fb15 100644
--- a/doc/inetutils.texi
+++ b/doc/inetutils.texi
@@ -32,6 +32,7 @@
 * ftp: (inetutils)ftp invocation.                 FTP client.
 * ftpd: (inetutils)ftpd invocation.               FTP Daemon.
 * hostname: (inetutils)hostname invocation.       Show or set system host name.
+* dnsdomainname: (inetutils)dnsdomainname invocation.       Show DNS domain name.
 * inetd: (inetutils)inetd invocation.             Interner super-server.
 * logger: (inetutils)logger invocation.           Send messages to the system log.
 * ping: (inetutils)ping invocation.               Packets to network hosts.
@@ -99,6 +100,7 @@ Documentation License''.
 Diagnostic programs
 
 * hostname invocation::                Show or set system host name.
+* dnsdomainname invocation::           Show DNS domain name.
 * logger invocation::                  Send messages to system log.
 * ping invocation::                    Packets to network hosts.
 * traceroute invocation::              Trace the route to a host.
@@ -281,6 +283,19 @@ Get short host name.
 Get NIS/YP domain name.
 @end table
 
+@node dnsdomainname invocation
+@chapter @command{dnsdomainname}: Show DNS domain name
+@cindex dnsdomainname
+
+@command{dnsdomainname} is a program to show the domain part of the
+system's fully qualified domain name.  For example, if the FQDN of the
+system is @code{name.example.org} the command will show
+@code{example.org}.
+
+@example
+dnsdomainname [@var{option}@dots{}]
+@end example
+
 @node logger invocation
 @chapter @command{logger}: Send messages to system log
 @cindex logger
diff --git a/man/Makefile.am b/man/Makefile.am
index 5572afa..c39f8a1 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -16,10 +16,10 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
-all = hostname.1 ifconfig.1 inetd.8 ftp.1 ftpd.8 logger.1 ping.1	\
-      ping6.1 rcp.1 rexec.1 rexecd.8 rlogin.1 rlogind.8 rsh.1 rshd.8	\
-      syslogd.8 talk.1 talkd.8 telnet.1 telnetd.8 tftp.1 tftpd.8	\
-      traceroute.1 uucpd.8 whois.1
+all = hostname.1 dnsdomainname.1 ifconfig.1 inetd.8 ftp.1 ftpd.8	\
+      logger.1 ping.1 ping6.1 rcp.1 rexec.1 rexecd.8 rlogin.1		\
+      rlogind.8 rsh.1 rshd.8 syslogd.8 talk.1 talkd.8 telnet.1		\
+      telnetd.8 tftp.1 tftpd.8 traceroute.1 uucpd.8 whois.1
 
 dist_man_MANS =
 
@@ -27,6 +27,10 @@ if ENABLE_hostname
 dist_man_MANS += hostname.1
 endif
 
+if ENABLE_dnsdomainname
+dist_man_MANS += dnsdomainname.1
+endif
+
 if ENABLE_ifconfig
 dist_man_MANS += ifconfig.1
 endif
@@ -133,6 +137,8 @@ ftpd.8: ftpd.h2m $(top_srcdir)/ftpd/ftpd.c $(top_srcdir)/configure.ac
 
 hostname.1: hostname.h2m $(top_srcdir)/src/hostname.c $(top_srcdir)/configure.ac
 
+dnsdomainname.1: dnsdomainname.h2m $(top_srcdir)/src/dnsdomainname.c $(top_srcdir)/configure.ac
+
 ifconfig.1: ifconfig.h2m $(top_srcdir)/ifconfig/options.c $(top_srcdir)/configure.ac
 
 inetd.8: inetd.h2m $(top_srcdir)/src/inetd.c $(top_srcdir)/configure.ac
@@ -186,6 +192,7 @@ whois.1: whois.h2m $(top_srcdir)/whois/whois.c $(top_srcdir)/configure.ac
 mapped_name = `echo ../$(TOOL)/$(TOOL) \
 | sed s,../ping6/ping6,../ping/ping6,\
 | sed s,../hostname/hostname,../src/hostname,\
+| sed s,../dnsdomainname/dnsdomainname,../src/dnsdomainname,\
 | sed s,../inetd/inetd,../src/inetd,\
 | sed s,../logger/logger,../src/logger,\
 | sed s,../rcp/rcp,../src/rcp,\
diff --git a/man/dnsdomainname.h2m b/man/dnsdomainname.h2m
new file mode 100644
index 0000000..afcf637
--- /dev/null
+++ b/man/dnsdomainname.h2m
@@ -0,0 +1,2 @@
+[NAME]
+dnsdomainname \- show DNS domain name
diff --git a/src/.gitignore b/src/.gitignore
index a41cd45..d07a8db 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -1,3 +1,4 @@
+dnsdomainname
 hostname
 inetd
 logger
diff --git a/src/Makefile.am b/src/Makefile.am
index e05ffd4..a98272b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -32,6 +32,10 @@ bin_PROGRAMS += $(hostname_BUILD)
 hostname_SOURCES = hostname.c
 EXTRA_PROGRAMS += hostname
 
+bin_PROGRAMS += $(dnsdomainname_BUILD)
+dnsdomainname_SOURCES = dnsdomainname.c
+EXTRA_PROGRAMS += dnsdomainname
+
 bin_PROGRAMS += $(logger_BUILD)
 logger_SOURCES = logger.c logprio.h
 EXTRA_PROGRAMS += logger
diff --git a/src/dnsdomainname.c b/src/dnsdomainname.c
new file mode 100644
index 0000000..8e1af02
--- /dev/null
+++ b/src/dnsdomainname.c
@@ -0,0 +1,82 @@
+/*
+  Copyright (C) 2012 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 <config.h>
+
+#include <argp.h>
+#include <error.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <netdb.h>
+
+#include "libinetutils.h"
+#include "progname.h"
+#include "xgethostname.h"
+
+const char doc[] =
+  "Show domain part of the system's fully qualified domain name.";
+const char *program_authors[] = {
+  "Simon Josefsson",
+  NULL
+};
+
+static struct argp argp = { NULL, NULL, NULL, doc };
+
+void
+dnsdomainname (void)
+{
+  char *host_name;
+  struct addrinfo hints, *res;
+  const char *dn;
+  int rc;
+
+  host_name = xgethostname ();
+  if (!host_name)
+    error (EXIT_FAILURE, errno, "cannot determine host name");
+
+  memset (&hints, 0, sizeof (struct addrinfo));
+  hints.ai_flags = AI_CANONNAME;
+
+  rc = getaddrinfo (host_name, NULL, &hints, &res);
+  if (rc != 0)
+    error (EXIT_FAILURE, 0, "%s", gai_strerror (rc));
+
+  dn = strchr (res->ai_canonname, '.');
+  if (dn == NULL)
+    error (EXIT_FAILURE, 0, "cannot qualify host name: %s", host_name);
+  dn++;
+
+  puts (dn);
+
+  free (host_name);
+  freeaddrinfo (res);
+}
+
+int
+main (int argc, char *argv[])
+{
+  set_program_name (argv[0]);
+
+  iu_argp_init ("dnsdomainname", program_authors);
+  argp_parse (&argp, argc, argv, 0, NULL, NULL);
+
+  dnsdomainname ();
+
+  exit (EXIT_SUCCESS);
+}
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 043e790..a5edd92 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -64,6 +64,10 @@ if ENABLE_hostname
 dist_check_SCRIPTS += hostname.sh
 endif
 
+if ENABLE_dnsdomainname
+dist_check_SCRIPTS += dnsdomainname.sh
+endif
+
 TESTS = $(check_PROGRAMS) $(dist_check_SCRIPTS)
 
 TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT)
diff --git a/tests/dnsdomainname.sh b/tests/dnsdomainname.sh
new file mode 100755
index 0000000..e30e1e1
--- /dev/null
+++ b/tests/dnsdomainname.sh
@@ -0,0 +1,50 @@
+#!/bin/sh
+
+# Copyright (C) 2012 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/'.
+
+set -e
+
+DNSDOMAINNAME=${DNSDOMAINNAME:-../src/dnsdomainname$EXEEXT}
+
+if ! test -x $DNSDOMAINNAME; then
+    echo "No executable $DNSDOMAINNAME available.  Skipping test."
+    exit 77
+fi
+
+$DNSDOMAINNAME > /dev/null
+rc=$?
+if test $rc -ne 0; then
+    echo "invoking $DNSDOMAINNAME failed with error code $rc"
+    exit 1
+fi
+
+$DNSDOMAINNAME --version > /dev/null
+rc=$?
+if test $rc -ne 0; then
+    echo "invoking $DNSDOMAINNAME --version failed with error code $rc"
+    exit 1
+fi
+
+$DNSDOMAINNAME --help > /dev/null
+rc=$?
+if test $rc -ne 0; then
+    echo "invoking $DNSDOMAINNAME --help failed with error code $rc"
+    exit 1
+fi
+
+exit 0

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

Summary of changes:
 ChangeLog                                 |   14 +++++
 NEWS                                      |    3 +
 configure.ac                              |    1 +
 doc/inetutils.texi                        |   15 +++++
 man/Makefile.am                           |   15 ++++--
 man/dnsdomainname.h2m                     |    2 +
 src/.gitignore                            |    1 +
 src/Makefile.am                           |    4 ++
 src/dnsdomainname.c                       |   82 +++++++++++++++++++++++++++++
 tests/Makefile.am                         |    4 ++
 ftp/Makefile.am => tests/dnsdomainname.sh |   40 ++++++++++----
 11 files changed, 165 insertions(+), 16 deletions(-)
 create mode 100644 man/dnsdomainname.h2m
 create mode 100644 src/dnsdomainname.c
 copy ftp/Makefile.am => tests/dnsdomainname.sh (50%)
 mode change 100644 => 100755


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Tue Mar 13 20:43:38 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1S7cJW-0007Xx-HC
	for mharc-commit-inetutils@gnu.org; Tue, 13 Mar 2012 20:43:38 -0400
Received: from eggs.gnu.org ([208.118.235.92]:42114)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1S7cJS-0007WH-UZ
	for commit-inetutils@gnu.org; Tue, 13 Mar 2012 20:43:36 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1S7cJ7-0006KW-VK
	for commit-inetutils@gnu.org; Tue, 13 Mar 2012 20:43:34 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:42315)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1S7cJ7-0006KR-RO
	for commit-inetutils@gnu.org; Tue, 13 Mar 2012 20:43:13 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1S7cJ7-0002gR-BW
	for commit-inetutils@gnu.org; Wed, 14 Mar 2012 00:43:13 +0000
Date: Wed, 14 Mar 2012 00:43:13 +0000
Message-Id: <E1S7cJ7-0002gR-BW@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_1-55-g4c39f0f
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 24587ec0fd92975adb4c29a4dfd21772ab4a2118
X-Git-Newrev: 4c39f0feb06ad4a5dc0a2191b340aaa4b666760f
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, 14 Mar 2012 00:43: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  4c39f0feb06ad4a5dc0a2191b340aaa4b666760f (commit)
       via  bc4809d68690e00cffb2ccfdd1fdf734f08988e1 (commit)
      from  24587ec0fd92975adb4c29a4dfd21772ab4a2118 (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=4c39f0feb06ad4a5dc0a2191b340aaa4b666760f


commit 4c39f0feb06ad4a5dc0a2191b340aaa4b666760f
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Wed Mar 14 01:17:14 2012 +0100

    Detection of termcap and libwrap.

diff --git a/ChangeLog b/ChangeLog
index d1f7e04..4f22ce1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2012-03-14  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	Make explicit dependency on header files for libwrap and termcap.
+
+	* am/libcurses.m4 (IU_LIB_TERMCAP): Check whether tgetent() is really
+	declared in <termcap.h>, not only checking presence of <termcap.h>.
+	That failing, check declaration of tgetent() using the pair <curses.h>,
+	and <term.h>.  In case of no successful detection at all, set LIBTERMCAP
+	to empty.
+	* configure.ac (LIBWRAP): Define only if hosts_ctl() is present in
+	libwrap and also the header <tcpd.h> exists.
+
 2012-03-13  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	* src/traceroute.c (do_try): When displaying traces, print host name
diff --git a/am/libcurses.m4 b/am/libcurses.m4
index 62c53e7..cc3a781 100644
--- a/am/libcurses.m4
+++ b/am/libcurses.m4
@@ -80,27 +80,32 @@ dnl IU_LIB_TERMCAP -- check for various termcap libraries
 dnl
 dnl Checks for various common libraries implementing the termcap interface,
 dnl including ncurses (unless --disable ncurses is specified), curses (which
-dnl does on some systems), termcap, and termlib.  If termcap is found, then
+dnl does so on some systems), termcap, and termlib.  If termcap is found, then
 dnl LIBTERMCAP is defined with the appropriate linker specification.
 dnl
+dnl Solaris is known to use libtermcap for tgetent, but to declare tgetent
+dnl in <term.h>!
+dnl
 AC_DEFUN([IU_LIB_TERMCAP], [
   AC_REQUIRE([IU_LIB_NCURSES])
   if test "$LIBNCURSES"; then
     LIBTERMCAP="$LIBNCURSES"
   else
     AC_CHECK_LIB(termcap, tgetent, LIBTERMCAP=-ltermcap)
-    AC_CHECK_HEADERS([termcap.h])
+    AC_CHECK_DECLS([tgetent], , , [[#include <termcap.h>]])
     if test "$ac_cv_lib_termcap_tgetent" = yes \
-	|| test "$ac_cv_header_termcap_h" = yes; then
+	&& test "$ac_cv_have_decl_tgetent" = 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_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>.])
+      AC_CHECK_DECLS([tgetent], , , [[#include <curses.h>
+#include <term.h>]])
+      if test "$ac_cv_lib_curses_tgetent" = yes \
+	  && test "$ac_cv_have_decl_tgetent" = yes; then
+	AC_DEFINE([HAVE_CURSES_TGETENT], 1,
+		  [Define to 1 if tgetent() exists in <curses.h>.])
+      fi
     fi
     if test "$ac_cv_lib_curses_tgetent" = no \
 	&& test "$ac_cv_lib_termcap_tgetent" = no; then
@@ -108,6 +113,8 @@ AC_DEFUN([IU_LIB_TERMCAP], [
       if "$ac_cv_lib_termlib_tgetent" = yes; then
 	AC_DEFINE([HAVE_TERMINFO_TGETENT], 1,
 		  [Define to 1 if tgetent() exists in libterminfo.])
+      else
+	LIBTERMCAP=
       fi
     fi
     if test -n "$LIBTERMCAP"; then
diff --git a/configure.ac b/configure.ac
index dde3d7c..e5c303e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -469,6 +469,7 @@ dnl See if we have libwrap.a
 dnl we cannot use AC_CHECK_LIB reliably since for the wrap lib
 dnl you have to define some global variables
 #AC_CHECK_LIB(wrap, hosts_ctl, LIBWRAP=-lwrap)
+  AC_CHECK_HEADERS([tcpd.h])
   AC_MSG_CHECKING(hosts_ctl in -lwrap);
   save_LIBS=$LIBS
   LIBS="$save_LIBS -lwrap"
@@ -476,8 +477,9 @@ dnl you have to define some global variables
               hosts_ctl(), eval "ac_cv_lib_wrap_hosts_ctl=yes",
               eval "ac_cv_lib_wrap_hosts_ctl=no")
   LIBS=$save_LIBS
-  if test "$ac_cv_lib_wrap_hosts_ctl" = yes ; then
-    AC_DEFINE([WITH_WRAP], 1, [Define to one if you have -lwrap.])
+  if test "$ac_cv_lib_wrap_hosts_ctl" = yes \
+      && test "$ac_cv_header_tcpd_h" = yes; then
+    AC_DEFINE([WITH_WRAP], 1, [Define to one if you have -lwrap and <tcpd.h>.])
     LIBWRAP=-lwrap
   fi
   AC_MSG_RESULT($ac_cv_lib_wrap_hosts_ctl);

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


commit bc4809d68690e00cffb2ccfdd1fdf734f08988e1
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Tue Mar 13 15:10:28 2012 +0100

    traceroute: Print format changes.

diff --git a/ChangeLog b/ChangeLog
index 404ff16..d1f7e04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-03-13  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	* src/traceroute.c (do_try): When displaying traces, print host name
+	only if in resolving mode; otherwise only numerical address.  Insert
+	one additional blank before time printout.
+	(get_hostname): Remove conditional clause on OPT_RESOLVE_HOSTNAMES.
+
 2012-03-12  Simon Josefsson  <simon@josefsson.org>
 
 	* NEWS: Mention new dnsdomainname tool.
diff --git a/src/traceroute.c b/src/traceroute.c
index 7918c22..1d53d1e 100644
--- a/src/traceroute.c
+++ b/src/traceroute.c
@@ -291,10 +291,13 @@ do_try (trace_t * trace, const int hop,
 	      else
 		{
 		  if (tries == 0 || prev_addr != trace->from.sin_addr.s_addr)
-		    printf (" %s (%s) ",
-			    inet_ntoa (trace->from.sin_addr),
+		    {
+		      printf (" %s ", inet_ntoa (trace->from.sin_addr));
+		      if (opt_resolve_hostnames)
+			printf ("(%s) ",
 			    get_hostname (&trace->from.sin_addr));
-		  printf ("%.3fms ", triptime);
+		    }
+		  printf (" %.3fms ", triptime);
 
 		}
 	      prev_addr = trace->from.sin_addr.s_addr;
@@ -309,13 +312,11 @@ do_try (trace_t * trace, const int hop,
 char *
 get_hostname (struct in_addr *addr)
 {
-  if (opt_resolve_hostnames)
-    {
-      struct hostent *info =
+  struct hostent *info =
 	gethostbyaddr ((char *) addr, sizeof (*addr), AF_INET);
-      if (info != NULL)
-	return info->h_name;
-    }
+  if (info != NULL)
+    return info->h_name;
+
   return inet_ntoa (*addr);
 }
 

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

Summary of changes:
 ChangeLog        |   19 +++++++++++++++++++
 am/libcurses.m4  |   23 +++++++++++++++--------
 configure.ac     |    6 ++++--
 src/traceroute.c |   19 ++++++++++---------
 4 files changed, 48 insertions(+), 19 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Wed Mar 14 03:42:42 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1S7ir4-0005Vc-Cs
	for mharc-commit-inetutils@gnu.org; Wed, 14 Mar 2012 03:42:42 -0400
Received: from eggs.gnu.org ([208.118.235.92]:43617)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1S7iqw-0005U7-VC
	for commit-inetutils@gnu.org; Wed, 14 Mar 2012 03:42:40 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1S7iqq-00018M-HR
	for commit-inetutils@gnu.org; Wed, 14 Mar 2012 03:42:34 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:33474)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1S7iqq-00018G-E0
	for commit-inetutils@gnu.org; Wed, 14 Mar 2012 03:42:28 -0400
Received: from jas by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <simon@josefsson.org>) id 1S7iqp-0008Eu-Pl
	for commit-inetutils@gnu.org; Wed, 14 Mar 2012 07:42:27 +0000
Date: Wed, 14 Mar 2012 07:42:27 +0000
Message-Id: <E1S7iqp-0008Eu-Pl@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_1-56-g4fc1f3e
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 4c39f0feb06ad4a5dc0a2191b340aaa4b666760f
X-Git-Newrev: 4fc1f3e84a05ceba05ebe3a34d69faf3f36389fd
From: Simon Josefsson <simon@josefsson.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.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, 14 Mar 2012 07:42: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  4fc1f3e84a05ceba05ebe3a34d69faf3f36389fd (commit)
      from  4c39f0feb06ad4a5dc0a2191b340aaa4b666760f (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=4fc1f3e84a05ceba05ebe3a34d69faf3f36389fd


commit 4fc1f3e84a05ceba05ebe3a34d69faf3f36389fd
Author: Simon Josefsson <simon@josefsson.org>
Date:   Wed Mar 14 08:42:23 2012 +0100

    tests/dnsdomainname.sh: Don't fail on configuration errors.

diff --git a/ChangeLog b/ChangeLog
index 4f22ce1..6cdd2c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-14  Simon Josefsson  <simon@josefsson.org>
+
+	* tests/dnsdomainname.sh: Don't fail on configuration errors.
+	Suggested by Mats Erik Andersson <mats.andersson@gisladisker.se>.
+
 2012-03-14  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	Make explicit dependency on header files for libwrap and termcap.
diff --git a/tests/dnsdomainname.sh b/tests/dnsdomainname.sh
index e30e1e1..4ebc1e7 100755
--- a/tests/dnsdomainname.sh
+++ b/tests/dnsdomainname.sh
@@ -26,13 +26,6 @@ if ! test -x $DNSDOMAINNAME; then
     exit 77
 fi
 
-$DNSDOMAINNAME > /dev/null
-rc=$?
-if test $rc -ne 0; then
-    echo "invoking $DNSDOMAINNAME failed with error code $rc"
-    exit 1
-fi
-
 $DNSDOMAINNAME --version > /dev/null
 rc=$?
 if test $rc -ne 0; then
@@ -47,4 +40,12 @@ if test $rc -ne 0; then
     exit 1
 fi
 
+# FIXME: Don't ignore all errors here.  We want to soft-fail (exit 77)
+# on 1) when getaddrinfo cannot lookup the address at all, or 2) when
+# the canonical address does not contain a period.  Both are
+# configuration issues, and the tool is arguable correct to fail in
+# these situations.  All other errors should lead to hard failures.
+
+$DNSDOMAINNAME || true
+
 exit 0

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

Summary of changes:
 ChangeLog              |    5 +++++
 tests/dnsdomainname.sh |   15 ++++++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Wed Mar 14 19:47:16 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1S7xuW-0000DE-0A
	for mharc-commit-inetutils@gnu.org; Wed, 14 Mar 2012 19:47:16 -0400
Received: from eggs.gnu.org ([208.118.235.92]:59609)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1S7xuT-0000AC-Lu
	for commit-inetutils@gnu.org; Wed, 14 Mar 2012 19:47:15 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1S7xuQ-0006yK-FM
	for commit-inetutils@gnu.org; Wed, 14 Mar 2012 19:47:13 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:33215)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1S7xuQ-0006yA-Bx
	for commit-inetutils@gnu.org; Wed, 14 Mar 2012 19:47:10 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1S7xuP-0002ZA-0U
	for commit-inetutils@gnu.org; Wed, 14 Mar 2012 23:47:09 +0000
Date: Wed, 14 Mar 2012 23:47:09 +0000
Message-Id: <E1S7xuP-0002ZA-0U@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_1-57-g4939ad9
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 4fc1f3e84a05ceba05ebe3a34d69faf3f36389fd
X-Git-Newrev: 4939ad983e8e6456d2c03241b2bad9eb738c38d5
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, 14 Mar 2012 23:47:15 -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  4939ad983e8e6456d2c03241b2bad9eb738c38d5 (commit)
      from  4fc1f3e84a05ceba05ebe3a34d69faf3f36389fd (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=4939ad983e8e6456d2c03241b2bad9eb738c38d5


commit 4939ad983e8e6456d2c03241b2bad9eb738c38d5
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Thu Mar 15 00:44:12 2012 +0100

    Shell portability issue in test.

diff --git a/ChangeLog b/ChangeLog
index 6cdd2c9..5730aa7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-15  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	* tests/dnsdomainname.sh: Replace `! test -x' by `test ! -x'
+	for shell portability.
+
 2012-03-14  Simon Josefsson  <simon@josefsson.org>
 
 	* tests/dnsdomainname.sh: Don't fail on configuration errors.
diff --git a/tests/dnsdomainname.sh b/tests/dnsdomainname.sh
index 4ebc1e7..83bf7de 100755
--- a/tests/dnsdomainname.sh
+++ b/tests/dnsdomainname.sh
@@ -21,7 +21,7 @@ set -e
 
 DNSDOMAINNAME=${DNSDOMAINNAME:-../src/dnsdomainname$EXEEXT}
 
-if ! test -x $DNSDOMAINNAME; then
+if test ! -x $DNSDOMAINNAME; then
     echo "No executable $DNSDOMAINNAME available.  Skipping test."
     exit 77
 fi

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

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


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Thu Mar 15 05:19:18 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1S86q6-0001cp-Su
	for mharc-commit-inetutils@gnu.org; Thu, 15 Mar 2012 05:19:18 -0400
Received: from eggs.gnu.org ([208.118.235.92]:51795)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1S86q0-0001au-Jc
	for commit-inetutils@gnu.org; Thu, 15 Mar 2012 05:19:17 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1S86pb-0008AL-UT
	for commit-inetutils@gnu.org; Thu, 15 Mar 2012 05:19:12 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:46825)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1S86pb-0008AG-R1
	for commit-inetutils@gnu.org; Thu, 15 Mar 2012 05:18:47 -0400
Received: from jas by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <simon@josefsson.org>) id 1S86pb-0001Gc-9o
	for commit-inetutils@gnu.org; Thu, 15 Mar 2012 09:18:47 +0000
Date: Thu, 15 Mar 2012 09:18:47 +0000
Message-Id: <E1S86pb-0001Gc-9o@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_1-59-gcf0173f
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 4939ad983e8e6456d2c03241b2bad9eb738c38d5
X-Git-Newrev: cf0173f1eaf518dda83adeb0efd80f249fa17264
From: Simon Josefsson <simon@josefsson.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.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, 15 Mar 2012 09:19:17 -0000

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

The branch, master has been updated
       via  cf0173f1eaf518dda83adeb0efd80f249fa17264 (commit)
       via  61b720a04ab422291e47252be530c84abd5579d0 (commit)
      from  4939ad983e8e6456d2c03241b2bad9eb738c38d5 (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=cf0173f1eaf518dda83adeb0efd80f249fa17264


commit cf0173f1eaf518dda83adeb0efd80f249fa17264
Author: Simon Josefsson <simon@josefsson.org>
Date:   Thu Mar 15 10:18:42 2012 +0100

    dnsdomainname: Don't error when no domain component.

diff --git a/ChangeLog b/ChangeLog
index 313aeb2..c858b45 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2012-03-15  Simon Josefsson  <simon@josefsson.org>
 
+	* src/dnsdomainname.c (dnsdomainname): Don't error when canonical
+	name does not have domain name component (compatibility with
+	Debian dnsdomainname).  Suggested by Mats Erik Andersson
+	<gnu@gisladisker.se>.
+
 	* tests/dnsdomainname.sh: Reject non-0 and non-1 exit codes (i.e.,
 	crashes).
 
diff --git a/src/dnsdomainname.c b/src/dnsdomainname.c
index 8e1af02..25e5359 100644
--- a/src/dnsdomainname.c
+++ b/src/dnsdomainname.c
@@ -58,11 +58,8 @@ dnsdomainname (void)
     error (EXIT_FAILURE, 0, "%s", gai_strerror (rc));
 
   dn = strchr (res->ai_canonname, '.');
-  if (dn == NULL)
-    error (EXIT_FAILURE, 0, "cannot qualify host name: %s", host_name);
-  dn++;
-
-  puts (dn);
+  if (dn)
+    puts (dn + 1);
 
   free (host_name);
   freeaddrinfo (res);

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


commit 61b720a04ab422291e47252be530c84abd5579d0
Author: Simon Josefsson <simon@josefsson.org>
Date:   Thu Mar 15 10:08:39 2012 +0100

    tests/dnsdomainname.sh: Reject non-0 and non-1 exit codes (i.e., crashes).

diff --git a/ChangeLog b/ChangeLog
index 5730aa7..313aeb2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-15  Simon Josefsson  <simon@josefsson.org>
+
+	* tests/dnsdomainname.sh: Reject non-0 and non-1 exit codes (i.e.,
+	crashes).
+
 2012-03-15  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	* tests/dnsdomainname.sh: Replace `! test -x' by `test ! -x'
diff --git a/tests/dnsdomainname.sh b/tests/dnsdomainname.sh
index 83bf7de..e671302 100755
--- a/tests/dnsdomainname.sh
+++ b/tests/dnsdomainname.sh
@@ -17,8 +17,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
-set -e
-
 DNSDOMAINNAME=${DNSDOMAINNAME:-../src/dnsdomainname$EXEEXT}
 
 if test ! -x $DNSDOMAINNAME; then
@@ -46,6 +44,11 @@ fi
 # configuration issues, and the tool is arguable correct to fail in
 # these situations.  All other errors should lead to hard failures.
 
-$DNSDOMAINNAME || true
+$DNSDOMAINNAME > /dev/null
+rc=$?
+if test $rc -ne 0 && test $rc -ne 1; then
+    echo "invoking $DNSDOMAINNAME failed with error code $rc"
+    exit 1
+fi
 
 exit 0

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

Summary of changes:
 ChangeLog              |   10 ++++++++++
 src/dnsdomainname.c    |    7 ++-----
 tests/dnsdomainname.sh |    9 ++++++---
 3 files changed, 18 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Thu Mar 15 05:34:02 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1S874M-00062Q-KA
	for mharc-commit-inetutils@gnu.org; Thu, 15 Mar 2012 05:34:02 -0400
Received: from eggs.gnu.org ([208.118.235.92]:47906)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1S874F-00060e-BH
	for commit-inetutils@gnu.org; Thu, 15 Mar 2012 05:34:01 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1S8741-0002dR-C4
	for commit-inetutils@gnu.org; Thu, 15 Mar 2012 05:33:54 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:37904)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1S8741-0002d2-8L
	for commit-inetutils@gnu.org; Thu, 15 Mar 2012 05:33:41 -0400
Received: from jas by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <simon@josefsson.org>) id 1S8740-0007y4-JV
	for commit-inetutils@gnu.org; Thu, 15 Mar 2012 09:33:40 +0000
Date: Thu, 15 Mar 2012 09:33:40 +0000
Message-Id: <E1S8740-0007y4-JV@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_1-60-ga6524c6
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: cf0173f1eaf518dda83adeb0efd80f249fa17264
X-Git-Newrev: a6524c63b5f0d529ab3fffb189c9c8513dcd2405
From: Simon Josefsson <simon@josefsson.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.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, 15 Mar 2012 09:34:01 -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  a6524c63b5f0d529ab3fffb189c9c8513dcd2405 (commit)
      from  cf0173f1eaf518dda83adeb0efd80f249fa17264 (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=a6524c63b5f0d529ab3fffb189c9c8513dcd2405


commit a6524c63b5f0d529ab3fffb189c9c8513dcd2405
Author: Simon Josefsson <simon@josefsson.org>
Date:   Thu Mar 15 10:33:36 2012 +0100

    dnsdomainname: Doc fixes.

diff --git a/ChangeLog b/ChangeLog
index c858b45..be4d4c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2012-03-15  Simon Josefsson  <simon@josefsson.org>
 
+	* doc/inetutils.texi (dnsdomainname invocation): Doc fix.
+	* man/dnsdomainname.h2m: Likewise.
+	* src/dnsdomainname.c (doc): Likewise.
+
 	* src/dnsdomainname.c (dnsdomainname): Don't error when canonical
 	name does not have domain name component (compatibility with
 	Debian dnsdomainname).  Suggested by Mats Erik Andersson
diff --git a/doc/inetutils.texi b/doc/inetutils.texi
index 892fb15..1078256 100644
--- a/doc/inetutils.texi
+++ b/doc/inetutils.texi
@@ -292,6 +292,12 @@ system's fully qualified domain name.  For example, if the FQDN of the
 system is @code{name.example.org} the command will show
 @code{example.org}.
 
+The tool uses gethostname to get the host name of the system and
+getaddrinfo to resolve it into a canonical name.  The part after the
+first period (@code{.}) of the canonical name is shown.
+
+The output is not necessarily related to the NIS/YP domain name.
+
 @example
 dnsdomainname [@var{option}@dots{}]
 @end example
diff --git a/man/dnsdomainname.h2m b/man/dnsdomainname.h2m
index afcf637..f4e2d51 100644
--- a/man/dnsdomainname.h2m
+++ b/man/dnsdomainname.h2m
@@ -1,2 +1,5 @@
 [NAME]
 dnsdomainname \- show DNS domain name
+
+[SEE ALSO]
+gethostname(2), getaddrinfo(3)
diff --git a/src/dnsdomainname.c b/src/dnsdomainname.c
index 25e5359..554eef3 100644
--- a/src/dnsdomainname.c
+++ b/src/dnsdomainname.c
@@ -30,7 +30,11 @@
 #include "xgethostname.h"
 
 const char doc[] =
-  "Show domain part of the system's fully qualified domain name.";
+  "Show domain part of the system's fully qualified host name.\n\
+\n\
+The tool uses gethostname to get the host name of the system\n\
+and getaddrinfo to resolve it into a canonical name.  The part\n\
+after the first period ('.') of the canonical name is shown.";
 const char *program_authors[] = {
   "Simon Josefsson",
   NULL

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

Summary of changes:
 ChangeLog             |    4 ++++
 doc/inetutils.texi    |    6 ++++++
 man/dnsdomainname.h2m |    3 +++
 src/dnsdomainname.c   |    6 +++++-
 4 files changed, 18 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Tue Mar 20 21:26:52 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1SAAKC-0007C2-Du
	for mharc-commit-inetutils@gnu.org; Tue, 20 Mar 2012 21:26:52 -0400
Received: from eggs.gnu.org ([208.118.235.92]:36213)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1SAAK8-0007B2-Kj
	for commit-inetutils@gnu.org; Tue, 20 Mar 2012 21:26:51 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1SAAK4-0005pd-UW
	for commit-inetutils@gnu.org; Tue, 20 Mar 2012 21:26:48 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:59685)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1SAAK4-0005pY-RD
	for commit-inetutils@gnu.org; Tue, 20 Mar 2012 21:26:44 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1SAAK3-0004Wd-JS
	for commit-inetutils@gnu.org; Wed, 21 Mar 2012 01:26:44 +0000
Date: Wed, 21 Mar 2012 01:26:43 +0000
Message-Id: <E1SAAK3-0004Wd-JS@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_1-62-g6065feb
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: a6524c63b5f0d529ab3fffb189c9c8513dcd2405
X-Git-Newrev: 6065febe54c92af0636342075553b7a00ce6f976
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 Mar 2012 01:26: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  6065febe54c92af0636342075553b7a00ce6f976 (commit)
       via  fdc2e326e3ef3477b6fb814d10fa53c12cd29c61 (commit)
      from  a6524c63b5f0d529ab3fffb189c9c8513dcd2405 (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=6065febe54c92af0636342075553b7a00ce6f976


commit 6065febe54c92af0636342075553b7a00ce6f976
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Wed Mar 21 00:15:09 2012 +0100

    Common helper for test scripts.

diff --git a/ChangeLog b/ChangeLog
index 3d2bf94..fb35379 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,31 @@
+2012-03-21  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	* configure.ac (DD, MKTEMP, NETSTAT): New variables.  Use AC_PATH_PROG
+	on `dd', `mktemp', and `netstat'.  Declare as precious with AC_ARG_VAR.
+	(SED): New variable.  Set using AC_PROG_SED, protect by AC_ARG_VAR.
+	(GREP): Protect using AC_ARG_VAR.
+	* tests/Makefile.am (BUILT_SOURCES, tools_subst): New variables.
+	(tools.sh): New target.
+	* tests/ftp-localhost.sh: Source `tools.sh'.  Use $GREP, $MKTEMP,
+	$NETSTAT, and $SED instead of utility names.  Change tests for `grep',
+	and `netstat'; check $need_mktemp.
+	(FTPHOME): Check also fifth field of passwd, should GECOS be missing.
+	(USER): Calculate using `func_id_user'.
+	* tests/hostname.sh: Source `tools.sh'.  `func_id_uid` replaces `id -u'.
+	* tests/ping-localhost.sh: Likewise.
+	* tests/traceroute-localhost.sh: Likewise.
+	* tests/syslogd.sh: Check directory early, then source `tools.sh'.
+	Check $need_mktemp and $need_netstat.  Use $SED, $MKTEMP, $NETSTAT,
+	and $GREP.  Replace `id -u' by `func_id_uid'.
+	* tests/telnet-localhost.sh: Source `tools.sh'.  Check $need_mktemp.
+	Use $SED, $MKTEMP, and $GREP.
+	(USER): Compute using `func_id_user'.
+	* tests/tftp.sh: Source `tools.sh'.  Check $need_dd, $need_mktemp,
+	and $need_netstat.  Remove checks for `netstat' and `grep'.  Use $SED,
+	$MKTEMP, $NETSTAT, $GREP, and $DD.
+	(USER): Compute using `func_id_user'.
+	* tests/tools.sh.in: New file.
+
 2012-03-20  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	* am/libcurses.m4 (IU_LIB_TERMCAP) <termlib detection>: Add a missing
diff --git a/configure.ac b/configure.ac
index e5c303e..468a5a4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -130,6 +130,9 @@ AC_ISC_POSIX
 AC_PROG_CC
 gl_EARLY
 AC_CHECK_TOOL(AR, ar)
+AC_PATH_PROG(DD, dd, dd)
+AC_PATH_PROG(MKTEMP, mktemp, mktemp)
+AC_PATH_PROG(NETSTAT, netstat, netstat)
 AC_PATH_PROG(RM, rm, rm)
 AC_PROG_CPP
 AC_PROG_INSTALL
@@ -137,7 +140,13 @@ AC_PROG_MAKE_SET
 AC_PROG_RANLIB
 AC_PROG_YACC
 AC_PROG_LN_S
+AC_PROG_SED
 AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir)
+AC_ARG_VAR(GREP, [Location of preferred 'grep' utility.])
+AC_ARG_VAR(SED, [Location of preferred 'sed' utility.])
+AC_ARG_VAR(DD, [Location of 'dd'.])
+AC_ARG_VAR(MKTEMP, [Location of 'mktemp'.])
+AC_ARG_VAR(NETSTAT, [Location of 'netstat'.])
 
 gl_INIT
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index a5edd92..9709a62 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -71,3 +71,14 @@ endif
 TESTS = $(check_PROGRAMS) $(dist_check_SCRIPTS)
 
 TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT)
+
+BUILT_SOURCES = tools.sh
+
+tools_subst = sed -e 's,[@]GREP[@],$(GREP),g' \
+	      -e 's,[@]SED[@],$(SED),g' \
+	      -e 's,[@]DD[@],$(DD),g' \
+	      -e 's,[@]MKTEMP[@],$(MKTEMP),g' \
+	      -e 's,[@]NETSTAT[@],$(NETSTAT),g'
+
+tools.sh: tools.sh.in Makefile
+	$(tools_subst) < $(srcdir)/tools.sh.in > $@
diff --git a/tests/ftp-localhost.sh b/tests/ftp-localhost.sh
index 1122e41..684c717 100755
--- a/tests/ftp-localhost.sh
+++ b/tests/ftp-localhost.sh
@@ -47,6 +47,8 @@
 
 set -e
 
+. ./tools.sh
+
 FTP=${FTP:-../ftp/ftp$EXEEXT}
 FTPD=${FTPD:-../ftpd/ftpd$EXEEXT}
 INETD=${INETD:-../src/inetd$EXEEXT}
@@ -59,7 +61,7 @@ PWD="${PWD:-`pwd`}"
 
 # Acting user and target user
 #
-USER="`id -u -n`"
+USER=`func_id_user`
 FTPUSER=${FTPUSER:-ftp}
 
 if [ ! -x $FTP ]; then
@@ -73,18 +75,8 @@ elif [ ! -x $INETD ]; then
     exit 77
 fi
 
-# Use a trivial test to detect grep(1).
-echo 'Good luck.' | grep 'ood' >/dev/null 2>&1 \
-    || {
-	echo 'No available grep(1), used for diagnosis.  Skipping test.' >&2
-	exit 77
-    }
-
-netstat -na >/dev/null 2>&1 ||
-    {
-	echo 'No available netstat(1), used for diagnosis.  Skipping test.' >&2
-	exit 77
-    }
+$need_mktemp || exit_no_mktemp
+$need_netstat || exit_no_netstat
 
 # The superserver Inetd puts constraints on any chroot
 # when running this script, since it needs to look up
@@ -109,17 +101,17 @@ fi
 
 if [ $VERBOSE ]; then
     set -x
-    $FTP --version | sed '1q'
-    $FTPD --version | sed '1q'
-    $INETD --version | sed '1q'
+    $FTP --version | $SED '1q'
+    $FTPD --version | $SED '1q'
+    $INETD --version | $SED '1q'
 fi
 
-if [ `id -u` != 0 ]; then
+if [ `func_id_uid` != 0 ]; then
     echo "ftpd needs to run as root" >&2
     exit 77
 fi
 
-if id -u "$FTPUSER" > /dev/null; then
+if id "$FTPUSER" > /dev/null; then
     :
 else
     echo "anonymous ftpd needs a '$FTPUSER' user" >&2
@@ -130,13 +122,16 @@ FTPHOME="`eval echo ~"$FTPUSER"`"
 if test ! -d "$FTPHOME"; then
     save_IFS="$IFS"
     IFS=:
-    set -- `grep "^$FTPUSER:" /etc/passwd`	# Existence is known above.
+    set -- `$GREP "^$FTPUSER:" /etc/passwd`	# Existence is known as above.
     IFS="$save_IFS"
-    if test ! -d "$6"; then
+    if test -d "$6"; then
+	FTPHOME="$6"
+    elif test -d "$5"; then	# In cases where GECOS is empty
+	FTPHOME="$5"
+    else
 	echo "The user '$FTPUSER' must have a home directory." >&2
 	exit 77
     fi
-    FTPHOME="$6"
 fi
 
 if test -d "$FTPHOME" && test -r "$FTPHOME" && test -x "$FTPHOME"; then
@@ -149,7 +144,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 -d $PWD/tmp.XXXXXXXXXX` ||
+TMPDIR=`$MKTEMP -d $PWD/tmp.XXXXXXXXXX` ||
     {
 	echo 'Failed at creating test directory.  Aborting.' >&2
 	exit 1
@@ -170,11 +165,11 @@ trap posttesting 0 1 2 3 15
 # Test for IPv4 as well as for IPv6.
 locate_port () {
     if [ "`uname -s`" = "SunOS" ]; then
-	netstat -na -finet -finet6 -Ptcp |
-	grep "\.$1[^0-9]" >/dev/null 2>&1
+	$NETSTAT -na -finet -finet6 -Ptcp |
+	$GREP "\.$1[^0-9]" >/dev/null 2>&1
     else
-	netstat -na |
-	grep "^$2[46]\{0,2\}.*[^0-9]$1[^0-9]" >/dev/null 2>&1
+	$NETSTAT -na |
+	$GREP "^$2[46]\{0,2\}.*[^0-9]$1[^0-9]" >/dev/null 2>&1
     fi
 }
 
@@ -253,13 +248,13 @@ test_report () {
     fi
 
     # Did we get access?
-    if grep 'Login failed' "$2" >/dev/null 2>&1; then
+    if $GREP 'Login failed' "$2" >/dev/null 2>&1; then
 	echo "Failed login for access using '$3' FTP client." >&2
 	exit 1
     fi
 
     # Standing control connection?
-    if grep 'FTP server status' "$2" >/dev/null 2>&1; then
+    if $GREP 'FTP server status' "$2" >/dev/null 2>&1; then
 	:
     else
 	echo "Cannot find server status for '$3' FTP client?" >&2
@@ -267,7 +262,7 @@ test_report () {
     fi
 
     # Was data transfer successful?
-    if grep '226 Transfer complete.' "$2" >/dev/null 2>&1; then
+    if $GREP '226 Transfer complete.' "$2" >/dev/null 2>&1; then
 	:
     else
 	echo "Cannot find transfer result for '$3' FTP client?" >&2
@@ -377,9 +372,9 @@ elif $have_sysctl; then
     # or
     #    net.inet6.ip6.v6only (BSD).
     #
-    value_v6only=`sysctl -a 2>/dev/null | grep v6only`
+    value_v6only=`sysctl -a 2>/dev/null | $GREP v6only`
     if test -n "$value_v6only"; then
-	value_v6only=`echo $value_v6only | sed 's/^.*[=:] *//'`
+	value_v6only=`echo $value_v6only | $SED 's/^.*[=:] *//'`
 	if test "$value_v6only" -eq 0; then
 	    # This is the good value.  Keep it.
 	    have_address_mapping=true
diff --git a/tests/hostname.sh b/tests/hostname.sh
index ebeea1e..ffbbe2b 100755
--- a/tests/hostname.sh
+++ b/tests/hostname.sh
@@ -23,6 +23,8 @@
 #
 #  * id(1), uname(1).
 
+. ./tools.sh
+
 hostname=${hostname:-../src/hostname$EXEEXT}
 
 if [ $VERBOSE ]; then
@@ -40,7 +42,7 @@ test `$hostname` = `uname -n` || errno=$?
 test $errno -eq 0 || echo "Failed to get hostname." >&2
 test $errno -eq 0 || exit $errno
 
-if [ `id -u` != 0 ]; then
+if [ `func_id_uid` != 0 ]; then
     echo "hostname: skipping tests to set host name"
 else
     # Only run this if hostname succeeded...
diff --git a/tests/ping-localhost.sh b/tests/ping-localhost.sh
index 2d29f26..8b092f8 100755
--- a/tests/ping-localhost.sh
+++ b/tests/ping-localhost.sh
@@ -23,6 +23,8 @@
 #
 #  * id(1).
 
+. ./tools.sh
+
 PING=${PING:-../ping/ping$EXEEXT}
 TARGET=${TARGET:-127.0.0.1}
 
@@ -39,7 +41,7 @@ if [ $VERBOSE ]; then
     $PING --version
 fi
 
-if [ `id -u` != 0 ]; then
+if [ `func_id_uid` != 0 ]; then
     echo "ping needs to run as root"
     exit 77
 fi
diff --git a/tests/syslogd.sh b/tests/syslogd.sh
index 3a719e4..0409d8b 100755
--- a/tests/syslogd.sh
+++ b/tests/syslogd.sh
@@ -51,9 +51,19 @@ HERE
     exit 0
 fi
 
+# Step into `tests/', should the invokation
+# have been made outside of it.
+#
+[ -d src ] && [ -f tests/syslogd.sh ] && cd tests/
+
+. ./tools.sh
+
 # Portability fix for SVR4
 PWD="${PWD:-`pwd`}"
 
+$need_mktemp || exit_no_mktemp
+$need_netstat || exit_no_netstat
+
 # Execution control.  Initialise early!
 #
 do_cleandir=false
@@ -84,15 +94,10 @@ fi
 SYSLOGD=${SYSLOGD:-../src/syslogd$EXEEXT}
 LOGGER=${LOGGER:-../src/logger$EXEEXT}
 
-# Step into `tests/', should the invokation
-# have been made outside of it.
-#
-[ -d src ] && [ -f tests/syslogd.sh ] && cd tests/
-
 if [ $VERBOSE ]; then
     set -x
-    $SYSLOGD --version | sed '1q'
-    $LOGGER --version | sed '1q'
+    $SYSLOGD --version | $SED '1q'
+    $LOGGER --version | $SED '1q'
 fi
 
 if [ ! -x $SYSLOGD ]; then
@@ -115,7 +120,7 @@ umask 0077
 
 if [ ! -d "$IU_TESTDIR" ]; then
     do_cleandir=true
-    IU_TESTDIR="`mktemp -d "$IU_TESTDIR" 2>/dev/null`" ||
+    IU_TESTDIR="`$MKTEMP -d "$IU_TESTDIR" 2>/dev/null`" ||
 	{
 	    echo 'Failed at creating test directory.  Aborting.' >&2
 	    exit 77
@@ -181,11 +186,11 @@ PORT=${PORT:-514}
 #
 locate_port () {
     if [ "`uname -s`" = "SunOS" ]; then
-	netstat -na -finet -finet6 -P$1 |
-	grep "\.$2[^0-9]" >/dev/null 2>&1
+	$NETSTAT -na -finet -finet6 -P$1 |
+	$GREP "\.$2[^0-9]" >/dev/null 2>&1
     else
-	netstat -na |
-	grep "^$1[46]\{0,2\}.*[^0-9]$2[^0-9]" >/dev/null 2>&1
+	$NETSTAT -na |
+	$GREP "^$1[46]\{0,2\}.*[^0-9]$2[^0-9]" >/dev/null 2>&1
     fi
 }
 
@@ -207,7 +212,7 @@ else
     # Append a slash if it is missing.
     expr X"$IU_TMPDIR" : X".*/$" >/dev/null || IU_TMPDIR="$IU_TMPDIR/"
 
-    IU_TMPDIR="`mktemp -d "${IU_TMPDIR}iu.XXXXXX" 2>/dev/null`" ||
+    IU_TMPDIR="`$MKTEMP -d "${IU_TMPDIR}iu.XXXXXX" 2>/dev/null`" ||
 	{   # Directory creation failed.  Disable test.
 	    cat <<-EOT >&2
 		WARNING!  Unable to create temporary directory below
@@ -266,9 +271,9 @@ rm -f "$OUT" "$PID" "$CONF"
 
 # Full testing at the standard port needs a superuser.
 # Randomise if necessary to get an underprivileged port.
-test `id -u` -eq 0 || do_standard_port=false
+test `func_id_uid` = 0 || do_standard_port=false
 
-if test `id -u` -ne 0 && test $PORT -le 1023; then
+if test `func_id_uid` != 0 && test $PORT -le 1023; then
     cat <<-EOT >&2
 	WARNING!!  The preset port $PORT/$PROTO is not usable,
 	since you are underprivileged.  Now attempting
@@ -373,7 +378,7 @@ if $do_socket_length; then
     # Allowing 55 characters for IU_BAD_BASE is almost aggressive.
     # A host name of length six would allow 64 characters
     pruned=`expr "UNIX socket name too long.*${IU_BAD_BASE}" : '\(.\{1,82\}\)'`
-    if grep "$pruned" "$OUT" >/dev/null 2>&1; then
+    if $GREP "$pruned" "$OUT" >/dev/null 2>&1; then
 	SUCCESSES=`expr $SUCCESSES + 1`
     fi
 fi
@@ -475,19 +480,19 @@ sleep 1
 
 # Detection of registered messages.
 #
-COUNT=`grep -c "$TAG" "$OUT"`
-COUNT2=`grep -c "$TAG2" "$OUT_USER"`
-COUNT2_debug=`grep -c "$TAG2.*user.debug" "$OUT_USER"`
-COUNT3=`grep -c "$TAG2" "$OUT_DEBUG"`
-COUNT3_info=`grep -c "$TAG2.*user.info" "$OUT_DEBUG"`
+COUNT=`$GREP -c "$TAG" "$OUT"`
+COUNT2=`$GREP -c "$TAG2" "$OUT_USER"`
+COUNT2_debug=`$GREP -c "$TAG2.*user.debug" "$OUT_USER"`
+COUNT3=`$GREP -c "$TAG2" "$OUT_DEBUG"`
+COUNT3_info=`$GREP -c "$TAG2.*user.info" "$OUT_DEBUG"`
 SUCCESSES=`expr $SUCCESSES + $COUNT + 2 \* $COUNT2 - $COUNT2_debug \
 		+ 2 \* $COUNT3 - $COUNT3_info`
 
 if [ -n "${VERBOSE+yes}" ]; then
     cat <<-EOT
 	---------- Successfully detected messages. ----------
-	`grep "$TAG" "$OUT"`
-	`grep -h "$TAG2" "$OUT_USER" "$OUT_DEBUG"`
+	`$GREP "$TAG" "$OUT"`
+	`$GREP -h "$TAG2" "$OUT_USER" "$OUT_DEBUG"`
 	---------- Full message log for syslogd. ------------
 	`cat "$OUT"`
 	---------- User message log. ------------------------
diff --git a/tests/telnet-localhost.sh b/tests/telnet-localhost.sh
index 49f8614..89ab47b 100755
--- a/tests/telnet-localhost.sh
+++ b/tests/telnet-localhost.sh
@@ -48,6 +48,10 @@ HERE
     exit 0
 fi
 
+. ./tools.sh
+
+$need_mktemp || exit_no_mktemp
+
 # The executables under test.
 #
 INETD=${INETD:-../src/inetd$EXEEXT}
@@ -66,8 +70,8 @@ test -d src && test -f tests/telnet-localhost.sh && cd tests/
 
 if test -n "$VERBOSE"; then
     set -x
-    $INETD --version | sed '1q'
-    $TELNET --version | sed '1q'
+    $INETD --version | $SED '1q'
+    $TELNET --version | $SED '1q'
 fi
 
 # The use of telnet is portable only with a connected TTY.
@@ -99,10 +103,10 @@ PWD="${PWD:-`pwd`}"
 # For file creation below IU_TESTDIR.
 umask 0077
 
-USER=`id -u -n`
+USER=`func_id_user`
 
 # Random base directory at testing time.
-TMPDIR=`mktemp -d $PWD/tmp.XXXXXXXXXX` ||
+TMPDIR=`$MKTEMP -d $PWD/tmp.XXXXXXXXXX` ||
     {
 	echo 'Failed at creating test directory.  Aborting.' >&2
 	exit 1
@@ -172,7 +176,7 @@ errno=0
 
 if test -n "$TARGET"; then
     output=`$TELNET $telnet_opts $TARGET $PORT 2>/dev/null`
-    echo "$output" | eval "grep 'Your address is $TARGET.' $display"
+    echo "$output" | eval "$GREP 'Your address is $TARGET.' $display"
     if test $? -ne 0; then
 	errno=1
 	echo "Failed at '$TARGET'." >&2
@@ -181,7 +185,7 @@ fi
 
 if test -n "$TARGET6"; then
     output=`$TELNET $telnet_opts $TARGET6 $PORT 2>/dev/null`
-    echo "$output" | eval "grep 'Your address is $TARGET6.' $display"
+    echo "$output" | eval "$GREP 'Your address is $TARGET6.' $display"
     if test $? -ne 0; then
 	errno=1
 	echo "Failed at '$TARGET6'." >&2
@@ -190,7 +194,7 @@ fi
 
 if test -n "$TARGET46"; then
     output=`$TELNET $telnet_opts $TARGET46 $PORT 2>/dev/null`
-    echo "$output" | eval "grep 'Your address is .*$TARGET.' $display"
+    echo "$output" | eval "$GREP 'Your address is .*$TARGET.' $display"
     if test $? -ne 0; then
 	echo "Informational: Unsuccessful with mapped address '$TARGET46'." >&2
     fi
diff --git a/tests/tftp.sh b/tests/tftp.sh
index ecea59b..88bd164 100755
--- a/tests/tftp.sh
+++ b/tests/tftp.sh
@@ -30,6 +30,12 @@
 #
 #    OpenBSD uses /etc/services directly, not via /etc/nsswitch.conf.
 
+. ./tools.sh
+
+$need_dd || exit_no_dd
+$need_mktemp || exit_no_mktemp
+$need_netstat || exit_no_netstat
+
 if [ "$VERBOSE" ]; then
     set -x
 fi
@@ -57,20 +63,6 @@ elif [ ! -x $IFCONFIG_SIMPLE ]; then	# Remove options
     exit 77
 fi
 
-# Check that netstat works before proceeding.
-netstat -na > /dev/null 2>&1
-if [ $? -ne 0 ]; then
-    echo "netstat: command failed to execute successfully" >&2
-    exit 77
-fi
-
-# And grep!
-echo 'Good luck.' | grep 'ood' > /dev/null 2>&1 \
-    || {
-	echo 'grep(1) is not available.  Skipping test.' >&2
-	exit 77
-    }
-
 # The superserver Inetd puts constraints on any chroot
 # when running this script, since it needs to look up
 # some basic facts stated in the configuration file.
@@ -94,13 +86,13 @@ fi
 
 AF=${AF:-inet}
 PROTO=${PROTO:-udp}
-USER=`id -u -n`
+USER=`func_id_user`
 
 # Late supplimentary subtest.
 do_conf_reload=true
 
 # Random base directory at testing time.
-TMPDIR=`mktemp -d $PWD/tmp.XXXXXXXXXX` ||
+TMPDIR=`$MKTEMP -d $PWD/tmp.XXXXXXXXXX` ||
     {
 	echo 'Failed at creating test directory.  Aborting.' >&2
 	exit 1
@@ -132,7 +124,7 @@ trap posttesting EXIT HUP INT QUIT TERM
 ADDRESSES="${ADDRESSES:-127.0.0.1 ::1}"
 
 if [ "$ADDRESSES" = "sense" ]; then
-    ADDRESSES="`$IFCONFIG | sed -e "/$AF /!d" \
+    ADDRESSES="`$IFCONFIG | $SED -e "/$AF /!d" \
 	-e "s/^.*$AF \([:.0-9]\{1,\}\) .*$/\1/g"`"
 fi
 
@@ -142,19 +134,19 @@ fi
 #
 locate_port () {
     if [ "`uname -s`" = "SunOS" ]; then
-	netstat -na -finet -finet6 -P$1 |
-	grep "\.$2[^0-9]" >/dev/null 2>&1
+	$NETSTAT -na -finet -finet6 -P$1 |
+	$GREP "\.$2[^0-9]" >/dev/null 2>&1
     else
-	netstat -na |
-	grep "^$1[46]\{0,2\}.*[^0-9]$2[^0-9]" >/dev/null 2>&1
+	$NETSTAT -na |
+	$GREP "^$1[46]\{0,2\}.*[^0-9]$2[^0-9]" >/dev/null 2>&1
     fi
 }
 
 if [ "$VERBOSE" ]; then
-    "$TFTP" --version | sed '1q'
-    "$TFTPD" --version | sed '1q'
-    "$INETD" --version | sed '1q'
-    "$IFCONFIG_SIMPLE" --version | sed '1q'
+    "$TFTP" --version | $SED '1q'
+    "$TFTPD" --version | $SED '1q'
+    "$INETD" --version | $SED '1q'
+    "$IFCONFIG_SIMPLE" --version | $SED '1q'
 fi
 
 # Find an available port number.  There will be some
@@ -293,11 +285,11 @@ 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" \
+    $DD if="$input" of="$TMPDIR/tftp-test/$name" \
 	bs=$bsize count=$count 2>/dev/null
 done
 
-FILELIST="`echo "$FILEDATA" | sed 's/ .*//' | tr "\n" ' '`"
+FILELIST="`echo "$FILEDATA" | $SED 's/ .*//' | tr "\n" ' '`"
 
 SUCCESSES=0
 EFFORTS=0
@@ -354,7 +346,7 @@ if $do_conf_reload; then
 	}
 
     kill -HUP $inetd_pid
-    name=`echo "$FILELIST" | sed 's/ .*//'`
+    name=`echo "$FILELIST" | $SED 's/ .*//'`
     for addr in $ADDRESSES; do
 	EFFORTS=`expr $EFFORTS + 1`
 	test -f "$name" && rm "$name"
diff --git a/tests/tools.sh.in b/tests/tools.sh.in
new file mode 100644
index 0000000..199c9d5
--- /dev/null
+++ b/tests/tools.sh.in
@@ -0,0 +1,89 @@
+# Copyright (C) 2012 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/'.
+
+# Helpers and supporting functionality for test scripts.
+
+GREP=${GREP:-@GREP@}
+SED=${SED:-@SED@}
+DD=${DD:-@DD@}
+MKTEMP=${MKTEMP:-@MKTEMP@}
+NETSTAT=${NETSTAT:-@NETSTAT@}
+
+# Variables for signalling presence of a utility:
+#
+#   need_toolname      Set to `false' if `toolname' is missing,
+#                      otherwise set to `:'.
+#
+#   exit_no_toolname   Function to exit with a message related to `toolname'.
+#
+# Suggested idiom:
+#
+#   $need_toolname || exit_no_toolname
+
+# `grep', `sed', and `uname' are used already by autoconfiguration,
+# so their existence is not tested for.
+
+need_id=false
+if id >/dev/null 2>&1; then
+	need_id=:
+fi
+
+exit_no_id () {
+    echo >&2 'No available id(1).  Skipping test.'
+    exit 77
+}
+
+need_dd=false
+if eval "$DD if=/dev/zero bs=5 count=1 >/dev/null 2>&1"; then
+	need_dd=:
+fi
+
+exit_no_dd () {
+    echo >&2 'No available dd(1).  Skipping test.'
+    exit 77
+}
+
+need_mktemp=false
+if eval "$MKTEMP -u temp.XXXXXX >/dev/null 2>&1"; then
+	need_mktemp=:
+fi
+
+exit_no_mktemp () {
+    echo >&2 'No available mktemp(1).  Skipping test.'
+    exit 77
+}
+
+need_netstat=false
+if eval "$NETSTAT -n >/dev/null 2>&1"; then
+	need_netstat=:
+fi
+
+exit_no_netstat () {
+    echo >&2 'No available netstat(1), used for diagnosis.  Skipping test.'
+    exit 77
+}
+
+# Some Solaris variants provide id(1) lacking `-u' switch.
+# Work around this by some computation.
+
+func_id_uid () {
+	id $1 2>&1 | $SED -n 's,.*uid=\([0-9]*\).*,\1,p'
+}
+
+func_id_user () {
+	id $1 2>&1 | $SED -n 's,.*uid=[0-9]*(\([^)]*\).*,\1,p'
+}
diff --git a/tests/traceroute-localhost.sh b/tests/traceroute-localhost.sh
index 1379251..ce22777 100755
--- a/tests/traceroute-localhost.sh
+++ b/tests/traceroute-localhost.sh
@@ -23,6 +23,8 @@
 #
 #  * id(1)
 
+. ./tools.sh
+
 TRACEROUTE=${TRACEROUTE:-../src/traceroute$EXEEXT}
 TARGET=${TARGET:-127.0.0.1}
 
@@ -36,7 +38,7 @@ if [ $VERBOSE ]; then
     $TRACEROUTE --version
 fi
 
-if [ `id -u` != 0 ]; then
+if [ `func_id_uid` != 0 ]; then
     echo "traceroute needs to run as root"
     exit 77
 fi

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


commit fdc2e326e3ef3477b6fb814d10fa53c12cd29c61
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Tue Mar 20 22:47:41 2012 +0100

    Diagnose linking to libtermlib correctly.

diff --git a/ChangeLog b/ChangeLog
index be4d4c6..3d2bf94 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-03-20  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	* am/libcurses.m4 (IU_LIB_TERMCAP) <termlib detection>: Add a missing
+	use of `test'.
+	(HAVE_TERMLIB_TGETENT): New macro, replaces HAVE_TERMINFO_TGETENT.
+
 2012-03-15  Simon Josefsson  <simon@josefsson.org>
 
 	* doc/inetutils.texi (dnsdomainname invocation): Doc fix.
diff --git a/am/libcurses.m4 b/am/libcurses.m4
index cc3a781..45cacc4 100644
--- a/am/libcurses.m4
+++ b/am/libcurses.m4
@@ -110,9 +110,9 @@ AC_DEFUN([IU_LIB_TERMCAP], [
     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.])
+      if test "$ac_cv_lib_termlib_tgetent" = yes; then
+	AC_DEFINE([HAVE_TERMLIB_TGETENT], 1,
+		  [Define to 1 if tgetent() exists in libtermlib.])
       else
 	LIBTERMCAP=
       fi

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

Summary of changes:
 ChangeLog                     |   34 ++++++++++++++++
 am/libcurses.m4               |    6 +-
 configure.ac                  |    9 ++++
 tests/Makefile.am             |   11 +++++
 tests/ftp-localhost.sh        |   57 ++++++++++++--------------
 tests/hostname.sh             |    4 +-
 tests/ping-localhost.sh       |    4 +-
 tests/syslogd.sh              |   51 +++++++++++++-----------
 tests/telnet-localhost.sh     |   18 +++++---
 tests/tftp.sh                 |   48 +++++++++-------------
 tests/tools.sh.in             |   89 +++++++++++++++++++++++++++++++++++++++++
 tests/traceroute-localhost.sh |    4 +-
 12 files changed, 240 insertions(+), 95 deletions(-)
 create mode 100644 tests/tools.sh.in


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Wed Mar 21 07:20:47 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1SAJax-0002Fg-1q
	for mharc-commit-inetutils@gnu.org; Wed, 21 Mar 2012 07:20:47 -0400
Received: from eggs.gnu.org ([208.118.235.92]:56034)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1SAJap-0002El-Bo
	for commit-inetutils@gnu.org; Wed, 21 Mar 2012 07:20:45 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1SAJah-0006CE-Qd
	for commit-inetutils@gnu.org; Wed, 21 Mar 2012 07:20:38 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:40948)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1SAJah-0006C4-N1
	for commit-inetutils@gnu.org; Wed, 21 Mar 2012 07:20:31 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1SAJaf-0005jL-Eu
	for commit-inetutils@gnu.org; Wed, 21 Mar 2012 11:20:30 +0000
Date: Wed, 21 Mar 2012 11:20:30 +0000
Message-Id: <E1SAJaf-0005jL-Eu@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_1-63-g45fc01f
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 6065febe54c92af0636342075553b7a00ce6f976
X-Git-Newrev: 45fc01f25fee6aebb6eddc42576ab00212778da3
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 Mar 2012 11:20: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  45fc01f25fee6aebb6eddc42576ab00212778da3 (commit)
      from  6065febe54c92af0636342075553b7a00ce6f976 (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=45fc01f25fee6aebb6eddc42576ab00212778da3


commit 45fc01f25fee6aebb6eddc42576ab00212778da3
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Wed Mar 21 12:20:18 2012 +0100

    tests: Distribute tools.sh.in.

diff --git a/ChangeLog b/ChangeLog
index fb35379..d6ea7c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,7 +4,8 @@
 	on `dd', `mktemp', and `netstat'.  Declare as precious with AC_ARG_VAR.
 	(SED): New variable.  Set using AC_PROG_SED, protect by AC_ARG_VAR.
 	(GREP): Protect using AC_ARG_VAR.
-	* tests/Makefile.am (BUILT_SOURCES, tools_subst): New variables.
+	* tests/Makefile.am (BUILT_SOURCES, EXTRA_DIST, CLEANFILES)
+	(tools_subst): New variables.
 	(tools.sh): New target.
 	* tests/ftp-localhost.sh: Source `tools.sh'.  Use $GREP, $MKTEMP,
 	$NETSTAT, and $SED instead of utility names.  Change tests for `grep',
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9709a62..e48e6f4 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -72,8 +72,12 @@ TESTS = $(check_PROGRAMS) $(dist_check_SCRIPTS)
 
 TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT)
 
+EXTRA_DIST = tools.sh.in
+
 BUILT_SOURCES = tools.sh
 
+CLEANFILES = tools.sh
+
 tools_subst = sed -e 's,[@]GREP[@],$(GREP),g' \
 	      -e 's,[@]SED[@],$(SED),g' \
 	      -e 's,[@]DD[@],$(DD),g' \

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

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


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Thu Mar 29 15:50:40 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1SDLMm-0004yV-Ra
	for mharc-commit-inetutils@gnu.org; Thu, 29 Mar 2012 15:50:40 -0400
Received: from eggs.gnu.org ([208.118.235.92]:35570)
	by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1SDLMi-0004xd-JB
	for commit-inetutils@gnu.org; Thu, 29 Mar 2012 15:50:39 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ams@gnu.org>) id 1SDLMf-0000i6-FO
	for commit-inetutils@gnu.org; Thu, 29 Mar 2012 15:50:36 -0400
Received: from [140.186.70.72] (port=57788 helo=vcs.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1SDLMf-0000ha-Ax
	for commit-inetutils@gnu.org; Thu, 29 Mar 2012 15:50:33 -0400
Received: from ams by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <ams@gnu.org>) id 1SDLMY-0005j7-K7
	for commit-inetutils@gnu.org; Thu, 29 Mar 2012 19:50:27 +0000
Date: Thu, 29 Mar 2012 19:50:26 +0000
Message-Id: <E1SDLMY-0005j7-K7@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_1-66-gfb27938
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 45fc01f25fee6aebb6eddc42576ab00212778da3
X-Git-Newrev: fb27938e459a824d09f648bfa05ca3dad5f4cd02
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: Thu, 29 Mar 2012 19:50: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  fb27938e459a824d09f648bfa05ca3dad5f4cd02 (commit)
       via  909da54e827d2f882db54dcb3b33a02f0db1bb10 (commit)
       via  773115a7d7d3627632c2d58a1466c876411c0ad4 (commit)
      from  45fc01f25fee6aebb6eddc42576ab00212778da3 (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=fb27938e459a824d09f648bfa05ca3dad5f4cd02


commit fb27938e459a824d09f648bfa05ca3dad5f4cd02
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Thu Mar 29 21:45:51 2012 +0200

    tests/.gitignore: Added tools.sh to list.

diff --git a/ChangeLog b/ChangeLog
index 0ef61de..69375b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2012-03-29  Alfred M. Szmidt  <ams@gnu.org>
 
+	* tests/.gitignore: Added tools.sh to list.
+
+2012-03-29  Alfred M. Szmidt  <ams@gnu.org>
+
 	Create xz compressed tarballs as part of `make dist'.
 
 	* README-alpha: Updated.
diff --git a/tests/.gitignore b/tests/.gitignore
index eb2c542..51bb74c 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -1,2 +1,3 @@
 localhost
 addrpeek
+tools.sh

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


commit 909da54e827d2f882db54dcb3b33a02f0db1bb10
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Thu Mar 29 21:43:47 2012 +0200

    Create xz compressed tarballs as part of `make dist'.

diff --git a/.gitignore b/.gitignore
index f63795b..5ed6df7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,6 +40,7 @@ gnulib
 gnulib/
 include
 inetutils-*.tar.gz
+inetutils-*.tar.xz
 inetutils-*/
 lib/
 libtool
diff --git a/ChangeLog b/ChangeLog
index 8565312..0ef61de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2012-03-29  Alfred M. Szmidt  <ams@gnu.org>
+
+	Create xz compressed tarballs as part of `make dist'.
+
+	* README-alpha: Updated.
+	* configure.ac: Added dist-xz.
+	* .gitignore: Added inetutils-*.tar.xz to list.
+
 2012-03-27  Alfred M. Szmidt  <ams@gnu.org>
 
 	Check return code of malloc, or use xmalloc.
diff --git a/README-alpha b/README-alpha
index 16eedf1..5f8883d 100644
--- a/README-alpha
+++ b/README-alpha
@@ -134,10 +134,10 @@ FIXME: put recent NEWS items here
 Please send bug reports to bug-inetutils@gnu.org.
 
 Here are the compressed sources:
-  ftp://ftp.gnu.org/gnu/inetutils/inetutils-VERSION.tar.gz
+  ftp://ftp.gnu.org/gnu/inetutils/inetutils-VERSION.tar.xz
 
 Here are the GPG detached signatures[*]:
-  ftp://ftp.gnu.org/gnu/inetutils/inetutils-VERSION.tar.gz.sig
+  ftp://ftp.gnu.org/gnu/inetutils/inetutils-VERSION.tar.xz.sig
 
 To reduce load on the main server, use a mirror listed at:
   http://www.gnu.org/order/ftp.html
@@ -147,7 +147,7 @@ the corresponding file (without the .sig suffix) is intact.  First,
 be sure to download both the .sig file and the corresponding tarball.
 Then, run a command like this:
 
-  gpg --verify inetutils-VERSION.tar.gz.sig
+  gpg --verify inetutils-VERSION.tar.xz.sig
 
 If that command fails because you don't have the required public key,
 then run this command to import it:
diff --git a/configure.ac b/configure.ac
index 468a5a4..3b3258d 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.1])
+AM_INIT_AUTOMAKE([1.11.1 dist-xz])
 
 # config.h turns this on, so make sure it's on for our tests too
 #CPPFLAGS=-D_BSD_SOURCE

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


commit 773115a7d7d3627632c2d58a1466c876411c0ad4
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Tue Mar 27 08:54:55 2012 +0200

    Check return code of malloc, or use xmalloc.

diff --git a/ChangeLog b/ChangeLog
index d6ea7c5..8565312 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,42 @@
+2012-03-27  Alfred M. Szmidt  <ams@gnu.org>
+
+	Check return code of malloc, or use xmalloc.
+
+	* whois/whois.c: Include "xalloc.h".
+	(gwhois_argp_parser, queryformat): Use xmalloc over malloc.
+
+	* telnet/commands.c: Include "xalloc.h".
+	(env_init, env_define): Use xmalloc over malloc.
+
+	* src/syslogd.c: Include "xalloc.h".
+	(crunch_list): Use xmalloc over malloc.
+
+	* src/rshd.c: Include "xalloc.h".
+	(doit): Use xmalloc over malloc.
+
+	* src/rsh.c: Include "xalloc.h".
+	(main): Use xmalloc over malloc.
+
+	* src/rlogind.c: Include "xalloc.h".
+	(do_shishi_login): Use xmalloc over malloc.
+
+	* src/rlogin.c: Include "xalloc.h".
+	(main): Use xmalloc over malloc.
+
+	* libtelnet/shishi.c (krb5shishi_send): Check return code of
+	malloc.
+
+	* libtelnet/kerberos5.c (kerberos5_send): Don't use assert to
+	check the return code for malloc
+
+	* libinetutils/kcmd.c (kcmd): Check return code of malloc.
+
+	* ifconfig/printif.c: Include "xalloc.h".
+	(print_interfaceX): Use xmalloc over malloc.
+
+	* ftp/cmds.c: Include "xalloc.h".
+	(dotrans, domap): Use xmalloc over malloc.
+
 2012-03-21  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	* configure.ac (DD, MKTEMP, NETSTAT): New variables.  Use AC_PATH_PROG
diff --git a/ftp/cmds.c b/ftp/cmds.c
index 07a8252..0fee735 100644
--- a/ftp/cmds.c
+++ b/ftp/cmds.c
@@ -82,6 +82,7 @@
 
 #include "ftp_var.h"
 #include "unused-parameter.h"
+#include "xalloc.h"
 
 #ifndef DEFPORT
 # ifdef IPPORT_FTP
@@ -2076,7 +2077,7 @@ setntrans (int argc, char **argv)
 char *
 dotrans (char *name)
 {
-  char *new = malloc (strlen (name) + 1);
+  char *new = xmalloc (strlen (name) + 1);
   char *cp1, *cp2 = new;
   int i, ostop, found;
 
@@ -2191,7 +2192,7 @@ char *
 domap (char *name)
 {
   int buf_len = strlen (name) + 1;
-  char *buf = malloc (buf_len);
+  char *buf = xmalloc (buf_len);
   char *cp1 = name, *cp2 = mapin;
   char *tp[9], *te[9];
   int i, toks[9], toknum = 0, match = 1;
diff --git a/ifconfig/printif.c b/ifconfig/printif.c
index 19cb290..5bd93b7 100644
--- a/ifconfig/printif.c
+++ b/ifconfig/printif.c
@@ -46,6 +46,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include "ifconfig.h"
+#include "xalloc.h"
 
 FILE *ostream;			/* Either stdout or stderror.  */
 int column_stdout;		/* The column position of the cursor on stdout.  */
@@ -1044,7 +1045,7 @@ print_interfaceX (format_data_t form, int quiet)
 		  form->format = p;
 		  print_interfaceX (form, 1);
 		  q = form->format;
-		  argv[argc] = malloc (q - p + 1);
+		  argv[argc] = xmalloc (q - p + 1);
 		  memcpy (argv[argc], p, q - p);
 		  argv[argc][q - p] = '\0';
 		  if (*q == '}')
diff --git a/libinetutils/kcmd.c b/libinetutils/kcmd.c
index 04d1687..2e7846c 100644
--- a/libinetutils/kcmd.c
+++ b/libinetutils/kcmd.c
@@ -137,6 +137,8 @@ kcmd (Shishi ** h, int *sock, char **ahost, unsigned short rport, char *locuser,
     }
 
   host_save = malloc (strlen (hp->h_name) + 1);
+  if (host_save == NULL)
+    return -1;
   strcpy (host_save, hp->h_name);
   *ahost = host_save;
 
diff --git a/libtelnet/kerberos5.c b/libtelnet/kerberos5.c
index ed71a26..3649c0c 100644
--- a/libtelnet/kerberos5.c
+++ b/libtelnet/kerberos5.c
@@ -230,7 +230,11 @@ kerberos5_send (TN_Authenticator * ap)
 
       rdata.length = strlen (telnet_krb5_realm);
       rdata.data = malloc (rdata.length + 1);
-      assert (rdata.data);
+      if (rdata.data == NULL)
+	{
+	  DEBUG (("telnet: Kerberos V5: could not allocate memory\r\n"));
+	  return 0;
+	}
       strcpy (rdata.data, telnet_krb5_realm);
       krb5_princ_set_realm (telnet_context, creds.server, &rdata);
     }
diff --git a/libtelnet/shishi.c b/libtelnet/shishi.c
index 4bf70c1..dd1622a 100644
--- a/libtelnet/shishi.c
+++ b/libtelnet/shishi.c
@@ -160,6 +160,11 @@ krb5shishi_send (TN_Authenticator * ap)
     }
 
   tmp = malloc (strlen ("host/") + strlen (RemoteHostName) + 1);
+  if (tmp == NULL)
+    {
+      DEBUG (("telnet: Kerberos V5: shishi memory allocation failed\r\n"));
+      return 0;
+    }
   sprintf (tmp, "host/%s", RemoteHostName);
   memset (&hint, 0, sizeof (hint));
   hint.server = tmp;
diff --git a/src/rlogin.c b/src/rlogin.c
index aadf4eb..2e5c5ba 100644
--- a/src/rlogin.c
+++ b/src/rlogin.c
@@ -103,6 +103,7 @@
 #include <progname.h>
 #include "libinetutils.h"
 #include "unused-parameter.h"
+#include "xalloc.h"
 
 #ifdef KERBEROS
 # ifdef HAVE_KERBEROSIV_DES_H
@@ -483,7 +484,7 @@ try_connect:
 		    case SHISHI_DES_CBC_NONE:
 		    case SHISHI_DES3_CBC_HMAC_SHA1_KD:
 		      ivtab[i]->keyusage = SHISHI_KEYUSAGE_KCMD_DES;
-		      ivtab[i]->iv = malloc (ivtab[i]->ivlen);
+		      ivtab[i]->iv = xmalloc (ivtab[i]->ivlen);
 		      memset (ivtab[i]->iv, !i, ivtab[i]->ivlen);
 		      ivtab[i]->ctx =
 			shishi_crypto (handle, key, ivtab[i]->keyusage,
@@ -501,7 +502,7 @@ try_connect:
 		    default:
 		      ivtab[i]->keyusage =
 			SHISHI_KEYUSAGE_KCMD_DES + 2 + 4 * i;
-		      ivtab[i]->iv = malloc (ivtab[i]->ivlen);
+		      ivtab[i]->iv = xmalloc (ivtab[i]->ivlen);
 		      memset (ivtab[i]->iv, 0, ivtab[i]->ivlen);
 		      ivtab[i]->ctx =
 			shishi_crypto (handle, key, ivtab[i]->keyusage,
diff --git a/src/rlogind.c b/src/rlogind.c
index 663da5b..48f1bdc 100644
--- a/src/rlogind.c
+++ b/src/rlogind.c
@@ -70,6 +70,7 @@
 #include <argp.h>
 #include <libinetutils.h>
 #include "unused-parameter.h"
+#include "xalloc.h"
 
 /*
   The TIOCPKT_* macros may not be implemented in the pty driver.
@@ -1148,7 +1149,7 @@ do_shishi_login (int infd, struct auth_data *ad, const char **err_msg)
 	    case SHISHI_DES_CBC_NONE:
 	    case SHISHI_DES3_CBC_HMAC_SHA1_KD:
 	      ad->ivtab[i]->keyusage = SHISHI_KEYUSAGE_KCMD_DES;
-	      ad->ivtab[i]->iv = malloc (ad->ivtab[i]->ivlen);
+	      ad->ivtab[i]->iv = xmalloc (ad->ivtab[i]->ivlen);
 	      memset (ad->ivtab[i]->iv, i, ad->ivtab[i]->ivlen);
 	      ad->ivtab[i]->ctx =
 		shishi_crypto (ad->h, ad->enckey, ad->ivtab[i]->keyusage,
@@ -1164,7 +1165,7 @@ do_shishi_login (int infd, struct auth_data *ad, const char **err_msg)
 	      break;
 	    default:
 	      ad->ivtab[i]->keyusage = SHISHI_KEYUSAGE_KCMD_DES + 6 - 4 * i;
-	      ad->ivtab[i]->iv = malloc (ad->ivtab[i]->ivlen);
+	      ad->ivtab[i]->iv = xmalloc (ad->ivtab[i]->ivlen);
 	      memset (ad->ivtab[i]->iv, 0, ad->ivtab[i]->ivlen);
 	      if (ad->protocol == 2)
 		ad->ivtab[i]->ctx =
diff --git a/src/rsh.c b/src/rsh.c
index 6f57c96..d7d164a 100644
--- a/src/rsh.c
+++ b/src/rsh.c
@@ -77,6 +77,7 @@
 #include <xalloc.h>
 #include <argp.h>
 #include <libinetutils.h>
+#include "xalloc.h"
 
 #ifdef KERBEROS
 # ifdef HAVE_KERBEROSIV_DES_H
@@ -381,7 +382,7 @@ try_connect:
 		    case SHISHI_DES_CBC_NONE:
 		    case SHISHI_DES3_CBC_HMAC_SHA1_KD:
 		      ivtab[i]->keyusage = SHISHI_KEYUSAGE_KCMD_DES;
-		      ivtab[i]->iv = malloc (ivtab[i]->ivlen);
+		      ivtab[i]->iv = xmalloc (ivtab[i]->ivlen);
 		      memset (ivtab[i]->iv,
 			      2 * i + 1 * (i < 2) - 4 * (i >= 2),
 			      ivtab[i]->ivlen);
@@ -401,7 +402,7 @@ try_connect:
 		    default:
 		      ivtab[i]->keyusage =
 			SHISHI_KEYUSAGE_KCMD_DES + 2 + 4 * i;
-		      ivtab[i]->iv = malloc (ivtab[i]->ivlen);
+		      ivtab[i]->iv = xmalloc (ivtab[i]->ivlen);
 		      memset (ivtab[i]->iv, 0, ivtab[i]->ivlen);
 		      ivtab[i]->ctx =
 			shishi_crypto (h, enckey, ivtab[i]->keyusage,
diff --git a/src/rshd.c b/src/rshd.c
index a9d25c8..e5df05f 100644
--- a/src/rshd.c
+++ b/src/rshd.c
@@ -96,6 +96,7 @@
 #include <progname.h>
 #include <argp.h>
 #include <libinetutils.h>
+#include "xalloc.h"
 
 #ifdef KERBEROS
 # ifdef HAVE_KERBEROSIV_DES_H
@@ -684,7 +685,7 @@ doit (int sockfd, struct sockaddr_in *fromp)
 		case SHISHI_DES_CBC_NONE:
 		case SHISHI_DES3_CBC_HMAC_SHA1_KD:
 		  ivtab[i]->keyusage = SHISHI_KEYUSAGE_KCMD_DES;
-		  ivtab[i]->iv = malloc (ivtab[i]->ivlen);
+		  ivtab[i]->iv = xmalloc (ivtab[i]->ivlen);
 		  memset (ivtab[i]->iv, 2 * i - 3 * (i >= 2),
 			  ivtab[i]->ivlen);
 		  ivtab[i]->ctx =
@@ -705,7 +706,7 @@ doit (int sockfd, struct sockaddr_in *fromp)
 		default:
 		  ivtab[i]->keyusage =
 		    SHISHI_KEYUSAGE_KCMD_DES + 4 * (i < 2) + 2 + 2 * (i % 2);
-		  ivtab[i]->iv = malloc (ivtab[i]->ivlen);
+		  ivtab[i]->iv = xmalloc (ivtab[i]->ivlen);
 		  memset (ivtab[i]->iv, 0, ivtab[i]->ivlen);
 		  if (protocol == 2)
 		    ivtab[i]->ctx =
diff --git a/src/syslogd.c b/src/syslogd.c
index a5b7e0b..f96ee85 100644
--- a/src/syslogd.c
+++ b/src/syslogd.c
@@ -124,6 +124,7 @@
 #include <libinetutils.h>
 #include <readutmp.h>
 #include "unused-parameter.h"
+#include "xalloc.h"
 
 /* A mask of all facilities mentioned explicitly in the configuration file
  *
@@ -970,7 +971,7 @@ crunch_list (char **oldlist, char *list)
     }
 
   /* take the last one */
-  oldlist[count] = (char *) malloc ((strlen (p) + 1) * sizeof (char));
+  oldlist[count] = (char *) xmalloc ((strlen (p) + 1) * sizeof (char));
   if (oldlist[count] == NULL)
     error (EXIT_FAILURE, errno, "can't allocate memory");
 
diff --git a/telnet/commands.c b/telnet/commands.c
index e6dec38..6a1be36 100644
--- a/telnet/commands.c
+++ b/telnet/commands.c
@@ -85,6 +85,7 @@
 
 #include "xalloc.h"
 #include "xvasprintf.h"
+#include "xalloc.h"
 
 #ifdef	ENCRYPTION
 # include <libtelnet/encrypt.h>
@@ -1895,7 +1896,7 @@ env_init (void)
       char *hostname = localhost ();
       char *cp2 = strchr ((char *) ep->value, ':');
 
-      cp = malloc (strlen (hostname) + strlen (cp2) + 1);
+      cp = xmalloc (strlen (hostname) + strlen (cp2) + 1);
       sprintf (cp, "%s%s", hostname, cp2);
 
       free (ep->value);
@@ -1928,7 +1929,7 @@ env_define (const char *var, unsigned char *value)
     }
   else
     {
-      ep = (struct env_lst *) malloc (sizeof (struct env_lst));
+      ep = (struct env_lst *) xmalloc (sizeof (struct env_lst));
       ep->next = envlisthead.next;
       envlisthead.next = ep;
       ep->prev = &envlisthead;
diff --git a/whois/whois.c b/whois/whois.c
index 9960773..07e1f7d 100644
--- a/whois/whois.c
+++ b/whois/whois.c
@@ -45,6 +45,7 @@
 /* Application-specific */
 #include <data.h>
 #include <whois.h>
+#include "xalloc.h"
 
 /* Global variables */
 int sockfd, verb = 0;
@@ -138,7 +139,7 @@ gwhois_argp_parser (int key, char *arg, struct argp_state *state)
   switch (key)
     {
     case 'h':
-      server = q = malloc (strlen (arg) + 1);
+      server = q = xmalloc (strlen (arg) + 1);
       for (p = arg; *p != '\0' && *p != ':'; *q++ = tolower (*p++));
       if (*p == ':')
 	port = p + 1;
@@ -410,7 +411,7 @@ queryformat (const char *server, const char *flags, const char *query)
   int isripe = 0;
 
   /* +10 for CORE; +2 for \r\n; +1 for NULL */
-  buf = malloc (strlen (flags) + strlen (query) + 10 + 2 + 1);
+  buf = xmalloc (strlen (flags) + strlen (query) + 10 + 2 + 1);
   *buf = '\0';
 
   isripe = is_ripe_server (ripe_servers, server)
@@ -521,7 +522,7 @@ query_crsnic (const int sock, const char *query)
   char *temp, buf[100], *ret = NULL;
   FILE *fi;
 
-  temp = malloc (strlen (query) + 1 + 2 + 1);
+  temp = xmalloc (strlen (query) + 1 + 2 + 1);
   *temp = '=';
   strcpy (temp + 1, query);
   strcat (temp, "\r\n");
@@ -539,7 +540,7 @@ query_crsnic (const int sock, const char *query)
 
 	  for (p = buf; *p != ':'; p++);	/* skip until colon */
 	  for (p++; *p == ' '; p++);	/* skip colon and spaces */
-	  ret = malloc (strlen (p) + 1);
+	  ret = xmalloc (strlen (p) + 1);
 	  for (q = ret; *p != '\n' && *p != '\r'; *q++ = *p++);	/*copy data */
 	  *q = '\0';
 	}

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

Summary of changes:
 .gitignore            |    1 +
 ChangeLog             |   51 +++++++++++++++++++++++++++++++++++++++++++++++++
 README-alpha          |    6 ++--
 configure.ac          |    2 +-
 ftp/cmds.c            |    5 ++-
 ifconfig/printif.c    |    3 +-
 libinetutils/kcmd.c   |    2 +
 libtelnet/kerberos5.c |    6 ++++-
 libtelnet/shishi.c    |    5 ++++
 src/rlogin.c          |    5 ++-
 src/rlogind.c         |    5 ++-
 src/rsh.c             |    5 ++-
 src/rshd.c            |    5 ++-
 src/syslogd.c         |    3 +-
 telnet/commands.c     |    5 ++-
 tests/.gitignore      |    1 +
 whois/whois.c         |    9 ++++---
 17 files changed, 96 insertions(+), 23 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Sat Mar 31 06:42:53 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1SDvll-0003UX-KS
	for mharc-commit-inetutils@gnu.org; Sat, 31 Mar 2012 06:42:53 -0400
Received: from eggs.gnu.org ([208.118.235.92]:58851)
	by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1SDvld-0003Sg-Nk
	for commit-inetutils@gnu.org; Sat, 31 Mar 2012 06:42:52 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ams@gnu.org>) id 1SDvlU-0005Pg-HM
	for commit-inetutils@gnu.org; Sat, 31 Mar 2012 06:42:45 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:57672)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1SDvlU-0005PP-Av
	for commit-inetutils@gnu.org; Sat, 31 Mar 2012 06:42:36 -0400
Received: from ams by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <ams@gnu.org>) id 1SDvlL-00083Q-Ni
	for commit-inetutils@gnu.org; Sat, 31 Mar 2012 10:42:34 +0000
Date: Sat, 31 Mar 2012 10:42:29 +0000
Message-Id: <E1SDvlL-00083Q-Ni@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_1-72-g8f92df2
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: fb27938e459a824d09f648bfa05ca3dad5f4cd02
X-Git-Newrev: 8f92df2bd52bcbddf8841e3b79d779109d485e5c
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 Mar 2012 10:42: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  8f92df2bd52bcbddf8841e3b79d779109d485e5c (commit)
       via  a1376ccecbc1c69dd312d33b1277195231af0469 (commit)
       via  143e3a69d6685083bc3928803f10510d0acd5a16 (commit)
       via  6f3a934df2759e1bbc7cf1998b7c33eec3d705ba (commit)
       via  97e598f08705de4797903452a25a86cf89a30e1a (commit)
       via  f5490a698f4b8c530240683cc029c0895897a627 (commit)
      from  fb27938e459a824d09f648bfa05ca3dad5f4cd02 (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=8f92df2bd52bcbddf8841e3b79d779109d485e5c


commit 8f92df2bd52bcbddf8841e3b79d779109d485e5c
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Sat Mar 31 12:39:58 2012 +0200

    configure.ac: Minor cleanup.

diff --git a/ChangeLog b/ChangeLog
index e005464..7bdd098 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2012-03-31  Alfred M. Szmidt  <ams@gnu.org>
 
+	configure.ac: Minor cleanup.
+
+	* configure.ac: Don't check for mkstemp, don't try to replace
+	strdup.
+	(long long, long double): Remove checks.
+	(AM_C_PROTOTYPES): Likewise.
+	(AC_FUNC_ALLOCA, AC_FUNC_MALLOC, AC_FUNC_REALLOC): Likewise.
+
+2012-03-31  Alfred M. Szmidt  <ams@gnu.org>
+
 	* Makefile.am (DISTCLEANFILES): Added $(PACKAGE)-$(VERSION).tar.xz
 	to list.
 
diff --git a/configure.ac b/configure.ac
index 96ccc91..47e8133 100644
--- a/configure.ac
+++ b/configure.ac
@@ -555,10 +555,6 @@ AC_CHECK_TYPE(sig_atomic_t, , AC_DEFINE([sig_atomic_t], int, [FIXME]),
   [IU_FLUSHLEFT([#include <sys/types.h>
                  #include <signal.h> ])])
 
-# Check for compile support for ceratin type
-AC_CHECK_TYPE(long long, , AC_DEFINE([LONG_LONG], long, [Define to long if compiler does not support]))
-AC_CHECK_TYPE(long double, , AC_DEFINE([LONG_DOUBLE], double, [Define to double if compiler does not support]))
-
 ### Checks for structures.
 IU_CHECK_MEMBERS([struct sockaddr_in.sin_len], , ,
     [ #include <sys/types.h>
@@ -614,18 +610,15 @@ IU_CHECK_WEAK_REFS
 
 ### Checks for library functions.
 AC_FUNC_CLOSEDIR_VOID
-AC_FUNC_ALLOCA
 AC_FUNC_SETVBUF_REVERSED
 AC_FUNC_FORK
 AC_FUNC_STRCOLL
 AC_FUNC_MMAP
-AC_FUNC_MALLOC
-AC_FUNC_REALLOC
 
 AC_CHECK_FUNCS(cfsetspeed cgetent dirfd fchdir flock \
                fork fpathconf ftruncate \
 	       getcwd getmsg getspnam initgroups initsetproctitle killpg \
-               mkstemp ptsname \
+               ptsname \
                setegid seteuid setpgid \
                setsid setregid setreuid setresgid setresuid setutent_r \
                sigaction sigvec strchr setproctitle tcgetattr tzset utimes \
@@ -635,7 +628,7 @@ AC_CHECK_FUNCS(cfsetspeed cgetent dirfd fchdir flock \
 
 # Functions that we will define if necessary.
 AC_REPLACE_FUNCS(getpass getusershell memcmp memcpy memmove memset \
-	         setenv strdup poll)
+		 strdup poll)
 
 # Look for the crypt function itself (in libcrypt if possible)
 _SAVE_LIBS="$LIBS"

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


commit a1376ccecbc1c69dd312d33b1277195231af0469
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Sat Mar 31 12:34:20 2012 +0200

    configure.ac: Replace M4 comments with `#'.  (silent change)

diff --git a/configure.ac b/configure.ac
index 3b3258d..96ccc91 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,11 +31,8 @@ AC_CANONICAL_HOST
 
 AM_INIT_AUTOMAKE([1.11.1 dist-xz])
 
-# config.h turns this on, so make sure it's on for our tests too
-#CPPFLAGS=-D_BSD_SOURCE
-
-dnl For now, we always use libexecdir; later we may want to vary where the
-dnl daemons go.
+# For now, we always use libexecdir; later we may want to vary where
+# the daemons go.
 inetdaemondir='$(libexecdir)'
 AC_SUBST(inetdaemondir)
 
@@ -122,7 +119,7 @@ IU_ENABLE_CLIENT(traceroute)
 
 AM_INIT_AUTOMAKE
 
-AM_SILENT_RULES([yes]) # make --enable-silent-rules the default.
+AM_SILENT_RULES([yes])
 
 AC_ISC_POSIX
 
@@ -166,17 +163,18 @@ if test "$gl_cv_lib_readline" = no; then
   ftp_INSTALL_HOOK=''
 fi
 
-dnl See if there's a separate libcrypt (many systems put crypt there)
+# See if there's a separate libcrypt (many systems put crypt there).
 AC_CHECK_LIB(crypt, crypt, LIBCRYPT=-lcrypt)
 AC_SUBST(LIBCRYPT)
 
-dnl libutil is a 4.4BSD library that defines several functions handy for
-dnl inetutil daemons, doing such things as utmp frobbing, and pty setup.
+# libutil is a 4.4BSD library that defines several functions handy for
+# inetutils daemons, doing such things as utmp frobbing, and pty
+# setup.
 AC_CHECK_LIB(util, logout, LIBUTIL=-lutil)
 AC_SUBST(LIBUTIL)
 
-# Check if they want support for PAM.  Certain daemons like
-# ftpd have support for it.
+# Check if they want support for PAM.  Certain daemons like ftpd have
+# support for it.
 
 # See if we have libpam.a this is for ftpd.
 if test "$with_pam" = yes ; then
@@ -200,7 +198,7 @@ fi
 AC_SUBST(LIBLS)
 AC_SUBST(libls_BUILD)
 
-dnl At least OpenSolaris is missing <protocols/talkd.h>.
+# At least OpenSolaris is missing <protocols/talkd.h>.
 AC_CHECK_HEADER(protocols/talkd.h, , ,
   [IU_FLUSHLEFT([#include <sys/types.h>
 		 #include <sys/socket.h>])])
@@ -227,9 +225,9 @@ else
   talk_BUILD=''
 fi
 
-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).
+# FIXME: Presently rshd and rlogind prefer iruserok(3), which is not
+# universally available.  Replacement code?  A fallback is being built
+# from ruserok(3) and inet_ntoa(3).
 AC_CHECK_FUNC(iruserok, , , [#include <netdb.h>])
 AC_CHECK_FUNC(ruserok, , , [#include <netdb.h>])
 if test "$ac_cv_func_iruserok" = yes; then
@@ -248,7 +246,7 @@ else
 fi
 
 
-dnl FIXME: Make this test case a bit more robust. Remove KRB4
+# FIXME: Make this test case a bit more robust.  Remove KRB4
 LIBAUTH=
 INCAUTH=
 if test "$enable_encryption" = yes \
@@ -269,7 +267,7 @@ if test "$enable_encryption" = yes \
       AC_CHECK_LIB(des, des_key_sched,
                    [LIBAUTH="$LIBAUTH -ldes"],
                    -L$KERBEROS_DIR)
-      dnl FIXME: Fix this to one test case.
+      # FIXME: Fix this to one test case.
       test "$enable_authentication" = yes \
       && test "$ac_cv_lib_krb_krb_mk_req" = yes \
       && AC_DEFINE([KRB4])
@@ -313,7 +311,7 @@ fi
 AC_SUBST(LIBAUTH)
 AC_SUBST(INCAUTH)
 
-dnl Define CPP macros that enable auth/encrypt code
+# Define CPP macros that enable auth/encrypt code
 if test ".$LIBAUTH" != .; then
   test "$enable_authentication" = yes && AC_DEFINE([AUTHENTICATION], 1,
                    [Define to one if you want authentication.])
@@ -321,7 +319,7 @@ if test ".$LIBAUTH" != .; then
                    [Define to one if you want encryption.])
 fi
 
-dnl Checks for IPv6 support.
+# Checks for IPv6 support.
 
 AC_ARG_ENABLE([ipv6],
   AS_HELP_STRING([--disable-ipv6], [disable IPv6 support]),
@@ -470,13 +468,12 @@ else
 fi
 
 
-dnl Check if they want support for Wrap.  Certain daemons like
-dnl ftpd have support for it.
+# Check if they want support for Wrap.  Certain daemons like ftpd have
+# support for it.
 
 if test "$with_wrap" = yes; then
-dnl See if we have libwrap.a
-dnl we cannot use AC_CHECK_LIB reliably since for the wrap lib
-dnl you have to define some global variables
+# See if we have libwrap.a we cannot use AC_CHECK_LIB reliably since
+# for the wrap lib you have to define some global variables
 #AC_CHECK_LIB(wrap, hosts_ctl, LIBWRAP=-lwrap)
   AC_CHECK_HEADERS([tcpd.h])
   AC_MSG_CHECKING(hosts_ctl in -lwrap);
@@ -496,6 +493,7 @@ fi
 AC_SUBST(LIBWRAP)
 
 ### Checks for header files.
+
 AC_HEADER_STDC
 AC_HEADER_TIME
 AC_HEADER_DIRENT
@@ -531,7 +529,8 @@ AC_CHECK_HEADERS([arpa/nameser.h com_err.h des.h errno.h fcntl.h features.h \
 )
 
 ### Checks for types.
-dnl Checks return type of signal handlers
+
+# Checks return type of signal handlers
 AC_TYPE_SIGNAL
 
 AC_CHECK_TYPE(socklen_t, ,
@@ -545,17 +544,18 @@ AC_CHECK_TYPES(struct if_nameindex, , ,
                  #include <sys/socket.h>
                  #include <net/if.h>])])
 
-dnl sigset_t is a set of signals (4.4BSD)
+# sigset_t is a set of signals (4.4BSD)
 AC_CHECK_TYPE(sigset_t, , AC_DEFINE([sigset_t], unsigned long, [FIXME]),
   [IU_FLUSHLEFT([#include <sys/types.h>
                  #include <signal.h> ])])
 
-dnl I'm not sure what this is, but netbsd has it; just use int if necessary.
+# I'm not sure what this is, but netbsd has it; just use int if
+# necessary.
 AC_CHECK_TYPE(sig_atomic_t, , AC_DEFINE([sig_atomic_t], int, [FIXME]),
   [IU_FLUSHLEFT([#include <sys/types.h>
                  #include <signal.h> ])])
 
-dnl Check for compile support for ceratin type
+# Check for compile support for ceratin type
 AC_CHECK_TYPE(long long, , AC_DEFINE([LONG_LONG], long, [Define to long if compiler does not support]))
 AC_CHECK_TYPE(long double, , AC_DEFINE([LONG_DOUBLE], double, [Define to double if compiler does not support]))
 
@@ -592,23 +592,24 @@ IU_CHECK_MEMBERS([struct hostent.h_addr_list], , , [#include <netdb.h>])
 
 IU_CHECK_MEMBERS([struct stat.st_blksize])
 
-dnl OpenSolaris does not use a union for `struct tftphdr.th_u'.
-dnl As a consequence `struct tftphdr.th_stuff' is a macro
-dnl resolving to a `ushort_t'. BSD and Linux produce `char *'.
+# OpenSolaris does not use a union for `struct tftphdr.th_u'.  As a
+# consequence `struct tftphdr.th_stuff' is a macro resolving to a
+# `ushort_t'.  BSD and Linux produce `char *'.
 IU_CHECK_MEMBERS([struct tftphdr.th_u], , ,
 		 [#include <sys/types.h>
 		  #include <sys/socket.h>
 		  #include <arpa/tftp.h>])
 
 ### Checks for compiler characteristics.
-AM_C_PROTOTYPES dnl FIXME: Does inetutils even compile on pre-ANSI compilers?
+AM_C_PROTOTYPES # FIXME: Does inetutils even compile on pre-ANSI
+		# compilers?
 AC_C_CONST
 
-dnl See if `weak refs' are possible; these make it possible (with shared
-dnl libraries) to check for the existance of a standard function at run-time
-dnl instead of compile time, which is very handy for distributing binary
-dnl version programs that automatically adapt -- in inetutils case, to whether
-dnl or not crypt is available.
+# See if `weak refs' are possible; these make it possible (with shared
+# libraries) to check for the existance of a standard function at
+# run-time instead of compile time, which is very handy for
+# distributing binary version programs that automatically adapt -- in
+# inetutils case, to whether or not crypt is available.
 IU_CHECK_WEAK_REFS
 
 ### Checks for library functions.
@@ -632,11 +633,11 @@ AC_CHECK_FUNCS(cfsetspeed cgetent dirfd fchdir flock \
                updwtmp updwtmpx vhangup wait3 wait4 opendir2 \
 	       __rcmd_errstr __check_rhosts_file )
 
-dnl Functions that we will define if necessary.
+# Functions that we will define if necessary.
 AC_REPLACE_FUNCS(getpass getusershell memcmp memcpy memmove memset \
 	         setenv strdup poll)
 
-dnl Look for the crypt function itself (in libcrypt if possible)
+# Look for the crypt function itself (in libcrypt if possible)
 _SAVE_LIBS="$LIBS"
 LIBS="$LIBCRYPT $LIBS"
 AC_CHECK_FUNCS(crypt)
@@ -644,28 +645,29 @@ LIBS="$_SAVE_LIBS"
 
 AC_CHECK_FUNC(_obstack_free)
 
-dnl Use (posix) `setpgid' if it's around, otherwise assume a BSD setpgrp
+# Use (posix) `setpgid' if it's around, otherwise assume a BSD setpgrp
 AC_CHECK_FUNC(setpgid, , AC_DEFINE([setpgid], setpgrp,
                           [Define to `setpgrp' if you don't have `setpgid'.]))
 
-dnl We use our own version of getopt (including our own header file) if the
-dnl system one doesn't have getopt_long.
+# We use our own version of getopt (including our own header file) if
+# the system one doesn't have getopt_long.
 AC_CHECK_FUNC(getopt_long)
 
 AC_CHECK_HEADER(poll.h)
 
-dnl See if snprintf exists, otherwise just use a bogus version
+# See if snprintf exists, otherwise just use a bogus version
 AC_CHECK_FUNC(snprintf,
   [AC_DEFINE([HAVE_SNPRINTF], 1, [Define to one if you have snprintf])])
 
-dnl See if vsnprintf exists, otherwise use our own.
+# See if vsnprintf exists, otherwise use our own.
 AC_CHECK_FUNC(vsnprintf,
   [AC_DEFINE([HAVE_VSNPRINTF], 1, [Define to one if you have vsnprintf])])
 
-dnl See if the system has strerror, and replace it if not
+# See if the system has strerror, and replace it if not
 AC_CHECK_FUNC(strerror)
 if test "$ac_cv_func_strerror" = no; then
-  # No strerror, so see if the SYS_ERRLIST variable can be used by ours
+  # No strerror, so see if the SYS_ERRLIST variable can be used by
+  # ours
   AC_CHECK_FUNC(sys_errlist, AC_DEFINE([HAVE_SYS_ERRLIST], 1,
                               [Define to one if you have sys_errlist.]))
   if test "$ac_cv_func_sys_errlist" = yes; then
@@ -675,7 +677,7 @@ if test "$ac_cv_func_strerror" = no; then
   fi
 fi
 
-dnl See if the system has hstrerror, and replace it if not
+# See if the system has hstrerror, and replace it if not
 AC_CHECK_FUNC(hstrerror)
 if test "$ac_cv_func_hstrerror" = yes; then
   AC_CHECK_DECL(hstrerror, , , [#include <netdb.h>])
@@ -688,24 +690,25 @@ else
 fi
 if test "$ac_cv_func_hstrerror" = yes \
    || test "$ac_cv_func_h_errlist" = yes; then
-  # If there's a system hstrerror, or we can reasonably replace it, say so.
-  # We still provide some definition, regardless, but this allows people to use
-  # a reasonable alternative if the situation allows, rather than using a
-  # degenerate version that only says `Host lookup error N'.
+  # If there's a system hstrerror, or we can reasonably replace it,
+  # say so.  We still provide some definition, regardless, but this
+  # allows people to use a reasonable alternative if the situation
+  # allows, rather than using a degenerate version that only says
+  # `Host lookup error N'.
   AC_DEFINE([HAVE_HSTRERROR], 1, [Define to one if you have hstrerror.])
 fi
 
-dnl OpenSolaris does not provide an external reference.
+# 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.
+# NetBSD does include an external reference.
 AC_CHECK_DECLS(telopts, , ,
   [IU_FLUSHLEFT([#undef TELOPTS
                  #include <arpa/telnet.h>])])
 
-dnl OpenSolaris provides Schedule and Session_Key.
+# OpenSolaris provides Schedule and Session_Key.
 AC_CHECK_TYPE(Schedule,
   AC_DEFINE([HAVE_ARPA_TELNET_H_SCHEDULE], 1,
 	    [Define to one if <arpa/telnet.h> defines a type Schedule.]), ,
@@ -721,14 +724,15 @@ AC_DECL_SYS_SIGLIST
 
 AC_CHECK_DECLS(crypt, , , [#include <unistd.h>])
 
-dnl EWOULDBLOCK is more or less the BSD version of posix EAGAIN.
+# EWOULDBLOCK is more or less the BSD version of posix EAGAIN.
 IU_CHECK_MACRO(EWOULDBLOCK, [#include <errno.h>], , ,
   AC_DEFINE([EWOULDBLOCK], EAGAIN, 1, [FIXME]))
 AC_CHECK_DECLS(errno, , , [#include <errno.h>])
 
-dnl See whether <syslog.h> will declare special internal stuff if we define
-dnl SYSLOG_NAMES before including it.  We check for various syslog internal
-dnl macros, the typedef `CODE', and the variable `prioritynames'.
+# See whether <syslog.h> will declare special internal stuff if we
+# define SYSLOG_NAMES before including it.  We check for various
+# syslog internal macros, the typedef `CODE', and the variable
+# `prioritynames'.
 define([iu_syslog_includes],
   [[#include <stdlib.h>
     #define SYSLOG_NAMES
@@ -742,8 +746,8 @@ IU_CHECK_MACRO(syslog internal macros,
       iu_syslog_includes), , iu_syslog_includes),)
 undefine([iu_syslog_includes])
 
-dnl Some systems don't declare common functions (especially if they return
-dnl int), at least in the expected header file.  Check.
+# Some systems don't declare common functions (especially if they
+# return int), at least in the expected header file.  Check.
 AC_CHECK_DECLS([fclose, pclose], , , [#include <stdio.h>])
 AC_CHECK_DECLS([getcwd, getlogin, getpass, getusershell, ttyname], , ,
                [#include <unistd.h>])
@@ -757,28 +761,29 @@ AC_CHECK_DECLS(htons, , ,
                  #endif
                  #include <netinet/in.h> ])])
 
-dnl Our home-grown version of setenv needs to use ENVIRON
+# Our home-grown version of setenv needs to use ENVIRON
 AC_CHECK_DECLS(environ, , ,
   [IU_FLUSHLEFT([#include <unistd.h>
                  #include <stdlib.h>])])
 
-dnl See if we have h_errno (the test is here so we can use -lresolv
-dnl if necessary).
+# See if we have h_errno (the test is here so we can use -lresolv if
+# necessary).
 AC_CACHE_CHECK([for h_errno], inetutils_cv_var_h_errno,
   AC_TRY_COMPILE([#include <netdb.h>],
     [ extern int h_errno; int iu_x = h_errno; ],
     inetutils_cv_var_h_errno=yes, inetutils_cv_var_h_errno=no))
 if test "$inetutils_cv_var_h_errno" = yes; then
-  dnl FIXME: Isn't this wrong? Shouldn't the declaration check define
-  dnl        this if we find h_errno?
+  # FIXME: Isn't this wrong? Shouldn't the declaration check define
+  #        this if we find h_errno?
   AC_DEFINE([HAVE_H_ERRNO], 1, [Define to one if you have h_errno.])
   AC_CHECK_DECL(h_errno, , , [#include <netdb.h>])
 fi
 
 ## Checks for CPP macros.
-dnl Look for the posix SEEK_ macros (for lseek), and if not found, try the
-dnl similar berkeley L_ macros; if neither can be found, use the classic unix
-dnl values.
+
+# Look for the posix SEEK_ macros (for lseek), and if not found, try
+# the similar berkeley L_ macros; if neither can be found, use the
+# classic unix values.
 IU_CHECK_MACRO(SEEK_ macros,
   [#include <unistd.h>], SEEK_SET SEEK_CUR SEEK_END,
   :,
@@ -791,7 +796,8 @@ IU_CHECK_MACRO(SEEK_ macros,
     AC_DEFINE([SEEK_CUR], 1, [FIXME])
     AC_DEFINE([SEEK_END], 2, [FIXME])))
 
-dnl Look for the posix _FILENO macros; if not found, use the classic unix values.
+# Look for the posix _FILENO macros; if not found, use the classic
+# unix values.
 IU_CHECK_MACRO(_FILENO macros,
   [#include <unistd.h>], STDIN_FILENO STDOUT_FILENO STDERR_FILENO,
   :,
@@ -799,7 +805,8 @@ IU_CHECK_MACRO(_FILENO macros,
   AC_DEFINE([STDOUT_FILENO], 1, [FIXME])
   AC_DEFINE([STDERR_FILENO], 2, [FIXME]))
 
-dnl See where to find fd_set (bit-vectors for select) manipulation macros.
+# See where to find fd_set (bit-vectors for select) manipulation
+# macros.
 IU_CHECK_MACRO(fd_set macros, [#include <sys/types.h>],
   FD_ZERO FD_CLR FD_SET FD_ISSET)
 if test "$inetutils_cv_macro_fd_set_macros" = no; then
@@ -807,14 +814,14 @@ if test "$inetutils_cv_macro_fd_set_macros" = no; then
     FD_ZERO FD_CLR FD_SET FD_ISSET)
 fi
 
-dnl Set convinience variables for inetutils.
+# Set convinience variables for inetutils.
 iu_LIBRARIES='$(top_builddir)/libinetutils/libinetutils.a $(top_builddir)/lib/libgnu.a'
 iu_INCLUDES='-I$(top_srcdir)/lib -I$(top_builddir)/lib -I$(top_srcdir)/libinetutils'
 AC_SUBST(iu_LIBRARIES)
 AC_SUBST(iu_INCLUDES)
 
-dnl Configure paths used by inetutils programs.  See the file `paths' for
-dnl details.
+# Configure paths used by inetutils programs.  See the file `paths'
+# for details.
 PATHDEFS_MAKE=pathdefs.make
 PATHS_DEFS=paths.defs
 IU_CONFIG_PATHS($srcdir/paths, PATHDEFS_MAKE, PATHS_DEFS)
@@ -822,10 +829,10 @@ AH_BOTTOM(
 [/* Defaults for PATH_ variables.  */
 #include <confpaths.h>])
 
-dnl Ok this is the end of the rope, even autoconf can't help.
-dnl For example on certain system login(1) will not work if we
-dnl don't have an entry in utmpx.
-dnl Also for some OS they are better handle with STREAMS
+# Ok this is the end of the rope, even autoconf can't help.  For
+# example on certain system login(1) will not work if we don't have an
+# entry in utmpx.  Also for some OS they are better handle with
+# STREAMS.
 case "$host" in
 *olaris*)
   AC_DEFINE([SOLARIS], 1, [FIXME])

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


commit 143e3a69d6685083bc3928803f10510d0acd5a16
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Sat Mar 31 12:24:34 2012 +0200

    README-alpha: Updated.  (silent change)

diff --git a/README-alpha b/README-alpha
index 5f8883d..a5605d2 100644
--- a/README-alpha
+++ b/README-alpha
@@ -3,15 +3,15 @@ Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
 See end of file for copying conditions.
 
-This document describes the actions needed to build the pre-release or
-Git version of the package.
+This document describes the actions needed to build GNU inetutils from
+a pre-release tarball or sources checked out from the version control.
 
 * Introduction
 
 This is a *pre-release* version, and not ready for production use yet.
-If you are taking source from Git, you will need to have several
-special tools to help contribute.  See chapter `Building', below,
-for the detailed instructions on how to build the package.
+If you are taking source from version control, you will need to have
+several special tools to help contribute.  See the section `Building',
+below, for the detailed instructions on how to build the package.
 
 Please, note that the accompanying documentation may be inaccurate or
 incomplete.  See ChangeLog for the list of recent changes.
@@ -27,21 +27,21 @@ it or got back to you, please let us know!
 * Checking Out the Sources
 
 The following instructions apply if you wish to obtain sources from
-the Git repository:
+the version control repository.
 
-To clone the source tree from the repository, issue the following command:
+To download the source tree from the repository, issue the following
+command:
 
   git clone git://git.savannah.gnu.org/inetutils.git
 
-This will give you read-only access.  If you think you need write access,
-contact the mailing list.
+This will give you read-only access.  If you think you need write
+access, contact the mailing list.
 
 * Prerequisites
 
-You need the following packages to build the development version of
-GNU Inetutils.  We don't make any extra effort to accommodate older
-versions of these packages, so please make sure that you have the
-latest stable version.
+You need the following packages, we don't make any extra effort to
+accommodate older versions of these packages, so please make sure that
+you have the latest stable version.
 
 - Autoconf <http://www.gnu.org/software/autoconf/>
 - Automake <http://www.gnu.org/software/automake/>
@@ -64,11 +64,10 @@ latest stable version.
 Once done, proceed as described in the file INSTALL.
 
 Normally you will have to run bootstrap only once.  However, if you
-intend to hack on Inetutils, you might need to run it again later.  In
-this case, you will probably want to save some time and bandwidth by
-avoiding downloading the same files again.  If so, create in the
-inetutils root directory the file named `.bootstrap' with the
-following contents:
+intend to hack, you might need to run it again later.  In this case,
+you will probably want to save some time and bandwidth by avoiding
+downloading the same files again.  If so, create in the top level
+directory the file named `.bootstrap' with the following contents:
 
    --gnulib-srcdir=$HOME/gnulib --skip-po
 
@@ -86,18 +85,20 @@ See INSTALL and README for the detailed instructions.
 * Development
 
 If you are looking for something to hack on, please take a look at the
-TODO file in the Git repository.
+TODO file in the repository, or in our bug tracker
+<https://savannah.gnu.org/bugs/?group=inetutils>.
 
-You can track the development process through the <commit-inetutils@gnu.org>
-mailing list.  This is a medium volume moderated list.
+You can track the development process through the
+<commit-inetutils@gnu.org> mailing list.  This is a medium volume
+moderated list.
 
-Daily snapshots built from Git are available from
+Daily snapshots built are available from
 <http://hydra.nixos.org/view/gnu/inetutils-master/latest>.
 
 Log outputs from building the daily snapshot on some systems are
 available from <http://autobuild.josefsson.org/inetutils/>
 
-Statistics based on Git commit logs are available from
+Statistics based on commit logs are available from
 <http://gitstats.josefsson.org/inetutils/>.
 
 * Release procedures
@@ -106,7 +107,7 @@ Statistics based on Git commit logs are available from
 
 To make an release issue the following commands:
 
-make alpha        # or stable
+  make alpha        # or stable
 
 Finally, bump the version number in NEWS, and configure.ac.
 
@@ -119,15 +120,13 @@ When doing a stable release, do not forget to:
 
 ** Announcement template
 
-Subject: inetutils-VERSION released
+Subject: GNU inetutils VERSION released
 
 The GNU inetutils team is proud to present version VERSION of the GNU
-network utilities suite.  The GNU network utilities suite provides the
-following tools: ftp(d), hostname, ifconfig, inetd, logger, ping, rcp,
-rexec(d), rlogin(d), rsh(d), syslogd, talk(d), telnet(d), tftp(d),
-traceroute, uucpd, and whois.
+networking utilities.  The GNU Networking Utilities are the common
+networking utilities, clients and servers of the GNU Operating System.
 
-The following things are new in this release:
+The following is new in this release:
 
 FIXME: put recent NEWS items here
 
@@ -142,9 +141,9 @@ Here are the GPG detached signatures[*]:
 To reduce load on the main server, use a mirror listed at:
   http://www.gnu.org/order/ftp.html
 
-[*] You can use either of the above signature files to verify that
-the corresponding file (without the .sig suffix) is intact.  First,
-be sure to download both the .sig file and the corresponding tarball.
+[*] You can use either of the above signature files to verify that the
+corresponding file (without the .sig suffix) is intact.  First, be
+sure to download both the .sig file and the corresponding tarball.
 Then, run a command like this:
 
   gpg --verify inetutils-VERSION.tar.xz.sig
@@ -161,15 +160,10 @@ hacking!
 
 * Copyright information
 
-Permission is granted to anyone to make or distribute verbatim copies
-of this document as received, in any medium, provided that the
-copyright notice and this permission notice are preserved,
-thus giving the recipient permission to redistribute in turn.
-
-Permission is granted to distribute modified versions
-of this document, or of portions of it,
-under the above conditions, provided also that they
-carry prominent notices stating who last changed them.
+Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without any warranty.
 
 Local Variables:
 mode: outline

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


commit 6f3a934df2759e1bbc7cf1998b7c33eec3d705ba
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Sat Mar 31 12:15:13 2012 +0200

    README: Updated.  (silent change)

diff --git a/README b/README
index f5c2588..91cf5ac 100644
--- a/README
+++ b/README
@@ -1,6 +1,7 @@
-GNU inetutils - The GNU Network Utilities
+GNU inetutils - The GNU Networking Utilities
 
-This is a distribution of common networking utilities and servers.
+The GNU Networking Utilities are the common networking utilities,
+clients and servers of the GNU Operating System.
 
 The individual utilities were originally derived from the 4.4BSDLite2
 distribution.  Many features were integrated from NetBSD, OpenBSD,
@@ -39,8 +40,8 @@ Some known deficiencies:
 
  - Non-Shishi Kerberos support does not build.  Patches welcome.
 
- - Shishi Kerberos support is only implemented for 'rlogin', 'rlogind',
-   'rsh', 'rshd', 'telnet', and 'telnetd'.
+ - Shishi Kerberos support is only implemented for 'rlogin',
+   'rlogind', 'rsh', 'rshd', 'telnet', and 'telnetd'.
 
  - Not all utilities are Kerberized even when built with Kerberos
    libraries, including 'rcp'.

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


commit 97e598f08705de4797903452a25a86cf89a30e1a
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Sat Mar 31 12:11:16 2012 +0200

    Makefile.am (DISTCLEANFILES): Added $(PACKAGE)-$(VERSION).tar.xz to list.

diff --git a/ChangeLog b/ChangeLog
index 789ba4a..e005464 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-31  Alfred M. Szmidt  <ams@gnu.org>
+
+	* Makefile.am (DISTCLEANFILES): Added $(PACKAGE)-$(VERSION).tar.xz
+	to list.
+
 2012-03-29  Alfred M. Szmidt  <ams@gnu.org>
 
 	* tests/.gitignore: Added tools.sh to list.
diff --git a/Makefile.am b/Makefile.am
index a34c914..3efee5f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,7 +26,8 @@ SUBDIRS = lib \
 	doc man \
 	tests
 
-DISTCLEANFILES = pathdefs.make paths.defs $(PACKAGE)-$(VERSION).tar.gz
+DISTCLEANFILES = pathdefs.make paths.defs \
+	$(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)-$(VERSION).tar.xz
 
 BUILT_SOURCES = $(top_srcdir)/.version
 $(top_srcdir)/.version:

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


commit f5490a698f4b8c530240683cc029c0895897a627
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Sat Mar 31 12:10:25 2012 +0200

    ChangeLog: Formating fixes.  (silent change)

diff --git a/ChangeLog b/ChangeLog
index 69375b7..789ba4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,72 +16,65 @@
 
 	* whois/whois.c: Include "xalloc.h".
 	(gwhois_argp_parser, queryformat): Use xmalloc over malloc.
-
 	* telnet/commands.c: Include "xalloc.h".
 	(env_init, env_define): Use xmalloc over malloc.
-
 	* src/syslogd.c: Include "xalloc.h".
 	(crunch_list): Use xmalloc over malloc.
-
 	* src/rshd.c: Include "xalloc.h".
 	(doit): Use xmalloc over malloc.
-
 	* src/rsh.c: Include "xalloc.h".
 	(main): Use xmalloc over malloc.
-
 	* src/rlogind.c: Include "xalloc.h".
 	(do_shishi_login): Use xmalloc over malloc.
-
 	* src/rlogin.c: Include "xalloc.h".
 	(main): Use xmalloc over malloc.
-
 	* libtelnet/shishi.c (krb5shishi_send): Check return code of
 	malloc.
-
 	* libtelnet/kerberos5.c (kerberos5_send): Don't use assert to
 	check the return code for malloc
-
 	* libinetutils/kcmd.c (kcmd): Check return code of malloc.
-
 	* ifconfig/printif.c: Include "xalloc.h".
 	(print_interfaceX): Use xmalloc over malloc.
-
 	* ftp/cmds.c: Include "xalloc.h".
 	(dotrans, domap): Use xmalloc over malloc.
 
 2012-03-21  Mats Erik Andersson  <gnu@gisladisker.se>
 
-	* configure.ac (DD, MKTEMP, NETSTAT): New variables.  Use AC_PATH_PROG
-	on `dd', `mktemp', and `netstat'.  Declare as precious with AC_ARG_VAR.
-	(SED): New variable.  Set using AC_PROG_SED, protect by AC_ARG_VAR.
+	* configure.ac (DD, MKTEMP, NETSTAT): New variables.  Use
+	AC_PATH_PROG on `dd', `mktemp', and `netstat'.  Declare as
+	precious with AC_ARG_VAR.
+	(SED): New variable.  Set using AC_PROG_SED, protect by
+	AC_ARG_VAR.
 	(GREP): Protect using AC_ARG_VAR.
 	* tests/Makefile.am (BUILT_SOURCES, EXTRA_DIST, CLEANFILES)
 	(tools_subst): New variables.
 	(tools.sh): New target.
 	* tests/ftp-localhost.sh: Source `tools.sh'.  Use $GREP, $MKTEMP,
-	$NETSTAT, and $SED instead of utility names.  Change tests for `grep',
-	and `netstat'; check $need_mktemp.
-	(FTPHOME): Check also fifth field of passwd, should GECOS be missing.
+	$NETSTAT, and $SED instead of utility names.  Change tests for
+	`grep', and `netstat'; check $need_mktemp.
+	(FTPHOME): Check also fifth field of passwd, should GECOS be
+	missing.
 	(USER): Calculate using `func_id_user'.
-	* tests/hostname.sh: Source `tools.sh'.  `func_id_uid` replaces `id -u'.
+	* tests/hostname.sh: Source `tools.sh'.  `func_id_uid` replaces
+	`id -u'.
 	* tests/ping-localhost.sh: Likewise.
 	* tests/traceroute-localhost.sh: Likewise.
 	* tests/syslogd.sh: Check directory early, then source `tools.sh'.
-	Check $need_mktemp and $need_netstat.  Use $SED, $MKTEMP, $NETSTAT,
-	and $GREP.  Replace `id -u' by `func_id_uid'.
-	* tests/telnet-localhost.sh: Source `tools.sh'.  Check $need_mktemp.
-	Use $SED, $MKTEMP, and $GREP.
+	Check $need_mktemp and $need_netstat.  Use $SED, $MKTEMP,
+	$NETSTAT, and $GREP.  Replace `id -u' by `func_id_uid'.
+	* tests/telnet-localhost.sh: Source `tools.sh'.  Check
+	$need_mktemp.  Use $SED, $MKTEMP, and $GREP.
 	(USER): Compute using `func_id_user'.
 	* tests/tftp.sh: Source `tools.sh'.  Check $need_dd, $need_mktemp,
-	and $need_netstat.  Remove checks for `netstat' and `grep'.  Use $SED,
-	$MKTEMP, $NETSTAT, $GREP, and $DD.
+	and $need_netstat.  Remove checks for `netstat' and `grep'.  Use
+	$SED, $MKTEMP, $NETSTAT, $GREP, and $DD.
 	(USER): Compute using `func_id_user'.
 	* tests/tools.sh.in: New file.
 
 2012-03-20  Mats Erik Andersson  <gnu@gisladisker.se>
 
-	* am/libcurses.m4 (IU_LIB_TERMCAP) <termlib detection>: Add a missing
-	use of `test'.
+	* am/libcurses.m4 (IU_LIB_TERMCAP) <termlib detection>: Add a
+	missing use of `test'.
 	(HAVE_TERMLIB_TGETENT): New macro, replaces HAVE_TERMINFO_TGETENT.
 
 2012-03-15  Simon Josefsson  <simon@josefsson.org>
@@ -100,8 +93,8 @@
 
 2012-03-15  Mats Erik Andersson  <gnu@gisladisker.se>
 
-	* tests/dnsdomainname.sh: Replace `! test -x' by `test ! -x'
-	for shell portability.
+	* tests/dnsdomainname.sh: Replace `! test -x' by `test ! -x' for
+	shell portability.
 
 2012-03-14  Simon Josefsson  <simon@josefsson.org>
 
@@ -112,20 +105,21 @@
 
 	Make explicit dependency on header files for libwrap and termcap.
 
-	* am/libcurses.m4 (IU_LIB_TERMCAP): Check whether tgetent() is really
-	declared in <termcap.h>, not only checking presence of <termcap.h>.
-	That failing, check declaration of tgetent() using the pair <curses.h>,
-	and <term.h>.  In case of no successful detection at all, set LIBTERMCAP
-	to empty.
+	* am/libcurses.m4 (IU_LIB_TERMCAP): Check whether tgetent() is
+	really declared in <termcap.h>, not only checking presence of
+	<termcap.h>.  That failing, check declaration of tgetent() using
+	the pair <curses.h>, and <term.h>.  In case of no successful
+	detection at all, set LIBTERMCAP to empty.
 	* configure.ac (LIBWRAP): Define only if hosts_ctl() is present in
 	libwrap and also the header <tcpd.h> exists.
 
 2012-03-13  Mats Erik Andersson  <gnu@gisladisker.se>
 
-	* src/traceroute.c (do_try): When displaying traces, print host name
-	only if in resolving mode; otherwise only numerical address.  Insert
-	one additional blank before time printout.
-	(get_hostname): Remove conditional clause on OPT_RESOLVE_HOSTNAMES.
+	* src/traceroute.c (do_try): When displaying traces, print host
+	name only if in resolving mode; otherwise only numerical address.
+	Insert one additional blank before time printout.
+	(get_hostname): Remove conditional clause on
+	OPT_RESOLVE_HOSTNAMES.
 
 2012-03-12  Simon Josefsson  <simon@josefsson.org>
 
@@ -143,30 +137,32 @@
 
 2012-03-10  Mats Erik Andersson  <gnu@gisladisker.se>
 
-	* whois/tld_serv_list (.cz, .fo, .gl, .gs, .hk, .ie, .il, .in, .is)
-	(.jp, .kr, .kz, .lt, .lu, .lv, .ms, .mx, .ng, .nz, .pe, .pl, .ro, .ru)
-	(.se, .sg, .si, .sk, .sm, .su, .tf, .th, .tr, .tw, .us): Updated entry.
-	(.dz, .ec, .es, .eu, .fi, .gd, .gg, .gi, .gy, .hn, .hr, .ht, .im, .io)
-	(.ir, .je, .ke, .la, .ly, .ma, .md, .me, .mg, .mn, .mp, .mu, .my, .na)
-	(.nc, .nf, .pm, .pr, .pt, .qa, .re, .rs, .sa, .sb, .sc, .so, .sx, .tk)
-	(.tl, .tv, .tz, .ua, .uy, .uz, .vc, .ve, .wf, .yt): New or upgraded
-	from web entry.
+	* whois/tld_serv_list (.cz, .fo, .gl, .gs, .hk, .ie, .il, .in)
+	(.is, .jp, .kr, .kz, .lt, .lu, .lv, .ms, .mx, .ng, .nz, .pe, .pl)
+	(.ro, .ru, .se, .sg, .si, .sk, .sm, .su, .tf, .th, .tr, .tw, .us):
+	Updated entry.
+	(.dz, .ec, .es, .eu, .fi, .gd, .gg, .gi, .gy, .hn, .hr, .ht, .im)
+	(.io, .ir, .je, .ke, .la, .ly, .ma, .md, .me, .mg, .mn, .mp, .mu)
+	(.my, .na, .nc, .nf, .pm, .pr, .pt, .qa, .re, .rs, .sa, .sb, .sc)
+	(.so, .sx, .tk, .tl, .tv, .tz, .ua, .uy, .uz, .vc, .ve, .wf, .yt):
+	New or upgraded from web entry.
 	(.hm, .ki, .mf, .pk, .pw, .sl, .sn, .tj, .ug, .um, .vn, .yu, .za):
 	Broken address or other comment.
 
 2012-03-06  Mats Erik Andersson  <gnu@gisladisker.se>
 
-	* ping/ping6.c (print_echo): Use flag NI_NUMERICHOST in call
-	to getnameinfo() whenever the option OPT_NUMERIC is active.
-	* ping/ping_echo.c (ipaddr2str): Isolate case OPT_NUMERIC to
-	call xstrdup().  Then call xstrdup() if gethostbyaddr() fails.
-	In main body, replace every `hp->h_name' for `ipstr', and
-	conversely, since only `hp->h_name' can fail do be defined.
+	* ping/ping6.c (print_echo): Use flag NI_NUMERICHOST in call to
+	getnameinfo() whenever the option OPT_NUMERIC is active.
+	* ping/ping_echo.c (ipaddr2str): Isolate case OPT_NUMERIC to call
+	xstrdup().  Then call xstrdup() if gethostbyaddr() fails.  In main
+	body, replace every `hp->h_name' for `ipstr', and conversely,
+	since only `hp->h_name' can fail do be defined.
 	* tests/ping-localhost.sh: Insert option `-n' to ping and ping6.
 
 2012-03-03  Mats Erik Andersson <gnu@gisladisker.se>
 
 	Display command prompt only in interactive mode.
+
 	* src/tftp.c (fromatty): New variable; true in interactive mode.
 	(main): Assign value to FROMATTY.
 	(command): Display prompt only if FROMATTY is true.
@@ -174,39 +170,44 @@
 2012-03-02  Mats Erik Andersson <gnu@gisladisker.se>
 
 	Make service lookup optional in FTP client.
-	* ftp/cmds.h [!DEFPORT] (DEFPORT): New macro.  Define as IPPORT_FTP
-	if available, otherwise as 21.
+
+	* ftp/cmds.h (DEFPORT) [!DEFPORT]: New macro.  Define as
+	IPPORT_FTP if available, otherwise as 21.
 	(another): Condition call to add_history() on FROMATTY.
-	(setpeer): Call getservbyname() for `ftp/tcp'.  Set port if successful;
-	use DEFPORT otherwise.
+	(setpeer): Call getservbyname() for `ftp/tcp'.  Set port if
+	successful; use DEFPORT otherwise.
 	* ftp/ftp_var.h (sp): Remove external variable.
-	* ftp/main.c (main): Remove call to getservbyname() and the use of SP.
+	* ftp/main.c (main): Remove call to getservbyname() and the use of
+	SP.
 	(cmdscanner): Condition call to add_history() on FROMATTY.
 
 2012-03-01  Mats Erik Andersson <gnu@gisladisker.se>
 
 	Subtests for SIGHUP reaction of `inetd' and `syslogd'.
 
-	* tests/syslogd.sh: Write a second configuration file after first run,
-	send SIGHUP to server, and evaluate message response.
+	* tests/syslogd.sh: Write a second configuration file after first
+	run, send SIGHUP to server, and evaluate message response.
 	(SUCCESSES): Update arithmetic expression used in evaluation.
-	(OUT_USER, OUT_DEBUG, TAG2, COUNT2, COUNT2_debug, COUNT3, COUNT3_info):
-	New variables.
-	<verbose report>: Print messages of files $OUT_USER and $OUT_DEBUG.
+	(OUT_USER, OUT_DEBUG, TAG2, COUNT2, COUNT2_debug, COUNT3)
+	(COUNT3_info): New variables.  <verbose report>: Print messages of
+	files $OUT_USER and $OUT_DEBUG.
 
-	* tests/tftp.sh: Calculate new port after first test run, send SIGHUP
-	to server, and transmit a small file at each adress in old list.
+	* tests/tftp.sh: Calculate new port after first test run, send
+	SIGHUP to server, and transmit a small file at each adress in old
+	list.
 	(do_conf_reload): New variable.
 
 2012-03-01  Mats Erik Andersson <gnu@gisladisker.se>
 
 	Reduce external prerequisites in test scripts.
+
 	* tests/ftp-localhost.sh: Replace `head -1' by `sed 1q'.
-	* tests/telnet-localhost.sh, tests/tftp.sh: Likewise.  Replace `ps pid'
-	by `kill -0 pid'.
+	* tests/telnet-localhost.sh, tests/tftp.sh: Likewise.  Replace `ps
+	pid' by `kill -0 pid'.
 	* tests/syslogd.sh: Likewise.  Replace `wc -l' by `grep -c'.
 
-	* tests/tftp.sh: Do not issue `set -m', since no job control in use.
+	* tests/tftp.sh: Do not issue `set -m', since no job control in
+	use.
 
 2012-02-25  Alfred M. Szmidt  <ams@gnu.org>
 
@@ -232,7 +233,8 @@
 
 2012-02-25  Alfred M. Szmidt  <ams@gnu.org>
 
-	* cfg.mk (local-checks-to-skip): Added sc_assignment_in_if to list.
+	* cfg.mk (local-checks-to-skip): Added sc_assignment_in_if to
+	list.
 	(sc_assignment_in_if): New target.
 
 	* bootstrap: Updated from gnulib.
@@ -242,8 +244,8 @@
 
 2012-02-22  Mats Erik Andersson <gnu@gisladisker.se>
 
-	* tests/ping-localhost.sh, tests/traceroute-localhost.sh: Mend string
-	quotation for expected variable expansion.
+	* tests/ping-localhost.sh, tests/traceroute-localhost.sh: Mend
+	string quotation for expected variable expansion.
 	* tests/syslogd.sh (SYSLOGD, LOGGER): Allow value overriding.
 	* tests/telnet-localhost.sh (INETD, TELNET, ADDRPEEK): Likewise.
 	(TARGET): New variable, replacing previous TARGET4.
@@ -251,31 +253,37 @@
 2012-02-22  Mats Erik Andersson <gnu@gisladisker.se>
 
 	Implement group assignment for services.
+
 	* src/inetd.c (struct servtab): New component `char *se_group'.
-	(run_service): New variable GRP.  Check existence of `sep->se_group'.
-	If valid, then apply setgid() to `grp->gr_gid' instead of `pwd->pw_gid'.
-	[HAVE_INITGROUPS] <initgroups>: Use `grp->gr_id' if an explicit group
-	was stated, otherwise use `pwd->pw_gid'.
+	(run_service): New variable GRP.  Check existence of
+	`sep->se_group'.  If valid, then apply setgid() to `grp->gr_gid'
+	instead of `pwd->pw_gid'.  <initgroups> [HAVE_INITGROUPS]: Use
+	`grp->gr_id' if an explicit group was stated, otherwise use
+	`pwd->pw_gid'.
 	(print_service): Display also group membership.
 	(enter, freeconfig): Add string handling for groups.
 	(getconfigent): Parse user string for an optional group component.
 	(nextconfig): Assure that an assigned group really exists.
 	(fix_tcpmux): Add empty group string.
-	* doc/inetutils.texi (inetd configuration file): Add setting of group.
+	* doc/inetutils.texi (inetd configuration file): Add setting of
+	group.
 
 2012-02-21  Mats Erik Andersson <gnu@gisladisker.se>
 
 	* tests/telnet-localhost.sh: Skip test in absence of assigned TTY.
-	Rewrite case evaluation without nested pipelines and OR connectives.
+	Rewrite case evaluation without nested pipelines and OR
+	connectives.
 
 2012-02-21  Mats Erik Andersson <gnu@gisladisker.se>
 
 	Basic test case for `telnet'.
-	* tests/Makefile.am (dist_check_SCRIPTS) [ENABLE_inetd && ENABLE_telnet]:
-	Added telnet-localhost.sh.
+
+	* tests/Makefile.am (dist_check_SCRIPTS) [ENABLE_inetd &&
+	ENABLE_telnet]: Added telnet-localhost.sh.
 	* tests/telnet-localhost.sh: New file.
 
-	* tests/ftp-localhost.sh (posttesting): Use SIGTERM first, then SIGKILL.
+	* tests/ftp-localhost.sh (posttesting): Use SIGTERM first, then
+	SIGKILL.
 	(locate_port): Adapt regex alternate pattern for legacy `grep'.
 	* tests/syslogd.sh (clean_testdir, locate_port): Likewise.
 	* tests/tftp.sh (posttesting, locate_port): Likewise.
@@ -283,6 +291,7 @@
 2012-02-20  Mats Erik Andersson <gnu@gisladisker.se>
 
 	Improve behaviour of single stacked clients.
+
 	* ftp/ftp.c (hookup): Do not add AI_ADDRCONFIG to HINTS.ai_flags.
 	* src/logger.c (open_socket): Likewise.
 	* telnet/commands.c (tn): Likewise.
@@ -311,15 +320,16 @@
 
 2012-02-09  Mats Erik Andersson <gnu@gisladisker.se>
 
-	* am/krb5.m4: When examining `libkrb5', replace AC_CHECK_LIB
-	by AC_TRY_LINK in order to avoid cached results, since identical
-	library and function names are tested for.
-	<OpenBSD Heimdal>: New test case.
+	* am/krb5.m4: When examining `libkrb5', replace AC_CHECK_LIB by
+	AC_TRY_LINK in order to avoid cached results, since identical
+	library and function names are tested for.  <OpenBSD Heimdal>: New
+	test case.
 
 2012-02-08  Mats Erik Andersson <gnu@gisladisker.se>
 
-	* tests/syslogd.sh: Reimplement a subtest using standard INET port.
-	A second SYSLOG daemon is started, which only uses INET sockets.
+	* tests/syslogd.sh: Reimplement a subtest using standard INET
+	port.  A second SYSLOG daemon is started, which only uses INET
+	sockets.
 	(do_standard_port): New variable, initially `true', changed to
 	`false' for non-root user and when 514/udp is in use.
 
@@ -329,52 +339,54 @@
 	standard port `syslog/udp'.  Fall back to `514' if `syslog' fails.
 	(find_inet_port): New function.
 	(BindPort): New variable.
-	[IPPORT_SYSLOG] (portstr): New variable.
+	(portstr) [IPPORT_SYSLOG]: New variable.
 	(LogPortText): Initialize to NULL.
 	(LogForwardPort): New variable.
 	(argp_options, parse_opt): New option `-B/--bind-port'.
 	(main): New call to `find_inet_port'.
 	(create_inet_socket): Check that LOGPORTTEXT is non-null,
 	otherwise inet sockets are left disabled.
-	[AI_ADDRCONFIG] (fprintflog, cfline): Only AF_UNSPEC invokes
-	AI_ADDRCONFIG.  Replace LOGPORTTEXT by LOGFORWARDPORT in calls
-	to getaddrinfo.
+	(fprintflog, cfline) [AI_ADDRCONFIG]: Only AF_UNSPEC invokes
+	AI_ADDRCONFIG.  Replace LOGPORTTEXT by LOGFORWARDPORT in calls to
+	getaddrinfo.
 
-	* tests/syslogd.sh: Adapt to `syslogd' allowing non-standard ports.
+	* tests/syslogd.sh: Adapt to `syslogd' allowing non-standard
+	ports.
 	(PORT): Make presetable from command line.
-	(locate_port): New function.
-	<non-root && privileged port>: Use a pseudo-random port.
-	<port in use>: Take a pseudo-random step to an even higher port, only
-	to disable inet sockets if even that action fails.
+	(locate_port): New function.  <non-root && privileged port>: Use a
+	pseudo-random port.  <port in use>: Take a pseudo-random step to
+	an even higher port, only to disable inet sockets if even that
+	action fails.
 	[do_inet_socket]: Add `-B$PORT' to IU_OPTIONS and append `:$PORT'
 	to option `-h' in calls to logger.
 
-	* tests/ftp-localhost.sh, tests/tftp.sh (NSSWITCH): Override
-	with value `/etc/services' when running OpenBSD.
+	* tests/ftp-localhost.sh, tests/tftp.sh (NSSWITCH): Override with
+	value `/etc/services' when running OpenBSD.
 
 2012-02-06  Mats Erik Andersson <gnu@gisladisker.se>
 
-	* doc/inetutils.texi (logger invocation): Describe option `-u/--unix'.
+	* doc/inetutils.texi (logger invocation): Describe option
+	`-u/--unix'.
 	(ftpd invocation): Describe options `-4/ipv4' and `-6/--ipv6'.
-	* tests/ftp-localhost.sh (NSSWITCH, PASSWD, PROTOCOLS): New variables
-	naming standard files.  Check their presence and skip test otherwise.
+	* tests/ftp-localhost.sh (NSSWITCH, PASSWD, PROTOCOLS): New
+	variables naming standard files.  Check their presence and skip
+	test otherwise.
 	* tests/tftp.sh (NSSWITCH, PASSWD, PROTOCOLS): Likewise.
 
 2012-02-05  Mats Erik Andersson <gnu@gisladisker.se>
 
 	* tests/tftp.sh: Need job control, issue `set -m'.
-	(spawned_pid): New variable.
-	<inetd restart failure>: For better robustness, kill process
-	immediately using SPAWNED_PID.
+	(spawned_pid): New variable.  <inetd restart failure>: For better
+	robustness, kill process immediately using SPAWNED_PID.
 
 2012-02-04  Mats Erik Andersson <gnu@gisladisker.se>
 
 	* src/logger.c (unixsock): New variable.
-	(open_socket): Allow HOST and UNIXSOCK to determine
-	UNIX socket name.  Add test that HOST be non-NULL.
+	(open_socket): Allow HOST and UNIXSOCK to determine UNIX socket
+	name.  Add test that HOST be non-NULL.
 	(argp_options): New option `-u/--unix'.
-	(parse_opt) <h>: Erase UNIXSOCK, i.e., clear `-u'.
-	<u>: New option. Set UNIXSOCK, erase HOST.
+	(parse_opt) <h>: Erase UNIXSOCK, i.e., clear `-u'.  <u>: New
+	option.  Set UNIXSOCK, erase HOST.
 
 2012-02-04  Mats Erik Andersson <gnu@gisladisker.se>
 
@@ -384,6 +396,7 @@
 2012-02-03  Mats Erik Andersson <gnu@gisladisker.se>
 
 	Do not use which(1) in test scripts.
+
 	* tests/ftp-localhost.sh: Use a trivial match to detect grep(1)
 	and a trivial invokation of netstat(1).  Use `sysctl -a', while
 	discarding STDOUT and STDERR, to sense for sysctl(8).
@@ -392,39 +405,42 @@
 2012-02-03  Mats Erik Andersson <gnu@gisladisker.se>
 
 	Attempt full detection of any intermediary step failing.
+
 	* tests/ftp-localhost.sh: Test presence of grep(1), netstat(1).
 	Capture failing mktemp(1).
 	(posttesting): Verify non-empty TMPDIR and it being a directory.
 	<inetd.conf, .netrc>: Test successful write to these files.
 	<starting INETD>: Test successful start as well as presence of
 	`$TMPDIR/inetd.pid' afterwards.
-	* tests/tftp.sh: Test presence of grep(1) and netstat(1).
-	Capture failing mktemp(1).
+	* tests/tftp.sh: Test presence of grep(1) and netstat(1).  Capture
+	failing mktemp(1).
 	(posttesting): Verify non-empty TMPDIR and it being a directory.
 	<write_conf>: Test successful execution.
-	(REDIRECT): New variable.
-	<INETD invokation>: Always use debug-mode `-d', but suppress STDERR
-	in non-verbose execution mode.  An eval call implements this during
-	the first attempt.  Test the validity of `inetd_pid' afterwards.
-	<restart of INETD>: Use `kill -9' and delete the file INETD_PID.
-	<creation of test files>: Check validity of TMPDIR and test for
-	failure when creating the directory `$TMPDIR/tftp-test'.
+	(REDIRECT): New variable.  <INETD invokation>: Always use
+	debug-mode `-d', but suppress STDERR in non-verbose execution
+	mode.  An eval call implements this during the first attempt.
+	Test the validity of `inetd_pid' afterwards.  <restart of INETD>:
+	Use `kill -9' and delete the file INETD_PID.  <creation of test
+	files>: Check validity of TMPDIR and test for failure when
+	creating the directory `$TMPDIR/tftp-test'.
 
 2012-02-02  Mats Erik Andersson <gnu@gisladisker.se>
 
 	Full set of prototypes for Shishi enabled builds.
-	* libinetutils/shishi_def.h [SHISHI] (krcmd, krcmd_mutual):
-	New prototypes.
-	* libtelnet/auth-proto.h [AUTHENTICATION] (auth_name): Likewise.
-	* libtelnet/auth.c [AUTHENTICATION] (auth_onoff): Likewise.
-	* libtelnet/enc-proto.h [ENCRYPTION] (EncryptStart, EncryptStartInput)
+
+	* libinetutils/shishi_def.h (krcmd, krcmd_mutual) [SHISHI]: New
+	prototypes.
+	* libtelnet/auth-proto.h (auth_name) [AUTHENTICATION]: Likewise.
+	* libtelnet/auth.c (auth_onoff) [AUTHENTICATION]: Likewise.
+	* libtelnet/enc-proto.h (EncryptStart, EncryptStartInput)
+	[ENCRYPTION]
 	(EncryptStartOutput, EncryptStatus, EncryptStop, EncryptStopInput)
 	(EncryptStopOutput, EncryptType, encrypt_start, encrypt_end)
 	(encrypt_request_start, encrypt_request_end, encrypt_support)
 	(encrypt_dec_keyid, encrypt_enc_keyid): Likewise.
 	* libtelnet/genget.h (Ambiguous): Likewise.
 	* libtelnet/misc-proto.h (auth_encrypt_user): Likewise.
-	* src/rlogind.c [SHISHI] (do_shishi_login): New prototype.
+	* src/rlogind.c (do_shishi_login) [SHISHI]: New prototype.
 	* telnet/commands.c [ENCRYPTION]: Include <libtelnet/encrypt.h>.
 	[AUTHENTICATION || ENCRYPTION]: Include <libtelnet/misc.h>.
 	* telnet/main.c [AUTHENTICATION]: Include <libtelnet/auth.h>.
@@ -438,10 +454,10 @@
 
 2012-02-01  Mats Erik Andersson <gnu@gisladisker.se>
 
-	* tests/syslogd.sh (do_inet_socket): New variable.
-	<port is busy>: Continue, but disable INET test.  Issue a notice.
-	* tests/tftp.sh (write_conf): New function.
-	<failed inetd launch>: Make a second start attempt, with new port.
+	* tests/syslogd.sh (do_inet_socket): New variable.  <port is
+	busy>: Continue, but disable INET test.  Issue a notice.
+	* tests/tftp.sh (write_conf): New function.  <failed inetd
+	launch>: Make a second start attempt, with new port.
 
 2012-02-01  Guillem Jover  <guillem@hadrons.org>
 
@@ -451,36 +467,40 @@
 
 2012-02-01  Mats Erik Andersson <gnu@gisladisker.se>
 
-	* configure.ac: Check for typedefs `Schedule' and `Session_Key'
-	in <arpa/telnet.h>.
-	* libinetutils/des_rw.c [ENCRYPTION && KERBEROS && !MIN] (MIN):
+	* configure.ac: Check for typedefs `Schedule' and `Session_Key' in
+	<arpa/telnet.h>.
+	* libinetutils/des_rw.c (MIN) [ENCRYPTION && KERBEROS && !MIN]:
 	Define missing macro.
-	[ENCRYPTION && KERBEROS && !roundup] (roundup): Likewise.
-	* libinetutils/kcmd.c (kcmd) [HAVE_SIGACTION]:  Use modern signal
+	(roundup) [ENCRYPTION && KERBEROS && !roundup]: Likewise.
+	* libinetutils/kcmd.c (kcmd) [HAVE_SIGACTION]: Use modern signal
 	handling.  New variables SIGS and OSIGS.
-	* libtelnet/auth.c [AUTHENTICATION] (AUTHTYPE_NAMES): New macro,
-	needed by OpenSolaris to fill in `authtype_names' by <arpa/telnet.h>.
-	* libtelnet/encrypt.h [ENCRYPTION && !HAVE_ARPA_TELNET_H_SCHEDULE]:
-	Typedef for `Schedule' is conditional.
+	* libtelnet/auth.c (AUTHTYPE_NAMES) [AUTHENTICATION]: New macro,
+	needed by OpenSolaris to fill in `authtype_names' by
+	<arpa/telnet.h>.
+	* libtelnet/encrypt.h [ENCRYPTION &&
+	!HAVE_ARPA_TELNET_H_SCHEDULE]: Typedef for `Schedule' is
+	conditional.
 	[ENCRYPTION && !HAVE_ARPA_TELNET_H_SESSION_KEY]: Typedef for
 	`Session_Key' is conditional.
 	* libtelnet/misc.c: Include <arpa/telnet.h>.
-	* src/rlogind.c [KERBEROS && ENCRYPTION] (ENC_WRITE): Define macro
+	* src/rlogind.c (ENC_WRITE) [KERBEROS && ENCRYPTION]: Define macro
 	using correct name.
-	* src/rshd.c [!MAX] (MAX): Define missing macro.
+	* src/rshd.c (MAX) [!MAX]: Define missing macro.
 
 2012-02-01  Mats Erik Andersson <gnu@gisladisker.se>
 
 	Detect and protect header files for Kerberos support.
+
 	* configure.ac: Check for <com_err.h>, <kerberosIV/des.h>,
 	<kerberosIV/krb.h>, <kerberosV/krb5.h>, <krb5.h>, <krb5/asn1.h>,
-	<krb5/crc-32.h>, <krb5/ext-proto.h>, <krb5/krb5.h>, <krb5/los-proto.h>.
+	<krb5/crc-32.h>, <krb5/ext-proto.h>, <krb5/krb5.h>,
+	<krb5/los-proto.h>.
 
 	* libinetutils/des_rw.c
-	[ENCRYPTION && KERBEROS && HAVE_KERBEROSIV_DES_H]:
-	Include <kerberosIV/des.h>.
-	[ENCRYPTION && KERBEROS && HAVE_KERBEROSIV_KRB_H]:
-	Include <kerberosIV/krb.h>.
+	[ENCRYPTION && KERBEROS && HAVE_KERBEROSIV_DES_H]: Include
+	<kerberosIV/des.h>.
+	[ENCRYPTION && KERBEROS && HAVE_KERBEROSIV_KRB_H]: Include
+	<kerberosIV/krb.h>.
 	* libinetutils/kcmd.c, libinetutils/krcmd.c
 	[KERBEROS && HAVE_KERBEROSIV_DES_H]: Include <kerberosIV/des.h>.
 	[KERBEROS && HAVE_KERBEROSIV_KRB_H]: Include <kerberosIV/krb.h>.
@@ -488,8 +508,10 @@
 	Include <krb5/krb5.h>.
 	[KRB5 && FORWARD && HAVE_KRB5_ASN1_H]: Include <krb5/asn1.h>.
 	[KRB5 && FORWARD && HAVE_KRB5_CRC_32_H]: Include <krb5/crc-32.h>.
-	[KRB5 && FORWARD && HAVE_KRB5_LOS_PROTO_H]: Include <krb5/los-proto.h>.
-	[KRB5 && FORWARD && HAVE_KRB5_EXT_PROTO_H]: Include <krb5/ext-proto.h>.
+	[KRB5 && FORWARD && HAVE_KRB5_LOS_PROTO_H]: Include
+	<krb5/los-proto.h>.
+	[KRB5 && FORWARD && HAVE_KRB5_EXT_PROTO_H]: Include
+	<krb5/ext-proto.h>.
 	* libtelnet/kerberos.c [KRB4 && HAVE_DES_H]: Include <des.h>.
 	[KRB4 && HAVE_KRB_H]: Include <krb.h>.
 	* libtelnet/kerberos5.c [KRB5 && HAVE_KRB5_H]: Include <krb5.h>.
@@ -499,28 +521,33 @@
 	[KERBEROS && HAVE_KERBEROSIV_KRB_H]: Include <kerberosIV/krb.h>.
 	* src/rlogin.c: Likewise.
 	[SHISHI]: Do inclusions independently of conditional code.
-	* src/rlogind.c [KERBEROS && KRB4 && HAVE_KERBEROSIV_DES_H]: Include
-	<kerberosIV/des.h>.
-	[KERBEROS && KRB4 && HAVE_KERBEROSIV_KRB_H]: Include <kerberosIV/krb.h>.
+	* src/rlogind.c [KERBEROS && KRB4 && HAVE_KERBEROSIV_DES_H]:
+	Include <kerberosIV/des.h>.
+	[KERBEROS && KRB4 && HAVE_KERBEROSIV_KRB_H]: Include
+	<kerberosIV/krb.h>.
 	[KERBEROS && KRB5 && HAVE_KRB5_H]: Include <krb5.h>.
-	[KERBEROS && KRB5 && HAVE_KERBEROSIV_KRB_H]: Include <kerberosIV/krb.h>.
-	* src/rsh.c, src/rshd.c [KERBEROS && HAVE_KERBEROSIV_DES_H]: Include
-	<kerberosIV/des.h>.
+	[KERBEROS && KRB5 && HAVE_KERBEROSIV_KRB_H]: Include
+	<kerberosIV/krb.h>.
+	* src/rsh.c, src/rshd.c [KERBEROS && HAVE_KERBEROSIV_DES_H]:
+	Include <kerberosIV/des.h>.
 	[KERBEROS && HAVE_KERBEROSIV_KRB_H]: Include <kerberosIV/krb.h>.
 	[SHISHI]: Do inclusions independently of conditional code.
 
 2012-01-31  Mats Erik Andersson <gnu@gisladisker.se>
 
 	* libinetutils/kcmd.c: Include <fcntl.h>.
-	* libtelnet/auth.h [!AUTH_REJECT] (AUTH_REJECT): Protect `#define'.
-	[!AUTH_UNKNOWN] (AUTH_UNKNOWN): Likewise.
-	[!AUTH_OTHER] (AUTH_OTHER): Likewise.
-	[!AUTH_USER] (AUTH_USER): Likewise.
-	[!AUTH_VALID] (AUTH_VALID): Likewise.
-	* libtelnet/enc_des.c [ENCTYPE_DES_OFB64] (ofb64_init, ofb64_start)
-	(ofb64_is, ofb64_reply, ofb64_session, ofb64_keyid, ofb64_printsub)
+	* libtelnet/auth.h (AUTH_REJECT) [!AUTH_REJECT]: Protect
+	`#define'.
+	(AUTH_UNKNOWN) [!AUTH_UNKNOWN]: Likewise.
+	(AUTH_OTHER) [!AUTH_OTHER]: Likewise.
+	(AUTH_USER) [!AUTH_USER]: Likewise.
+	(AUTH_VALID) [!AUTH_VALID]: Likewise.
+	* libtelnet/enc_des.c (ofb64_init, ofb64_start)
+	[ENCTYPE_DES_OFB64]
+	(ofb64_is, ofb64_reply, ofb64_session, ofb64_keyid)
+	(ofb64_printsub)
 	(ofb64_encrypt, ofb64_decrypt): Protect definitions.
-	* libtelnet/encrypt.c [ENCTYPE_DES_OFB64] (i_support_encrypt)
+	* libtelnet/encrypt.c (i_support_encrypt) [ENCTYPE_DES_OFB64]
 	(i_support_decrypt): Add ENCTYPE_DES_OFB64 only if existing,
 	otherwise only ENCTYPE_DES_CFB64.
 	(encryptions) [ENCTYPE_DES_OFB64]: Conditional use of OFB64 calls.
@@ -530,8 +557,8 @@
 	(ENCTYPE_DES_CFB64): Likewise
 	[!ENCTYPE_DES_OFB64 && TELOPT_ENCTYPE_DES_OFB64]
 	(ENCTYPE_DES_OFB64): Likewise.
-	[!ENCTYPE_CNT && TELOPT_ENCTYPE_CNT] (ENCTYPE_CNT): Likewise.
-	[!VALIDKEY] (VALIDKEY): Protect `#define'.
+	(ENCTYPE_CNT) [!ENCTYPE_CNT && TELOPT_ENCTYPE_CNT]: Likewise.
+	(VALIDKEY) [!VALIDKEY]: Protect `#define'.
 
 2012-01-31  Mats Erik Andersson <gnu@gisladisker.se>
 
@@ -557,17 +584,18 @@
 
 	* libtelnet/auth.c, libtelnet/enc_des.c, libtelnet/encrypt.c,
 	libtelnet/kerberos.c, libtelnet/kerberos5.c, libtelnet/shishi.c:
-	Add external prototype `void printsub (char, unsigned char *, int)',
-	appearing as callback.
+	Add external prototype `void printsub (char, unsigned char *,
+	int)', appearing as callback.
 	* libtelnet/auth-proto.h (auth_gen_printsub): Remove prototype.
 	(auth_printsub): Missing prototype.
 	* libtelnet/auth.c (auth_gen_printsub): Declare as static, and
 	position before code for `auth_printsub'.
 	* libtelnet/enc-proto.h (encrypt_printsub): Missing prototype.
-	[ENCRYPTION && TELNETD]: Rename macro TELENTD as TELNETD,
-	both are otherwise not in use.
+	[ENCRYPTION && TELNETD]: Rename macro TELENTD as TELNETD, both are
+	otherwise not in use.
 	* libtelnet/encrypt.c (encrypt_gen_printsub): Reorder parameters
-	in declaration to read `(unsigned char *, int, unsigned char *, int)'.
+	in declaration to read `(unsigned char *, int, unsigned char *,
+	int)'.
 	(encrypt_printsub): Likewise.
 	* telnet/utilities.c [AUTHENTICATION]: Include <libtelnet/auth.h>.
 	[ENCRYPTION]: Include <libtelnet/encrypt.h>.
@@ -575,14 +603,14 @@
 
 2012-01-27  Mats Erik Andersson <gnu@gisladisker.se>
 
-	* tests/ftp-localhost.sh, tests/tftp.sh (PORT): Detect if it
-	is preset, or detect an unused value from a short list.
+	* tests/ftp-localhost.sh, tests/tftp.sh (PORT): Detect if it is
+	preset, or detect an unused value from a short list.
 	* tests/ftp-localhost.sh (locate_port): New function.
 
 2012-01-26  Mats Erik Andersson <gnu@gisladisker.se>
 
-	* tests/syslogd.sh (SOCKET): Disable the use of this
-	UNIX socket name if its length would be excessive.
+	* tests/syslogd.sh (SOCKET): Disable the use of this UNIX socket
+	name if its length would be excessive.
 
 2012-01-26  Mats Erik Andersson <gnu@gisladisker.se>
 
@@ -596,20 +624,19 @@
 2012-01-25  Mats Erik Andersson <gnu@gisladisker.se>
 
 	* tests/syslogd.sh: Substantial rewrite.  Early verbosity.
-	Consistent quoting for white space in IU_TESTDIR.  Robustness
-	with error checking.  Execution inside `tests/'.
+	Consistent quoting for white space in IU_TESTDIR.  Robustness with
+	error checking.  Execution inside `tests/'.
 	(TARGET, TARGET6): New variables.
 	(TMPDIR): Overrides `/tmp/' as temporary directory.
 
 2012-01-23  Mats Erik Andersson <gnu@gisladisker.se>
 
-	* tests/ftp-localhost.sh: New preamble to fail
-	with SVR4 shell.  Backtics in command substitution.
-	* tests/tftp.sh: Rewrite for SVR4 portability.
-	Backtics in command substitution.  expr(1) for
-	arithmetic.  Only basic regex with grep(1), no `-q'.
-	Remove character classes.  Quotation issue for tr(1).
-	Use `test -r /dev/urandom' to circumvent soft link.
+	* tests/ftp-localhost.sh: New preamble to fail with SVR4 shell.
+	Backtics in command substitution.
+	* tests/tftp.sh: Rewrite for SVR4 portability.  Backtics in
+	command substitution.  expr(1) for arithmetic.  Only basic regex
+	with grep(1), no `-q'.  Remove character classes.  Quotation issue
+	for tr(1).  Use `test -r /dev/urandom' to circumvent soft link.
 
 2012-01-22  Mats Erik Andersson <gnu@gisladisker.se>
 
@@ -617,8 +644,8 @@
 
 2012-01-22  Mats Erik Andersson <gnu@gisladisker.se>
 
-	* tests/ftp-localhost.sh: sysctl(1) uses `=' or `:'
-	as delimeter.  Detect both.
+	* tests/ftp-localhost.sh: sysctl(1) uses `=' or `:' as delimeter.
+	Detect both.
 
 2012-01-22  Mats Erik Andersson <gnu@gisladisker.se>
 
@@ -626,32 +653,33 @@
 	* ftpd/ftpd.c (options): New options `-4/ipv4' and `-6/ipv6`.
 	(parse_opt): Detect `4' and `6'.
 	* ftpd/server_mode.c (usefamily): New variable.
-	[!DEFPORT] (DEFPORT): Use IPPORT_FTP if available.
-	(server_mode): Remove use of AI_ADDRCONFIG.  When seeing AF_UNSPEC,
-	build AF_INET6 socket and reset socket option IPV6_V6ONLY.
+	(DEFPORT) [!DEFPORT]: Use IPPORT_FTP if available.
+	(server_mode): Remove use of AI_ADDRCONFIG.  When seeing
+	AF_UNSPEC, build AF_INET6 socket and reset socket option
+	IPV6_V6ONLY.
 
 2012-01-22  Mats Erik Andersson <gnu@gisladisker.se>
 
 	* ftpd/extern.h (passive): New prototype.
 	* ftpd/ftpcmd.y (EPRT, EPSV, CHAR): New tokens.
 	(net_proto, tcp_port, net_addr): New value returning types.
-	(cmd) <PORT>: Use value returned from `host_port'. Erase PDATA
+	(cmd) <PORT>: Use value returned from `host_port'.  Erase PDATA
 	and USEDEFAULT only if successful.
 	(cmd) <PASV>: Changed call to passive().
 	(cmd) <EPRT, EPSV>: New code for token parsers.
-	(host_port): Declare as `%type <i>', returning an integer.
-	Handle mapped IPv4 addresses.  Erase DATA_DEST after an address
-	resolving failure.
+	(host_port): Declare as `%type <i>', returning an integer.  Handle
+	mapped IPv4 addresses.  Erase DATA_DEST after an address resolving
+	failure.
 	(DLIST): New macro used as state in finite state automata.
 	(cmdtab): New entries EPRT and EPSV.
 	(yylex) <DLIST>: Implement new state.
-	* ftpd/ftpd.c (passive): New prototype `passive(int, int)'.
-	New variable TRY_AF.  Select address family based on parameters
-	and CTRL_ADDR.
+	* ftpd/ftpd.c (passive): New prototype `passive(int, int)'.  New
+	variable TRY_AF.  Select address family based on parameters and
+	CTRL_ADDR.
 	(passive) <EPSV>: Handle AF_INET and AF_INET6.
 	(passive) <PASV>: Process also mapped IPv4 address.
-	* tests/ftp-localhost.sh: More tests in inetd mode: EPSV and
-	EPRT for IPv4 and IPv6.  Suppress FTP dialog unless verbose.
+	* tests/ftp-localhost.sh: More tests in inetd mode: EPSV and EPRT
+	for IPv4 and IPv6.  Suppress FTP dialog unless verbose.
 
 2012-01-18  Simon Josefsson  <simon@josefsson.org>
 
@@ -665,16 +693,16 @@
 
 2012-01-07  Mats Erik Andersson <gnu@gisladisker.se>
 
-	* telnet/utilities.c (SetNetTrace): Filename buffer overrun: replace
-	strcpy() by strncpy().
+	* telnet/utilities.c (SetNetTrace): Filename buffer overrun:
+	replace strcpy() by strncpy().
 	(printoption, printsub): Code formatting of ternary operator.
 
 2012-01-07  Guillem Jover  <guillem@hadrons.org>
 
 	* telnet/utilities.c (printsub) <env_common>: Use constant format
-	strings instead of offsets into fixed string.  Remove NOQUOTE,
-	add QUOTE.
-
+	strings instead of offsets into fixed string.  Remove NOQUOTE, add
+	QUOTE.
+
 2012-01-06  Simon Josefsson  <simon@josefsson.org>
 
 	inetutils 1.9.1
@@ -691,9 +719,10 @@
 
 	* ftpd/ftpcmd.y (host_port): Use AI_NUMERICHOST and AI_NUMERICSERV
 	in `HINTS.ai_flags'.  Do not use AI_ADDRCONFIG.
-	* ftpd/ftpd.c (getdatasock): Erase port number stored in DATA_SOURCE.
-	* tests/ftp-localhost.sh: Detect transfered data and duplicate tests
-	also for an active connection, not only a passive attempt.
+	* ftpd/ftpd.c (getdatasock): Erase port number stored in
+	DATA_SOURCE.
+	* tests/ftp-localhost.sh: Detect transfered data and duplicate
+	tests also for an active connection, not only a passive attempt.
 
 2012-01-03  Alfred M. Szmidt  <ams@gnu.org>
 
@@ -703,24 +732,25 @@
 
 	Internal address structure rewrite for `ftpd'.
 
-	* ftpd/extern.h (data_dest, his_addr): Change to `struct sockaddr_storage'.
+	* ftpd/extern.h (data_dest, his_addr): Change to `struct
+	sockaddr_storage'.
 	(server_mode): New prototype: second argument `struct sockaddr *'.
-	* ftpd/ftpcmd.y (cmd): Use casts to `struct sockaddr_in' to evaluate
-	sub case `host_port'.
+	* ftpd/ftpcmd.y (cmd): Use casts to `struct sockaddr_in' to
+	evaluate sub case `host_port'.
 	(yylex) [HAVE_SETPROCTITLE]: Compare to numeric naught, not NULL.
-	* ftpd/ftpd.c (data_dest, his_addr, ctrl_addr, data_source, pasv_addr):
-	Change to `struct sockaddr_storage'.
+	* ftpd/ftpd.c (data_dest, his_addr, ctrl_addr, data_source)
+	(pasv_addr): Change to `struct sockaddr_storage'.
 	(main): Apply updated server_mode().
 	(main, getdatasock, dataconn): Set IP_TOS only for AF_INET.
 	(dataconn, passive): Copy addresses using memcpy().
 	(statfilecmd): Change SIN to `struct sockaddr_storage'.
 	(statcmd): Casts as `struct sockaddr_in' needed for A and P.
-	(passive): Clear port number depending on address family.
-	Reply with 229 for EPSV/IPv6 and 227 for PASV.
+	(passive): Clear port number depending on address family.  Reply
+	with 229 for EPSV/IPv6 and 227 for PASV.
 	* ftpd/server_mode.c (check_host): Activate AF_INET6 case.
 	(server_mode): Second argument is 'struct sockaddr *', must be
-	initiated before call, and returns actual address length.
-	New variable SAVED_ADDRLEN.  Changed call due to these two.
+	initiated before call, and returns actual address length.  New
+	variable SAVED_ADDRLEN.  Changed call due to these two.
 
 2012-01-02  Mats Erik Andersson <gnu@gisladisker.se>
 
@@ -732,9 +762,9 @@
 	* ftpd/ftpcmd.y: Include <netdb.h>.
 	(cmd) [unix || __unix__]: SYS_TYPE must recognize __unix__.
 	(host_port): Use getaddrinfo to initiate DATA_DEST.
-	* ftpd/ftpd.c (data_set_len, his_addrlen, addrstr, portstr,
-	ctrl_addrlen, data_source_len, pasv_addrlen): New variables.
-	[HAVE_LIBWRAP] (check_host): Prototype extended with socklen_t.
+	* ftpd/ftpd.c (data_set_len, his_addrlen, addrstr, portstr)
+	(ctrl_addrlen, data_source_len, pasv_addrlen): New variables.
+	(check_host) [HAVE_LIBWRAP]: Prototype extended with socklen_t.
 	(dolog): Likewise.
 	(main): Use HIS_ADDRLEN, CTRL_ADDRLEN instead of local ADDRLEN.
 	Changed calls to server_mode and dolog due to new prototypes.
@@ -742,20 +772,21 @@
 	fields in DATA_SOURCE from CTRL_ADDR, and DATA_SOURCE_LEN from
 	CTRL_ADDRLEN.  Dynamic address length to bind().
 	(dataconn): Use FROM as `struct sockaddr_storage.  Change socket
-	descriptor S to be `int'.  Assign DATA_DEST and DATA_DEST_LEN
-	in a block.  Use getnameinfo for error message.  Dynamic socket
-	length in connect().
+	descriptor S to be `int'.  Assign DATA_DEST and DATA_DEST_LEN in a
+	block.  Use getnameinfo for error message.  Dynamic socket length
+	in connect().
 	(statcmd): Lookup using getnameinfo().
 	(dolog): New prototype, extended by `socklen_t'.  Likewise.
-	(passive): Removed variable LEN, now using length and family stored
-	in address variables, which are global.
-	* ftpd/server_mode.c (check_host): New prototype: adding `socklen_t'.
-	Removed SIN, HP. New variables ERR, NAME.  Lookup uses getnameinfo().
-	(server_mode): New prototype: adding `socklen_t'.  Delete SERVER_ADDR.
-	New varables ERR, PORTSTR, HINTS, RES, AI.  Lookup uses getaddrinfo
-	and a loop to get listener.  Server loop removes ADDRLEN, now setting
-	address length by use of PHIS_ADDRLEN.
-
+	(passive): Removed variable LEN, now using length and family
+	stored in address variables, which are global.
+	* ftpd/server_mode.c (check_host): New prototype: adding
+	`socklen_t'.  Removed SIN, HP.  New variables ERR, NAME.  Lookup
+	uses getnameinfo().
+	(server_mode): New prototype: adding `socklen_t'.  Delete
+	SERVER_ADDR.  New varables ERR, PORTSTR, HINTS, RES, AI.  Lookup
+	uses getaddrinfo and a loop to get listener.  Server loop removes
+	ADDRLEN, now setting address length by use of PHIS_ADDRLEN.
+
 2011-12-31  Alfred M. Szmidt  <ams@gnu.org>
 
 	inetutils 1.9
@@ -779,13 +810,14 @@
 
 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):
+	* 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 (__check_rhosts_file) [HAVE___CHECK_RHOSTS_FILE]:
 	Protect declaration as extern variable.
-	[__GLIBC__ && WITH_IRUSEROK] (iruserok): Protect declaration
-	as extern.
+	(iruserok) [__GLIBC__ && WITH_IRUSEROK]: Protect declaration as
+	extern.
 	(options) [HAVE___CHECK_RHOSTS_FILE]: Conditionally include the
 	option `-l/--no-rhosts'.
 	(parse_opt) [HAVE___CHECK_RHOSTS_FILE]: Likewise.
@@ -795,10 +827,10 @@
 	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.
+	(__check_rhosts_file) [HAVE___CHECK_RHOSTS_FILE]: Protect
+	declaration as extern variable.
+	(iruserok) [__GLIBC__ && WITH_IRUSEROK]: Protect declaration as
+	extern.
 	(parse_opt) [HAVE___CHECK_RHOSTS_FILE]: Conditional detection of
 	`-l/--no-rhosts'.
 	(doit) [WITH_IRUSEROK]: Protect call to iruserok.
@@ -1073,7 +1105,7 @@
 2011-11-21  Mats Erik Andersson <gnu@gisladisker.se>
 
 	* libtelnet/getent.c [HAVE_CGETENT]: Include <stdlib.h>.
-	* telnet/sys_bsd.c [SIGINFO] (sendayt): Missing declaration.
+	* telnet/sys_bsd.c (sendayt) [SIGINFO]: Missing declaration.
 	* doc/inetutils.texi (telnet invocation): Minor fixes.
 	* TODO: Updated.
 
@@ -8283,7 +8315,6 @@
 	* ping/ping_address.c, ping/ping_echo.c, ping/ping_router.c,
 	ping/ping_timestamp.c: <signal.h> -> <sys/signal.h>
 
-
 2001-06-20  Sergey Poznyakoff  <gray@farlep.net>
 
 	Patches by Alain:
@@ -10040,7 +10071,6 @@ AC_REPLACE_FUNC (setproctitle).
 	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

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

Summary of changes:
 ChangeLog    |  515 +++++++++++++++++++++++++++++++--------------------------
 Makefile.am  |    3 +-
 README       |    9 +-
 README-alpha |   78 ++++-----
 configure.ac |  170 ++++++++++----------
 5 files changed, 408 insertions(+), 367 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


