From MAILER-DAEMON Fri Aug 09 06:30:20 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1V7jxc-0000NU-Af
	for mharc-commit-inetutils@gnu.org; Fri, 09 Aug 2013 06:30:20 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:53333)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1V7jxV-0000CP-4M
	for commit-inetutils@gnu.org; Fri, 09 Aug 2013 06:30:18 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1V7jxS-0002Mh-WC
	for commit-inetutils@gnu.org; Fri, 09 Aug 2013 06:30:13 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:53603)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1V7jxS-0002Mb-Rf
	for commit-inetutils@gnu.org; Fri, 09 Aug 2013 06:30:10 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1V7jxS-0001dF-5r
	for commit-inetutils@gnu.org; Fri, 09 Aug 2013 10:30:10 +0000
Date: Fri, 09 Aug 2013 10:30:10 +0000
Message-Id: <E1V7jxS-0001dF-5r@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_1-319-gc488b56
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 2e8cad2200e7d1d794a23451d902de5a11528536
X-Git-Newrev: c488b569fe7f7e6309073acbb7e3950be9fc8a95
From: Mats Erik Andersson <gnu@gisladisker.se>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
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 Aug 2013 10:30:18 -0000

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

The branch, master has been updated
       via  c488b569fe7f7e6309073acbb7e3950be9fc8a95 (commit)
      from  2e8cad2200e7d1d794a23451d902de5a11528536 (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=c488b569fe7f7e6309073acbb7e3950be9fc8a95


commit c488b569fe7f7e6309073acbb7e3950be9fc8a95
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Fri Aug 9 12:11:51 2013 +0200

    syslogd: Elementary fix.

diff --git a/ChangeLog b/ChangeLog
index 672adbe..213dcfe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-08-09  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	* src/syslogd.c (argp_options): Improve `mark' text.
+	(logmsg) [INTERNAL_MARK]: Compute facility from
+	macro INTERNAL_MARK for better consistency.
+
 2013-07-20  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	talkd: Small audit of ACL.
diff --git a/doc/inetutils.texi b/doc/inetutils.texi
index bc20491..2a93dd5 100644
--- a/doc/inetutils.texi
+++ b/doc/inetutils.texi
@@ -3378,7 +3378,7 @@ Forward messages from remote hosts.
 @itemx --mark=@var{interval}
 @opindex -m
 @opindex --mark
-Specify timestamp interval in logs (0 for no timestamps).
+Specify timestamp interval expressed in minutes (0 for no timestamping).
 
 @item -l @var{hostlist}
 @opindex -l
@@ -3395,8 +3395,14 @@ logging their name.  Multiple lists are allowed.
 
 @command{syslogd} reads its configuration file when it starts up and
 whenever it receives a hangup signal.  The @file{syslog.conf} file is
-the configuration file for the @command{syslogd} program.  It consists
-of lines with two fields: the @dfn{selector} field which specifies the
+the main configuration file for the @command{syslogd} program.
+In addition, the server looks below the directory @file{syslog.d/}
+for further configuration files, making it easy to arrange a common
+set of logging conventions in @file{syslog.conf}, augmented by
+system and service specific drop-in configuration in @file{syslog.d/}.
+
+Each configuration file consists of lines with two fields:
+a @dfn{selector} field which specifies the
 types of messages and priorities to which the line applies, and an
 @dfn{action} field which specifies the action to be taken if a message
 @command{syslogd} receives matches the selection criteria.  The
diff --git a/src/syslogd.c b/src/syslogd.c
index 75a5083..7af10f3 100644
--- a/src/syslogd.c
+++ b/src/syslogd.c
@@ -345,8 +345,8 @@ static struct argp_option argp_options[] = {
   {"ipany", OPT_IPANY, NULL, 0, "allow transport with IPv4 and IPv6", GRP+1},
   {"bind", 'b', "ADDR", 0, "bind listener to this address/name", GRP+1},
   {"bind-port", 'B', "PORT", 0, "bind listener to this port", GRP+1},
-  {"mark", 'm', "INTVL", 0, "specify timestamp interval in logs (0 for no "
-   "timestamps)", GRP+1},
+  {"mark", 'm', "INTVL", 0, "specify timestamp interval in minutes"
+   " (0 for no timestamping)", GRP+1},
   {"no-detach", 'n', NULL, 0, "do not enter daemon mode", GRP+1},
   {"no-forward", OPT_NO_FORWARD, NULL, 0, "do not forward any messages "
    "(overrides --hop)", GRP+1},
@@ -1188,7 +1188,11 @@ logmsg (int pri, const char *msg, const char *from, int flags)
 
   /* Extract facility and priority level.  */
   if (flags & MARK)
+#ifdef INTERNAL_MARK
+    fac = LOG_FAC (INTERNAL_MARK);
+#else
     fac = LOG_NFACILITIES;
+#endif
   else
     fac = LOG_FAC (pri);
   prilev = LOG_PRI (pri);

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

Summary of changes:
 ChangeLog          |    6 ++++++
 doc/inetutils.texi |   12 +++++++++---
 src/syslogd.c      |    8 ++++++--
 3 files changed, 21 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Wed Aug 14 16:50:31 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1V9i1X-0003MB-1S
	for mharc-commit-inetutils@gnu.org; Wed, 14 Aug 2013 16:50:31 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:36730)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1V9i1T-0003Lh-Km
	for commit-inetutils@gnu.org; Wed, 14 Aug 2013 16:50:29 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1V9i1R-0001aJ-Rr
	for commit-inetutils@gnu.org; Wed, 14 Aug 2013 16:50:27 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:40139)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1V9i1R-0001aF-O5
	for commit-inetutils@gnu.org; Wed, 14 Aug 2013 16:50:25 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1V9i1R-00020x-1r
	for commit-inetutils@gnu.org; Wed, 14 Aug 2013 20:50:25 +0000
Date: Wed, 14 Aug 2013 20:50:25 +0000
Message-Id: <E1V9i1R-00020x-1r@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_1-320-gae099cd
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: c488b569fe7f7e6309073acbb7e3950be9fc8a95
X-Git-Newrev: ae099cde5bb2de9ebf4cdf012c5a05aa5a92bc84
From: Mats Erik Andersson <gnu@gisladisker.se>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
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 Aug 2013 20:50: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  ae099cde5bb2de9ebf4cdf012c5a05aa5a92bc84 (commit)
      from  c488b569fe7f7e6309073acbb7e3950be9fc8a95 (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=ae099cde5bb2de9ebf4cdf012c5a05aa5a92bc84


commit ae099cde5bb2de9ebf4cdf012c5a05aa5a92bc84
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Wed Aug 14 14:55:49 2013 +0200

    One new test script.

diff --git a/ChangeLog b/ChangeLog
index 213dcfe..0d3c0b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2013-08-14  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	* tests/inetd.sh: New file.
+	* tests/Makefile.am (dist_check_SCRIPTS)
+	[ENABLE_inetd && ENABLE_telnet]: Add inetd.sh.
+
+	* tests/telnet-localhost.sh: Set service node
+	to $TARGET and $TARGET6 in inetd configuration.
+
+	* tests/utmp.sh: Call $SED, not `sed'.
+
 2013-08-09  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	* src/syslogd.c (argp_options): Improve `mark' text.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 288acb8..4f53921 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -56,7 +56,7 @@ endif
 
 if ENABLE_inetd
 if ENABLE_telnet
-dist_check_SCRIPTS += telnet-localhost.sh
+dist_check_SCRIPTS += inetd.sh telnet-localhost.sh
 endif
 endif
 
diff --git a/tests/inetd.sh b/tests/inetd.sh
new file mode 100755
index 0000000..c990b9c
--- /dev/null
+++ b/tests/inetd.sh
@@ -0,0 +1,163 @@
+#!/bin/sh
+
+# Copyright (C) 2013 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/'.
+
+# Test to establish functionality of inetd.
+# An important part is to run in daemon mode
+# and to send SIGHUP repeatedly.
+#
+# Written by Mats Erik Andersson.
+
+. ./tools.sh
+
+if test -z "${VERBOSE+set}"; then
+    silence=:
+fi
+
+# Portability fix for SVR4
+PWD="${PWD:-`pwd`}"
+USER=${USER:-`func_id_user`}
+
+# Prerequisites
+#
+$need_mktemp || exit_no_mktemp
+
+# Execution control.  Initialise early!
+#
+do_cleandir=false
+
+# Executable under test and helper functionality.
+#
+INETD=${INETD:-../src/inetd$EXEEXT}
+TELNET=${TELNET:-../telnet/telnet$EXEEXT}
+ADDRPEEK=${ADDRPEEK:-$PWD/addrpeek$EXEEXT}
+
+if test ! -x $ADDRPEEK; then
+    echo >&2 "No executable '$ADDRPEEK' present.  Skipping test."
+    exit 77
+fi
+
+if [ ! -x $INETD ]; then
+    echo "Missing executable '$INETD'.  Skipping test." >&2
+    exit 77
+fi
+
+if [ ! -x $TELNET ]; then
+    echo "Missing executable '$TELNET'.  Skipping test." >&2
+    exit 77
+fi
+
+if test -n "$VERBOSE"; then
+    set -x
+    $INETD --version | $SED '1q'
+fi
+
+# For file creation below IU_TESTDIR.
+umask 0077
+
+# Keep any external assignment of testing directory.
+# Otherwise a randomisation is included.
+#
+: ${IU_TESTDIR:=$PWD/iu_inetd.XXXXXX}
+
+if [ ! -d "$IU_TESTDIR" ]; then
+    do_cleandir=true
+    IU_TESTDIR="`$MKTEMP -d "$IU_TESTDIR" 2>/dev/null`" ||
+	{
+	    echo 'Failed at creating test directory.  Aborting.' >&2
+	    exit 77
+	}
+elif expr X"$IU_TESTDIR" : X"\.\{1,2\}/\{0,1\}$" >/dev/null; then
+    # Eliminating directories: . ./ .. ../
+    echo 'Dangerous input for test directory.  Aborting.' >&2
+    exit 77
+fi
+
+# The INETD daemon uses two files in the present test.
+#
+CONF="$IU_TESTDIR"/inetd.conf
+PID="$IU_TESTDIR"/inetd.pid
+
+# Are we able to write in IU_TESTDIR?
+# This could happen with preset IU_TESTDIR.
+#
+touch "$CONF" || {
+    echo 'No write access in test directory.  Aborting.' >&2
+    exit 1
+}
+
+# Erase the temporary directory.
+#
+clean_testdir () {
+    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
+	rm -r -f "$IU_TESTDIR"
+    fi
+}
+
+# Write a fresh configuration file.  Port is input parameter.
+write_conf () {
+    # First argument is port number.  Node is fixed as localhost.
+    echo "localhost:$1 stream tcp4 nowait $USER $ADDRPEEK addrpeek addr" \
+	> $CONF
+}
+
+errno=0
+
+PORT=`expr 12347 + ${RANDOM:-$$} % 521`
+
+write_conf $PORT
+
+# The daemon is launched only once.
+#
+$INETD -p$PID $CONF
+
+# Allow for the service to settle.
+sleep 2
+
+if test ! -f $PID; then
+    echo >&2 "Inetd never started: missing the PID-file."
+    errno=1
+else
+    # Repeated SIGHUP testing, with modified port.
+    for nn in 1 2 3 4 5; do
+	# Check for response at chosen port.
+	$TELNET -c -E -K -4 localhost $PORT 2>/dev/null |
+	    grep 'Your address is 127.0.0.1.' >/dev/null 2>&1 || errno=1
+
+	test $errno -eq 0 ||
+	    { echo >&2 "Repetition $nn failed."; break; }
+
+	# Update with new port for next round.
+	PORT=`expr $PORT + 1 + ${RANDOM:-$$} % 521`
+	write_conf $PORT
+	kill -HUP `cat $PID`
+
+	# Allow for the service to settle.
+	sleep 1
+    done
+    $silence echo "Passed `expr $nn - 1` SIGHUP rounds."
+fi
+
+test $errno -ne 0 || $silence echo 'Successful testing.'
+
+clean_testdir
+
+exit $errno
diff --git a/tests/telnet-localhost.sh b/tests/telnet-localhost.sh
index 36293f1..37e19b1 100755
--- a/tests/telnet-localhost.sh
+++ b/tests/telnet-localhost.sh
@@ -132,8 +132,8 @@ trap posttesting EXIT HUP INT QUIT TERM
 PORT=`expr 4973 + ${RANDOM:-$$} % 973`
 
 cat > "$INETD_CONF" <<-EOF ||
-	$PORT stream tcp4 nowait $USER $ADDRPEEK addrpeek addr
-	$PORT stream tcp6 nowait $USER $ADDRPEEK addrpeek addr
+	$TARGET:$PORT stream tcp4 nowait $USER $ADDRPEEK addrpeek addr
+	$TARGET6:$PORT stream tcp6 nowait $USER $ADDRPEEK addrpeek addr
 EOF
     {
 	echo 'Could not create configuration file for Inetd.  Aborting.' >&2
diff --git a/tests/utmp.sh b/tests/utmp.sh
index 79951cf..978b11e 100755
--- a/tests/utmp.sh
+++ b/tests/utmp.sh
@@ -39,7 +39,7 @@ errno=0
 if who >/dev/null 2>&1; then
     # Check that readutmp agrees with who(1),
     # limiting ourselves to at most three users.
-    for nn in `who | sed 's/ .*//; 3q;'`; do
+    for nn in `who | $SED 's/ .*//; 3q;'`; do
 	$READUTMP $nn || errno=1
     done
 else

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

Summary of changes:
 ChangeLog                 |   11 +++
 tests/Makefile.am         |    2 +-
 tests/inetd.sh            |  163 +++++++++++++++++++++++++++++++++++++++++++++
 tests/telnet-localhost.sh |    4 +-
 tests/utmp.sh             |    2 +-
 5 files changed, 178 insertions(+), 4 deletions(-)
 create mode 100755 tests/inetd.sh


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Thu Aug 15 05:09:00 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1V9tYC-0006oY-7u
	for mharc-commit-inetutils@gnu.org; Thu, 15 Aug 2013 05:09:00 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:41648)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1V9tY9-0006o2-QJ
	for commit-inetutils@gnu.org; Thu, 15 Aug 2013 05:08:59 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1V9tY8-0006Pg-Ar
	for commit-inetutils@gnu.org; Thu, 15 Aug 2013 05:08:57 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:50292)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1V9tY8-0006Pc-7N
	for commit-inetutils@gnu.org; Thu, 15 Aug 2013 05:08:56 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1V9tY7-0002hW-EF
	for commit-inetutils@gnu.org; Thu, 15 Aug 2013 09:08:55 +0000
Date: Thu, 15 Aug 2013 09:08:55 +0000
Message-Id: <E1V9tY7-0002hW-EF@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_1-321-ga1b9dbf
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: ae099cde5bb2de9ebf4cdf012c5a05aa5a92bc84
X-Git-Newrev: a1b9dbff1bd4b634716ed01996fa1e8577bea354
From: Mats Erik Andersson <gnu@gisladisker.se>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
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 Aug 2013 09:08:59 -0000

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

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


commit a1b9dbff1bd4b634716ed01996fa1e8577bea354
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Thu Aug 15 11:11:46 2013 +0200

    Make test robust.

diff --git a/ChangeLog b/ChangeLog
index 0d3c0b0..5594da0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-08-15  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	* tests/inetd.sh (write_conf): Use numerical address
+	for localhost.  This avoids dependency on system set-up.
+
 2013-08-14  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	* tests/inetd.sh: New file.
diff --git a/tests/inetd.sh b/tests/inetd.sh
index c990b9c..e16f9a5 100755
--- a/tests/inetd.sh
+++ b/tests/inetd.sh
@@ -115,7 +115,7 @@ clean_testdir () {
 # Write a fresh configuration file.  Port is input parameter.
 write_conf () {
     # First argument is port number.  Node is fixed as localhost.
-    echo "localhost:$1 stream tcp4 nowait $USER $ADDRPEEK addrpeek addr" \
+    echo "127.0.0.1:$1 stream tcp4 nowait $USER $ADDRPEEK addrpeek addr" \
 	> $CONF
 }
 

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

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


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Thu Aug 15 16:27:15 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VA48Z-0007Tc-HC
	for mharc-commit-inetutils@gnu.org; Thu, 15 Aug 2013 16:27:15 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:47555)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1VA48V-0007TQ-GK
	for commit-inetutils@gnu.org; Thu, 15 Aug 2013 16:27:13 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1VA48T-0005Q0-4x
	for commit-inetutils@gnu.org; Thu, 15 Aug 2013 16:27:11 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:46555)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1VA48T-0005Pw-20
	for commit-inetutils@gnu.org; Thu, 15 Aug 2013 16:27:09 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1VA48S-0003FL-Cs
	for commit-inetutils@gnu.org; Thu, 15 Aug 2013 20:27:08 +0000
Date: Thu, 15 Aug 2013 20:27:08 +0000
Message-Id: <E1VA48S-0003FL-Cs@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_1-322-ga936ebb
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: a1b9dbff1bd4b634716ed01996fa1e8577bea354
X-Git-Newrev: a936ebb7251ca745673a5cdd518eb48ef2903f21
From: Mats Erik Andersson <gnu@gisladisker.se>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
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 Aug 2013 20:27:13 -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  a936ebb7251ca745673a5cdd518eb48ef2903f21 (commit)
      from  a1b9dbff1bd4b634716ed01996fa1e8577bea354 (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=a936ebb7251ca745673a5cdd518eb48ef2903f21


commit a936ebb7251ca745673a5cdd518eb48ef2903f21
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Thu Aug 15 22:24:48 2013 +0200

    Needing tty for inetd test.

diff --git a/ChangeLog b/ChangeLog
index 5594da0..0ca59dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2013-08-15  Mats Erik Andersson  <gnu@gisladisker.se>
 
+	* tests/inetd.sh: Skip test in absence of assigned TTY.
+	This is needed due to the use of a built `telnet'.
+
+2013-08-15  Mats Erik Andersson  <gnu@gisladisker.se>
+
 	* tests/inetd.sh (write_conf): Use numerical address
 	for localhost.  This avoids dependency on system set-up.
 
diff --git a/tests/inetd.sh b/tests/inetd.sh
index e16f9a5..b452ad0 100755
--- a/tests/inetd.sh
+++ b/tests/inetd.sh
@@ -67,6 +67,14 @@ if test -n "$VERBOSE"; then
     $INETD --version | $SED '1q'
 fi
 
+# The use of telnet is portable only with a connected TTY.
+if tty >/dev/null; then
+    :
+else
+    echo >&2 'No TTY is assigned to this process.  Skipping test.'
+    exit 77
+fi
+
 # For file creation below IU_TESTDIR.
 umask 0077
 

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

Summary of changes:
 ChangeLog      |    5 +++++
 tests/inetd.sh |    8 ++++++++
 2 files changed, 13 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Fri Aug 23 19:13:48 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VD0Y7-0005BM-W9
	for mharc-commit-inetutils@gnu.org; Fri, 23 Aug 2013 19:13:48 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:35997)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1VD0Y4-0005B5-63
	for commit-inetutils@gnu.org; Fri, 23 Aug 2013 19:13:45 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1VD0Y1-0003x9-Qb
	for commit-inetutils@gnu.org; Fri, 23 Aug 2013 19:13:44 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:45393)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1VD0Y1-0003x4-Mq
	for commit-inetutils@gnu.org; Fri, 23 Aug 2013 19:13:41 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1VD0Y1-0005H7-3p
	for commit-inetutils@gnu.org; Fri, 23 Aug 2013 23:13:41 +0000
Date: Fri, 23 Aug 2013 23:13:41 +0000
Message-Id: <E1VD0Y1-0005H7-3p@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_1-323-g7bf459b
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: a936ebb7251ca745673a5cdd518eb48ef2903f21
X-Git-Newrev: 7bf459b53e0faacbb14de13e8e5571085109907b
From: Mats Erik Andersson <gnu@gisladisker.se>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
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, 23 Aug 2013 23:13: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  7bf459b53e0faacbb14de13e8e5571085109907b (commit)
      from  a936ebb7251ca745673a5cdd518eb48ef2903f21 (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=7bf459b53e0faacbb14de13e8e5571085109907b


commit 7bf459b53e0faacbb14de13e8e5571085109907b
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Mon Aug 19 00:01:40 2013 +0200

    Run inetd test without tty.

diff --git a/ChangeLog b/ChangeLog
index 0ca59dc..fd02225 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2013-08-18  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	* tests/Makefile.am (check_PROGRAMS) [ENABLE_inetd]:
+	Add tcpget.
+	* tests/inetd.sh (TARGET, TCPGET): New variables.
+	(TELNET): Remove variable.
+	Remove check for tty.  Use TARGET for host addressing.
+	Use `tcpget' instead of `telnet', which allows the
+	test to be performed by build robots.
+	* tests/tcpget.c: New file.
+
 2013-08-15  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	* tests/inetd.sh: Skip test in absence of assigned TTY.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 4f53921..7b64e3b 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -23,7 +23,7 @@ LDADD = $(iu_LIBRARIES)
 
 check_PROGRAMS = localhost readutmp waitdaemon
 if ENABLE_inetd
-check_PROGRAMS += addrpeek
+check_PROGRAMS += addrpeek tcpget
 endif
 
 dist_check_SCRIPTS = utmp.sh
diff --git a/tests/inetd.sh b/tests/inetd.sh
index b452ad0..9fb6347 100755
--- a/tests/inetd.sh
+++ b/tests/inetd.sh
@@ -41,11 +41,14 @@ $need_mktemp || exit_no_mktemp
 #
 do_cleandir=false
 
+# Select numerical target address, only IPv4.
+TARGET=${TARGET:-127.0.0.1}
+
 # Executable under test and helper functionality.
 #
 INETD=${INETD:-../src/inetd$EXEEXT}
-TELNET=${TELNET:-../telnet/telnet$EXEEXT}
 ADDRPEEK=${ADDRPEEK:-$PWD/addrpeek$EXEEXT}
+TCPGET=${TCPGET:-$PWD/tcpget$EXEEXT}
 
 if test ! -x $ADDRPEEK; then
     echo >&2 "No executable '$ADDRPEEK' present.  Skipping test."
@@ -57,8 +60,8 @@ if [ ! -x $INETD ]; then
     exit 77
 fi
 
-if [ ! -x $TELNET ]; then
-    echo "Missing executable '$TELNET'.  Skipping test." >&2
+if test ! -x $TCPGET; then
+    echo >&2 "No executable '$TCPGET' present.  Skipping test."
     exit 77
 fi
 
@@ -67,14 +70,6 @@ if test -n "$VERBOSE"; then
     $INETD --version | $SED '1q'
 fi
 
-# The use of telnet is portable only with a connected TTY.
-if tty >/dev/null; then
-    :
-else
-    echo >&2 'No TTY is assigned to this process.  Skipping test.'
-    exit 77
-fi
-
 # For file creation below IU_TESTDIR.
 umask 0077
 
@@ -122,8 +117,8 @@ clean_testdir () {
 
 # Write a fresh configuration file.  Port is input parameter.
 write_conf () {
-    # First argument is port number.  Node is fixed as localhost.
-    echo "127.0.0.1:$1 stream tcp4 nowait $USER $ADDRPEEK addrpeek addr" \
+    # First argument is port number.  Node is fixed.
+    echo "$TARGET:$1 stream tcp4 nowait $USER $ADDRPEEK addrpeek addr" \
 	> $CONF
 }
 
@@ -147,8 +142,8 @@ else
     # Repeated SIGHUP testing, with modified port.
     for nn in 1 2 3 4 5; do
 	# Check for response at chosen port.
-	$TELNET -c -E -K -4 localhost $PORT 2>/dev/null |
-	    grep 'Your address is 127.0.0.1.' >/dev/null 2>&1 || errno=1
+	$TCPGET $TARGET $PORT 2>/dev/null |
+	    grep "Your address is $TARGET." >/dev/null 2>&1 || errno=1
 
 	test $errno -eq 0 ||
 	    { echo >&2 "Repetition $nn failed."; break; }
diff --git a/tests/tcpget.c b/tests/tcpget.c
new file mode 100644
index 0000000..0c4edda
--- /dev/null
+++ b/tests/tcpget.c
@@ -0,0 +1,125 @@
+/* tcpget - get single response from a TCP port.
+  Copyright (C) 2013 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/* Written by Mats Erik Andersson.  */
+
+/* Tcpget receives and displays whatever text a server cares to send
+ * without any interaction from a client and within a set time period.
+ * An alarm timer is set to five seconds by default, but the limit
+ * can be set to another value with a command line switch, starting
+ * at one second, but limited upwards to one hour!
+ *
+ * Invocation:
+ *
+ *   tcpget [-t secs] host tcp-port
+ */
+
+#include <config.h>
+
+#include <stdio.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <netdb.h>
+#include <progname.h>
+#ifdef HAVE_LOCALE_H
+# include <locale.h>
+#endif
+
+int
+main (int argc, char *argv[])
+{
+  int fd, opt, rc;
+  int timeout = 5;	/* Defaulting to five seconds of waiting time.  */
+  char buffer[256];
+  struct addrinfo hints, *ai, *res;
+
+  set_program_name (argv[0]);
+
+#ifdef HAVE_SETLOCALE
+  setlocale (LC_ALL, "");
+#endif
+
+  while ((opt = getopt (argc, argv, "t:")) != -1)
+    {
+      int t;
+
+      switch (opt)
+	{
+	case 't':
+	  t = atoi (optarg);
+	  if (t > 0 && t <= 3600 /* on hour */)
+	    timeout = t;
+	  break;
+
+	default:
+	  fprintf (stderr, "Usage: %s [-t secs] host port\n", argv[0]);
+	  exit (EXIT_FAILURE);
+	}
+    }
+
+  if (argc < optind + 2)
+    return (EXIT_FAILURE);
+
+  memset (&hints, 0, sizeof (hints));
+  hints.ai_family = AF_UNSPEC;
+  hints.ai_socktype = SOCK_STREAM;
+
+  rc = getaddrinfo (argv[optind], argv[optind + 1], &hints, &res);
+
+  if (rc)
+    {
+      fprintf (stderr, "%s: %s\n", argv[0], gai_strerror (rc));
+      return (EXIT_FAILURE);
+    }
+
+  for (ai = res; ai; ai = ai->ai_next)
+    {
+      fd = socket (ai->ai_family, ai->ai_socktype, ai->ai_protocol);
+      if (fd < 0)
+	continue;
+
+      if (connect (fd, ai->ai_addr, ai->ai_addrlen) >= 0)
+	break;
+
+      close (fd);
+    }
+
+  freeaddrinfo (res);
+
+  if (ai && (fd >= 0))
+    {
+      ssize_t n;
+
+      alarm (timeout);
+
+      while ((n = recv (fd, buffer, sizeof (buffer), 0)))
+	write (STDOUT_FILENO, buffer, n);
+
+      close (fd);
+    }
+
+  close (STDIN_FILENO);
+  close (STDOUT_FILENO);
+  close (STDERR_FILENO);
+
+  return EXIT_SUCCESS;
+}

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

Summary of changes:
 ChangeLog         |   11 +++++
 tests/Makefile.am |    2 +-
 tests/inetd.sh    |   25 ++++------
 tests/tcpget.c    |  125 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 147 insertions(+), 16 deletions(-)
 create mode 100644 tests/tcpget.c


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Sun Aug 25 13:21:35 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VDe0N-0002Un-Hk
	for mharc-commit-inetutils@gnu.org; Sun, 25 Aug 2013 13:21:35 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:56083)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1VDe0K-0002Te-Jx
	for commit-inetutils@gnu.org; Sun, 25 Aug 2013 13:21:33 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1VDe0J-0000fC-HA
	for commit-inetutils@gnu.org; Sun, 25 Aug 2013 13:21:32 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:32856)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1VDe0J-0000f8-DG
	for commit-inetutils@gnu.org; Sun, 25 Aug 2013 13:21:31 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1VDe0I-0000d7-Mc
	for commit-inetutils@gnu.org; Sun, 25 Aug 2013 17:21:31 +0000
Date: Sun, 25 Aug 2013 17:21:30 +0000
Message-Id: <E1VDe0I-0000d7-Mc@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_1-324-gd01210d
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 7bf459b53e0faacbb14de13e8e5571085109907b
X-Git-Newrev: d01210da4810bbcee9f3f5cfad37a654639468ea
From: Mats Erik Andersson <gnu@gisladisker.se>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
	<commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 25 Aug 2013 17:21:33 -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  d01210da4810bbcee9f3f5cfad37a654639468ea (commit)
      from  7bf459b53e0faacbb14de13e8e5571085109907b (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=d01210da4810bbcee9f3f5cfad37a654639468ea


commit d01210da4810bbcee9f3f5cfad37a654639468ea
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Sun Aug 25 19:23:00 2013 +0200

    False negative in test.

diff --git a/ChangeLog b/ChangeLog
index fd02225..6f2139e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2013-08-25  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	False negative while testing syslogd.
+
+	* tests/syslogd.sh (iu_socklen_max): Do not accept
+	`GNU/kFreeBSD' as a system supporting unix sockets
+	of length 108.
+
 2013-08-18  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	* tests/Makefile.am (check_PROGRAMS) [ENABLE_inetd]:
diff --git a/tests/syslogd.sh b/tests/syslogd.sh
index 93ad0a1..85a8fb2 100755
--- a/tests/syslogd.sh
+++ b/tests/syslogd.sh
@@ -91,8 +91,7 @@ do_standard_port=true
 iu_socklen_max=104	# BSD flavour!
 
 IU_OS=`uname -s`
-if test "$IU_OS" = "Linux" || test "$IU_OS" = "GNU/kFreeBSD" ||
-	test "$IU_OS" = "SunOS"; then
+if test "$IU_OS" = "Linux" || test "$IU_OS" = "SunOS"; then
     # Aim at the boundary of 108 characters.
     iu_socklen_max=108
 fi

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

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


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Fri Aug 30 09:51:48 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VFP76-0004C7-8u
	for mharc-commit-inetutils@gnu.org; Fri, 30 Aug 2013 09:51:48 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:36582)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1VFP73-0004Bp-HV
	for commit-inetutils@gnu.org; Fri, 30 Aug 2013 09:51:46 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1VFP6x-0004GN-FN
	for commit-inetutils@gnu.org; Fri, 30 Aug 2013 09:51:45 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:60423)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1VFP6x-0004GI-CE
	for commit-inetutils@gnu.org; Fri, 30 Aug 2013 09:51:39 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1VFP6w-0003Fw-Gu
	for commit-inetutils@gnu.org; Fri, 30 Aug 2013 13:51:38 +0000
Date: Fri, 30 Aug 2013 13:51:38 +0000
Message-Id: <E1VFP6w-0003Fw-Gu@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_1-325-gab8e5c4
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: d01210da4810bbcee9f3f5cfad37a654639468ea
X-Git-Newrev: ab8e5c4d8079ecb1278b9724e04d98e093ef5e23
From: Mats Erik Andersson <gnu@gisladisker.se>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
	<commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 30 Aug 2013 13:51:46 -0000

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

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


commit ab8e5c4d8079ecb1278b9724e04d98e093ef5e23
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Wed Aug 28 12:59:42 2013 +0200

    ftp: Secrecy in debug mode.

diff --git a/ChangeLog b/ChangeLog
index 6f2139e..b88741d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2013-08-28  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	ftp: Secrecy in debug mode.
+
+	* ftp/ftp.c (command) <debug>: Insert a missing `else'.
+	This avoids displaying the password in clear text.
+	Problem introduced in a change made 2013-05-17.
+
 2013-08-25  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	False negative while testing syslogd.
diff --git a/ftp/ftp.c b/ftp/ftp.c
index 7e3e41e..c9b5aaf 100644
--- a/ftp/ftp.c
+++ b/ftp/ftp.c
@@ -396,7 +396,7 @@ command (const char *fmt, ...)
       va_start (ap, fmt);
       if (strncmp ("PASS ", fmt, 5) == 0)
 	printf ("PASS XXXX");
-      if (strncmp ("ACCT ", fmt, 5) == 0)
+      else if (strncmp ("ACCT ", fmt, 5) == 0)
 	printf ("ACCT XXXX");
       else
 	vfprintf (stdout, fmt, ap);

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

Summary of changes:
 ChangeLog |    8 ++++++++
 ftp/ftp.c |    2 +-
 2 files changed, 9 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Fri Aug 30 09:52:31 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VFP7n-0004FX-Dy
	for mharc-commit-inetutils@gnu.org; Fri, 30 Aug 2013 09:52:31 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:36776)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1VFP7i-0004FN-M5
	for commit-inetutils@gnu.org; Fri, 30 Aug 2013 09:52:29 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1VFP7f-0004Q2-W8
	for commit-inetutils@gnu.org; Fri, 30 Aug 2013 09:52:26 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:60450)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1VFP7f-0004Py-Rj
	for commit-inetutils@gnu.org; Fri, 30 Aug 2013 09:52:23 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1VFP7f-0003IM-7X
	for commit-inetutils@gnu.org; Fri, 30 Aug 2013 13:52:23 +0000
Date: Fri, 30 Aug 2013 13:52:23 +0000
Message-Id: <E1VFP7f-0003IM-7X@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_1-326-g309ba4a
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: ab8e5c4d8079ecb1278b9724e04d98e093ef5e23
X-Git-Newrev: 309ba4a5419830ed357d18979a8b34944d0ce6ad
From: Mats Erik Andersson <gnu@gisladisker.se>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
	<commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 30 Aug 2013 13:52: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  309ba4a5419830ed357d18979a8b34944d0ce6ad (commit)
      from  ab8e5c4d8079ecb1278b9724e04d98e093ef5e23 (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=309ba4a5419830ed357d18979a8b34944d0ce6ad


commit 309ba4a5419830ed357d18979a8b34944d0ce6ad
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Wed Aug 28 16:43:49 2013 +0200

    Portability of Unix macros.

diff --git a/ChangeLog b/ChangeLog
index b88741d..88eaa18 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,61 @@
 2013-08-28  Mats Erik Andersson  <gnu@gisladisker.se>
 
+	Identification of unices.  Check `__unix' and
+	`__unix__' in addition to `unix'.  This is needed
+	for `ftp' with GCC on NetBSD, OpenBSD.  Both macros
+	are necessary to distinguish AIX and HP-UX!
+
+	* ftp/cmds.c (setpeer)
+	[(unix || __unix || __unix__) && (NBBY==8)]: Add
+	macros __unix and __unix__ in conditional; this
+	sends initial SYST request from NetBSD and OpenBSD.
+
+	* ftpd/ftpcmd.y (cmd) [unix || __unix || __unix__]:
+	Likewise; announce system as UNIX.
+
+	* telnet/commands.c (Togglelist, filestuff)
+	[(unix || __unix || __unix__) && TN3270]: Likewise.
+	(status, transcomhelp)
+	[(unix || __unix || __unix__) && TN3270]: Likewise.
+	(zhelp) [unix || __unix || __unix__]: Likewise.
+	(cmdtab) [unix || __unix || __unix__]
+	<cases "transcom", "z">: Likewise.
+	(command) [unix || __unix || __unix__] <!top>:
+	Likewise; ignore SIGINT and SIGQUIT.
+	* telnet/main.c (argp_options)
+	[(unix || __unix || __unix__) && TN3270]: Likewise.
+	(parse_opt) [(unix || __unix || __unix__) && TN3270]
+	<case 't'>: Likewise.
+	* telnet/telnet.c [unix || __unix || __unix__]:
+	Likewise; include <signal.h>.
+	(Scheduler) [(unix || __unix || __unix__) && TN3270]:
+	Likewise.
+	* telnet/tn3270.c (HaveInput, cursesdata, sigiocount)
+	(tline, transcom) [(unix || __unix || __unix__) && TN3270]:
+	Likewise.
+	(init_3270, inputAvailable, DataToTerminal, Finish3270)
+	(settranscom) [(unix || __unix || __unix__) && TN3270]:
+	Likewise.
+	* telnet/utilities.c (EmptyTerminal)
+	[unix || __unix || __unix__]: Likewise; handle fdset.
+
+	Check macro `__sun' to detect Solaris.  Possibly
+	the code is portable also to Solaris Studio.
+
+	* ifconfig/system.c [!__linux__]: Check macro  __sun,
+	not the less portable __sun__.
+	* ifconfig/system.h [!__linux__]: Likewise.
+	* ping/ping6.c: Likewise.
+
+
+	Helper program for identifying build environments.
+
+	* tests/identify.c: New file.
+	* tests/Makefile.am (noinst_PROGRAMS, identify_LDADD):
+	New variables.
+
+2013-08-28  Mats Erik Andersson  <gnu@gisladisker.se>
+
 	ftp: Secrecy in debug mode.
 
 	* ftp/ftp.c (command) <debug>: Insert a missing `else'.
diff --git a/ftp/cmds.c b/ftp/cmds.c
index 45c870a..e6904ea 100644
--- a/ftp/cmds.c
+++ b/ftp/cmds.c
@@ -288,7 +288,7 @@ setpeer (int argc, char **argv)
       if (autologin)
 	login (host);
 
-#if defined unix && NBBY == 8
+#if (defined unix || defined __unix || defined __unix__) && NBBY == 8
 /*
  * this ifdef is to keep someone form "porting" this to an incompatible
  * system and not checking this out. This way they have to think about it.
@@ -342,7 +342,7 @@ setpeer (int argc, char **argv)
 	      ("Remember to set tenex mode when transfering binary files from this machine.\n");
 	}
       verbose = overbose;
-#endif /* unix */
+#endif /* (unix || __unix || __unix__) && (NBBY == 8) */
     }
 }
 
diff --git a/ftpd/ftpcmd.y b/ftpd/ftpcmd.y
index 3c77d7a..5e126f5 100644
--- a/ftpd/ftpcmd.y
+++ b/ftpd/ftpcmd.y
@@ -542,7 +542,7 @@ cmd
 # endif /* BSD */
 #endif /* !HAVE_UNAME */
 
-#if defined unix || defined __unix__
+#if defined unix || defined __unix || defined __unix__
 			sys_type = "UNIX";
 #else
 			sys_type = "UNKNOWN";
diff --git a/ifconfig/system.c b/ifconfig/system.c
index 0fd5ad8..7c00597 100644
--- a/ifconfig/system.c
+++ b/ifconfig/system.c
@@ -21,7 +21,7 @@
 
 #if defined __linux__
 # include "system/linux.c"
-#elif defined __sun__
+#elif defined __sun
 # include "system/solaris.c"
 #elif defined __QNX__
 # include "system/qnx.c"
diff --git a/ifconfig/system.h b/ifconfig/system.h
index 7ff5f56..7bc297d 100644
--- a/ifconfig/system.h
+++ b/ifconfig/system.h
@@ -89,7 +89,7 @@ extern struct if_nameindex* (*system_if_nameindex) (void);
 
 # if defined __linux__
 #  include "system/linux.h"
-# elif defined __sun__
+# elif defined __sun
 #  include "system/solaris.h"
 # elif defined __QNX__
 #  include "system/qnx.h"
diff --git a/ping/ping6.c b/ping/ping6.c
index 7cdf991..ef0c584 100644
--- a/ping/ping6.c
+++ b/ping/ping6.c
@@ -19,9 +19,9 @@
 
 #include <config.h>
 
-#ifdef __sun__
+#ifdef __sun
 #  define _XPG4_2	1	/* OpenSolaris: msg_control */
-#endif /* __sun__ */
+#endif /* __sun */
 
 #include <sys/socket.h>
 #include <sys/time.h>
diff --git a/telnet/commands.c b/telnet/commands.c
index 944516e..a9ed244 100644
--- a/telnet/commands.c
+++ b/telnet/commands.c
@@ -826,7 +826,7 @@ static struct togglelist Togglelist[] = {
    &localchars,
    "recognize certain control characters"},
   {" ", "", 0, NULL, NULL},			/* empty line */
-#if defined unix && defined TN3270
+#if (defined unix || defined __unix || defined __unix__) && defined TN3270
   {"apitrace",
    "(debugging) toggle tracing of API transactions",
    0,
@@ -837,7 +837,7 @@ static struct togglelist Togglelist[] = {
    0,
    &cursesdata,
    "print hexadecimal representation of curses data"},
-#endif /* defined(unix) && defined(TN3270) */
+#endif /* (unix || __unix || __unix__)) && TN3270 */
   {"debug",
    "debugging",
    togdebug,
@@ -2306,7 +2306,7 @@ encrypt_cmd (int argc, char *argv[])
 }
 #endif /* ENCRYPTION */
 
-#if defined unix && defined TN3270
+#if (defined unix || defined __unix || defined __unix__) && defined TN3270
 static void
 filestuff (int fd)
 {
@@ -2335,7 +2335,7 @@ filestuff (int fd)
       return;
     }
 }
-#endif /* defined(unix) && defined(TN3270) */
+#endif /* (unix || __unix || __unix__) && TN3270 */
 
 /*
  * Print status about the connection.
@@ -2392,7 +2392,7 @@ status (int argc, char *argv[])
     {
       printf ("Escape character is '%s'.\n", control (escape));
     }
-# if defined unix
+# if defined unix || defined __unix || defined __unix__
   if ((argc >= 2) && !strcmp (argv[1], "everything"))
     {
       printf ("SIGIO received %d time%s.\n",
@@ -2413,7 +2413,7 @@ status (int argc, char *argv[])
     {
       printf ("Transparent mode command is '%s'.\n", transcom);
     }
-# endif	/* defined(unix) */
+# endif /* unix || __unix || __unix__ */
   fflush (stdout);
   if (In3270)
     {
@@ -2827,10 +2827,9 @@ static char
   togglestring[] = "toggle operating parameters ('toggle ?' for more)",
   slchelp[] = "change state of special characters ('slc ?' for more)",
   displayhelp[] = "display operating parameters",
-#if defined TN3270 && defined unix
+#if defined TN3270 && (defined unix || defined __unix || defined __unix__)
   transcomhelp[] = "specify Unix command for transparent mode pipe",
-#endif
-  /* defined(TN3270) && defined(unix) */
+#endif /* TN3270 && (unix || __unix || __unix__) */
 #if defined AUTHENTICATION
   authhelp[] = "turn on (off) authentication ('auth ?' for more)",
 #endif
@@ -2838,10 +2837,9 @@ static char
   encrypthelp[] = "turn on (off) encryption ('encrypt ?' for more)",
 #endif
   /* ENCRYPTION */
-#if defined unix
+#if defined unix || defined __unix || defined __unix__
   zhelp[] = "suspend telnet",
-#endif
-  /* defined(unix) */
+#endif /* unix || __unix || __unix__ */
   shellhelp[] = "invoke a subshell",
   envhelp[] = "change environment variables ('environ ?' for more)",
   modestring[] = "try to enter line or character mode ('mode ?' for more)";
@@ -2861,18 +2859,18 @@ static Command cmdtab[] = {
   {"status", statushelp, status, 0},
   {"toggle", togglestring, toggle, 0},
   {"slc", slchelp, slccmd, 0},
-#if defined TN3270 && defined unix
+#if defined TN3270 && (defined unix || defined __unix || defined __unix__)
   {"transcom", transcomhelp, settranscom, 0},
-#endif /* defined(TN3270) && defined(unix) */
+#endif /* TN3270 && (unix || __unix || __unix__) */
 #if defined AUTHENTICATION
   {"auth", authhelp, auth_cmd, 0},
 #endif
 #ifdef	ENCRYPTION
   {"encrypt", encrypthelp, encrypt_cmd, 0},
 #endif /* ENCRYPTION */
-#if defined unix
+#if defined unix || defined __unix || defined __unix__
   {"z", zhelp, suspend, 0},
-#endif /* defined(unix) */
+#endif /* unix || __unix || __unix__ */
 #if defined TN3270
   {"!", shellhelp, shell, 1},
 #else
@@ -2934,13 +2932,13 @@ command (int top, char *tbuf, int cnt)
   if (!top)
     {
       putchar ('\n');
-#if defined unix
+#if defined unix || defined __unix || defined __unix__
     }
   else
     {
       signal (SIGINT, SIG_DFL);
       signal (SIGQUIT, SIG_DFL);
-#endif /* defined(unix) */
+#endif /* unix || __unix || __unix__ */
     }
   for (;;)
     {
diff --git a/telnet/main.c b/telnet/main.c
index ed350fe..419462a 100644
--- a/telnet/main.c
+++ b/telnet/main.c
@@ -183,7 +183,7 @@ static struct argp_option argp_options[] = {
 # undef GRID
 #endif
 
-#if defined TN3270 && defined unix
+#if defined TN3270 && (defined unix || defined __unix || defined __unix__)
 # define GRID 40
   { NULL, 0, NULL, 0,
     "TN3270 support:", GRID },
@@ -193,7 +193,7 @@ static struct argp_option argp_options[] = {
   { "noasynctty", OPTION_NOASYNCTTY, NULL, 0, "", GRID+1 },
   { "noasyncnet", OPTION_NOASYNCNET, NULL, 0, "", GRID+1 },
 # undef GRID
-#endif
+#endif /* TN3270 && (unix || __unix || __unix__) */
   { NULL, 0, NULL, 0, NULL, 0 }
 };
 
@@ -285,7 +285,7 @@ parse_opt (int key, char *arg, struct argp_state *state _GL_UNUSED_PARAMETER)
       rlogin = '~';
       break;
 
-#if defined TN3270 && defined unix
+#if defined TN3270 && (defined unix || defined __unix || defined __unix__)
     case 't':
       /* FIXME: Buffer!!! */
       transcom = tline;
@@ -303,7 +303,7 @@ parse_opt (int key, char *arg, struct argp_state *state _GL_UNUSED_PARAMETER)
     case OPTION_NOASYNCNET:
       noasynchnet = 1;
       break;
-#endif
+#endif /* TN3270 && (unix || __unix || __unix__) */
 
 #ifdef	ENCRYPTION
     case 'x':
diff --git a/telnet/telnet.c b/telnet/telnet.c
index 694b8f8..73406ed 100644
--- a/telnet/telnet.c
+++ b/telnet/telnet.c
@@ -51,13 +51,13 @@
 
 #include <sys/types.h>
 
-#if defined unix
+#if defined unix || defined __unix || defined __unix__
 # include <signal.h>
 /* By the way, we need to include curses.h before telnet.h since,
  * among other things, telnet.h #defines 'DO', which is a variable
  * declared in curses.h.
  */
-#endif /* defined(unix) */
+#endif /* unix || __unix || __unix__ */
 
 #include <arpa/telnet.h>
 
@@ -2353,13 +2353,13 @@ Scheduler (int block)
   netex = !SYNCHing;
 
   /* If we have seen a signal recently, reset things */
-#if defined TN3270 && defined unix
+#if defined TN3270 && (defined unix || defined __unix || defined __unix__)
   if (HaveInput)
     {
       HaveInput = 0;
       signal (SIGIO, inputAvailable);
     }
-#endif /* defined(TN3270) && defined(unix) */
+#endif /* TN3270 && (unix || __unix || __unix__) */
 
   /* Call to system code to process rings */
 
diff --git a/telnet/tn3270.c b/telnet/tn3270.c
index 96e8b30..969dc38 100644
--- a/telnet/tn3270.c
+++ b/telnet/tn3270.c
@@ -66,14 +66,14 @@
 # include "../sys_curses/telextrn.h"
 # include "../ctlr/externs.h"
 
-# if defined unix
+# if defined unix || defined __unix || defined __unix__
 int HaveInput,			/* There is input available to scan */
   cursesdata,			/* Do we dump curses data? */
   sigiocount;			/* Number of times we got a SIGIO */
 
 char tline[200];
 char *transcom = 0;		/* transparent mode command (default: none) */
-# endif	/* defined(unix) */
+# endif	/* unix || __unix || __unix__ */
 
 char Ibuf[8 * BUFSIZ], *Ifrontp, *Ibackp;
 
@@ -94,10 +94,10 @@ void
 init_3270 (void)
 {
 #if defined TN3270
-# if defined unix
+# if defined unix || defined __unix || defined __unix__
   HaveInput = 0;
   sigiocount = 0;
-# endif	/* defined(unix) */
+# endif	/* unix || __unix || __unix__ */
   Sent3270TerminalType = 0;
   Ifrontp = Ibackp = Ibuf;
   init_ctlr ();			/* Initialize some things */
@@ -184,14 +184,14 @@ DataToNetwork (register char *buffer, register int count, int done)
 }
 
 
-# if defined unix
+# if defined unix || defined __unix || defined __unix__
 void
 inputAvailable (int signo)
 {
   HaveInput = 1;
   sigiocount++;
 }
-# endif	/* defined(unix) */
+# endif	/* unix || __unix || __unix__ */
 
 void
 outputPurge ()
@@ -226,19 +226,19 @@ DataToTerminal (register char *buffer, register int count)
     {
       if (TTYROOM () == 0)
 	{
-# if defined unix
+# if defined unix || defined __unix || defined __unix__
 	  fd_set o;
 
 	  FD_ZERO (&o);
-# endif	/* defined(unix) */
+# endif	/* unix || __unix || __unix__ */
 	  ttyflush (0);
 	  while (TTYROOM () == 0)
 	    {
-# if defined unix
+# if defined unix || defined __unix || defined __unix__
 	      FD_SET (tout, &o);
 	      select (tout + 1, (fd_set *) 0, &o, (fd_set *) 0,
 		      (struct timeval *) 0);
-# endif	/* defined(unix) */
+# endif	/* unix || __unix || __unix__ */
 	      ttyflush (0);
 	    }
 	}
@@ -294,9 +294,9 @@ Finish3270 ()
 {
   while (Push3270 () || !DoTerminalOutput ())
     {
-# if defined unix
+# if defined unix || defined __unix || defined __unix__
       HaveInput = 0;
-# endif	/* defined(unix) */
+# endif	/* unix || __unix || __unix__ */
       ;
     }
 }
@@ -431,7 +431,7 @@ tn3270_ttype ()
     }
 }
 
-# if defined unix
+# if defined unix || defined __unix || defined __unix__
 int
 settranscom (int argc, char *argv[])
 {
@@ -454,6 +454,6 @@ settranscom (int argc, char *argv[])
     }
   return 1;
 }
-# endif	/* defined(unix) */
+# endif	/* unix || __unix || __unix__ */
 
 #endif /* defined(TN3270) */
diff --git a/telnet/utilities.c b/telnet/utilities.c
index 1c29649..567e07e 100644
--- a/telnet/utilities.c
+++ b/telnet/utilities.c
@@ -994,28 +994,28 @@ printsub (char direction, unsigned char *pointer, int length)
 void
 EmptyTerminal (void)
 {
-#if defined unix
+#if defined unix || defined __unix || defined __unix__
   fd_set o;
 
   FD_ZERO (&o);
-#endif /* defined(unix) */
+#endif /* unix || __unix || __unix__ */
 
   if (TTYBYTES () == 0)
     {
-#if defined unix
+#if defined unix || defined __unix || defined __unix__
       FD_SET (tout, &o);
       select (tout + 1, (fd_set *) 0, &o, (fd_set *) 0, (struct timeval *) 0);	/* wait for TTLOWAT */
-#endif /* defined(unix) */
+#endif /* unix || __unix || __unix__ */
     }
   else
     {
       while (TTYBYTES ())
 	{
 	  ttyflush (0);
-#if defined unix
+#if defined unix || defined __unix || defined __unix__
 	  FD_SET (tout, &o);
 	  select (tout + 1, (fd_set *) 0, &o, (fd_set *) 0, (struct timeval *) 0);	/* wait for TTLOWAT */
-#endif /* defined(unix) */
+#endif /* unix || __unix || __unix__ */
 	}
     }
 }
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7b64e3b..8abff39 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -21,7 +21,11 @@ AM_CPPFLAGS = $(iu_INCLUDES)
 
 LDADD = $(iu_LIBRARIES)
 
+noinst_PROGRAMS = identify
+identify_LDADD =
+
 check_PROGRAMS = localhost readutmp waitdaemon
+
 if ENABLE_inetd
 check_PROGRAMS += addrpeek tcpget
 endif
diff --git a/tests/identify.c b/tests/identify.c
new file mode 100644
index 0000000..b4debf6
--- /dev/null
+++ b/tests/identify.c
@@ -0,0 +1,117 @@
+/* identify -- Probe system and report characteristica.
+  Copyright (C) 2013 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/* Written by Mats Erik Andersson.  */
+
+/* Collect information about this system and report it.
+ * Some identified characteristica of relevance to GNU Inetutils
+ * are displayed for use in bug reporting and resolution.
+ */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include <sys/param.h>
+#include <sys/utsname.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+
+#define tell_macro(a,b)	\
+  printf ("%s: %s\n", (b) ? "Available macro" : "Not defined", (a));
+
+int
+main (void)
+{
+  int a, ux;
+  struct utsname uts;
+  struct sockaddr_un su;
+
+  if (uname (&uts) < 0)
+    {
+      fprintf (stderr, "Not able to identify running system.\n");
+      exit (EXIT_FAILURE);
+    }
+
+  /* Identify the hardware.  */
+  printf ("Running system: %s, %s\n",
+	  uts.sysname, uts.machine);
+  printf (" Variant: %s\n", uts.release);
+  printf (" Variant: %s\n", uts.version);
+  puts ("");
+
+  /*
+   * Report on macros that determine alternate code.
+   * These depend on toolchains and hardware.
+   */
+  ux = 0;
+#ifdef unix
+  ux = 1;
+#endif
+  tell_macro ("unix", ux);
+
+  ux = 0;
+#ifdef __unix
+  ux = 1;
+#endif
+  tell_macro ("__unix", ux);
+
+  ux = 0;
+#ifdef __unix__
+  ux = 1;
+#endif
+  tell_macro ("__unix__", ux);
+
+  ux = 0;
+#ifdef __sun
+  ux = 1;
+#endif
+  tell_macro ("__sun", ux);
+
+  ux = 0;
+#ifdef __sun__
+  ux = 1;
+#endif
+  tell_macro ("__sun__", ux);
+
+  a = 0;
+#ifdef TN3270
+  a = 1;
+#endif
+  tell_macro ("TN3270", a);
+
+  /*
+   * Implementation specific charateristica.
+   */
+  puts ("");
+
+  a = 0;
+#ifdef BSD
+  a = 1;
+#endif
+  tell_macro ("BSD", a);
+
+  printf ("Size of 'struct sockaddr_un.sun_path': %zu\n",
+	  sizeof (su.sun_path));
+  return 0;
+}

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

Summary of changes:
 ChangeLog          |   56 +++++++++++++++++++++++++
 ftp/cmds.c         |    4 +-
 ftpd/ftpcmd.y      |    2 +-
 ifconfig/system.c  |    2 +-
 ifconfig/system.h  |    2 +-
 ping/ping6.c       |    4 +-
 telnet/commands.c  |   34 +++++++--------
 telnet/main.c      |    8 ++--
 telnet/telnet.c    |    8 ++--
 telnet/tn3270.c    |   28 ++++++------
 telnet/utilities.c |   12 +++---
 tests/Makefile.am  |    4 ++
 tests/identify.c   |  117 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 13 files changed, 228 insertions(+), 53 deletions(-)
 create mode 100644 tests/identify.c


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Fri Aug 30 09:53:32 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VFP8m-0005K0-Hk
	for mharc-commit-inetutils@gnu.org; Fri, 30 Aug 2013 09:53:32 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:37080)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1VFP8k-0005HK-8V
	for commit-inetutils@gnu.org; Fri, 30 Aug 2013 09:53:31 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1VFP8i-00054H-QN
	for commit-inetutils@gnu.org; Fri, 30 Aug 2013 09:53:30 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:48083)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1VFP8i-00054D-NR
	for commit-inetutils@gnu.org; Fri, 30 Aug 2013 09:53:28 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1VFP8a-0003LO-Pj
	for commit-inetutils@gnu.org; Fri, 30 Aug 2013 13:53:27 +0000
Date: Fri, 30 Aug 2013 13:53:23 +0000
Message-Id: <E1VFP8a-0003LO-Pj@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_1-327-g10ad51b
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 309ba4a5419830ed357d18979a8b34944d0ce6ad
X-Git-Newrev: 10ad51b87f6847531bb9cf92f4ec925d45ec9e94
From: Mats Erik Andersson <gnu@gisladisker.se>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
	<commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 30 Aug 2013 13:53:32 -0000

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

The branch, master has been updated
       via  10ad51b87f6847531bb9cf92f4ec925d45ec9e94 (commit)
      from  309ba4a5419830ed357d18979a8b34944d0ce6ad (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=10ad51b87f6847531bb9cf92f4ec925d45ec9e94


commit 10ad51b87f6847531bb9cf92f4ec925d45ec9e94
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Wed Aug 28 23:42:31 2013 +0200

    ftp: New command lpwd.

diff --git a/ChangeLog b/ChangeLog
index 88eaa18..4cb9028 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
 2013-08-28  Mats Erik Andersson  <gnu@gisladisker.se>
 
+	ftp: New command `lpwd'.
+
+	* ftp/cmds.c: Include "xgetcwd.h".
+	(lcd): Remove external prototype of xgetcwd().
+	(lpwd): New function.
+	* ftp/cmdtab.c (lpwdhelp): New variable.
+	(cmdtab): Add entry for `lpwd'.
+	* ftp/extern.h (lpwd): New prototype.
+
+	* ftp/main.c (argp_options) <-d/--debug>:
+	Improve relevance of help message.
+
+2013-08-28  Mats Erik Andersson  <gnu@gisladisker.se>
+
 	Identification of unices.  Check `__unix' and
 	`__unix__' in addition to `unix'.  This is needed
 	for `ftp' with GCC on NetBSD, OpenBSD.  Both macros
diff --git a/ftp/cmds.c b/ftp/cmds.c
index e6904ea..87a9d78 100644
--- a/ftp/cmds.c
+++ b/ftp/cmds.c
@@ -88,6 +88,7 @@
 #include "ftp_var.h"
 #include "unused-parameter.h"
 #include "xalloc.h"
+#include "xgetcwd.h"
 
 #ifndef DEFPORT
 # ifdef IPPORT_FTP
@@ -1360,7 +1361,6 @@ void
 lcd (int argc, char **argv)
 {
   char *dir;
-  extern char *xgetcwd ();
 
   if (argc < 2)
     argc++, argv[1] = home;
@@ -1725,6 +1725,25 @@ pwd (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
 }
 
 /*
+ * Print local working directory.
+ */
+void
+lpwd (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
+{
+  char *dir = xgetcwd ();
+
+  if (dir)
+    {
+      printf ("Local directory is %s\n", dir);
+      free (dir);
+    }
+  else
+    error (0, errno, "getcwd");
+
+  code = 0;
+}
+
+/*
  * Make a directory.
  */
 void
diff --git a/ftp/cmdtab.c b/ftp/cmdtab.c
index d872d36..ac79a79 100644
--- a/ftp/cmdtab.c
+++ b/ftp/cmdtab.c
@@ -84,6 +84,7 @@ char ipanyhelp[] = "allow all address families";
 char ipv4help[] = "select only IPv4 addresses";
 char ipv6help[] = "select only IPv6 addresses";
 char lcdhelp[] = "change local working directory";
+char lpwdhelp[] = "print local working directory";
 char lshelp[] = "list contents of remote directory";
 char macdefhelp[] = "define a macro";
 char mdeletehelp[] = "delete multiple files";
@@ -161,6 +162,7 @@ static struct cmd cmdtab[] = {
   {"ipv4", ipv4help, 0, 0, 0, setipv4},
   {"ipv6", ipv6help, 0, 0, 0, setipv6},
   {"lcd", lcdhelp, 0, 0, 0, lcd},
+  {"lpwd", lpwdhelp, 0, 0, 0, lpwd},
   {"ls", lshelp, 1, 1, 1, ls},
   {"macdef", macdefhelp, 0, 0, 0, macdef},
   {"mdelete", mdeletehelp, 1, 1, 1, mdelete},
diff --git a/ftp/extern.h b/ftp/extern.h
index 8acd0f7..dff99cf 100644
--- a/ftp/extern.h
+++ b/ftp/extern.h
@@ -88,6 +88,7 @@ void intr (int sig);
 void lcd (int, char **);
 int login (char *);
 void lostpeer (int sig);
+void lpwd (int, char **);
 void ls (int, char **);
 void mabort (int);
 void macdef (int, char **);
diff --git a/ftp/main.c b/ftp/main.c
index 9fe0f01..d12f6dc 100644
--- a/ftp/main.c
+++ b/ftp/main.c
@@ -100,7 +100,7 @@ enum {
 
 static struct argp_option argp_options[] = {
 #define GRP 0
-  {"debug", 'd', NULL, 0, "set the SO_DEBUG option", GRP+1},
+  {"debug", 'd', NULL, 0, "enable debugging output", GRP+1},
   {"no-edit", 'e', NULL, 0,
 #if HAVE_READLINE
 	  "disable command line editing",

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

Summary of changes:
 ChangeLog    |   14 ++++++++++++++
 ftp/cmds.c   |   21 ++++++++++++++++++++-
 ftp/cmdtab.c |    2 ++
 ftp/extern.h |    1 +
 ftp/main.c   |    2 +-
 5 files changed, 38 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Fri Aug 30 09:54:24 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VFP9c-0006VC-Sn
	for mharc-commit-inetutils@gnu.org; Fri, 30 Aug 2013 09:54:24 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:37398)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1VFP9Y-0006QJ-17
	for commit-inetutils@gnu.org; Fri, 30 Aug 2013 09:54:22 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1VFP9V-0005TV-Lo
	for commit-inetutils@gnu.org; Fri, 30 Aug 2013 09:54:19 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:48098)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1VFP9V-0005TQ-IM
	for commit-inetutils@gnu.org; Fri, 30 Aug 2013 09:54:17 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1VFP99-0003NT-NT
	for commit-inetutils@gnu.org; Fri, 30 Aug 2013 13:53:59 +0000
Date: Fri, 30 Aug 2013 13:53:55 +0000
Message-Id: <E1VFP99-0003NT-NT@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_1-328-ge42eda3
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 10ad51b87f6847531bb9cf92f4ec925d45ec9e94
X-Git-Newrev: e42eda37d7f3a3fa5a3579b6d1a53b816e748d82
From: Mats Erik Andersson <gnu@gisladisker.se>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
	<commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 30 Aug 2013 13:54:22 -0000

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

The branch, master has been updated
       via  e42eda37d7f3a3fa5a3579b6d1a53b816e748d82 (commit)
      from  10ad51b87f6847531bb9cf92f4ec925d45ec9e94 (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=e42eda37d7f3a3fa5a3579b6d1a53b816e748d82


commit e42eda37d7f3a3fa5a3579b6d1a53b816e748d82
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Thu Aug 29 19:28:39 2013 +0200

    Documentation (silent change)

diff --git a/NEWS b/NEWS
index bd5ff7b..c1f4992 100644
--- a/NEWS
+++ b/NEWS
@@ -25,6 +25,7 @@ present code, so they do not need to link against libidn at all.
 Called as `pftp', passive mode is preset.  New switch `-e/--no-edit'
 for compatibility with other implementations.  Can now be built
 without readline ability: configure using `--disable-readline'.
+New command `lpwd' avoids a shell call for a common task.
 
 * ifconfig
 
diff --git a/README-alpha b/README-alpha
index d311ead..4121f01 100644
--- a/README-alpha
+++ b/README-alpha
@@ -24,6 +24,13 @@ more messages we get regarding a particular problem the sooner it'll
 be fixed -- usually.  If you sent a complete patch and nobody applied
 it or got back to you, please let us know!
 
+The source `tests/identify.c' should compile in all interesting
+build environments, even without configuration.  The resulting
+executables display some features known to have produced malfunctions
+in portability.  Conveying some selected part of that output could
+help us in locating the cause of compiling errors, or of missing
+functionality in the built programs.
+
 * Checking Out the Sources
 
 The following instructions apply if you wish to obtain sources from
diff --git a/doc/inetutils.texi b/doc/inetutils.texi
index 2a93dd5..1f20163 100644
--- a/doc/inetutils.texi
+++ b/doc/inetutils.texi
@@ -1356,18 +1356,11 @@ Initially set addressing to IPv6 only.
 @opindex --active
 Enable active mode transfer.  Default mode for @command{ftp}.
 
-@item -p
-@itemx --passive
-@opindex -p
-@opindex --passive
-Enable passive mode transfer.  Default mode when invoked
-as @command{pftp}.
-
 @item -d
 @itemx --debug
 @opindex -d
 @opindex --debug
-Enables socket debugging.
+Enable debugging output and possibly also socket debugging.
 
 @item -e
 @itemx --no-edit
@@ -1401,6 +1394,13 @@ login name (default is the user identity on the local machine), and,
 if necessary, prompt for a password and an account with which to
 login.
 
+@item -p
+@itemx --passive
+@opindex -p
+@opindex --passive
+Enable passive mode transfer.  Default mode when invoked
+as @command{pftp}.
+
 @item --prompt[=@var{prompt}]
 @opindex --prompt
 Print a command-line prompt, even if not on a tty.  If @var{prompt} is
@@ -1411,7 +1411,7 @@ Notice, that the argument is optional.
 @itemx --trace
 @opindex -t
 @opindex --trace
-Enable packet tracing.
+Enable packet tracing (not implemented).
 
 @item -v
 @itemx --verbose
@@ -1427,12 +1427,14 @@ This is default for interactive mode.
 When @command{ftp} is awaiting commands from the user,
 a prompt is displayed.
 The default string is @samp{ftp>}, but it can been
-changed in a command line option, perhaps to enhance
-uniqueness for recording a session.
+changed with a command line option, perhaps to enhance
+uniqueness while recording a session.
 
-Be aware that correct execution of many commands depends upon the
-proper behavior of the remote server.
-The following commands are recognized by @command{ftp} itself, though:
+Be aware that correct execution of many commands depends upon
+a proper behavior of the remote server.
+The following commands are recognized by @command{ftp} itself.
+Command names can be abbreviated to the shortest unique
+string with identical beginning.
 
 @table @code
 @item ! [@var{command} [@var{args}]]
@@ -1446,9 +1448,9 @@ command.  Arguments are passed to the macro unglobbed.
 
 @item account [@var{passwd}]
 Supply a supplemental password required by a remote system for access
-to resources once a login has been successfully completed.  If no
+to resources, once a login has been successfully completed.  If no
 argument is included, the user will be prompted for an account
-password in a non-echoing input mode.
+password in non-echoing input mode.
 
 @item append @var{local-file} [@var{remote-file}]
 Append a local file to a file on the remote machine.  If
@@ -1459,7 +1461,7 @@ type, format, mode, and structure.
 
 @item ascii
 Set the file transfer type to network ASCII.  This is the default
-type.
+type, except when two unices are communicating.
 
 @item bell
 Arrange that a bell be sounded after each file transfer command is
@@ -1467,6 +1469,9 @@ completed.
 
 @item binary
 Set the file transfer type to support binary image transfer.
+This transfer type is selected during initial handshake, should
+the client on a Unix system recognize that the server is also
+running on a Unix system.
 
 @item bye
 @itemx quit
@@ -1493,11 +1498,11 @@ current working directory.
 
 @item chmod @var{mode} @var{file-name}
 Change the access permission of the file @var{file-name} on the remote
-sytem to @var{mode}.
+system to @var{mode}.
 
 @item close
 @itemx disconnect
-Terminate the FTP session with the remote server,
+Terminate the FTP session with the present remote server,
 and return to the command interpreter.
 Any defined macros are erased.
 
@@ -1521,33 +1526,30 @@ it is used to set the debugging level.  When debugging is on,
 by the string @samp{-->}.
 
 @item dir [@var{remote-directory}] [@var{local-file}]
-Print a listing of the directory contents in the directory,
-@var{remote-directory}, and, optionally, placing the output in
-@var{local-file}.  If interactive prompting is on, @command{ftp} will
-prompt the user to verify that the last argument is indeed the target
-local file for receiving dir output.  If no directory is specified,
+Print a listing of the contents in the directory
+@var{remote-directory}, and, optionally, place the output in
+@var{local-file}.  If interactive prompting is set, @command{ftp} will
+prompt the user to verify that the last argument is the intended
+local file to receive output.  If no directory is specified,
 the current working directory on the remote machine is used.  If no
-local file is specified, or @var{local-file} is a dash @samp{-},
-output goes to the terminal.
+local file is specified, or if @var{local-file} is a dash @samp{-},
+then output is displayed on the terminal.
 
 @item epsv4
 Toggle the use of EPSV/EPRT for IPv4 addressing.  Default is off.
 
 @item form @var{format}
-Set the file transfer form to @var{format}.  The default format is
-@samp{file}.
-
-@c FIXME: List all avaiable FORMATS's.
+Set the file transfer form to @var{format}.  The only supported
+format is @samp{non-print}.
 
 @item get @var{remote-file} [@var{local-file}]
 @itemx recv @var{remote-file} [@var{local-file}]
-Retrieve the @var{remote-file} and store it on the local machine.  If
-the local file name is not specified, it is given the same name it has
-on the remote machine, subject to alteration by the current
-@code{case}, @code{ntrans}, and @code{nmap} settings.  The current
-settings for @code{type}, @code{form}, @code{mode},
-and @code{structure} are used while
-transferring the file.
+Retrieve the @var{remote-file} and store it on the local machine.
+If a local file name is not specified, the local copy is given the
+same name as is stated for the remote original, subject to alteration
+by the current @code{case}, @code{ntrans}, and @code{nmap} settings.
+The current settings for @code{type}, @code{form}, @code{mode},
+and @code{structure} are effective during file transfer.
 
 @item glob
 Toggle file name expansion for @code{mdelete}, @code{mget}, and
@@ -1595,6 +1597,9 @@ Allow IPv4 as well as IPv6 addressing.
 Change the working directory on the local machine.  If no directory is
 specified, the user's home directory is used.
 
+@item lpwd
+Print the name of the current working directory on the local machine.
+
 @item ls [@var{remote-directory}] [@var{local-file}]
 Print a listing of the contents of a directory on the remote machine.
 The listing includes any system-dependent information that the server
@@ -1660,7 +1665,7 @@ A dash @samp{-} is accepted as last argument without check!
 
 @item mode [@var{mode-name}]
 Set the file transfer mode to @var{mode-name}.  The default mode is
-@samp{stream}.
+@samp{stream}, and it is also the only implemented mode.
 
 @item modtime @var{file-name}
 Show the last modification time of the file on the remote machine.
@@ -1906,12 +1911,14 @@ Show the type of operating system running on the remote machine.
 Set the file transfer type to that needed to talk to TENEX machines.
 
 @item trace
-Toggle packet tracing.
+Toggle packet tracing (feature is not implemented).
 
 @item type [@var{type-name}]
 Set the file transfer type to @var{type-name}.  If no type is
-specified, the current type is printed.  The default type is network
-ASCII.
+specified, the current type is printed.
+The recognized type names are @samp{ascii}, @samp{binary},
+@samp{ebcdic}, @samp{image}, and @samp{tenex}.
+The default type is network ASCII.
 
 @item umask [@var{newmask}]
 Set the default umask on the remote server to @var{newmask}.  If

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

Summary of changes:
 NEWS               |    1 +
 README-alpha       |    7 ++++
 doc/inetutils.texi |   89 ++++++++++++++++++++++++++++------------------------
 3 files changed, 56 insertions(+), 41 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Fri Aug 30 09:55:15 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VFPAR-0006oJ-Fe
	for mharc-commit-inetutils@gnu.org; Fri, 30 Aug 2013 09:55:15 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:37650)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1VFPAP-0006lc-BZ
	for commit-inetutils@gnu.org; Fri, 30 Aug 2013 09:55:14 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1VFPAK-0005uI-Fx
	for commit-inetutils@gnu.org; Fri, 30 Aug 2013 09:55:13 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:48119)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1VFPAK-0005uE-DO
	for commit-inetutils@gnu.org; Fri, 30 Aug 2013 09:55:08 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1VFPAH-0003RR-2V
	for commit-inetutils@gnu.org; Fri, 30 Aug 2013 13:55:05 +0000
Date: Fri, 30 Aug 2013 13:55:05 +0000
Message-Id: <E1VFPAH-0003RR-2V@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_1-329-gffe0043
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: e42eda37d7f3a3fa5a3579b6d1a53b816e748d82
X-Git-Newrev: ffe00431a3d9a41e4d12b0b7a836288ba4a4cd13
From: Mats Erik Andersson <gnu@gisladisker.se>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
	<commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 30 Aug 2013 13:55: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  ffe00431a3d9a41e4d12b0b7a836288ba4a4cd13 (commit)
      from  e42eda37d7f3a3fa5a3579b6d1a53b816e748d82 (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=ffe00431a3d9a41e4d12b0b7a836288ba4a4cd13


commit ffe00431a3d9a41e4d12b0b7a836288ba4a4cd13
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Thu Aug 29 20:35:02 2013 +0200

    Handle socket debugging.

diff --git a/ChangeLog b/ChangeLog
index 4cb9028..35637a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2013-08-29  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	Handle socket debugging.
+
+	* ftp/ftp.c (initconn) <passivemode>: Suppress error
+	message for errno EACCES while setting SO_DEBUG.  This is
+	a minor part of debug mode, and denial is system dependent.
+	Else report using error(), not perror().  Add DEBUG to text.
+	<label noport>: Likewise.
+
+	* src/inetd.c (setup): Likewise.
+
+	* src/rsh.c (main) <try_connect && debug_option>:
+	Improve error message to mention DEBUG.
+
 2013-08-28  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	ftp: New command `lpwd'.
diff --git a/ftp/ftp.c b/ftp/ftp.c
index c9b5aaf..682bcbf 100644
--- a/ftp/ftp.c
+++ b/ftp/ftp.c
@@ -1205,7 +1205,8 @@ initconn (void)
       if ((options & SO_DEBUG) &&
 	  setsockopt (data, SOL_SOCKET, SO_DEBUG, (char *) &on,
 		      sizeof (on)) < 0)
-	perror ("ftp: setsockopt (ignored)");
+	if (errno != EACCES)	/* Ignore insufficient permission.  */
+	  error (0, errno, "setsockopt DEBUG (ignored)");
 
       /* Be contemporary:
        *   first try EPSV,
@@ -1419,9 +1420,11 @@ noport:
       error (0, errno, "bind");
       goto bad;
     }
-  if (options & SO_DEBUG &&
-      setsockopt (data, SOL_SOCKET, SO_DEBUG, (char *) &on, sizeof (on)) < 0)
-    error (0, errno, "setsockopt (ignored)");
+  if (options & SO_DEBUG
+      && setsockopt (data, SOL_SOCKET, SO_DEBUG,
+		     (char *) &on, sizeof (on)) < 0)
+    if (errno != EACCES)	/* Ignore insufficient permission.  */
+      error (0, errno, "setsockopt DEBUG (ignored)");
   len = sizeof (data_addr);
   if (getsockname (data, (struct sockaddr *) &data_addr, &len) < 0)
     {
diff --git a/src/inetd.c b/src/inetd.c
index 98b8a58..bd67e9a 100644
--- a/src/inetd.c
+++ b/src/inetd.c
@@ -622,7 +622,8 @@ setup (struct servtab *sep)
   if (strncmp (sep->se_proto, "tcp", 3) == 0 && (options & SO_DEBUG))
     {
       if (setsockopt (sep->se_fd, SOL_SOCKET, SO_DEBUG,
-		      (char *) &on, sizeof (on)) < 0)
+		      (char *) &on, sizeof (on)) < 0
+	  && errno != EACCES)	/* Ignore insufficient permission.  */
 	syslog (LOG_ERR, "setsockopt (SO_DEBUG): %m");
     }
 
diff --git a/src/rsh.c b/src/rsh.c
index f0e09ae..d17bbad 100644
--- a/src/rsh.c
+++ b/src/rsh.c
@@ -526,10 +526,10 @@ try_connect:
       int one = 1;
       if (setsockopt (rem, SOL_SOCKET, SO_DEBUG, (char *) &one,
 		      sizeof one) < 0)
-	error (0, errno, "setsockopt");
+	error (0, errno, "setsockopt DEBUG (ignored)");
       if (setsockopt (rfd2, SOL_SOCKET, SO_DEBUG, (char *) &one,
 		      sizeof one) < 0)
-	error (0, errno, "setsockopt");
+	error (0, errno, "setsockopt DEBUG (ignored)");
     }
 
   seteuid (uid);

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

Summary of changes:
 ChangeLog   |   15 +++++++++++++++
 ftp/ftp.c   |   11 +++++++----
 src/inetd.c |    3 ++-
 src/rsh.c   |    4 ++--
 4 files changed, 26 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Fri Aug 30 10:19:34 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VFPXy-00008x-KD
	for mharc-commit-inetutils@gnu.org; Fri, 30 Aug 2013 10:19:34 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:43367)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1VFPXr-00008D-GG
	for commit-inetutils@gnu.org; Fri, 30 Aug 2013 10:19:32 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1VFPXl-00066R-TY
	for commit-inetutils@gnu.org; Fri, 30 Aug 2013 10:19:27 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:44458)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1VFPXl-00066L-Ph
	for commit-inetutils@gnu.org; Fri, 30 Aug 2013 10:19:21 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1VFPXl-00052l-4q
	for commit-inetutils@gnu.org; Fri, 30 Aug 2013 14:19:21 +0000
Date: Fri, 30 Aug 2013 14:19:21 +0000
Message-Id: <E1VFPXl-00052l-4q@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_1-330-g0887048
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: ffe00431a3d9a41e4d12b0b7a836288ba4a4cd13
X-Git-Newrev: 0887048c53f30d7f3a5c1b5cc6d943b40b22e1df
From: Mats Erik Andersson <gnu@gisladisker.se>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
	<commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 30 Aug 2013 14:19:32 -0000

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

The branch, master has been updated
       via  0887048c53f30d7f3a5c1b5cc6d943b40b22e1df (commit)
      from  ffe00431a3d9a41e4d12b0b7a836288ba4a4cd13 (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=0887048c53f30d7f3a5c1b5cc6d943b40b22e1df


commit 0887048c53f30d7f3a5c1b5cc6d943b40b22e1df
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Fri Aug 30 16:23:03 2013 +0200

    bootstrap: Updated from gnulib.

diff --git a/ChangeLog b/ChangeLog
index 35637a6..761184f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-08-30  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	* bootstrap: Updated from gnulib.
+
 2013-08-29  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	Handle socket debugging.
diff --git a/bootstrap b/bootstrap
index 9c52204..e31d17d 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Print a version string.
-scriptversion=2013-07-03.20; # UTC
+scriptversion=2013-08-15.22; # UTC
 
 # Bootstrap this package from checked-out sources.
 
@@ -209,12 +209,16 @@ bootstrap_sync=false
 # Use git to update gnulib sources
 use_git=true
 
+check_exists() {
+  ($1 --version </dev/null) >/dev/null 2>&1
+  test $? -lt 126
+}
+
 # find_tool ENVVAR NAMES...
 # -------------------------
 # Search for a required program.  Use the value of ENVVAR, if set,
-# otherwise find the first of the NAMES that can be run (i.e.,
-# supports --version).  If found, set ENVVAR to the program name,
-# die otherwise.
+# otherwise find the first of the NAMES that can be run.
+# If found, set ENVVAR to the program name, die otherwise.
 #
 # FIXME: code duplication, see also gnu-web-doc-update.
 find_tool ()
@@ -224,27 +228,21 @@ find_tool ()
   find_tool_names=$@
   eval "find_tool_res=\$$find_tool_envvar"
   if test x"$find_tool_res" = x; then
-    for i
-    do
-      if ($i --version </dev/null) >/dev/null 2>&1; then
-       find_tool_res=$i
-       break
+    for i; do
+      if check_exists $i; then
+        find_tool_res=$i
+        break
       fi
     done
-  else
-    find_tool_error_prefix="\$$find_tool_envvar: "
   fi
-  test x"$find_tool_res" != x \
-    || die "one of these is required: $find_tool_names"
-  ($find_tool_res --version </dev/null) >/dev/null 2>&1 \
-    || die "${find_tool_error_prefix}cannot run $find_tool_res --version"
+  if test x"$find_tool_res" = x; then
+    warn_ "one of these is required: $find_tool_names;"
+    die   "alternatively set $find_tool_envvar to a compatible tool"
+  fi
   eval "$find_tool_envvar=\$find_tool_res"
   eval "export $find_tool_envvar"
 }
 
-# Find sha1sum, named gsha1sum on MacPorts, and shasum on Mac OS X 10.6.
-find_tool SHA1SUM sha1sum gsha1sum shasum
-
 # Override the default configuration, if necessary.
 # Make sure that bootstrap.conf is sourced from the current directory
 # if we were invoked as "sh bootstrap".
@@ -256,12 +254,12 @@ esac
 # Extra files from gnulib, which override files from other sources.
 test -z "${gnulib_extra_files}" && \
   gnulib_extra_files="
-        $build_aux/install-sh
-        $build_aux/mdate-sh
-        $build_aux/texinfo.tex
-        $build_aux/depcomp
-        $build_aux/config.guess
-        $build_aux/config.sub
+        build-aux/install-sh
+        build-aux/mdate-sh
+        build-aux/texinfo.tex
+        build-aux/depcomp
+        build-aux/config.guess
+        build-aux/config.sub
         doc/INSTALL
 "
 
@@ -326,7 +324,7 @@ insert_if_absent() {
     die "Error: Duplicate entries in $file: " $duplicate_entries
   fi
   linesold=$(gitignore_entries $file | wc -l)
-  linesnew=$(echo "$str" | gitignore_entries - $file | sort -u | wc -l)
+  linesnew=$( { echo "$str"; cat $file; } | gitignore_entries | sort -u | wc -l)
   if [ $linesold != $linesnew ] ; then
     { echo "$str" | cat - $file > $file.bak && mv $file.bak $file; } \
       || die "insert_if_absent $file $str: failed"
@@ -469,8 +467,7 @@ check_versions() {
     if [ "$req_ver" = "-" ]; then
       # Merely require app to exist; not all prereq apps are well-behaved
       # so we have to rely on $? rather than get_version.
-      $app --version >/dev/null 2>&1
-      if [ 126 -le $? ]; then
+      if ! check_exists $app; then
         warn_ "Error: '$app' not found"
         ret=1
       fi
@@ -503,6 +500,12 @@ print_versions() {
   # can't depend on column -t
 }
 
+# Find sha1sum, named gsha1sum on MacPorts, shasum on Mac OS X 10.6.
+# Also find the compatible sha1 utility on the BSDs
+if test x"$SKIP_PO" = x; then
+  find_tool SHA1SUM sha1sum gsha1sum shasum sha1
+fi
+
 use_libtool=0
 # We'd like to use grep -E, to see if any of LT_INIT,
 # AC_PROG_LIBTOOL, AM_PROG_LIBTOOL is used in configure.ac,
@@ -551,10 +554,10 @@ fi
 echo "$0: Bootstrapping from checked-out $package sources..."
 
 # See if we can use gnulib's git-merge-changelog merge driver.
-if $use_git && test -d .git && (git --version) >/dev/null 2>/dev/null ; then
+if $use_git && test -d .git && check_exists git; then
   if git config merge.merge-changelog.driver >/dev/null ; then
     :
-  elif (git-merge-changelog --version) >/dev/null 2>/dev/null ; then
+  elif check_exists git-merge-changelog; then
     echo "$0: initializing git-merge-changelog driver"
     git config merge.merge-changelog.name 'GNU-style ChangeLog merge driver'
     git config merge.merge-changelog.driver 'git-merge-changelog %O %A %B'
@@ -692,11 +695,10 @@ update_po_files() {
     cksum_file="$ref_po_dir/$po.s1"
     if ! test -f "$cksum_file" ||
         ! test -f "$po_dir/$po.po" ||
-        ! $SHA1SUM -c --status "$cksum_file" \
-            < "$new_po" > /dev/null; then
+        ! $SHA1SUM -c "$cksum_file" < "$new_po" > /dev/null 2>&1; then
       echo "$me: updated $po_dir/$po.po..."
       cp "$new_po" "$po_dir/$po.po" \
-          && $SHA1SUM < "$new_po" > "$cksum_file"
+          && $SHA1SUM < "$new_po" > "$cksum_file" || return
     fi
   done
 }

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

Summary of changes:
 ChangeLog |    4 +++
 bootstrap |   66 +++++++++++++++++++++++++++++++-----------------------------
 2 files changed, 38 insertions(+), 32 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Fri Aug 30 19:29:45 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VFY8P-0001kD-Bt
	for mharc-commit-inetutils@gnu.org; Fri, 30 Aug 2013 19:29:45 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:38808)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1VFY8N-0001k6-EI
	for commit-inetutils@gnu.org; Fri, 30 Aug 2013 19:29:44 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1VFY8M-0004uG-Ay
	for commit-inetutils@gnu.org; Fri, 30 Aug 2013 19:29:43 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:53921)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1VFY8M-0004u5-7Z
	for commit-inetutils@gnu.org; Fri, 30 Aug 2013 19:29:42 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1VFY8L-00075t-By
	for commit-inetutils@gnu.org; Fri, 30 Aug 2013 23:29:41 +0000
Date: Fri, 30 Aug 2013 23:29:41 +0000
Message-Id: <E1VFY8L-00075t-By@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_1-331-g5666011
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 0887048c53f30d7f3a5c1b5cc6d943b40b22e1df
X-Git-Newrev: 56660118ac33f48f071cb51d2a13d09cc2e77178
From: Mats Erik Andersson <gnu@gisladisker.se>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
	<commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 30 Aug 2013 23:29:44 -0000

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

The branch, master has been updated
       via  56660118ac33f48f071cb51d2a13d09cc2e77178 (commit)
      from  0887048c53f30d7f3a5c1b5cc6d943b40b22e1df (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=56660118ac33f48f071cb51d2a13d09cc2e77178


commit 56660118ac33f48f071cb51d2a13d09cc2e77178
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Sat Aug 31 00:54:39 2013 +0200

    Support BSD libedit.

diff --git a/ChangeLog b/ChangeLog
index 761184f..b79298b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2013-08-31  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	Support BSD libedit.  (Used on GNU/kFreeBSD.)
+
+	* am/readline.m4 (gl_FUNC_READLINE): Check for headers
+	before library linkage.  Check for header file variants
+	<editline/readline.h> and <editline/history.h>.
+	While testing linking against libreadline and libedit,
+	conditionally use HAVE_*_READLINE_H to include the
+	correct header file.
+
+	* ftp/cmds.c, ftp/main.c
+	[!HAVE_READLINE_READLINE_H && HAVE_EDITLINE_READLINE_H]:
+	Include <editline/readline.h>
+	[!HAVE_READLINE_HISTORY_H && HAVE_EDITLINE_HISTORY_H]:
+	Include <editline/history.h>
+
 2013-08-30  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	* bootstrap: Updated from gnulib.
diff --git a/am/readline.m4 b/am/readline.m4
index 3958e71..56cf01a 100644
--- a/am/readline.m4
+++ b/am/readline.m4
@@ -20,6 +20,11 @@ AC_DEFUN([gl_FUNC_READLINE],
 		   [do not build against libreadline]), ,
     [enable_readline=yes])
 
+  dnl Readline libraries come in a handful flavours.
+  dnl Detect the ones we do offer support for.
+  AC_CHECK_HEADERS([readline/readline.h readline/history.h \
+		    editline/readline.h editline/history.h])
+
   dnl Search for libreadline and define LIBREADLINE, LTLIBREADLINE and
   dnl INCREADLINE accordingly.
   AC_LIB_LINKFLAGS_BODY([readline])
@@ -45,7 +50,11 @@ AC_DEFUN([gl_FUNC_READLINE],
         LIBS="$LIBS -l$extra_lib"
       fi
       AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
-#include <readline/readline.h>]],
+#ifdef HAVE_READLINE_READLINE_H
+# include <readline/readline.h>
+#elif defined HAVE_EDITLINE_READLINE_H
+# include <editline/readline.h>
+#endif]],
           [[readline((char*)0);]])],
         [if test -n "$extra_lib"; then
            gl_cv_lib_readline="yes, requires -l$extra_lib"
@@ -67,7 +76,11 @@ AC_DEFUN([gl_FUNC_READLINE],
     am_save_LIBS="$LIBS"
     LIBS="$am_save_LIBS -ledit"
     AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
-#include <readline/readline.h>]],
+#ifdef HAVE_READLINE_READLINE_H
+# include <readline/readline.h>
+#elif defined HAVE_EDITLINE_READLINE_H
+# include <editline/readline.h>
+#endif]],
         [[readline((char*)0);]])],
       [gl_cv_lib_readline="yes"])
     LIBS="$am_save_LIBS"
@@ -93,8 +106,6 @@ AC_DEFUN([gl_FUNC_READLINE],
   fi
   AC_SUBST([LIBREADLINE])
   AC_SUBST([LTLIBREADLINE])
-
-  AC_CHECK_HEADERS([readline/readline.h readline/history.h])
 ])
 
 # Prerequisites of lib/readline.c.
diff --git a/ftp/cmds.c b/ftp/cmds.c
index 87a9d78..cf09a9d 100644
--- a/ftp/cmds.c
+++ b/ftp/cmds.c
@@ -80,9 +80,13 @@
 
 #ifdef HAVE_READLINE_READLINE_H
 # include <readline/readline.h>
+#elif defined HAVE_EDITLINE_READLINE_H
+# include <editline/readline.h>
 #endif
 #ifdef HAVE_READLINE_HISTORY_H
 # include <readline/history.h>
+#elif defined HAVE_EDITLINE_HISTORY_H
+# include <editline/history.h>
 #endif
 
 #include "ftp_var.h"
diff --git a/ftp/main.c b/ftp/main.c
index d12f6dc..4231951 100644
--- a/ftp/main.c
+++ b/ftp/main.c
@@ -82,9 +82,13 @@
 
 #ifdef HAVE_READLINE_READLINE_H
 # include <readline/readline.h>
+#elif defined HAVE_EDITLINE_READLINE_H
+# include <editline/readline.h>
 #endif
 #ifdef HAVE_READLINE_HISTORY_H
 # include <readline/history.h>
+#elif defined HAVE_EDITLINE_HISTORY_H
+# include <editline/history.h>
 #endif
 
 

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

Summary of changes:
 ChangeLog      |   17 +++++++++++++++++
 am/readline.m4 |   19 +++++++++++++++----
 ftp/cmds.c     |    4 ++++
 ftp/main.c     |    4 ++++
 4 files changed, 40 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Fri Aug 30 19:47:04 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VFYPA-0003s0-AH
	for mharc-commit-inetutils@gnu.org; Fri, 30 Aug 2013 19:47:04 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:44893)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1VFYP7-0003rP-PJ
	for commit-inetutils@gnu.org; Fri, 30 Aug 2013 19:47:02 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1VFYP6-0003xM-TB
	for commit-inetutils@gnu.org; Fri, 30 Aug 2013 19:47:01 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:42112)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1VFYP6-0003xH-Pe
	for commit-inetutils@gnu.org; Fri, 30 Aug 2013 19:47:00 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1VFYP6-00080f-FR
	for commit-inetutils@gnu.org; Fri, 30 Aug 2013 23:47:00 +0000
Date: Fri, 30 Aug 2013 23:47:00 +0000
Message-Id: <E1VFYP6-00080f-FR@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_1-332-g0612350
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 56660118ac33f48f071cb51d2a13d09cc2e77178
X-Git-Newrev: 06123506eaa0923fe999d96020bbe4597ed81534
From: Mats Erik Andersson <gnu@gisladisker.se>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
	<commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 30 Aug 2013 23:47:02 -0000

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

The branch, master has been updated
       via  06123506eaa0923fe999d96020bbe4597ed81534 (commit)
      from  56660118ac33f48f071cb51d2a13d09cc2e77178 (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=06123506eaa0923fe999d96020bbe4597ed81534


commit 06123506eaa0923fe999d96020bbe4597ed81534
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Sat Aug 31 01:46:25 2013 +0200

    ftpd: Status reveals timeout.

diff --git a/ChangeLog b/ChangeLog
index b79298b..f32ee25 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2013-08-31  Mats Erik Andersson  <gnu@gisladisker.se>
 
+	* ftpd/ftpd.c (statcmd): Report session timeout.
+
+2013-08-31  Mats Erik Andersson  <gnu@gisladisker.se>
+
 	Support BSD libedit.  (Used on GNU/kFreeBSD.)
 
 	* am/readline.m4 (gl_FUNC_READLINE): Check for headers
diff --git a/ftpd/ftpd.c b/ftpd/ftpd.c
index 79839bd..1174dbc 100644
--- a/ftpd/ftpd.c
+++ b/ftpd/ftpd.c
@@ -1573,6 +1573,7 @@ statcmd (void)
   if (!isdigit (cred.remotehost[0]))
     printf (" (%s)", addrstr);
   printf ("\r\n");
+  printf ("     Session timeout is %d seconds\r\n", timeout);
   if (cred.logged_in)
     {
       if (cred.guest)

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

Summary of changes:
 ChangeLog   |    4 ++++
 ftpd/ftpd.c |    1 +
 2 files changed, 5 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Sat Aug 31 09:01:32 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VFko0-0006ML-14
	for mharc-commit-inetutils@gnu.org; Sat, 31 Aug 2013 09:01:32 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:37523)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1VFknx-0006M8-Kf
	for commit-inetutils@gnu.org; Sat, 31 Aug 2013 09:01:30 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1VFknw-0001Ju-98
	for commit-inetutils@gnu.org; Sat, 31 Aug 2013 09:01:29 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:44821)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1VFknw-0001Jn-52
	for commit-inetutils@gnu.org; Sat, 31 Aug 2013 09:01:28 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1VFkmo-0001cU-8i
	for commit-inetutils@gnu.org; Sat, 31 Aug 2013 13:00:56 +0000
Date: Sat, 31 Aug 2013 13:00:39 +0000
Message-Id: <E1VFkmo-0001cU-8i@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_1-333-g6a47f40
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 06123506eaa0923fe999d96020bbe4597ed81534
X-Git-Newrev: 6a47f400cae44ba53f5a4cbcfa43ea95b2e3cadc
From: Mats Erik Andersson <gnu@gisladisker.se>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
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 Aug 2013 13:01:31 -0000

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

The branch, master has been updated
       via  6a47f400cae44ba53f5a4cbcfa43ea95b2e3cadc (commit)
      from  06123506eaa0923fe999d96020bbe4597ed81534 (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=6a47f400cae44ba53f5a4cbcfa43ea95b2e3cadc


commit 6a47f400cae44ba53f5a4cbcfa43ea95b2e3cadc
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Sat Aug 31 14:38:44 2013 +0200

    Diagnostics in syslogd test.

diff --git a/ChangeLog b/ChangeLog
index f32ee25..9bda5cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2013-08-31  Mats Erik Andersson  <gnu@gisladisker.se>
 
+	* tests/syslogd.sh: Lengthen sleeping periods.
+	Add better diagnostics when some test case fails.
+
+2013-08-31  Mats Erik Andersson  <gnu@gisladisker.se>
+
 	* ftpd/ftpd.c (statcmd): Report session timeout.
 
 2013-08-31  Mats Erik Andersson  <gnu@gisladisker.se>
diff --git a/tests/syslogd.sh b/tests/syslogd.sh
index 85a8fb2..3fa0f87 100755
--- a/tests/syslogd.sh
+++ b/tests/syslogd.sh
@@ -453,10 +453,11 @@ TAG2="syslogd-reload-test"
 
 # Load the new configuration
 kill -HUP `cat "$PID"`
-sleep 1
+sleep 2
 
 if $do_unix_socket; then
-    # Two messages, but absence is also awarded credit.
+    # Two messages of weight 2, ensuring that missing
+    # and misplaced messages are not yielding negatives.
     TESTCASES=`expr $TESTCASES + 4`
     $LOGGER -h "$SOCKET" -p user.info -t "$TAG2" \
 	"user.info as BSD message. (pid $$)"
@@ -465,10 +466,11 @@ if $do_unix_socket; then
 fi
 
 if $do_inet_socket; then
-    # Two messages, but absence is also awarded credit.
+    # Two messages of weight 2, ensuring that missing
+    # and misplaced messages are not yielding negatives.
     TESTCASES=`expr $TESTCASES + 4`
     $LOGGER -4 -h "$TARGET:$PORT" -p user.info -t "$TAG2" \
-	"user.info IPv4 message. (pid $$)"
+	"user.info as IPv4 message. (pid $$)"
     $LOGGER -4 -h "$TARGET:$PORT" -p user.debug -t "$TAG2" \
 	"user.debug as IPv4 message. (pid $$)"
 fi
@@ -496,6 +498,7 @@ if $do_standard_port; then
     # Only INET socket, no UNIX socket.
     $SYSLOGD --rcfile="$CONF" --pidfile="$PID" --socket='' \
 	--inet --ipany $OPTIONS
+    sleep 1
     $LOGGER -4 -h "$TARGET" -p user.info -t "$TAG" \
 	"IPv4 to standard port. (pid $$)"
     $LOGGER -6 -h "$TARGET6" -p user.info -t "$TAG" \
@@ -503,16 +506,25 @@ if $do_standard_port; then
 fi
 
 # Delay detection due to observed race condition.
-sleep 1
+sleep 3
 
 # Detection of registered messages.
 #
+# Initial message logging.
 COUNT=`$GREP -c "$TAG" "$OUT"`
+
+# Second set-up after SIGHUP.
 COUNT2=`$GREP -c "$TAG2" "$OUT_USER"`
-COUNT2_debug=`$GREP -c "$TAG2.*user.debug" "$OUT_USER"`
 COUNT3=`$GREP -c "$TAG2" "$OUT_DEBUG"`
+
+# No debug message should enter with selector 'user.info'.
+COUNT2_debug=`$GREP -c "$TAG2.*user.debug" "$OUT_USER"`
+
+# No info message should enter with selector '*.=debug'.
 COUNT3_info=`$GREP -c "$TAG2.*user.info" "$OUT_DEBUG"`
-SUCCESSES=`expr $SUCCESSES + $COUNT + 2 \* $COUNT2 - $COUNT2_debug \
+
+SUCCESSES=`expr $SUCCESSES + $COUNT \
+		+ 2 \* $COUNT2 - $COUNT2_debug \
 		+ 2 \* $COUNT3 - $COUNT3_info`
 
 if [ -n "${VERBOSE+yes}" ]; then
@@ -543,7 +555,45 @@ if [ "$SUCCESSES" -eq "$TESTCASES" ]; then
     $silence echo "Successful testing."
     EXITCODE=0
 else
-    $silence echo "Failing some tests."
+    echo "Failing some tests."
+    # Tell about the symptoms.
+
+    # local socket transport
+    if $do_unix_socket; then
+	if grep "$TAG2.*info.*BSD" "$OUT_USER" >/dev/null 2>&1; then
+	    :
+	else
+	    echo >&2 '** UDP socket did not convey info msg after HUP.'
+	fi
+	if grep "$TAG2.*debug.*BSD" "$OUT_DEBUG" >/dev/null 2>&1; then
+	    :
+	else
+	    echo >&2 '** UDP socket did not convey debug msg after HUP.'
+	fi
+    fi # do_unix_socket
+
+    # UDP transport
+    if $do_inet_socket; then
+	if grep "$TAG2.*info.*IPv" "$OUT_USER" >/dev/null 2>&1; then
+	    :
+	else
+	    echo >&2 '** IP socket did not convey info msg after HUP.'
+	fi
+	if grep "$TAG2.*debug.*IPv" "$OUT_DEBUG" >/dev/null 2>&1; then
+	    :
+	else
+	    echo >&2 '** IP socket did not convey debug msg after HUP.'
+	fi
+    fi # do_inet_socket
+
+    # Automated build robots fail regularly at registering
+    # any messages in the debug file.
+    if test ! -s "$OUT_USER"; then
+	echo >&2 '**** The file "user.log" was empty. Investigate! ****'
+    fi
+    if test ! -s "$OUT_DEBUG"; then
+	echo >&2 '**** The file "debug.log" was empty. Investigate! ****'
+    fi
 fi
 
 # Remove the daemon process.

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

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


hooks/post-receive
-- 
GNU Inetutils 


