From MAILER-DAEMON Sat Mar 14 11:59:02 2015
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1YWoSs-0000xo-1x
	for mharc-commit-inetutils@gnu.org; Sat, 14 Mar 2015 11:59:02 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:35472)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1YWoSp-0000xg-8q
	for commit-inetutils@gnu.org; Sat, 14 Mar 2015 11:59:00 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1YWoSo-0008DW-1G
	for commit-inetutils@gnu.org; Sat, 14 Mar 2015 11:58:59 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:45118)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1YWoSn-0008DQ-Tt
	for commit-inetutils@gnu.org; Sat, 14 Mar 2015 11:58:57 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1YWoSm-00087Z-RY
	for commit-inetutils@gnu.org; Sat, 14 Mar 2015 15:58:57 +0000
Date: Sat, 14 Mar 2015 15:58:56 +0000
Message-Id: <E1YWoSm-00087Z-RY@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_2-50-g31714fe
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: c590657f6ab2f2df30c0e2087a90ac2afead2af9
X-Git-Newrev: 31714fe8bfeb19bf53502e8a9f503aeba67ad281
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, 14 Mar 2015 15:59:00 -0000

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

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


commit 31714fe8bfeb19bf53502e8a9f503aeba67ad281
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Sat Mar 14 16:45:05 2015 +0100

    Build failures while IPv6 is disabled.

diff --git a/ChangeLog b/ChangeLog
index e4da2bd..0310ba6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2015-03-14  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	Build failures while IPv6 is disabled.
+
+	* configure.ac (ENABLE_hstrerror): New conditional variable.
+
+	* src/rlogind.c [IPV6] (checkhost): Move right parenthesis
+	outside of precompiler conditional.
+
+	* telnetd/Makefile.am [ENABLE_hstrerror]: Add $(LIBRESOLV)
+	to LDADD.  With IPv6 disabled, the code in `telnetd/telnetd.c'
+	uses hstrerror(), so Solaris must link against libresolv.
+
 2015-02-28  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	Fully configure testing without IPv6.
diff --git a/configure.ac b/configure.ac
index 3579817..b1ba09b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -227,7 +227,7 @@ fi
 AC_SUBST(LIBLS)
 AC_SUBST(libls_BUILD)
 AC_SUBST(enable_libls)
-AM_CONDITIONAL([ENABLE_libls], test "$enable_libls" = yes)
+AM_CONDITIONAL([ENABLE_libls], [test "$enable_libls" = yes])
 
 # At least OpenSolaris is missing <protocols/talkd.h>.
 AC_CHECK_HEADER(protocols/talkd.h, , ,
@@ -1021,6 +1021,9 @@ esac
 TARGET=${TARGET:-127.0.0.1}
 TARGET6=${TARGET6:-::1}
 
+# Work around code peculiarities.
+AM_CONDITIONAL([ENABLE_hstrerror], [test "$ipv6" = no])
+
 AC_CONFIG_FILES([
 Makefile
 summary.sh
diff --git a/src/rlogind.c b/src/rlogind.c
index 4c6c38e..fb45895 100644
--- a/src/rlogind.c
+++ b/src/rlogind.c
@@ -333,8 +333,9 @@ check_host (struct sockaddr *sa, socklen_t len)
 
   if (sa->sa_family != AF_INET
 # ifdef IPV6
-      && sa->sa_family != AF_INET6)
+      && sa->sa_family != AF_INET6
 # endif
+     )
     return 1;
 
 # if HAVE_DECL_GETNAMEINFO
diff --git a/telnetd/Makefile.am b/telnetd/Makefile.am
index 84abed9..1a927a3 100644
--- a/telnetd/Makefile.am
+++ b/telnetd/Makefile.am
@@ -31,6 +31,10 @@ LDADD = \
 	$(iu_LIBRARIES) \
 	$(LIBTERMCAP) $(LIBUTIL) $(LIBCRYPT) $(LIBAUTH)
 
+if ENABLE_hstrerror
+LDADD += $(LIBRESOLV)
+endif
+
 inetdaemondir = @inetdaemondir@
 
 inetdaemon_PROGRAMS = $(telnetd_BUILD)

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

Summary of changes:
 ChangeLog           |   13 +++++++++++++
 configure.ac        |    5 ++++-
 src/rlogind.c       |    3 ++-
 telnetd/Makefile.am |    4 ++++
 4 files changed, 23 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Sat Mar 14 14:28:16 2015
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1YWqnI-0001hb-LV
	for mharc-commit-inetutils@gnu.org; Sat, 14 Mar 2015 14:28:16 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:55781)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1YWqnG-0001hI-Ms
	for commit-inetutils@gnu.org; Sat, 14 Mar 2015 14:28:15 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1YWqn0-0000x8-OF
	for commit-inetutils@gnu.org; Sat, 14 Mar 2015 14:28:14 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:46586)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1YWqn0-0000x4-KV
	for commit-inetutils@gnu.org; Sat, 14 Mar 2015 14:27:58 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1YWqn0-0002bw-59
	for commit-inetutils@gnu.org; Sat, 14 Mar 2015 18:27:58 +0000
Date: Sat, 14 Mar 2015 18:27:58 +0000
Message-Id: <E1YWqn0-0002bw-59@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_2-51-g236256e
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 31714fe8bfeb19bf53502e8a9f503aeba67ad281
X-Git-Newrev: 236256e897e51ea4993d2e70f77f23a085ac115e
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, 14 Mar 2015 18:28:16 -0000

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

The branch, master has been updated
       via  236256e897e51ea4993d2e70f77f23a085ac115e (commit)
      from  31714fe8bfeb19bf53502e8a9f503aeba67ad281 (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=236256e897e51ea4993d2e70f77f23a085ac115e


commit 236256e897e51ea4993d2e70f77f23a085ac115e
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Sat Mar 14 19:27:52 2015 +0100

    Complaints during IPv6-less testing.

diff --git a/ChangeLog b/ChangeLog
index 0310ba6..f4f3ef7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2015-03-14  Mats Erik Andersson  <gnu@gisladisker.se>
 
+	Complaints during IPv6-less testing.
+	Unused IPv6 directives cause logged complaints by inetd.
+
+	* tests/ftp-localhost.sh: Add a tcp6 listener to `inetd.conf'
+	only if TEST_IPV6 is not `no'.
+	* tests/tftp.sh: Likewise with udp6.
+
+2015-03-14  Mats Erik Andersson  <gnu@gisladisker.se>
+
 	Build failures while IPv6 is disabled.
 
 	* configure.ac (ENABLE_hstrerror): New conditional variable.
diff --git a/tests/ftp-localhost.sh b/tests/ftp-localhost.sh
index 32ff34f..f589549 100755
--- a/tests/ftp-localhost.sh
+++ b/tests/ftp-localhost.sh
@@ -250,6 +250,10 @@ fi
 
 cat <<EOT > "$TMPDIR/inetd.conf"
 $PORT stream tcp4 nowait $USER $PWD/$FTPD ftpd -A -l
+EOT
+
+test "$TEST_IPV6" = "no" ||
+    cat <<EOT >> "$TMPDIR/inetd.conf"
 $PORT stream tcp6 nowait $USER $PWD/$FTPD ftpd -A -l
 EOT
 
diff --git a/tests/tftp.sh b/tests/tftp.sh
index fac2e44..34adf4c 100755
--- a/tests/tftp.sh
+++ b/tests/tftp.sh
@@ -209,6 +209,10 @@ fi
 write_conf () {
     cat > "$INETD_CONF" <<-EOF
 	$PORT dgram ${PROTO}4 wait $USER $TFTPD   tftpd -l $TMPDIR/tftp-test
+	EOF
+
+    test "$TEST_IPV6" = "no" ||
+	cat >> "$INETD_CONF" <<-EOF
 	$PORT dgram ${PROTO}6 wait $USER $TFTPD   tftpd -l $TMPDIR/tftp-test
 	EOF
 }
@@ -420,6 +424,10 @@ if $do_secure_setting; then
 
     cat > "$INETD_CONF" <<-EOF
 	$PORT dgram ${PROTO}4 wait $USER $TFTPD   tftpd -l -s $TMPDIR /tftp-test
+	EOF
+
+    test "$TEST_IPV6" = "no" ||
+	cat >> "$INETD_CONF" <<-EOF
 	$PORT dgram ${PROTO}6 wait $USER $TFTPD   tftpd -l -s $TMPDIR /tftp-test
 	EOF
 

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

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


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Sat Mar 14 22:07:57 2015
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1YWxy9-0005P8-FA
	for mharc-commit-inetutils@gnu.org; Sat, 14 Mar 2015 22:07:57 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:44454)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1YWxy6-0005OG-DZ
	for commit-inetutils@gnu.org; Sat, 14 Mar 2015 22:07:55 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1YWxy5-0004fr-1q
	for commit-inetutils@gnu.org; Sat, 14 Mar 2015 22:07:54 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:50275)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1YWxy4-0004fN-U2
	for commit-inetutils@gnu.org; Sat, 14 Mar 2015 22:07:52 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1YWxy3-0007OI-Mk
	for commit-inetutils@gnu.org; Sun, 15 Mar 2015 02:07:51 +0000
Date: Sun, 15 Mar 2015 02:07:51 +0000
Message-Id: <E1YWxy3-0007OI-Mk@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_2-52-g0b7e868
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 236256e897e51ea4993d2e70f77f23a085ac115e
X-Git-Newrev: 0b7e8687494ed8522e0243b5e6390fbd4e5e54c9
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, 15 Mar 2015 02:07:55 -0000

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

The branch, master has been updated
       via  0b7e8687494ed8522e0243b5e6390fbd4e5e54c9 (commit)
      from  236256e897e51ea4993d2e70f77f23a085ac115e (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=0b7e8687494ed8522e0243b5e6390fbd4e5e54c9


commit 0b7e8687494ed8522e0243b5e6390fbd4e5e54c9
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Sun Mar 15 02:54:03 2015 +0100

    telnetd: Suppress PTY packet data.
    
    The data preamble from PTY in packet mode was not pruned
    sufficiently before transferring the payload to client.

diff --git a/ChangeLog b/ChangeLog
index f4f3ef7..0310c61 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2015-03-15  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	telnetd: Suppress PTY packet data.
+	The server is receiving PTY input in packet mode, but is not
+	properly discarding PIOCPKT_DATA before handing over input
+	to the network socket.  Do this correctly.
+
+	* telnetd/telnetd.c (telnet_run) <input from pty>: Break the
+	loop also if pty_read() returns zero.  Add a final call to
+	pty_get_char() before ending FD_ISSET(pty, &ibits).  This call
+	was mistakenly located within the subcase where TIOCPKT_NOSTOP
+	or TIOCPKT_DOSTOP is handled.
+
 2015-03-14  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	Complaints during IPv6-less testing.
diff --git a/telnetd/telnetd.c b/telnetd/telnetd.c
index eb825e5..fff4432 100644
--- a/telnetd/telnetd.c
+++ b/telnetd/telnetd.c
@@ -662,14 +662,17 @@ telnetd_run (void)
       if (FD_ISSET (pty, &ibits))
 	{
 	  /* Something to read from the pty... */
-	  if (pty_read () < 0)
+	  if (pty_read () <= 0)
 	    break;
+
+	  /* The first byte is now TIOCPKT data.  Peek at it.  */
 	  c = pty_get_char (1);
+
 #if defined TIOCPKT_IOCTL
 	  if (c & TIOCPKT_IOCTL)
 	    {
 	      pty_get_char (0);
-	      copy_termbuf ();
+	      copy_termbuf ();	/* Pty buffer is now emptied.  */
 	      localstat ();
 	    }
 #endif
@@ -686,16 +689,16 @@ telnetd_run (void)
 	  if (his_state_is_will (TELOPT_LFLOW)
 	      && (c & (TIOCPKT_NOSTOP | TIOCPKT_DOSTOP)))
 	    {
-	      int newflow = c & TIOCPKT_DOSTOP ? 1 : 0;
+	      int newflow = (c & TIOCPKT_DOSTOP) ? 1 : 0;
 	      if (newflow != flowmode)
 		{
 		  net_output_data ("%c%c%c%c%c%c",
 				   IAC, SB, TELOPT_LFLOW,
 				   flowmode ? LFLOW_ON : LFLOW_OFF, IAC, SE);
 		}
-	      pty_get_char (0);
 	    }
 
+	  pty_get_char (0);	/* Discard the TIOCPKT preamble.  */
 	}
 
       while (pty_input_level () > 0)

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

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


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Mon Mar 16 18:26:16 2015
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1YXdSi-0007X3-89
	for mharc-commit-inetutils@gnu.org; Mon, 16 Mar 2015 18:26:16 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:46222)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1YXdSf-0007Vu-F8
	for commit-inetutils@gnu.org; Mon, 16 Mar 2015 18:26:14 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1YXdSd-0006jU-Te
	for commit-inetutils@gnu.org; Mon, 16 Mar 2015 18:26:13 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:44043)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1YXdSd-0006jP-Q2
	for commit-inetutils@gnu.org; Mon, 16 Mar 2015 18:26:11 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1YXdSd-0000s4-0n
	for commit-inetutils@gnu.org; Mon, 16 Mar 2015 22:26:11 +0000
Date: Mon, 16 Mar 2015 22:26:11 +0000
Message-Id: <E1YXdSd-0000s4-0n@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_2-53-g495beb8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 0b7e8687494ed8522e0243b5e6390fbd4e5e54c9
X-Git-Newrev: 495beb89dac593371c004c57c65c4efd290ecd51
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: Mon, 16 Mar 2015 22:26:14 -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  495beb89dac593371c004c57c65c4efd290ecd51 (commit)
      from  0b7e8687494ed8522e0243b5e6390fbd4e5e54c9 (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=495beb89dac593371c004c57c65c4efd290ecd51


commit 495beb89dac593371c004c57c65c4efd290ecd51
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Mon Mar 16 23:22:12 2015 +0100

    ftp: Honour host aliases.
    
    Take care to preserve the desired peer's name.  Do not
    replace it with its canonical name.  Bug was reported to
    the list as `2015-02/msg00000.html' by John Sullivan.

diff --git a/ChangeLog b/ChangeLog
index 0310c61..70c741c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2015-03-16  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	ftp: Honour host aliases.
+	While establishing the connection, do not replace the desired
+	peer name with its canonical name.  This prevents correct use
+	of the netrc file.  Bug reported by John Sullivan in
+	http://lists.gnu.org/archive/html/bug-inetutils/2015-02/msg00000.html
+
+	* ftp/cmds.c (setpeer): Do not assign value from hookup()
+	to HOST.  Instead, only test if it is non-null.
+
 2015-03-15  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	telnetd: Suppress PTY packet data.
diff --git a/ftp/cmds.c b/ftp/cmds.c
index 16ba5fc..422d365 100644
--- a/ftp/cmds.c
+++ b/ftp/cmds.c
@@ -279,8 +279,14 @@ setpeer (int argc, char **argv)
       port = (sp) ? ntohs (sp->s_port) : DEFPORT;
     }
 
-  host = hookup (host, port);
-  if (host)
+  /* After hookup(), the global variable `hostname' contains
+   * the canonical host name corresponding to the alias name
+   * contained in HOST.  The return value of hookup() is not
+   * NULL only if the server has answered our call.  The value
+   * of HOST should be preserved for reporting inside login(),
+   * which also detects a correct stanza of the netrc file.
+   */
+  if (hookup (host, port))
     {
       int overbose;
 

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

Summary of changes:
 ChangeLog  |   11 +++++++++++
 ftp/cmds.c |   10 ++++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Thu Mar 19 09:20:06 2015
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1YYaMo-0008MQ-R8
	for mharc-commit-inetutils@gnu.org; Thu, 19 Mar 2015 09:20:06 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:48125)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1YYaMj-0008ID-Cs
	for commit-inetutils@gnu.org; Thu, 19 Mar 2015 09:20:05 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1YYaMi-0000bw-0J
	for commit-inetutils@gnu.org; Thu, 19 Mar 2015 09:20:01 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:58644)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1YYaMh-0000bs-Tj
	for commit-inetutils@gnu.org; Thu, 19 Mar 2015 09:19:59 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1YYaMg-0005Ky-Se
	for commit-inetutils@gnu.org; Thu, 19 Mar 2015 13:19:59 +0000
Date: Thu, 19 Mar 2015 13:19:58 +0000
Message-Id: <E1YYaMg-0005Ky-Se@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_2-54-gfa3245a
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 495beb89dac593371c004c57c65c4efd290ecd51
X-Git-Newrev: fa3245ac8c288b87139a0da8249d0a408c4dfb87
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, 19 Mar 2015 13:20:05 -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  fa3245ac8c288b87139a0da8249d0a408c4dfb87 (commit)
      from  495beb89dac593371c004c57c65c4efd290ecd51 (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=fa3245ac8c288b87139a0da8249d0a408c4dfb87


commit fa3245ac8c288b87139a0da8249d0a408c4dfb87
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Thu Mar 19 13:49:43 2015 +0100

    telnetd: Enable autologin in legacy mode.
    
    Without authentication, autologin was broken.  Bug reported
    by Kuaikuai Wu to the list in `2014-12/msg00010.html'.

diff --git a/ChangeLog b/ChangeLog
index 70c741c..6f868c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2015-03-19  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	telnetd: Enable autologin in legacy mode.
+	Without Kerberos authentication the autologin code was not
+	determining what user name to hand over to the login service.
+	Adding the user name, when applicable, resolves the issue.
+	Bug was reported by Kuaikuai Wu in
+	http://lists.gnu.org/archive/html/bug-inetutils/2014-12/msg00010.html
+
+	* telnetd/telnetd.c [SOLARIS10] (login_invocation):
+	Add device path "-d %L" and user name "%U", the latter
+	in the form of an else clause to the selector "%?u".
+	[!SOLARIS10] (login_invocation): Likewise for "%U" only.
+
+	* telnetd/utility.c (getterminaltype): Change the paramater
+	name `user_name' to `uname', as the former shadows a precious
+	and global variable name.
+	(_var_short_name) <case 'L'>: New case, returning full path
+	to the PTY device assigned to client.
+	<case 'U'>: New case, returning a copy of the environment
+	variable USER, or an empty string.
+
 2015-03-16  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	ftp: Honour host aliases.
diff --git a/telnetd/telnetd.c b/telnetd/telnetd.c
index fff4432..faecc07 100644
--- a/telnetd/telnetd.c
+++ b/telnetd/telnetd.c
@@ -52,14 +52,14 @@ char *login_invocation =
    *       `-u' takes the Kerberos principal name
    *       of the authenticating, remote user.
    */
-  PATH_LOGIN " -p -h %h %?T{-t %T} %?u{-u %u}"
+  PATH_LOGIN " -p -h %h %?T{-t %T} -d %L %?u{-u %u}{%U}"
 
 #elif defined SOLARIS
   /* At least for SunOS 5.8.  */
-  PATH_LOGIN " -h %h %?T{%T} %?u{-- %u}"
+  PATH_LOGIN " -h %h %?T{%T} %?u{-- %u}{%U}"
 
 #else /* !SOLARIS */
-  PATH_LOGIN " -p -h %h %?u{-f %u}"
+  PATH_LOGIN " -p -h %h %?u{-f %u}{%U}"
 #endif
   ;
 
diff --git a/telnetd/utility.c b/telnetd/utility.c
index e644377..21a231e 100644
--- a/telnetd/utility.c
+++ b/telnetd/utility.c
@@ -695,7 +695,7 @@ _gettermname (void)
  * Changes terminaltype.
  */
 int
-getterminaltype (char *user_name, size_t len)
+getterminaltype (char *uname, size_t len)
 {
   int retval = -1;
 
@@ -721,10 +721,10 @@ getterminaltype (char *user_name, size_t len)
       ttloop (his_will_wont_is_changing (TELOPT_AUTHENTICATION));
 
       if (his_state_is_will (TELOPT_AUTHENTICATION))
-	retval = auth_wait (user_name, len);
+	retval = auth_wait (uname, len);
     }
 #else /* !AUTHENTICATION */
-  (void) user_name;	/* Silence warning.  */
+  (void) uname;	/* Silence warning.  */
 #endif
 
 #ifdef	ENCRYPTION
@@ -1680,6 +1680,9 @@ _var_short_name (struct line_expander *exp)
     case 'l':
       return xstrdup (local_hostname);
 
+    case 'L':
+      return xstrdup (line);
+
     case 't':
       q = strchr (line + 1, '/');
       if (q)
@@ -1694,6 +1697,9 @@ _var_short_name (struct line_expander *exp)
     case 'u':
       return user_name ? xstrdup (user_name) : NULL;
 
+    case 'U':
+      return getenv ("USER") ? xstrdup (getenv ("USER")) : xstrdup ("");
+
     default:
       exp->state = EXP_STATE_ERROR;
       return NULL;

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

Summary of changes:
 ChangeLog         |   22 ++++++++++++++++++++++
 telnetd/telnetd.c |    6 +++---
 telnetd/utility.c |   12 +++++++++---
 3 files changed, 34 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Fri Mar 20 10:51:50 2015
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1YYyH8-0006vI-Kh
	for mharc-commit-inetutils@gnu.org; Fri, 20 Mar 2015 10:51:50 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:45905)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1YYyH5-0006uX-Jp
	for commit-inetutils@gnu.org; Fri, 20 Mar 2015 10:51:49 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1YYyH4-0001Tu-7b
	for commit-inetutils@gnu.org; Fri, 20 Mar 2015 10:51:47 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:48147)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1YYyH4-0001To-3I
	for commit-inetutils@gnu.org; Fri, 20 Mar 2015 10:51:46 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1YYyH3-0001MW-8N
	for commit-inetutils@gnu.org; Fri, 20 Mar 2015 14:51:45 +0000
Date: Fri, 20 Mar 2015 14:51:45 +0000
Message-Id: <E1YYyH3-0001MW-8N@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_2-55-g6b95da1
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: fa3245ac8c288b87139a0da8249d0a408c4dfb87
X-Git-Newrev: 6b95da18a8c6cff38bc212a20a6bd9d1333ee956
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, 20 Mar 2015 14:51:49 -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  6b95da18a8c6cff38bc212a20a6bd9d1333ee956 (commit)
      from  fa3245ac8c288b87139a0da8249d0a408c4dfb87 (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=6b95da18a8c6cff38bc212a20a6bd9d1333ee956


commit 6b95da18a8c6cff38bc212a20a6bd9d1333ee956
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Fri Mar 20 14:34:59 2015 +0100

    telnetd: Texinfo documentation.

diff --git a/ChangeLog b/ChangeLog
index 6f868c3..a0e7a58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2015-03-20  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	telnetd: Texinfo documentation.
+
+	* doc/inetutils.texi (telnetd invocation): Add a section
+	on the use of replacement tokens in the execution string.
+
 2015-03-19  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	telnetd: Enable autologin in legacy mode.
diff --git a/doc/inetutils.texi b/doc/inetutils.texi
index ef7e74c..bd82a7c 100644
--- a/doc/inetutils.texi
+++ b/doc/inetutils.texi
@@ -4980,6 +4980,112 @@ is to be disabled.  Standard choices are @samp{null},
 @samp{kerberos_v4}, and @samp{kerberos_v5}.
 @end table
 
+@section Crafting an execution string.
+
+The server @command{telnetd} contains a built-in execution string
+which invokes @command{login} with arguments suitable for the
+operating system at hand.  This preset choice corresponds to the
+standard use case of the service.  For specialized purposes
+this implementation also offers a command line option @option{-E},
+or @option{--exec-login}, to override the built-in execution of
+@command{login}, thus allowing almost any choice of handler.
+
+@noindent
+A custom execution string could look like
+
+@example
+telnetd -h -E '/usr/local/sbin/avrop  %t %U'
+@end example
+
+@noindent
+The execution string must as its first part provide an absolute
+path to an executable file.  After that may follow arbitrary
+additional arguments.
+For this latter part, @command{telnetd} offers some replacement
+tokens that dynamically are replaced by content.  All are of
+the form @code{%<var>}, where @samp{<var>} is a single letter
+from the following collection of selectors.
+A valid letter is called @dfn{variable}.
+The mark @emph{conditional}, appearing below, indicates that the
+corresponding variable is conditionally assigned a value.
+
+@table @code
+@item %a
+@opindex %a
+Returns @samp{ok} whenever authentication is complete. @emph{conditional}
+
+@item %d
+@opindex %d
+Produces a time and date string.
+
+@item %h
+@opindex %h
+Gives the remote host name in canonical form.
+
+@item %l
+@opindex %l
+States the local host name, also in canonical form.
+
+@item %L
+@opindex %L
+Returns the path of the pseudo terminal assigned to the client.
+
+@item %t
+@opindex %t
+Gives the terminal device stripped of the leading @samp{/dev/}.
+
+@item %T
+@opindex %T
+States the terminal type, like @samp{xterm}. @emph{conditional}
+
+@item %u
+@opindex %u
+Provides the authenticated user name. @emph{conditional}
+
+@item %U
+@opindex %U
+Returns the user name passed as an environment variable @env{USER}
+by the remote client software.  The value is empty, should the
+environment not provide a value.
+
+@end table
+
+In addition, a conditional construct is able to take one action
+in case a variable has an assigned value, and optionally to take
+another action in the opposite case.  The contruct is
+
+@example
+%?<var>@{true-stmt@}[@{false-stmt@}]
+@end example
+
+@noindent
+The braces are here mandatory, while the brackets enclose the optional
+else-clause and are not included in actual use.
+The initial, motivating example, could thus be expanded to read
+
+@example
+telnetd -h -E '/usr/local/sbin/avrop  %t %?a@{%u krb5@}@{%U@}'
+@end example
+
+@noindent
+In case authentication was completed as user @samp{sigge},
+the execution string would resolve to
+
+@smallexample
+/usr/local/sbin/avrop  pts/1 sigge krb5
+@end smallexample
+
+@noindent
+In all other cases the result would be
+
+@smallexample
+/usr/local/sbin/avrop  pts/1 $USER
+@end smallexample
+
+@noindent
+where @code{$USER} is the value of the corresponding environment
+variable and could possibly be empty.
+
 @node uucpd invocation
 @chapter @command{uucpd}: Unix to Unix Copy relay daemon.
 @cindex uucpd

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

Summary of changes:
 ChangeLog          |    7 +++
 doc/inetutils.texi |  106 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 113 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Sat Mar 21 18:41:07 2015
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1YZS4p-0008Pe-RW
	for mharc-commit-inetutils@gnu.org; Sat, 21 Mar 2015 18:41:07 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:46043)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1YZS4n-0008OC-TB
	for commit-inetutils@gnu.org; Sat, 21 Mar 2015 18:41:06 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1YZS4m-0004EW-Mm
	for commit-inetutils@gnu.org; Sat, 21 Mar 2015 18:41:05 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:42032)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1YZS4m-0004ES-JG
	for commit-inetutils@gnu.org; Sat, 21 Mar 2015 18:41:04 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1YZS4l-00086s-ED
	for commit-inetutils@gnu.org; Sat, 21 Mar 2015 22:41:04 +0000
Date: Sat, 21 Mar 2015 22:41:03 +0000
Message-Id: <E1YZS4l-00086s-ED@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_2-56-gf09010f
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 6b95da18a8c6cff38bc212a20a6bd9d1333ee956
X-Git-Newrev: f09010fcda33e679d59ae53565f14a3e576ae138
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, 21 Mar 2015 22:41:06 -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  f09010fcda33e679d59ae53565f14a3e576ae138 (commit)
      from  6b95da18a8c6cff38bc212a20a6bd9d1333ee956 (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=f09010fcda33e679d59ae53565f14a3e576ae138


commit f09010fcda33e679d59ae53565f14a3e576ae138
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Sat Mar 21 23:28:52 2015 +0100

    Portability of time format string.

diff --git a/ChangeLog b/ChangeLog
index a0e7a58..a74d968 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2015-03-21  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	Portability of time format string.
+
+	* telnetd/utility.c (_var_short_name) <case 'd'>: Change `%P'
+	to `%p' in format string for strftime(), as the former is a
+	GNU exclusive extension of no portability at all.  Another
+	conversion specifier `%l' is not POSIX conforming, but seems
+	to be generally supported, so it is left untouched.
+
 2015-03-20  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	telnetd: Texinfo documentation.
diff --git a/telnetd/utility.c b/telnetd/utility.c
index 21a231e..e7ffb8e 100644
--- a/telnetd/utility.c
+++ b/telnetd/utility.c
@@ -1671,7 +1671,7 @@ _var_short_name (struct line_expander *exp)
     case 'd':
       time (&t);
       strftime (timebuf, sizeof (timebuf),
-		"%l:%M%P on %A, %d %B %Y", localtime (&t));
+		"%l:%M%p on %A, %d %B %Y", localtime (&t));
       return xstrdup (timebuf);
 
     case 'h':

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

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


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Wed Mar 25 18:24:39 2015
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Yatj4-0000hf-Vo
	for mharc-commit-inetutils@gnu.org; Wed, 25 Mar 2015 18:24:38 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:40875)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1Yatj1-0000h6-Nf
	for commit-inetutils@gnu.org; Wed, 25 Mar 2015 18:24:36 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1Yatj0-00054o-Jv
	for commit-inetutils@gnu.org; Wed, 25 Mar 2015 18:24:35 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:47847)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1Yatj0-00054i-GG
	for commit-inetutils@gnu.org; Wed, 25 Mar 2015 18:24:34 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1Yatiz-0004az-Sv
	for commit-inetutils@gnu.org; Wed, 25 Mar 2015 22:24:34 +0000
Date: Wed, 25 Mar 2015 22:24:33 +0000
Message-Id: <E1Yatiz-0004az-Sv@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_2-57-g9c4b9b1
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: f09010fcda33e679d59ae53565f14a3e576ae138
X-Git-Newrev: 9c4b9b1f6dc025c69361328f134aac03287d8b9a
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, 25 Mar 2015 22:24:36 -0000

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

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


commit 9c4b9b1f6dc025c69361328f134aac03287d8b9a
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Wed Mar 25 22:26:53 2015 +0100

    Documentation (silent change)

diff --git a/NEWS b/NEWS
index f7a2996..cff5233 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,11 @@ Version 1.9.3:
 
 * ftp
 
+An old inability to allow other names than the canonical name has
+been corrected.  This means that a machine entry in the .netrc file
+will now be used as expected.  Previously any alias name was replaced
+by the corresponding canonical name, before reading the .netrc file.
+
 The internal command `hash' accepts a suffixed letter to the size
 argument, like `12k', instead of 12288.  Made a minor change to the
 syntax of the command itself, allowing size changes independently
@@ -45,6 +50,17 @@ there has for a long time existed an attack vector based on large
 facility numbers, made public in CVE-2014-3684.  This is now mended
 in our code base.
 
+* telnetd
+
+The ability to autologin a client, without using authentication,
+is now functional in the expected manner, i.e., the prompt for a
+user name is suppressed in favour of an immediate password prompt.
+
+In a setting where the client is using a UTF-8 encoding, it was
+common to observe strange characters in most responses.  This was
+caused by the server daemon, due to incomplete purging of internal
+protocol data.  The issue should now be resolved.
+
 * whois
 
 Improved cooperation with servers like `whois.arin.net', `whois.eu',

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

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


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Mon Mar 30 07:23:34 2015
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1YcXn4-0007oW-TT
	for mharc-commit-inetutils@gnu.org; Mon, 30 Mar 2015 07:23:34 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:46139)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1YcXn1-0007nu-KB
	for commit-inetutils@gnu.org; Mon, 30 Mar 2015 07:23:32 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1YcXn0-0003MN-3M
	for commit-inetutils@gnu.org; Mon, 30 Mar 2015 07:23:31 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:34582)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1YcXn0-0003MI-08
	for commit-inetutils@gnu.org; Mon, 30 Mar 2015 07:23:30 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1YcXmy-00062m-TN
	for commit-inetutils@gnu.org; Mon, 30 Mar 2015 11:23:29 +0000
Date: Mon, 30 Mar 2015 11:23:28 +0000
Message-Id: <E1YcXmy-00062m-TN@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_2-58-g768f222
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 9c4b9b1f6dc025c69361328f134aac03287d8b9a
X-Git-Newrev: 768f222f617fe80e0fa55adb7c95b76fdfb074cd
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: Mon, 30 Mar 2015 11:23: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  768f222f617fe80e0fa55adb7c95b76fdfb074cd (commit)
      from  9c4b9b1f6dc025c69361328f134aac03287d8b9a (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=768f222f617fe80e0fa55adb7c95b76fdfb074cd


commit 768f222f617fe80e0fa55adb7c95b76fdfb074cd
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Mon Mar 30 12:56:18 2015 +0200

    Texinfo: Improve typeset output.
    
    In typeset form, like PS and PDF, two cases of exceedingly
    long lines are improved.  Examples rendered in small fonts
    are all changed into normal size.

diff --git a/ChangeLog b/ChangeLog
index a74d968..0b2ccc7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2015-03-30  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	Texinfo: Improve typeset output.
+
+	* doc/inetutils.texi: Replace all @smallexample by @example.
+	<inetd invocation>: Make the multi-line example two spaces
+	narrower in order to fit into a rendered PDF page.
+	<tftpd invocation>: Rephrase a sentence for easier line breaks,
+	thus avoiding text extending into the right margin.
+
 2015-03-21  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	Portability of time format string.
diff --git a/doc/inetutils.texi b/doc/inetutils.texi
index bd82a7c..a234556 100644
--- a/doc/inetutils.texi
+++ b/doc/inetutils.texi
@@ -377,9 +377,9 @@ Send messages to the given host or socket.  The @var{host} argument
 can be either a local UNIX socket name (containing a slash @samp{/}),
 or be of the form
 
-@smallexample
+@example
 @var{host}[:@var{port}]
-@end smallexample
+@end example
 
 @noindent
 where @var{host} is the remote host name or IP address, and the
@@ -1783,9 +1783,9 @@ and @file{myfile.myfile} from @file{.myfile}.
 
 Spaces may be included in @var{outpattern}, but are easily removed:
 
-@smallexample
+@example
 nmap $1 |sed "s/ *$//" > $1
-@end smallexample
+@end example
 
 Use a backslash @samp{\} to escape the characters
 @samp{$}, @samp{[}, @samp{]}, and @samp{,}.
@@ -2033,9 +2033,9 @@ includes spaces, the argument must be quoted; e.g.  @samp{"ls -lt"}.
 
 A particularly useful example of this mechanism in action, is
 
-@smallexample
+@example
 ftp> dir . |less
-@end smallexample
+@end example
 
 which allows the user to scroll through a long directory listing.
 
@@ -2396,9 +2396,9 @@ file @file{remotefile} to a file named @file{otherfile} again, but this
 time the file is located on the remote host.  The effect of quoting
 the redirection operator is to execute the command
 
-@smallexample
+@example
 cat remotefile >> localfile
-@end smallexample
+@end example
 
 @noindent
 entirely on the remote most, whence stdout at the remote host will
@@ -3078,9 +3078,9 @@ To avoid repeating an address that occurs frequently, a line with a
 host address specifier and colon, but no further fields is allowed,
 e.g.:
 
-@smallexample
+@example
 127.0.0.1,192.168.0.5:
-@end smallexample
+@end example
 
 The address specifier from such a line is remembered and used for all
 further lines lacking an explicit host specifier.  Such a default
@@ -3092,9 +3092,9 @@ When used in a normal configuration line, it causes the default address
 specifier to be ignored for that line.  When used in a default address
 specification, e.g.:
 
-@smallexample
+@example
 *:
-@end smallexample
+@end example
 
 it causes any previous default address specifier to be forgotten.
 
@@ -3235,11 +3235,11 @@ Here are several example service entries for the various types of
 services:
 
 @example
-ftp           stream  tcp   nowait root  /usr/libexec/ftpd       ftpd -l
-ntalk         dgram   udp   wait   nobody:tty  /usr/libexec/talkd  talkd
+ftp           stream  tcp   nowait root  /usr/libexec/ftpd     ftpd -l
+ntalk         dgram   udp   wait   nobody:tty /usr/libexec/talkd talkd
 tcpmux        stream  tcp   nowait root  internal
-tcpmux/+date  stream  tcp   nowait guest /bin/date               date
-tcpmux/phonebook stream tcp nowait guest /usr/bin/phonebook      phonebook
+tcpmux/+date  stream  tcp   nowait guest /bin/date             date
+tcpmux/phonebook stream tcp nowait guest /usr/bin/phonebook    phonebook
 @end example
 
 @node Inetd Environment
@@ -4092,13 +4092,13 @@ tftp dgram udp4 wait root /usr/sbin/tftpd \
 @noindent
 This would allow the TFTP client to use any of
 
-@smallexample
+@example
 get kernel
 get /tftpboot/kernel
 get kernel.alt
 get /altboot/kernel.alt
 get /etc/motd
-@end smallexample
+@end example
 
 @noindent
 given that @file{/tftpboot/kernel} and @file{/altboot/kernel.alt} exist.
@@ -4115,8 +4115,8 @@ tftp dgram udp4 wait root /usr/sbin/tftpd \
 @end example
 
 @noindent
-Supposing that the files @file{/srv/tftp-root/tftpboot/kernel}
-and @file{/srv/tftp-root/altboot/kernel.alt} were available,
+Supposing the files @file{kernel} and @file{kernel.alt} to exist
+in the common directory @file{/srv/tftp-root/altboot/},
 all the previously suggested client requests for a kernel would
 still be granted, but now any request for @file{/etc/motd}
 would be declined, and would get a reply `File not found' back.
@@ -5071,16 +5071,16 @@ telnetd -h -E '/usr/local/sbin/avrop  %t %?a@{%u krb5@}@{%U@}'
 In case authentication was completed as user @samp{sigge},
 the execution string would resolve to
 
-@smallexample
+@example
 /usr/local/sbin/avrop  pts/1 sigge krb5
-@end smallexample
+@end example
 
 @noindent
 In all other cases the result would be
 
-@smallexample
+@example
 /usr/local/sbin/avrop  pts/1 $USER
-@end smallexample
+@end example
 
 @noindent
 where @code{$USER} is the value of the corresponding environment

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

Summary of changes:
 ChangeLog          |   10 ++++++++++
 doc/inetutils.texi |   48 ++++++++++++++++++++++++------------------------
 2 files changed, 34 insertions(+), 24 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Mon Mar 30 17:00:40 2015
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1YcgnY-0006Lc-Qu
	for mharc-commit-inetutils@gnu.org; Mon, 30 Mar 2015 17:00:40 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:43242)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1YcgnW-0006LV-FY
	for commit-inetutils@gnu.org; Mon, 30 Mar 2015 17:00:39 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1YcgnU-0006eh-Gi
	for commit-inetutils@gnu.org; Mon, 30 Mar 2015 17:00:38 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:41836)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1YcgnU-0006dr-AS
	for commit-inetutils@gnu.org; Mon, 30 Mar 2015 17:00:36 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1YcgnT-0004cm-5C
	for commit-inetutils@gnu.org; Mon, 30 Mar 2015 21:00:35 +0000
Date: Mon, 30 Mar 2015 21:00:35 +0000
Message-Id: <E1YcgnT-0004cm-5C@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_2-59-g3e7df6e
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 768f222f617fe80e0fa55adb7c95b76fdfb074cd
X-Git-Newrev: 3e7df6ebd742dc50a31406c1cb5f872a0a9b1cc7
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: Mon, 30 Mar 2015 21:00:40 -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  3e7df6ebd742dc50a31406c1cb5f872a0a9b1cc7 (commit)
      from  768f222f617fe80e0fa55adb7c95b76fdfb074cd (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=3e7df6ebd742dc50a31406c1cb5f872a0a9b1cc7


commit 3e7df6ebd742dc50a31406c1cb5f872a0a9b1cc7
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Mon Mar 30 22:50:03 2015 +0200

    Texinfo: Slight reordering of nodes.

diff --git a/ChangeLog b/ChangeLog
index 0b2ccc7..f499500 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,25 @@
 2015-03-30  Mats Erik Andersson  <gnu@gisladisker.se>
 
+	Texinfo: Slight reordering of nodes.
+	This makes all chapters consistent in themselves.
+
+	* doc/inetutils.texi: Put direntry `dnsdomainname' first in
+	dircategory `Individual utilities', for alphabetic reasons.
+	Interchange nodes `dnsdomainname invocation' and `hostname
+	invocation' in response to that change.
+	(ftp invocation): In sub-menu, move `The .netrc file' to be
+	last entry in the list.  Move the node `Ftp environment' from
+	last to third relative position in this chapter.  Position
+	three comes from the ordering in the established sub-menu.
+
+2015-03-30  Mats Erik Andersson  <gnu@gisladisker.se>
+
 	Texinfo: Improve typeset output.
 
 	* doc/inetutils.texi: Replace all @smallexample by @example.
-	<inetd invocation>: Make the multi-line example two spaces
+	(inetd invocation): Make the multi-line example two spaces
 	narrower in order to fit into a rendered PDF page.
-	<tftpd invocation>: Rephrase a sentence for easier line breaks,
+	(tftpd invocation): Rephrase a sentence for easier line breaks,
 	thus avoiding text extending into the right margin.
 
 2015-03-21  Mats Erik Andersson  <gnu@gisladisker.se>
diff --git a/doc/inetutils.texi b/doc/inetutils.texi
index a234556..12ad8b1 100644
--- a/doc/inetutils.texi
+++ b/doc/inetutils.texi
@@ -29,10 +29,10 @@
 
 @dircategory Individual utilities
 @direntry
+* dnsdomainname: (inetutils)dnsdomainname invocation.       Show DNS domain name.
 * ftp: (inetutils)ftp invocation.                 FTP client.
 * ftpd: (inetutils)ftpd invocation.               FTP Daemon.
 * hostname: (inetutils)hostname invocation.       Show or set system host name.
-* dnsdomainname: (inetutils)dnsdomainname invocation.       Show DNS domain name.
 * inetd: (inetutils)inetd invocation.             Internet super-server.
 * logger: (inetutils)logger invocation.           Send messages to the system log.
 * ping: (inetutils)ping invocation.               Packets to network hosts.
@@ -229,6 +229,31 @@ Failure is indicated by a nonzero value --- typically @samp{1}, though
 it may differ on unusual platforms, as POSIX requires only that it be
 nonzero.
 
+@node dnsdomainname invocation
+@chapter @command{dnsdomainname}: Show DNS domain name
+@cindex dnsdomainname
+
+@command{dnsdomainname} is a program to show the domain part of the
+system's fully qualified domain name.  For example, if the FQDN of the
+system is @code{name.example.org} the command will show
+@code{example.org}.
+The output is not necessarily related to the NIS/YP domain name.
+
+The tool uses gethostname to get the host name of the system and
+then getaddrinfo to resolve it into a canonical name.
+The domain part of the canonical name is shown, i.e., the part
+after the first period@tie{}(@code{.}) of the official name.
+
+@noindent
+Synopsis:
+
+@example
+dnsdomainname [@var{option}@dots{}]
+@end example
+
+@noindent
+There is no command specific option.
+
 @node hostname invocation
 @chapter @command{hostname}: Show or set system host name.
 @cindex hostname
@@ -298,31 +323,6 @@ Get short host name.
 Get NIS/YP domain name.
 @end table
 
-@node dnsdomainname invocation
-@chapter @command{dnsdomainname}: Show DNS domain name
-@cindex dnsdomainname
-
-@command{dnsdomainname} is a program to show the domain part of the
-system's fully qualified domain name.  For example, if the FQDN of the
-system is @code{name.example.org} the command will show
-@code{example.org}.
-The output is not necessarily related to the NIS/YP domain name.
-
-The tool uses gethostname to get the host name of the system and
-then getaddrinfo to resolve it into a canonical name.
-The domain part of the canonical name is shown, i.e., the part
-after the first period@tie{}(@code{.}) of the official name.
-
-@noindent
-Synopsis:
-
-@example
-dnsdomainname [@var{option}@dots{}]
-@end example
-
-@noindent
-There is no command specific option.
-
 @node logger invocation
 @chapter @command{logger}: Send messages to system log
 @cindex logger
@@ -1352,10 +1352,10 @@ of operation.
 * Ftp options::
 * Ftp commands::
 * Ftp environment::
-* The .netrc file::
 * Aborting a file transfer::
 * File naming conventions::
 * File transfer parameters::
+* The .netrc file::
 @end menu
 
 @node Ftp options
@@ -1991,6 +1991,23 @@ transfer are reported.  By default, verbose is on.
 Command arguments which have embedded spaces may be inclosed within
 citation characters @samp{"}.
 
+@node Ftp environment
+@section Environment variables in use
+
+@command{ftp} accesses the following environment variables.
+
+@table @env
+@item HOME
+Used for locating a @file{.netrc} file, if one exists.
+
+@item NETRC
+Alternate location of the @file{.netrc} file,
+taking precedence over the standard location.
+
+@item SHELL
+For determining the default shell interpreter.
+@end table
+
 @node Aborting a file transfer
 @section Aborting a file transfer
 
@@ -2144,23 +2161,6 @@ encountered.  If a macro named init is defined, it is automatically
 executed as the last step in the auto-login process.
 @end table
 
-@node Ftp environment
-@section Environment variables in use
-
-@command{ftp} accesses the following environment variables.
-
-@table @env
-@item HOME
-Used for locating a @file{.netrc} file, if one exists.
-
-@item NETRC
-Alternate location of the @file{.netrc} file,
-taking precedence over the standard location.
-
-@item SHELL
-For determining the default shell interpreter.
-@end table
-
 @node tftp invocation
 @chapter @command{tftp}: TFTP client
 @cindex tftp

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

Summary of changes:
 ChangeLog          |   18 +++++++++-
 doc/inetutils.texi |   88 ++++++++++++++++++++++++++--------------------------
 2 files changed, 60 insertions(+), 46 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Tue Mar 31 03:46:19 2015
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1YcqsN-00087O-HQ
	for mharc-commit-inetutils@gnu.org; Tue, 31 Mar 2015 03:46:19 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:42247)
	by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1YcqsG-00086u-8D
	for commit-inetutils@gnu.org; Tue, 31 Mar 2015 03:46:18 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ams@gnu.org>) id 1Ycqs9-0001Pc-Nj
	for commit-inetutils@gnu.org; Tue, 31 Mar 2015 03:46:12 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:48844)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1Ycqs9-0001PU-IN
	for commit-inetutils@gnu.org; Tue, 31 Mar 2015 03:46:05 -0400
Received: from ams by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <ams@gnu.org>) id 1Ycqs8-0003GV-80
	for commit-inetutils@gnu.org; Tue, 31 Mar 2015 07:46:04 +0000
Date: Tue, 31 Mar 2015 07:46:04 +0000
Message-Id: <E1Ycqs8-0003GV-80@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_2-60-gae6b5b5
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 3e7df6ebd742dc50a31406c1cb5f872a0a9b1cc7
X-Git-Newrev: ae6b5b5f5c134e710fb45e20ea7ff8b3da10c030
From: "Alfred M. Szmidt" <ams@gnu.org>
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: Tue, 31 Mar 2015 07:46: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  ae6b5b5f5c134e710fb45e20ea7ff8b3da10c030 (commit)
      from  3e7df6ebd742dc50a31406c1cb5f872a0a9b1cc7 (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=ae6b5b5f5c134e710fb45e20ea7ff8b3da10c030


commit ae6b5b5f5c134e710fb45e20ea7ff8b3da10c030
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Tue Mar 31 07:43:44 2015 +0000

    * doc/inetutils.texi: Re-order chapters.

diff --git a/ChangeLog b/ChangeLog
index f499500..f93388a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-03-31  Alfred M. Szmidt  <ams@gnu.org>
+
+	* doc/inetutils.texi: Re-order chapters.
+
 2015-03-30  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	Texinfo: Slight reordering of nodes.
diff --git a/doc/inetutils.texi b/doc/inetutils.texi
index 12ad8b1..775b9a8 100644
--- a/doc/inetutils.texi
+++ b/doc/inetutils.texi
@@ -19,8 +19,6 @@
 @syncodeindex pg cp
 @syncodeindex vr cp
 
-@set Francois Fran@,{c}ois
-
 @dircategory Basics
 @direntry
 * Inetutils: (inetutils).       GNU networking utilities.
@@ -35,8 +33,8 @@
 * hostname: (inetutils)hostname invocation.       Show or set system host name.
 * inetd: (inetutils)inetd invocation.             Internet super-server.
 * logger: (inetutils)logger invocation.           Send messages to the system log.
-* ping: (inetutils)ping invocation.               Packets to network hosts.
 * ping6: (inetutils)ping6 invocation.             Packets to IPv6 network hosts.
+* ping: (inetutils)ping invocation.               Packets to network hosts.
 * rcp: (inetutils)rcp invocation.                 Remote copy
 * rexec: (inetutils)rexec invocation.             Remote execution client.
 * rexecd: (inetutils)rexecd invocation.           Remote execution server.
@@ -93,8 +91,6 @@ Documentation License''.
 @insertcopying
 @end ifnottex
 
-@cindex networking utilities
-
 @menu
 * Introduction::                       Caveats, overview, and authors.
 * Common options::                     Common options.
@@ -122,16 +118,18 @@ Clients
 
 Daemons
 
-* ftpd invocation::                    FTP Daemon.
-* inetd invocation::                   Internet super-server.
-* rexecd invocation::                  Remote execution server.
-* rlogind invocation::                 Remote login server.
-* rshd invocation::                    Remote shell server.
-* syslogd invocation::                 Syslog server.
-* talkd invocation::                   Talk server.
-* telnetd invocation::                 Telnet server.
-* tftpd invocation::                   TFTP server.
-* uucpd invocation::                   Unix to Unix Copy.
+* inetd invocation::		       Internet super-server.
+* syslogd invocation::		       Syslog server.
+* ftpd invocation::		       FTP Daemon.
+* rexecd invocation::		       Remote execution server.
+* rlogind invocation::		       Remote login server.
+* rshd invocation::		       Remote shell server.
+* talkd invocation::		       Talk server.
+* telnetd invocation::		       Telnet server.
+* tftpd invocation::		       TFTP server.
+* uucpd invocation::		       Unix to Unix Copy.
+
+Appendix
 
 * GNU Free Documentation License::     The license for this manual.
 * Index::                              Index of manual.
@@ -228,10 +226,10 @@ majority of commands, an exit status of zero indicates success.
 Failure is indicated by a nonzero value --- typically @samp{1}, though
 it may differ on unusual platforms, as POSIX requires only that it be
 nonzero.
-
+
 @node dnsdomainname invocation
 @chapter @command{dnsdomainname}: Show DNS domain name
-@cindex dnsdomainname
+@pindex dnsdomainname
 
 @command{dnsdomainname} is a program to show the domain part of the
 system's fully qualified domain name.  For example, if the FQDN of the
@@ -253,10 +251,10 @@ dnsdomainname [@var{option}@dots{}]
 
 @noindent
 There is no command specific option.
-
+
 @node hostname invocation
 @chapter @command{hostname}: Show or set system host name.
-@cindex hostname
+@pindex hostname
 
 @command{hostname} is a program to show or to set the name of a
 host system.
@@ -322,10 +320,10 @@ Get short host name.
 @opindex --nis
 Get NIS/YP domain name.
 @end table
-
+
 @node logger invocation
 @chapter @command{logger}: Send messages to system log
-@cindex logger
+@pindex logger
 
 @command{logger} is a program to send entries to system log.  It
 provides a shell command interface similar to the system log module.
@@ -476,10 +474,10 @@ logger -p daemon.warn -h logger.runasimi.org -S 10.10.10.1  \
 @verb{|       |}--file warnings
 @end example
 @end enumerate
-
+
 @node ping invocation
 @chapter @command{ping}: Packets to network hosts
-@cindex ping
+@pindex ping
 
 @c FIXME: The text is far to detailed about the actual implementation
 @c of ping.  A user doesn't need to know that we are using TIMEVAL, or
@@ -863,10 +861,10 @@ Some BSD variants offer a kernel setting to inhibit all replies
 to ICMP_MASKREQ packets, but in general, Unices are designed either
 to answer the request with a valid netmask, or to drop the request,
 causing @command{ping} to wait for a timeout condition.
-
+
 @node ping6 invocation
 @chapter @command{ping6}: Packets to IPv6 network hosts
-@cindex ping6
+@pindex ping6
 
 @command{ping6} uses ICMPv6 datagrams to get a response
 from the chosen destination host.
@@ -1021,10 +1019,10 @@ the use of @command{ping6}.
 Keep in mind, though, that the differing address family
 causes some discrepancy.
 @xref{ping invocation}.
-
+
 @node traceroute invocation
 @chapter @command{traceroute}: Trace the route to a host
-@cindex traceroute
+@pindex traceroute
 
 @command{traceroute} prints a trace of the route
 IP@tie{}packets are travelling to a remote host.
@@ -1163,10 +1161,10 @@ Isolated host, not reachable.
 @item !X
 Forbidden by remote administration.
 @end table
-
+
 @node whois invocation
 @chapter @command{whois}: User interface to WHOIS data bases.
-@cindex whois
+@pindex whois
 
 The functionality of a world wide Internet is dependent on
 stored node information of different kinds.
@@ -1315,10 +1313,9 @@ When unset, @samp{whois.internic.net} is used as default server.
 
 @end table
 
-
 @node ftp invocation
 @chapter @command{ftp}: FTP client
-@cindex ftp
+@pindex ftp
 
 @command{ftp} is the user interface to FTP,
 the File Transfer Protocol.
@@ -2160,139 +2157,26 @@ and continue until a null line (consecutive new-line characters) is
 encountered.  If a macro named init is defined, it is automatically
 executed as the last step in the auto-login process.
 @end table
+
+@node rcp invocation
+@chapter @command{rcp}: Copy files between machines
+@pindex rcp
 
-@node tftp invocation
-@chapter @command{tftp}: TFTP client
-@cindex tftp
-
-@command{tftp} is the user interface to the Internet TFTP, Trivial
-File Transfer Protocol, which allows users to transfer files to and
-from a remote machine.  The remote host may be specified on the
-command line, in which case @command{tftp} uses host as the default
-host for future transfers.
+@command{rcp} copies files between machines.  Each file or directory
+argument is either a remote file name of the form
+@samp{rname@@rhost:path}, or a local file name (containing no @samp{:}
+characters, or a @samp{/} before any @samp{:}s).
 
 @noindent
 Synopsis:
 
 @example
-tftp [@var{option}]@dots{} @var{host}
-@end example
-
-@section Commands
-
-Once @command{tftp} is running, it issues the prompt and recognizes
-the following commands:
-
-@table @code
-@item ? @var{command-name}
-Print help information.
-
-@item ascii
-Shorthand for @code{mode ascii}
-
-@item binary
-Shorthand for @code{mode binary}
-
-@item connect @var{host-name} [@var{port}]
-Set the host (and optionally port) for transfers.  Note that the TFTP
-protocol, unlike the FTP protocol, does not maintain connections
-between transfers; thus, the connect command does not actually create
-a connection, but merely remembers what host is to be used for
-transfers.  You do not have to use the connect command; the remote
-host can be specified as part of the get or put commands.
-
-@item get @var{file-name}
-@itemx get @var{remotename} @var{localname}
-@itemx get @var{file}@dots{}
-Get a file, or a set of files, from the specified sources.  The source can
-be in one of two forms: a file name on the remote host, if the host has
-already been specified, or a string of the form @samp{host:filename}
-to specify both a host and file name at the same time.  If the latter
-form is used, the last hostname specified becomes the default for
-future transfers.  When specifying a numeric IPv6 address as host
-part, then this address must be enclosed between square brackets,
-since it contains colons and would interfere with the delimiter
-before the file name.  Brackets are optional for IPv4 addresses.
-
-@example
-tftp> get [2001:1234::12]:issue
-@end example
-
-@item mode @var{transfer-mode}
-Set the mode for transfers; @var{transfer-mode} may be one of
-@samp{ascii} or @samp{binary}.  The default is @samp{ascii}.
-
-@item put @var{file}
-@itemx put @var{localfile} @var{remotefile}
-@itemx put @var{file}@dots{} @var{remote-directory}
-Put a file or set of files to the specified remote file or directory.
-The destination can be in one of two forms: a filename on the remote
-host, if the host has already been specified, or a string of the form
-@samp{host:filename} to specify both a host and filename at the same
-time.  If the latter form is used, the hostname specified becomes the
-default for future transfers.  If the @file{remote-directory} form is
-used, the remote host is assumed to be a UNIX machine.  The same use
-of square brackets for enclosing numeric IPv6 addresses applies here,
-as was mentioned for the command @command{get}.
-
-@item quit
-Exit @command{tftp}.  An end of file also exits.
-
-@item rexmt @var{retransmission-timeout}
-Set the per-packet retransmission timeout, in seconds.
-
-@item status
-Show current status.
-
-@item timeout @var{total-transmission-timeout}
-Set the total transmission timeout, in seconds.
-
-@item trace
-Toggle packet tracing.
-
-@item verbose
-Toggle verbose mode.
-@end table
-
-Because there is no user-login or validation within the @command{tftp}
-protocol, the remote site will probably have some sort of file-access
-restrictions in place.  The exact methods are specific to each site
-and therefore difficult to document here.
-
-@node rsh invocation
-@chapter @command{rsh}: Remote shell
-@cindex rsh
-
-@command{rsh} executes commands on a remote host and copies its local
-standard input to that of the remote command, as well as the remote
-standard output to the local standard output, and the remote standard
-error to the local standard error.  Locally raised interrupt, quit and
-terminate signals are all propagated to the remote command. Normally
-@command{rsh} terminates when the remote command does so.
-
-When using the @command{rsh} command, you can for convenience create
-a link in your path, using a host name as name of the link.  For example:
-
-@example
-# ln -s /usr/bin/rsh @var{hostname}
-# @var{hostname} ls
+rcp [@var{option}]@dots{} @var{old-file} @var{new-file}
+rcp [@var{option}]@dots{} @var{files}@dots{} @var{directory}
 @end example
 
-@noindent
-Afterwards, @var{hostname} will be passed to @command{rsh} as host name
-whenever the command @var{hostname} is issued.
-
-@command{rsh} allows access to the remote host without the use of a
-password.  The prerequisite is a suitable specification in @file{~/.rhosts}.
-For details, @xref{rcmd, , rcmd, libc, The GNU C Library Reference Manual}.
-
-If no command is specified for @command{rsh} ar argument following the
-host name, then you will be logged in on the remote host using @command{rlogin}.
-
 @section Command line options
-@anchor{rsh options}
-
-The options are as follows :
+@anchor{rcp options}
 
 @table @option
 @item -4
@@ -2307,42 +2191,23 @@ Use only IPv4.
 @opindex --ipv6
 Use only IPv6.
 
-@item -d
-@itemx --debug
+@item -d @var{directory}
+@itemx --target-directory=@var{directory}
 @opindex -d
-@opindex --debug
-Turns on socket debugging used for communication with the remote host.
-
-@item -l @var{user}
-@itemx --user=@var{user}
-@opindex -l
-@opindex --user
-By default, the remote username is the same as the local username.
-The @option{-l} option and the @samp{username@@host} format allow the
-remote user name to be specified.  Kerberos authentication is used,
-whenever available, and authorization is determined as in @command{rlogin}
-(@pxref{rlogin invocation}).
-
-@item -n
-@itemx --no-input
-@opindex -n
-@opindex --no-input
-Use @file{/dev/null} for all input, telling the server side that
-we send no material.  This can prevent the remote process from
-blocking, should it optionally accept more input.
-The option is void together with encryption.
-@end table
+@opindex --target-directory
+Copy all source arguments into @var{directory}.
 
-@noindent
-The next three options are available only if the program
-has been compiled with support for Kerberos authentication.
+@item -f
+@itemx --from
+@opindex -f
+@opindex --from
+(Server mode only.) Copying from remote host.
 
-@table @option
 @item -k @var{realm}
 @itemx --realm=@var{realm}
 @opindex -k
 @opindex --realm
-The option requests rsh to obtain tickets for the remote host in
+The option requests rcp to obtain tickets for the remote host in
 realm @var{realm} instead of the remote host's realm.
 
 @item -K
@@ -2351,62 +2216,135 @@ realm @var{realm} instead of the remote host's realm.
 @opindex --kerberos
 Turns off all Kerberos authentication.
 
+@item -p
+@itemx --preserve
+@opindex -p
+@opindex --preserve
+Causes @code{rcp} to attempt to preserve (duplicate) in its copies the
+modification times and modes of the source files, ignoring the umask.
+By default, the mode and owner of the target file are preserved
+if the target itself already exists; otherwise the mode of the source
+file is modified by the @code{umask} setting on the destination host.
+
+@item -r
+@itemx --recursive
+@opindex -r
+@opindex --recursive
+If any of the source files are directories, @command{rcp} copies each
+subtree rooted at that name; in this case the destination must be a
+directory.
+
+@item -t
+@itemx --to
+@opindex -t
+@opindex --to
+(Server mode only.) Copying to remote host.
+
 @item -x
 @itemx --encrypt
 @opindex -x
 @opindex --encrypt
-Turns on encryption for all data passed via the rsh session.  This
-may impact response time and CPU utilization, but provides increased
+Turns on encryption for all data passed via the @command{rcp} session.
+This may impact response time and CPU utilization, but provides increased
 security.
+
 @end table
 
-@noindent
-Finally, some compatibility options are present:
+@command{rcp} doesn't detect all cases where the target of a copy
+might be a file in cases where only a directory should be legal.
 
-@table @option
-@item -8
-@itemx --8-bit
-@itemx -e @var{char}
-@itemx --escape=@var{char}
-@itemx -E
-@itemx --no-escape
-Ignored during normal operation, but passed on to @command{rlogin}
-when @command{rsh} is invoked without a command argument.
-@end table
+@command{rcp} can be confused by any output generated by commands in a
+@file{.login}, @file{.profile}, or @file{.cshrc} file on the remote
+host.
 
-@section Note on stream redirections
+The destination user and hostname may have to be specified as
+@samp{rhost.rname} when the destination machine is running the 4.2BSD
+version of @command{rcp}.
+
+@node rexec invocation
+@chapter @command{rexec}: a remote execution program
+@pindex rexec
 
-Beware that non-quoted shell metacharacters are interpreted on the local
-machine, while quoted metacharacters are interpreted on the remote
-machine.  For example:
+@command{rexec} is a program that executes a program on another host.
+
+@noindent
+Synopsis:
 
 @example
-rsh otherhost  cat remotefile >> localfile
-rsh otherhost  cat remotefile ">>" otherfile
+rexec --user=@var{login} --password=@var{pass} --host=@var{host}  \
+@verb{|      |}[OPTION] @var{command}
 @end example
 
-@noindent
-The first command appends the contents of @file{remotefile}, as found
-on the remote host, to the file @file{localfile} on the local host,
-since the local shell will intercept the redirection and will thus
-receive whatever the remote process directs to stdout.
+@section Command line options
+@anchor{rexec options}
 
-In contrast, the second command will append the contents of the same
-file @file{remotefile} to a file named @file{otherfile} again, but this
-time the file is located on the remote host.  The effect of quoting
-the redirection operator is to execute the command
+@table @option
+@item -4
+@itemx --ipv4
+@opindex -4
+@opindex --ipv4
+Use only IPv4 connections as all times.
 
-@example
-cat remotefile >> localfile
-@end example
+@item -6
+@itemx --ipv6
+@opindex -6
+@opindex --ipv6
+Use only IPv6 connections.
 
-@noindent
-entirely on the remote most, whence stdout at the remote host will
-have nothing to transmit to the listening local host!.
+@item -a
+@itemx --ipany
+@opindex -a
+@opindex --ipany
+Allow any address family for connections.  This is the default.
+
+@item -e
+@itemx --error=@var{port}
+@opindex -e
+@opindex --error
+Specify the TCP port to use for stderr redirection, in case it is not
+specified a random port will be used.
+
+@item -h
+@item --host=@var{name}
+@opindex -h
+@opindex --host
+Specify the host with whom to connect: symbolic name or address.
+
+@item -n
+@itemx --noerr
+@opindex -n
+@opindex --noerr
+If specified, an error stream will not be created.
+
+@item -p
+@itemx --password=@var{passwd}
+@opindex -p
+@opindex --password
+Specify the password for logging-in.  The special value
+consisting of a single dash @samp{-} will make @command{rexec}
+read a single line from stdin.  This input is then used
+as password and is passed as such to the remote server.
+Thus it is possible to hide vital access information
+slightly better than the full disclosure implicit in
+the text of a command line option.
+
+@item -P
+@itemx --port=@var{num}
+@opindex -P
+@opindex --port
+Specify to which numerical port a connection shall be sought.
+If it is not specified, then use port 512/tcp by default.
 
+@item -u
+@itemx --user=@var{name}
+@opindex -u
+@opindex --user
+Specify the user with whom to log into the server.
+@end table
+
 @node rlogin invocation
 @chapter @command{rlogin}: Remote login
-@cindex rlogin
+@pindex rlogin
 
 The @command{rlogin} command starts a terminal session on the
 specified remote host, provided the required authentication
@@ -2589,26 +2527,41 @@ for on the remote machine as in @command{login}.  To avoid certain
 security problems, the @file{.k5login} file must be owned by the remote
 user.  If Kerberos authentication fails, a warning message is printed
 and the standard Berkeley rlogin is used instead.
+
+@node rsh invocation
+@chapter @command{rsh}: Remote shell
+@pindex rsh
 
-@node rcp invocation
-@chapter @command{rcp}: Copy files between machines
-@cindex rcp
-
-@command{rcp} copies files between machines.  Each file or directory
-argument is either a remote file name of the form
-@samp{rname@@rhost:path}, or a local file name (containing no @samp{:}
-characters, or a @samp{/} before any @samp{:}s).
+@command{rsh} executes commands on a remote host and copies its local
+standard input to that of the remote command, as well as the remote
+standard output to the local standard output, and the remote standard
+error to the local standard error.  Locally raised interrupt, quit and
+terminate signals are all propagated to the remote command. Normally
+@command{rsh} terminates when the remote command does so.
 
-@noindent
-Synopsis:
+When using the @command{rsh} command, you can for convenience create
+a link in your path, using a host name as name of the link.  For example:
 
 @example
-rcp [@var{option}]@dots{} @var{old-file} @var{new-file}
-rcp [@var{option}]@dots{} @var{files}@dots{} @var{directory}
+# ln -s /usr/bin/rsh @var{hostname}
+# @var{hostname} ls
 @end example
 
+@noindent
+Afterwards, @var{hostname} will be passed to @command{rsh} as host name
+whenever the command @var{hostname} is issued.
+
+@command{rsh} allows access to the remote host without the use of a
+password.  The prerequisite is a suitable specification in @file{~/.rhosts}.
+For details, @xref{rcmd, , rcmd, libc, The GNU C Library Reference Manual}.
+
+If no command is specified for @command{rsh} ar argument following the
+host name, then you will be logged in on the remote host using @command{rlogin}.
+
 @section Command line options
-@anchor{rcp options}
+@anchor{rsh options}
+
+The options are as follows :
 
 @table @option
 @item -4
@@ -2623,23 +2576,42 @@ Use only IPv4.
 @opindex --ipv6
 Use only IPv6.
 
-@item -d @var{directory}
-@itemx --target-directory=@var{directory}
+@item -d
+@itemx --debug
 @opindex -d
-@opindex --target-directory
-Copy all source arguments into @var{directory}.
+@opindex --debug
+Turns on socket debugging used for communication with the remote host.
 
-@item -f
-@itemx --from
-@opindex -f
-@opindex --from
-(Server mode only.) Copying from remote host.
+@item -l @var{user}
+@itemx --user=@var{user}
+@opindex -l
+@opindex --user
+By default, the remote username is the same as the local username.
+The @option{-l} option and the @samp{username@@host} format allow the
+remote user name to be specified.  Kerberos authentication is used,
+whenever available, and authorization is determined as in @command{rlogin}
+(@pxref{rlogin invocation}).
+
+@item -n
+@itemx --no-input
+@opindex -n
+@opindex --no-input
+Use @file{/dev/null} for all input, telling the server side that
+we send no material.  This can prevent the remote process from
+blocking, should it optionally accept more input.
+The option is void together with encryption.
+@end table
+
+@noindent
+The next three options are available only if the program
+has been compiled with support for Kerberos authentication.
 
+@table @option
 @item -k @var{realm}
 @itemx --realm=@var{realm}
 @opindex -k
 @opindex --realm
-The option requests rcp to obtain tickets for the remote host in
+The option requests rsh to obtain tickets for the remote host in
 realm @var{realm} instead of the remote host's realm.
 
 @item -K
@@ -2648,150 +2620,76 @@ realm @var{realm} instead of the remote host's realm.
 @opindex --kerberos
 Turns off all Kerberos authentication.
 
-@item -p
-@itemx --preserve
-@opindex -p
-@opindex --preserve
-Causes @code{rcp} to attempt to preserve (duplicate) in its copies the
-modification times and modes of the source files, ignoring the umask.
-By default, the mode and owner of the target file are preserved
-if the target itself already exists; otherwise the mode of the source
-file is modified by the @code{umask} setting on the destination host.
-
-@item -r
-@itemx --recursive
-@opindex -r
-@opindex --recursive
-If any of the source files are directories, @command{rcp} copies each
-subtree rooted at that name; in this case the destination must be a
-directory.
-
-@item -t
-@itemx --to
-@opindex -t
-@opindex --to
-(Server mode only.) Copying to remote host.
-
 @item -x
 @itemx --encrypt
 @opindex -x
 @opindex --encrypt
-Turns on encryption for all data passed via the @command{rcp} session.
-This may impact response time and CPU utilization, but provides increased
+Turns on encryption for all data passed via the rsh session.  This
+may impact response time and CPU utilization, but provides increased
 security.
+@end table
 
+@noindent
+Finally, some compatibility options are present:
+
+@table @option
+@item -8
+@itemx --8-bit
+@itemx -e @var{char}
+@itemx --escape=@var{char}
+@itemx -E
+@itemx --no-escape
+Ignored during normal operation, but passed on to @command{rlogin}
+when @command{rsh} is invoked without a command argument.
 @end table
 
-@command{rcp} doesn't detect all cases where the target of a copy
-might be a file in cases where only a directory should be legal.
+@section Note on stream redirections
 
-@command{rcp} can be confused by any output generated by commands in a
-@file{.login}, @file{.profile}, or @file{.cshrc} file on the remote
-host.
+Beware that non-quoted shell metacharacters are interpreted on the local
+machine, while quoted metacharacters are interpreted on the remote
+machine.  For example:
 
-The destination user and hostname may have to be specified as
-@samp{rhost.rname} when the destination machine is running the 4.2BSD
-version of @command{rcp}.
+@example
+rsh otherhost  cat remotefile >> localfile
+rsh otherhost  cat remotefile ">>" otherfile
+@end example
 
-@node rexec invocation
-@chapter @command{rexec}: a remote execution program
-@cindex rexec
+@noindent
+The first command appends the contents of @file{remotefile}, as found
+on the remote host, to the file @file{localfile} on the local host,
+since the local shell will intercept the redirection and will thus
+receive whatever the remote process directs to stdout.
 
-@command{rexec} is a program that executes a program on another host.
+In contrast, the second command will append the contents of the same
+file @file{remotefile} to a file named @file{otherfile} again, but this
+time the file is located on the remote host.  The effect of quoting
+the redirection operator is to execute the command
+
+@example
+cat remotefile >> localfile
+@end example
+
+@noindent
+entirely on the remote most, whence stdout at the remote host will
+have nothing to transmit to the listening local host!.
+
+@node talk invocation
+@chapter @command{talk}: a communication program
+@pindex talk
+
+@command{talk} is a visual communication program which copies lines
+from your terminal to that of another user.
 
 @noindent
 Synopsis:
 
 @example
-rexec --user=@var{login} --password=@var{pass} --host=@var{host}  \
-@verb{|      |}[OPTION] @var{command}
+talk @var{person} [@var{ttyname}]
 @end example
 
-@section Command line options
-@anchor{rexec options}
+@section Invoking
 
-@table @option
-@item -4
-@itemx --ipv4
-@opindex -4
-@opindex --ipv4
-Use only IPv4 connections as all times.
-
-@item -6
-@itemx --ipv6
-@opindex -6
-@opindex --ipv6
-Use only IPv6 connections.
-
-@item -a
-@itemx --ipany
-@opindex -a
-@opindex --ipany
-Allow any address family for connections.  This is the default.
-
-@item -e
-@itemx --error=@var{port}
-@opindex -e
-@opindex --error
-Specify the TCP port to use for stderr redirection, in case it is not
-specified a random port will be used.
-
-@item -h
-@item --host=@var{name}
-@opindex -h
-@opindex --host
-Specify the host with whom to connect: symbolic name or address.
-
-@item -n
-@itemx --noerr
-@opindex -n
-@opindex --noerr
-If specified, an error stream will not be created.
-
-@item -p
-@itemx --password=@var{passwd}
-@opindex -p
-@opindex --password
-Specify the password for logging-in.  The special value
-consisting of a single dash @samp{-} will make @command{rexec}
-read a single line from stdin.  This input is then used
-as password and is passed as such to the remote server.
-Thus it is possible to hide vital access information
-slightly better than the full disclosure implicit in
-the text of a command line option.
-
-@item -P
-@itemx --port=@var{num}
-@opindex -P
-@opindex --port
-Specify to which numerical port a connection shall be sought.
-If it is not specified, then use port 512/tcp by default.
-
-@item -u
-@itemx --user=@var{name}
-@opindex -u
-@opindex --user
-Specify the user with whom to log into the server.
-@end table
-
-
-@node talk invocation
-@chapter @command{talk}: a communication program
-@cindex talk
-
-@command{talk} is a visual communication program which copies lines
-from your terminal to that of another user.
-
-@noindent
-Synopsis:
-
-@example
-talk @var{person} [@var{ttyname}]
-@end example
-
-@section Invoking
-
-The command line arguments are as follows:
+The command line arguments are as follows:
 
 @table @var
 @item person
@@ -2847,10 +2745,10 @@ The ability to talk may be enabled or disabled by use of the
 this message passing is enabled at the outset of a terminal session.
 Certain commands, in particular @command{nroff} and @command{pr},
 disable messages in order to prevent messy output.
-
+
 @node telnet invocation
 @chapter @command{telnet}: User interface to TELNET
-@cindex telnet
+@pindex telnet
 
 Login to a remote system HOST, optionally using a (non-standard)
 service port PORT.
@@ -2966,10 +2864,108 @@ Use this option multiple times if more than one type
 is to be disabled.  Standard choices are @samp{null},
 @samp{kerberos_v4}, and @samp{kerberos_v5}.
 @end table
+
+@node tftp invocation
+@chapter @command{tftp}: TFTP client
+@pindex tftp
+
+@command{tftp} is the user interface to the Internet TFTP, Trivial
+File Transfer Protocol, which allows users to transfer files to and
+from a remote machine.  The remote host may be specified on the
+command line, in which case @command{tftp} uses host as the default
+host for future transfers.
+
+@noindent
+Synopsis:
+
+@example
+tftp [@var{option}]@dots{} @var{host}
+@end example
+
+@section Commands
+
+Once @command{tftp} is running, it issues the prompt and recognizes
+the following commands:
+
+@table @code
+@item ? @var{command-name}
+Print help information.
+
+@item ascii
+Shorthand for @code{mode ascii}
+
+@item binary
+Shorthand for @code{mode binary}
+
+@item connect @var{host-name} [@var{port}]
+Set the host (and optionally port) for transfers.  Note that the TFTP
+protocol, unlike the FTP protocol, does not maintain connections
+between transfers; thus, the connect command does not actually create
+a connection, but merely remembers what host is to be used for
+transfers.  You do not have to use the connect command; the remote
+host can be specified as part of the get or put commands.
 
+@item get @var{file-name}
+@itemx get @var{remotename} @var{localname}
+@itemx get @var{file}@dots{}
+Get a file, or a set of files, from the specified sources.  The source can
+be in one of two forms: a file name on the remote host, if the host has
+already been specified, or a string of the form @samp{host:filename}
+to specify both a host and file name at the same time.  If the latter
+form is used, the last hostname specified becomes the default for
+future transfers.  When specifying a numeric IPv6 address as host
+part, then this address must be enclosed between square brackets,
+since it contains colons and would interfere with the delimiter
+before the file name.  Brackets are optional for IPv4 addresses.
+
+@example
+tftp> get [2001:1234::12]:issue
+@end example
+
+@item mode @var{transfer-mode}
+Set the mode for transfers; @var{transfer-mode} may be one of
+@samp{ascii} or @samp{binary}.  The default is @samp{ascii}.
+
+@item put @var{file}
+@itemx put @var{localfile} @var{remotefile}
+@itemx put @var{file}@dots{} @var{remote-directory}
+Put a file or set of files to the specified remote file or directory.
+The destination can be in one of two forms: a filename on the remote
+host, if the host has already been specified, or a string of the form
+@samp{host:filename} to specify both a host and filename at the same
+time.  If the latter form is used, the hostname specified becomes the
+default for future transfers.  If the @file{remote-directory} form is
+used, the remote host is assumed to be a UNIX machine.  The same use
+of square brackets for enclosing numeric IPv6 addresses applies here,
+as was mentioned for the command @command{get}.
+
+@item quit
+Exit @command{tftp}.  An end of file also exits.
+
+@item rexmt @var{retransmission-timeout}
+Set the per-packet retransmission timeout, in seconds.
+
+@item status
+Show current status.
+
+@item timeout @var{total-transmission-timeout}
+Set the total transmission timeout, in seconds.
+
+@item trace
+Toggle packet tracing.
+
+@item verbose
+Toggle verbose mode.
+@end table
+
+Because there is no user-login or validation within the @command{tftp}
+protocol, the remote site will probably have some sort of file-access
+restrictions in place.  The exact methods are specific to each site
+and therefore difficult to document here.
+
 @node inetd invocation
 @chapter @command{inetd}: Internet super-server
-@cindex inetd
+@pindex inetd
 
 @command{inetd} program should be run at boot time by /etc/rc.  It
 then listens for connections on certain internet sockets.  When a
@@ -3317,10 +3313,10 @@ occurs when the service is invoked.
 @itemx service: can't set gid number
 The user or group ID for the entry's user is invalid.
 @end table
-
+
 @node syslogd invocation
 @chapter @command{syslogd}: system service logging faclity
-@cindex syslogd
+@pindex syslogd
 
 @command{syslogd} is a system service that provides error logging
 facility.  Messages are read from the UNIX domain socket
@@ -3636,10 +3632,10 @@ The effects of multiple selectors are sometimes not intuitive.  For
 example @samp{mail.crit,*.err} will select the @samp{mail} facility
 messages at the level of @samp{err} or higher, not at the level of
 @samp{crit} or higher.
-
+
 @node ftpd invocation
 @chapter @command{ftpd}: FTP daemon
-@cindex ftpd
+@pindex ftpd
 
 @command{ftpd} is the Internet File Transfer Protocol server process.
 The server uses the TCP protocol and listens at the port specified in
@@ -3972,391 +3968,124 @@ that a single @samp{@@} on a line by itself in
 @file{/etc/ftpchroot}, will enforce chrooting
 upon every user allowed to access the FTP service.
 This gives a Draconian, protective configuration.
+
+@node rexecd invocation
+@chapter @command{rexecd}: server for @code{rexec}
+@pindex rexecd
 
-@node tftpd invocation
-@chapter @command{tftpd}: TFTP server
-@cindex tftpd
-
-@command{tftpd} is intended to be invoked via @command{inetd}
-at all times.
-
-@noindent
-Synopsis:
-
-@example
-tftpd [@var{options}] [@var{directory} @dots{}]
-@end example
-
-@table @option
-@item -g @var{group}
-@itemx --group=@var{group}
-@opindex -g
-@opindex --group
-Specify group membership of the process owner.
-This is used only along with the option @option{-s},
-and replaces the group membership that comes from
-the process owner himself.
-
-@item -l
-@itemx --logging
-@opindex -l
-@opindex --logging
-Enable logging.
-
-@item -n
-@itemx --nonexistent
-@opindex -n
-@opindex --nonexistent
-Supress negative acknowledgement of requests for nonexistent relative
-filenames.
-
-@item -s @var{dir}
-@itemx --secure-dir=@var{dir}
-@opindex -s
-@opindex --secure-dir
-Let the serving process change its root directory to @var{dir}
-before attending to any requests.
-This directory is not observable by any client, but improves
-server isolation, since servable contents must be located
-below this chrooted directory @var{dir}.
-
-@item -u @var{user}
-@itemx --user=@var{user}
-@opindex -u
-@opindex --user
-Specify the process owner for serving requests.
-Only relevant along with the option @option{-s}.
-The default name is @samp{nobody}.
-@end table
-
-@section Directory prefixes
-@anchor{tftpd validation}
-
-In addition to options, an invocation of @command{tftpd} can
-specify an optional list of directory prefixes.
-These are approved of according to two principles:
-
-@itemize @bullet
-@item
-Relative pathnames are ignored.
-
-@item
-At most twenty prefixes are approved, the rest is discarded.
-@end itemize
-
-@noindent
-A request for a file is decided upon as a consequence
-of evaluating these criteria:
-
-@itemize @bullet
-@item
-Every file request containing the substring @samp{/../} is denied,
-as is a file name beginning with @samp{../}.
-
-@item
-Write requests must specify absolute locations.
-
-@item
-A file request, if specified as an @emph{absolute} pathname,
-must begin with one of the approved directory prefixes,
-should at least one such prefix have been accepted.
-
-@item
-In the absence of a prefix collection, any absolute pathname is
-accepted, should the corresponding file exist.
-
-@item
-A file request, if specified as a @emph{relative} name,
-will only be searched for below the acceptable prefixes,
-should at least one such prefix have been approved.
-
-@item
-A request for a relatively named file, is denied in the absence
-of approved directory prefixes.
-
-@item
-The resulting file must be world readable, or world writable,
-for a read request, or a write request, to succeed.
-@end itemize
-
-@section Use cases
-@anchor{tftpd setup cases}
-
-The standard use case is an entry in @file{/etc/inetd.conf} like
-
-@example
-tftp dgram udp4 wait root /usr/sbin/tftpd \
-@verb{        } tftpd /tftpboot /altboot
-@end example
-
-@noindent
-This would allow the TFTP client to use any of
-
-@example
-get kernel
-get /tftpboot/kernel
-get kernel.alt
-get /altboot/kernel.alt
-get /etc/motd
-@end example
-
-@noindent
-given that @file{/tftpboot/kernel} and @file{/altboot/kernel.alt} exist.
-Observe that also @file{/etc/motd} is accessible, inspite there being
-no explicit mention of standard file locations.
-
-A stronger mode of running a TFTP server is to use the `secure mode',
-meaning that the serving process is running in a chrooted mode.
-Then a suitable configuration could be
+@command{rexecd} is the server for the @code{rexec} routine.  The
+server provides remote execution facilities with authentication based
+on user names and passwords.  It passes error messages and notices
+to the @code{syslog} facility @samp{LOG_DAEMON}.
 
 @example
-tftp dgram udp4 wait root /usr/sbin/tftpd \
-@verb{        } tftpd --secure-dir=/srv/tftp-root  /tftpboot /altboot
+rexecd [@var{option}]@dots{}
 @end example
 
-@noindent
-Supposing the files @file{kernel} and @file{kernel.alt} to exist
-in the common directory @file{/srv/tftp-root/altboot/},
-all the previously suggested client requests for a kernel would
-still be granted, but now any request for @file{/etc/motd}
-would be declined, and would get a reply `File not found' back.
-
-The chrooted setting is denying access outside of
-@file{/srv/tftp-root}, yet is not indicating this lock-in
-to the client, and is thus improving server isolation.
-Since neither of @option{-u} and @option{-g} were specified,
-the configuration reproduced above will in fact have the
-transmitting server process running with the default
-owner set to @samp{nobody:nogroup}.
-
-@node rshd invocation
-@chapter @command{rshd}: Remote shell server
-@cindex rshd
-
-The @command{rshd} server is the server for the @code{rcmd} routine
-and, consequently, for the @command{rsh} (@pxref{rsh invocation})
-program.  The server provides remote execution facilities with
-authentication based on privileged port numbers from trusted hosts.
-The @command{rshd} server listens for service requests at the port
-indicated in the @samp{cmd} service specification.  When a service
-request is received the following protocol is initiated:
+@command{rexecd} listens for service requests at the port indicated in
+the @samp{exec} service specification.  When a service request is
+received the following protocol is initiated:
 
 @enumerate
 @item
-The server checks the client's source port.  If the port is not in the
-range 512--1023, the server aborts the connection.  However, this
-condition is not applied for Kerberized service.
-
-@item
 The server reads characters from the socket up to a NUL (@samp{\0})
 byte.  The resultant string is interpreted as an ASCII number, base
 10.
 
 @item
-If the number received in step 2 is non-zero, it is interpreted as the
+If the number received in step 1 is non-zero, it is interpreted as the
 port number of a secondary stream to be used for the stderr.  A second
 connection is then created to the specified port on the client's
-machine.  The source port of this second connection is also in the
-range 512--1023.
-
-@item
-The server checks the client's source address and requests the
-corresponding host name.  If the hostname cannot be determined, the
-dot-notation representation of the host address is used.  If the
-hostname is in the same domain as the server (according to the last
-two components of the domain name), or if the @option{-a} option is
-given, the addresses for the hostname are requested, verifying that
-the name and address correspond.  If address verification fails, the
-connection is aborted with the message, @samp{Host address mismatch.}
-
-@item
-A null terminated user name of at most 16 characters is retrieved on
-the initial socket.  This user name is interpreted as the user
-identity on the client's machine.
-
-@item
-A null terminated user name of at most 16 characters is retrieved on
-the initial socket.  This user name is interpreted as a user identity
-to use on the server's machine.
-
-@item
-A null terminated command to be passed to a shell is retrieved on the
-initial socket.  The length of the command is limited by the upper
-bound on the size of the system's argument list.
-
-@item
-Rshd then validates the user using @code{ruserok}, which uses the file
-@file{/etc/hosts.equiv} and the @file{.rhosts} file found in the
-user's home directory.  The @option{-l} option prevents @code{ruserok}
-from doing any validation based on the user's @file{.rhosts} file,
-unless the user is the superuser.
-
-@item
-If the file @file{/etc/nologin} exists and the user is not the
-superuser, the connection is closed.
-
-@item
-A null byte is returned on the initial socket and the command line is
-passed to the normal login shell of the user.  The shell inherits the
-network connections established by @command{rshd}.
+machine.
 
 @item
-Transport-level keepalive messages are enabled unless the @option{-n}
-option is present.  The use of keepalive messages allows sessions to
-be timed out if the client crashes or becomes unreachable.
+A NUL terminated user name of at most 16 characters is retrieved on
+the initial socket.
 
 @item
-The @option{-L} option causes all successful accesses to be logged to
-@command{syslogd} (@pxref{syslogd invocation}) as @samp{auth.info}
-messages.
-@end enumerate
-
-@xref{ruserok, , ruserok, libc, The GNU C Library Reference Manual},
-for details.
-
-@section Invoking
-
-The options are as follows:
-
-@table @option
-@item -a
-@itemx --verify-hostname
-@opindex -a
-@opindex --verify-hostname
-Ask hostname for verification.
-
-@c @item -d
-@c @itemx --daemon
-@c @opindex -d
-@c @opindex --daemon
-@c Daemon mode.
-
-@item -k
-@itemx --kerberos
-@opindex -k
-@opindex --kerberos
-Use Kerberos authentication.
-
-@item -l
-@itemx --no-rhosts
-@opindex -l
-@opindex --no-rhosts
-Ignore @file{.rhosts} file.
-
-@item -L
-@itemx --log-sessions
-@opindex -L
-@opindex --log-sessions
-Log successful logins.
-
-@item -n
-@itemx --no-keepalive
-@opindex -n
-@opindex --no-keepalive
-Do not set SO_KEEPALIVE.
+A NUL terminated, unencrypted password of at most 16 characters is
+retrieved on the initial socket.
 
-@item -S @var{name}
-@itemx --servername=@var{name}
-@opindex -S
-@opindex --servername
-Set Kerberos server name, overriding canonical hostname.
+@item
+A NUL terminated command to be passed to a shell is retrieved on the
+initial socket.  The length of the command is limited by the upper
+bound on the size of the system's argument list.
 
-@item -v
-@itemx --vacuous
-@opindex -v
-@opindex --vacuous
-Fail any call asking for non-Kerberos authentication.
+@item
+@command{rexecd} then validates the user as is done at login time and,
+if the authentication was successful, changes to the user's home
+directory, and establishes the user and group protections of the user.
+If any of these steps fail the connection is aborted with a diagnostic
+message returned.
 
-@c OBSOLETE?
-@c @item -x
-@c @itemx --encrypt
-@c @opindex -x
-@c @opindex --encrypt
-@c Turns on DES encryption for all data passed via the @command{rshd}
-@c session.  This may impact response time and CPU utilization, but
-@c provides increased security.
+@item
+A NUL byte is returned on the initial socket and the command line is
+passed to the normal login shell of the user.  The shell inherits the
+network connections established by rexecd.
+@end enumerate
 
-@c @item -D[@var{level}]
-@c @itemx --debug[=@var{level}]
-@c @opindex -D
-@c @opindex -debug
-@c Set debug level, not implemented.
+@section Invoking
 
-@c @item -o
-@c @itemx --allow-root
-@c @opindex -o
-@c @opindex --allow-root
-@c Allow uid == 0 to login, disabled by default
+The only option is as follows:
 
-@c @item -p @var{port}
-@c @itemx --port=@var{port}
-@c @opindex -p
-@c @opindex --port
-@c Listen on given port (valid only in daemon mode).
+@table @option
+@item -l
+@itemx --logging
+@opindex -l
+@opindex --logging
+Raise logging level for this service; use more than once for
+increased verbosity.  The @code{syslog} facility in use is
+@samp{LOG_DAEMON}.
 
-@item -r
-@itemx --reverse-required
-@opindex -r
-@opindex --reverse-required
-Demand that the client's IP address be resolvable
-as a host name.
 @end table
 
-Should @command{rshd} have been built with PAM support,
-it reads any setting specified for a service named either
-@samp{rsh} or @samp{krsh}, the latter name for clients
-seeking Kerberised authentication.
+Should @command{rexecd} have been built with PAM support,
+it reads any setting specified for a service named @samp{rexec}.
 
 @section Diagnostics
 
 Except for the last one listed below, all diagnostic messages are
 returned on the initial socket, after which any network connections
 are closed.  An error is indicated by a leading byte with a value of 1
-(0 is returned in step 10 above upon successful completion of all the
-steps prior to the execution of the login shell).
+(0 is returned in step 7 above upon successful completion of all the
+steps prior to the command execution).
 
 @table @samp
-@item Locuser too long
-The name of the user on the client's machine is longer than 16
-characters.
+@item username too long
+The name is longer than 16 characters.
 
-@item Ruser too long
-The name of the user on the remote machine is longer than 16
-characters.
+@item password too long
+The password is longer than 16 characters.
 
-@item Command too long
+@item command too long
 The command line passed exceeds the size of the argument list (as
 configured into the system).
 
-@item Login incorrect
+@item Login incorrect.
 No password file entry for the user name existed.
 
-@item Remote directory
-The chdir command to the home directory failed.
-
-@item Permission denied
-The authentication procedure described above failed,
-or address resolution was insufficient.
+@item Password incorrect.
+The wrong password was supplied.
 
-@item Can't make pipe.
-The pipe needed for the stderr, wasn't created.
+@item No remote directory.
+The chdir command to the home directory failed.
 
-@item Can't fork; try again.
+@item Try again.
 A fork by the server failed.
 
 @item <shellname>: @dots{}
 The user's login shell could not be started.  This message is returned
-on the connection associated with the stderr, and is not preceded by a
-flag byte.
+on the connection associated with the stderr, and is not ...
+@c FIXME: Fill this out.
 @end table
 
-The authentication procedure used here assumes the integrity of each
-client machine and the connecting medium.  This is insecure, but is
-useful in an ``open'' environment.
-
+@emph{Note}, that indicating @samp{Login incorrect} as opposed to
+@samp{Password incorrect} is a security breach which allows people to
+probe a system for users with null passwords.
+
 @node rlogind invocation
 @chapter @command{rlogind}: Remote login server
-@cindex rlogind
+@pindex rlogind
 
 @command{rlogind} is the server for the @command{rlogin} client program
 (@pxref{rlogin invocation}).  The server provides a remote login
@@ -4582,125 +4311,235 @@ to pass the checks induced by options @option{-a} or @option{-r}.
 @item Try again.
 A fork by the server failed.
 @end table
+
+@node rshd invocation
+@chapter @command{rshd}: Remote shell server
+@pindex rshd
 
-@node rexecd invocation
-@chapter @command{rexecd}: server for @code{rexec}
-@cindex rexecd
-
-@command{rexecd} is the server for the @code{rexec} routine.  The
-server provides remote execution facilities with authentication based
-on user names and passwords.  It passes error messages and notices
-to the @code{syslog} facility @samp{LOG_DAEMON}.
-
-@example
-rexecd [@var{option}]@dots{}
-@end example
-
-@command{rexecd} listens for service requests at the port indicated in
-the @samp{exec} service specification.  When a service request is
-received the following protocol is initiated:
+The @command{rshd} server is the server for the @code{rcmd} routine
+and, consequently, for the @command{rsh} (@pxref{rsh invocation})
+program.  The server provides remote execution facilities with
+authentication based on privileged port numbers from trusted hosts.
+The @command{rshd} server listens for service requests at the port
+indicated in the @samp{cmd} service specification.  When a service
+request is received the following protocol is initiated:
 
 @enumerate
 @item
+The server checks the client's source port.  If the port is not in the
+range 512--1023, the server aborts the connection.  However, this
+condition is not applied for Kerberized service.
+
+@item
 The server reads characters from the socket up to a NUL (@samp{\0})
 byte.  The resultant string is interpreted as an ASCII number, base
 10.
 
 @item
-If the number received in step 1 is non-zero, it is interpreted as the
+If the number received in step 2 is non-zero, it is interpreted as the
 port number of a secondary stream to be used for the stderr.  A second
 connection is then created to the specified port on the client's
-machine.
+machine.  The source port of this second connection is also in the
+range 512--1023.
 
 @item
-A NUL terminated user name of at most 16 characters is retrieved on
-the initial socket.
+The server checks the client's source address and requests the
+corresponding host name.  If the hostname cannot be determined, the
+dot-notation representation of the host address is used.  If the
+hostname is in the same domain as the server (according to the last
+two components of the domain name), or if the @option{-a} option is
+given, the addresses for the hostname are requested, verifying that
+the name and address correspond.  If address verification fails, the
+connection is aborted with the message, @samp{Host address mismatch.}
 
 @item
-A NUL terminated, unencrypted password of at most 16 characters is
-retrieved on the initial socket.
+A null terminated user name of at most 16 characters is retrieved on
+the initial socket.  This user name is interpreted as the user
+identity on the client's machine.
 
 @item
-A NUL terminated command to be passed to a shell is retrieved on the
+A null terminated user name of at most 16 characters is retrieved on
+the initial socket.  This user name is interpreted as a user identity
+to use on the server's machine.
+
+@item
+A null terminated command to be passed to a shell is retrieved on the
 initial socket.  The length of the command is limited by the upper
 bound on the size of the system's argument list.
 
 @item
-@command{rexecd} then validates the user as is done at login time and,
-if the authentication was successful, changes to the user's home
-directory, and establishes the user and group protections of the user.
-If any of these steps fail the connection is aborted with a diagnostic
-message returned.
+Rshd then validates the user using @code{ruserok}, which uses the file
+@file{/etc/hosts.equiv} and the @file{.rhosts} file found in the
+user's home directory.  The @option{-l} option prevents @code{ruserok}
+from doing any validation based on the user's @file{.rhosts} file,
+unless the user is the superuser.
+
+@item
+If the file @file{/etc/nologin} exists and the user is not the
+superuser, the connection is closed.
+
+@item
+A null byte is returned on the initial socket and the command line is
+passed to the normal login shell of the user.  The shell inherits the
+network connections established by @command{rshd}.
+
+@item
+Transport-level keepalive messages are enabled unless the @option{-n}
+option is present.  The use of keepalive messages allows sessions to
+be timed out if the client crashes or becomes unreachable.
+
+@item
+The @option{-L} option causes all successful accesses to be logged to
+@command{syslogd} (@pxref{syslogd invocation}) as @samp{auth.info}
+messages.
+@end enumerate
+
+@xref{ruserok, , ruserok, libc, The GNU C Library Reference Manual},
+for details.
+
+@section Invoking
+
+The options are as follows:
+
+@table @option
+@item -a
+@itemx --verify-hostname
+@opindex -a
+@opindex --verify-hostname
+Ask hostname for verification.
+
+@c @item -d
+@c @itemx --daemon
+@c @opindex -d
+@c @opindex --daemon
+@c Daemon mode.
+
+@item -k
+@itemx --kerberos
+@opindex -k
+@opindex --kerberos
+Use Kerberos authentication.
+
+@item -l
+@itemx --no-rhosts
+@opindex -l
+@opindex --no-rhosts
+Ignore @file{.rhosts} file.
+
+@item -L
+@itemx --log-sessions
+@opindex -L
+@opindex --log-sessions
+Log successful logins.
+
+@item -n
+@itemx --no-keepalive
+@opindex -n
+@opindex --no-keepalive
+Do not set SO_KEEPALIVE.
+
+@item -S @var{name}
+@itemx --servername=@var{name}
+@opindex -S
+@opindex --servername
+Set Kerberos server name, overriding canonical hostname.
+
+@item -v
+@itemx --vacuous
+@opindex -v
+@opindex --vacuous
+Fail any call asking for non-Kerberos authentication.
 
-@item
-A NUL byte is returned on the initial socket and the command line is
-passed to the normal login shell of the user.  The shell inherits the
-network connections established by rexecd.
-@end enumerate
+@c OBSOLETE?
+@c @item -x
+@c @itemx --encrypt
+@c @opindex -x
+@c @opindex --encrypt
+@c Turns on DES encryption for all data passed via the @command{rshd}
+@c session.  This may impact response time and CPU utilization, but
+@c provides increased security.
 
-@section Invoking
+@c @item -D[@var{level}]
+@c @itemx --debug[=@var{level}]
+@c @opindex -D
+@c @opindex -debug
+@c Set debug level, not implemented.
 
-The only option is as follows:
+@c @item -o
+@c @itemx --allow-root
+@c @opindex -o
+@c @opindex --allow-root
+@c Allow uid == 0 to login, disabled by default
 
-@table @option
-@item -l
-@itemx --logging
-@opindex -l
-@opindex --logging
-Raise logging level for this service; use more than once for
-increased verbosity.  The @code{syslog} facility in use is
-@samp{LOG_DAEMON}.
+@c @item -p @var{port}
+@c @itemx --port=@var{port}
+@c @opindex -p
+@c @opindex --port
+@c Listen on given port (valid only in daemon mode).
 
+@item -r
+@itemx --reverse-required
+@opindex -r
+@opindex --reverse-required
+Demand that the client's IP address be resolvable
+as a host name.
 @end table
 
-Should @command{rexecd} have been built with PAM support,
-it reads any setting specified for a service named @samp{rexec}.
+Should @command{rshd} have been built with PAM support,
+it reads any setting specified for a service named either
+@samp{rsh} or @samp{krsh}, the latter name for clients
+seeking Kerberised authentication.
 
 @section Diagnostics
 
 Except for the last one listed below, all diagnostic messages are
 returned on the initial socket, after which any network connections
 are closed.  An error is indicated by a leading byte with a value of 1
-(0 is returned in step 7 above upon successful completion of all the
-steps prior to the command execution).
+(0 is returned in step 10 above upon successful completion of all the
+steps prior to the execution of the login shell).
 
 @table @samp
-@item username too long
-The name is longer than 16 characters.
+@item Locuser too long
+The name of the user on the client's machine is longer than 16
+characters.
 
-@item password too long
-The password is longer than 16 characters.
+@item Ruser too long
+The name of the user on the remote machine is longer than 16
+characters.
 
-@item command too long
+@item Command too long
 The command line passed exceeds the size of the argument list (as
 configured into the system).
 
-@item Login incorrect.
+@item Login incorrect
 No password file entry for the user name existed.
 
-@item Password incorrect.
-The wrong password was supplied.
-
-@item No remote directory.
+@item Remote directory
 The chdir command to the home directory failed.
 
-@item Try again.
+@item Permission denied
+The authentication procedure described above failed,
+or address resolution was insufficient.
+
+@item Can't make pipe.
+The pipe needed for the stderr, wasn't created.
+
+@item Can't fork; try again.
 A fork by the server failed.
 
 @item <shellname>: @dots{}
 The user's login shell could not be started.  This message is returned
-on the connection associated with the stderr, and is not ...
-@c FIXME: Fill this out.
+on the connection associated with the stderr, and is not preceded by a
+flag byte.
 @end table
 
-@emph{Note}, that indicating @samp{Login incorrect} as opposed to
-@samp{Password incorrect} is a security breach which allows people to
-probe a system for users with null passwords.
-
-
+The authentication procedure used here assumes the integrity of each
+client machine and the connecting medium.  This is insecure, but is
+useful in an ``open'' environment.
+
 @node talkd invocation
 @chapter @command{talkd}: a server for communication between users
-@cindex talkd
+@pindex talkd
 
 @command{talkd} is a server that notifies users that someone else
 wants to initiate a conversation.  It acts as a repository of
@@ -4886,11 +4725,10 @@ The administrator must explicitly arrange some admitting rule,
 with an action @samp{allow}, and some suitable net list.
 Still, the individual user can arrange his private file
 for an even narrower selection of friends.
-
-
+
 @node telnetd invocation
 @chapter @command{telnetd}: Telnet server
-@cindex telnetd
+@pindex telnetd
 
 @example
 telnetd [@var{option}]@dots{}
@@ -5085,10 +4923,166 @@ In all other cases the result would be
 @noindent
 where @code{$USER} is the value of the corresponding environment
 variable and could possibly be empty.
+
+@node tftpd invocation
+@chapter @command{tftpd}: TFTP server
+@pindex tftpd
+
+@command{tftpd} is intended to be invoked via @command{inetd}
+at all times.
+
+@noindent
+Synopsis:
+
+@example
+tftpd [@var{options}] [@var{directory} @dots{}]
+@end example
+
+@table @option
+@item -g @var{group}
+@itemx --group=@var{group}
+@opindex -g
+@opindex --group
+Specify group membership of the process owner.
+This is used only along with the option @option{-s},
+and replaces the group membership that comes from
+the process owner himself.
+
+@item -l
+@itemx --logging
+@opindex -l
+@opindex --logging
+Enable logging.
+
+@item -n
+@itemx --nonexistent
+@opindex -n
+@opindex --nonexistent
+Supress negative acknowledgement of requests for nonexistent relative
+filenames.
+
+@item -s @var{dir}
+@itemx --secure-dir=@var{dir}
+@opindex -s
+@opindex --secure-dir
+Let the serving process change its root directory to @var{dir}
+before attending to any requests.
+This directory is not observable by any client, but improves
+server isolation, since servable contents must be located
+below this chrooted directory @var{dir}.
+
+@item -u @var{user}
+@itemx --user=@var{user}
+@opindex -u
+@opindex --user
+Specify the process owner for serving requests.
+Only relevant along with the option @option{-s}.
+The default name is @samp{nobody}.
+@end table
+
+@section Directory prefixes
+@anchor{tftpd validation}
+
+In addition to options, an invocation of @command{tftpd} can
+specify an optional list of directory prefixes.
+These are approved of according to two principles:
+
+@itemize @bullet
+@item
+Relative pathnames are ignored.
+
+@item
+At most twenty prefixes are approved, the rest is discarded.
+@end itemize
+
+@noindent
+A request for a file is decided upon as a consequence
+of evaluating these criteria:
+
+@itemize @bullet
+@item
+Every file request containing the substring @samp{/../} is denied,
+as is a file name beginning with @samp{../}.
+
+@item
+Write requests must specify absolute locations.
+
+@item
+A file request, if specified as an @emph{absolute} pathname,
+must begin with one of the approved directory prefixes,
+should at least one such prefix have been accepted.
+
+@item
+In the absence of a prefix collection, any absolute pathname is
+accepted, should the corresponding file exist.
 
+@item
+A file request, if specified as a @emph{relative} name,
+will only be searched for below the acceptable prefixes,
+should at least one such prefix have been approved.
+
+@item
+A request for a relatively named file, is denied in the absence
+of approved directory prefixes.
+
+@item
+The resulting file must be world readable, or world writable,
+for a read request, or a write request, to succeed.
+@end itemize
+
+@section Use cases
+@anchor{tftpd setup cases}
+
+The standard use case is an entry in @file{/etc/inetd.conf} like
+
+@example
+tftp dgram udp4 wait root /usr/sbin/tftpd \
+@verb{        } tftpd /tftpboot /altboot
+@end example
+
+@noindent
+This would allow the TFTP client to use any of
+
+@example
+get kernel
+get /tftpboot/kernel
+get kernel.alt
+get /altboot/kernel.alt
+get /etc/motd
+@end example
+
+@noindent
+given that @file{/tftpboot/kernel} and @file{/altboot/kernel.alt} exist.
+Observe that also @file{/etc/motd} is accessible, inspite there being
+no explicit mention of standard file locations.
+
+A stronger mode of running a TFTP server is to use the `secure mode',
+meaning that the serving process is running in a chrooted mode.
+Then a suitable configuration could be
+
+@example
+tftp dgram udp4 wait root /usr/sbin/tftpd \
+@verb{        } tftpd --secure-dir=/srv/tftp-root  /tftpboot /altboot
+@end example
+
+@noindent
+Supposing the files @file{kernel} and @file{kernel.alt} to exist
+in the common directory @file{/srv/tftp-root/altboot/},
+all the previously suggested client requests for a kernel would
+still be granted, but now any request for @file{/etc/motd}
+would be declined, and would get a reply `File not found' back.
+
+The chrooted setting is denying access outside of
+@file{/srv/tftp-root}, yet is not indicating this lock-in
+to the client, and is thus improving server isolation.
+Since neither of @option{-u} and @option{-g} were specified,
+the configuration reproduced above will in fact have the
+transmitting server process running with the default
+owner set to @samp{nobody:nogroup}.
+
 @node uucpd invocation
 @chapter @command{uucpd}: Unix to Unix Copy relay daemon.
-@cindex uucpd
+@pindex uucpd
 
 @command{uucpd} is a relay daemon responsible for accepting
 TCP transported connections for @command{uucico}.  It is started

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

Summary of changes:
 ChangeLog          |    4 +
 doc/inetutils.texi | 1546 ++++++++++++++++++++++++++--------------------------
 2 files changed, 774 insertions(+), 776 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


