From MAILER-DAEMON Mon Jul 02 14:47:20 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Sllea-0001Sq-M4
	for mharc-commit-inetutils@gnu.org; Mon, 02 Jul 2012 14:47:20 -0400
Received: from eggs.gnu.org ([208.118.235.92]:52197)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1SlleW-0001Px-Bq
	for commit-inetutils@gnu.org; Mon, 02 Jul 2012 14:47:18 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1SlleT-0006uU-5y
	for commit-inetutils@gnu.org; Mon, 02 Jul 2012 14:47:15 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:50531)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1SlleT-0006uI-2S
	for commit-inetutils@gnu.org; Mon, 02 Jul 2012 14:47:13 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1SlleR-0006dE-Py
	for commit-inetutils@gnu.org; Mon, 02 Jul 2012 18:47:12 +0000
Date: Mon, 02 Jul 2012 18:47:12 +0000
Message-Id: <E1SlleR-0006dE-Py@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_1-122-g76de114
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 3e80d3ab10a603309fc51ac899361bd2dcf83bdf
X-Git-Newrev: 76de114e0804190217fa9007c1218315156c9d69
From: Mats Erik Andersson <gnu@gisladisker.se>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
	<commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Jul 2012 18:47: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  76de114e0804190217fa9007c1218315156c9d69 (commit)
       via  c32c09739e3adc26ffa505b1a829aaf1ecaddbb2 (commit)
      from  3e80d3ab10a603309fc51ac899361bd2dcf83bdf (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=76de114e0804190217fa9007c1218315156c9d69


commit 76de114e0804190217fa9007c1218315156c9d69
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Mon Jul 2 20:18:38 2012 +0200

    rlogin, rsh: Libshishi issues.

diff --git a/ChangeLog b/ChangeLog
index fc069cd..489feb8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2012-07-02  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	* libinetutils/shishi_def.c (shishi_auth): New type
+	`unsigned short port' of seventh parameter.
+	* libinetutils/shishi.c (shishi_auth): Likewise.
+	Call shishi_init() before shishi_realm_default_set().
+	* src/rlogin.c (parse_opt) <'k'>: Copy value from `arg'.
+	* src/rsh.c (options): The option `-k/--realm' takes
+	a value REALM, which was missing.
+
 2012-07-01  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	rshd: Fix non-kerberized Shishi code.
diff --git a/libinetutils/shishi.c b/libinetutils/shishi.c
index caae9b0..bbe1ad6 100644
--- a/libinetutils/shishi.c
+++ b/libinetutils/shishi.c
@@ -31,8 +31,8 @@
 /* shishi authentication */
 int
 shishi_auth (Shishi ** handle, int verbose, char **cname,
-	     const char *sname, int sock,
-	     char *cmd, int port, Shishi_key ** enckey, char *realm)
+	     const char *sname, int sock, char *cmd,
+	     unsigned short port, Shishi_key ** enckey, char *realm)
 {
   Shishi_ap *ap;
   Shishi_tkt *tkt;
@@ -60,9 +60,6 @@ shishi_auth (Shishi ** handle, int verbose, char **cname,
       return 1;
     }
 
-  if (realm)
-    shishi_realm_default_set (*handle, realm);
-
   rc = shishi_init (handle);
   if (rc != SHISHI_OK)
     {
@@ -71,6 +68,9 @@ shishi_auth (Shishi ** handle, int verbose, char **cname,
       return 1;
     }
 
+  if (realm)
+    shishi_realm_default_set (*handle, realm);
+
   h = *handle;
 
   if (!*cname)
diff --git a/libinetutils/shishi_def.h b/libinetutils/shishi_def.h
index 2351d34..868d72f 100644
--- a/libinetutils/shishi_def.h
+++ b/libinetutils/shishi_def.h
@@ -55,8 +55,8 @@ struct auth_data
 };
 
 extern int shishi_auth (Shishi ** handle, int verbose, char **cname,
-			const char *sname, int sock,
-			char *cmd, int port, Shishi_key ** enckey,
+			const char *sname, int sock, char *cmd,
+			unsigned short port, Shishi_key ** enckey,
 			char *realm);
 
 extern int get_auth (int infd, Shishi ** handle, Shishi_ap ** ap,
diff --git a/src/rlogin.c b/src/rlogin.c
index d4f0171..bb21e1a 100644
--- a/src/rlogin.c
+++ b/src/rlogin.c
@@ -313,7 +313,7 @@ parse_opt (int key, char *arg, struct argp_state *state)
       break;
 
     case 'k':
-      strncpy (dest_realm_buf, optarg, sizeof (dest_realm_buf));
+      strncpy (dest_realm_buf, arg, sizeof (dest_realm_buf));
       /* Make sure it's null termintated.  */
       dest_realm_buf[sizeof (dest_realm_buf) - 1] = '\0';
       dest_realm = dest_realm_buf;
@@ -536,11 +536,10 @@ try_connect:
 #  endif
 # endif	/* CRYPT */
 
-	rem = krcmd (
 # if defined SHISHI
-		      &handle, &host, sp->s_port, &user, term, 0, dest_realm);
+	rem = krcmd (&handle, &host, sp->s_port, &user, term, 0, dest_realm);
 # else
-		      &host, sp->s_port, user, term, 0, dest_realm);
+	rem = krcmd (&host, sp->s_port, user, term, 0, dest_realm);
 # endif
       if (rem < 0)
 	{
diff --git a/src/rsh.c b/src/rsh.c
index aabc88f..dcbfc49 100644
--- a/src/rsh.c
+++ b/src/rsh.c
@@ -151,7 +151,7 @@ static struct argp_option options[] = {
 #if defined KERBEROS || defined SHISHI
   { "kerberos", 'K', NULL, 0,
     "turns off all Kerberos authentication" },
-  { "realm", 'k', NULL, 0,
+  { "realm", 'k', "REALM", 0,
     "obtain tickets for the remote host in REALM "
     "instead of the remote host's realm" },
   { "encrypt", 'x', NULL, 0,
@@ -435,11 +435,10 @@ try_connect:
       else
 #  endif
 # endif
-	rem = krcmd (
 # if defined SHISHI
-		      &h, &host, sp->s_port, &user, args, &rfd2, dest_realm);
+	rem = krcmd (&h, &host, sp->s_port, &user, args, &rfd2, dest_realm);
 # else
-		      &host, sp->s_port, user, args, &rfd2, dest_realm);
+	rem = krcmd (&host, sp->s_port, user, args, &rfd2, dest_realm);
 # endif
       if (rem < 0)
 	{

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


commit c32c09739e3adc26ffa505b1a829aaf1ecaddbb2
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Sun Jul 1 00:07:09 2012 +0200

    rshd: Usability with deactivated Shishi.

diff --git a/ChangeLog b/ChangeLog
index 01de26d..fc069cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2012-07-01  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	rshd: Fix non-kerberized Shishi code.
+
+	* src/rshd.c (options) [KERBEROS || SHISHI]: Add missing
+	SHISHI to conditional activation of `-k/--kerberos' and
+	`-v/--vacuous'.
+	(doit) [KERBEROS] <check address family>: Remove SHISHI
+	in conditional, thus preventing libshishi based server
+	from issuing failure for non AF_INET connections.
+	(doit) [SHISHI && use_kerberos] <authentication>:
+	Insert missing `if (use_kerberos)' before code block
+	for conducting Shishi authentication; adjust indentation
+	of this complete block!
+	(doit) [SHISHI] <checksum test>: Conditionally activate
+	getsockname() for reporting receiving port.
+
 2012-06-25  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	rlogind: Prepare for address independence.
diff --git a/src/rshd.c b/src/rshd.c
index fe361cd..b76a421 100644
--- a/src/rshd.c
+++ b/src/rshd.c
@@ -208,10 +208,10 @@ static struct argp_option options[] = {
     "do not set SO_KEEPALIVE" },
   { "log-sessions", 'L', NULL, 0,
     "log successfull logins" },
-#ifdef	KERBEROS
+#if defined KERBEROS || defined SHISHI
   /* FIXME: The option semantics does not match that of others r* utilities */
   { "kerberos", 'k', NULL, 0,
-    "use kerberos IV authentication" },
+    "use kerberos authentication" },
   /* FIXME: Option name is misleading */
   { "vacuous", 'v', NULL, 0,
     "require Kerberos authentication" },
@@ -460,14 +460,14 @@ doit (int sockfd, struct sockaddr *fromp, socklen_t fromlen)
 #endif
 
   /* Verify that the client's address is an Internet adress. */
-#if defined KERBEROS || defined SHISHI
+#ifdef KERBEROS
   if (fromp->sa_family != AF_INET)
     {
       syslog (LOG_ERR, "malformed originating address (af %d)\n",
 	      fromp->sa_family);
       exit (EXIT_FAILURE);
     }
-#endif
+#endif /* KERBEROS */
 #ifdef IP_OPTIONS
   {
     unsigned char optbuf[BUFSIZ / 3], *cp;
@@ -829,74 +829,75 @@ doit (int sockfd, struct sockaddr *fromp, socklen_t fromlen)
   cmdbuf = getstr ("command");
 
 #ifdef SHISHI
-  {
-    int error;
-    int rc;
-    char *compcksum;
-    size_t compcksumlen;
-    char cksumdata[100];
-    struct sockaddr_in sock;
-    size_t socklen;
+  if (use_kerberos)
+    {
+      int error;
+      int rc;
+      char *compcksum;
+      size_t compcksumlen;
+      char cksumdata[100];
+      struct sockaddr_storage sock;
+      size_t socklen;
 
 # ifdef ENCRYPTION
-    if (strlen (cmdbuf) >= 3)
-      if (!strncmp (cmdbuf, "-x ", 3))
-	{
-	  doencrypt = 1;
-	  int i;
+      if (strlen (cmdbuf) >= 3)
+	if (!strncmp (cmdbuf, "-x ", 3))
+	  {
+	    int i;
 
-	  ivtab[0] = &iv1;
-	  ivtab[1] = &iv2;
-	  ivtab[2] = &iv3;
-	  ivtab[3] = &iv4;
+	    doencrypt = 1;
 
-	  keytype = shishi_key_type (enckey);
-	  keylen = shishi_cipher_blocksize (keytype);
+	    ivtab[0] = &iv1;
+	    ivtab[1] = &iv2;
+	    ivtab[2] = &iv3;
+	    ivtab[3] = &iv4;
 
-	  for (i = 0; i < 4; i++)
-	    {
-	      ivtab[i]->ivlen = keylen;
+	    keytype = shishi_key_type (enckey);
+	    keylen = shishi_cipher_blocksize (keytype);
 
-	      switch (keytype)
-		{
-		case SHISHI_DES_CBC_CRC:
-		case SHISHI_DES_CBC_MD4:
-		case SHISHI_DES_CBC_MD5:
-		case SHISHI_DES_CBC_NONE:
-		case SHISHI_DES3_CBC_HMAC_SHA1_KD:
-		  ivtab[i]->keyusage = SHISHI_KEYUSAGE_KCMD_DES;
-		  ivtab[i]->iv = xmalloc (ivtab[i]->ivlen);
-		  memset (ivtab[i]->iv, 2 * i - 3 * (i >= 2),
-			  ivtab[i]->ivlen);
-		  ivtab[i]->ctx =
-		    shishi_crypto (h, enckey, ivtab[i]->keyusage,
-				   shishi_key_type (enckey), ivtab[i]->iv,
-				   ivtab[i]->ivlen);
-		  break;
-
-		case SHISHI_ARCFOUR_HMAC:
-		case SHISHI_ARCFOUR_HMAC_EXP:
-		  ivtab[i]->keyusage =
-		    SHISHI_KEYUSAGE_KCMD_DES + 4 * (i < 2) + 2 + 2 * (i % 2);
-		  ivtab[i]->ctx =
-		    shishi_crypto (h, enckey, ivtab[i]->keyusage,
-				   shishi_key_type (enckey), NULL, 0);
-		  break;
-
-		default:
-		  ivtab[i]->keyusage =
-		    SHISHI_KEYUSAGE_KCMD_DES + 4 * (i < 2) + 2 + 2 * (i % 2);
-		  ivtab[i]->iv = xmalloc (ivtab[i]->ivlen);
-		  memset (ivtab[i]->iv, 0, ivtab[i]->ivlen);
-		  if (protocol == 2)
+	    for (i = 0; i < 4; i++)
+	      {
+		ivtab[i]->ivlen = keylen;
+
+		switch (keytype)
+		  {
+		  case SHISHI_DES_CBC_CRC:
+		  case SHISHI_DES_CBC_MD4:
+		  case SHISHI_DES_CBC_MD5:
+		  case SHISHI_DES_CBC_NONE:
+		  case SHISHI_DES3_CBC_HMAC_SHA1_KD:
+		    ivtab[i]->keyusage = SHISHI_KEYUSAGE_KCMD_DES;
+		    ivtab[i]->iv = xmalloc (ivtab[i]->ivlen);
+		    memset (ivtab[i]->iv, 2 * i - 3 * (i >= 2),
+			    ivtab[i]->ivlen);
 		    ivtab[i]->ctx =
 		      shishi_crypto (h, enckey, ivtab[i]->keyusage,
-				     shishi_key_type (enckey), ivtab[i]->iv,
-				     ivtab[i]->ivlen);
-		}
-	    }
+				     shishi_key_type (enckey),
+				     ivtab[i]->iv, ivtab[i]->ivlen);
+		    break;
 
-	}
+		  case SHISHI_ARCFOUR_HMAC:
+		  case SHISHI_ARCFOUR_HMAC_EXP:
+		    ivtab[i]->keyusage =
+		      SHISHI_KEYUSAGE_KCMD_DES + 4 * (i < 2) + 2 + 2 * (i % 2);
+		    ivtab[i]->ctx =
+		      shishi_crypto (h, enckey, ivtab[i]->keyusage,
+				     shishi_key_type (enckey), NULL, 0);
+		    break;
+
+		  default:
+		    ivtab[i]->keyusage =
+		      SHISHI_KEYUSAGE_KCMD_DES + 4 * (i < 2) + 2 + 2 * (i % 2);
+		    ivtab[i]->iv = xmalloc (ivtab[i]->ivlen);
+		    memset (ivtab[i]->iv, 0, ivtab[i]->ivlen);
+		    if (protocol == 2)
+		      ivtab[i]->ctx =
+			shishi_crypto (h, enckey, ivtab[i]->keyusage,
+				       shishi_key_type (enckey),
+				       ivtab[i]->iv, ivtab[i]->ivlen);
+		  }
+	      }
+	  }
 # endif /* ENCRYPTION */
 
     remuser = getstr ("remuser");
@@ -906,19 +907,30 @@ doit (int sockfd, struct sockaddr *fromp, socklen_t fromlen)
 
     /* verify checksum */
 
-    /* Doesn't give socket port ?
-       socklen = sizeof (sock);
-       if (getsockname (STDIN_FILENO, (struct sockaddr *)&sock, &socklen) < 0)
-       {
-       syslog (LOG_ERR, "Can't get sock name");
-       exit (EXIT_FAILURE);
-       }
-     */
-    snprintf (cksumdata, 100, "544:%s%s", /*ntohs(sock.sin_port), */ cmdbuf,
-	      locuser);
-    rc =
-      shishi_checksum (h, enckey, 0, cksumtype, cksumdata, strlen (cksumdata),
-		       &compcksum, &compcksumlen);
+# if 1
+    {
+      unsigned short port;
+
+    /* Doesn't give socket port ? */
+      socklen = sizeof (sock);
+      if (getsockname (STDIN_FILENO, (struct sockaddr *)&sock, &socklen) < 0)
+	{
+	  syslog (LOG_ERR, "Can't get sock name");
+	  exit (EXIT_FAILURE);
+	}
+
+      port = (sock.ss_family == AF_INET6)
+	     ? ((struct sockaddr_in6 *) &sock)->sin6_port
+	     : ((struct sockaddr_in *) &sock)->sin_port;
+
+      snprintf (cksumdata, 100, "%u:%s%s", port, cmdbuf, locuser);
+    }
+# else
+    snprintf (cksumdata, 100, "544:%s%s", cmdbuf, locuser);
+# endif
+    rc = shishi_checksum (h, enckey, 0, cksumtype,
+			  cksumdata, strlen (cksumdata),
+			  &compcksum, &compcksumlen);
     free (cksum);
     if (rc != SHISHI_OK
 	|| compcksumlen != cksumlen

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

Summary of changes:
 ChangeLog                 |   27 +++++++
 libinetutils/shishi.c     |   10 ++--
 libinetutils/shishi_def.h |    4 +-
 src/rlogin.c              |    7 +-
 src/rsh.c                 |    7 +-
 src/rshd.c                |  168 ++++++++++++++++++++++++---------------------
 6 files changed, 130 insertions(+), 93 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Tue Jul 03 09:41:22 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Sm3M2-0007Sr-05
	for mharc-commit-inetutils@gnu.org; Tue, 03 Jul 2012 09:41:22 -0400
Received: from eggs.gnu.org ([208.118.235.92]:58719)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1Sm3Lu-0007RD-Bu
	for commit-inetutils@gnu.org; Tue, 03 Jul 2012 09:41:20 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1Sm3Ln-0000E6-IU
	for commit-inetutils@gnu.org; Tue, 03 Jul 2012 09:41:13 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:56546)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1Sm3Ln-0000Da-Ey
	for commit-inetutils@gnu.org; Tue, 03 Jul 2012 09:41:07 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1Sm3Ll-0004TX-I1
	for commit-inetutils@gnu.org; Tue, 03 Jul 2012 13:41:06 +0000
Date: Tue, 03 Jul 2012 13:41:06 +0000
Message-Id: <E1Sm3Ll-0004TX-I1@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_1-123-g4b48cb5
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 76de114e0804190217fa9007c1218315156c9d69
X-Git-Newrev: 4b48cb5f2bcf781b072b5b11c0a528f18d85a140
From: Mats Erik Andersson <gnu@gisladisker.se>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
	<commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Jul 2012 13:41:20 -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  4b48cb5f2bcf781b072b5b11c0a528f18d85a140 (commit)
      from  76de114e0804190217fa9007c1218315156c9d69 (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=4b48cb5f2bcf781b072b5b11c0a528f18d85a140


commit 4b48cb5f2bcf781b072b5b11c0a528f18d85a140
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Tue Jul 3 15:08:22 2012 +0200

    Shishi related error messages.

diff --git a/ChangeLog b/ChangeLog
index 489feb8..e15e17c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2012-07-03  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	* libinetutils/kcmd.c (kcmd, getport)
+	[HAVE_STRUCT_SOCKADDR_IN_SIN_LEN]: Initiate `sin.sin_len'.
+	(kcmd): Calculate address strings using inet_ntop().
+	Use correct address location in message `Trying ...'.
+	* src/rsh.c (main) [KERBEROS || SHISHI]: New variable
+	KRB_ERRNO used for proper error diagnostics.  Assign a
+	value after each authentication call.
+	(warning): Remove erroneous call to va_arg().
+
 2012-07-02  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	* libinetutils/shishi_def.c (shishi_auth): New type
diff --git a/libinetutils/kcmd.c b/libinetutils/kcmd.c
index 2e7846c..674d86e 100644
--- a/libinetutils/kcmd.c
+++ b/libinetutils/kcmd.c
@@ -173,6 +173,9 @@ kcmd (Shishi ** h, int *sock, char **ahost, unsigned short rport, char *locuser,
 	}
       fcntl (s, F_SETOWN, pid);
       sin.sin_family = hp->h_addrtype;
+#ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
+      sin.sin_len = sizeof (sin);
+#endif
 
       memcpy (&sin.sin_addr, hp->h_addr, hp->h_length);
       sin.sin_port = rport;
@@ -198,14 +201,18 @@ kcmd (Shishi ** h, int *sock, char **ahost, unsigned short rport, char *locuser,
       if (hp->h_addr_list[1] != NULL)
 	{
 	  int oerrno = errno;
+	  char addrstr[INET6_ADDRSTRLEN];
 
-	  fprintf (stderr,
-		   "kcmd: connect to address %s: ", inet_ntoa (sin.sin_addr));
+	  fprintf (stderr, "kcmd: connect to address %s: ",
+		   inet_ntop (hp->h_addrtype, hp->h_addr_list[0],
+			      addrstr, sizeof (addrstr)));
 	  errno = oerrno;
 	  perror (NULL);
 	  hp->h_addr_list++;
 	  memcpy (& sin.sin_addr, hp->h_addr_list, hp->h_length);
-	  fprintf (stderr, "Trying %s...\n", inet_ntoa (sin.sin_addr));
+	  fprintf (stderr, "Trying %s...\n",
+		   inet_ntop (hp->h_addrtype, hp->h_addr_list[0],
+			      addrstr, sizeof (addrstr)));
 	  continue;
 	}
 # endif	/* !(defined(ultrix) || defined(sun)) */
@@ -378,8 +385,11 @@ getport (int *alport)
   int s;
 
   sin.sin_family = AF_INET;
+#ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
+  sin.sin_len = sizeof (sin);
+#endif
   sin.sin_addr.s_addr = INADDR_ANY;
-  s = socket (AF_INET, SOCK_STREAM, 0);
+  s = socket (sin.sin_family, SOCK_STREAM, 0);
   if (s < 0)
     return (-1);
   for (;;)
diff --git a/src/rsh.c b/src/rsh.c
index dcbfc49..50c2a0a 100644
--- a/src/rsh.c
+++ b/src/rsh.c
@@ -234,6 +234,9 @@ main (int argc, char **argv)
   struct servent *sp;
   sigset_t sigs, osigs;
   int asrsh, rem;
+#if defined KERBEROS || defined SHISHI
+  int krb_errno;
+#endif
   pid_t pid = 0;
   uid_t uid;
   char *args, *host;
@@ -354,12 +357,12 @@ try_connect:
 
 # if defined KERBEROS
       rem = KSUCCESS;
-      errno = 0;
+      krb_errno = 0;
       if (dest_realm == NULL)
 	dest_realm = krb_realmofhost (host);
 # elif defined (SHISHI)
       rem = SHISHI_OK;
-      errno = 0;
+      krb_errno = 0;
 # endif
 
 # ifdef ENCRYPTION
@@ -375,6 +378,7 @@ try_connect:
 
 	  rem = krcmd_mutual (&h, &host, sp->s_port, &user, term, &rfd2,
 			      dest_realm, &enckey);
+	  krb_errno = errno;
 	  if (rem > 0)
 	    {
 	      keytype = shishi_key_type (enckey);
@@ -429,26 +433,32 @@ try_connect:
 	  free (term);
 	}
       else
-#  else
-	rem = krcmd_mutual (&host, sp->s_port, user, args, &rfd2,
-			    dest_realm, &cred, schedule);
+#  else /* KERBEROS */
+	{
+	  rem = krcmd_mutual (&host, sp->s_port, user, args, &rfd2,
+			      dest_realm, &cred, schedule);
+	  krb_errno = errno;
+	}
       else
 #  endif
 # endif
+	{
 # if defined SHISHI
-	rem = krcmd (&h, &host, sp->s_port, &user, args, &rfd2, dest_realm);
-# else
-	rem = krcmd (&host, sp->s_port, user, args, &rfd2, dest_realm);
+	  rem = krcmd (&h, &host, sp->s_port, &user, args, &rfd2, dest_realm);
+# else /* KERBEROS */
+	  rem = krcmd (&host, sp->s_port, user, args, &rfd2, dest_realm);
 # endif
+	  krb_errno = errno;
+	}
       if (rem < 0)
 	{
 	  use_kerberos = 0;
 	  sp = getservbyname ("shell", "tcp");
 	  if (sp == NULL)
 	    error (EXIT_FAILURE, 0, "shell/tcp: unknown service");
-	  if (errno == ECONNREFUSED)
+	  if (krb_errno == ECONNREFUSED)
 	    warning ("remote host doesn't support Kerberos");
-	  if (errno == ENOENT)
+	  if (krb_errno == ENOENT)
 	    warning ("can't provide Kerberos auth data");
 	  goto try_connect;
 	}
@@ -723,7 +733,6 @@ warning (const char *fmt, ...)
 
   fprintf (stderr, "%s: warning, using standard rsh: ", program_name);
   va_start (ap, fmt);
-  fmt = va_arg (ap, char *);
   vfprintf (stderr, fmt, ap);
   va_end (ap);
   fprintf (stderr, ".\n");

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

Summary of changes:
 ChangeLog           |   11 +++++++++++
 libinetutils/kcmd.c |   18 ++++++++++++++----
 src/rsh.c           |   31 ++++++++++++++++++++-----------
 3 files changed, 45 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Mon Jul 09 19:06:22 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1SoN26-0008IO-5c
	for mharc-commit-inetutils@gnu.org; Mon, 09 Jul 2012 19:06:22 -0400
Received: from eggs.gnu.org ([208.118.235.92]:36255)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1SoN21-0008Hw-KM
	for commit-inetutils@gnu.org; Mon, 09 Jul 2012 19:06:20 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1SoN1x-0000OE-Fx
	for commit-inetutils@gnu.org; Mon, 09 Jul 2012 19:06:17 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:48228)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1SoN1x-0000Np-Cf
	for commit-inetutils@gnu.org; Mon, 09 Jul 2012 19:06:13 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1SoN1v-0004YX-LX
	for commit-inetutils@gnu.org; Mon, 09 Jul 2012 23:06:12 +0000
Date: Mon, 09 Jul 2012 23:06:12 +0000
Message-Id: <E1SoN1v-0004YX-LX@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_1-125-g3da88b2
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 4b48cb5f2bcf781b072b5b11c0a528f18d85a140
X-Git-Newrev: 3da88b201d8397b2a7906a9ee8194fbfae247338
From: Mats Erik Andersson <gnu@gisladisker.se>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
	<commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Jul 2012 23:06:20 -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  3da88b201d8397b2a7906a9ee8194fbfae247338 (commit)
       via  715707856daa622f5fc3076e0b7171f055c7ca42 (commit)
      from  4b48cb5f2bcf781b072b5b11c0a528f18d85a140 (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=3da88b201d8397b2a7906a9ee8194fbfae247338


commit 3da88b201d8397b2a7906a9ee8194fbfae247338
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Sat Jul 7 14:49:44 2012 +0200

    rshd: PAM conversation matters.

diff --git a/ChangeLog b/ChangeLog
index 7a67e5a..9be716a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2012-07-07  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	* src/rshd.c (doit) <PAM_NEW_AUTHTOK_REQD>:
+	When either pam_authenticate() or pam_acct_mgmt()
+	require token renewal, then call pam_chauthtok()
+	and repeat the previous call.
+	(rsh_conv) <PAM_PROMPT_ECHO_OFF>: Build a full
+	pam_response structure using an emtpy password,
+	instead of returning an empty pointer.  Make a
+	syslog notice showing the passed message string.
+
 2012-07-05  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	rsh, rshd: Functional Shishi code.  Tested on
diff --git a/src/rshd.c b/src/rshd.c
index 8623960..b6b1303 100644
--- a/src/rshd.c
+++ b/src/rshd.c
@@ -1000,6 +1000,14 @@ doit (int sockfd, struct sockaddr *fromp, socklen_t fromlen)
 	case PAM_ABORT:
 	  pam_end (pam_handle, pam_rc);
 	  exit (EXIT_FAILURE);
+	case PAM_NEW_AUTHTOK_REQD:
+	  pam_rc = pam_chauthtok (pam_handle, PAM_CHANGE_EXPIRED_AUTHTOK);
+	  if (pam_rc == PAM_SUCCESS)
+	    {
+	      pam_rc = pam_authenticate (pam_handle, PAM_SILENT);
+	      if (pam_rc == PAM_SUCCESS)
+		break;
+	    }
 	default:
 	  errorstr = "Password incorrect.\n";
 	  goto fail;
@@ -1012,6 +1020,13 @@ doit (int sockfd, struct sockaddr *fromp, socklen_t fromlen)
       switch (pam_rc)
 	{
 	case PAM_NEW_AUTHTOK_REQD:
+	  pam_rc = pam_chauthtok (pam_handle, PAM_CHANGE_EXPIRED_AUTHTOK);
+	  if (pam_rc == PAM_SUCCESS)
+	    {
+	      pam_rc = pam_acct_mgmt (pam_handle, PAM_SILENT);
+	      if (pam_rc == PAM_SUCCESS)
+		break;
+	    }
 	case PAM_AUTH_ERR:
 	  errorstr = "Password incorrect.\n";
 	  goto fail;
@@ -1733,7 +1748,22 @@ rsh_conv (int num, const struct pam_message **pam_msg,
   switch ((*pam_msg)->msg_style)
     {
     case PAM_PROMPT_ECHO_OFF:	/* Return an empty password.  */
+      resp = (struct pam_response *) malloc (sizeof (*resp));
+      if (!resp)
+	return PAM_BUF_ERR;
+      resp->resp_retcode = 0;
+      resp->resp = strdup ("");
+      if (!resp->resp)
+	{
+	  free (resp);
+	  return PAM_BUF_ERR;
+	}
+      if (log_success)
+	syslog (LOG_NOTICE | LOG_AUTH, "PAM message \"%s\".",
+		(*pam_msg)->msg);
+      *pam_resp = resp;
       return PAM_SUCCESS;
+      break;
     case PAM_TEXT_INFO:		/* Not yet supported.  */
     case PAM_ERROR_MSG:		/* Likewise.  */
     case PAM_PROMPT_ECHO_ON:	/* Interactivity is not supported.  */

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


commit 715707856daa622f5fc3076e0b7171f055c7ca42
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Thu Jul 5 23:21:55 2012 +0200

    rsh, rshd: Verified Shishi support.

diff --git a/ChangeLog b/ChangeLog
index e15e17c..7a67e5a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,50 @@
+2012-07-05  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	rsh, rshd: Functional Shishi code.  Tested on
+	32-bit system, with and without encryption,
+	but without PAM.
+
+	* src/rlogind.c (servername): New variable.
+	(options): New option `-S/--servername'.
+	(parse_opt) <'S'>: Implement `-S'.
+	(do_shishi_login): Add `servername' as additional
+	argument to get_auth().
+	* src/rsh.c (servername): New variable.
+	(options): New option `-S/--servername'.  Rephrase
+	explanation for `-v/--vacuous'.
+	(parse_opt) <'S'>: Implement `-S'.
+	(doit): Add `servername' as additional argument to
+	get_auth().  Apply ntohs() to PORT in calculating
+	CKSUMDATA.  Do not free CKSUM before use!
+	(doit) [WITH_IRUSEROK_AF && !WITH_PAM]: Calculate
+	FROMADDRP separately, not within nested conditionals.
+
+	* libinetutils/kcmd.c (kcmd) [SHISHI]: Let arguments
+	`laddr' and `faddr' be `struct sockaddr_storage *'.
+	New variables LEN and PORT, use `struct sockaddr_storage'
+	for SIN and FROM.  Modify resolver code to handle AF_INET
+	and AF_INET6.
+	* libinetutils/krcmd.c (krcmd) [SHISHI]: Produce error
+	message using shishi_strerror() at failures.
+	(krcmd_mutual) [SHISHI]: Use `struct sockaddr_storage'
+	for LADDR and FADDR.
+	* libinetutils/shishi.c (shishi_auth, get_auth): Return
+	meaningful error status, not `1' every time.
+	(shishi_auth) <ticket fetch failure>: Report Kerberos
+	principal name, not only host name of server.
+	(shishi_auth) <authentication response reading>: Store
+	int32 sized answer in an integer, not in a char!  Report
+	a failure in case authentication actually failed.
+	(get_auth): Add a further parameter `char *srvname'.
+	Call shishi_server_for_local_service() only if `srvname'
+	was NULL.  Otherwise, manually assemble the host's
+	principal name.
+	(get_auth) <authentication type failure>: Follow protocol
+	and send a response 0x01.
+	(get_auth) <protocol version failure>: Follow protocol
+	and send a response 0x02.
+	* libinetutils/shishi_def.h (get_auth): Update signature.
+
 2012-07-03  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	* libinetutils/kcmd.c (kcmd, getport)
diff --git a/libinetutils/kcmd.c b/libinetutils/kcmd.c
index 674d86e..c3f079e 100644
--- a/libinetutils/kcmd.c
+++ b/libinetutils/kcmd.c
@@ -101,8 +101,8 @@ kcmd (int *sock, char **ahost, unsigned short rport, char *locuser,
 int
 kcmd (Shishi ** h, int *sock, char **ahost, unsigned short rport, char *locuser,
       char **remuser, char *cmd, int *fd2p, char *service, char *realm,
-      Shishi_key ** key,
-      struct sockaddr_in *laddr, struct sockaddr_in *faddr, long authopts)
+      Shishi_key ** key, struct sockaddr_storage *laddr,
+      struct sockaddr_storage *faddr, long authopts)
 # endif
 {
   int s, timo = 1, pid;
@@ -111,7 +111,8 @@ kcmd (Shishi ** h, int *sock, char **ahost, unsigned short rport, char *locuser,
 # else
   long oldmask;
 # endif /* !HAVE_SIGACTION */
-  struct sockaddr_in sin, from;
+  struct sockaddr_storage sin, from;
+  socklen_t len;
   char c;
 
 # ifdef ATHENA_COMPAT
@@ -129,6 +130,9 @@ kcmd (Shishi ** h, int *sock, char **ahost, unsigned short rport, char *locuser,
 # endif
 
   pid = getpid ();
+
+  /* FIXME: Often the following rejects non-IPv4.
+   * This is dependent on system implementation.  */
   hp = gethostbyname (*ahost);
   if (hp == NULL)
     {
@@ -172,15 +176,30 @@ kcmd (Shishi ** h, int *sock, char **ahost, unsigned short rport, char *locuser,
 	  return (-1);
 	}
       fcntl (s, F_SETOWN, pid);
-      sin.sin_family = hp->h_addrtype;
+      sin.ss_family = hp->h_addrtype;
+      switch (hp->h_addrtype)
+	{
+	case AF_INET6:
+	  len = sizeof (struct sockaddr_in6);
 #ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
-      sin.sin_len = sizeof (sin);
+	  sin.ss_len = len;
 #endif
+	  memcpy (&((struct sockaddr_in6 *) &sin)->sin6_addr,
+		  hp->h_addr, hp->h_length);
+	  ((struct sockaddr_in6 *) &sin)->sin6_port = rport;
+	  break;
+	case AF_INET:
+	default:
+	  len = sizeof (struct sockaddr_in);
+#ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
+	  sin.ss_len = len;
+#endif
+	  memcpy (&((struct sockaddr_in *) &sin)->sin_addr,
+		  hp->h_addr, hp->h_length);
+	  ((struct sockaddr_in *) &sin)->sin_port = rport;
+	}
 
-      memcpy (&sin.sin_addr, hp->h_addr, hp->h_length);
-      sin.sin_port = rport;
-
-      if (connect (s, (struct sockaddr *) &sin, sizeof (sin)) >= 0)
+      if (connect (s, (struct sockaddr *) &sin, len) >= 0)
 	break;
       close (s);
       if (errno == EADDRINUSE)
@@ -209,7 +228,6 @@ kcmd (Shishi ** h, int *sock, char **ahost, unsigned short rport, char *locuser,
 	  errno = oerrno;
 	  perror (NULL);
 	  hp->h_addr_list++;
-	  memcpy (& sin.sin_addr, hp->h_addr_list, hp->h_length);
 	  fprintf (stderr, "Trying %s...\n",
 		   inet_ntop (hp->h_addrtype, hp->h_addr_list[0],
 			      addrstr, sizeof (addrstr)));
@@ -236,8 +254,10 @@ kcmd (Shishi ** h, int *sock, char **ahost, unsigned short rport, char *locuser,
   else
     {
       char num[8];
-      int s2 = getport (&lport), s3;
-      int len = sizeof (from);
+      int port, s2, s3;
+
+      s2 = getport (&lport);
+      len = sizeof (from);
 
       if (s2 < 0)
 	{
@@ -263,8 +283,12 @@ kcmd (Shishi ** h, int *sock, char **ahost, unsigned short rport, char *locuser,
 	  goto bad;
 	}
       *fd2p = s3;
-      from.sin_port = ntohs ((unsigned short) from.sin_port);
-      if (from.sin_family != AF_INET || from.sin_port >= IPPORT_RESERVED)
+      port = (from.ss_family == AF_INET6)
+	     ? ntohs (((struct sockaddr_in6 *) &from)->sin6_port)
+	     : ntohs (((struct sockaddr_in *) &from)->sin_port);
+
+      if (port >= IPPORT_RESERVED
+          || from.ss_family != AF_INET && from.ss_family != AF_INET6)
 	{
 	  fprintf (stderr,
 		   "kcmd(socket): protocol failure in circuit setup.\n");
@@ -287,7 +311,7 @@ kcmd (Shishi ** h, int *sock, char **ahost, unsigned short rport, char *locuser,
 
       *faddr = sin;
 
-      sin_len = sizeof (struct sockaddr_in);
+      sin_len = sizeof (*laddr);
       if (getsockname (s, (struct sockaddr *) laddr, &sin_len) < 0)
 	{
 	  perror ("kcmd(getsockname)");
@@ -310,7 +334,7 @@ kcmd (Shishi ** h, int *sock, char **ahost, unsigned short rport, char *locuser,
 
       *faddr = sin;
 
-      sin_len = sizeof (struct sockaddr_in);
+      sin_len = sizeof (*laddr);
       if (getsockname (s, (struct sockaddr *) laddr, &sin_len) < 0)
 	{
 	  perror ("kcmd(getsockname)");
diff --git a/libinetutils/krcmd.c b/libinetutils/krcmd.c
index d22caa5..08b3402 100644
--- a/libinetutils/krcmd.c
+++ b/libinetutils/krcmd.c
@@ -76,7 +76,7 @@
 # if defined SHISHI
 int kcmd (Shishi **, int *, char **, unsigned short, char *, char **,
 	  char *, int *, char *, char *, Shishi_key **,
-	  struct sockaddr_in *, struct sockaddr_in *, long);
+	  struct sockaddr_storage *, struct sockaddr_storage *, long);
 # else
 int kcmd (int *, char **, unsigned short, char *, char *, char *, int *,
 	  KTEXT, char *, char *, CREDENTIALS *, Key_schedule,
@@ -105,7 +105,7 @@ krcmd (Shishi ** h, char **ahost, unsigned short rport, char **remuser, char *cm
 
   if (err > SHISHI_OK)
     {
-      fprintf (stderr, "krcmd: %s\n", "error");
+      fprintf (stderr, "krcmd: error %d, %s\n", err, shishi_strerror (err));
       return (-1);
     }
   if (err < 0)
@@ -149,7 +149,7 @@ krcmd_mutual (Shishi ** h, char **ahost, unsigned short rport, char **remuser,
 	      char *cmd, int *fd2p, char *realm, Shishi_key ** key)
 {
   int sock = -1, err = 0;
-  struct sockaddr_in laddr, faddr;
+  struct sockaddr_storage laddr, faddr;
   long authopts = SHISHI_APOPTIONS_MUTUAL_REQUIRED;
 
   err = kcmd (h, &sock, ahost, rport, NULL,	/* locuser not used */
diff --git a/libinetutils/shishi.c b/libinetutils/shishi.c
index bbe1ad6..25c54a0 100644
--- a/libinetutils/shishi.c
+++ b/libinetutils/shishi.c
@@ -57,7 +57,7 @@ shishi_auth (Shishi ** handle, int verbose, char **cname,
     {
       fprintf (stderr, "shishi_check_version() failed:\n"
 	       "Header file incompatible with shared library.\n");
-      return 1;
+      return SHISHI_INVALID_ARGUMENT;
     }
 
   rc = shishi_init (handle);
@@ -65,7 +65,7 @@ shishi_auth (Shishi ** handle, int verbose, char **cname,
     {
       fprintf (stderr,
 	       "error initializing shishi: %s\n", shishi_strerror (rc));
-      return 1;
+      return rc;
     }
 
   if (realm)
@@ -97,7 +97,7 @@ shishi_auth (Shishi ** handle, int verbose, char **cname,
       errormsg[100] = '\0';
 
       fprintf (stderr, "Error during server authentication : %s\n", errormsg);
-      return 1;
+      return SHISHI_VERIFY_FAILED;
     }
 
   if (verbose)
@@ -114,7 +114,7 @@ shishi_auth (Shishi ** handle, int verbose, char **cname,
   if (!tmpserver)
     {
       perror ("shishi_auth()");
-      return 1;
+      return SHISHI_TOO_SMALL_BUFFER;
     }
   strcpy (tmpserver, SERVICE);
   strcat (tmpserver, "/");
@@ -126,9 +126,9 @@ shishi_auth (Shishi ** handle, int verbose, char **cname,
   tkt = shishi_tkts_get (shishi_tkts_default (h), &hint);
   if (!tkt)
     {
+      fprintf (stderr, "cannot find ticket for \"%s\"\n", tmpserver);
       free (tmpserver);
-      fprintf (stderr, "cannot find ticket for \"%s\"\n", sname);
-      return 1;
+      return SHISHI_INVALID_TICKET;
     }
 
   free (tmpserver);
@@ -142,13 +142,14 @@ shishi_auth (Shishi ** handle, int verbose, char **cname,
   if (rc != SHISHI_OK)
     {
       fprintf (stderr, "cannot create authentication context\n");
-      return 1;
+      return rc;
     }
 
 
   /* checksum = port: terminal name */
 
-  snprintf (cksumdata, 100, "%u:%s%s", ntohs (port), cmd, *cname);
+  snprintf (cksumdata, sizeof (cksumdata) - 1,
+	    "%u:%s%s", ntohs (port), cmd, *cname);
 
   /* add checksum to authenticator */
 
@@ -164,7 +165,7 @@ shishi_auth (Shishi ** handle, int verbose, char **cname,
       fprintf (stderr, "cannot build authentication request: %s\n",
 	       shishi_strerror (rc));
 
-      return 1;
+      return rc;
     }
 
   if (verbose)
@@ -184,9 +185,11 @@ shishi_auth (Shishi ** handle, int verbose, char **cname,
 
   write (sock, out, outlen);
 
-  /* read a respond from server - what ? */
+  /* read response from server - what ? */
 
-  read (sock, &auth, sizeof (int));
+  read (sock, &rc, sizeof (rc));
+  if (rc)
+    return SHISHI_APREP_VERIFY_FAILED;
 
   /* For mutual authentication, wait for server reply. */
 
@@ -216,7 +219,7 @@ shishi_auth (Shishi ** handle, int verbose, char **cname,
 	  else
 	    fprintf (stderr, "AP-REP verification error: %s\n",
 		     shishi_strerror (rc));
-	  return 1;
+	  return rc;
 	}
 
       /* The server is authenticated. */
@@ -228,7 +231,7 @@ shishi_auth (Shishi ** handle, int verbose, char **cname,
   if (verbose)
     printf ("User authenticated.\n");
 
-  return 0;
+  return SHISHI_OK;
 
 }
 
@@ -242,7 +245,7 @@ senderror (int s, char type, char *buf)
 int
 get_auth (int infd, Shishi ** handle, Shishi_ap ** ap,
 	  Shishi_key ** enckey, const char **err_msg, int *protoversion,
-	  int *cksumtype, char **cksum, int *cksumlen)
+	  int *cksumtype, char **cksum, int *cksumlen, char *srvname)
 {
   Shishi_key *key;
   char *out;
@@ -268,20 +271,32 @@ get_auth (int infd, Shishi ** handle, Shishi_ap ** ap,
     {
       *err_msg =
 	"shishi_check_version() failed: header file incompatible with shared library.";
-      return 1;
+      return SHISHI_INVALID_ARGUMENT;
     }
 
   rc = shishi_init_server (handle);
   if (rc != SHISHI_OK)
     return rc;
 
-  servername = shishi_server_for_local_service (*handle, SERVICE);
+  if (srvname && *srvname)
+    {
+      servername = malloc (sizeof (SERVICE) + strlen (srvname) + 2);
+      if (!servername)
+	{
+	  *err_msg = "Not enough memory";
+	  return SHISHI_TOO_SMALL_BUFFER;
+	}
+      sprintf (servername, "%s/%s", SERVICE, srvname);
+    }
+  else
+    servername = shishi_server_for_local_service (*handle, SERVICE);
 
   key = shishi_hostkeys_for_server (*handle, servername);
+  free (servername);
   if (!key)
     {
       *err_msg = shishi_error (*handle);
-      return 1;
+      return SHISHI_INVALID_KEY;
     }
 
   /* Read Kerberos 5 sendauth message */
@@ -289,7 +304,7 @@ get_auth (int infd, Shishi ** handle, Shishi_ap ** ap,
   if (rc != sizeof (int))
     {
       *err_msg = "Error reading message size";
-      return 1;
+      return SHISHI_IO_ERROR;
     }
 
   buflen = ntohl (len);
@@ -297,14 +312,14 @@ get_auth (int infd, Shishi ** handle, Shishi_ap ** ap,
   if (!buf)
     {
       *err_msg = "Not enough memory";
-      return 1;
+      return SHISHI_TOO_SMALL_BUFFER;
     }
 
   rc = read (infd, buf, buflen);
   if (rc != buflen)
     {
       *err_msg = "Error reading authentication message";
-      return 1;
+      return SHISHI_IO_ERROR;
     }
 
   len = strlen (krb5sendauth);
@@ -312,7 +327,9 @@ get_auth (int infd, Shishi ** handle, Shishi_ap ** ap,
   if (rc)
     {
       *err_msg = "Invalid authentication type";
-      return 1;
+      /* Authentication type is wrong.  */
+      write (infd, "\001", 1);
+      return SHISHI_VERIFY_FAILED;
     }
 
   free (buf);
@@ -322,21 +339,21 @@ get_auth (int infd, Shishi ** handle, Shishi_ap ** ap,
   if (rc != sizeof (int))
     {
       *err_msg = "Error reading protocol message size";
-      return 1;
+      return SHISHI_IO_ERROR;
     }
   buflen = ntohl (len);
   buf = malloc (buflen);
   if (!buf)
     {
       *err_msg = "Not enough memory";
-      return 1;
+      return SHISHI_TOO_SMALL_BUFFER;
     }
 
   rc = read (infd, buf, buflen);
   if (rc != buflen)
     {
       *err_msg = "Error reading protocol message";
-      return 1;
+      return SHISHI_IO_ERROR;
     }
 
   len = strlen (krb5kcmd1);
@@ -348,7 +365,9 @@ get_auth (int infd, Shishi ** handle, Shishi_ap ** ap,
       if (rc)
 	{
 	  *err_msg = "Protocol version not supported";
-	  return 1;
+	  /* Protocol version is wrong.  */
+	  write (infd, "\002", 1);
+	  return SHISHI_VERIFY_FAILED;
 	}
       *protoversion = 2;
     }
@@ -367,7 +386,7 @@ get_auth (int infd, Shishi ** handle, Shishi_ap ** ap,
   if (rc != sizeof (int))
     {
       *err_msg = "Error reading authentication request size";
-      return 1;
+      return SHISHI_IO_ERROR;
     }
 
   buflen = ntohl (len);
@@ -375,14 +394,14 @@ get_auth (int infd, Shishi ** handle, Shishi_ap ** ap,
   if (!buf)
     {
       *err_msg = "Not enough memory";
-      return 1;
+      return SHISHI_TOO_SMALL_BUFFER;
     }
 
   rc = read (infd, buf, buflen);
   if (rc != buflen)
     {
       *err_msg = "Error reading authentication request";
-      return 1;
+      return SHISHI_IO_ERROR;
     }
 
   /* Create Authentication context */
@@ -393,7 +412,7 @@ get_auth (int infd, Shishi ** handle, Shishi_ap ** ap,
 
   /* Store request in context */
 
-  shishi_ap_req_der_set (*ap, buf, buflen);
+  rc = shishi_ap_req_der_set (*ap, buf, buflen);
   if (rc != SHISHI_OK)
     return rc;
 
@@ -424,11 +443,11 @@ get_auth (int infd, Shishi ** handle, Shishi_ap ** ap,
   if (rc != SHISHI_OK)
     return rc;
 
-  /* User is authenticated. */
+  /* User is authenticated.  */
   error = 0;
   write (infd, &error, sizeof (int));
 
-  /* Authenticate ourself to client, if request */
+  /* Authenticate ourself to client, if requested.  */
 
   if (shishi_apreq_mutual_required_p (*handle, shishi_ap_req (*ap)))
     {
@@ -442,7 +461,7 @@ get_auth (int infd, Shishi ** handle, Shishi_ap ** ap,
 	{
 	  *err_msg = "Error sending AP-REP";
 	  free (out);
-	  return 1;
+	  return SHISHI_IO_ERROR;
 	}
 
       rc = write (infd, out, ntohl (outlen));
@@ -450,7 +469,7 @@ get_auth (int infd, Shishi ** handle, Shishi_ap ** ap,
 	{
 	  *err_msg = "Error sending AP-REP";
 	  free (out);
-	  return 1;
+	  return SHISHI_IO_ERROR;
 	}
 
       free (out);
@@ -467,7 +486,7 @@ get_auth (int infd, Shishi ** handle, Shishi_ap ** ap,
       if (tkt == NULL)
 	{
 	  *err_msg = "Could not get tkt from AP-REQ";
-	  return 1;
+	  return SHISHI_INVALID_TICKET;
 	}
 
       rc = shishi_encticketpart_get_key (*handle,
diff --git a/libinetutils/shishi_def.h b/libinetutils/shishi_def.h
index 868d72f..d574665 100644
--- a/libinetutils/shishi_def.h
+++ b/libinetutils/shishi_def.h
@@ -62,7 +62,7 @@ extern int shishi_auth (Shishi ** handle, int verbose, char **cname,
 extern int get_auth (int infd, Shishi ** handle, Shishi_ap ** ap,
 		     Shishi_key ** enckey, const char **err_msg,
 		     int *protoversion, int *cksumtype, char **cksum,
-		     int *cksumlen);
+		     int *cksumlen, char *srvname);
 
 extern int readenc (Shishi * h, int sock, char *buf, int *len,
 		    shishi_ivector * iv, Shishi_key * enckey, int proto);
diff --git a/src/rlogind.c b/src/rlogind.c
index b3451ef..86cf17c 100644
--- a/src/rlogind.c
+++ b/src/rlogind.c
@@ -176,6 +176,7 @@ int keepalive = 1;
 
 #if defined KERBEROS || defined SHISHI
 int kerberos = 0;
+char *servername = NULL;
 
 # ifdef ENCRYPTION
 int encrypt_io = 0;
@@ -291,6 +292,8 @@ static struct argp_option options[] = {
 #if defined KERBEROS || defined SHISHI
   { "kerberos", 'k', NULL, 0,
     "use kerberos IV/V authentication" },
+  { "servername", 'S', "NAME", 0,
+    "set Kerberos server name, overriding canonical hostname" },
 #endif
 #if defined ENCRYPTION
   { "encrypt", 'x', NULL, 0,
@@ -354,6 +357,10 @@ parse_opt (int key, char *arg, struct argp_state *state)
 	kerberos = AUTH_KERBEROS_DEFAULT;
       break;
 
+    case 'S':
+      servername = arg;
+      break;
+
 # ifdef ENCRYPTION
     case 'x':
       encrypt_io = 1;
@@ -1185,10 +1192,10 @@ do_shishi_login (int infd, struct auth_data *ad, const char **err_msg)
 
 #  ifdef ENCRYPTION
   rc = get_auth (infd, &ad->h, &ad->ap, &ad->enckey, err_msg, &ad->protocol,
-		 &cksumtype, &cksum, &cksumlen);
+		 &cksumtype, &cksum, &cksumlen, servername);
 #  else
   rc = get_auth (infd, &ad->h, &ad->ap, NULL, err_msg, &ad->protocol,
-		 &cksumtype, &cksum, &cksumlen);
+		 &cksumtype, &cksum, &cksumlen, servername);
 #  endif
   if (rc != SHISHI_OK)
     return rc;
diff --git a/src/rshd.c b/src/rshd.c
index b76a421..8623960 100644
--- a/src/rshd.c
+++ b/src/rshd.c
@@ -194,6 +194,7 @@ int protocol;
 # define VERSION_SIZE	9
 # define SECURE_MESSAGE  "This rsh session is using DES encryption for all transmissions.\r\n"
 int doencrypt, use_kerberos, vacuous;
+char *servername = NULL;
 #else
 #endif /* KERBEROS || SHISHI */
 
@@ -214,7 +215,9 @@ static struct argp_option options[] = {
     "use kerberos authentication" },
   /* FIXME: Option name is misleading */
   { "vacuous", 'v', NULL, 0,
-    "require Kerberos authentication" },
+    "fail for non-Kerberos authentication" },
+  { "servername", 'S', "NAME", 0,
+    "set Kerberos server name, overriding canonical hostname" },
 #endif /* KERBEROS */
   { NULL }
 };
@@ -263,6 +266,10 @@ parse_opt (int key, char *arg, struct argp_state *state)
       doencrypt = 1;
       break;
 # endif
+
+    case 'S':
+      servername = arg;
+      break;
 #endif /* KERBEROS || SHISHI */
 
     case 'L':
@@ -596,7 +603,7 @@ doit (int sockfd, struct sockaddr *fromp, socklen_t fromlen)
 #endif
 	if (port >= IPPORT_RESERVED || port < IPPORT_RESERVED / 2)
 	  {
-	    syslog (LOG_ERR, "2nd port not reserved\n");
+	    syslog (LOG_ERR, "Second port outside reserved range.");
 	    exit (EXIT_FAILURE);
 	  }
       /* Use the fromp structure that we already have available.
@@ -812,7 +819,7 @@ doit (int sockfd, struct sockaddr *fromp, socklen_t fromlen)
       char *err_msg;
 
       rc = get_auth (STDIN_FILENO, &h, &ap, &enckey, &err_msg, &protocol,
-		     &cksumtype, &cksum, &cksumlen);
+		     &cksumtype, &cksum, &cksumlen, servername);
       if (rc != SHISHI_OK)
 	{
 	  rshd_error ("Kerberos authentication failure: %s\n",
@@ -906,12 +913,9 @@ doit (int sockfd, struct sockaddr *fromp, socklen_t fromlen)
       exit (EXIT_FAILURE);
 
     /* verify checksum */
-
-# if 1
     {
       unsigned short port;
 
-    /* Doesn't give socket port ? */
       socklen = sizeof (sock);
       if (getsockname (STDIN_FILENO, (struct sockaddr *)&sock, &socklen) < 0)
 	{
@@ -923,15 +927,12 @@ doit (int sockfd, struct sockaddr *fromp, socklen_t fromlen)
 	     ? ((struct sockaddr_in6 *) &sock)->sin6_port
 	     : ((struct sockaddr_in *) &sock)->sin_port;
 
-      snprintf (cksumdata, 100, "%u:%s%s", port, cmdbuf, locuser);
+      snprintf (cksumdata, 100, "%u:%s%s", ntohs (port), cmdbuf, locuser);
     }
-# else
-    snprintf (cksumdata, 100, "544:%s%s", cmdbuf, locuser);
-# endif
+
     rc = shishi_checksum (h, enckey, 0, cksumtype,
 			  cksumdata, strlen (cksumdata),
 			  &compcksum, &compcksumlen);
-    free (cksum);
     if (rc != SHISHI_OK
 	|| compcksumlen != cksumlen
 	|| memcmp (compcksum, cksum, cksumlen) != 0)
@@ -1052,6 +1053,18 @@ doit (int sockfd, struct sockaddr *fromp, socklen_t fromlen)
     }
 #endif /* WITH_PAM */
 
+#if defined WITH_IRUSEROK_AF && !defined WITH_PAM
+    switch (fromp->sa_family)
+      {
+      case AF_INET6:
+	fromaddrp = (void *) &((struct sockaddr_in6 *) fromp)->sin6_addr;
+	break;
+      case AF_INET:
+      default:
+	fromaddrp = (void *) &((struct sockaddr_in *) fromp)->sin_addr;
+      }
+#endif
+
 #ifdef	KERBEROS
   if (use_kerberos)
     {
@@ -1090,15 +1103,6 @@ doit (int sockfd, struct sockaddr *fromp, socklen_t fromlen)
                      && (iruserok_sa ((void *) fromp, fromlen,
 				      pwd->pw_uid == 0, remuser, locuser)) < 0))
 # elif defined WITH_IRUSEROK_AF
-    switch (fromp->sa_family)
-      {
-      case AF_INET6:
-	fromaddrp = (void *) &((struct sockaddr_in6 *) fromp)->sin6_addr;
-	break;
-      case AF_INET:
-      default:
-	fromaddrp = (void *) &((struct sockaddr_in *) fromp)->sin_addr;
-      }
     if (errorstr || (pwd->pw_passwd != 0 && *pwd->pw_passwd != '\0'
                      && (iruserok_af (fromaddrp, pwd->pw_uid == 0,
 				      remuser, locuser, fromp->sa_family)) < 0))

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

Summary of changes:
 ChangeLog                 |   58 ++++++++++++++++++++++++++++++
 libinetutils/kcmd.c       |   56 ++++++++++++++++++++--------
 libinetutils/krcmd.c      |    6 ++--
 libinetutils/shishi.c     |   87 +++++++++++++++++++++++++++-----------------
 libinetutils/shishi_def.h |    2 +-
 src/rlogind.c             |   11 +++++-
 src/rshd.c                |   74 ++++++++++++++++++++++++++++----------
 7 files changed, 218 insertions(+), 76 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Tue Jul 10 13:07:17 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Sodu9-0003hL-SH
	for mharc-commit-inetutils@gnu.org; Tue, 10 Jul 2012 13:07:17 -0400
Received: from eggs.gnu.org ([208.118.235.92]:38604)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1Sodu6-0003gu-0W
	for commit-inetutils@gnu.org; Tue, 10 Jul 2012 13:07:15 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1Sodtv-0001Zc-Ef
	for commit-inetutils@gnu.org; Tue, 10 Jul 2012 13:07:13 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:36180)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1Sodtv-0001ZY-B9
	for commit-inetutils@gnu.org; Tue, 10 Jul 2012 13:07:03 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1Sodtu-0006qh-2k
	for commit-inetutils@gnu.org; Tue, 10 Jul 2012 17:07:02 +0000
Date: Tue, 10 Jul 2012 17:07:02 +0000
Message-Id: <E1Sodtu-0006qh-2k@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_1-126-g7129ba4
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 3da88b201d8397b2a7906a9ee8194fbfae247338
X-Git-Newrev: 7129ba40720e8a4c3da62b4af6764557f3c0842e
From: Mats Erik Andersson <gnu@gisladisker.se>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
	<commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Jul 2012 17:07: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  7129ba40720e8a4c3da62b4af6764557f3c0842e (commit)
      from  3da88b201d8397b2a7906a9ee8194fbfae247338 (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=7129ba40720e8a4c3da62b4af6764557f3c0842e


commit 7129ba40720e8a4c3da62b4af6764557f3c0842e
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Tue Jul 10 18:59:22 2012 +0200

    rshd: 64-bit issue with libshishi.

diff --git a/ChangeLog b/ChangeLog
index 9be716a..70fb0d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2012-07-10  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	rshd: Resolve conflicts `int' versus `size_t'.
+	Inappropriate use of `int' leads to failure
+	of authentication on 64-bit architectures.
+
+	* libinetutils/shishi.c (shishi_auth): Let OUTLEN
+	be `size_t'. Read and write lengths using MSGLEN.
+	(get_auth): New argument type `size_t *cksumlen'.
+	Let OUTLEN be `size_t'.  New variable LEN.
+	(readenc, writeenc): New type `size_t outlen'.
+	* libinetutils/shishi_def.h (shishi_auth):
+	Modified signature.
+	* src/rlogind.c (do_shishi_login): Use `size_t'
+	for CKSUMLEN and `socklen_t' for SOCKLEN.
+	* src/rshd.c (doit) [SHISHI]: Likewise.
+
 2012-07-07  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	* src/rshd.c (doit) <PAM_NEW_AUTHTOK_REQD>:
diff --git a/libinetutils/shishi.c b/libinetutils/shishi.c
index 25c54a0..e49718e 100644
--- a/libinetutils/shishi.c
+++ b/libinetutils/shishi.c
@@ -41,7 +41,7 @@ shishi_auth (Shishi ** handle, int verbose, char **cname,
 
   int rc;
   char *out;
-  int outlen;
+  size_t outlen;
   int krb5len, msglen;
   char *tmpserver;
   char auth;
@@ -178,7 +178,8 @@ shishi_auth (Shishi ** handle, int verbose, char **cname,
 
   /* send size of AP-REQ to the server */
 
-  msglen = htonl (outlen);
+  msglen = outlen;
+  msglen = htonl (msglen);
   write (sock, (char *) &msglen, sizeof (int));
 
   /* send AP-REQ to the server */
@@ -200,10 +201,10 @@ shishi_auth (Shishi ** handle, int verbose, char **cname,
 
       /* read size of the AP-REP */
 
-      read (sock, (char *) &outlen, sizeof (int));
+      read (sock, (char *) &msglen, sizeof (int));
 
       /* read AP-REP */
-      outlen = ntohl (outlen);
+      outlen = ntohl (msglen);
       outlen = read (sock, out, outlen);
 
       rc = shishi_ap_rep_verify_der (ap, out, outlen);
@@ -245,11 +246,11 @@ senderror (int s, char type, char *buf)
 int
 get_auth (int infd, Shishi ** handle, Shishi_ap ** ap,
 	  Shishi_key ** enckey, const char **err_msg, int *protoversion,
-	  int *cksumtype, char **cksum, int *cksumlen, char *srvname)
+	  int *cksumtype, char **cksum, size_t *cksumlen, char *srvname)
 {
   Shishi_key *key;
   char *out;
-  int outlen;
+  size_t outlen;
   char *buf;
   int buflen;
   int len;
@@ -451,12 +452,15 @@ get_auth (int infd, Shishi ** handle, Shishi_ap ** ap,
 
   if (shishi_apreq_mutual_required_p (*handle, shishi_ap_req (*ap)))
     {
+      int len;
+
       rc = shishi_ap_rep_der (*ap, &out, &outlen);
       if (rc != SHISHI_OK)
 	return rc;
 
-      outlen = htonl (outlen);
-      rc = write (infd, &outlen, sizeof (int));
+      len = outlen;
+      len = htonl (len);
+      rc = write (infd, &len, sizeof (len));
       if (rc != sizeof (int))
 	{
 	  *err_msg = "Error sending AP-REP";
@@ -464,8 +468,8 @@ get_auth (int infd, Shishi ** handle, Shishi_ap ** ap,
 	  return SHISHI_IO_ERROR;
 	}
 
-      rc = write (infd, out, ntohl (outlen));
-      if (rc != ntohl (outlen))
+      rc = write (infd, out, ntohl (len));
+      if (rc != ntohl (len))
 	{
 	  *err_msg = "Error sending AP-REP";
 	  free (out);
@@ -512,7 +516,7 @@ readenc (Shishi * h, int sock, char *buf, int *len, shishi_ivector * iv,
 
   int rc;
   int val;
-  int outlen;
+  size_t outlen;
   int dlen = 0, blocksize, enctype, hashsize;
 
   /* read size of message */
@@ -637,7 +641,8 @@ writeenc (Shishi * h, int sock, char *buf, int wlen, int *len,
   char *bufbis;
 
   int rc;
-  int dlen, outlen;
+  int dlen;
+  size_t outlen;
 
   dlen = wlen;
   dlen = htonl (dlen);
diff --git a/libinetutils/shishi_def.h b/libinetutils/shishi_def.h
index d574665..71ef2d7 100644
--- a/libinetutils/shishi_def.h
+++ b/libinetutils/shishi_def.h
@@ -62,7 +62,7 @@ extern int shishi_auth (Shishi ** handle, int verbose, char **cname,
 extern int get_auth (int infd, Shishi ** handle, Shishi_ap ** ap,
 		     Shishi_key ** enckey, const char **err_msg,
 		     int *protoversion, int *cksumtype, char **cksum,
-		     int *cksumlen, char *srvname);
+		     size_t *cksumlen, char *srvname);
 
 extern int readenc (Shishi * h, int sock, char *buf, int *len,
 		    shishi_ivector * iv, Shishi_key * enckey, int proto);
diff --git a/src/rlogind.c b/src/rlogind.c
index 86cf17c..c7745ca 100644
--- a/src/rlogind.c
+++ b/src/rlogind.c
@@ -1182,13 +1182,13 @@ do_shishi_login (int infd, struct auth_data *ad, const char **err_msg)
   int error = 0;
   int keylen, keytype;
   struct passwd *pwd = NULL;
-  int cksumtype, cksumlen = 30;
+  int cksumtype;
   char *cksum;
   char *compcksum;
-  size_t compcksumlen;
+  size_t compcksumlen, cksumlen = 30;
   char cksumdata[100];
   struct sockaddr_in sock;
-  size_t socklen = sizeof (sock);
+  socklen_t socklen = sizeof (sock);
 
 #  ifdef ENCRYPTION
   rc = get_auth (infd, &ad->h, &ad->ap, &ad->enckey, err_msg, &ad->protocol,
diff --git a/src/rshd.c b/src/rshd.c
index b6b1303..5cf796c 100644
--- a/src/rshd.c
+++ b/src/rshd.c
@@ -422,7 +422,8 @@ doit (int sockfd, struct sockaddr *fromp, socklen_t fromlen)
   int pv1[2], pv2[2];
   fd_set wready, writeto;
   int keytype, keylen;
-  int cksumtype, cksumlen;
+  int cksumtype;
+  size_t cksumlen;
   char *cksum = NULL;
 #endif /* KERBEROS || SHISHI */
 
@@ -844,7 +845,7 @@ doit (int sockfd, struct sockaddr *fromp, socklen_t fromlen)
       size_t compcksumlen;
       char cksumdata[100];
       struct sockaddr_storage sock;
-      size_t socklen;
+      socklen_t socklen;
 
 # ifdef ENCRYPTION
       if (strlen (cmdbuf) >= 3)

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

Summary of changes:
 ChangeLog                 |   17 +++++++++++++++++
 libinetutils/shishi.c     |   29 +++++++++++++++++------------
 libinetutils/shishi_def.h |    2 +-
 src/rlogind.c             |    6 +++---
 src/rshd.c                |    5 +++--
 5 files changed, 41 insertions(+), 18 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Tue Jul 10 20:21:04 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Sokfw-0001pL-S8
	for mharc-commit-inetutils@gnu.org; Tue, 10 Jul 2012 20:21:04 -0400
Received: from eggs.gnu.org ([208.118.235.92]:60567)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1Sokfu-0001p4-15
	for commit-inetutils@gnu.org; Tue, 10 Jul 2012 20:21:03 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1Sokfs-0003ig-5P
	for commit-inetutils@gnu.org; Tue, 10 Jul 2012 20:21:01 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:35313)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1Sokfr-0003iR-Lr
	for commit-inetutils@gnu.org; Tue, 10 Jul 2012 20:20:59 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1Sokfq-0002ck-9H
	for commit-inetutils@gnu.org; Wed, 11 Jul 2012 00:20:59 +0000
Date: Wed, 11 Jul 2012 00:20:59 +0000
Message-Id: <E1Sokfq-0002ck-9H@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_1-127-ga8a2081
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 7129ba40720e8a4c3da62b4af6764557f3c0842e
X-Git-Newrev: a8a2081ec4cbdfc94598203935ff840dcefbc42c
From: Mats Erik Andersson <gnu@gisladisker.se>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
	<commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Jul 2012 00:21:03 -0000

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

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


commit a8a2081ec4cbdfc94598203935ff840dcefbc42c
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Wed Jul 11 02:18:56 2012 +0200

    Solaris builds with libshishi.

diff --git a/ChangeLog b/ChangeLog
index 70fb0d9..9e02eae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-07-11  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	Allow builds on OpenSolaris with libshishi.
+
+	* telnet/main.c: Include <arpa/telnet.h>.
+
 2012-07-10  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	rshd: Resolve conflicts `int' versus `size_t'.
diff --git a/telnet/main.c b/telnet/main.c
index a1a35c9..a112741 100644
--- a/telnet/main.c
+++ b/telnet/main.c
@@ -62,6 +62,8 @@
 #include <argp.h>
 #include <libinetutils.h>
 
+#include <arpa/telnet.h>
+
 #ifdef	AUTHENTICATION
 # include <libtelnet/auth.h>
 #endif

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

Summary of changes:
 ChangeLog     |    6 ++++++
 telnet/main.c |    2 ++
 2 files changed, 8 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Mon Jul 16 11:43:46 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1SqnSc-0004jd-NG
	for mharc-commit-inetutils@gnu.org; Mon, 16 Jul 2012 11:43:46 -0400
Received: from eggs.gnu.org ([208.118.235.92]:50773)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1SqnSQ-0004iS-Vs
	for commit-inetutils@gnu.org; Mon, 16 Jul 2012 11:43:45 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1SqnSO-0001lx-6L
	for commit-inetutils@gnu.org; Mon, 16 Jul 2012 11:43:34 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:44794)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1SqnSO-0001ls-28
	for commit-inetutils@gnu.org; Mon, 16 Jul 2012 11:43:32 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1SqnSM-0003tE-NC
	for commit-inetutils@gnu.org; Mon, 16 Jul 2012 15:43:31 +0000
Date: Mon, 16 Jul 2012 15:43:31 +0000
Message-Id: <E1SqnSM-0003tE-NC@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_1-130-g3a870c0
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: a8a2081ec4cbdfc94598203935ff840dcefbc42c
X-Git-Newrev: 3a870c0123b5e6eb0a9ae621a719c36724b422c4
From: Mats Erik Andersson <gnu@gisladisker.se>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
	<commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Jul 2012 15:43:45 -0000

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

The branch, master has been updated
       via  3a870c0123b5e6eb0a9ae621a719c36724b422c4 (commit)
       via  217f5157bc8022c2ab11905e838bb7f078860e2c (commit)
       via  bfc79fcbbde4a65fa28ec9cd49b468eeb58e15cd (commit)
      from  a8a2081ec4cbdfc94598203935ff840dcefbc42c (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=3a870c0123b5e6eb0a9ae621a719c36724b422c4


commit 3a870c0123b5e6eb0a9ae621a719c36724b422c4
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Sat Jul 14 23:31:11 2012 +0200

    telnetd: Effective authentication modes.

diff --git a/ChangeLog b/ChangeLog
index 616d656..36311b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2012-07-14  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	telnetd: Activate authentication modes.
+	Send TELOPT_AUTHENTICATION based on the
+	authentication level chosen for the server.
+
+	* telnetd/utility.c (getterminaltype)
+	[AUTHENTICATION]: Choose between send_wont(),
+	send_do() and send_will() with TELOPT_AUTHENTICATION
+	depending on `auth_level'.
+
 2012-07-13  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	* telnetd/telnetd.c (auth_level) [AUTHENTICATION]:
diff --git a/telnetd/utility.c b/telnetd/utility.c
index 8183a79..b96a18f 100644
--- a/telnetd/utility.c
+++ b/telnetd/utility.c
@@ -698,13 +698,27 @@ getterminaltype (char *user_name)
 #if defined AUTHENTICATION
   /*
    * Handle the Authentication option before we do anything else.
+   * Distinguish the available modes by level:
+   *
+   *   off:			Authentication is forbidden.
+   *   none:			Volontary authentication.
+   *   user, valid, other:	Mandatory authentication only.
    */
-  send_do (TELOPT_AUTHENTICATION, 1);
-  ttloop (his_will_wont_is_changing (TELOPT_AUTHENTICATION));
+  if (auth_level < 0)
+    send_wont (TELOPT_AUTHENTICATION, 1);
+  else
+    {
+      if (auth_level > 0)
+	send_do (TELOPT_AUTHENTICATION, 1);
+      else
+	send_will (TELOPT_AUTHENTICATION, 1);
 
-  if (his_state_is_will (TELOPT_AUTHENTICATION))
-    retval = auth_wait (user_name);
-#endif
+      ttloop (his_will_wont_is_changing (TELOPT_AUTHENTICATION));
+
+      if (his_state_is_will (TELOPT_AUTHENTICATION))
+	retval = auth_wait (user_name);
+    }
+#endif /* AUTHENTICATION */
 
 #ifdef	ENCRYPTION
   send_will (TELOPT_ENCRYPT, 1);

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


commit 217f5157bc8022c2ab11905e838bb7f078860e2c
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Fri Jul 13 18:45:03 2012 +0200

    telnetd: Authmode only with Kerberos.

diff --git a/ChangeLog b/ChangeLog
index 326fff6..616d656 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2012-07-13  Mats Erik Andersson  <gnu@gisladisker.se>
 
+	* telnetd/telnetd.c (auth_level) [AUTHENTICATION]:
+	Use only in kerberized server builds.
+	(arpg_options, parse_opt) [AUTHENTICATION]
+	<-a/--authmode>: Likewise.
+	(parse_mode) [AUTHENTICATION]: Likewise.
+
+	* telnetd/utility.c (io_drain) <EAGAIN in read()>:
+	Silence useless logging message `ttloop: retrying'.
+
+2012-07-13  Mats Erik Andersson  <gnu@gisladisker.se>
+
 	telnet, telnetd: Set service name for libshishi
 	in server and allow client to specify realm.
 
diff --git a/telnetd/telnetd.c b/telnetd/telnetd.c
index d844d37..cd57cf8 100644
--- a/telnetd/telnetd.c
+++ b/telnetd/telnetd.c
@@ -32,7 +32,10 @@
 # include <libtelnet/misc.h>
 #endif
 
+#ifdef  AUTHENTICATION
 static void parse_authmode (char *str);
+#endif
+
 static void parse_linemode (char *str);
 static void parse_debug_level (char *str);
 static void telnetd_setup (int fd);
@@ -57,8 +60,6 @@ int lmodetype;			/* Type of linemode (2) */
 int hostinfo = 1;		/* Print the host-specific information before
 				   login */
 
-int auth_level = 0;		/* Authentication level */
-
 int debug_level[debug_max_mode];	/* Debugging levels */
 int debug_tcp = 0;		/* Should the SO_DEBUG be set? */
 
@@ -82,7 +83,7 @@ int flowmode;			/* current flow control state */
 int restartany;			/* restart output on any character state */
 int diagnostic;			/* telnet diagnostic capabilities */
 #if defined AUTHENTICATION
-int auth_level;
+int auth_level = 0;		/* Authentication level */
 int autologin;
 #endif
 
@@ -95,8 +96,10 @@ struct telnetd_clocks clocks;
 
 
 static struct argp_option argp_options[] = {
+#ifdef  AUTHENTICATION
   { "authmode", 'a', "MODE", 0,
     "specify what mode to use for authentication" },
+#endif
   { "debug", 'D', "LEVEL", OPTION_ARG_OPTIONAL,
     "set debugging level" },
   { "exec-login", 'E', "STRING", 0,
@@ -122,9 +125,11 @@ parse_opt (int key, char *arg, struct argp_state *state)
 {
   switch (key)
     {
+#ifdef  AUTHENTICATION
     case 'a':
       parse_authmode (arg);
       break;
+#endif
 
     case 'D':
       parse_debug_level (arg);
@@ -201,6 +206,7 @@ parse_linemode (char *str)
     fprintf (stderr, "telnetd: invalid argument to --linemode\n");
 }
 
+#ifdef  AUTHENTICATION
 void
 parse_authmode (char *str)
 {
@@ -217,6 +223,7 @@ parse_authmode (char *str)
   else
     fprintf (stderr, "telnetd: unknown authorization level for -a\n");
 }
+#endif /* AUTHENTICATION */
 
 static struct
 {
diff --git a/telnetd/utility.c b/telnetd/utility.c
index cdd1d9a..8183a79 100644
--- a/telnetd/utility.c
+++ b/telnetd/utility.c
@@ -412,7 +412,9 @@ again:
     {
       if (errno == EAGAIN)
 	{
-	  syslog (LOG_INFO, "ttloop: retrying");
+	  /*
+	   * syslog (LOG_INFO, "ttloop: retrying");
+	   */
 	  goto again;
 	}
       syslog (LOG_INFO, "ttloop:  read: %m\n");

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


commit bfc79fcbbde4a65fa28ec9cd49b468eeb58e15cd
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Fri Jul 13 11:36:45 2012 +0200

    telnet: Service and realm for libshishi.

diff --git a/ChangeLog b/ChangeLog
index 9e02eae..326fff6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2012-07-13  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	telnet, telnetd: Set service name for libshishi
+	in server and allow client to specify realm.
+
+	* libtelnet/shishi.c (dest_realm): New variable.
+	(krb5shishi_send): Call shishi_realm_default_set()
+	whenever `dest_realm' is set.
+	(krb5shishi_is_auth): New variable SERVER.  Construct
+	a service name from `LocalHostName' and use it in a
+	call to shishi_hostkeys_for_server().
+	* telnet/main.c (dest_realm) [KRB4 || SHISHI]:
+	New external variable.
+	(argp_options) [AUTHENTICATION && (KRB4 || SHISHI)]:
+	Activate the option `-k/--realm' also whith SHISHI.
+	(parse_opt) [AUTHENTICATION && (KRB4 || SHISHI)]:
+	Likewise.
+
 2012-07-11  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	Allow builds on OpenSolaris with libshishi.
diff --git a/libtelnet/shishi.c b/libtelnet/shishi.c
index dd1622a..17c9c3e 100644
--- a/libtelnet/shishi.c
+++ b/libtelnet/shishi.c
@@ -40,6 +40,8 @@
 #  include "encrypt.h"
 # endif
 
+char *dest_realm = NULL;
+
 Shishi_key *enckey = NULL;
 
 static unsigned char str_data[2048] = { IAC, SB, TELOPT_AUTHENTICATION, 0,
@@ -168,6 +170,10 @@ krb5shishi_send (TN_Authenticator * ap)
   sprintf (tmp, "host/%s", RemoteHostName);
   memset (&hint, 0, sizeof (hint));
   hint.server = tmp;
+
+  if (dest_realm && *dest_realm)
+    shishi_realm_default_set (shishi_handle, dest_realm);
+
   tkt = shishi_tkts_get (shishi_tkts_default (shishi_handle), &hint);
   free (tmp);
   if (!tkt)
@@ -398,7 +404,7 @@ krb5shishi_is_auth (TN_Authenticator * a, unsigned char *data, int cnt,
 {
   Shishi_key *key, *key2;
   int rc;
-  char *cnamerealm;
+  char *cnamerealm, *server;
   int cnamerealmlen;
 # ifdef ENCRYPTION
   Session_Key skey;
@@ -428,7 +434,16 @@ krb5shishi_is_auth (TN_Authenticator * a, unsigned char *data, int cnt,
       return 1;
     }
 
-  key = shishi_hostkeys_for_localservice (shishi_handle, "host");
+  server = malloc (strlen ("host/") + strlen (LocalHostName) + 1);
+  if (server)
+    {
+      sprintf (server, "host/%s", LocalHostName);
+      key = shishi_hostkeys_for_server (shishi_handle, server);
+      free (server);
+    }
+  else
+    key = shishi_hostkeys_for_localservice (shishi_handle, "host");
+
   if (key == NULL)
     {
       snprintf (errbuf, errbuflen, "Could not find key:\n%s\n",
diff --git a/telnet/main.c b/telnet/main.c
index a112741..0c5b219 100644
--- a/telnet/main.c
+++ b/telnet/main.c
@@ -111,6 +111,10 @@ enum {
   OPTION_NOASYNCNET
 };
 
+#if defined KRB4 || defined SHISHI
+extern char *dest_realm;
+#endif
+
 static struct argp_option argp_options[] = {
 #define GRID 10
   { NULL, 0, NULL, 0,
@@ -160,7 +164,7 @@ static struct argp_option argp_options[] = {
     "Authentication and Kerberos options:", GRID },
   { "disable-auth", 'X', "ATYPE", 0,
     "disable type ATYPE authentication", GRID+1 },
-# if defined KRB4
+# if defined KRB4 || defined SHISHI
   { "realm", 'k', "REALM", 0,
     "obtain tickets for the remote host in REALM "
     "instead of the remote host's realm", GRID+1 },
@@ -257,7 +261,8 @@ parse_opt (int key, char *arg, struct argp_state *state)
       break;
 #endif
 
-#if defined AUTHENTICATION && defined KRB4
+#if defined AUTHENTICATION && \
+      ( defined KRB4 || defined SHISHI )
     case 'k':
       dest_realm = arg;
       break;

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

Summary of changes:
 ChangeLog          |   40 ++++++++++++++++++++++++++++++++++++++++
 libtelnet/shishi.c |   19 +++++++++++++++++--
 telnet/main.c      |    9 +++++++--
 telnetd/telnetd.c  |   13 ++++++++++---
 telnetd/utility.c  |   28 ++++++++++++++++++++++------
 5 files changed, 96 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Wed Jul 25 22:17:20 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1SuDdg-0002Ay-Ks
	for mharc-commit-inetutils@gnu.org; Wed, 25 Jul 2012 22:17:20 -0400
Received: from eggs.gnu.org ([208.118.235.92]:53115)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1SuDda-0002Ah-86
	for commit-inetutils@gnu.org; Wed, 25 Jul 2012 22:17:18 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1SuDdV-0005jV-Eo
	for commit-inetutils@gnu.org; Wed, 25 Jul 2012 22:17:14 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:48604)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1SuDdV-0005jR-9o
	for commit-inetutils@gnu.org; Wed, 25 Jul 2012 22:17:09 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1SuDdQ-0004Ch-H0
	for commit-inetutils@gnu.org; Thu, 26 Jul 2012 02:17:08 +0000
Date: Thu, 26 Jul 2012 02:17:08 +0000
Message-Id: <E1SuDdQ-0004Ch-H0@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_1-137-gc239b98
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 3a870c0123b5e6eb0a9ae621a719c36724b422c4
X-Git-Newrev: c239b983175eacc8b82dcba61313a91e49646fb7
From: Mats Erik Andersson <gnu@gisladisker.se>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
	<commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 26 Jul 2012 02:17: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  c239b983175eacc8b82dcba61313a91e49646fb7 (commit)
       via  81acda2919c5e4507dba0ceaa2565adc55524d57 (commit)
       via  6c7b2815daa5e50add254d522a69a7a20c549cb1 (commit)
       via  a78e5df5a6cb2347cc7a56c4bb98e95229026579 (commit)
       via  598e9a9ecf2563c78d1477019a9c68a7edf80771 (commit)
       via  7de0a6859990a97a3190e8c398d57e9a8e023d28 (commit)
       via  f0bea21c7e58ffb7251cdda4f1f7ad39913d4cff (commit)
      from  3a870c0123b5e6eb0a9ae621a719c36724b422c4 (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=c239b983175eacc8b82dcba61313a91e49646fb7


commit c239b983175eacc8b82dcba61313a91e49646fb7
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Tue Jul 24 23:21:18 2012 +0200

    rcp: Non-encrypting libshishi support.

diff --git a/ChangeLog b/ChangeLog
index b71678d..e117652 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,32 @@
+2012-07-24  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	rcp: Non-encrypting libshishi support.
+
+	* src/rcp.c [SHISHI]: Include <shishi.h>, `shishi_def.h'.
+	[ENCRYPTION]: Replace obsolete conditionals on CRYPT.
+	(dest_realm, use_kerberos, doencrypt) [KERBEROS || SHISHI]:
+	Always declare variables.
+	(h, enckey, iv1, iv2, iv3, iv4, ivtab, keytype, keylen)
+	(rc, wlen) [SHISHI]: New variables.
+	(options, parse_opt) [KERBEROS || SHISHI]: Make `-K', '-k'
+	and `-x' available with libshishi.
+	(main) [KERBEROS || SHISHI]: If `doencrypt && !use_kerberos'
+	then exit with failure.
+	(toremot): Invalidate descriptor `rem'.
+	[SHISHI]: Call shishi_done() at completion.
+	(tolocal) [SHISHI]: Likewise.
+	(kerberos) [KERBEROS || SHISHI]: New variable KRB_ERRNO,
+	used to capture error conditions better.  New code for
+	libshishi support.
+	(oldw) [KERBEROS || SHISHI]: Extend to libshishi.
+
+	* libinetutils/shishi.c (shishi_auth) <missing ticket>:
+	Add realm to error message, call shishi_realm_default().
+
+	* src/rsh.c (talk) [KERBEROS && ENCRYPTION]: Replace
+	obsolete macro CRYPT.  Replace non-existent variable
+	`doenencryption' by `doencrypt'.
+
 2012-07-23  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	rcp, rlogin, rlogind: IP_TOS mending.
diff --git a/libinetutils/shishi.c b/libinetutils/shishi.c
index e49718e..27c72f0 100644
--- a/libinetutils/shishi.c
+++ b/libinetutils/shishi.c
@@ -126,7 +126,8 @@ shishi_auth (Shishi ** handle, int verbose, char **cname,
   tkt = shishi_tkts_get (shishi_tkts_default (h), &hint);
   if (!tkt)
     {
-      fprintf (stderr, "cannot find ticket for \"%s\"\n", tmpserver);
+      fprintf (stderr, "cannot find ticket for \"%s@%s\"\n",
+	       tmpserver, shishi_realm_default (h));
       free (tmpserver);
       return SHISHI_INVALID_TICKET;
     }
diff --git a/src/rcp.c b/src/rcp.c
index 540f8e6..c0460a2 100644
--- a/src/rcp.c
+++ b/src/rcp.c
@@ -101,6 +101,11 @@ void run_err (const char *, ...);
 int susystem (char *, int);
 void verifydir (char *);
 
+#ifdef SHISHI
+# include <shishi.h>
+# include "shishi_def.h"
+#endif /* SHISHI */
+
 #ifdef KERBEROS
 # ifdef HAVE_KERBEROSIV_DES_H
 #  include <kerberosIV/des.h>
@@ -108,17 +113,30 @@ void verifydir (char *);
 # ifdef HAVE_KERBEROSIV_KRB_H
 #  include <kerberosIV/krb.h>
 # endif
+#endif /* KERBEROS */
 
+#if defined KERBEROS || defined SHISHI
 char *dest_realm = NULL;
 int use_kerberos = 1;
+int doencrypt = 0;
+
+# ifdef KERBEROS
 CREDENTIALS cred;
 Key_schedule schedule;
 extern char *krb_realmofhost ();
 
-# ifdef CRYPT
-int doencrypt = 0;
-# endif
-#endif /* KERBEROS  */
+# elif defined SHISHI /* !KERBEROS  */
+Shishi *h;
+Shishi_key *enckey;
+shishi_ivector iv1, iv2, iv3, iv4;
+shishi_ivector *ivtab[4];
+
+int keytype;
+int keylen;
+int rc;
+int wlen;
+# endif /* SHISHI */
+#endif /* KERBEROS || SHISHI */
 
 const char doc[] = "Remote copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.";
 const char arg_doc[] = "SOURCE DEST\n"
@@ -143,7 +161,7 @@ static struct argp_option options[] = {
     "attempt to preserve (duplicate) in its copies the"
     " modification times and modes of the source files",
     GRID+1 },
-#ifdef KERBEROS
+#if defined KERBEROS || defined SHISHI
   { "kerberos", 'K', NULL, 0,
     "turns off all Kerberos authentication",
     GRID+1 },
@@ -151,19 +169,19 @@ static struct argp_option options[] = {
     "obtain tickets for the remote host in REALM instead of the remote host's realm",
     GRID+1 },
 #endif
-#ifdef CRYPT
+#ifdef ENCRYPTION
   { "encrypt", 'x', NULL, 0,
-    "encrypt all data using DES",
+    "encrypt all data transfer",
     GRID+1 },
 #endif
   { "target-directory", 'd', "DIRECTORY", 0,
     "copy all SOURCE arguments into DIRECTORY",
     GRID+1 },
   { "from", 'f', NULL, 0,
-    "copying from remote host",
+    "copying from remote host (server use only)",
     GRID+1 },
   { "to", 't', NULL, 0,
-    "copying to remote host",
+    "copying to remote host (server use only)",
     GRID+1 },
 #if defined WITH_ORCMD_AF || defined WITH_RCMD_AF
   { "ipv4", '4', NULL, 0,
@@ -190,24 +208,24 @@ parse_opt (int key, char *arg, struct argp_state *state)
       break;
 #endif /* WITH_ORCMD_AF || WITH_RCMD_AF */
 
-#ifdef KERBEROS
+#if defined KERBEROS || defined SHISHI
     case 'K':
       use_kerberos = 0;
       break;
-#endif
 
-#ifdef KERBEROS
     case 'k':
       dest_realm = arg;
       break;
-#endif
 
-#ifdef CRYPT
+# ifdef ENCRYPTION
     case 'x':
       doencrypt = 1;
-      /* des_set_key(cred.session, schedule); */
+#  ifdef KERBEROS
+      des_set_key(cred.session, schedule);
+#  endif
       break;
-#endif
+# endif /* ENCRYPTION */
+#endif /* KERBEROS || SHISHI */
 
     case 'p':
       preserve_option = 1;
@@ -256,10 +274,11 @@ int errs, rem;
 
 char *command;
 
-#ifdef KERBEROS
+#if defined KERBEROS || defined SHISHI
 int kerberos (char **, char *, char *, char *);
 void oldw (const char *, ...);
-#endif
+#endif /* KERBEROS || SHISHI */
+
 int response (void);
 void rsource (char *, struct stat *);
 void sink (int, char *[]);
@@ -283,13 +302,13 @@ main (int argc, char *argv[])
   argc -= index;
   argv += index;
 
-#ifdef KERBEROS
+#if defined KERBEROS || defined SHISHI
   if (use_kerberos)
     {
-# ifdef CRYPT
+# if defined ENCRYPTION && defined KERBEROS
       shell = doencrypt ? "ekshell" : "kshell";
 # else
-      shell = "kshell";
+      shell = "kshell";		/* Libshishi uses a single service.  */
 # endif
       if ((sp = getservbyname (shell, "tcp")) == NULL)
 	{
@@ -300,7 +319,7 @@ main (int argc, char *argv[])
     }
   else
     sp = getservbyname (shell = "shell", "tcp");
-#else
+#else /* !KERBEROS && !SHISHI */
   sp = getservbyname (shell = "shell", "tcp");
 #endif
   if (sp == NULL)
@@ -333,23 +352,28 @@ main (int argc, char *argv[])
   if (argc > 2)
     targetshouldbedirectory = 1;
 
-#ifndef KERBEROS
+#if defined KERBEROS || defined SHISHI
+  if (doencrypt && !use_kerberos)
+    error (EXIT_FAILURE, 0, "encryption must use Kerberos");
+#endif
+
+#if !defined KERBEROS && !defined SHISHI
   /* We must be setuid root.  */
   if (geteuid ())
     error (EXIT_FAILURE, 0, "must be setuid root.");
 #endif
 
   /* Command to be executed on remote system using "rsh". */
-#ifdef	KERBEROS
+#if defined KERBEROS || defined SHISHI
   rc = asprintf (&command, "rcp%s%s%s%s", iamrecursive ? " -r" : "",
-# ifdef CRYPT
+# ifdef ENCRYPTION
 		 (doencrypt && use_kerberos ? " -x" : ""),
-# else
+# else /* No encryption */
 		 "",
 # endif
 		 preserve_option ? " -p" : "",
 		 targetshouldbedirectory ? " -d" : "");
-#else
+#else /* !KERBEROS && !SHISHI */
   rc = asprintf (&command, "rcp%s%s%s",
 		 iamrecursive ? " -r" : "", preserve_option ? " -p" : "",
 		 targetshouldbedirectory ? " -d" : "");
@@ -360,7 +384,7 @@ main (int argc, char *argv[])
   rem = -1;
   signal (SIGPIPE, lostconn);
 
-  targ = colon (argv[argc - 1]);	/* Dest is remote host. */
+  targ = colon (argv[argc - 1]);
   if (targ)			/* Dest is remote host. */
     toremote (targ, argc, argv);
   else
@@ -447,12 +471,12 @@ toremote (char *targ, int argc, char *argv[])
 	      if (asprintf (&bp, "%s -t %s", command, targ) < 0)
 		xalloc_die ();
 	      host = thost;
-#ifdef KERBEROS
+#if defined KERBEROS || defined SHISHI
 	      if (use_kerberos)
 		rem = kerberos (&host, bp, pwd->pw_name,
 				tuser ? tuser : pwd->pw_name);
 	      else
-#endif
+#endif /* KERBEROS || SHISHI */
 #ifdef WITH_ORCMD_AF
 		rem = orcmd_af (&host, port, pwd->pw_name,
 				tuser ? tuser : pwd->pw_name,
@@ -486,6 +510,12 @@ toremote (char *targ, int argc, char *argv[])
 	      setuid (userid);
 	    }
 	  source (1, argv + i);
+	  close (rem);
+	  rem = -1;
+#ifdef SHISHI
+	  if (use_kerberos)
+	    shishi_done (h);
+#endif
 	}
     }
 }
@@ -508,7 +538,8 @@ tolocal (int argc, char *argv[])
 	    strlen (argv[argc - 1]) + 20;
 	  if (asprintf (&bp, "exec %s%s%s %s %s",
 			PATH_CP,
-			iamrecursive ? " -r" : "", preserve_option ? " -p" : "",
+			iamrecursive ? " -r" : "",
+			preserve_option ? " -p" : "",
 			argv[i], argv[argc - 1]) < 0)
 	    xalloc_die ();
 	  if (susystem (bp, userid))
@@ -535,17 +566,19 @@ tolocal (int argc, char *argv[])
 	}
       if (asprintf (&bp, "%s -f %s", command, src) < 0)
 	xalloc_die ();
-      rem =
-#ifdef KERBEROS
-	use_kerberos ? kerberos (&host, bp, pwd->pw_name, suser) :
+
+#if defined KERBEROS || defined SHISHI
+      if (use_kerberos)
+	rem = kerberos (&host, bp, pwd->pw_name, suser);
+      else
 #elif defined WITH_ORCMD_AF
-	orcmd_af (&host, port, pwd->pw_name, suser, bp, 0, family);
+	rem = orcmd_af (&host, port, pwd->pw_name, suser, bp, 0, family);
 #elif defined WITH_RCMD_AF
-	rcmd_af (&host, port, pwd->pw_name, suser, bp, 0, family);
+	rem = rcmd_af (&host, port, pwd->pw_name, suser, bp, 0, family);
 #elif defined WITH_ORCMD
-	orcmd (&host, port, pwd->pw_name, suser, bp, 0);
+	rem = orcmd (&host, port, pwd->pw_name, suser, bp, 0);
 #else /* !WITH_ORCMD_AF && !WITH_RCMD_AF && !WITH_ORCMD */
-	rcmd (&host, port, pwd->pw_name, suser, bp, 0);
+	rem = rcmd (&host, port, pwd->pw_name, suser, bp, 0);
 #endif
       free (bp);
       if (rem < 0)
@@ -568,6 +601,10 @@ tolocal (int argc, char *argv[])
       seteuid (0);
       close (rem);
       rem = -1;
+#ifdef SHISHI
+      if (use_kerberos)
+	shishi_done (h);
+#endif
     }
 }
 
@@ -1057,34 +1094,56 @@ screwup:
   exit (EXIT_FAILURE);
 }
 
-#ifdef KERBEROS
+#if defined KERBEROS || defined SHISHI
 int
 kerberos (char **host, char *bp, char *locuser, char *user)
 {
+  int krb_errno = 0;
   struct servent *sp;
 
 again:
   if (use_kerberos)
     {
-      rem = KSUCCESS;
       errno = 0;
+# ifdef KERBEROS
+      rem = KSUCCESS;
       if (dest_realm == NULL)
 	dest_realm = krb_realmofhost (*host);
-      rem =
-# ifdef CRYPT
-	doencrypt ?
-	krcmd_mutual (host, port, user, bp, 0, dest_realm, &cred, schedule) :
+# elif defined SHISHI
+      rem = SHISHI_OK;
 # endif
-	krcmd (host, port, user, bp, 0, dest_realm);
+# ifdef ENCRYPTION
+      if (doencrypt)
+	{
+#  ifdef KERBEROS
+	  rem = krcmd_mutual (host, port, user, bp, 0, dest_realm,
+			      &cred, schedule) :
+#  elif defined SHISHI
+	  /* Not yet supported.  */
+	  rem = -1; /* krcmd_mutual () */
+	  errno = ENOENT;
+#  endif
+	  krb_errno = errno;
+	}
+      else
+# endif /* ENCRYPTION */
+	{
+# ifdef KERBEROS
+	  rem = krcmd (host, port, user, bp, 0, dest_realm);
+# else /* SHISHI */
+	  rem = krcmd (&h, host, port, &user, bp, NULL, dest_realm, family);
+# endif
+	  krb_errno = errno;
+	}
 
       if (rem < 0)
 	{
 	  use_kerberos = 0;
 	  if ((sp = getservbyname ("shell", "tcp")) == NULL)
 	    error (EXIT_FAILURE, 0, "unknown service shell/tcp");
-	  if (errno == ECONNREFUSED)
+	  if (krb_errno == ECONNREFUSED)
 	    oldw ("remote host doesn't support Kerberos");
-	  else if (errno == ENOENT)
+	  else if (krb_errno == ENOENT)
 	    oldw ("can't provide Kerberos authentication data");
 	  port = sp->s_port;
 	  goto again;
@@ -1092,7 +1151,7 @@ again:
     }
   else
     {
-# ifdef CRYPT
+# ifdef ENCRYPTION
       if (doencrypt)
 	error (EXIT_FAILURE, 0, "the -x option requires Kerberos authentication");
 # endif
@@ -1108,7 +1167,7 @@ again:
     }
   return rem;
 }
-#endif /* KERBEROS */
+#endif /* KERBEROS || SHISHI */
 
 int
 response (void)
@@ -1145,7 +1204,7 @@ response (void)
     }
 }
 
-#ifdef KERBEROS
+#if defined KERBEROS || defined SHISHI
 void
 oldw (const char *fmt, ...)
 {
@@ -1157,7 +1216,7 @@ oldw (const char *fmt, ...)
   fprintf (stderr, ", using standard rcp\n");
   va_end (ap);
 }
-#endif
+#endif /* KERBEROS || SHISHI */
 
 void
 run_err (const char *fmt, ...)
diff --git a/src/rsh.c b/src/rsh.c
index 08ea480..d2dbe99 100644
--- a/src/rsh.c
+++ b/src/rsh.c
@@ -102,15 +102,14 @@ sa_family_t family = AF_UNSPEC;
 
 #if defined KERBEROS || defined SHISHI
 int use_kerberos = 1, doencrypt;
-# ifdef KERBEROS
 char *dest_realm = NULL;
+
+# ifdef KERBEROS
 CREDENTIALS cred;
 Key_schedule schedule;
 extern char *krb_realmofhost ();
 
 # elif defined(SHISHI)
-char *dest_realm = NULL;
-
 Shishi *h;
 Shishi_key *enckey;
 shishi_ivector iv1, iv2, iv3, iv4;
@@ -155,7 +154,7 @@ static struct argp_option options[] = {
     "obtain tickets for the remote host in REALM "
     "instead of the remote host's realm" },
   { "encrypt", 'x', NULL, 0,
-    "encrypt all data using DES" },
+    "encrypt all data transfer" },
 #endif
 #if defined WITH_ORCMD_AF || defined WITH_RCMD_AF
   { "ipv4", '4', NULL, 0, "use only IPv4" },
@@ -195,9 +194,7 @@ parse_opt (int key, char *arg, struct argp_state *state)
     case 'K':
       use_kerberos = 0;
       break;
-#endif
 
-#if defined KERBEROS || defined SHISHI
     case 'k':
       dest_realm = arg;
       break;
@@ -210,7 +207,7 @@ parse_opt (int key, char *arg, struct argp_state *state)
 #  endif
       break;
 # endif
-#endif
+#endif /* KERBEROS || SHISHI */
 
     case 'n':
       null_input_option = 1;
@@ -655,8 +652,8 @@ talk (int null_input_option, sigset_t * osigs, pid_t pid, int rem)
 	{
 	  errno = 0;
 #ifdef KERBEROS
-# ifdef CRYPT
-	  if (doenencryption)
+# ifdef ENCRYPTION
+	  if (doencrypt)
 	    cc = des_read (rfd2, buf, sizeof buf);
 	  else
 # endif

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


commit 81acda2919c5e4507dba0ceaa2565adc55524d57
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Mon Jul 23 01:11:40 2012 +0200

    rcp, rlogin, rlogind: IP_TOS mending.

diff --git a/ChangeLog b/ChangeLog
index 51ae8f9..b71678d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2012-07-23  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	rcp, rlogin, rlogind: IP_TOS mending.
+
+	* src/rcp.c (toremote, tolocal)
+	[IP_TOS && IPPROTO_IP && IPTOS_THROUGHPUT]: New variables
+	SS and SSLEN.  Call getpeername() to determine domain and
+	call setsockopt(IP_TOS) only for family AF_INET.
+	* src/rlogin.c (main): Likewise.
+	* src/rlogind.c (rlogind_mainloop)
+	[IP_TOS && IPPROTO_IP && IPTOS_THROUGHPUT]: Set socket
+	option IP_TOS only for family AF_INET.
+
 2012-07-22  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	rlogin, rsh: Find official host name.
diff --git a/src/rcp.c b/src/rcp.c
index f5d5e67..540f8e6 100644
--- a/src/rcp.c
+++ b/src/rcp.c
@@ -377,6 +377,10 @@ toremote (char *targ, int argc, char *argv[])
 {
   int i, tos;
   char *bp, *host, *src, *suser, *thost, *tuser;
+#if defined IP_TOS && defined IPPROTO_IP && defined IPTOS_THROUGHPUT
+  struct sockaddr_storage ss;
+  socklen_t sslen;
+#endif
 
   *targ++ = 0;
   if (*targ == 0)
@@ -467,8 +471,11 @@ toremote (char *targ, int argc, char *argv[])
 	      if (rem < 0)
 		exit (EXIT_FAILURE);
 #if defined IP_TOS && defined IPPROTO_IP && defined IPTOS_THROUGHPUT
+	      sslen = sizeof (ss);
+	      (void) getpeername (rem, (struct sockaddr *) &ss, &sslen);
 	      tos = IPTOS_THROUGHPUT;
-	      if (setsockopt (rem, IPPROTO_IP, IP_TOS,
+	      if (ss.ss_family == AF_INET &&
+		  setsockopt (rem, IPPROTO_IP, IP_TOS,
 			      (char *) &tos, sizeof (int)) < 0)
 		if (errno != ENOPROTOOPT)
 		  error (0, errno, "TOS (ignored)");
@@ -488,6 +495,10 @@ tolocal (int argc, char *argv[])
 {
   int i, len, tos;
   char *bp, *host, *src, *suser;
+#if defined IP_TOS && defined IPPROTO_IP && defined IPTOS_THROUGHPUT
+  struct sockaddr_storage ss;
+  socklen_t sslen;
+#endif
 
   for (i = 0; i < argc - 1; i++)
     {
@@ -544,9 +555,12 @@ tolocal (int argc, char *argv[])
 	}
       seteuid (userid);
 #if defined IP_TOS && defined IPPROTO_IP && defined IPTOS_THROUGHPUT
+      sslen = sizeof (ss);
+      (void) getpeername (rem, (struct sockaddr *) &ss, &sslen);
       tos = IPTOS_THROUGHPUT;
-      if (setsockopt (rem, IPPROTO_IP, IP_TOS, (char *) &tos, sizeof (int)) <
-	  0)
+      if (ss.ss_family == AF_INET &&
+	  setsockopt (rem, IPPROTO_IP, IP_TOS,
+		      (char *) &tos, sizeof (int)) < 0)
 	if (errno != ENOPROTOOPT)
 	  error (0, errno, "TOS (ignored)");
 #endif
diff --git a/src/rlogin.c b/src/rlogin.c
index 0ee1f1a..a7cea19 100644
--- a/src/rlogin.c
+++ b/src/rlogin.c
@@ -596,8 +596,14 @@ try_connect:
 
 #if defined IP_TOS && defined IPPROTO_IP && defined IPTOS_LOWDELAY
   {
+    struct sockaddr_storage ss;
+    socklen_t sslen = sizeof (ss);
     int one = IPTOS_LOWDELAY;
-    if (setsockopt (rem, IPPROTO_IP, IP_TOS, (char *) &one, sizeof (int)) < 0)
+
+    (void) getpeername (rem, (struct sockaddr *) &ss, &sslen);
+    if (ss.ss_family == AF_INET &&
+	setsockopt (rem, IPPROTO_IP, IP_TOS,
+		    (char *) &one, sizeof (int)) < 0)
       error (0, errno, "setsockopt TOS (ignored)");
   }
 #endif
diff --git a/src/rlogind.c b/src/rlogind.c
index 4340dcf..b5d8ea6 100644
--- a/src/rlogind.c
+++ b/src/rlogind.c
@@ -867,7 +867,9 @@ rlogind_mainloop (int infd, int outfd)
 
 #if defined IP_TOS && defined IPPROTO_IP && defined IPTOS_LOWDELAY
   true = IPTOS_LOWDELAY;
-  if (setsockopt (infd, IPPROTO_IP, IP_TOS, (char *) &true, sizeof true) < 0)
+  if (auth_data.from.ss_family == AF_INET &&
+      setsockopt (infd, IPPROTO_IP, IP_TOS,
+		  (char *) &true, sizeof true) < 0)
     syslog (LOG_WARNING, "setsockopt (IP_TOS): %m");
 #endif
 

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


commit 6c7b2815daa5e50add254d522a69a7a20c549cb1
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Sun Jul 22 01:39:24 2012 +0200

    rlogin, rsh: Host lookup.

diff --git a/ChangeLog b/ChangeLog
index f64e91c..51ae8f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2012-07-22  Mats Erik Andersson  <gnu@gisladisker.se>
 
+	rlogin, rsh: Find official host name.
+
+	* libinetutils/kcmd.c (kcmd) [HAVE_DECL_GETADDRINFO]:
+	New variable FQDN.  Establish official host name by
+	calling getnameinfo() on requested host.
+
+2012-07-22  Mats Erik Andersson  <gnu@gisladisker.se>
+
 	rsh, rlogin: Working IPv6 with libshishi.
 
 	* libinetutils/kcmd.c (kcmd) [SHISHI]: Add a
diff --git a/libinetutils/kcmd.c b/libinetutils/kcmd.c
index 0e6fe94..4b61c41 100644
--- a/libinetutils/kcmd.c
+++ b/libinetutils/kcmd.c
@@ -122,7 +122,7 @@ kcmd (Shishi ** h, int *sock, char **ahost, unsigned short rport, char *locuser,
 # endif
 # ifdef HAVE_DECL_GETADDRINFO
   struct addrinfo hints, *ai, *res;
-  char portstr[8];
+  char portstr[8], fqdn[NI_MAXHOST];
 # else /* !HAVE_DECL_GETADDRINFO */
   struct hostent *hp;
 # endif
@@ -152,10 +152,23 @@ kcmd (Shishi ** h, int *sock, char **ahost, unsigned short rport, char *locuser,
 
   ai = res;
 
-  host_save = malloc (strlen (ai->ai_canonname) + 1);
-  if (host_save == NULL)
-    return (-1);
-  strcpy (host_save, ai->ai_canonname);
+  /* Attempt back resolving into the official host name.  */
+  rc = getnameinfo (ai->ai_addr, ai->ai_addrlen, fqdn, sizeof (fqdn),
+		    NULL, 0, NI_NAMEREQD);
+  if (!rc)
+    {
+      host_save = malloc (strlen (fqdn) + 1);
+      if (host_save == NULL)
+	return (-1);
+      strcpy (host_save, fqdn);
+    }
+  else
+    {
+      host_save = malloc (strlen (ai->ai_canonname) + 1);
+      if (host_save == NULL)
+	return (-1);
+      strcpy (host_save, ai->ai_canonname);
+    }
 
 # else /* !HAVE_DECL_GETADDRINFO */
   /* Often the following rejects non-IPv4.

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


commit a78e5df5a6cb2347cc7a56c4bb98e95229026579
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Sun Jul 22 00:09:18 2012 +0200

    rlogin, rsh: IPv6 with libshishi.

diff --git a/ChangeLog b/ChangeLog
index f4f3b77..f64e91c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2012-07-22  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	rsh, rlogin: Working IPv6 with libshishi.
+
+	* libinetutils/kcmd.c (kcmd) [SHISHI]: Add a
+	parameter `int af' to signature.  Apply as
+	`hints.ai_family = af'.
+	* libinetutils/krcmd.c (kcmd) [SHISHI]: Update.
+	(krcmd) [SHISHI]: Add parameter `int af'.  Pass
+	this to kcmd().
+	(krcmd_mutual) [SHISHI]: Likewise.
+	* libinetutils/shishi_def.h (krcmd, krcmd_mutual):
+	Update signatures.
+	* src/rlogin.c (main) [SHISHI] <try_connect>:
+	Add parameter `family' to krcmd() and krcmd_mutual().
+	* src/rsh.c (main) [SHISHI] <try_connect>: Likewise.
+
 2012-07-21  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	r-commands: Partial IPv6 support.
diff --git a/libinetutils/kcmd.c b/libinetutils/kcmd.c
index 130b9e5..0e6fe94 100644
--- a/libinetutils/kcmd.c
+++ b/libinetutils/kcmd.c
@@ -102,7 +102,7 @@ int
 kcmd (Shishi ** h, int *sock, char **ahost, unsigned short rport, char *locuser,
       char **remuser, char *cmd, int *fd2p, char *service, char *realm,
       Shishi_key ** key, struct sockaddr_storage *laddr,
-      struct sockaddr_storage *faddr, long authopts)
+      struct sockaddr_storage *faddr, long authopts, int af)
 # endif
 {
   int s, timo = 1, pid;
@@ -138,7 +138,7 @@ kcmd (Shishi ** h, int *sock, char **ahost, unsigned short rport, char *locuser,
 
 # ifdef HAVE_DECL_GETADDRINFO
   memset (&hints, 0, sizeof (hints));
-  hints.ai_family = AF_UNSPEC;
+  hints.ai_family = af;
   hints.ai_socktype = SOCK_STREAM;
   hints.ai_flags = AI_CANONNAME;
   snprintf (portstr, sizeof (portstr), "%hu", ntohs (rport));
diff --git a/libinetutils/krcmd.c b/libinetutils/krcmd.c
index 08b3402..4435f0d 100644
--- a/libinetutils/krcmd.c
+++ b/libinetutils/krcmd.c
@@ -76,7 +76,8 @@
 # if defined SHISHI
 int kcmd (Shishi **, int *, char **, unsigned short, char *, char **,
 	  char *, int *, char *, char *, Shishi_key **,
-	  struct sockaddr_storage *, struct sockaddr_storage *, long);
+	  struct sockaddr_storage *, struct sockaddr_storage *,
+	  long, int);
 # else
 int kcmd (int *, char **, unsigned short, char *, char *, char *, int *,
 	  KTEXT, char *, char *, CREDENTIALS *, Key_schedule,
@@ -92,7 +93,7 @@ int kcmd (int *, char **, unsigned short, char *, char *, char *, int *,
 # if defined SHISHI
 int
 krcmd (Shishi ** h, char **ahost, unsigned short rport, char **remuser, char *cmd,
-       int *fd2p, char *realm)
+       int *fd2p, char *realm, int af)
 {
   int sock = -1, err = 0;
   long authopts = 0L;
@@ -101,7 +102,7 @@ krcmd (Shishi ** h, char **ahost, unsigned short rport, char **remuser, char *cm
 	      remuser, cmd, fd2p, SERVICE_NAME, realm, NULL,	/* key schedule not used */
 	      NULL,		/* local addr not used */
 	      NULL,		/* foreign addr not used */
-	      authopts);
+	      authopts, af);
 
   if (err > SHISHI_OK)
     {
@@ -146,7 +147,7 @@ krcmd (char **ahost, unsigned short rport, char *remuser, char *cmd, int *fd2p,
 #  if defined SHISHI
 int
 krcmd_mutual (Shishi ** h, char **ahost, unsigned short rport, char **remuser,
-	      char *cmd, int *fd2p, char *realm, Shishi_key ** key)
+	      char *cmd, int *fd2p, char *realm, Shishi_key ** key, int af)
 {
   int sock = -1, err = 0;
   struct sockaddr_storage laddr, faddr;
@@ -156,7 +157,7 @@ krcmd_mutual (Shishi ** h, char **ahost, unsigned short rport, char **remuser,
 	      remuser, cmd, fd2p, SERVICE_NAME, realm, key,	/* filled in */
 	      &laddr,		/* filled in */
 	      &faddr,		/* filled in */
-	      authopts);
+	      authopts, af);
 
   if (err > SHISHI_OK)
     {
diff --git a/libinetutils/shishi_def.h b/libinetutils/shishi_def.h
index bd8b9d6..4970cd9 100644
--- a/libinetutils/shishi_def.h
+++ b/libinetutils/shishi_def.h
@@ -71,10 +71,11 @@ extern int writeenc (Shishi * h, int sock, char *buf, int wlen, int *len,
 		     shishi_ivector * iv, Shishi_key * enckey, int proto);
 
 extern int krcmd (Shishi ** h, char **ahost, unsigned short rport,
-		  char **remuser, char *cmd, int *fd2p, char *realm);
+		  char **remuser, char *cmd, int *fd2p,
+		  char *realm, int af);
 
 extern int krcmd_mutual (Shishi ** h, char **ahost, unsigned short rport,
 			 char **remuser, char *cmd, int *fd2p, char *realm,
-			 Shishi_key ** key);
+			 Shishi_key ** key, int af);
 
 #endif
diff --git a/src/rlogin.c b/src/rlogin.c
index f240352..0ee1f1a 100644
--- a/src/rlogin.c
+++ b/src/rlogin.c
@@ -472,7 +472,7 @@ try_connect:
 	  int i;
 
 	  rem = krcmd_mutual (&handle, &host, sp->s_port, &user, term, 0,
-			      dest_realm, &key);
+			      dest_realm, &key, family);
 	  if (rem > 0)
 	    {
 	      keytype = shishi_key_type (key);
@@ -523,7 +523,7 @@ try_connect:
 	}
 
       else
-#  else
+#  else /* KERBEROS */
 	rem = krcmd_mutual (&host, sp->s_port, user, term, 0,
 			    dest_realm, &cred, schedule);
       else
@@ -531,8 +531,9 @@ try_connect:
 # endif	/* CRYPT */
 
 # if defined SHISHI
-	rem = krcmd (&handle, &host, sp->s_port, &user, term, 0, dest_realm);
-# else
+	rem = krcmd (&handle, &host, sp->s_port, &user, term, 0,
+		     dest_realm, family);
+# else /* KERBEROS */
 	rem = krcmd (&host, sp->s_port, user, term, 0, dest_realm);
 # endif
       if (rem < 0)
diff --git a/src/rsh.c b/src/rsh.c
index 50c2a0a..08ea480 100644
--- a/src/rsh.c
+++ b/src/rsh.c
@@ -360,7 +360,7 @@ try_connect:
       krb_errno = 0;
       if (dest_realm == NULL)
 	dest_realm = krb_realmofhost (host);
-# elif defined (SHISHI)
+# elif defined SHISHI
       rem = SHISHI_OK;
       krb_errno = 0;
 # endif
@@ -377,7 +377,7 @@ try_connect:
 	  strcat (term, args);
 
 	  rem = krcmd_mutual (&h, &host, sp->s_port, &user, term, &rfd2,
-			      dest_realm, &enckey);
+			      dest_realm, &enckey, family);
 	  krb_errno = errno;
 	  if (rem > 0)
 	    {
@@ -444,7 +444,8 @@ try_connect:
 # endif
 	{
 # if defined SHISHI
-	  rem = krcmd (&h, &host, sp->s_port, &user, args, &rfd2, dest_realm);
+	  rem = krcmd (&h, &host, sp->s_port, &user, args, &rfd2,
+		       dest_realm, family);
 # else /* KERBEROS */
 	  rem = krcmd (&host, sp->s_port, user, args, &rfd2, dest_realm);
 # endif

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


commit 598e9a9ecf2563c78d1477019a9c68a7edf80771
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Sat Jul 21 20:12:22 2012 +0200

    r-commands: Partial IPv6 support.

diff --git a/ChangeLog b/ChangeLog
index 2d5c619..f4f3b77 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+2012-07-21  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	r-commands: Partial IPv6 support.
+	Adapt host resolution to cope with IPv6,
+	in particular for libshishi related code.
+
+	* libinetutils/kcmd.c (getport): New signature
+	`(int *, int)', adding address family parameter.
+	Update code to use `struct sockaddr_storage'.
+	New variable LEN.
+	(kcmd): New alternate code using getaddrinfo(),
+	instead of gethostbyname().
+	[HAVE_DECL_GETADDRINFO]: New variables HINTS, AI, RES.
+
+	* libinetutils/shishi_def.h <struct auth_data>: Changed
+	type of FROM to `struct sockaddr_storage'.
+	* src/rlogind.c <struct auth_data> [!SHISHI]: Likewise.
+	(rlogind_auth): New variables ADDRP, PORT.  Adapt to new
+	type of `auth_data.from'.
+	[!KERBEROS]: Accept families AF_INET and AF_INET6.
+	(rlogind_mainloop): Adapt to new `auth_data.from'.
+	(do_rlogin): Likewise.
+	[WITH_IRUSEROK_AF || WITH_IRUSEROK]: New variable ADDRP.
+	(do_shishi_login): New type `struct sockaddr_storage'
+	for SOCK.
+
 2012-07-18  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	rlogin: Close libshishi handle.
diff --git a/libinetutils/kcmd.c b/libinetutils/kcmd.c
index c3f079e..130b9e5 100644
--- a/libinetutils/kcmd.c
+++ b/libinetutils/kcmd.c
@@ -88,7 +88,7 @@
 
 # define START_PORT	5120	/* arbitrary */
 
-int getport (int *);
+int getport (int *, int);
 
 # if defined KERBEROS
 int
@@ -120,7 +120,12 @@ kcmd (Shishi ** h, int *sock, char **ahost, unsigned short rport, char *locuser,
 # else
   int lport = START_PORT;
 # endif
+# ifdef HAVE_DECL_GETADDRINFO
+  struct addrinfo hints, *ai, *res;
+  char portstr[8];
+# else /* !HAVE_DECL_GETADDRINFO */
   struct hostent *hp;
+# endif
   int rc;
   char *host_save;
   int status;
@@ -131,7 +136,29 @@ kcmd (Shishi ** h, int *sock, char **ahost, unsigned short rport, char *locuser,
 
   pid = getpid ();
 
-  /* FIXME: Often the following rejects non-IPv4.
+# ifdef HAVE_DECL_GETADDRINFO
+  memset (&hints, 0, sizeof (hints));
+  hints.ai_family = AF_UNSPEC;
+  hints.ai_socktype = SOCK_STREAM;
+  hints.ai_flags = AI_CANONNAME;
+  snprintf (portstr, sizeof (portstr), "%hu", ntohs (rport));
+
+  rc = getaddrinfo (*ahost, portstr, &hints, &res);
+  if (rc)
+    {
+      fprintf (stderr, "kcmd: host %s: %s\n", *ahost, gai_strerror (rc));
+      return (-1);
+    }
+
+  ai = res;
+
+  host_save = malloc (strlen (ai->ai_canonname) + 1);
+  if (host_save == NULL)
+    return (-1);
+  strcpy (host_save, ai->ai_canonname);
+
+# else /* !HAVE_DECL_GETADDRINFO */
+  /* Often the following rejects non-IPv4.
    * This is dependent on system implementation.  */
   hp = gethostbyname (*ahost);
   if (hp == NULL)
@@ -144,6 +171,8 @@ kcmd (Shishi ** h, int *sock, char **ahost, unsigned short rport, char *locuser,
   if (host_save == NULL)
     return -1;
   strcpy (host_save, hp->h_name);
+# endif /* !HAVE_DECL_GETADDRINFO */
+
   *ahost = host_save;
 
 # ifdef KERBEROS
@@ -161,7 +190,11 @@ kcmd (Shishi ** h, int *sock, char **ahost, unsigned short rport, char *locuser,
 # endif /* !HAVE_SIGACTION */
   for (;;)
     {
-      s = getport (&lport);
+# ifdef HAVE_DECL_GETADDRINFO
+      s = getport (&lport, ai->ai_family);
+# else /* !HAVE_DECL_GETADDRINFO */
+      s = getport (&lport, hp->h_addrtype);
+# endif
       if (s < 0)
 	{
 	  if (errno == EAGAIN)
@@ -176,14 +209,19 @@ kcmd (Shishi ** h, int *sock, char **ahost, unsigned short rport, char *locuser,
 	  return (-1);
 	}
       fcntl (s, F_SETOWN, pid);
+
+# ifdef HAVE_DECL_GETADDRINFO
+      len = ai->ai_addrlen;
+      memcpy (&sin, ai->ai_addr, ai->ai_addrlen);
+# else /* !HAVE_DECL_GETADDRINFO */
       sin.ss_family = hp->h_addrtype;
       switch (hp->h_addrtype)
 	{
 	case AF_INET6:
 	  len = sizeof (struct sockaddr_in6);
-#ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
+#  ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
 	  sin.ss_len = len;
-#endif
+#  endif
 	  memcpy (&((struct sockaddr_in6 *) &sin)->sin6_addr,
 		  hp->h_addr, hp->h_length);
 	  ((struct sockaddr_in6 *) &sin)->sin6_port = rport;
@@ -191,13 +229,14 @@ kcmd (Shishi ** h, int *sock, char **ahost, unsigned short rport, char *locuser,
 	case AF_INET:
 	default:
 	  len = sizeof (struct sockaddr_in);
-#ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
+#  ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
 	  sin.ss_len = len;
-#endif
+#  endif
 	  memcpy (&((struct sockaddr_in *) &sin)->sin_addr,
 		  hp->h_addr, hp->h_length);
 	  ((struct sockaddr_in *) &sin)->sin_port = rport;
 	}
+# endif /* !HAVE_DECL_GETADDRINFO */
 
       if (connect (s, (struct sockaddr *) &sin, len) >= 0)
 	break;
@@ -217,11 +256,28 @@ kcmd (Shishi ** h, int *sock, char **ahost, unsigned short rport, char *locuser,
 	  continue;
 	}
 # if ! defined ultrix || defined sun
+#  ifdef HAVE_DECL_GETADDRINFO
+      if (ai->ai_next)
+#  else /* !HAVE_DECL_GETADDRINFO */
       if (hp->h_addr_list[1] != NULL)
+#  endif
 	{
 	  int oerrno = errno;
 	  char addrstr[INET6_ADDRSTRLEN];
 
+#  ifdef HAVE_DECL_GETADDRINFO
+	  getnameinfo (ai->ai_addr, ai->ai_addrlen,
+		       addrstr, sizeof (addrstr), NULL, 0,
+		       NI_NUMERICHOST);
+	  fprintf (stderr, "kcmd: connect to address %s: ", addrstr);
+	  errno = oerrno;
+	  perror (NULL);
+	  ai = ai->ai_next;
+	  getnameinfo (ai->ai_addr, ai->ai_addrlen,
+		       addrstr, sizeof (addrstr), NULL, 0,
+		       NI_NUMERICHOST);
+	  fprintf (stderr, "Trying %s...\n", addrstr);
+#  else /* !HAVE_DECL_GETADDRINFO */
 	  fprintf (stderr, "kcmd: connect to address %s: ",
 		   inet_ntop (hp->h_addrtype, hp->h_addr_list[0],
 			      addrstr, sizeof (addrstr)));
@@ -231,11 +287,20 @@ kcmd (Shishi ** h, int *sock, char **ahost, unsigned short rport, char *locuser,
 	  fprintf (stderr, "Trying %s...\n",
 		   inet_ntop (hp->h_addrtype, hp->h_addr_list[0],
 			      addrstr, sizeof (addrstr)));
+#  endif /* !HAVE_DECL_GETADDRINFO */
 	  continue;
 	}
 # endif	/* !(defined(ultrix) || defined(sun)) */
+# ifdef HAVE_DECL_GETADDRINFO
+      if (errno != ECONNREFUSED)
+	perror (res->ai_canonname);
+
+      if (res)
+	freeaddrinfo (res);
+# else /* !HAVE_DECL_GETADDRINFO */
       if (errno != ECONNREFUSED)
 	perror (hp->h_name);
+# endif
 
 # if HAVE_SIGACTION
       sigprocmask (SIG_SETMASK, &osigs, NULL);
@@ -245,6 +310,11 @@ kcmd (Shishi ** h, int *sock, char **ahost, unsigned short rport, char *locuser,
 
       return (-1);
     }
+# ifdef HAVE_DECL_GETADDRINFO
+  if (res)
+    freeaddrinfo (res);
+#endif
+
   lport--;
   if (fd2p == 0)
     {
@@ -256,7 +326,7 @@ kcmd (Shishi ** h, int *sock, char **ahost, unsigned short rport, char *locuser,
       char num[8];
       int port, s2, s3;
 
-      s2 = getport (&lport);
+      s2 = getport (&lport, sin.ss_family);
       len = sizeof (from);
 
       if (s2 < 0)
@@ -403,23 +473,38 @@ bad:
 }
 
 int
-getport (int *alport)
+getport (int *alport, int af)
 {
-  struct sockaddr_in sin;
+  struct sockaddr_storage sin;
+  socklen_t len;
   int s;
 
-  sin.sin_family = AF_INET;
-#ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
-  sin.sin_len = sizeof (sin);
-#endif
-  sin.sin_addr.s_addr = INADDR_ANY;
-  s = socket (sin.sin_family, SOCK_STREAM, 0);
+  memset (&sin, 0, sizeof (sin));
+  sin.ss_family = af;
+  len = (af == AF_INET6) ? sizeof (struct sockaddr_in6)
+	: sizeof (struct sockaddr_in);
+# ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
+  sin.ss_len = len;
+# endif
+
+  s = socket (sin.ss_family, SOCK_STREAM, 0);
   if (s < 0)
     return (-1);
   for (;;)
     {
-      sin.sin_port = htons ((unsigned short) * alport);
-      if (bind (s, (struct sockaddr *) &sin, sizeof (sin)) >= 0)
+      switch (af)
+	{
+	case AF_INET6:
+	  ((struct sockaddr_in6 *) &sin)->sin6_port =
+		htons ((unsigned short) * alport);
+	  break;
+	case AF_INET:
+	default:
+	  ((struct sockaddr_in *) &sin)->sin_port =
+		htons ((unsigned short) * alport);
+	}
+
+      if (bind (s, (struct sockaddr *) &sin, len) >= 0)
 	return (s);
       if (errno != EADDRINUSE)
 	{
diff --git a/libinetutils/shishi_def.h b/libinetutils/shishi_def.h
index 71ef2d7..bd8b9d6 100644
--- a/libinetutils/shishi_def.h
+++ b/libinetutils/shishi_def.h
@@ -36,7 +36,7 @@ typedef struct shishi_iv shishi_ivector;
 
 struct auth_data
 {
-  struct sockaddr_in from;
+  struct sockaddr_storage from;
   socklen_t fromlen;
   char *hostaddr;
   char *hostname;
diff --git a/src/rlogind.c b/src/rlogind.c
index f463f44..4340dcf 100644
--- a/src/rlogind.c
+++ b/src/rlogind.c
@@ -144,7 +144,7 @@ extern int __check_rhosts_file;
 #ifndef SHISHI
 struct auth_data
 {
-  struct sockaddr_in from;
+  struct sockaddr_storage from;
   socklen_t fromlen;
   char *hostaddr;
   char *hostname;
@@ -442,6 +442,7 @@ main (int argc, char *argv[])
   return 0;
 }
 
+/* FIXME: Migrate to IPv6 supported listener.  */
 
 void
 rlogin_daemon (int maxchildren, int port)
@@ -546,7 +547,7 @@ rlogin_daemon (int maxchildren, int port)
 int
 rlogind_auth (int fd, struct auth_data *ap)
 {
-#if defined HAVE_DECL_GETNAMEINFO || defined HAVE_DECL_GETADDRINFO
+#if defined HAVE_DECL_GETNAMEINFO && defined HAVE_DECL_GETADDRINFO
   int rc;
   char hoststr[NI_MAXHOST];
 #else
@@ -554,11 +555,25 @@ rlogind_auth (int fd, struct auth_data *ap)
 #endif
   char *hostname;
   int authenticated = 0;
+  void * addrp;
+  int port;
 
 #ifdef SHISHI
   int len, c;
 #endif
 
+  switch (ap->from.ss_family)
+    {
+    case AF_INET6:
+      addrp = (void *) &((struct sockaddr_in6 *) &ap->from)->sin6_addr;
+      port = ntohs (((struct sockaddr_in6 *) &ap->from)->sin6_port);
+      break;
+    case AF_INET:
+    default:
+      addrp = (void *) &((struct sockaddr_in *) &ap->from)->sin_addr;
+      port = ntohs (((struct sockaddr_in *) &ap->from)->sin_port);
+    }
+
   confirmed = 0;
 
   /* Check the remote host name */
@@ -568,8 +583,17 @@ rlogind_auth (int fd, struct auth_data *ap)
   if (!rc)
     hostname = hoststr;
 #else /* !HAVE_DECL_GETNAMEINFO */
-  hp = gethostbyaddr ((char *) &ap->from.sin_addr, sizeof (struct in_addr),
-		      ap->from.sin_family);
+  switch (ap->from.ss_family)
+    {
+    case AF_INET6:
+      hp = gethostbyaddr (addrp, sizeof (struct in6_addr),
+			  ap->from.ss_family);
+      break;
+    case AF_INET:
+    default:
+      hp = gethostbyaddr (addrp, sizeof (struct in_addr),
+			  ap->from.ss_family);
+    }
   if (hp)
     hostname = hp->h_name;
 #endif /* !HAVE_DECL_GETNAMEINFO */
@@ -591,7 +615,7 @@ rlogind_auth (int fd, struct auth_data *ap)
       char astr[INET6_ADDRSTRLEN];
 
       memset (&hints, 0, sizeof (hints));
-      hints.ai_family = ap->from.sin_family;
+      hints.ai_family = ap->from.ss_family;
       hints.ai_socktype = SOCK_STREAM;
 
       rc = getaddrinfo (ap->hostname, NULL, &hints, &res);
@@ -615,8 +639,7 @@ rlogind_auth (int fd, struct auth_data *ap)
 	{
 	  if (hp->h_addr_list[0] == NULL)
 	    break;
-	  match = memcmp (hp->h_addr_list[0], &ap->from.sin_addr,
-			  sizeof (ap->from.sin_addr)) == 0;
+	  match = memcmp (hp->h_addr_list[0], addrp, hp->h_length) == 0;
 	}
 #endif /* !HAVE_DECL_GETADDRINFO */
       if (!match)
@@ -638,15 +661,17 @@ rlogind_auth (int fd, struct auth_data *ap)
       else
 	fatal (fd, err_msg, 0);
       write (fd, &c, 1);
-      confirmed = 1;		/* we sent the null! */
+      confirmed = 1;		/* We have sent the null!  */
     }
   else
 #endif
     {
-      int port = ntohs (ap->from.sin_port);
-
-      if (ap->from.sin_family != AF_INET ||
-	  port >= IPPORT_RESERVED || port < IPPORT_RESERVED / 2)
+      if ((ap->from.ss_family != AF_INET
+#ifndef KERBEROS
+	   && ap->from.ss_family != AF_INET6
+#endif
+	  )
+	  || port >= IPPORT_RESERVED || port < IPPORT_RESERVED / 2)
 	{
 	  syslog (LOG_NOTICE, "Connection from %s on illegal port %d",
 		  ap->hostaddr, port);
@@ -818,7 +843,10 @@ rlogind_mainloop (int infd, int outfd)
       fatal (outfd, "Can't get peer name of remote host", 1);
     }
 
-  reply = inet_ntop (auth_data.from.sin_family, &auth_data.from.sin_addr,
+  reply = inet_ntop (auth_data.from.ss_family,
+		     (auth_data.from.ss_family == AF_INET6)
+		       ? (void *) &((struct sockaddr_in6 *) &auth_data.from)->sin6_addr
+		       : (void *) &((struct sockaddr_in *) &auth_data.from)->sin_addr,
 		     addrstr, sizeof (addrstr));
   if (reply == NULL)
     {
@@ -828,7 +856,9 @@ rlogind_mainloop (int infd, int outfd)
   auth_data.hostaddr = xstrdup (addrstr);
 
   syslog (LOG_INFO, "Connect from %s:%d", auth_data.hostaddr,
-	  ntohs (auth_data.from.sin_port));
+	  (auth_data.from.ss_family == AF_INET6)
+	  ? ntohs (((struct sockaddr_in6 *) &auth_data.from)->sin6_port)
+	  : ntohs (((struct sockaddr_in *) &auth_data.from)->sin_port));
 
   true = 1;
   if (keepalive
@@ -923,6 +953,19 @@ do_rlogin (int infd, struct auth_data *ap)
 {
   struct passwd *pwd;
   int rc;
+#if defined WITH_IRUSEROK_AF || defined WITH_IRUSEROK
+  void *addrp;
+
+  switch (ap->from.ss_family)
+    {
+    case AF_INET6:
+      addrp = (void *) &((struct sockaddr_in6 *) &ap->from)->sin6_addr;
+      break;
+    case AF_INET:
+    default:
+      addrp = (void *) &((struct sockaddr_in *) &ap->from)->sin_addr;
+    }
+#endif /* WITH_IRUSEROK_AF || WITH_IRUSEROK */
 
   getstr (infd, &ap->rusername, NULL);
   getstr (infd, &ap->lusername, NULL);
@@ -946,10 +989,10 @@ do_rlogin (int infd, struct auth_data *ap)
   rc = iruserok_sa ((struct sockaddr *) &ap->from, ap->fromlen, 0,
 		    ap->rusername, ap->lusername);
 # elif defined WITH_IRUSEROK_AF
-  rc = iruserok_af (&ap->from.sin_addr, 0, ap->rusername, ap->lusername,
-		    ap->from.sin_family);
+  rc = iruserok_af (addrp, 0, ap->rusername, ap->lusername,
+		    ap->from.ss_family);
 # else /* WITH_IRUSEROK */
-  rc = iruserok (ap->from.sin_addr.s_addr, 0, ap->rusername, ap->lusername);
+  rc = iruserok (addrp, 0, ap->rusername, ap->lusername);
 # endif /* WITH_IRUSEROK_SA || WITH_IRUSEROK_AF || WITH_IRUSEROK */
   if (rc)
     syslog (LOG_ERR | LOG_AUTH,
@@ -958,7 +1001,7 @@ do_rlogin (int infd, struct auth_data *ap)
 #elif defined WITH_RUSEROK_AF || defined WITH_RUSEROK
 # ifdef WITH_RUSEROK_AF
   rc = ruserok_af (ap->hostaddr, 0, ap->rusername, ap->lusername,
-		   ap->from.sin_family);
+		   ap->from.ss_family);
 # else /* WITH_RUSEROK */
   rc = ruserok (ap->hostaddr, 0, ap->rusername, ap->lusername);
 # endif /* WITH_RUSEROK_AF || WITH_RUSEROK */
@@ -1187,7 +1230,7 @@ do_shishi_login (int infd, struct auth_data *ad, const char **err_msg)
   char *compcksum;
   size_t compcksumlen, cksumlen = 30;
   char cksumdata[100];
-  struct sockaddr_in sock;
+  struct sockaddr_storage sock;
   socklen_t socklen = sizeof (sock);
 
 #  ifdef ENCRYPTION
@@ -1296,8 +1339,11 @@ do_shishi_login (int infd, struct auth_data *ad, const char **err_msg)
       fatal (infd, "Can't get sockname", 1);
     }
 
-  snprintf (cksumdata, 100, "%u:%s%s", ntohs (sock.sin_port), ad->term + 5,
-	    ad->lusername);
+  snprintf (cksumdata, 100, "%u:%s%s",
+	    (sock.ss_family == AF_INET6)
+	      ? ntohs (((struct sockaddr_in6 *) &sock)->sin6_port)
+	      : ntohs (((struct sockaddr_in *) &sock)->sin_port),
+	    ad->term + 5, ad->lusername);
   rc = shishi_checksum (ad->h, ad->enckey, 0, cksumtype, cksumdata,
 			strlen (cksumdata), &compcksum, &compcksumlen);
   if (rc != SHISHI_OK

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


commit 7de0a6859990a97a3190e8c398d57e9a8e023d28
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Wed Jul 18 19:44:21 2012 +0200

    rlogin: Close libshishi handle.

diff --git a/ChangeLog b/ChangeLog
index 430b50a..2d5c619 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2012-07-18  Mats Erik Andersson  <gnu@gisladisker.se>
 
+	rlogin: Close libshishi handle.
+	The normal logout action should lead to an
+	orderly close down of the active libshishi
+	handle, otherwise the tickets get lost.
+
+	* src/rlogin.c (doit) <reader returning> [SHISHI]:
+	Call shishi_done() in authenticating mode, possibly
+	also shishi_key_done() and shishi_crypto_close().
+
+2012-07-18  Mats Erik Andersson  <gnu@gisladisker.se>
+
 	rlogin: Non-authenticating with libshishi.
 	Verified functionality with `-K' switch.
 
diff --git a/src/rlogin.c b/src/rlogin.c
index 417fa0f..f240352 100644
--- a/src/rlogin.c
+++ b/src/rlogin.c
@@ -747,6 +747,22 @@ doit (sigset_t * smask)
 	  /* If the reader returns zero, the socket to the server returned
 	     an EOF, meaning the client logged out of the remote system.
 	     This is the normal termination.  */
+#ifdef SHISHI
+	  if (use_kerberos)
+	    {
+# ifdef ENCRYPTION
+	      if (doencrypt)
+		{
+		  shishi_key_done (key);
+		  shishi_crypto_close (iv1.ctx);
+		  shishi_crypto_close (iv2.ctx);
+		  free (iv1.iv);
+		  free (iv2.iv);
+		}
+# endif /* ENCRYPTION */
+	      shishi_done (handle);
+	    }
+#endif /* SHISHI */
           error (0, 0, "Connection to %s closed normally.\r", host);
           /* EXIT_SUCCESS is usually zero. So error might not exit.  */
           exit (EXIT_SUCCESS);

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


commit f0bea21c7e58ffb7251cdda4f1f7ad39913d4cff
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Wed Jul 18 19:27:07 2012 +0200

    rlogin: Usable non-authenticating libshishi.

diff --git a/ChangeLog b/ChangeLog
index 36311b9..430b50a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2012-07-18  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	rlogin: Non-authenticating with libshishi.
+	Verified functionality with `-K' switch.
+
+	* src/rlogin.c (OPTIONS): Remove unused macro.
+	(main): Call doit() with reference to SMASK,
+	not OSMASK.
+	(reader) [SHISHI]: Check OOB data only in
+	Kerberos mode, i.e., for set `use_kerberos'.
+
+	rlogind: Authenticating mode with libshishi.
+	Avoid segmentation faults.
+
+	* src/rlogind.c (so_krb_login): Properly set
+	an empty error message by `*err_msg = NULL'.
+	(do_shishi_login): Do not free CKSUM before use,
+	but do so afterwards.
+
 2012-07-14  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	telnetd: Activate authentication modes.
diff --git a/src/rlogin.c b/src/rlogin.c
index bb21e1a..417fa0f 100644
--- a/src/rlogin.c
+++ b/src/rlogin.c
@@ -223,12 +223,6 @@ void warning (const char *, ...);
 
 extern sighandler_t setsig (int, sighandler_t);
 
-#if defined KERBEROS || defined SHISHI
-# define OPTIONS	"8EKde:k:l:xhV"
-#else
-# define OPTIONS	"8EKde:l:hV"
-#endif
-
 const char args_doc[] = "HOST";
 const char doc[] = "Starts a terminal session on a remote host.";
 
@@ -613,7 +607,7 @@ try_connect:
   seteuid (uid);
   setuid (uid);
 
-  doit (&osmask);
+  doit (&smask);
 
   return 0;
 }
@@ -1222,12 +1216,15 @@ reader (sigset_t * smask)
   for (;;)
     {
 #ifdef SHISHI
-      if ((rcvcnt >= 5) && (bufp[0] == '\377') && (bufp[1] == '\377'))
-	if ((bufp[2] == 'o') && (bufp[3] == 'o'))
-	  {
-	    oob (1);
-	    bufp += 5;
-	  }
+      if (use_kerberos)
+	{
+	  if ((rcvcnt >= 5) && (bufp[0] == '\377') && (bufp[1] == '\377'))
+	    if ((bufp[2] == 'o') && (bufp[3] == 'o'))
+	      {
+		oob (1);
+		bufp += 5;
+	      }
+	}
 #endif
       while ((remaining = rcvcnt - (bufp - rcvbuf)) > 0)
 	{
diff --git a/src/rlogind.c b/src/rlogind.c
index c7745ca..f463f44 100644
--- a/src/rlogind.c
+++ b/src/rlogind.c
@@ -979,7 +979,7 @@ do_krb_login (int infd, struct auth_data *ap, const char **err_msg)
 {
   int rc;
 
-  err_msg = NULL;
+  *err_msg = NULL;
 # if defined KRB5
   if (kerberos == AUTH_KERBEROS_5)
     rc = do_krb5_login (infd, ap, err_msg);
@@ -1300,17 +1300,18 @@ do_shishi_login (int infd, struct auth_data *ad, const char **err_msg)
 	    ad->lusername);
   rc = shishi_checksum (ad->h, ad->enckey, 0, cksumtype, cksumdata,
 			strlen (cksumdata), &compcksum, &compcksumlen);
-  free (cksum);
   if (rc != SHISHI_OK
       || compcksumlen != cksumlen || memcmp (compcksum, cksum, cksumlen) != 0)
     {
       /* err_msg crash ? */
       /* *err_msg = "checksum verify failed"; */
       syslog (LOG_ERR, "checksum verify failed: %s", shishi_error (ad->h));
+      free (cksum);
       free (compcksum);
       return 1;
     }
 
+  free (cksum);
   free (compcksum);
 
   rc = shishi_authorized_p (ad->h, shishi_ap_tkt (ad->ap), ad->lusername);

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

Summary of changes:
 ChangeLog                 |  123 ++++++++++++++++++++++++++++++
 libinetutils/kcmd.c       |  136 +++++++++++++++++++++++++++++-----
 libinetutils/krcmd.c      |   11 ++-
 libinetutils/shishi.c     |    3 +-
 libinetutils/shishi_def.h |    7 +-
 src/rcp.c                 |  181 +++++++++++++++++++++++++++++++-------------
 src/rlogin.c              |   56 ++++++++++-----
 src/rlogind.c             |   97 ++++++++++++++++++------
 src/rsh.c                 |   22 +++---
 9 files changed, 500 insertions(+), 136 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Fri Jul 27 10:20:48 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1SulPM-0002wO-Ub
	for mharc-commit-inetutils@gnu.org; Fri, 27 Jul 2012 10:20:48 -0400
Received: from eggs.gnu.org ([208.118.235.92]:51824)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1SulPE-0002w4-Un
	for commit-inetutils@gnu.org; Fri, 27 Jul 2012 10:20:47 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1SulP5-0006fe-BJ
	for commit-inetutils@gnu.org; Fri, 27 Jul 2012 10:20:40 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:47038)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1SulP5-0006fa-79
	for commit-inetutils@gnu.org; Fri, 27 Jul 2012 10:20:31 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1SulP3-0002v0-96
	for commit-inetutils@gnu.org; Fri, 27 Jul 2012 14:20:30 +0000
Date: Fri, 27 Jul 2012 14:20:30 +0000
Message-Id: <E1SulP3-0002v0-96@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_1-138-g4689d41
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: c239b983175eacc8b82dcba61313a91e49646fb7
X-Git-Newrev: 4689d41a2a7b7f60aec12e60189ae467169c2bc3
From: Mats Erik Andersson <gnu@gisladisker.se>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
	<commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Jul 2012 14:20:48 -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  4689d41a2a7b7f60aec12e60189ae467169c2bc3 (commit)
      from  c239b983175eacc8b82dcba61313a91e49646fb7 (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=4689d41a2a7b7f60aec12e60189ae467169c2bc3


commit 4689d41a2a7b7f60aec12e60189ae467169c2bc3
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Fri Jul 27 14:14:46 2012 +0200

    rlogind, rshd: Protocol coherence.

diff --git a/ChangeLog b/ChangeLog
index e117652..6a7a022 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,35 @@
+2012-07-27  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	rlogin, rshd: Protocol coherence.
+
+	* configure.ac: Check for `getpwuid_r'.
+	* libinetutils/kcmd.c (kcmd) [SHISHI]: Transmit `locuser' if
+	defined at all.  Set `errno' to ENOENT at protocol failure.
+	* libinetutils/krcmd.c [SHISHI && HAVE_GETPWUID_R]: Include
+	<stdlib.h>, <unistd.h>, and <pwd.h>.  New static variables
+	`pwbuflen', `pwbuf', `pwstor', and `pwd'.
+	(krcmd) [SHISHI && HAVE_GETPWUID_R]: Determine local user
+	using getpwuid_r() and pass this on to kcmd().
+	(krcmd_mutual) [SHISHI && HAVE_GETPWUID_R]: Likewise.
+
+	* src/rlogin.c (main) <label try_connect>: New variable
+	KRB_ERRNO, used to track error causes reliably.
+	* src/rlogind.c: Include <stdarg.h>.
+	(rlogind_error): New function, reusing code from fatal().
+	(fatal): Altered as trivial wrapper around rlogind_error().
+	(do_krb_login): Check `*err_msg' in detecting messages.
+	(do_shishi_login): Read `ad->rusername' and `ad->lusername'
+	in the order mandated by exchange protocol, observing their
+	meaning from server's view.  Check `error' in verifying
+	successful exchange.  Provide error messages in case of
+	failure.  Delay syslog message for success until applicable,
+	and provide more detail in both syslog messages.
+	* src/rshd.c (doit) [SHISHI]: Read `remuser' and `locuser'
+	in the order relevant from server side perspective.  Check
+	`error' in verifying successful exchange.  Pass error
+	messages and better syslog messages in response to exchange
+	and authentication.
+
 2012-07-24  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	rcp: Non-encrypting libshishi support.
diff --git a/configure.ac b/configure.ac
index 376a063..ca9f267 100644
--- a/configure.ac
+++ b/configure.ac
@@ -661,7 +661,8 @@ AC_FUNC_MMAP
 
 AC_CHECK_FUNCS(cfsetspeed cgetent dirfd fchdir flock \
                fork fpathconf ftruncate \
-	       getcwd getmsg getspnam initgroups initsetproctitle killpg \
+               getcwd getmsg getpwuid_r getspnam \
+               initgroups initsetproctitle killpg \
                ptsname \
                setegid seteuid setpgid \
                setsid setregid setreuid setresgid setresuid setutent_r \
diff --git a/libinetutils/kcmd.c b/libinetutils/kcmd.c
index 4b61c41..6a43882 100644
--- a/libinetutils/kcmd.c
+++ b/libinetutils/kcmd.c
@@ -431,14 +431,17 @@ kcmd (Shishi ** h, int *sock, char **ahost, unsigned short rport, char *locuser,
 		    realm)) != SHISHI_OK)
     goto bad2;
 
-  write (s, *remuser, strlen (*remuser) + 1);
+  if (locuser && locuser[0])
+    write (s, locuser, strlen (locuser) + 1);
+  else
+    write (s, *remuser, strlen (*remuser) + 1);
 # endif	/* SHISHI */
 
   write (s, cmd, strlen (cmd) + 1);
 
 # ifdef SHISHI
   write (s, *remuser, strlen (*remuser) + 1);
-  write (s, &zero, sizeof (int));
+  write (s, &zero, sizeof (int));	/* XXX: not protocol */
 # endif
 
   if ((rc = read (s, &c, 1)) != 1)
@@ -459,6 +462,7 @@ kcmd (Shishi ** h, int *sock, char **ahost, unsigned short rport, char *locuser,
 	    break;
 	}
       status = -1;
+      errno = ENOENT;
       goto bad2;
     }
 # if HAVE_SIGACTION
diff --git a/libinetutils/krcmd.c b/libinetutils/krcmd.c
index 4435f0d..6e8ee35 100644
--- a/libinetutils/krcmd.c
+++ b/libinetutils/krcmd.c
@@ -67,7 +67,12 @@
 # elif defined(SHISHI)
 #  include <shishi.h>
 #  include "shishi_def.h"
-# endif
+#  ifdef HAVE_GETPWUID_R
+#   include <stdlib.h>
+#   include <unistd.h>
+#   include <pwd.h>
+#  endif /* HAVE_GETPWUID_R */
+# endif /* SHISHI */
 
 # include <stdio.h>
 
@@ -91,6 +96,12 @@ int kcmd (int *, char **, unsigned short, char *, char *, char *, int *,
  */
 
 # if defined SHISHI
+#  ifdef HAVE_GETPWUID_R
+static int pwbuflen;
+static char *pwbuf = NULL;	/* Reused after first allocation.  */
+static struct passwd pwstor, *pwd;
+#  endif /* HAVE_GETPWUID_R */
+
 int
 krcmd (Shishi ** h, char **ahost, unsigned short rport, char **remuser, char *cmd,
        int *fd2p, char *realm, int af)
@@ -98,8 +109,29 @@ krcmd (Shishi ** h, char **ahost, unsigned short rport, char **remuser, char *cm
   int sock = -1, err = 0;
   long authopts = 0L;
 
-  err = kcmd (h, &sock, ahost, rport, NULL,	/* locuser not used */
-	      remuser, cmd, fd2p, SERVICE_NAME, realm, NULL,	/* key schedule not used */
+#  ifdef HAVE_GETPWUID_R
+  if (!pwbuf)
+    {
+      pwbuflen = sysconf (_SC_GETPW_R_SIZE_MAX);
+      if (pwbuflen <= 0)
+	pwbuflen = 1024;	/* Guessing only.  */
+
+      pwbuf = malloc (pwbuflen);
+    }
+
+  if (pwbuf)
+    (void) getpwuid_r (getuid (), &pwstor, pwbuf, pwbuflen, &pwd);
+#  endif /* HAVE_GETPWUID_R */
+
+  err = kcmd (h, &sock, ahost, rport,
+#  ifdef HAVE_GETPWUID_R
+	      pwd ? pwd->pw_name : *remuser,	/* locuser */
+#  else /* !HAVE_GETPWUID_R */
+	      NULL,		/* locuser not used */
+#  endif
+	      remuser, cmd, fd2p,
+	      SERVICE_NAME, realm,
+	      NULL,		/* key schedule not used */
 	      NULL,		/* local addr not used */
 	      NULL,		/* foreign addr not used */
 	      authopts, af);
@@ -153,8 +185,28 @@ krcmd_mutual (Shishi ** h, char **ahost, unsigned short rport, char **remuser,
   struct sockaddr_storage laddr, faddr;
   long authopts = SHISHI_APOPTIONS_MUTUAL_REQUIRED;
 
-  err = kcmd (h, &sock, ahost, rport, NULL,	/* locuser not used */
-	      remuser, cmd, fd2p, SERVICE_NAME, realm, key,	/* filled in */
+#   ifdef HAVE_GETPWUID_R
+  if (!pwbuf)
+    {
+      pwbuflen = sysconf (_SC_GETPW_R_SIZE_MAX);
+      if (pwbuflen <= 0)
+	pwbuflen = 1024;	/* Guessing only.  */
+
+      pwbuf = malloc (pwbuflen);
+    }
+
+  if (pwbuf)
+    (void) getpwuid_r (getuid (), &pwstor, pwbuf, pwbuflen, &pwd);
+#   endif /* HAVE_GETPWUID_R */
+
+  err = kcmd (h, &sock, ahost, rport,
+#   ifdef HAVE_GETPWUID_R
+	      pwd ? pwd->pw_name : *remuser,	/* locuser */
+#   else /* !HAVE_GETPWUID_R */
+	      NULL,		/* locuser not used */
+#   endif
+	      remuser, cmd, fd2p,
+	      SERVICE_NAME, realm, key,	/* filled in */
 	      &laddr,		/* filled in */
 	      &faddr,		/* filled in */
 	      authopts, af);
diff --git a/src/rlogin.c b/src/rlogin.c
index a7cea19..a42f27a 100644
--- a/src/rlogin.c
+++ b/src/rlogin.c
@@ -448,6 +448,7 @@ main (int argc, char *argv[])
 try_connect:
   if (use_kerberos)
     {
+      int krb_errno = 0;
       struct hostent *hp;
 
       /* Fully qualified hostname (needed for krb_realmofhost).  */
@@ -473,6 +474,7 @@ try_connect:
 
 	  rem = krcmd_mutual (&handle, &host, sp->s_port, &user, term, 0,
 			      dest_realm, &key, family);
+	  krb_errno = errno;
 	  if (rem > 0)
 	    {
 	      keytype = shishi_key_type (key);
@@ -524,27 +526,32 @@ try_connect:
 
       else
 #  else /* KERBEROS */
-	rem = krcmd_mutual (&host, sp->s_port, user, term, 0,
-			    dest_realm, &cred, schedule);
+	{
+	  rem = krcmd_mutual (&host, sp->s_port, user, term, 0,
+			      dest_realm, &cred, schedule);
+	  krb_errno = errno;
+	}
       else
 #  endif
-# endif	/* CRYPT */
-
+# endif	/* ENCRYPTION */
+	{
 # if defined SHISHI
-	rem = krcmd (&handle, &host, sp->s_port, &user, term, 0,
-		     dest_realm, family);
+	  rem = krcmd (&handle, &host, sp->s_port, &user, term, 0,
+		       dest_realm, family);
 # else /* KERBEROS */
-	rem = krcmd (&host, sp->s_port, user, term, 0, dest_realm);
+	  rem = krcmd (&host, sp->s_port, user, term, 0, dest_realm);
 # endif
+	  krb_errno = errno;
+	}
       if (rem < 0)
 	{
 	  use_kerberos = 0;
 	  sp = getservbyname ("login", "tcp");
 	  if (sp == NULL)
 	    error (EXIT_FAILURE, 0, "unknown service login/tcp.");
-	  if (errno == ECONNREFUSED)
+	  if (krb_errno == ECONNREFUSED)
 	    warning ("remote host doesn't support Kerberos");
-	  if (errno == ENOENT)
+	  if (krb_errno == ENOENT)
 	    warning ("can't provide Kerberos auth data");
 	  goto try_connect;
 	}
diff --git a/src/rlogind.c b/src/rlogind.c
index b5d8ea6..cd021da 100644
--- a/src/rlogind.c
+++ b/src/rlogind.c
@@ -56,6 +56,7 @@
 #include <syslog.h>
 #include <errno.h>
 #include <stdio.h>
+#include <stdarg.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <stdlib.h>
@@ -212,6 +213,7 @@ void protocol (int f, int p, struct auth_data *ap);
 int control (int pty, char *cp, size_t n);
 void cleanup (int signo);
 void fatal (int f, const char *msg, int syserr);
+void rlogind_error (int f, int syserr, const char *msg, ...);
 int in_local_domain (char *hostname);
 char *topdomain (char *name, int max_dots);
 
@@ -944,7 +946,7 @@ rlogind_mainloop (int infd, int outfd)
 	}
 # endif
     }
-#endif
+#endif /* SHISHI */
 
   return 0;
 }
@@ -1037,7 +1039,7 @@ do_krb_login (int infd, struct auth_data *ap, const char **err_msg)
   rc = do_krb4_login (infd, ap, err_msg);
 # endif
 
-  if (rc && !err_msg)
+  if (rc && !*err_msg)
     *err_msg = kerberos_error_string (rc);
 
   return rc;
@@ -1118,7 +1120,7 @@ do_krb4_login (int infd, struct auth_data *ap, const char **err_msg)
 
   return 0;
 }
-# endif
+# endif /* KRB4 */
 
 # ifdef KRB5
 int
@@ -1217,7 +1219,7 @@ do_krb5_login (int infd, struct auth_data *ap, const char **err_msg)
   return 0;
 }
 
-# endif
+# endif /* KRB5 */
 
 # ifdef SHISHI
 int
@@ -1298,16 +1300,17 @@ do_shishi_login (int infd, struct auth_data *ad, const char **err_msg)
     }
 #  endif
 
-  getstr (infd, &ad->lusername, NULL);
-  getstr (infd, &ad->term, "TERM=");
   getstr (infd, &ad->rusername, NULL);
+  getstr (infd, &ad->term, "TERM=");
+  getstr (infd, &ad->lusername, NULL);
 
-  rc = read (infd, &error, sizeof (int));
-  if ((rc != sizeof (int)) && rc)
+  rc = read (infd, &error, sizeof (int));	/* XXX: not protocol */
+  if ((rc != sizeof (int)) || error)
     {
+      *err_msg = "Authentication exchange failed.";
       free (pwd);
       free (cksum);
-      return 1;
+      return EXIT_FAILURE;
     }
 
   /*
@@ -1330,9 +1333,6 @@ do_shishi_login (int infd, struct auth_data *ad, const char **err_msg)
 
   free (pwd);
 
-  syslog (LOG_INFO | LOG_AUTH,
-	  "Kerberos V login from %s on %s\n", ad->lusername, ad->hostname);
-
   /* verify checksum */
 
   if (getsockname (infd, (struct sockaddr *) &sock, &socklen) < 0)
@@ -1351,32 +1351,38 @@ do_shishi_login (int infd, struct auth_data *ad, const char **err_msg)
   if (rc != SHISHI_OK
       || compcksumlen != cksumlen || memcmp (compcksum, cksum, cksumlen) != 0)
     {
-      /* err_msg crash ? */
-      /* *err_msg = "checksum verify failed"; */
+      *err_msg = "Authentication exchange failed.";
       syslog (LOG_ERR, "checksum verify failed: %s", shishi_error (ad->h));
       free (cksum);
       free (compcksum);
-      return 1;
+      return rc;
     }
 
   free (cksum);
+
   free (compcksum);
 
   rc = shishi_authorized_p (ad->h, shishi_ap_tkt (ad->ap), ad->lusername);
   if (!rc)
     {
-      syslog (LOG_ERR | LOG_AUTH, "User is not authorized to log in as: %s",
-	      ad->lusername);
+      syslog (LOG_ERR | LOG_AUTH,
+	      "User %s@%s is not authorized to log in as: %s.",
+	      ad->rusername, ad->hostname, ad->lusername);
       shishi_ap_done (ad->ap);
-      return 1;
+      rlogind_error (infd, 0, "Failed to get authorized as `%s'.\n", ad->lusername);
+      return rc;
     }
 
+  syslog (LOG_INFO | LOG_AUTH,
+	  "Kerberos V login from %s on %s as `%s'.\n",
+	  ad->rusername, ad->hostname, ad->lusername);
+
   shishi_ap_done (ad->ap);
 
   return SHISHI_OK;
 }
-# endif
-#endif
+# endif /* SHISHI */
+#endif /* KERBEROS || SHISHI */
 
 #define BUFFER_SIZE 128
 
@@ -1702,10 +1708,18 @@ topdomain (char *name, int max_dots)
 }
 
 void
-fatal (int f, const char *msg, int syserr)
+rlogind_error (int f, int syserr, const char *msg, ...)
 {
   int len;
-  char buf[BUFSIZ], *bp = buf;
+  char buf[BUFSIZ], buf2[BUFSIZ], *bp = buf;
+  va_list ap;
+  va_start (ap, msg);
+
+  /*
+   * Error message proper, with variadic parts.
+   */
+  vsnprintf (buf2, sizeof (buf2) - 1, msg, ap);
+  va_end (ap);
 
   /*
    * Prepend binary one to message if we haven't sent
@@ -1715,10 +1729,17 @@ fatal (int f, const char *msg, int syserr)
     *bp++ = '\01';		/* error indicator */
   if (syserr)
     snprintf (bp, sizeof buf - (bp - buf),
-	      "rlogind: %s: %s.\r\n", msg, strerror (errno));
+	      "rlogind: %s: %s.\r\n", buf2, strerror (errno));
   else
-    snprintf (bp, sizeof buf - (bp - buf), "rlogind: %s.\r\n", msg);
+    snprintf (bp, sizeof buf - (bp - buf), "rlogind: %s.\r\n", buf2);
+
   len = strlen (bp);
   write (f, buf, bp + len - buf);
+}
+
+void
+fatal (int f, const char *msg, int syserr)
+{
+  rlogind_error (f, syserr, msg);
   exit (EXIT_FAILURE);
 }
diff --git a/src/rshd.c b/src/rshd.c
index 5cf796c..30b87f6 100644
--- a/src/rshd.c
+++ b/src/rshd.c
@@ -86,12 +86,20 @@
  */
 
 /*
- * remote shell server exchange protocol:
+ * remote shell server exchange protocol (client view!):
  *	[port]\0
  *	remuser\0
  *	locuser\0
  *	command\0
  *	data
+ *
+ * Kerberized exchange delays the remote user name:
+ *
+ *      \0
+ *      locuser\0
+ *      command\0
+ *      remuser\0
+ *      data
  */
 
 #include <config.h>
@@ -830,10 +838,10 @@ doit (int sockfd, struct sockaddr *fromp, socklen_t fromlen)
     }
   else
 #endif /* KERBEROS || SHISHI */
-    remuser = getstr ("remuser");
+    locuser = getstr ("locuser");
 
   /* Read three strings from the client. */
-  locuser = getstr ("locuser");
+  remuser = getstr ("remuser");		/* The acting client!  */
   cmdbuf = getstr ("command");
 
 #ifdef SHISHI
@@ -908,9 +916,10 @@ doit (int sockfd, struct sockaddr *fromp, socklen_t fromlen)
 	  }
 # endif /* ENCRYPTION */
 
-    remuser = getstr ("remuser");
-    rc = read (STDIN_FILENO, &error, sizeof (int));
-    if ((rc != sizeof (int)) && rc)
+    locuser = getstr ("locuser");	/* The agent here!  */
+
+    rc = read (STDIN_FILENO, &error, sizeof (int)); /* XXX: not protocol */
+    if ((rc != sizeof (int)) || error)
       exit (EXIT_FAILURE);
 
     /* verify checksum */
@@ -942,14 +951,19 @@ doit (int sockfd, struct sockaddr *fromp, socklen_t fromlen)
 	/* *err_msg = "checksum verify failed"; */
 	syslog (LOG_ERR, "checksum verify failed: %s", shishi_error (h));
 	free (compcksum);
+	shishi_ap_done (ap);
+	rshd_error ("Authentication exchange failed.\n");
 	exit (EXIT_FAILURE);
       }
 
     rc = shishi_authorized_p (h, shishi_ap_tkt (ap), locuser);
     if (!rc)
       {
-	syslog (LOG_ERR, "User is not authorized to log in as: %s", locuser);
+	syslog (LOG_AUTH | LOG_ERR,
+		"User %s@%s is not authorized to run as: %s.",
+		remuser, hostname, locuser);
 	shishi_ap_done (ap);
+	rshd_error ("Failed to get authorized as `%s'.\n", locuser);
 	exit (EXIT_FAILURE);
       }
 
@@ -1175,12 +1189,13 @@ doit (int sockfd, struct sockaddr *fromp, socklen_t fromlen)
       exit (EXIT_FAILURE);
     }
 
-  /* Now write the null byte back to the client telling it
+  /* Now write the null byte back to the client, telling it
    * that everything is OK.
+   *
    * Note that this means that any error message that we generate
    * from now on (such as the perror() if the execl() fails), won't
-   * be seen by the rcomd() fucntion, but will be seen by the
-   * application that called rcmd() when it reads from the socket.
+   * be seen by the rcmd() function, but it will be seen by the
+   * application that called rcmd() once it reads from the socket.
    */
   if (write (STDERR_FILENO, "\0", 1) < 0)
     {
@@ -1592,7 +1607,11 @@ doit (int sockfd, struct sockaddr *fromp, socklen_t fromlen)
 		hostname, locuser, cmdbuf);
       else
 #endif /* KERBEROS */
-	syslog (LOG_INFO | LOG_AUTH, "%s@%s as %s: cmd='%.80s'",
+	syslog (LOG_INFO | LOG_AUTH,
+#ifdef SHISHI
+		"Kerberized "
+#endif
+		"%s@%s as %s: cmd='%.80s'",
 		remuser, hostname, locuser, cmdbuf);
     }
 #ifdef SHISHI
@@ -1626,7 +1645,7 @@ rshd_error (const char *fmt, ...)
   bp = buf;
   if (sent_null == 0)
     {
-      *bp++ = 1;
+      *bp++ = 1;	/* error indicator */
       len = 1;
     }
   else

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

Summary of changes:
 ChangeLog            |   32 +++++++++++++++++++++++
 configure.ac         |    3 +-
 libinetutils/kcmd.c  |    8 ++++-
 libinetutils/krcmd.c |   62 +++++++++++++++++++++++++++++++++++++++++---
 src/rlogin.c         |   25 +++++++++++------
 src/rlogind.c        |   69 ++++++++++++++++++++++++++++++++-----------------
 src/rshd.c           |   43 ++++++++++++++++++++++--------
 7 files changed, 189 insertions(+), 53 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


