Remove the kadmin/import and kadmin/export directories since the are

subsumed by kdb5_util.

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

29 files changed, 6 insertions, 1780 deletions

diff --git a/src/kadmin/ChangeLog b/src/kadmin/ChangeLog
index 1ab78f2182..cc6b226691 100644
--- a/src/kadmin/ChangeLog
+++ b/src/kadmin/ChangeLog
@@ -1,3 +1,8 @@
+Wed Sep 11 16:27:04 1996  Theodore Y. Ts'o  <tytso@mit.edu>
+
+	* configure.in: no longer build import and export since they
+		are subsumed by kdb5_util.
+
 Tue Sep 10 18:20:51 1996  Tom Yu  <tlyu@mit.edu>
 
 	* configure.in: no longer build keytab
diff --git a/src/kadmin/configure.in b/src/kadmin/configure.in
index 3778142b0e..082a6dfdbd 100644
--- a/src/kadmin/configure.in
+++ b/src/kadmin/configure.in
@@ -1,6 +1,6 @@
 AC_INIT(configure.in)
 CONFIG_RULES
 dnl CONFIG_DIRS(kpasswd v5server v5client)
-CONFIG_DIRS(export import cli dbutil passwd ktutil server v4server v5passwdd)
+CONFIG_DIRS(cli dbutil passwd ktutil server v4server v5passwdd)
 DO_SUBDIRS
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/kadmin/export/ChangeLog b/src/kadmin/export/ChangeLog
deleted file mode 100644
index 97a8078c42..0000000000
--- a/src/kadmin/export/ChangeLog
+++ /dev/null
@@ -1,19 +0,0 @@
-Thu Jul 18 20:39:32 1996  Marc Horowitz  <marc@mit.edu>
-
-	* configure.in: removed ET_RULES, replaced with AC_PROG_AWK
-
-Mon Jul 15 16:51:51 1996  Marc Horowitz  <marc@mit.edu>
-
-	* export.c (print_princ): return should return a value.
-
-	* configure.in (USE_GSSAPI_LIBRARY): shared libraries require all
- 	symbols to be resolved, so this needs to be here.
-
-Wed Jul 10 01:26:18 1996  Marc Horowitz  <marc@mit.edu>
-
-	* Makefile.in, configure.in: added autoconf support
-
-Tue Jul  9 16:45:52 1996  Marc Horowitz  <marc@mit.edu>
-
-	* export.c: renamed <ovsec_admin/foo.h> to <kadm5/foo.h>
-
diff --git a/src/kadmin/export/Makefile.in b/src/kadmin/export/Makefile.in
deleted file mode 100644
index 5fa282d89e..0000000000
--- a/src/kadmin/export/Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
-CFLAGS = $(CCOPTS) $(DEFS) -I. $(LOCALINCLUDE)
-
-PROG = kadm5_export
-OBJS = ovsec_adm_export.o export.o export_err.o 
-
-all:: $(PROG)
-
-export_err.c export_err.h: $(srcdir)/export_err.et
-
-export.o: export_err.h
-ovsec_adm_export.o: export_err.h
-
-$(PROG): $(OBJS) $(DEPLIBS)
-	$(CC) $(LDFLAGS) $(LDARGS) -o $(PROG) $(OBJS) $(LIBS)
-
-install::
-	$(INSTALL_PROGRAM) $(PROG) ${DESTDIR}$(ADMIN_BINDIR)/$(PROG)
-
-clean::
-	$(RM) $(PROG) $(OBJS)
diff --git a/src/kadmin/export/Makefile.ov b/src/kadmin/export/Makefile.ov
deleted file mode 100644
index 83e8c7219d..0000000000
--- a/src/kadmin/export/Makefile.ov
+++ /dev/null
@@ -1,24 +0,0 @@
-TOP = ..
-include $(TOP)/config.mk/template
-# CFLAGS := $(CFLAGS) -Wall
-
-# The next line *shouldn't* work, because the : should be a ::.
-# However, it does work, and if I change it to :: gmake does really
-# weird things.
-ovsec_adm_export: export_err.h
-
-depend:: export_err.h
-
-PROG := kadm5_export
-OBJS := ovsec_adm_export.o export.o export_err.o
-SRCS := ovsec_adm_export.c export.c export_err.et
-ETABLES := export_err.et
- 
-LIBS = $(LIBADMSRV) $(LIBRPCLIB) $(LIBKDB5) $(LIBKRB5_ALL) $(LIBDYN) $(LIBDB)
-
-expand ErrorTables
-expand InstallAdmin
-expand Depend
-
-SUBDIRS = unit-test
-expand SubdirTarget
diff --git a/src/kadmin/export/configure.in b/src/kadmin/export/configure.in
deleted file mode 100644
index 992d591a11..0000000000
--- a/src/kadmin/export/configure.in
+++ /dev/null
@@ -1,12 +0,0 @@
-AC_INIT(ovsec_adm_export.c)
-CONFIG_RULES
-AC_PROG_INSTALL
-AC_PROG_AWK
-USE_KADMSRV_LIBRARY
-USE_GSSRPC_LIBRARY
-USE_GSSAPI_LIBRARY
-USE_DYN_LIBRARY
-USE_KDB5_LIBRARY
-KRB5_LIBRARIES
-V5_USE_SHARED_LIB
-V5_AC_OUTPUT_MAKEFILE
diff --git a/src/kadmin/export/export.c b/src/kadmin/export/export.c
deleted file mode 100644
index 3d41c4d9d7..0000000000
--- a/src/kadmin/export/export.c
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * Copyright 1993 OpenVision Technologies, Inc., All Rights Reserved
- *
- * $Header$
- */
-
-#if !defined(lint) && !defined(__CODECENTER__)
-static char *rcsid = "$Header$";
-#endif
-
-#include    <sys/time.h>
-#include    <stdio.h>
-#include    <malloc.h>
-#include    <unistd.h>
-
-#include    <kadm5/adb.h>
-#include    "export_err.h"
-#include    "local.h"
-
-extern	int errno;
-
-void print_key_data(FILE *f, krb5_key_data *key_data)
-{
-     int c;
-     
-     fprintf(f, "%d\t%d\t", key_data->key_data_type[0],
-	     key_data->key_data_length[0]);
-     for(c = 0; c < key_data->key_data_length[0]; c++) 
-	  fprintf(f, "%02x ",
-		  key_data->key_data_contents[0][c]);
-}
-
-/*
- * Function: print_princ
- * 
- * Purpose: output osa_adb_princ_ent data in a human
- *	    readable format (which is a format suitable for
- *	    ovsec_adm_import consumption)
- *
- * Arguments:
- *	data		(input) pointer to a structure containing a FILE *
- *			        and a record counter.
- *	entry		(input) entry to get dumped.
- * 	<return value>	void
- *
- * Requires:
- *	nuttin
- * 
- * Effects:
- *	writes data to the specified file pointerp.
- *
- * Modifies:
- *	nuttin
- * 
- */
-krb5_error_code print_princ(krb5_pointer data, krb5_db_entry *kdb)
-{
-    char *princstr;
-    int	x, y, foundcrc, ret;
-    struct retdata *d;
-    krb5_tl_data tl_data;
-    osa_princ_ent_rec adb;
-    XDR xdrs;
-
-    d = (struct retdata *) data;
-
-    /*
-     * XXX Currently, lookup_tl_data always returns zero; it sets
-     * tl_data->tl_data_length to zero if the type isn't found.
-     * This should be fixed...
-     */
-    /*
-     * XXX Should this function do nothing for a principal with no
-     * admin data, or print a record of "default" values?   See
-     * comment in server_kdb.c to help decide.
-     */
-    tl_data.tl_data_type = KRB5_TL_KADM_DATA;
-    if ((ret = krb5_dbe_lookup_tl_data(d->context, kdb, &tl_data))
-	|| (tl_data.tl_data_length == 0))
-	 return(0);
-
-    memset(&adb, 0, sizeof(adb));
-    xdrmem_create(&xdrs, tl_data.tl_data_contents,
-		  tl_data.tl_data_length, XDR_DECODE);
-    if (! xdr_osa_princ_ent_rec(&xdrs, &adb)) {
-	 xdr_destroy(&xdrs);
-	 return(OSA_ADB_XDR_FAILURE);
-    }
-    xdr_destroy(&xdrs);
-    
-    krb5_unparse_name(d->context, kdb->princ, &princstr);
-    fprintf(d->fp, "princ\t%s\t", princstr);
-    if(adb.policy == NULL)
-	fputc('\t', d->fp);
-    else
-	fprintf(d->fp, "%s\t", adb.policy);
-    fprintf(d->fp, "%x\t%d\t%d\t%d", adb.aux_attributes,
-	    adb.old_key_len,adb.old_key_next, adb.admin_history_kvno);
-
-    for (x = 0; x < adb.old_key_len; x++) {
-	 if (! d->ovsec_compat)
-	      fprintf(d->fp, "\t%d", adb.old_keys[x].n_key_data);
-
-	 foundcrc = 0;
-	 for (y = 0; y < adb.old_keys[x].n_key_data; y++) {
-	      krb5_key_data *key_data = &adb.old_keys[x].key_data[y];
-
-	      if (d->ovsec_compat) {
-		   if (key_data->key_data_type[0] != ENCTYPE_DES_CBC_CRC)
-			continue;
-		   if (foundcrc) {
-			fprintf(stderr, error_message(EXPORT_DUP_DESCRC), 
-				princstr);
-			continue;
-		   }
-		   foundcrc++;
-	      }
-	      fputc('\t', d->fp);
-	      print_key_data(d->fp, key_data);
-	 }
-	 if (d->ovsec_compat && !foundcrc)
-	      fprintf(stderr, error_message(EXPORT_NO_DESCRC), princstr);
-    }
-
-    d->count++;
-    fputc('\n', d->fp);
-    free(princstr);
-    return(0);
-}
-
-/*
- * Function: print_policy
- * 
- * Purpose: Print the contents of a policy entry in a human readable format.
- *	    This format is also suitable for consumption for dbimport.
- *
- * Arguments:
- *	data		(input) a pointer to a structure containing a FILE *
- *			        and a record counter.
- *	entry		(input) policy entry
- * 	<return value>	void
- *
- * Requires:
- *	nuttin
- * 
- * Effects:
- *	writes data to file
- *
- * Modifies:
- *	nuttin
- * 
- */
-
-void
-print_policy(void *data, osa_policy_ent_t entry)
-{
-    struct  retdata *d;
-
-    d = (struct retdata *) data;
-    fprintf(d->fp, "policy\t%s\t%d\t%d\t%d\t%d\t%d\t%d\n", entry->name,
-	    entry->pw_min_life, entry->pw_max_life, entry->pw_min_length,
-	    entry->pw_min_classes, entry->pw_history_num,
-	    entry->policy_refcnt);
-    d->count++;
-    return;
-}
-
-/*
- * Function: export_principal
- * 
- * Purpose:  interates through the principal database with the
- *	     osa_adb_iter_princ function which calls the print_princ
- *	     routine with the FILE * of our filename. If the file
- *	     name that gets passed in is NULL then we use stdout.
- *
- * Arguments:
- *	d		(input) pointer to retdata.
- * 	<return value>	error code. 0 if sucsessful.
- *
- * Requires:
- *	nuttin
- * 
- * Effects:
- *	calls osa_adb_iter_princ which calls print_princ
- *
- * Modifies:
- *	nuttin
- * 
- */
-osa_adb_ret_t
-export_principal(struct retdata *d, kadm5_config_params *params)
-{
-     int ret;
-
-     if (ret = krb5_db_set_name(d->context, params->dbname))
-	  return ret;
-
-     if (ret = krb5_db_init(d->context))
-	  return ret;
-
-     if (ret = krb5_dbm_db_iterate(d->context, print_princ, d))
-	  return ret;
-
-     if (ret = krb5_db_fini(d->context))
-	  return ret;
-
-     return 0;
-}
-
-/*
- * Function: export_policy
- * 
- * Purpose: iterates through the policy database with the
- *	    osa_adb_iter_policy function which calls the print_policy
- *	    routine with the FILE * of our filename. If the file name
- *	    that gets passed in is NULL then we use stdout.
- *
- * Arguments:
- *	d		(input) a pointer to retdata
- * 	<return value>	error code 0 if sucsessfull.
- *
- * Requires:
- *	nuttin
- * 
- * Effects:
- *	calls osa_adb_iter_policy which calls print_policy
- *
- * Modifies:
- *	nuttin
- * 
- */
-osa_adb_ret_t
-export_policy(struct retdata *d, osa_adb_policy_t db)
-{
-    osa_adb_ret_t	ret;
-    
-    if((ret = osa_adb_iter_policy(db, print_policy, (void *) d))
-       != OSA_ADB_OK) {
-	return ret;
-    }
-    return OSA_ADB_OK;
-}
diff --git a/src/kadmin/export/export_err.et b/src/kadmin/export/export_err.et
deleted file mode 100644
index 6c99a47b07..0000000000
--- a/src/kadmin/export/export_err.et
+++ /dev/null
@@ -1,19 +0,0 @@
-error_table exp
-error_code EXPORT_NO_ERR,		"Database export complete, %d record%s processed.\n"
-error_code EXPORT_UNK_OPTION,		"Unknown Option\nUsage: ovsec_adm_export [filename]"
-error_code EXPORT_OUTPUT_OPEN,		"while opening output file"
-error_code EXPORT_OUTPUT_CHMOD,		"while changing mode of file"
-error_code EXPORT_OUTPUT_STAT,		"while trying to stat file"
-error_code EXPORT_DATABASE_OPEN,	"while opening database"
-error_code EXPORT_PRINCIPAL,		"while exporting principal database"
-error_code EXPORT_POLICY,		"while exporting policy database"
-error_code EXPORT_LOCK,			"while locking database"
-error_code EXPORT_UNLOCK,		"while unlocking database"
-error_code EXPORT_CLOSE,		"while closing database"
-error_code EXPORT_SINGLE_RECORD,	""
-error_code EXPORT_PLURAL_RECORDS,	"s"
-error_code EXPORT_NO_DESCRC,		"Warning!  No DES-CBC-CRC key for principal %s, cannot generate ovsec_adm_export-compatible record; skipping."
-error_code EXPORT_DUP_DESCRC,		"Warning!  Multiple DES-CBC-CRC keys for principal %s; skipping duplicates."
-error_code EXPORT_GET_CONFIG,		"while retrieving configuration parameters"
-end
-
diff --git a/src/kadmin/export/local.h b/src/kadmin/export/local.h
deleted file mode 100644
index 3ec895ab24..0000000000
--- a/src/kadmin/export/local.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright 1993 OpenVision Technologies, Inc., All Rights Reserved
- *
- * $Header$
- */
-
-struct	retdata {
-     krb5_context context;
-     FILE    *fp;
-     int	    count;
-     int	    ovsec_compat;
-};
-
-osa_adb_ret_t	export_principal(struct retdata *, kadm5_config_params *);
-osa_adb_ret_t	export_policy(struct retdata *d, osa_adb_policy_t);
diff --git a/src/kadmin/export/ovsec_adm_export.c b/src/kadmin/export/ovsec_adm_export.c
deleted file mode 100644
index ded21ba558..0000000000
--- a/src/kadmin/export/ovsec_adm_export.c
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Copyright 1993 OpenVision Technologies, Inc., All Rights Reserved
- *
- * $Header$
- */
-
-#if !defined(lint) && !defined(__CODECENTER__)
-static char *rcsid = "$Header$";
-#endif
-
-#include    <sys/types.h>
-#include    <sys/file.h>
-#include    <sys/stat.h>
-#include    <fcntl.h>
-#include    <kadm5/adb.h>
-#include    <stdio.h>
-#include    <string.h>
-#include    <unistd.h>
-#include    "export_err.h"
-#include    "local.h"
-
-int
-main(int argc, char *argv[])
-{
-    char		*filename;
-    struct  retdata	d;
-    struct  stat	statb;
-    int			ret, fd;
-    time_t		now;
-    char		*whoami = argv[0];
-    osa_adb_policy_t	policy_db;
-    kadm5_config_params	params;
-    
-    memset(&params, 0, sizeof(params));
-    memset(&d, 0, sizeof(d));
-    
-    filename = NULL;
-    initialize_exp_error_table();
-    initialize_adb_error_table();
-    krb5_init_context(&d.context);
-    krb5_init_ets(d.context);
-    
-    while(--argc) {
-	if(*++argv == NULL)
-	    break;
-	if(!strcmp(*argv, "-princ")) {
-	     params.dbname = *++argv;
-	     params.mask |= KADM5_CONFIG_DBNAME;
-	     continue;
-	}
-	if(!strcmp(*argv, "-policy")) {
-	     params.admin_dbname = *++argv;
-	     params.mask |= KADM5_CONFIG_ADBNAME;
-	     continue;
-	}
-	if(!strcmp(*argv, "-ovsec")) {
-	     d.ovsec_compat++;
-	     continue;
-	}
-	if (*argv[0] == '-') {
-	    com_err(whoami, EXPORT_UNK_OPTION, NULL);
-	    exit(2);
-	}
-	if(filename == NULL) 
-	    filename = *argv;
-	else {
-	    com_err(whoami, EXPORT_UNK_OPTION, NULL);
-	    exit(2);
-	}
-    }
-
-    if (ret = kadm5_get_config_params(d.context, NULL, NULL, &params,
-				      &params)) {
-	 com_err(whoami, ret, error_message(EXPORT_GET_CONFIG));
-	 exit(2);
-    }
-#define REQUIRED_MASK (KADM5_CONFIG_DBNAME | \
-		       KADM5_CONFIG_ADBNAME)
-    if ((params.mask & REQUIRED_MASK) != REQUIRED_MASK) {
-	 com_err(whoami, KADM5_BAD_SERVER_PARAMS,
-		 error_message(EXPORT_GET_CONFIG));
-	 exit(2);
-    }
-    
-    if(filename != NULL) {
-	if((fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC, 0400)) == -1) {
-	    com_err(whoami, errno, "%s (%s)",
-		    error_message(EXPORT_OUTPUT_OPEN), filename);
-	    exit(2);
-	}
-	if(fstat(fd, &statb) == -1) {
-	    com_err(whoami, errno, "%s (%s)",
-		    error_message(EXPORT_OUTPUT_STAT), filename);
-	    exit(2);
-	}
-	if(S_ISREG(statb.st_mode)) {
-	    int mask = umask(0);
-	    (void) umask(mask);
-	    if (fchmod(fd, (0400 & ~mask)) == -1) {
-		com_err(whoami, errno, "%s (%s)",
-			error_message(EXPORT_OUTPUT_CHMOD), filename);
-		exit(2);
-	    }
-	}
-	if ((d.fp = fdopen(fd, "w")) == NULL) {
-	    com_err(whoami, errno, "%s (%s)",
-		    error_message(EXPORT_OUTPUT_OPEN), filename);
-	    exit(2);
-	}
-    } else d.fp = stdout;
-
-    if((ret = osa_adb_open_policy(&policy_db, &params)) != OSA_ADB_OK) {
-	 com_err(argv[0], ret, error_message(EXPORT_DATABASE_OPEN));
-	 exit(2);
-    }
-    if ((ret = osa_adb_get_lock(policy_db, OSA_ADB_SHARED) != OSA_ADB_OK)) {
-	 com_err(argv[0], ret, error_message(EXPORT_LOCK));
-	 exit(2);
-    }
-    
-    d.count = 0;
-    
-    now = time(NULL);
-    if (d.ovsec_compat)
-	 fprintf(d.fp, "OpenV*Secure V1.0\t%s", ctime(&now));
-    else
-	 fprintf(d.fp, "Kerberos KADM5 database V2.0\t%s",
-		 ctime(&now));
-    
-    if ((ret = export_policy(&d, policy_db)) != OSA_ADB_OK) {
-       com_err(whoami, ret, "%s (%s)", error_message(EXPORT_POLICY),
-	       params.admin_dbname);
-       exit(2);
-    }
-    if ((ret = export_principal(&d, &params)) !=
-	 OSA_ADB_OK) { 
-       com_err(whoami, ret, "%s (%s)", error_message(EXPORT_PRINCIPAL),
-	       params.dbname);
-       exit(2);
-    }
-    fprintf(d.fp, "End of Database\t%d\trecords\n", d.count);
-
-    if ((ret = osa_adb_release_lock(policy_db)) != OSA_ADB_OK) {
-	 com_err(argv[0], ret, error_message(EXPORT_UNLOCK));
-	 exit(2);
-    }
-    if ((ret = osa_adb_close_policy(policy_db)) != OSA_ADB_OK) {
-	 com_err(argv[0], ret, error_message(EXPORT_CLOSE));
-	 exit(2);
-    }
-    
-    fprintf(stderr, error_message(EXPORT_NO_ERR), d.count,
-	    (d.count == 1) ? error_message(EXPORT_SINGLE_RECORD) :
-	    error_message(EXPORT_PLURAL_RECORDS));
-    exit(0);
-}
-    
-	
-	    
diff --git a/src/kadmin/export/unit-test/config/unix.exp b/src/kadmin/export/unit-test/config/unix.exp
deleted file mode 100644
index e8d852f899..0000000000
--- a/src/kadmin/export/unit-test/config/unix.exp
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# export_version -- extract and print the version number of export
-#
-
-proc export_version {} {
-	global EXPORT
-	set tmp [exec ident $EXPORT]
-	if [regexp {Header: .*export.c,v ([0-9]+\.[0-9]+)} $tmp \
-		dummy version] then {
-		clone_output "$EXPORT version $version\n"
-	} else {
-		clone_output "$EXPORT version <unknown>\n"
-	}
-}
-#
-# export_load -- loads the program
-#
-proc export_load {} {
-	#
-}
-
-# export_exit -- clean up and exit
-proc export_exit {} {
-	#
-}
-
-#
-# export_start -- start export running
-#
-proc export_start { args } {
-	global EXPORT
-	global spawn_id
-
-	verbose "% $EXPORT $args" 1
-	eval spawn $EXPORT $args
-}
diff --git a/src/kadmin/export/unit-test/export.0/dotest.exp b/src/kadmin/export/unit-test/export.0/dotest.exp
deleted file mode 100644
index 93ac21250f..0000000000
--- a/src/kadmin/export/unit-test/export.0/dotest.exp
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# $Id$
-#
-
-verbose "starting test: dotest.sh"
-
-spawn ./dotest.sh
-
-set timeout 60
-
-expect {
-	-re "error dumping (princ|policy)\.(\[12\])"
-		{ fail $expect_out(0,string); exp_continue }
-	-re "export/import (principal|policy) db (failed|succeeded)"
-	{ 
-		if {![string compare $expect_out(2,string) failed]} {
-			fail $expect_out(0,string)
-		} else {
-			pass $expect_out(0,string)
-		}
-		exp_continue
-	}
-	eof break
-	timeout { fail "timeout"; close }
-}
-
-set w [wait]
-
-verbose "% Exit $w"
diff --git a/src/kadmin/export/unit-test/export.0/output.exp b/src/kadmin/export/unit-test/export.0/output.exp
deleted file mode 100644
index 6e0d4144b7..0000000000
--- a/src/kadmin/export/unit-test/export.0/output.exp
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# $Id$
-#
-
-set timeout 30
-
-load_lib "helpers.exp"
-
-#
-# Here are the tests
-#
-
-exec rm -f /tmp/dbexport
-
-export_win "B.25: General success" /tmp/dbexport
-
-check_mode "B.26" /tmp/dbexport 0400
-
-if {[catch "exec chmod 666 /tmp/dbexport" output]} {
-	unresolved "B.27: can't chmod /tmp/dbexport: $output"
-} else {
-	export_win "prep for B.27" /tmp/dbexport
-	check_mode "B.27" /tmp/dbexport 0400
-	exec rm -f /tmp/dbexport
-}
-
-proc test28 {} {
-	if {[catch "file stat /dev/null stats" output]} {
-		unresolved "B.28: can't stat /dev/null: $output"
-		return
-	}
-	set stats(mode) [expr $stats(mode) & 07777]
-	if {$stats(mode) == [expr 0400]} {
-		if {[catch "exec chmod 666 /dev/null" output]} {
-			unresolved "B.28: can't chmod /dev/null: $output"
-			return
-		}
-		set stats(mode) [expr 0666]
-	}
-	export_win "prep for B.28" /dev/null
-	check_mode "B.28" /dev/null $stats(mode)
-}
-test28
diff --git a/src/kadmin/export/unit-test/export.0/usage.exp b/src/kadmin/export/unit-test/export.0/usage.exp
deleted file mode 100644
index 9a592c9b8d..0000000000
--- a/src/kadmin/export/unit-test/export.0/usage.exp
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# $Id$
-#
-
-set timeout 30
-
-load_lib "helpers.exp"
-
-#
-# Here are the tests
-#
-
-export_lose "A.9: output file not writable" /foo/bar/baz \
-	"No such file or directory while opening output file"
-
-export_lose "A.10: two arguments" {foo bar} \
-	"Usage:"
-
-# XXX this depends on this being the last test run
-
-system {rm /krb5/kadb5}
-
-export_lose "A.2: /krb5 doesn't exist" /tmp/dbexport \
-	"No such file or directory while opening database"
-
diff --git a/src/kadmin/import/ChangeLog b/src/kadmin/import/ChangeLog
deleted file mode 100644
index ca7c0bc2db..0000000000
--- a/src/kadmin/import/ChangeLog
+++ /dev/null
@@ -1,17 +0,0 @@
-Thu Jul 18 20:40:32 1996  Marc Horowitz  <marc@mit.edu>
-
-	* configure.in: removed ET_RULES, replaced with AC_PROG_AWK
-
-Mon Jul 15 16:58:08 1996  Marc Horowitz  <marc@mit.edu>
-
-	* configure.in (USE_GSSAPI_LIBRARY): shared libraries require all
- 	symbols to be resolved, so this needs to be here.
-
-Wed Jul 10 01:26:47 1996  Marc Horowitz  <marc@mit.edu>
-
-	* Makefile.in, configure.in: added autoconf support
-
-Tue Jul  9 17:12:08 1996  Marc Horowitz  <marc@mit.edu>
-
-	* ovsec_adm_import.c, import.c: renamed <ovsec_admin/foo.h> to
- 	<kadm5/foo.h>	
diff --git a/src/kadmin/import/Makefile.in b/src/kadmin/import/Makefile.in
deleted file mode 100644
index 2f15e706f9..0000000000
--- a/src/kadmin/import/Makefile.in
+++ /dev/null
@@ -1,18 +0,0 @@
-CFLAGS = $(CCOPTS) $(DEFS) -I. $(LOCALINCLUDE)
-
-PROG = kadm5_import
-OBJS = ovsec_adm_import.o import.o import_err.o strtok.o misc.o
-
-all:: $(PROG)
-
-import_err.c import_err.h: $(srcdir)/import_err.et
-$(OBJS): import_err.h
-
-$(PROG): $(OBJS) $(DEPLIBS)
-	$(CC) $(LDFLAGS) $(LDARGS) -o $(PROG) $(OBJS) $(LIBS)
-
-install::
-	$(INSTALL_PROGRAM) $(PROG) ${DESTDIR}$(ADMIN_BINDIR)/$(PROG)
-
-clean::
-	$(RM) $(PROG) $(OBJS)
diff --git a/src/kadmin/import/Makefile.ov b/src/kadmin/import/Makefile.ov
deleted file mode 100644
index f2750313de..0000000000
--- a/src/kadmin/import/Makefile.ov
+++ /dev/null
@@ -1,24 +0,0 @@
-TOP = ..
-include $(TOP)/config.mk/template
-CFLAGS := $(CFLAGS)
-
-# The next line *shouldn't* work, because the : should be a ::.
-# However, it does work, and if I change it to :: gmake does really
-# weird things.
-ovsec_adm_import: import_err.h
-
-depend:: import_err.h
-
-PROG := kadm5_import
-OBJS := ovsec_adm_import.o import_err.o import.o strtok.o misc.o
-SRCS := ovsec_adm_import.c import.c import_err.et strtok.c misc.c
-ETABLES := import_err.et
-
-LIBS = $(LIBADMSRV) $(LIBRPCLIB) $(LIBKDB5) $(LIBKRB5_ALL) $(LIBDYN) $(LIBDB)
-
-expand ErrorTables
-expand InstallAdmin
-expand Depend
-
-SUBDIRS = unit-test
-expand SubdirTarget
diff --git a/src/kadmin/import/configure.in b/src/kadmin/import/configure.in
deleted file mode 100644
index ad66ebd7c7..0000000000
--- a/src/kadmin/import/configure.in
+++ /dev/null
@@ -1,12 +0,0 @@
-AC_INIT(ovsec_adm_import.c)
-CONFIG_RULES
-AC_PROG_INSTALL
-AC_PROG_AWK
-USE_KADMSRV_LIBRARY
-USE_GSSRPC_LIBRARY
-USE_GSSAPI_LIBRARY
-USE_DYN_LIBRARY
-USE_KDB5_LIBRARY
-KRB5_LIBRARIES
-V5_USE_SHARED_LIB
-V5_AC_OUTPUT_MAKEFILE
diff --git a/src/kadmin/import/import.c b/src/kadmin/import/import.c
deleted file mode 100644
index b1a8c0a76c..0000000000
--- a/src/kadmin/import/import.c
+++ /dev/null
@@ -1,421 +0,0 @@
-/*
- * Copyright 1993 OpenVision Technologies, Inc., All Rights Reserved
- *
- * $Header$
- */
-
-#if !defined(lint) && !defined(__CODECENTER__)
-static char *rcsid = "$Header$";
-#endif
-
-#include    <unistd.h>
-#include    <string.h>
-#include    <stdlib.h>
-#include    <memory.h>
-
-#include    <kadm5/adb.h>
-#include    "import_err.h"
-#include    "import.h"
-
-#define LINESIZE	32768 /* XXX */
-#define PLURAL(count)	(((count) == 1) ? error_message(IMPORT_SINGLE_RECORD) : error_message(IMPORT_PLURAL_RECORDS))
-   
-int parse_pw_hist_ent(current, hist, ovsec_compat)
-   char *current;
-   osa_pw_hist_ent *hist;
-   int ovsec_compat;
-{
-     int tmp, i, j, ret;
-     char *cp;
-
-     ret = 0;
-     if (!ovsec_compat) {
-	  if ((cp = nstrtok((char *) NULL, "\t")) == NULL) {
-	       com_err(NULL, IMPORT_BAD_RECORD, "%s", current);
-	       return IMPORT_FAILED;
-	  }
-	  hist->n_key_data = atoi(cp);
-     } else
-	  hist->n_key_data = 1;
-
-     hist->key_data = (krb5_key_data *) malloc(hist->n_key_data *
-					       sizeof(krb5_key_data));
-     if (hist->key_data == NULL)
-	  return ENOMEM;
-     memset(hist->key_data, 0, sizeof(krb5_key_data)*hist->n_key_data);
-
-     for (i = 0; i < hist->n_key_data; i++) {
-	  krb5_key_data *key_data = &hist->key_data[i];
-
-	  key_data->key_data_ver = 1;
-	  
-	  if((cp = nstrtok((char *) NULL, "\t")) == NULL) {
-	       com_err(NULL, IMPORT_BAD_RECORD, "%s", current);
-	       ret = IMPORT_FAILED;
-	       goto done;
-	  }
-	  key_data->key_data_type[0] = atoi(cp);
-
-	  if((cp = nstrtok((char *) NULL, "\t")) == NULL) {
-	       com_err(NULL, IMPORT_BAD_RECORD, "%s", current);
-	       ret =  IMPORT_FAILED;
-	       goto done;
-	  }
-	  key_data->key_data_length[0] = atoi(cp);
-	  
-	  if((cp = nstrtok((char *) NULL, "\t")) == NULL) {
-	       com_err(NULL, IMPORT_BAD_RECORD, "%s", current);
-	       ret = IMPORT_FAILED;
-	       goto done;
-	  }
-	  if(!(key_data->key_data_contents[0] =
-	       (krb5_octet *) malloc(key_data->key_data_length[0]+1))) {
-	       ret = ENOMEM;
-	       goto done;
-	  }
-	  for(j = 0; j < key_data->key_data_length[0]; j++) {
-	       if(sscanf(cp, "%02x", &tmp) != 1) {
-		    com_err(NULL, IMPORT_BAD_RECORD, "%s", current);
-		    ret = IMPORT_FAILED;
-		    goto done;
-	       }
-	       key_data->key_data_contents[0][j] = tmp;
-	       cp = strchr(cp, ' ') + 1;
-	  }
-     }
-     
-done:
-     return ret;
-}
-
-		     
-
-/*
- * Function: parse_principal
- * 
- * Purpose: parse principal line in db dump file
- *
- * Arguments:
- * 	<return value>	0 on sucsess, error code on failure
- *
- * Requires:
- *	principal database to be opened.
- *	nstrtok(3) to have a valid buffer in memory.
- * 
- * Effects:
- *	[effects]
- *
- * Modifies:
- *	[modifies]
- * 
- */
-int parse_principal(context, ovsec_compat)
-   krb5_context context;
-   int ovsec_compat;
-{
-    XDR xdrs;
-    osa_princ_ent_t	    rec;
-    osa_adb_ret_t	    ret;
-    krb5_tl_data	    tl_data;
-    krb5_principal	    princ;
-    krb5_db_entry	    kdb;
-    char		    *current;
-    char		    *cp;
-    int			    tmp, x, i, one, more;
-
-    if((cp = nstrtok((char *) NULL, "\t")) == NULL)
-	return IMPORT_BAD_FILE;
-    if((rec = (osa_princ_ent_t) malloc(sizeof(osa_princ_ent_rec))) == NULL)
-	return ENOMEM;
-    memset(rec, 0, sizeof(osa_princ_ent_rec));
-    if((ret = krb5_parse_name(context, cp, &princ))) 
-	goto done;
-    krb5_unparse_name(context, princ, &current);
-    if((cp = nstrtok((char *) NULL, "\t")) == NULL) {
-	com_err(NULL, IMPORT_BAD_RECORD, "%s", current);
-	ret =  IMPORT_FAILED;
-	goto done;
-    } else {
-	if(strcmp(cp, "")) {
-	    if((rec->policy = (char *) malloc(strlen(cp)+1)) == NULL)  {
-		ret = ENOMEM;
-		goto done;
-	    }
-	    strcpy(rec->policy, cp);
-	} else rec->policy = NULL;
-    }
-    if((cp = nstrtok((char *) NULL, "\t")) == NULL) {
-	com_err(NULL, IMPORT_BAD_RECORD, "%s", current);
-	ret = IMPORT_FAILED;
-	goto done;
-    }
-    rec->aux_attributes = strtol(cp, (char  **)NULL, 16);
-    if((cp = nstrtok((char *) NULL, "\t")) == NULL) {
-	com_err(NULL, IMPORT_BAD_RECORD, "%s", current);
-	ret = IMPORT_FAILED;
-	goto done;
-    }
-    rec->old_key_len = atoi(cp);
-    if((cp = nstrtok((char *) NULL, "\t")) == NULL) {
-	com_err(NULL, IMPORT_BAD_RECORD, "%s", current);
-	ret = IMPORT_FAILED;
-	goto done;
-    }
-    rec->old_key_next = atoi(cp);
-    if((cp = nstrtok((char *) NULL, "\t")) == NULL) {
-	com_err(NULL, IMPORT_BAD_RECORD, "%s", current);
-	ret = IMPORT_FAILED;
-	goto done;
-    }
-    rec->admin_history_kvno = atoi(cp);
-    if (! rec->old_key_len) {
-       rec->old_keys = NULL;
-    } else {
-       if(!(rec->old_keys = (osa_pw_hist_ent *)
-	    malloc(sizeof(osa_pw_hist_ent) * rec->old_key_len))) {
-	  ret = ENOMEM;
-	  goto done;
-       }
-       memset(rec->old_keys,0,
-	      sizeof(osa_pw_hist_ent) * rec->old_key_len);
-       for(x = 0; x < rec->old_key_len; x++)
-	    parse_pw_hist_ent(current, &rec->old_keys[x], ovsec_compat);
-    }
-
-    xdralloc_create(&xdrs, XDR_ENCODE);
-    if (! xdr_osa_princ_ent_rec(&xdrs, rec)) {
-	 xdr_destroy(&xdrs);
-	 ret = OSA_ADB_XDR_FAILURE;
-	 goto done;
-    }
-
-    tl_data.tl_data_type = KRB5_TL_KADM_DATA;
-    tl_data.tl_data_length = xdr_getpos(&xdrs);
-    tl_data.tl_data_contents = xdralloc_getdata(&xdrs);
-
-    one = 1;
-    ret = krb5_db_get_principal(context, princ, &kdb, &one,
-				&more);
-    if (ret)
-	 goto done;
-    
-    if (ret = krb5_dbe_update_tl_data(context, &kdb,
-				&tl_data))
-	 goto done;
-
-    if (ret = krb5_db_put_principal(context, &kdb, &one))
-	 goto done;
-
-    xdr_destroy(&xdrs);
-
-done:
-    free(current);
-    krb5_free_principal(context, princ);
-    osa_free_princ_ent(rec);
-    return ret;
-}
-    
-/*
- * Function: parse-policy
- * 
- * Purpose: parse the ascii text of a dump file and turn it into
- *	    a policy_ent_rec.
- *
- * Arguments:
- * 	<return value>	0 on sucsess, error code on failure;
- *
- * Requires:
- *	nstrtok to have a buffer in memory
- * 
- * Effects:
- *	write data out to db.
- *
- * Modifies:
- *	policy db.
- * 
- */
-int
-parse_policy(pol_db)
-   osa_adb_policy_t pol_db;
-{
-    osa_policy_ent_t	    rec;
-    char		    *cp;
-    osa_adb_ret_t	    ret;
-    
-    if((rec = (osa_policy_ent_t) malloc(sizeof(osa_princ_ent_rec))) == NULL)
-	return ENOMEM;
-    memset(rec, 0, sizeof(osa_princ_ent_rec));
-    if((cp = nstrtok((char *) NULL, "\t")) == NULL) {
-	ret = IMPORT_BAD_FILE;
-	goto done;
-    }
-    if((rec->name = (char *) malloc(strlen(cp) + 1)) == NULL) {
-	ret = ENOMEM;
-	goto done;
-    }
-    strcpy(rec->name, cp);
-    if((cp = nstrtok((char *) NULL, "\t")) == NULL) {
-	com_err(NULL, IMPORT_BAD_RECORD, "%s", rec->name);
-	ret = IMPORT_FAILED;
-	goto done;
-    }
-    rec->pw_min_life = atoi(cp);
-    if((cp = nstrtok((char *) NULL, "\t")) == NULL) {
-	com_err(NULL, IMPORT_BAD_RECORD, "%s", rec->name);
-	ret = IMPORT_FAILED;
-	goto done;
-    }
-    rec->pw_max_life = atoi(cp);
-    if((cp = nstrtok((char *) NULL, "\t")) == NULL) {
-	com_err(NULL, IMPORT_BAD_RECORD, "%s", rec->name);
-	ret = IMPORT_FAILED;
-	goto done;
-    }
-    rec->pw_min_length = atoi(cp);
-    if((cp = nstrtok((char *) NULL, "\t")) == NULL) {
-	com_err(NULL, IMPORT_BAD_RECORD, "%s", rec->name);
-	ret = IMPORT_FAILED;
-	goto done;
-    }
-    rec->pw_min_classes = atoi(cp);
-    if((cp = nstrtok((char *) NULL, "\t")) == NULL) {
-	com_err(NULL, IMPORT_BAD_RECORD, "%s", rec->name);
-	ret = IMPORT_FAILED;
-	goto done;
-    }
-    rec->pw_history_num = atoi(cp);
-    if((cp = nstrtok((char *) NULL, "\t")) == NULL) {
-	com_err(NULL, IMPORT_BAD_RECORD, "%s", rec->name);
-	ret = IMPORT_FAILED;
-	goto done;
-    }
-    rec->policy_refcnt = atoi(cp);
-    ret = osa_adb_create_policy(pol_db, rec);
-done:
-   osa_free_policy_ent(rec);
-   return ret;
-}
-
-/*
- * Function: import-file
- * 
- * Purpose: import a flat ascii file and convert it to a db file.
- *
- * Arguments:
- *	fp		    (input) file pointer to read db.
- * 	<return value>	    0 or error code on error.
- *
- * Requires:
- *	fp be valid
- * 
- * Effects:
- *	calls appropriate routine to write out db files.
- *
- * Modifies:
- *	database file.
- *
- */
-
-int import_file(krb5_context context, FILE *fp, int merge_princs,
-		osa_adb_policy_t pol_db) 
-{
-    
-    int	    count = 0;
-    int	    errcnt = 0;
-    int	    ret = 0;
-    int	    found_footer = 0;
-    int	    file_count;
-    int	    ovsec_compat;
-    char    line[LINESIZE];
-    char    version[BUFSIZ];
-    char    date[BUFSIZ];
-    char    *cp;
-    
-    if(fgets(line, LINESIZE, fp) == NULL)
-	return IMPORT_BAD_FILE;
-    if ((sscanf(line, "%[^\t]\t %[^\t]", version, date)) != 2)
-	return IMPORT_BAD_FILE;
-    if(!strcmp(version, VERSION_OVSEC_10))
-	 ovsec_compat++;
-    else if (strcmp(version, VERSION_KADM5_20))
-	 return IMPORT_BAD_VERSION;
-
-    while(fgets(line, LINESIZE, fp) != (char *) NULL) {
-	if(found_footer) {
-	    com_err(NULL, IMPORT_EXTRA_DATA, NULL);
-	    break;
-	}
-	cp = nstrtok(line, "\t");
-	if(!strcasecmp(cp, "princ")) {
-	    if(merge_princs &&
-	       (ret = parse_principal(context, ovsec_compat)) != OSA_ADB_OK) {
-		if(ret == IMPORT_FAILED) {
-		    if(!confirm())
-			break;
-		    else {
-			errcnt++;
-			continue;
-		    }
-		} else break;
-	    } else {
-		count++;
-		continue;
-	    }
-	}
-	if(!strcasecmp(cp, "policy")) {
-	    if((ret = parse_policy(pol_db)) != OSA_ADB_OK) {
-		if(ret == IMPORT_FAILED) {
-		    if(!confirm())
-			break;
-		    else {
-			errcnt++;
-			continue;
-		    }
-		} else break;
-	    } else {
-		count++;
-		continue;
-	    }
-	}
-	if(!strcasecmp(cp, "end of database")) {
-	    found_footer = 1;
-	} else {
-	    com_err(NULL, IMPORT_BAD_TOKEN, "%s", cp);
-	    if(!confirm()) {
-		ret = IMPORT_BAD_FILE;
-		break;
-	    }  else {
-		errcnt++;
-		continue;
-	    }
-	}
-    }
-    if(ret == OSA_ADB_OK && found_footer) {
-	if((cp = nstrtok(NULL, "\t")) == NULL) {
-	    com_err(NULL, IMPORT_BAD_FOOTER, NULL);
-	    if(!confirm())
-		ret = IMPORT_BAD_FOOTER;
-	    else
-		ret = OSA_ADB_OK;
-	} else
-	    file_count = atoi(cp);
-	if(file_count != (count + errcnt)) {
-	    fprintf(stderr, error_message(IMPORT_COUNT_MESSAGE), file_count,
-		    PLURAL(file_count), count, PLURAL(count));
-	    if(!confirm())
-		ret =  IMPORT_MISMATCH_COUNT;
-	    else
-		ret = OSA_ADB_OK;
-	} else fprintf(stderr, error_message(IMPORT_NO_ERR), count,
-		       PLURAL(count));
-    } else if(ret == OSA_ADB_OK && !found_footer) {
-	com_err(NULL, IMPORT_BAD_FOOTER, NULL);
-	if(!confirm())
-	    ret = IMPORT_BAD_FOOTER;
-	else
-	    ret = OSA_ADB_OK;
-    }
-
-    return ret;
-}
-    
diff --git a/src/kadmin/import/import.h b/src/kadmin/import/import.h
deleted file mode 100644
index e0c3fedf91..0000000000
--- a/src/kadmin/import/import.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 1993 OpenVision Technologies, Inc., All Rights Reserved
- *
- * $Header$
- * 
- * $Log$
- * Revision 1.3  1996/07/22 20:26:27  marc
- * this commit includes all the changes on the OV_9510_INTEGRATION and
- * OV_MERGE branches.  This includes, but is not limited to, the new openvision
- * admin system, and major changes to gssapi to add functionality, and bring
- * the implementation in line with rfc1964.  before committing, the
- * code was built and tested for netbsd and solaris.
- *
- * Revision 1.2.4.1  1996/07/18 03:02:23  marc
- * merged in changes from OV_9510_BP to OV_9510_FINAL1
- *
- * Revision 1.2.2.1  1996/06/20  21:48:24  marc
- * File added to the repository on a branch
- *
- * Revision 1.2  1996/06/05  20:52:28  bjaspan
- * initial hack at porting to mit kerberos
- *
- * Revision 1.1  1993/11/17 06:13:23  shanzer
- * Initial revision
- *
- */
-
-#include    <stdio.h>
-
-/*
- * XXX These should be defined somewhere so import and export get the
- * same value.
- */
-#define	VERSION_OVSEC_10	"OpenV*Secure V1.0"
-#define VERSION_KADM5_20	"Kerberos KADM5 database V2.0"
-
-int	import_file(krb5_context context, FILE *fp, int merge_princs,
-		    osa_adb_policy_t pol_db);
-int	confirm(void);
-char	*nstrtok(char *str, char *delim);
diff --git a/src/kadmin/import/import_err.et b/src/kadmin/import/import_err.et
deleted file mode 100644
index e091fe33c7..0000000000
--- a/src/kadmin/import/import_err.et
+++ /dev/null
@@ -1,26 +0,0 @@
-error_table imp
-error_code IMPORT_NO_ERR,	    "Successfully imported %d record%s.\n"
-error_code IMPORT_BAD_FILE,	    "Input not recognized as database dump"
-error_code IMPORT_BAD_TOKEN,	    "Bad token in dump file."
-error_code IMPORT_BAD_VERSION,	    "Bad version in dump file"
-error_code IMPORT_BAD_RECORD,	    "Defective record encountered: "
-error_code IMPORT_BAD_FOOTER,	    "Truncated input file detected."
-error_code IMPORT_FAILED,	    "Import of dump failed"
-error_code IMPORT_COUNT_MESSAGE,    "Mismatched record count: %d record%s indicated, %d record%s scanned.\n"
-error_code IMPORT_MISMATCH_COUNT,   "Number of records imported does not match count"
-error_code IMPORT_UNK_OPTION,	    "Unknown command line option.\nUsage: ovsec_adm_import [filename]"
-error_code IMPORT_WARN_DB,	    "Warning -- continuing to import will overwrite existing databases!"
-error_code IMPORT_RENAME_FAILED,    "Database rename Failed!!"
-error_code IMPORT_EXTRA_DATA,	    "Extra data after footer is ignored."
-error_code IMPORT_CONFIRM,	    "Proceed <y|n>?"
-error_code IMPORT_OPEN_DUMP,	    "while opening input file"
-error_code IMPORT_IMPORT,	    "while importing databases"
-error_code IMPORT_TTY,		    "cannot open /dev/tty!!"
-error_code IMPORT_RENAME_OPEN,	    "while opening databases"
-error_code IMPORT_RENAME_LOCK,	    "while acquiring permanent lock"
-error_code IMPORT_RENAME_UNLOCK,    "while releasing permanent lock"
-error_code IMPORT_RENAME_CLOSE,	    "while closing databases"
-error_code IMPORT_SINGLE_RECORD,    ""
-error_code IMPORT_PLURAL_RECORDS,   "s"
-error_code IMPORT_GET_PARAMS,	    "while retrieving configuration parameters"
-end
diff --git a/src/kadmin/import/misc.c b/src/kadmin/import/misc.c
deleted file mode 100644
index bc58c7e7ff..0000000000
--- a/src/kadmin/import/misc.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright 1993 OpenVision Technologies, Inc., All Rights Reserved
- *
- * $Header$
- * 
- * $Log$
- * Revision 1.4  1996/07/22 20:26:31  marc
- * this commit includes all the changes on the OV_9510_INTEGRATION and
- * OV_MERGE branches.  This includes, but is not limited to, the new openvision
- * admin system, and major changes to gssapi to add functionality, and bring
- * the implementation in line with rfc1964.  before committing, the
- * code was built and tested for netbsd and solaris.
- *
- * Revision 1.3.4.1  1996/07/18 03:02:26  marc
- * merged in changes from OV_9510_BP to OV_9510_FINAL1
- *
- * Revision 1.3.2.1  1996/06/20  21:48:39  marc
- * File added to the repository on a branch
- *
- * Revision 1.3  1994/04/11  23:52:10  jik
- * Sandbox:
- *
- *  Include <com_err.h> to get the declaration of error_message.
- *
- * Revision 1.3  1994/03/29  21:18:54  jik
- * Include <com_err.h> to get the declaration of error_message.
- *
- * Revision 1.2  1993/12/21  18:59:25  shanzer
- * make sure we prompt for input from /dev/tty
- *
- * Revision 1.1  1993/11/14  23:51:04  shanzer
- * Initial revision
- *
- */
-
-#if !defined(lint) && !defined(__CODECENTER__)
-static char *rcsid = "$Header$";
-#endif
-
-#include    <stdio.h>
-#include    <com_err.h> /* for error_message() */
-#include    "import_err.h"
-
-#ifndef TRUE
-#define TRUE (1);
-#endif
-#ifndef FALSE
-#define	FALSE (0);
-#endif
-
-/*
- * Function: confirm
- * 
- * Purpose: ask a yes or no question you must answer
- *	    with a 'y|n|Y|n'
- *
- * Arguments:
- *	(input) none
- *	<return value> 1 if answered yes. 0 if no.
- *
- * Requires:
- *	IMPORT_CONFIRM be be defined. and com_err be init.
- * 
- * Effects:
- *	none
- *
- * Modifies:
- *	nuttin
- * 
- */
-
-int
-confirm(void)
-{
-    char    buf[BUFSIZ];    /* can we say overkill ... */
-    FILE    *fp;
-
-    if ((fp = fopen("/dev/tty", "r")) == NULL) {
-	fprintf(stderr, error_message(IMPORT_TTY));
-	return FALSE;
-    }
-    while(1) {
-	fprintf(stderr, error_message(IMPORT_CONFIRM));
-	fgets(buf, BUFSIZ, fp);
-	if(buf[0] == 'y' || buf[0] == 'Y') {
-	    fclose(fp);
-	    return TRUE;
-	}
-	if(buf[0] == 'n' || buf[0] == 'N') {
-	    fclose(fp);
-	    return FALSE;
-	}
-    }
-}
-    
diff --git a/src/kadmin/import/ovsec_adm_import.c b/src/kadmin/import/ovsec_adm_import.c
deleted file mode 100644
index 4ca920434e..0000000000
--- a/src/kadmin/import/ovsec_adm_import.c
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Copyright 1993 OpenVision Technologies, Inc., All Rights Reserved
- *
- * $Header$
- */
-
-#if !defined(lint) && !defined(__CODECENTER__)
-static char *rcsid = "$Header$";
-#endif
-
-#include    <stdio.h>
-#include    <string.h>
-#include    <unistd.h>
-
-#include    <kadm5/adb.h>
-#include    "import_err.h"
-#include    "import.h"
-
-#define	TMP_POLICY_FMT   "/krb5/#ovsec_import_policy.%d"
-
-int
-main(int argc, char *argv[])
-{
-    char		*filename,
-			*whoami;
-    int			ret, merge_princs;
-    FILE		*fp;
-    osa_adb_policy_t	policy_db;
-    char		pol_dbfile[BUFSIZ];
-    kadm5_config_params	params;
-    krb5_context context;
-    
-    filename = NULL;
-    initialize_imp_error_table();
-    initialize_adb_error_table();
-    krb5_init_context(&context);
-    krb5_init_ets(context);
-    
-    whoami = argv[0];
-    merge_princs = 0;
-    while(--argc) {
-	if(*++argv == NULL)
-	    break;
-	if (!strcmp(*argv, "-merge_princs")) {
-	     merge_princs++;
-	     continue;
-	}
-	if (*argv[0] == '-') {
-	    com_err(whoami, IMPORT_UNK_OPTION, NULL);
-	    exit(2);
-	}
-	if(filename == NULL) 
-	    filename = *argv;
-	else {
-	    com_err(whoami, IMPORT_UNK_OPTION, NULL);
-	    exit(2);
-	}
-    }
-    if(filename != NULL) {
-	if ((fp = fopen(filename, "r")) == NULL) {
-	    com_err(whoami, errno, "%s (%s)", error_message(IMPORT_OPEN_DUMP),
-		    filename);
-	    exit(2);
-	}
-    } else fp = stdin;
-
-    sprintf(pol_dbfile, TMP_POLICY_FMT, getpid());
-    if(access(pol_dbfile, F_OK) == 0) {
-	if(unlink(pol_dbfile) != 0)
-	    return errno;
-    }
-
-    params.mask = 0;
-    if (ret = kadm5_get_config_params(context, NULL, NULL, &params,
-				      &params)) {
-	 com_err(whoami, ret, error_message(IMPORT_GET_PARAMS));
-	 exit(2);
-    }
-#define REQUIRED_MASK (KADM5_CONFIG_DBNAME | \
-		       KADM5_CONFIG_ADBNAME)
-    if ((params.mask & REQUIRED_MASK) != REQUIRED_MASK) {
-	 com_err(whoami, KADM5_BAD_SERVER_PARAMS,
-		 error_message(IMPORT_GET_PARAMS));
-	 exit(2);
-    }
-    /*
-     * This trick lets me use the temporary policy db name but the
-     * standard policy db lockfile, thus ensuring that no one changes
-     * the policy while this program is working.
-     */
-    params.admin_dbname = pol_dbfile;
-    
-    if((ret = osa_adb_open_policy(&policy_db, &params)) != OSA_ADB_OK) {
-	 com_err(whoami, ret, error_message(IMPORT_RENAME_OPEN));
-	 exit(2);
-    }
-    if ((ret = osa_adb_get_lock(policy_db, OSA_ADB_PERMANENT) != OSA_ADB_OK)) {
-	 com_err(whoami, ret, error_message(IMPORT_RENAME_LOCK));
-	 exit(2);
-    }
-    if (merge_princs) {
-	 if ((ret = krb5_db_set_name(context, params.dbname)) ||
-	     (ret = krb5_db_init(context))) {
-	      com_err(whoami, ret, error_message(IMPORT_RENAME_OPEN));
-	      exit(2);
-	 }
-    }
-    
-    if((ret = import_file(context, fp, merge_princs, policy_db)) !=
-       OSA_ADB_OK) { 
-	unlink(pol_dbfile);
-	com_err(whoami, ret, error_message(IMPORT_IMPORT));
-	exit(2);
-    }
-
-    if (merge_princs && (ret = krb5_db_fini(context))) {
-	 com_err(whoami, ret, error_message(IMPORT_RENAME_CLOSE));
-	 exit(2);
-    }
-
-    kadm5_free_config_params(context, &params);
-    params.mask = 0;
-    if (ret = kadm5_get_config_params(context, NULL, NULL, &params,
-				      &params)) {
-	 com_err(whoami, ret, error_message(IMPORT_GET_PARAMS));
-	 exit(2);
-    }
-    
-    if (access(params.admin_dbname, F_OK) == 0) {
-	puts(error_message(IMPORT_WARN_DB));
-	if(!confirm()) {
-	    com_err(whoami, IMPORT_FAILED, NULL);
-	    exit(2);
-	}
-    }
-    
-    if((ret = osa_adb_open_policy(&policy_db, &params)) != OSA_ADB_OK) {
-	 com_err(whoami, ret, error_message(IMPORT_RENAME_OPEN));
-	 exit(2);
-    }
-    if ((ret = osa_adb_get_lock(policy_db, OSA_ADB_PERMANENT) != OSA_ADB_OK)) {
-	 com_err(whoami, ret, error_message(IMPORT_RENAME_LOCK));
-	 exit(2);
-    }
-    if (rename(pol_dbfile, params.admin_dbname) != 0) {
-	 com_err(whoami, IMPORT_RENAME_FAILED, NULL);
-
-	 /* WARNING!  Permanent lock is not replaced.  This will */
-	 /* require manual administrative action! */
-	 exit(2);
-    }
-    if ((ret = osa_adb_release_lock(policy_db)) != OSA_ADB_OK) {
-	 com_err(whoami, ret, error_message(IMPORT_RENAME_UNLOCK));
-
-	 /* WARNING!  Permanent lock is not replaced.  This will */
-	 /* require manual administrative action! */
-	 exit(2);
-    }
-    if ((ret = osa_adb_close_policy(policy_db)) != OSA_ADB_OK) {
-	 com_err(whoami, ret, error_message(IMPORT_RENAME_CLOSE));
-	 exit(2);
-    }
-    exit(0);
-}
diff --git a/src/kadmin/import/strtok.c b/src/kadmin/import/strtok.c
deleted file mode 100644
index 7b71557860..0000000000
--- a/src/kadmin/import/strtok.c
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright 1993 OpenVision Technologies, Inc., All Rights Reserved
- *
- * $Header$
- * 
- * $Log$
- * Revision 1.2  1996/07/22 20:26:35  marc
- * this commit includes all the changes on the OV_9510_INTEGRATION and
- * OV_MERGE branches.  This includes, but is not limited to, the new openvision
- * admin system, and major changes to gssapi to add functionality, and bring
- * the implementation in line with rfc1964.  before committing, the
- * code was built and tested for netbsd and solaris.
- *
- * Revision 1.1.4.1  1996/07/18 03:02:29  marc
- * merged in changes from OV_9510_BP to OV_9510_FINAL1
- *
- * Revision 1.1.2.1  1996/06/20  21:49:01  marc
- * File added to the repository on a branch
- *
- * Revision 1.1  1993/11/14  23:51:23  shanzer
- * Initial revision
- *
- */
-
-#if !defined(lint) && !defined(__CODECENTER__)
-static char *rcsid = "$Header$";
-#endif
-
-
-/*
- * Copyright (c) 1988 Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that: (1) source distributions retain this entire copyright
- * notice and comment, and (2) distributions including binaries display
- * the following acknowledgement:  ``This product includes software
- * developed by the University of California, Berkeley and its contributors''
- * in the documentation or other materials provided with the distribution
- * and in all advertising materials mentioning features or use of this
- * software. Neither the name of the University nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strtok.c	5.7 (Berkeley) 6/1/90";
-#endif /* LIBC_SCCS and not lint */
-
-#include <stddef.h>
-#include <string.h>
-
-/*
- * Function: nstrtok
- * 
- * Purpose: the same as strtok ... just different. does not deal with
- *	    multiple tokens in row.
- *
- * Arguments:
- *	s	    (input) string to scan
- *	delim	    (input) list of delimiters
- * 	<return value> string or null on error.
- *
- * Requires:
- *	nuttin
- * 
- * Effects:
- *	sets last to string
- *
- * Modifies:
- *	last
- * 
- */
-
-char *
-nstrtok(s, delim)
-	register char *s, *delim;
-{
-	register char *spanp;
-	register int c, sc;
-	char *tok;
-	static char *last;
-
-
-	if (s == NULL && (s = last) == NULL)
-		return (NULL);
-
-	/*
-	 * Skip (span) leading delimiters (s += strspn(s, delim), sort of).
-	 */
-#ifdef OLD	 
-cont:
-	c = *s++;
-	for (spanp = delim; (sc = *spanp++) != 0;) {
-		if (c == sc)
-			goto cont;
-	}
-
-	if (c == 0) {		/* no non-delimiter characters */
-		last = NULL;
-		return (NULL);
-	}
-	tok = s - 1;
-#else
-	tok = s;
-#endif	
-
-	/*
-	 * Scan token (scan for delimiters: s += strcspn(s, delim), sort of).
-	 * Note that delim must have one NUL; we stop if we see that, too.
-	 */
-	for (;;) {
-		c = *s++;
-		spanp = delim;
-		do {
-			if ((sc = *spanp++) == c) {
-				if (c == 0)
-					s = NULL;
-				else
-					s[-1] = 0;
-				last = s;
-				return (tok);
-			}
-		} while (sc != 0);
-	}
-	/* NOTREACHED */
-}
-
diff --git a/src/kadmin/import/unit-test/Makefile.ov b/src/kadmin/import/unit-test/Makefile.ov
deleted file mode 100644
index c7ac33c0bb..0000000000
--- a/src/kadmin/import/unit-test/Makefile.ov
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# $Id$
-#
-
-TOP = ../..
-include $(TOP)/config.mk/template
-
-unit-test::
-	$(RUNTEST) IMPORT=../ovsec_adm_import --tool import
diff --git a/src/kadmin/import/unit-test/config/unix.exp b/src/kadmin/import/unit-test/config/unix.exp
deleted file mode 100644
index af4ff443ea..0000000000
--- a/src/kadmin/import/unit-test/config/unix.exp
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# import_version -- extract and print the version number of import
-#
-
-proc import_version {} {
-	global IMPORT
-	set tmp [exec ident $IMPORT]
-	if [regexp {Header: .*import.c,v ([0-9]+\.[0-9]+)} $tmp \
-		dummy version] then {
-		clone_output "$IMPORT version $version\n"
-	} else {
-		clone_output "$IMPORT version <unknown>\n"
-	}
-}
-#
-# import_load -- loads the program
-#
-proc import_load {} {
-	#
-}
-
-# import_exit -- clean up and exit
-proc import_exit {} {
-	#
-}
-
-#
-# import_start -- start import running
-#
-proc import_start { args } {
-	global IMPORT
-	global spawn_id
-
-	verbose "% $IMPORT $args" 1
-	eval spawn $IMPORT $args
-}
diff --git a/src/kadmin/import/unit-test/helpers.exp b/src/kadmin/import/unit-test/helpers.exp
deleted file mode 100644
index 5905614e78..0000000000
--- a/src/kadmin/import/unit-test/helpers.exp
+++ /dev/null
@@ -1,93 +0,0 @@
-#
-# $Id$
-#
-
-proc myfail { comment } {
-	global mytest_name
-	global mytest_status
-	wait
-	fail "$mytest_name: $comment"
-	set mytest_status 1
-}
-
-proc mypass {} {
-}
-
-##
-## When you expect on an id, and eof is detected, the spawn_id is closed.
-## It may be waited for, but calling expect or close on this id is an ERROR!
-##
-
-proc mytest { name kpargs status args } {
-	global spawn_id
-	global timeout
-	global mytest_name
-	global mytest_status
-
-	verbose "starting test: $name"
-
-	set mytest_name "$name"
-
-	eval import_start $kpargs
-
-	# at the end, eof is success
-
-	lappend args { eof { if {[regexp "\[\r\n\]$" $expect_out(buffer)] == 0} { myfail "final status message not newline-terminated" } } }
-
-	# for each test argument....
-	# rep invariant:  when this foreach ends, the id is close'd, but
-	#   not wait'ed.
-
-	foreach test $args {
-		set mytest_status 0
-
-		# treat the arg as an expect parameter
-		# if failure, the process will be closed and waited.
-
-		uplevel 1 "expect {
-			$test
-			timeout { close; myfail \"timeout\"}
-			eof { myfail \"eof read before expected message string\" }
-		}"			
-
-		if {$mytest_status == 1} { return }
-	}
-
-	# at this point, the id is closed and we can wait on it.
-
-	set ret [wait]
-	verbose "% Exit $ret" 1
-	if {[lindex $ret 0] == -1} {
-		fail "$name: wait returned error [lindex $ret 1]"
-	} else {
-		if { ((![string compare $status zero]) &&
-		      ([lindex $ret 1] == 0)) ||
-		     ((![string compare $status nonzero]) &&
-		      ([lindex $ret 1] != 0)) } {
-			pass "$name"
-		} else {
-			fail "$name: unexpected return status [lindex $ret 1], should be $status"
-		}
-	}
-}
-
-proc import_win { name args } {
-	mytest "$name" "$args" zero {
-		-re "Successfully imported \[0-9\]+ records."
-			{ mypass }
-		eof
-			{ myfail "error: $expect_out(buffer)" }
-	} 
-}
-
-proc import_lose { name args error } {
-	mytest "$name" "$args" nonzero {
-		-re "Successfully imported \[0-9\]+ records."
-			{ myfail "unexpected success" }
-		-re "ovsec_adm_import: .*$error"
-			{ mypass }
-		eof
-			{ myfail "error: $expect_out(buffer)" }
-	} 
-}
-
diff --git a/src/kadmin/import/unit-test/import.0/usage.exp b/src/kadmin/import/unit-test/import.0/usage.exp
deleted file mode 100644
index 8e82f5a210..0000000000
--- a/src/kadmin/import/unit-test/import.0/usage.exp
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# $Id$
-#
-
-set timeout 5
-
-load_lib "helpers.exp"
-
-#
-# Here are the tests
-#
-
-import_lose "C.6: input file not readable" /foo/bar/baz \
-	"No such file or directory while opening input file"
-
-import_lose "C.7: two arguments" {foo bar} \
-	"Usage:"
-
-system {rm -rf /krb5}
-
-import_lose "C.2: /krb5 doesn't exist" ./valid_export_file \
-	"Secure administration database lock file missing while importing"
-
diff --git a/src/kadmin/import/unit-test/valid_export_file b/src/kadmin/import/unit-test/valid_export_file
deleted file mode 100644
index dad19c874c..0000000000
--- a/src/kadmin/import/unit-test/valid_export_file
+++ /dev/null
@@ -1,27 +0,0 @@
-OpenV*Secure V1.0	Tue Dec 21 14:18:18 1993
-policy	test-pol	0	10000	8	2	3	1
-policy	dict-only	0	0	1	1	1	1
-policy	once-a-min	30	0	1	1	1	1
-policy	test-pol-nopw	0	0	1	1	1	2
-princ	admin/delete@SECURE-TEST.OV.COM		0	0	0	0	
-princ	test3@SECURE-TEST.OV.COM		0	0	0	0	
-princ	admin/modify@SECURE-TEST.OV.COM		0	0	0	0	
-princ	ovsec_adm/changepw@SECURE-TEST.OV.COM		0	0	0	0	
-princ	test2@SECURE-TEST.OV.COM		0	0	0	0	
-princ	admin/pol@SECURE-TEST.OV.COM	test-pol-nopw	800	0	0	0	
-princ	admin/rename@SECURE-TEST.OV.COM		0	0	0	0	
-princ	test1@SECURE-TEST.OV.COM		0	0	0	0	
-princ	krbtgt/SECURE-TEST.OV.COM@SECURE-TEST.OV.COM		0	0	0	0	
-princ	pol3@SECURE-TEST.OV.COM	dict-only	800	0	0	0	
-princ	admin/get-pol@SECURE-TEST.OV.COM	test-pol-nopw	800	0	0	0	
-princ	admin/none@SECURE-TEST.OV.COM		0	0	0	0	
-princ	testuser@SECURE-TEST.OV.COM		0	0	0	0	
-princ	pol2@SECURE-TEST.OV.COM	once-a-min	800	0	0	0	
-princ	K/M@SECURE-TEST.OV.COM		0	0	0	0	
-princ	pol1@SECURE-TEST.OV.COM	test-pol	800	0	0	0	
-princ	ovsec_adm/history@SECURE-TEST.OV.COM		0	0	0	0	
-princ	admin@SECURE-TEST.OV.COM		0	0	0	0	
-princ	admin/add@SECURE-TEST.OV.COM		0	0	0	0	
-princ	admin/get@SECURE-TEST.OV.COM		0	0	0	0	
-princ	ovsec_adm/admin@SECURE-TEST.OV.COM		0	0	0	0	
-End of Database	25	records