get rid of lib/krb5util

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14574 dc483132-0cff-0310-8789-dd5450dbe970

8 files changed, 7 insertions, 640 deletions

diff --git a/src/lib/.Sanitize b/src/lib/.Sanitize
index 8aa5acac4..a669a93bd 100644
--- a/src/lib/.Sanitize
+++ b/src/lib/.Sanitize
@@ -44,7 +44,6 @@ krb4
 krb5
 krb5.saber.source
 krb5.saber.warnings
-krb5util
 libkrb5.def
 win_glue.c
 winsock.def
diff --git a/src/lib/ChangeLog b/src/lib/ChangeLog
index 4218a325f..f59632b36 100644
--- a/src/lib/ChangeLog
+++ b/src/lib/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-25  Ken Raeburn  <raeburn@mit.edu>
+
+	* Makefile.in (MY_SUBDIRS): Don't list krb5util.
+	(CLEANLIBS): Don't delete libkrb5util.a.
+
 2002-06-13  Ken Raeburn  <raeburn@mit.edu>
 
 	* Makefile.in (WINLIBS): Use ws2_32.lib instead of wsock32.lib.
diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
index b6a69b255..c82234fd3 100644
--- a/src/lib/Makefile.in
+++ b/src/lib/Makefile.in
@@ -1,7 +1,7 @@
 thisconfigdir=./..
 myfulldir=lib
 mydir=lib
-MY_SUBDIRS=crypto krb5 des425 @KRB4@ krb5util kdb gssapi rpc kadm5
+MY_SUBDIRS=crypto krb5 des425 @KRB4@ kdb gssapi rpc kadm5
 BUILDTOP=$(REL)$(U)
 
 MAC_SUBDIRS = crypto krb5 gssapi
@@ -12,7 +12,7 @@ all-mac::
 
 CLEANLIBS = libkrb5.a libkdb5.a libcrypto.a libgssapi_krb5.a libdes425.a \
 	libkrb425.a libkadm.a libkrb4.a libcom_err.a libpty.a \
-	libss.a libkrb5util.a libgssapi.a \
+	libss.a libgssapi.a \
 	libkrb5.so libcrypto.so libkrb4.so libdes425.so
 
 clean-mac:: clean-unix
diff --git a/src/lib/krb5util/.Sanitize b/src/lib/krb5util/.Sanitize
deleted file mode 100644
index 03489e494..000000000
--- a/src/lib/krb5util/.Sanitize
+++ /dev/null
@@ -1,37 +0,0 @@
-# Sanitize.in for Kerberos V5
-
-# Each directory to survive it's way into a release will need a file
-# like this one called "./.Sanitize".  All keyword lines must exist,
-# and must exist in the order specified by this file.  Each directory
-# in the tree will be processed, top down, in the following order.
-
-# Hash started lines like this one are comments and will be deleted
-# before anything else is done.  Blank lines will also be squashed
-# out.
-
-# The lines between the "Do-first:" line and the "Things-to-keep:"
-# line are executed as a /bin/sh shell script before anything else is
-# done in this 
-
-Do-first:
-
-# All files listed between the "Things-to-keep:" line and the
-# "Files-to-sed:" line will be kept.  All other files will be removed.
-# Directories listed in this section will have their own Sanitize
-# called.  Directories not listed will be removed in their entirety
-# with rm -rf.
-
-Things-to-keep:
-
-.cvsignore
-ChangeLog
-Makefile.in
-configure
-configure.in
-compat_recv.c
-seteuid.c
-Things-to-lose:
-
-Do-last:
-
-# End of file.
diff --git a/src/lib/krb5util/ChangeLog b/src/lib/krb5util/ChangeLog
deleted file mode 100644
index f335bfdd8..000000000
--- a/src/lib/krb5util/ChangeLog
+++ /dev/null
@@ -1,92 +0,0 @@
-2002-06-25  Ken Raeburn  <raeburn@mit.edu>
-
-	* seteuid.c: Deleted.
-	* Makefile.in (OBJS, STLIBOBJS, SRCS): Remove references.
-
-2001-10-05  Ken Raeburn  <raeburn@mit.edu>
-
-	* compat_recv.c: Drop _MSDOS support.
-
-2001-06-26  Ezra Peisach  <epeisach@mit.edu>
-
-	* compat_recv.c: Flush out prototype for static krb_v4_recvauth.
-
-2001-06-11  Ezra Peisach  <epeisach@mit.edu>
-
-	* compat_recv.c: Include k5-util.h to ensure new prototypes agree
-	with definitions.
-
-2000-10-23  Tom Yu  <tlyu@mit.edu>
-
-	* compat_recv.c (krb_v4_recvauth): Update call to mk_priv().
-	
-2000-05-31  Ken Raeburn  <raeburn@mit.edu>
-
-	* compat_recv.c (krb5_compat_recvauth_version): Variant of
-	krb5_compat_recvauth, similar to krb5_recvauth_version.
-
-1999-10-26  Wilfredo Sanchez  <tritan@mit.edu>
-
-	* Makefile.in: Clean up usage of CFLAGS, CPPFLAGS, DEFS, DEFINES,
-	LOCAL_INCLUDES such that one can override CFLAGS from the command
-	line without losing CPP search patchs and defines. Some associated
-	Makefile cleanup.
-
-1998-11-13  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-
-	* Makefile.in: Set the myfulldir and mydir variables (which are
-		relative to buildtop and thisconfigdir, respectively.)
-
-Mon Mar 23 17:34:50 1998  Tom Yu  <tlyu@mit.edu>
-
-	* seteuid.c (krb5_setegid): Fix typo: seteuid -> setegid.
-
-Sun Feb 22 19:22:18 1998  Tom Yu  <tlyu@mit.edu>
-
-	* configure.in: Add checks for set{re,e,res}gid().
-
-	* seteuid.c: Include k5-util.h rather than k5-int.h.  Add
-	krb5_setegid().
-
-Wed Feb 18 16:26:00 1998  Tom Yu  <tlyu@mit.edu>
-
-	* Makefile.in: Remove trailing slash from thisconfigdir.  Fix up
-	BUILDTOP for new conventions.
-
-Mon Feb  2 17:01:22 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-
-	* Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile
-
-Tue Jan  6 16:51:44 1998  Tom Yu  <tlyu@mit.edu>
-
-	* seteuid.c (krb5_seteuid): Don't check for _POSIX_SAVED_IDS, as
- 	4.4BSD derivatives don't define it but do have a reasonable
- 	seteuid anyway. [krb5-libs/503]
-
-Tue Nov 18 19:55:22 1997  Tom Yu  <tlyu@mit.edu>
-
-	* configure.in: Use new library build rules.
-
-	* Makefile.in: Use new library build rules.
-
-Tue Feb 18 09:47:34 1997  Ezra Peisach  <epeisach@mit.edu>
-
-	* compat_recv.c: Remove include of kerberosIV/krb4-proto.h
-
-Mon May 20 02:37:44 1996  Sam Hartman  <hartmans@mit.edu>
-
-	* seteuid.c: Include k5-int.h
-
-Sun May 19 23:28:22 1996  Sam Hartman  <hartmans@mit.edu>
-
-	* seteuid.c (krb5_seteuid): set saved uid to current effective
- 	uid, not current real uid, so we can get back, while calling
- 	setresuid().
-
-Sat May 18 04:41:55 1996  Sam Hartman  <hartmans@tertius.mit.edu>
-
-	* configure.in:  Check for functions needed to seteuid.
-
-	* seteuid.c (krb5_seteuid): New function to allow UID to be
-        changed and returned to later.
-
diff --git a/src/lib/krb5util/Makefile.in b/src/lib/krb5util/Makefile.in
deleted file mode 100644
index bc5836ea6..000000000
--- a/src/lib/krb5util/Makefile.in
+++ /dev/null
@@ -1,43 +0,0 @@
-thisconfigdir=.
-myfulldir=lib/krb5util
-mydir=.
-BUILDTOP=$(REL)$(U)$(S)$(U)
-
-##DOSBUILDTOP = ..\..
-##DOSLIBNAME=krb5util.lib
-
-OBJS=	compat_recv.$(OBJEXT)
-
-STLIBOBJS=compat_recv.o
-
-SRCS=	$(srcdir)/compat_recv.c
-
-LIB=krb5util
-LIBMAJOR=1
-LIBMINOR=0
-STOBJLISTS=OBJS.ST
-RELDIR=krb5util
-
-LIBNAME=libkrb5util.
-
-all-unix:: all-liblinks
-all-mac:: 
-all-windows:: 
-
-clean-unix:: clean-liblinks clean-libs clean-libobjs
-clean-mac::
-clean-windows::
-	$(RM) krb5util.lib krb5util.bak
-
-# +++ Dependency line eater +++
-# 
-# Makefile dependencies follow.  This must be the last section in
-# the Makefile.in file
-#
-compat_recv.so compat_recv.po $(OUTPRE)compat_recv.$(OBJEXT): compat_recv.c $(SRCTOP)/include/k5-int.h \
-  $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \
-  $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(SRCTOP)/include/port-sockets.h \
-  $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/krb5/kdb.h \
-  $(BUILDTOP)/include/profile.h $(SRCTOP)/include/kerberosIV/krb.h \
-  $(SRCTOP)/include/kerberosIV/des.h $(SRCTOP)/include/k5-util.h
-
diff --git a/src/lib/krb5util/compat_recv.c b/src/lib/krb5util/compat_recv.c
deleted file mode 100644
index c8e9f05c8..000000000
--- a/src/lib/krb5util/compat_recv.c
+++ /dev/null
@@ -1,457 +0,0 @@
-/*
- * lib/krb5/krb/compat_recv.c
- *
- * Copyright 1993 by the Massachusetts Institute of Technology.
- * All Rights Reserved.
- *
- * Export of this software from the United States of America may
- *   require a specific license from the United States Government.
- *   It is the responsibility of any person or organization contemplating
- *   export to obtain such a license before exporting.
- * 
- * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
- * distribute this software and its documentation for any purpose and
- * without fee is hereby granted, provided that the above copyright
- * notice appear in all copies and that both that copyright notice and
- * this permission notice appear in supporting documentation, and that
- * the name of M.I.T. not be used in advertising or publicity pertaining
- * to distribution of the software without specific, written prior
- * permission.  Furthermore if you modify this software you must label
- * your software as modified software and not distribute it in such a
- * fashion that it might be confused with the original M.I.T. software.
- * M.I.T. makes no representations about the suitability of
- * this software for any purpose.  It is provided "as is" without express
- * or implied warranty.
- * 
- *
- * convenience sendauth/recvauth functions, with compatibility with V4
- * recvauth.
- *
- * NOTE: linking in this function will pull in V4 kerberos routines.
- *
- * WARNING: In the V4-style arguments, the ticket and kdata arguments
- * have different types than the V4 recvauth; in V4, they were KTEXT
- * and AUTH_DAT *, respectively.  Here, they are KTEXT * and AUTH_DAT **
- * and they are allocated by recvauth if and only if we end up talking
- * to a V4 sendauth.
- */
-
-#define NEED_SOCKETS
-#include "k5-int.h"
-#if !defined(_MACINTOSH)
-#include <kerberosIV/krb.h>
-#include "com_err.h"
-#include <errno.h>
-
-#include <stdio.h>
-#include <string.h>
-#include "k5-util.h"
-
-static int krb_v4_recvauth(long options, int fd, KTEXT ticket,
-			   char *service, char *instance, 
-			   struct sockaddr_in *faddr,
-			   struct sockaddr_in *laddr,
-			   AUTH_DAT *kdata,
-			   char *filename,
-			   Key_schedule schedule,
-			   char *version);
-
-#define	KRB_V4_SENDAUTH_VERS	"AUTHV0.1" /* MUST be 8 chars long */
-#define KRB_V5_SENDAUTH_VERS	"KRB5_SENDAUTH_V1.0"
-
-#define KRB5_RECVAUTH_V4	4
-#define KRB5_RECVAUTH_V5	5
-
-krb5_error_code
-krb5_compat_recvauth(context, auth_context,
-	             /* IN */
-		     fdp, appl_version, server, flags, keytab,
-		     v4_options, v4_service, v4_instance, v4_faddr, v4_laddr,
-		     v4_filename, 
-		     /* OUT */
-		     ticket,
-		     auth_sys, v4_kdata, v4_schedule, v4_version)
-    krb5_context context;
-    krb5_auth_context  *auth_context;
-	krb5_pointer	fdp;
-	char	*appl_version;
-	krb5_principal	server;
-	krb5_int32	flags;
-	krb5_keytab    	keytab;
-	krb5_ticket  ** ticket;
-        krb5_int32      *auth_sys;
-
-	/*
-	 * Version 4 arguments
-	 */
-	krb5_int32 v4_options;	 /* bit-pattern of options */
-	char *v4_service;	 /* service expected */
-	char *v4_instance;	 /* inst expected (may be filled in) */
-	struct sockaddr_in *v4_faddr; /* foreign address */
-	struct sockaddr_in *v4_laddr; /* local address */
-	AUTH_DAT **v4_kdata;	 /* kerberos data (returned) */
-	char *v4_filename;	 /* name of file with service keys */
-	Key_schedule v4_schedule; /* key schedule (return) */
-	char *v4_version;		 /* version string (filled in) */
-{
-	union verslen {
-		krb5_int32	len;
-		char		vers[4];
-	} vers;
-	char	*buf;
-	int	len, length;
-	krb5_int32	retval;
-	int		fd = *( (int *) fdp);
-#ifdef KRB5_KRB4_COMPAT
-	KTEXT		v4_ticket;	 /* storage for client's ticket */
-#endif
-		
-	if ((retval = krb5_net_read(context, fd, vers.vers, 4)) != 4)
-		return((retval < 0) ? errno : ECONNABORTED);
-
-#ifdef KRB5_KRB4_COMPAT
-	if (!strncmp(vers.vers, KRB_V4_SENDAUTH_VERS, 4)) {
-		/*
-		 * We must be talking to a V4 sendauth; read in the
-		 * rest of the version string and make sure.
-		 */
-		if ((retval = krb5_net_read(context, fd, vers.vers, 4)) != 4)
-			return((retval < 0) ? errno : ECONNABORTED);
-		
-		if (strncmp(vers.vers, KRB_V4_SENDAUTH_VERS+4, 4))
-			return KRB5_SENDAUTH_BADAUTHVERS;
-
-		*auth_sys = KRB5_RECVAUTH_V4;
-
-		*v4_kdata = (AUTH_DAT *) malloc( sizeof(AUTH_DAT) );
-		v4_ticket = (KTEXT) malloc(sizeof(KTEXT_ST));
-
-		retval = krb_v4_recvauth(v4_options, fd, v4_ticket,
-					 v4_service, v4_instance, v4_faddr,
-					 v4_laddr, *v4_kdata, v4_filename,
-					 v4_schedule, v4_version);
-		krb5_xfree(v4_ticket);
-		/*
-		 * XXX error code translation?
-		 */
-		switch (retval) {
-		case RD_AP_OK:
-		    return 0;
-		case RD_AP_TIME:
-		    return KRB5KRB_AP_ERR_SKEW;
-		case RD_AP_EXP:
-		    return KRB5KRB_AP_ERR_TKT_EXPIRED;
-		case RD_AP_NYV:
-		    return KRB5KRB_AP_ERR_TKT_NYV;
-		case RD_AP_NOT_US:
-		    return KRB5KRB_AP_ERR_NOT_US;
-		case RD_AP_UNDEC:
-		    return KRB5KRB_AP_ERR_BAD_INTEGRITY;
-		case RD_AP_REPEAT:
-		    return KRB5KRB_AP_ERR_REPEAT;
-		case RD_AP_MSG_TYPE:
-		    return KRB5KRB_AP_ERR_MSG_TYPE;
-		case RD_AP_MODIFIED:
-		    return KRB5KRB_AP_ERR_MODIFIED;
-		case RD_AP_ORDER:
-		    return KRB5KRB_AP_ERR_BADORDER;
-		case RD_AP_BADD:
-		    return KRB5KRB_AP_ERR_BADADDR;
-		default:
-		    return KRB5_SENDAUTH_BADRESPONSE;
-		}
-	}
-#endif
-
-	/*
-	 * Assume that we're talking to a V5 recvauth; read in the
-	 * the version string, and make sure it matches.
-	 */
-	
-	len = (int) ntohl(vers.len);
-
-	if (len < 0 || len > 255)
-		return KRB5_SENDAUTH_BADAUTHVERS;
-
-	buf = malloc(len);
-	if (!buf)
-		return ENOMEM;
-	
-	length = krb5_net_read(context, fd, buf, len);
-	if (len != length) {
-		krb5_xfree(buf);
-		if (len < 0)
-			return errno;
-		else
-			return ECONNABORTED;
-	}
-
-	if (strcmp(buf, KRB_V5_SENDAUTH_VERS)) {
-		krb5_xfree(buf);
-		return KRB5_SENDAUTH_BADAUTHVERS;
-	}
-	krb5_xfree(buf);
-
-	*auth_sys = KRB5_RECVAUTH_V5;
-	
-	retval = krb5_recvauth(context, auth_context, fdp, appl_version, server,
-			       flags | KRB5_RECVAUTH_SKIP_VERSION, 
-			       keytab, ticket);
-
-	return retval;
-}
-
-krb5_error_code
-krb5_compat_recvauth_version(context, auth_context,
-			     /* IN */
-			     fdp, server, flags, keytab,
-			     v4_options, v4_service, v4_instance, v4_faddr,
-			     v4_laddr,
-			     v4_filename, 
-			     /* OUT */
-			     ticket,
-			     auth_sys, v4_kdata, v4_schedule,
-			     version)
-    krb5_context context;
-    krb5_auth_context  *auth_context;
-	krb5_pointer	fdp;
-	krb5_principal	server;
-	krb5_int32	flags;
-	krb5_keytab    	keytab;
-	krb5_ticket  ** ticket;
-        krb5_int32      *auth_sys;
-
-	/*
-	 * Version 4 arguments
-	 */
-	krb5_int32 v4_options;	 /* bit-pattern of options */
-	char *v4_service;	 /* service expected */
-	char *v4_instance;	 /* inst expected (may be filled in) */
-	struct sockaddr_in *v4_faddr; /* foreign address */
-	struct sockaddr_in *v4_laddr; /* local address */
-	AUTH_DAT **v4_kdata;	 /* kerberos data (returned) */
-	char *v4_filename;	 /* name of file with service keys */
-	Key_schedule v4_schedule; /* key schedule (return) */
-    krb5_data *version;		/* application version filled in */
-{
-	union verslen {
-		krb5_int32	len;
-		char		vers[4];
-	} vers;
-	char	*buf;
-	int	len, length;
-	krb5_int32	retval;
-	int		fd = *( (int *) fdp);
-#ifdef KRB5_KRB4_COMPAT
-	KTEXT		v4_ticket;	 /* storage for client's ticket */
-#endif
-		
-	if ((retval = krb5_net_read(context, fd, vers.vers, 4)) != 4)
-		return((retval < 0) ? errno : ECONNABORTED);
-
-#ifdef KRB5_KRB4_COMPAT
-	if (!strncmp(vers.vers, KRB_V4_SENDAUTH_VERS, 4)) {
-		/*
-		 * We must be talking to a V4 sendauth; read in the
-		 * rest of the version string and make sure.
-		 */
-		if ((retval = krb5_net_read(context, fd, vers.vers, 4)) != 4)
-			return((retval < 0) ? errno : ECONNABORTED);
-		
-		if (strncmp(vers.vers, KRB_V4_SENDAUTH_VERS+4, 4))
-			return KRB5_SENDAUTH_BADAUTHVERS;
-
-		*auth_sys = KRB5_RECVAUTH_V4;
-
-		*v4_kdata = (AUTH_DAT *) malloc( sizeof(AUTH_DAT) );
-		v4_ticket = (KTEXT) malloc(sizeof(KTEXT_ST));
-
-		version->length = KRB_SENDAUTH_VLEN; /* no trailing \0! */
-		version->data = malloc (KRB_SENDAUTH_VLEN + 1);
-		version->data[KRB_SENDAUTH_VLEN] = 0;
-		if (version->data == 0)
-		    return errno;
-		retval = krb_v4_recvauth(v4_options, fd, v4_ticket,
-					 v4_service, v4_instance, v4_faddr,
-					 v4_laddr, *v4_kdata, v4_filename,
-					 v4_schedule, version->data);
-		krb5_xfree(v4_ticket);
-		/*
-		 * XXX error code translation?
-		 */
-		switch (retval) {
-		case RD_AP_OK:
-		    return 0;
-		case RD_AP_TIME:
-		    return KRB5KRB_AP_ERR_SKEW;
-		case RD_AP_EXP:
-		    return KRB5KRB_AP_ERR_TKT_EXPIRED;
-		case RD_AP_NYV:
-		    return KRB5KRB_AP_ERR_TKT_NYV;
-		case RD_AP_NOT_US:
-		    return KRB5KRB_AP_ERR_NOT_US;
-		case RD_AP_UNDEC:
-		    return KRB5KRB_AP_ERR_BAD_INTEGRITY;
-		case RD_AP_REPEAT:
-		    return KRB5KRB_AP_ERR_REPEAT;
-		case RD_AP_MSG_TYPE:
-		    return KRB5KRB_AP_ERR_MSG_TYPE;
-		case RD_AP_MODIFIED:
-		    return KRB5KRB_AP_ERR_MODIFIED;
-		case RD_AP_ORDER:
-		    return KRB5KRB_AP_ERR_BADORDER;
-		case RD_AP_BADD:
-		    return KRB5KRB_AP_ERR_BADADDR;
-		default:
-		    return KRB5_SENDAUTH_BADRESPONSE;
-		}
-	}
-#endif
-
-	/*
-	 * Assume that we're talking to a V5 recvauth; read in the
-	 * the version string, and make sure it matches.
-	 */
-	
-	len = (int) ntohl(vers.len);
-
-	if (len < 0 || len > 255)
-		return KRB5_SENDAUTH_BADAUTHVERS;
-
-	buf = malloc(len);
-	if (!buf)
-		return ENOMEM;
-	
-	length = krb5_net_read(context, fd, buf, len);
-	if (len != length) {
-		krb5_xfree(buf);
-		if (len < 0)
-			return errno;
-		else
-			return ECONNABORTED;
-	}
-
-	if (strcmp(buf, KRB_V5_SENDAUTH_VERS)) {
-		krb5_xfree(buf);
-		return KRB5_SENDAUTH_BADAUTHVERS;
-	}
-	krb5_xfree(buf);
-
-	*auth_sys = KRB5_RECVAUTH_V5;
-	
-	retval = krb5_recvauth_version(context, auth_context, fdp, server,
-				       flags | KRB5_RECVAUTH_SKIP_VERSION, 
-				       keytab, ticket, version);
-
-	return retval;
-}
-
-
-#ifndef max
-#define	max(a,b) (((a) > (b)) ? (a) : (b))
-#endif /* max */
-
-#ifdef KRB5_KRB4_COMPAT	
-static int
-krb_v4_recvauth(options, fd, ticket, service, instance, faddr, laddr, kdata,
-		filename, schedule, version)
-long options;			 /* bit-pattern of options */
-int fd;				 /* file descr. to read from */
-KTEXT ticket;			 /* storage for client's ticket */
-char *service;			 /* service expected */
-char *instance;			 /* inst expected (may be filled in) */
-struct sockaddr_in *faddr;	 /* address of foreign host on fd */
-struct sockaddr_in *laddr;	 /* local address */
-AUTH_DAT *kdata;		 /* kerberos data (returned) */
-char *filename;			 /* name of file with service keys */
-Key_schedule schedule;		 /* key schedule (return) */
-char *version;			 /* version string (filled in) */
-{
-    int cc, old_vers = 0;
-    int rem;
-    krb5_int32 tkt_len, priv_len;
-    krb5_ui_4 cksum;
-    u_char tmp_buf[MAX_KTXT_LEN+max(KRB_SENDAUTH_VLEN+1,21)];
-
-    /* read the application version string */
-    if ((krb_net_read(fd, version, KRB_SENDAUTH_VLEN) !=
-	 KRB_SENDAUTH_VLEN))
-	return(errno);
-    version[KRB_SENDAUTH_VLEN] = '\0';
-
-    /* get the length of the ticket */
-    if (krb_net_read(fd, (char *)&tkt_len, sizeof(tkt_len)) !=
-	sizeof(tkt_len))
-	return(errno);
-    
-    /* sanity check */
-    ticket->length = ntohl((unsigned long)tkt_len);
-    if ((ticket->length <= 0) || (ticket->length > MAX_KTXT_LEN)) {
-	if (options & KOPT_DO_MUTUAL) {
-	    rem = KFAILURE;
-	    goto mutual_fail;
-	} else
-	    return(KFAILURE); /* XXX there may still be junk on the fd? */
-    }		
-
-    /* read the ticket */
-    if (krb_net_read(fd, (char *) ticket->dat, ticket->length)
-	!= ticket->length)
-	return(errno);
-
-    /*
-     * now have the ticket.  decrypt it to get the authenticated
-     * data.
-     */
-    rem = krb_rd_req(ticket,service,instance,faddr->sin_addr.s_addr,
-		     kdata,filename);
-
-    if (old_vers) return(rem);	 /* XXX can't do mutual with old client */
-
-    /* if we are doing mutual auth, compose a response */
-    if (options & KOPT_DO_MUTUAL) {
-	if (rem != KSUCCESS)
-	    /* the krb_rd_req failed */
-	    goto mutual_fail;
-
-	/* add one to the (formerly) sealed checksum, and re-seal it
-	   for return to the client */
-	cksum = kdata->checksum + 1;
-	cksum = htonl(cksum);
-#ifndef NOENCRYPTION
-	key_sched(kdata->session,schedule);
-#endif /* !NOENCRYPTION */
-	priv_len = krb_mk_priv((unsigned char *)&cksum,
-			       tmp_buf,
-			       (unsigned long) sizeof(cksum),
-			       schedule,
-			       &kdata->session,
-			       laddr,
-			       faddr);
-	if (priv_len < 0) {
-	    /* re-sealing failed; notify the client */
-	    rem = KFAILURE;	 /* XXX */
-mutual_fail:
-	    priv_len = -1;
-	    tkt_len = htonl((unsigned long) priv_len);
-	    /* a length of -1 is interpreted as an authentication
-	       failure by the client */
-	    if ((cc = krb_net_write(fd, (char *)&tkt_len, sizeof(tkt_len)))
-		!= sizeof(tkt_len))
-		return(cc);
-	    return(rem);
-	} else {
-	    /* re-sealing succeeded, send the private message */
-	    tkt_len = htonl((unsigned long)priv_len);
-	    if ((cc = krb_net_write(fd, (char *)&tkt_len, sizeof(tkt_len)))
-		 != sizeof(tkt_len))
-		return(cc);
-	    if ((cc = krb_net_write(fd, (char *)tmp_buf, (int) priv_len))
-		!= (int) priv_len)
-		return(cc);
-	}
-    }
-    return(rem);
-}
-#endif
-#endif
diff --git a/src/lib/krb5util/configure.in b/src/lib/krb5util/configure.in
deleted file mode 100644
index f03b15f83..000000000
--- a/src/lib/krb5util/configure.in
+++ /dev/null
@@ -1,8 +0,0 @@
-AC_INIT(configure.in)
-CONFIG_RULES
-AC_CHECK_HEADERS(unistd.h stdlib.h sys/types.h)
-AC_CHECK_FUNCS(seteuid setresuid setreuid setegid setresgid setregid)
-dnl AppendRule([all:: all-$(WHAT)])
-KRB5_BUILD_LIBRARY_STATIC
-KRB5_BUILD_LIBOBJS
-V5_AC_OUTPUT_MAKEFILE