From MAILER-DAEMON Fri Apr 25 09:11:14 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1WdfuM-0003jm-Dt
	for mharc-commit-inetutils@gnu.org; Fri, 25 Apr 2014 09:11:14 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:40801)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1WdfuJ-0003ZZ-OG
	for commit-inetutils@gnu.org; Fri, 25 Apr 2014 09:11:13 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1WdfuH-0002KY-1o
	for commit-inetutils@gnu.org; Fri, 25 Apr 2014 09:11:11 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:44540)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1WdfuG-0002KO-V9
	for commit-inetutils@gnu.org; Fri, 25 Apr 2014 09:11:08 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1WdfuG-0003C4-8o
	for commit-inetutils@gnu.org; Fri, 25 Apr 2014 13:11:08 +0000
Date: Fri, 25 Apr 2014 13:11:08 +0000
Message-Id: <E1WdfuG-0003C4-8o@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_2-16-gbbff25d
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 1db1e91f34f1c31a297c3c65417ac4f93a7a404f
X-Git-Newrev: bbff25dd378415078f3498d877e376c8160f9de7
From: Mats Erik Andersson <gnu@gisladisker.se>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
	<commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 25 Apr 2014 13:11:13 -0000

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

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


commit bbff25dd378415078f3498d877e376c8160f9de7
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Fri Apr 25 14:21:45 2014 +0200

    Silence warnings with libshishi.

diff --git a/ChangeLog b/ChangeLog
index a5155b9..1f0a0b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2014-04-25  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	Silence warnings with libshishi.
+
+	* libinetutils/kcmd.c [KERBEROS || SHISHI] (kcmd):
+	Declare realm argument as `const char *'.
+	* libinetutils/krcmd.c [KERBEROS || SHISHI]
+	(kcmd, krcmd, krcmd_mutual): Likewise.
+	* libinetutils/shishi.c [SHISHI] (shishi_auth): Likewise.
+	* libinetutils/shishi_def.h [SHISHI] (shishi_auth, krcmd)
+	(krcmd_mutual): Likewise.
+	* src/rcp.c [KERBEROS || SHISHI] (dest_realm): Likewise.
+	* src/rlogin.c [KERBEROS || SHISHI] (dest_realm): Likewise.
+	* src/rsh.c [KERBEROS || SHISHI] (dest_realm): Likewise.
+
+	* src/rlogind.c (rlogind_auth): Initialize HOSTNAME.
+
 2014-03-28  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	syslogd: Local time option.
diff --git a/libinetutils/kcmd.c b/libinetutils/kcmd.c
index 35a610f..ac8afaa 100644
--- a/libinetutils/kcmd.c
+++ b/libinetutils/kcmd.c
@@ -94,13 +94,13 @@ int getport (int *, int);
 int
 kcmd (int *sock, char **ahost, unsigned short rport, char *locuser,
       char *remuser, char *cmd, int *fd2p, KTEXT ticket,
-      char *service, char *realm,
+      char *service, const char *realm,
       CREDENTIALS * cred, Key_schedule schedule, MSG_DAT * msg_data,
       struct sockaddr_in *laddr, struct sockaddr_in *faddr, long authopts)
 # elif defined(SHISHI)
 int
 kcmd (Shishi ** h, int *sock, char **ahost, unsigned short rport, char *locuser,
-      char **remuser, char *cmd, int *fd2p, char *service, char *realm,
+      char **remuser, char *cmd, int *fd2p, char *service, const char *realm,
       Shishi_key ** key, struct sockaddr_storage *laddr,
       struct sockaddr_storage *faddr, long authopts, int af)
 # endif
diff --git a/libinetutils/krcmd.c b/libinetutils/krcmd.c
index e4f4bdd..ce6d927 100644
--- a/libinetutils/krcmd.c
+++ b/libinetutils/krcmd.c
@@ -80,12 +80,12 @@
 
 # if defined SHISHI
 int kcmd (Shishi **, int *, char **, unsigned short, char *, char **,
-	  char *, int *, char *, char *, Shishi_key **,
+	  char *, int *, char *, const char *, Shishi_key **,
 	  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,
+	  KTEXT, char *, const char *, CREDENTIALS *, Key_schedule,
 	  MSG_DAT *, struct sockaddr_in *, struct sockaddr_in *, long);
 # endif
 
@@ -104,7 +104,7 @@ static struct passwd pwstor, *pwd;
 
 int
 krcmd (Shishi ** h, char **ahost, unsigned short rport, char **remuser, char *cmd,
-       int *fd2p, char *realm, int af)
+       int *fd2p, const char *realm, int af)
 {
   int sock = -1, err = 0;
   long authopts = 0L;
@@ -149,7 +149,7 @@ krcmd (Shishi ** h, char **ahost, unsigned short rport, char **remuser, char *cm
 # elif defined(KERBEROS)
 int
 krcmd (char **ahost, unsigned short rport, char *remuser, char *cmd, int *fd2p,
-       char *realm)
+       const char *realm)
 {
   int sock = -1, err = 0;
   KTEXT_ST ticket;
@@ -179,7 +179,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, int af)
+	      char *cmd, int *fd2p, const char *realm, Shishi_key ** key, int af)
 {
   int sock = -1, err = 0;
   struct sockaddr_storage laddr, faddr;
@@ -226,7 +226,7 @@ krcmd_mutual (Shishi ** h, char **ahost, unsigned short rport, char **remuser,
 #  elif defined(KERBEROS)
 int
 krcmd_mutual (char **ahost, unsigned short rport, char *remuser, char *cmd,
-	      int *fd2p, char *realm, CREDENTIALS * cred, Key_schedule sched)
+	      int *fd2p, const char *realm, CREDENTIALS * cred, Key_schedule sched)
 {
   int sock, err;
   KTEXT_ST ticket;
diff --git a/libinetutils/shishi.c b/libinetutils/shishi.c
index dea6165..e6edaba 100644
--- a/libinetutils/shishi.c
+++ b/libinetutils/shishi.c
@@ -32,7 +32,8 @@
 int
 shishi_auth (Shishi ** handle, int verbose, char **cname,
 	     const char *sname, int sock, char *cmd,
-	     unsigned short port, Shishi_key ** enckey, char *realm)
+	     unsigned short port, Shishi_key ** enckey,
+	     const char *realm)
 {
   Shishi_ap *ap;
   Shishi_tkt *tkt;
diff --git a/libinetutils/shishi_def.h b/libinetutils/shishi_def.h
index e91b230..9e8276a 100644
--- a/libinetutils/shishi_def.h
+++ b/libinetutils/shishi_def.h
@@ -58,7 +58,7 @@ struct auth_data
 extern int shishi_auth (Shishi ** handle, int verbose, char **cname,
 			const char *sname, int sock, char *cmd,
 			unsigned short port, Shishi_key ** enckey,
-			char *realm);
+			const char *realm);
 
 extern int get_auth (int infd, Shishi ** handle, Shishi_ap ** ap,
 		     Shishi_key ** enckey, const char **err_msg,
@@ -73,10 +73,10 @@ extern int writeenc (Shishi * h, int sock, char *buf, int wlen, int *len,
 
 extern int krcmd (Shishi ** h, char **ahost, unsigned short rport,
 		  char **remuser, char *cmd, int *fd2p,
-		  char *realm, int af);
+		  const 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, int af);
+			 char **remuser, char *cmd, int *fd2p,
+			 const char *realm, Shishi_key ** key, int af);
 
 #endif
diff --git a/src/rcp.c b/src/rcp.c
index 62b53b2..234beac 100644
--- a/src/rcp.c
+++ b/src/rcp.c
@@ -118,7 +118,7 @@ void verifydir (char *);
 #endif /* KERBEROS */
 
 #if defined KERBEROS || defined SHISHI
-char *dest_realm = NULL;
+const char *dest_realm = NULL;
 int use_kerberos = 1;
 int doencrypt = 0;
 
diff --git a/src/rlogin.c b/src/rlogin.c
index 91d8187..f3d909e 100644
--- a/src/rlogin.c
+++ b/src/rlogin.c
@@ -123,12 +123,14 @@
 #if defined KERBEROS || defined SHISHI
 int use_kerberos = 1, doencrypt;
 # ifdef KERBEROS
-char dest_realm_buf[REALM_SZ], *dest_realm = NULL;
+char dest_realm_buf[REALM_SZ];
+const char *dest_realm = NULL;
 CREDENTIALS cred;
 Key_schedule schedule;
 
 # elif defined(SHISHI)
-char dest_realm_buf[REALM_SZ], *dest_realm = NULL;
+char dest_realm_buf[REALM_SZ];
+const char *dest_realm = NULL;
 
 Shishi *handle;
 Shishi_key *key;
diff --git a/src/rlogind.c b/src/rlogind.c
index 1e3e866..1bb84fb 100644
--- a/src/rlogind.c
+++ b/src/rlogind.c
@@ -865,7 +865,7 @@ rlogind_auth (int fd, struct auth_data *ap)
   struct hostent *hp;
   void *addrp;
 #endif
-  char *hostname;
+  char *hostname = "";
   int authenticated = 0;
   int port;
 
diff --git a/src/rsh.c b/src/rsh.c
index 44a0421..091ccd0 100644
--- a/src/rsh.c
+++ b/src/rsh.c
@@ -102,7 +102,7 @@ sa_family_t family = AF_UNSPEC;
 
 #if defined KERBEROS || defined SHISHI
 int use_kerberos = 1, doencrypt;
-char *dest_realm = NULL;
+const char *dest_realm = NULL;
 
 # ifdef KERBEROS
 CREDENTIALS cred;

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

Summary of changes:
 ChangeLog                 |   17 +++++++++++++++++
 libinetutils/kcmd.c       |    4 ++--
 libinetutils/krcmd.c      |   12 ++++++------
 libinetutils/shishi.c     |    3 ++-
 libinetutils/shishi_def.h |    8 ++++----
 src/rcp.c                 |    2 +-
 src/rlogin.c              |    6 ++++--
 src/rlogind.c             |    2 +-
 src/rsh.c                 |    2 +-
 9 files changed, 38 insertions(+), 18 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Fri Apr 25 16:46:45 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Wdn1B-0006KE-RG
	for mharc-commit-inetutils@gnu.org; Fri, 25 Apr 2014 16:46:45 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:54771)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1Wdn17-00066l-LI
	for commit-inetutils@gnu.org; Fri, 25 Apr 2014 16:46:43 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1Wdn15-0001Uy-Eg
	for commit-inetutils@gnu.org; Fri, 25 Apr 2014 16:46:41 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:51075)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1Wdn15-0001Uu-Ag
	for commit-inetutils@gnu.org; Fri, 25 Apr 2014 16:46:39 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1Wdn14-0008RS-I3
	for commit-inetutils@gnu.org; Fri, 25 Apr 2014 20:46:38 +0000
Date: Fri, 25 Apr 2014 20:46:38 +0000
Message-Id: <E1Wdn14-0008RS-I3@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_2-18-gdf4d445
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: bbff25dd378415078f3498d877e376c8160f9de7
X-Git-Newrev: df4d445682e20b0c0b111eadc88b6c11599a0357
From: Mats Erik Andersson <gnu@gisladisker.se>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
	<commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 25 Apr 2014 20:46:44 -0000

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

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


commit df4d445682e20b0c0b111eadc88b6c11599a0357
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Fri Apr 25 20:44:08 2014 +0200

    bootstrap: Updated from gnulib. (silent change)

diff --git a/bootstrap b/bootstrap
index 5acbe5b..ce90bc4 100755
--- a/bootstrap
+++ b/bootstrap
@@ -4,7 +4,7 @@ scriptversion=2013-12-05.23; # UTC
 
 # Bootstrap this package from checked-out sources.
 
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

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


commit bd212de4563a261f7ba133f95496117fef140527
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Fri Apr 25 20:23:20 2014 +0200

    Begin adaptions to Heimdal's Kerberos.
    
    Aim at an adaption of all r-commands, with the first
    incomplete steps for `rsh'.

diff --git a/ChangeLog b/ChangeLog
index 1f0a0b8..4918c45 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,35 @@
 2014-04-25  Mats Erik Andersson  <gnu@gisladisker.se>
 
+	Begin support for Heimdal's Kerberos.
+	Very incomplete code for `rsh', but a needed start.
+
+	* libinetutils/kerberos5_def.h: New file.
+
+	* libinetutils/krcmd.c: Remove support for KRB4, replacing
+	most macros KERBEROS by KRB5.
+	[KRB5]: Include <krb5.h> and "kerberos5_def.h".
+	[KRB5] (kcmd, krcmd, krcmd_mutual): Update declarations,
+	and make small, obvious adaptions to Kerberos5.
+	[KRB5] (krcmd_mutual): Update value of AUTHOPTS.
+
+	* libinetutils/Makefile.am (noinst_HEADERS):
+	Add `kerberos5_def.h'.
+
+	* src/rsh.c: Replace macro KERBEROS by KRB5, temporarily
+	making an exception in some code related to encryption.
+	[KRB5]: Include <krb5.h> and "kerberos5_def.h".
+	[KRB5] (ctx, keyblock, server): New variables.
+	[KRB5 && ENCRYPTION] (parse_opt) <case 'x'>: Remove
+	call to des_set_key().
+	[KRB5 || SHISHI] (main): Refactor code for port lookup
+	and command string generation, since Kerberos5 and Shishi
+	have common traits.
+	[KRB5] (main): Adapt to new signatures of krcmd() and
+	krcmd_mutual().  Initialize `ctx', and reimplement realm
+	lookup using Kerberos5 API.
+
+2014-04-25  Mats Erik Andersson  <gnu@gisladisker.se>
+
 	Silence warnings with libshishi.
 
 	* libinetutils/kcmd.c [KERBEROS || SHISHI] (kcmd):
diff --git a/libinetutils/Makefile.am b/libinetutils/Makefile.am
index 1e690f2..87922f5 100644
--- a/libinetutils/Makefile.am
+++ b/libinetutils/Makefile.am
@@ -27,7 +27,8 @@ AM_CPPFLAGS = \
 
 noinst_LIBRARIES = libinetutils.a
 
-noinst_HEADERS = argcv.h libinetutils.h tftpsubs.h shishi_def.h
+noinst_HEADERS = argcv.h libinetutils.h tftpsubs.h \
+		 kerberos5_def.h shishi_def.h
 
 EXTRA_DIST = logwtmp.c
 
diff --git a/libinetutils/kerberos5_def.h b/libinetutils/kerberos5_def.h
new file mode 100644
index 0000000..764a9a4
--- /dev/null
+++ b/libinetutils/kerberos5_def.h
@@ -0,0 +1,54 @@
+/*
+  Copyright (C) 2014 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+#ifdef KRB5
+# include <sys/socket.h>
+# include <netinet/in.h>
+
+# ifdef HAVE_KRB5_h
+#  include <krb5.h>
+# endif
+
+# define SERVICE "host"
+
+extern int kerberos_auth (krb5_context *ctx, int verbose, char **cname,
+			  const char *sname, int sock, char *cmd,
+			  unsigned short port, krb5_keyblock **key,
+			  const char *realm);
+
+extern int get_auth (int infd, krb5_context *ctx, krb5_auth_context *actx,
+		     krb5_keyblock **key, const char **err_msg,
+		     int *protoversion, int *cksumtype, char **cksum,
+		     size_t *cksumlen, char *srvname);
+
+extern int kcmd (krb5_context *ctx, int *sock, char **ahost,
+		 unsigned short rport, char *locuser, char **remuser,
+		 char *cmd, int *fd2p, char *service, const char *realm,
+		 krb5_keyblock **key, struct sockaddr_in *laddr,
+		 struct sockaddr_in *raddr, long opts);
+
+extern int krcmd (krb5_context *ctx, char **ahost, unsigned short rport,
+		  char **remuser, char *cmd, int *fd2p,
+		  const char *realm);
+
+extern int krcmd_mutual (krb5_context *ctx, char **ahost,
+			 unsigned short rport, char **remuser,
+			 char *cmd, int *fd2p, const char *realm,
+			 krb5_keyblock **key);
+
+#endif	/* KRB5 */
diff --git a/libinetutils/krcmd.c b/libinetutils/krcmd.c
index ce6d927..f9ff32b 100644
--- a/libinetutils/krcmd.c
+++ b/libinetutils/krcmd.c
@@ -49,7 +49,8 @@
 
 #include <config.h>
 
-#if defined KRB4 || defined SHISHI
+#if defined KRB5 || defined SHISHI
+
 # include <sys/types.h>
 # ifdef ENCRYPTION
 #  include <sys/socket.h>
@@ -57,14 +58,13 @@
 
 # include <netinet/in.h>
 
-# ifdef KERBEROS
-#  ifdef HAVE_KERBEROSIV_DES_H
-#   include <kerberosIV/des.h>
-#  endif
-#  ifdef HAVE_KERBEROSIV_KRB_H
-#   include <kerberosIV/krb.h>
+# ifdef KRB5
+#  ifdef HAVE_KRB5_H
+#   include <krb5.h>
 #  endif
-# elif defined(SHISHI)
+#  include "kerberos5_def.h"
+
+# elif defined(SHISHI) /* ! KRB5 */
 #  include <shishi.h>
 #  include "shishi_def.h"
 #  ifdef HAVE_GETPWUID_R
@@ -72,7 +72,7 @@
 #   include <unistd.h>
 #   include <pwd.h>
 #  endif /* HAVE_GETPWUID_R */
-# endif /* SHISHI */
+# endif /* SHISHI && !KRB5 */
 
 # include <stdio.h>
 
@@ -83,11 +83,11 @@ int kcmd (Shishi **, int *, char **, unsigned short, char *, char **,
 	  char *, int *, char *, const char *, Shishi_key **,
 	  struct sockaddr_storage *, struct sockaddr_storage *,
 	  long, int);
-# else
-int kcmd (int *, char **, unsigned short, char *, char *, char *, int *,
-	  KTEXT, char *, const char *, CREDENTIALS *, Key_schedule,
-	  MSG_DAT *, struct sockaddr_in *, struct sockaddr_in *, long);
-# endif
+# else /* KRB5 && !SHISHI */
+int kcmd (krb5_context *, int *, char **, unsigned short, char *, char **,
+	  char *, int *, char *, const char *, krb5_keyblock **,
+	  struct sockaddr_in *, struct sockaddr_in *, long);
+# endif /* !SHISHI */
 
 /*
  * krcmd: simplified version of Athena's "kcmd"
@@ -103,8 +103,8 @@ static struct passwd pwstor, *pwd;
 #  endif /* HAVE_GETPWUID_R */
 
 int
-krcmd (Shishi ** h, char **ahost, unsigned short rport, char **remuser, char *cmd,
-       int *fd2p, const char *realm, int af)
+krcmd (Shishi ** h, char **ahost, unsigned short rport, char **remuser,
+       char *cmd, int *fd2p, const char *realm, int af)
 {
   int sock = -1, err = 0;
   long authopts = 0L;
@@ -146,33 +146,37 @@ krcmd (Shishi ** h, char **ahost, unsigned short rport, char **remuser, char *cm
   return (sock);
 }
 
-# elif defined(KERBEROS)
+# elif defined(KRB5) /* !SHISHI */
 int
-krcmd (char **ahost, unsigned short rport, char *remuser, char *cmd, int *fd2p,
-       const char *realm)
+krcmd (krb5_context *ctx, char **ahost, unsigned short rport,
+       char **remuser, char *cmd, int *fd2p, const char *realm)
 {
-  int sock = -1, err = 0;
-  KTEXT_ST ticket;
+  int sock = -1;
+  krb5_error_code err = 0;
   long authopts = 0L;
 
-  err = kcmd (&sock, ahost, rport, NULL,	/* locuser not used */
-	      remuser, cmd, fd2p, &ticket, SERVICE_NAME, realm, NULL,	/* credentials not used */
-	      (bit_64 *) NULL,	/* key schedule not used */
-	      (MSG_DAT *) NULL,	/* MSG_DAT not used */
+  err = kcmd (ctx, &sock, ahost, rport,
+	      NULL,	/* locuser not used */
+	      remuser, cmd, fd2p,
+	      SERVICE_NAME, realm,
+	      (krb5_keyblock **) NULL,		/* key not used */
 	      (struct sockaddr_in *) NULL,	/* local addr not used */
 	      (struct sockaddr_in *) NULL,	/* foreign addr not used */
 	      authopts);
 
-  if (err > KSUCCESS && err < MAX_KRB_ERRORS)
+  if (err > 0)
     {
-      fprintf (stderr, "krcmd: %s\n", krb_err_txt[err]);
+      const char *text = krb5_get_error_message (*ctx, err);
+
+      fprintf (stderr, "krcmd: %s\n", text);
+      krb5_free_error_message (*ctx, text);
       return (-1);
     }
   if (err < 0)
     return (-1);
   return (sock);
 }
-# endif
+# endif /* KRB5 && !SHISHI */
 
 # ifdef ENCRYPTION
 
@@ -206,7 +210,8 @@ krcmd_mutual (Shishi ** h, char **ahost, unsigned short rport, char **remuser,
 	      NULL,		/* locuser not used */
 #   endif
 	      remuser, cmd, fd2p,
-	      SERVICE_NAME, realm, key,	/* filled in */
+	      SERVICE_NAME, realm,
+	      key,		/* filled in */
 	      &laddr,		/* filled in */
 	      &faddr,		/* filled in */
 	      authopts, af);
@@ -223,28 +228,32 @@ krcmd_mutual (Shishi ** h, char **ahost, unsigned short rport, char **remuser,
   return (sock);
 }
 
-#  elif defined(KERBEROS)
+#  elif defined(KRB5) /* !SHISHI */
 int
-krcmd_mutual (char **ahost, unsigned short rport, char *remuser, char *cmd,
-	      int *fd2p, const char *realm, CREDENTIALS * cred, Key_schedule sched)
+krcmd_mutual (krb5_context *ctx, char **ahost, unsigned short rport,
+	      char **remuser, char *cmd, int *fd2p, const char *realm,
+	      krb5_keyblock **key)
 {
-  int sock, err;
-  KTEXT_ST ticket;
-  MSG_DAT msg_dat;
+  int sock;
+  krb5_error_code err = 0;
   struct sockaddr_in laddr, faddr;
-  long authopts = KOPT_DO_MUTUAL;
+  long authopts = AP_OPTS_MUTUAL_REQUIRED | AP_OPTS_USE_SUBKEY;
 
-  err = kcmd (&sock, ahost, rport, NULL,	/* locuser not used */
-	      remuser, cmd, fd2p, &ticket, SERVICE_NAME, realm, cred,	/* filled in */
-	      sched,		/* filled in */
-	      &msg_dat,		/* filled in */
+  err = kcmd (ctx, &sock, ahost, rport,
+	      NULL,		/* locuser not used */
+	      remuser, cmd, fd2p,
+	      SERVICE_NAME, realm,
+	      key,		/* filled in */
 	      &laddr,		/* filled in */
 	      &faddr,		/* filled in */
 	      authopts);
 
-  if (err > KSUCCESS && err < MAX_KRB_ERRORS)
+  if (err > 0)
     {
-      fprintf (stderr, "krcmd_mutual: %s\n", krb_err_txt[err]);
+      const char *text = krb5_get_error_message (*ctx, err);
+
+      fprintf (stderr, "krcmd_mutual: %s\n", text);
+      krb5_free_error_message (*ctx, text);
       return (-1);
     }
 
@@ -252,6 +261,6 @@ krcmd_mutual (char **ahost, unsigned short rport, char *remuser, char *cmd,
     return (-1);
   return (sock);
 }
-#  endif /* CRYPT */
-# endif	/* KERBEROS */
-#endif /* KERBEROS */
+#  endif /* KRB5 && !SHISHI */
+# endif /* ENCRYPTION  */
+#endif /* KRB5 || SHISHI */
diff --git a/src/rsh.c b/src/rsh.c
index 091ccd0..4ea507e 100644
--- a/src/rsh.c
+++ b/src/rsh.c
@@ -79,14 +79,12 @@
 #include <libinetutils.h>
 #include <unused-parameter.h>
 
-#ifdef KERBEROS
-# ifdef HAVE_KERBEROSIV_DES_H
-#  include <kerberosIV/des.h>
-# endif
-# ifdef KERBEROSIV_KRB_H
-#  include <kerberosIV/krb.h>
+#ifdef KRB5
+# ifdef HAVE_KRB5_H
+#  include <krb5.h>
 # endif
-#endif /* KERBEROS */
+# include "kerberos5_def.h"
+#endif /* KRB5 */
 
 #ifdef SHISHI
 # include <shishi.h>
@@ -100,14 +98,14 @@ char *user = NULL;
 sa_family_t family = AF_UNSPEC;
 #endif
 
-#if defined KERBEROS || defined SHISHI
+#if defined KRB5 || defined SHISHI
 int use_kerberos = 1, doencrypt;
 const char *dest_realm = NULL;
 
-# ifdef KERBEROS
-CREDENTIALS cred;
-Key_schedule schedule;
-extern char *krb_realmofhost ();
+# ifdef KRB5
+krb5_context ctx;
+krb5_keyblock *keyblock;
+krb5_principal server;
 
 # elif defined(SHISHI)
 Shishi *h;
@@ -120,7 +118,7 @@ int keylen;
 int rc;
 int wlen;
 # endif /* SHISHI */
-#endif /* KERBEROS || SHISHI */
+#endif /* KRB5 || SHISHI */
 
 /*
  * rsh - remote shell
@@ -156,7 +154,7 @@ static struct argp_option options[] = {
   { "ipv6", '6', NULL, 0, "use only IPv6", GRP },
 #endif
 #undef GRP
-#if defined KERBEROS || defined SHISHI
+#if defined KRB5 || defined SHISHI
 # define GRP 20
   { "kerberos", 'K', NULL, 0,
     "turns off all Kerberos authentication", GRP },
@@ -168,7 +166,7 @@ static struct argp_option options[] = {
     "encrypt all data transfer", GRP },
 # endif /* ENCRYPTION */
 # undef GRP
-#endif /* KERBEROS || SHISHI */
+#endif /* KRB5 || SHISHI */
   { NULL, 0, NULL, 0, NULL, 0 }
 };
 
@@ -200,7 +198,7 @@ parse_opt (int key, char *arg,
       user = arg;
       break;
 
-#if defined KERBEROS || defined SHISHI
+#if defined KRB5 || defined SHISHI
     case 'K':
       use_kerberos = 0;
       break;
@@ -212,12 +210,9 @@ parse_opt (int key, char *arg,
 # ifdef ENCRYPTION
     case 'x':
       doencrypt = 1;
-#  ifdef KERBEROS
-      des_set_key (cred.session, schedule);
-#  endif
       break;
 # endif
-#endif /* KERBEROS || SHISHI */
+#endif /* KRB5 || SHISHI */
 
     case 'n':
       null_input_option = 1;
@@ -242,7 +237,7 @@ main (int argc, char **argv)
   struct servent *sp;
   sigset_t sigs, osigs;
   int asrsh, rem;
-#if defined KERBEROS || defined SHISHI
+#if defined KRB5 || defined SHISHI
   int krb_errno;
 #endif
   pid_t pid = 0;
@@ -311,7 +306,7 @@ main (int argc, char **argv)
       }
   }
 
-#if defined KERBEROS || defined SHISHI
+#if defined KRB5 || defined SHISHI
 # ifdef ENCRYPTION
   /* -x turns off -n */
   if (doencrypt)
@@ -322,18 +317,7 @@ main (int argc, char **argv)
   args = copyargs (argv);
 
   sp = NULL;
-#ifdef KERBEROS
-  if (use_kerberos)
-    {
-      sp = getservbyname ((doencrypt ? "ekshell" : "kshell"), "tcp");
-      if (sp == NULL)
-	{
-	  use_kerberos = 0;
-	  warning ("can't get entry for %s/tcp service",
-		   doencrypt ? "ekshell" : "kshell");
-	}
-    }
-#elif defined(SHISHI)
+#if defined KRB5 || defined SHISHI
   if (use_kerberos)
     {
       sp = getservbyname ("kshell", "tcp");
@@ -349,23 +333,40 @@ main (int argc, char **argv)
   if (sp == NULL)
     error (EXIT_FAILURE, 0, "shell/tcp: unknown service");
 
+#if defined KRB5
+  if (use_kerberos)
+    {
+      rem = krb5_init_context (&ctx);
+      if (rem)
+	error (EXIT_FAILURE, errno, "Error initializing krb5");
+    }
+#endif /* KRB5 */
 
-#if defined KERBEROS || defined SHISHI
+#if defined KRB5 || defined SHISHI
 try_connect:
   if (use_kerberos)
     {
-# if defined KERBEROS
+# if defined KRB5
       struct hostent *hp;
 
-      /* fully qualify hostname (needed for krb_realmofhost) */
+      /* Get fully qualify hostname for realm determination.  */
       hp = gethostbyname (host);
       if (hp != NULL && !(host = strdup (hp->h_name)))
 	error (EXIT_FAILURE, errno, "strdup");
 
-      rem = KSUCCESS;
+      rem = 0;
       krb_errno = 0;
+
       if (dest_realm == NULL)
-	dest_realm = krb_realmofhost (host);
+	{
+	  krb_errno = krb5_sname_to_principal (ctx, host, SERVICE,
+					       KRB5_NT_SRV_HST,
+					       &server);
+	  if (krb_errno)
+	    warning ("cannot assign principal to host %s", host);
+	  else
+	    dest_realm = krb5_principal_get_realm (ctx, server);
+	}
 # elif defined SHISHI
       rem = SHISHI_OK;
       krb_errno = 0;
@@ -373,18 +374,26 @@ try_connect:
 
 # ifdef ENCRYPTION
       if (doencrypt)
-#  if defined SHISHI
 	{
 	  int i;
+#  if defined KRB5 || defined SHISHI
 	  char *term;
 
 	  term = xmalloc (strlen (args) + 4);
 	  strcpy (term, "-x ");
 	  strcat (term, args);
 
+#   ifdef SHISHI
 	  rem = krcmd_mutual (&h, &host, sp->s_port, &user, term, &rfd2,
 			      dest_realm, &enckey, family);
+#   else /* KRB5 && !SHISHI */
+	  rem = krcmd_mutual (&ctx, &host, sp->s_port, &user, args,
+			      &rfd2, dest_realm, &keyblock);
+#   endif
 	  krb_errno = errno;
+	  free (term);
+
+#   ifdef SHISHI
 	  if (rem > 0)
 	    {
 	      keytype = shishi_key_type (enckey);
@@ -436,27 +445,27 @@ try_connect:
 		    }
 		}
 	    }
-	  free (term);
+#   endif /* SHISHI */
+#  endif /* KRB5 || SHISHI */
 	}
       else
-#  else /* KERBEROS */
-	{
-	  rem = krcmd_mutual (&host, sp->s_port, user, args, &rfd2,
-			      dest_realm, &cred, schedule);
-	  krb_errno = errno;
-	}
-      else
-#  endif
 # endif /* ENCRYPTION */
 	{
 # if defined SHISHI
 	  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
+# else /* KRB5 && !SHISHI */
+	  rem = krcmd (&ctx, &host, sp->s_port, &user, args,
+		       &rfd2, dest_realm);
+# endif /* KRB5 */
 	  krb_errno = errno;
 	}
+
+# ifdef KRB5
+      /* No more use of dest_realm.  */
+      krb5_free_principal (ctx, server);
+# endif
+
       if (rem < 0)
 	{
 	  use_kerberos = 0;
@@ -494,7 +503,7 @@ try_connect:
       rem = rcmd (&host, sp->s_port, pw->pw_name, user, args, &rfd2);
 # endif
     }
-#else /* !KERBEROS && !SHISHI */
+#else /* !KRB5 && !SHISHI */
   if (!user)
     user = pw->pw_name;
 # ifdef WITH_ORCMD_AF
@@ -506,7 +515,7 @@ try_connect:
 # else /* !WITH_ORCMD_AF && !WITH_RCMD_AF && !WITH_ORCMD */
   rem = rcmd (&host, sp->s_port, pw->pw_name, user, args, &rfd2);
 # endif
-#endif /* !KERBEROS && !SHISHI */
+#endif /* !KRB5 && !SHISHI */
 
   if (rem < 0)
     {
@@ -565,7 +574,7 @@ try_connect:
 	error (EXIT_FAILURE, errno, "fork");
     }
 
-#if defined KERBEROS || defined SHISHI
+#if defined KRB5 || defined SHISHI
 # ifdef ENCRYPTION
   if (!doencrypt)
 # endif

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

Summary of changes:
 ChangeLog                    |   30 +++++++++++
 bootstrap                    |    2 +-
 libinetutils/Makefile.am     |    3 +-
 libinetutils/kerberos5_def.h |   54 +++++++++++++++++++
 libinetutils/krcmd.c         |   99 +++++++++++++++++++----------------
 src/rsh.c                    |  119 ++++++++++++++++++++++-------------------
 6 files changed, 205 insertions(+), 102 deletions(-)
 create mode 100644 libinetutils/kerberos5_def.h


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Sat Apr 26 13:04:57 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1We625-0002zI-96
	for mharc-commit-inetutils@gnu.org; Sat, 26 Apr 2014 13:04:57 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:33355)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1We621-0002pb-Na
	for commit-inetutils@gnu.org; Sat, 26 Apr 2014 13:04:56 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1We61z-0006uH-AK
	for commit-inetutils@gnu.org; Sat, 26 Apr 2014 13:04:53 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:34060)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1We61z-0006uB-5u
	for commit-inetutils@gnu.org; Sat, 26 Apr 2014 13:04:51 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1We61x-0000Ly-Le
	for commit-inetutils@gnu.org; Sat, 26 Apr 2014 17:04:50 +0000
Date: Sat, 26 Apr 2014 17:04:49 +0000
Message-Id: <E1We61x-0000Ly-Le@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_2-19-g547bb31
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: df4d445682e20b0c0b111eadc88b6c11599a0357
X-Git-Newrev: 547bb31ef5a971fcd310b741a20cbe1b0959770a
From: Mats Erik Andersson <gnu@gisladisker.se>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
	<commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 26 Apr 2014 17:04:56 -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  547bb31ef5a971fcd310b741a20cbe1b0959770a (commit)
      from  df4d445682e20b0c0b111eadc88b6c11599a0357 (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=547bb31ef5a971fcd310b741a20cbe1b0959770a


commit 547bb31ef5a971fcd310b741a20cbe1b0959770a
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Sat Apr 26 18:56:19 2014 +0200

    libinetutils: Skeletal preparations for Heimdal.
    
    Lay the foundation for separate authentication code to be
    used by the r-commands when built with standard Kerberos5.

diff --git a/ChangeLog b/ChangeLog
index 4918c45..d0b8bd4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2014-04-26  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	libinetutils: Skeletal preparations for Heimdal.
+
+	* configure.ac <krb5>: Disable rlogind and rshd.
+	(KERBEROS_VERSION): Publish it using AC_SUBST.
+
+	* libinetutils/kerberos5.c: New file, mostly copied
+	in from `shishi.c' as a guide.
+
+	* libinetutils/Makefile.am (libinetutils_a_SOURCES):
+	Remove `des_rw.c', and add `kerberos5.c'.
+
+	* libinetutils/kcmd.c: Remove support for KRB4, replacing
+	all macros KERBEROS by KRB5.
+	[KRB5]: Include <krb5.h> and "kerberos5_def.h".
+	[KRB5] (kcmd): Update declarations, and make small,
+	obvious adaptions to Kerberos5.
+	(kcmd): Refactor steps common to SHISHI and KRB5, such as
+	protocol exchange and address resolution.  They differ at
+	the end, calling shishi_auth() or kerberos_auth().
+
 2014-04-25  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	Begin support for Heimdal's Kerberos.
diff --git a/configure.ac b/configure.ac
index 7ad7690..3915b8e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -356,11 +356,14 @@ if test "$enable_encryption" = yes \
 			krb5/asn1.h krb5/crc-32.h krb5/ext-proto.h \
 			krb5/krb5.h krb5/los-proto.h])
       CPPFLAGS=$save_CPPFLAGS
-      # We have no support for krcmd() with Kerberos5.
+      # We have limited support for krcmd() with Kerberos5.
       # Encryption must be sorted out as a first step.
       IU_DISABLE_TARGET(rcp)
       IU_DISABLE_TARGET(rlogin)
       IU_DISABLE_TARGET(rsh)
+      # Likewise, we need to migrate away from KRB4 and des_*()
+      IU_DISABLE_TARGET(rlogind)
+      IU_DISABLE_TARGET(rshd)
     fi
     ;;
   *)
@@ -390,6 +393,7 @@ if test "$enable_encryption" = yes \
 fi
 AC_SUBST(LIBAUTH)
 AC_SUBST(INCAUTH)
+AC_SUBST(KERBEROS_VERSION)
 
 # Define CPP macros that enable auth/encrypt code
 if test ".$LIBAUTH" != .; then
diff --git a/libinetutils/Makefile.am b/libinetutils/Makefile.am
index 87922f5..b256545 100644
--- a/libinetutils/Makefile.am
+++ b/libinetutils/Makefile.am
@@ -37,9 +37,9 @@ libinetutils_a_SOURCES = \
  cleansess.c\
  daemon.c\
  defauthors.c\
- des_rw.c\
  if_index.c \
  kcmd.c\
+ kerberos5.c \
  krcmd.c\
  localhost.c\
  logwtmpko.c\
diff --git a/libinetutils/kcmd.c b/libinetutils/kcmd.c
index ac8afaa..c7cc639 100644
--- a/libinetutils/kcmd.c
+++ b/libinetutils/kcmd.c
@@ -49,7 +49,7 @@
 
 #include <config.h>
 
-#if defined KERBEROS || defined SHISHI
+#if defined KRB5 || defined SHISHI
 
 # include <sys/param.h>
 # include <sys/file.h>
@@ -60,17 +60,15 @@
 # include <netinet/in.h>
 # include <arpa/inet.h>
 
-# if defined KERBEROS
-#  ifdef HAVE_KERBEROSIV_DES_H
-#   include <kerberosIV/des.h>
+# if defined KRB5
+#  ifdef HAVE_KRB5_H
+#   include <krb5.h>
 #  endif
-#  ifdef HAVE_KERBEROSIV_KRB_H
-#   include <kerberosIV/krb.h>
-#  endif
-# elif defined(SHISHI)
+#  include "kerberos5_def.h"
+# elif defined(SHISHI) /* !KRB5 */
 #  include <shishi.h>
 #  include "shishi_def.h"
-# endif
+# endif /* SHISHI && !KRB5 */
 
 # include <ctype.h>
 # include <errno.h>
@@ -90,20 +88,21 @@
 
 int getport (int *, int);
 
-# if defined KERBEROS
+# if defined KRB5
 int
-kcmd (int *sock, char **ahost, unsigned short rport, char *locuser,
-      char *remuser, char *cmd, int *fd2p, KTEXT ticket,
-      char *service, const char *realm,
-      CREDENTIALS * cred, Key_schedule schedule, MSG_DAT * msg_data,
-      struct sockaddr_in *laddr, struct sockaddr_in *faddr, long authopts)
-# elif defined(SHISHI)
+kcmd (krb5_context *ctx, int *sock, char **ahost, unsigned short rport,
+      char *locuser, char **remuser, char *cmd, int *fd2p,
+      char *service, const char *realm, krb5_keyblock **key,
+      struct sockaddr_in *laddr, struct sockaddr_in *faddr,
+      long authopts)
+# elif defined(SHISHI) /* !KRB5 */
 int
-kcmd (Shishi ** h, int *sock, char **ahost, unsigned short rport, char *locuser,
-      char **remuser, char *cmd, int *fd2p, char *service, const char *realm,
-      Shishi_key ** key, struct sockaddr_storage *laddr,
-      struct sockaddr_storage *faddr, long authopts, int af)
-# endif
+kcmd (Shishi ** h, int *sock, char **ahost, unsigned short rport,
+      char *locuser, char **remuser, char *cmd, int *fd2p,
+      char *service, const char *realm, Shishi_key ** key,
+      struct sockaddr_storage *laddr, struct sockaddr_storage *faddr,
+      long authopts, int af)
+# endif /* SHISHI && !KRB5 */
 {
   int s, timo = 1, pid;
 # ifdef HAVE_SIGACTION
@@ -130,10 +129,6 @@ kcmd (Shishi ** h, int *sock, char **ahost, unsigned short rport, char *locuser,
   char *host_save, *host;
   int status;
 
-# if defined SHISHI
-  int zero = 0;
-# endif
-
   pid = getpid ();
 
   /* Extract Kerberos instance name.  */
@@ -145,7 +140,11 @@ kcmd (Shishi ** h, int *sock, char **ahost, unsigned short rport, char *locuser,
 
 # if HAVE_DECL_GETADDRINFO
   memset (&hints, 0, sizeof (hints));
+#  ifdef KRB5
+  hints.ai_family = AF_INET;
+#  else /* SHISHI && !KRB5 */
   hints.ai_family = af;
+#  endif
   hints.ai_socktype = SOCK_STREAM;
   hints.ai_flags = AI_CANONNAME;
   snprintf (portstr, sizeof (portstr), "%hu", ntohs (rport));
@@ -212,12 +211,6 @@ kcmd (Shishi ** h, int *sock, char **ahost, unsigned short rport, char *locuser,
       *ahost = p;
     }
 
-# ifdef KERBEROS
-  /* If realm is null, look up from table */
-  if (realm == NULL || realm[0] == '\0')
-    realm = krb_realmofhost (host_save);
-# endif	/* KERBEROS */
-
 # ifdef HAVE_SIGACTION
   sigemptyset (&sigs);
   sigaddset (&sigs, SIGURG);
@@ -350,7 +343,7 @@ kcmd (Shishi ** h, int *sock, char **ahost, unsigned short rport, char *locuser,
 # if HAVE_DECL_GETADDRINFO
   if (res)
     freeaddrinfo (res);
-#endif
+# endif
 
   lport--;
   if (fd2p == 0)
@@ -411,35 +404,15 @@ kcmd (Shishi ** h, int *sock, char **ahost, unsigned short rport, char *locuser,
   /* write(s, locuser, strlen(locuser)+1); */
 
   /* set up the needed stuff for mutual auth, but only if necessary */
-# ifdef KERBEROS
-  if (authopts & KOPT_DO_MUTUAL)
-    {
-      int sin_len;
-
-      *faddr = sin;
-
-      sin_len = sizeof (*laddr);
-      if (getsockname (s, (struct sockaddr *) laddr, &sin_len) < 0)
-	{
-	  perror ("kcmd(getsockname)");
-	  status = -1;
-	  goto bad2;
-	}
-    }
-
-  if ((status = krb_sendauth (authopts, s, ticket, service, *ahost,
-			      realm, (unsigned long) getpid (), msg_data,
-			      cred, schedule,
-			      laddr, faddr, "KCMDV0.1")) != KSUCCESS)
-    goto bad2;
-
-  write (s, remuser, strlen (remuser) + 1);
-# elif defined(SHISHI)
+# ifdef KRB5
+  if (authopts & AP_OPTS_MUTUAL_REQUIRED)
+# elif defined(SHISHI) /* !KRB5 */
   if (authopts & SHISHI_APOPTIONS_MUTUAL_REQUIRED)
+# endif
     {
       socklen_t sin_len;
 
-      *faddr = sin;
+      memcpy (faddr, &sin, sizeof(*faddr));
 
       sin_len = sizeof (*laddr);
       if (getsockname (s, (struct sockaddr *) laddr, &sin_len) < 0)
@@ -452,25 +425,37 @@ kcmd (Shishi ** h, int *sock, char **ahost, unsigned short rport, char *locuser,
 
   (void) service;	/* Silence warning.  XXX: Implicit use?  */
 
-  if ((status =
-       shishi_auth (h, 0, remuser, *ahost, s, cmd, rport, key,
-		    realm)) != SHISHI_OK)
+# ifdef KRB5
+  status = kerberos_auth (ctx, 0, remuser, *ahost, s,
+			  cmd, rport, key, realm);
+  if (status != 0)
     goto bad2;
 
+# elif defined(SHISHI) /* !KRB5 */
+  status = shishi_auth (h, 0, remuser, *ahost, s,
+			cmd, rport, key, realm);
+  if (status != SHISHI_OK)
+    goto bad2;
+
+# endif /* SHISHI && !KRB5 */
+
   write (s, *remuser, strlen (*remuser) + 1);
-# endif	/* SHISHI */
 
   write (s, cmd, strlen (cmd) + 1);
 
-# ifdef SHISHI
   if (locuser && locuser[0])
     write (s, locuser, strlen (locuser) + 1);
   else
     write (s, *remuser, strlen (*remuser) + 1);
-  write (s, &zero, sizeof (int));	/* XXX: not protocol */
-# endif
 
-  if ((rc = read (s, &c, 1)) != 1)
+  {
+    int zero = 0;	/* No forwarding of credentials.  */
+
+    write (s, &zero, sizeof (zero));
+  }
+
+  rc = read (s, &c, sizeof (c));
+  if (rc != sizeof (c))
     {
       if (rc == -1)
 	perror (*ahost);
@@ -497,11 +482,11 @@ kcmd (Shishi ** h, int *sock, char **ahost, unsigned short rport, char *locuser,
   sigsetmask (oldmask);
 # endif /* !HAVE_SIGACTION */
   *sock = s;
-# if defined KERBEROS
-  return (KSUCCESS);
-# elif defined(SHISHI)
+# if defined KRB5
+  return (0);
+# elif defined(SHISHI) /* !KRB5 */
   return (SHISHI_OK);
-# endif
+# endif /* SHISHI && !KRB5 */
 bad2:
   if (lport)
     close (*fd2p);
@@ -569,4 +554,4 @@ getport (int *alport, int af)
     }
 }
 
-#endif /* KERBEROS || SHISHI */
+#endif /* KRB5 || SHISHI */
diff --git a/libinetutils/kerberos5.c b/libinetutils/kerberos5.c
new file mode 100644
index 0000000..41a657e
--- /dev/null
+++ b/libinetutils/kerberos5.c
@@ -0,0 +1,483 @@
+/* shishi.c -- functions to use Heimdal's and MIT's Kerberos V
+  Copyright (C) 2014 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#ifdef KRB5
+# include <stdio.h>
+# include <stdlib.h>
+# include <string.h>
+# include <unistd.h>
+
+# include <krb5.h>
+# include "kerberos5_def.h"
+
+/* authentication, client side */
+int
+kerberos_auth (krb5_context *ctx, int verbose, char **cname,
+	       const char *sname, int sock, char *cmd,
+	       unsigned short port, krb5_keyblock **key,
+	       const char *realm)
+{
+  int rc;
+  char *out, *p;
+  size_t outlen;
+  int krb5len, msglen;
+  char *tmpserver;
+  char auth;
+  /* KERBEROS 5 SENDAUTH MESSAGE */
+  char krb5sendauth[] = "KRB5_SENDAUTH_V1.0";
+  /* PROTOCOL VERSION */
+  char krb5sendclient[] = "KCMDV0.2";
+
+  /* to store error msg sent by server */
+  char errormsg[101];
+  char cksumdata[101];
+
+  krb5_data cksum_data;
+  krb5_principal server;
+  krb5_auth_context auth_ctx = NULL;
+  krb5_flags authopts = AP_OPTS_USE_SUBKEY;
+
+  if (krb5_sname_to_principal (*ctx, sname, "host",
+			       KRB5_NT_SRV_HST, &server))
+    return (-1);
+
+  /* If realm is null, look up from table */
+  if (realm == NULL || realm[0] == '\0')
+#  ifdef KRB5_GENERAL__ /* MIT */
+    realm = (char *) krb5_princ_realm (*ctx, server);
+#  else /* Heimdal */
+    realm = krb5_principal_get_realm (*ctx, server);
+#  endif
+
+  /* size of KRB5 auth message */
+  krb5len = strlen (krb5sendauth) + 1;
+  msglen = htonl (krb5len);
+  write (sock, &msglen, sizeof (int));
+  /* KRB5 authentication message */
+  write (sock, krb5sendauth, krb5len);
+  /* size of client message */
+  krb5len = strlen (krb5sendclient) + 1;
+  msglen = htonl (krb5len);
+  write (sock, &msglen, sizeof (int));
+  /* KRB5 client message */
+  write (sock, krb5sendclient, krb5len);
+
+  /* get answer from server 0 = ok, 1 = error with message */
+  read (sock, &auth, 1);
+  if (auth)
+    {
+      ssize_t n;
+
+      errormsg[0] = '\0';
+      n = read (sock, errormsg, sizeof (errormsg) - 1);
+
+      if (n >= 0 && n < (ssize_t) sizeof (errormsg))
+	errormsg[n] = '\0';
+      else
+	errormsg[sizeof (errormsg) -1] = '\0';
+
+      fprintf (stderr, "Error during server authentication : %s\n", errormsg);
+      return -1;
+    }
+
+  if (verbose)
+    {
+      printf ("Client: %s\n", *cname);
+      printf ("Server: %s\n", sname);
+    }
+
+  /* Get a ticket for the server. */
+
+  tmpserver = malloc (strlen (SERVICE) + strlen (sname) + 2);
+  if (!tmpserver)
+    {
+      perror ("kerberos_auth()");
+      return -1;
+    }
+
+  p = strchr (sname, '/');
+  if (p && (p != sname))
+    strcpy (tmpserver, sname);	/* Non-empty prefix.  */
+  else
+    sprintf (tmpserver, "%s/%s", SERVICE, sname + (p ? 1 : 0));
+
+  /* Retrieve realm assigned to this server as per configuration,
+   * unless an explicit domain was passed in the call.
+   */
+  if (!realm)
+    {
+      if (!p)
+	p = (char *) sname;
+      else if (*p == '/')
+	++p;
+    }
+
+  /* checksum = port: terminal name */
+
+  cksum_data.length = snprintf (cksumdata, sizeof (cksumdata) - 1,
+				"%u:%s%s", ntohs (port), cmd, *cname);
+
+  if (strncmp (cmd, "-x ", 3) == 0)
+    authopts |= AP_OPTS_MUTUAL_REQUIRED;
+
+  cksum_data.data = cksumdata;
+
+  rc = krb5_sendauth (*ctx, &auth_ctx, &sock, "KCMDV0.2",
+		      NULL, server, authopts, &cksum_data,
+		      NULL, NULL, NULL, NULL, NULL);
+
+  if (rc == KRB5_SENDAUTH_REJECTED)
+  {
+    fprintf (stderr, "server rejected authentication");
+    return rc;
+  }
+
+  krb5_free_principal (*ctx, server);
+# if 0
+  krb5_data_free (&cksum_data);
+# endif
+
+  rc = krb5_auth_con_getlocalsubkey (*ctx, auth_ctx, key);
+
+  /* send size of AP-REQ to the server */
+
+  msglen = outlen;
+  msglen = htonl (msglen);
+  write (sock, (char *) &msglen, sizeof (int));
+
+  /* send AP-REQ to the server */
+
+  write (sock, out, outlen);
+
+  /* read response from server - what ? */
+
+  read (sock, &rc, sizeof (rc));
+  if (rc)
+    return -1 /* SHISHI_APREP_VERIFY_FAILED */;
+
+  /* For mutual authentication, wait for server reply. */
+
+  /* We are now authenticated. */
+  if (verbose)
+    printf ("User authenticated.\n");
+
+  return 0;
+
+}
+
+/* authentication, server side */
+int
+get_auth (int infd, krb5_context *ctx, krb5_auth_context *actx,
+	  krb5_keyblock **key, const char **err_msg,
+	  int *protoversion, int *cksumtype,
+	  char **cksum, size_t *cksumlen, char *srvname)
+{
+  char *out;
+  size_t outlen;
+  char *buf;
+  int buflen;
+  int len;
+  int rc;
+  int error;
+  /* KERBEROS 5 SENDAUTH MESSAGE */
+  char krb5sendauth[] = "KRB5_SENDAUTH_V1.0";
+  /* PROTOCOL VERSION */
+  char krb5kcmd1[] = "KCMDV0.1";
+  char krb5kcmd2[] = "KCMDV0.2";
+  char *servername, *server = NULL, *realm = NULL;
+
+  *err_msg = NULL;
+  /* Get key for the server. */
+
+# if 0
+  /*
+   * XXX: Taken straight from the version for libshishi.
+   * XXX: No adaptions yet.
+   */
+  rc = shishi_init_server (handle);
+  if (rc != SHISHI_OK)
+    return rc;
+
+  if (srvname && *srvname)
+    {
+      rc = shishi_parse_name (*handle, srvname, &server, &realm);
+      if (rc != SHISHI_OK)
+	{
+	  *err_msg = shishi_strerror (rc);
+	  return rc;
+	}
+    }
+
+  if (server && *server)
+    {
+      char *p;
+
+      servername = malloc (sizeof (SERVICE) + strlen (server) + 2);
+      if (!servername)
+	{
+	  *err_msg = "Not enough memory";
+	  return SHISHI_TOO_SMALL_BUFFER;
+	}
+
+      p = strchr (server, '/');
+      if (p && (p != server))
+	sprintf (servername, "%s", server);	/* Non-empty prefix.  */
+      else
+	sprintf (servername, "%s/%s", SERVICE,
+		 server + (p ? 1 : 0));	/* Remove initial slash.  */
+    }
+  else
+    servername = shishi_server_for_local_service (*handle, SERVICE);
+
+  if (realm && *realm)
+    shishi_realm_default_set (*handle, realm);
+
+  free (server);
+  free (realm);
+
+  /* Enable use of `~/.k5login'.  */
+  if (shishi_check_version ("1.0.2"))	/* Faulty in version 1.0.1.  */
+    {
+      rc = shishi_cfg_authorizationtype_set (*handle, "k5login basic");
+      if (rc != SHISHI_OK)
+	{
+	  *err_msg = shishi_error (*handle);
+	  return rc;
+	}
+    }
+
+  key = shishi_hostkeys_for_serverrealm (*handle, servername,
+					 shishi_realm_default (*handle));
+  free (servername);
+  if (!key)
+    {
+      *err_msg = shishi_error (*handle);
+      return SHISHI_INVALID_KEY;
+    }
+
+  /* Read Kerberos 5 sendauth message */
+  rc = read (infd, &len, sizeof (int));
+  if (rc != sizeof (int))
+    {
+      *err_msg = "Error reading message size";
+      return SHISHI_IO_ERROR;
+    }
+
+  buflen = ntohl (len);
+  buf = malloc (buflen);
+  if (!buf)
+    {
+      *err_msg = "Not enough memory";
+      return SHISHI_TOO_SMALL_BUFFER;
+    }
+
+  rc = read (infd, buf, buflen);
+  if (rc != buflen)
+    {
+      *err_msg = "Error reading authentication message";
+      return SHISHI_IO_ERROR;
+    }
+
+  len = strlen (krb5sendauth);
+  rc = strncmp (buf, krb5sendauth, buflen >= len ? len : buflen);
+  if (rc)
+    {
+      *err_msg = "Invalid authentication type";
+      /* Authentication type is wrong.  */
+      write (infd, "\001", 1);
+      return SHISHI_VERIFY_FAILED;
+    }
+
+  free (buf);
+
+  /* Read protocol version */
+  rc = read (infd, &len, sizeof (int));
+  if (rc != sizeof (int))
+    {
+      *err_msg = "Error reading protocol message size";
+      return SHISHI_IO_ERROR;
+    }
+  buflen = ntohl (len);
+  buf = malloc (buflen);
+  if (!buf)
+    {
+      *err_msg = "Not enough memory";
+      return SHISHI_TOO_SMALL_BUFFER;
+    }
+
+  rc = read (infd, buf, buflen);
+  if (rc != buflen)
+    {
+      *err_msg = "Error reading protocol message";
+      return SHISHI_IO_ERROR;
+    }
+
+  len = strlen (krb5kcmd1);
+  rc = strncmp (buf, krb5kcmd1, buflen >= len ? len : buflen);
+  if (rc)
+    {
+      len = strlen (krb5kcmd2);
+      rc = strncmp (buf, krb5kcmd2, buflen >= len ? len : buflen);
+      if (rc)
+	{
+	  *err_msg = "Protocol version not supported";
+	  /* Protocol version is wrong.  */
+	  write (infd, "\002", 1);
+	  return SHISHI_VERIFY_FAILED;
+	}
+      *protoversion = 2;
+    }
+  else
+    *protoversion = 1;
+
+  free (buf);
+
+  /* Authentication type is ok */
+
+  write (infd, "\0", 1);
+
+  /* Read Authentication request from client */
+
+  rc = read (infd, &len, sizeof (int));
+  if (rc != sizeof (int))
+    {
+      *err_msg = "Error reading authentication request size";
+      return SHISHI_IO_ERROR;
+    }
+
+  buflen = ntohl (len);
+  buf = malloc (buflen);
+  if (!buf)
+    {
+      *err_msg = "Not enough memory";
+      return SHISHI_TOO_SMALL_BUFFER;
+    }
+
+  rc = read (infd, buf, buflen);
+  if (rc != buflen)
+    {
+      *err_msg = "Error reading authentication request";
+      return SHISHI_IO_ERROR;
+    }
+
+  /* Create Authentication context */
+
+  rc = shishi_ap_nosubkey (*handle, ap);
+  if (rc != SHISHI_OK)
+    return rc;
+
+  /* Store request in context */
+
+  rc = shishi_ap_req_der_set (*ap, buf, buflen);
+  if (rc != SHISHI_OK)
+    return rc;
+
+  free (buf);
+
+  /* Process authentication request */
+
+  rc = shishi_ap_req_process (*ap, key);
+  if (rc != SHISHI_OK)
+    return rc;
+
+# ifdef ENCRYPTION
+
+  /* extract subkey if present from ap exchange for secure connection */
+  if (*protoversion == 2)
+    {
+      *enckey = NULL;
+      shishi_authenticator_get_subkey (*handle,
+				       shishi_ap_authenticator (*ap), enckey);
+    }
+
+# endif
+
+  /* Get authenticator checksum */
+  rc = shishi_authenticator_cksum (*handle,
+				   shishi_ap_authenticator (*ap),
+				   cksumtype, cksum, cksumlen);
+  if (rc != SHISHI_OK)
+    return rc;
+
+  /* User is authenticated.  */
+  error = 0;
+  write (infd, &error, sizeof (int));
+
+  /* Authenticate ourself to client, if requested.  */
+
+  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;
+
+      len = outlen;
+      len = htonl (len);
+      rc = write (infd, &len, sizeof (len));
+      if (rc != sizeof (int))
+	{
+	  *err_msg = "Error sending AP-REP";
+	  free (out);
+	  return SHISHI_IO_ERROR;
+	}
+
+      rc = write (infd, out, ntohl (len));
+      if (rc != (int) ntohl (len))
+	{
+	  *err_msg = "Error sending AP-REP";
+	  free (out);
+	  return SHISHI_IO_ERROR;
+	}
+
+      free (out);
+
+      /* We are authenticated to client */
+    }
+
+# ifdef ENCRYPTION
+  if (*protoversion == 1)
+    {
+      Shishi_tkt *tkt;
+
+      tkt = shishi_ap_tkt (*ap);
+      if (tkt == NULL)
+	{
+	  *err_msg = "Could not get tkt from AP-REQ";
+	  return SHISHI_INVALID_TICKET;
+	}
+
+      rc = shishi_encticketpart_get_key (*handle,
+					 shishi_tkt_encticketpart (tkt),
+					 enckey);
+      if (rc != SHISHI_OK)
+	return rc;
+    }
+# endif /* ENCRYPTION */
+
+  return 0;
+# else
+  return -1;
+# endif
+}
+#endif /* KRB5 */

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

Summary of changes:
 ChangeLog                |   22 ++
 configure.ac             |    6 +-
 libinetutils/Makefile.am |    2 +-
 libinetutils/kcmd.c      |  125 ++++++-------
 libinetutils/kerberos5.c |  483 ++++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 566 insertions(+), 72 deletions(-)
 create mode 100644 libinetutils/kerberos5.c


hooks/post-receive
-- 
GNU Inetutils 


