Remove loadv4/dumpv4 code in kdb5_util. (The command table entries for

this code had already been commented out previously.)

ticket: 6303
status: open

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

6 files changed, 0 insertions, 1500 deletions

diff --git a/src/kadmin/dbutil/Makefile.in b/src/kadmin/dbutil/Makefile.in
index 331a3d9..2d8b15d 100644
--- a/src/kadmin/dbutil/Makefile.in
+++ b/src/kadmin/dbutil/Makefile.in
@@ -10,10 +10,6 @@ PROG_RPATH=$(KRB5_LIBDIR)
 KDB_DEP_LIB=$(DL_LIB) $(THREAD_LINKOPTS)
 
 PROG = kdb5_util
-###OBJS	= kdb5_util.o dump.o dumpv4.o loadv4.o \
-###	kdb5_create.o kadm5_create.o string_table.o kdb5_stash.o \
-###	kdb5_destroy.o ovload.o import_err.o strtok.o
-###
 
 SRCS = kdb5_util.c kdb5_create.c kadm5_create.c string_table.c kdb5_destroy.c kdb5_stash.c import_err.c strtok.c dump.c ovload.c
 
diff --git a/src/kadmin/dbutil/dumpv4.c b/src/kadmin/dbutil/dumpv4.c
deleted file mode 100644
index 065206a..0000000
--- a/src/kadmin/dbutil/dumpv4.c
+++ /dev/null
@@ -1,462 +0,0 @@
-/*
- * admin/edit/dumpv4.c
- *
- * Copyright 1990,1991, 1994 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.
- * 
- *
- * Dump a KDC database into a V4 slave dump.
- */
-
-/*
- * Copyright (C) 1998 by the FundsXpress, INC.
- * 
- * 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 FundsXpress. not be used in advertising or publicity pertaining
- * to distribution of the software without specific, written prior
- * permission.  FundsXpress makes no representations about the suitability of
- * this software for any purpose.  It is provided "as is" without express
- * or implied warranty.
- * 
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-#ifdef KRB5_KRB4_COMPAT
-
-#include "k5-int.h"
-#include "com_err.h"
-
-#include <des.h>
-#include <krb.h>
-#ifdef HAVE_KRB_DB_H
-#include <krb_db.h>
-#endif /*HAVE_KRB_DB_H*/
-#ifdef HAVE_KDC_H
-;/* MKEYFILE is now defined in kdc.h */
-#include <kdc.h>
-#endif /*HAVE_KDC_H*/
-#include <stdio.h>
-#include <kadm5/admin.h>
-#include "kdb5_util.h"
-
-struct dump_record {
-	char	*comerr_name;
-	FILE	*f;
-	krb5_keyblock *v5mkey;
-	C_Block		v4_master_key;
-	Key_schedule	v4_master_key_schedule;
-	long	master_key_version;
-	char	*realm;
-};
-
-
-void update_ok_file();
-
-#define ANAME_SZ 40
-#define INST_SZ 40
-
-static char *v4_mkeyfile = "/.k";
-static int shortlife;
-static krb5_error_code handle_one_key(struct dump_record *arg, 
-				      krb5_keyblock *v5mkey, 
-				      krb5_key_data *v5key, 
-				      des_cblock v4key);
-static int handle_keys(struct dump_record *arg);
-
-static int
-v4init(arg, manual)
-    struct dump_record *arg;
-    int manual;
-{
-    int fd;
-    int ok = 0;
-
-    if (!manual) {
-	fd = open(v4_mkeyfile, O_RDONLY, 0600);
-	if (fd >= 0) {
-	    if (read(fd,arg->v4_master_key,sizeof(C_Block)) == sizeof(C_Block))
-		ok = 1;
-	    close(fd);
-	}
-    }
-    if (!ok) {
-	des_read_password(&arg->v4_master_key, "V4 Kerberos master key", 1);
-	printf("\n");
-    }
-    arg->master_key_version = 1;
-    key_sched(arg->v4_master_key, arg->v4_master_key_schedule);
-
-    return 0;
-}
-
-static void
-v4_print_time(file, timeval)
-    FILE   *file;
-    unsigned long timeval;
-{
-    struct tm *tm;
-    struct tm *gmtime();
-    tm = gmtime((time_t *)&timeval);
-    fprintf(file, " %04d%02d%02d%02d%02d",
-            tm->tm_year < 1900 ? tm->tm_year + 1900: tm->tm_year,
-            tm->tm_mon + 1,
-            tm->tm_mday,
-            tm->tm_hour,
-            tm->tm_min);
-}
-
-
-
-static krb5_error_code
-dump_v4_iterator(ptr, entry)
-    krb5_pointer ptr;
-    krb5_db_entry *entry;
-{
-    struct dump_record *arg = (struct dump_record *) ptr;
-    krb5_principal mod_princ;
-    krb5_timestamp mod_time;
-    krb5_error_code retval;
-    int	i, max_kvno, ok_key;
-
-    struct v4princ {
-	char name[ANAME_SZ+1];
-	char instance[INST_SZ+1];
-	char realm[REALM_SZ+1];
-	int max_life;
-	int kdc_key_ver, key_version, attributes;
-	char mod_name[ANAME_SZ+1];
-	char mod_instance[INST_SZ+1];
-	char mod_realm[REALM_SZ+1];
-    } v4princ, *principal;
-    des_cblock v4key;
-    
-    principal = &v4princ;
-
-    if (strcmp(krb5_princ_realm(util_context, entry->princ)->data, arg->realm))
-	/* skip this because it's a key for a different realm, probably
-	 * a paired krbtgt key */
-	return 0;
-
-    retval = krb5_524_conv_principal(util_context, entry->princ,
-				     principal->name, principal->instance,
-				     principal->realm);
-    if (retval)
-	/* Skip invalid V4 principals */
-	return 0;
-
-    if (!strcmp(principal->name, "K") && !strcmp(principal->instance, "M"))
-	/* The V4 master key is handled specially */
-	return 0;
-
-    if (! principal->name[0])
-	return 0;
-    if (! principal->instance[0])
-	strlcpy(principal->instance, "*", sizeof(principal->instance));
-
-    /* Now move to mod princ */
-    if ((retval = krb5_dbe_lookup_mod_princ_data(util_context,entry,
-						 &mod_time, &mod_princ))){
-	com_err(arg->comerr_name, retval, "while unparsing db entry");
-	exit_status++;
-	return retval;
-    }
-    retval = krb5_524_conv_principal(util_context, mod_princ,
-				     principal->mod_name, principal->mod_instance,
-				     principal->mod_realm);
-    if (retval) {
-	/* Invalid V4 mod principal */
-	principal->mod_name[0] = '\0';
-	principal->mod_instance[0] = '\0';
-    }
-
-    if (! principal->mod_name[0])
-	strlcpy(principal->mod_name, "*", sizeof(principal->mod_name));
-    if (! principal->mod_instance[0])
-	strlcpy(principal->mod_instance, "*", sizeof(principal->mod_instance));
-    
-    /* OK deal with the key now. */
-    for (max_kvno = i = 0; i < entry->n_key_data; i++) {
-	if (max_kvno < entry->key_data[i].key_data_kvno) {
-	     max_kvno = entry->key_data[i].key_data_kvno;
-	     ok_key = i;
-	}
-    }
-
-    i = ok_key;
-    while (ok_key < entry->n_key_data) {
-	if (max_kvno == entry->key_data[ok_key].key_data_kvno) {
-	    if (entry->key_data[ok_key].key_data_type[1]
-		== KRB5_KDB_SALTTYPE_V4) {
-		goto found_one;
-	    }
-	}
-	ok_key++;
-    }
-
-    /* See if there are any DES keys that may be suitable */
-    ok_key = i;
-    while (ok_key < entry->n_key_data) {
-	if (max_kvno == entry->key_data[ok_key].key_data_kvno) {
-	    krb5_enctype enctype = entry->key_data[ok_key].key_data_type[0];
-	    if ((enctype == ENCTYPE_DES_CBC_CRC) ||
-		(enctype == ENCTYPE_DES_CBC_MD5) ||
-		(enctype == ENCTYPE_DES_CBC_RAW))
-		goto found_one;
-	}
-	ok_key++;
-    }
-    /* skip this because it's a new style key and we can't help it */
-    return 0;
-
-found_one:;
-    principal->key_version = max_kvno;
-    if (!shortlife)
-	principal->max_life = krb_time_to_life(0, entry->max_life);
-    else {
-	principal->max_life = entry->max_life / (60 * 5);
-	if (principal->max_life > 255)
-	    principal->max_life = 255;
-    }
-
-    principal->kdc_key_ver = arg->master_key_version;
-    principal->attributes = 0;	/* ??? not preserved either */
-
-    fprintf(arg->f, "%s %s %d %d %d %d ",
-	    principal->name,
-	    principal->instance,
-	    principal->max_life,
-	    principal->kdc_key_ver,
-	    principal->key_version,
-	    principal->attributes);
-
-    handle_one_key(arg, arg->v5mkey, &entry->key_data[ok_key], v4key);
-
-    for (i = 0; i < 8; i++) {
-	fprintf(arg->f, "%02x", ((unsigned char*)v4key)[i]);
-	if (i == 3) fputc(' ', arg->f);
-    }
-
-    if (entry->expiration == 0) {
-        /* 0 means "never" expire. V4 didn't support that, so rather than
-	   having everything appear to have expired in 1970, we nail in the
-	   Cygnus 96q1 default value.  The value quoted here is directly 
-	   from src/admin/kdb_init.c in Cygnus CNS V4 96q1, and is
-	   roughly 12/31/2009. */
-        v4_print_time(arg->f, 946702799+((365*10+3)*24*60*60));
-    } else {
-    v4_print_time(arg->f, entry->expiration);
-    }
-    v4_print_time(arg->f, mod_time);
-
-    fprintf(arg->f, " %s %s\n", principal->mod_name, principal->mod_instance);
-    return 0;
-}
-
-/*ARGSUSED*/
-void dump_v4db(argc, argv)
-	int	argc;
-	char	**argv;
-{
-	int	i;
-	char	*outname = NULL;
-	FILE	*f;
-	struct dump_record	arg;
-
-	for (i = 1; i < argc; i++) {
-		if (!strcmp(argv[i], "-S")) {
-			shortlife++;
-			continue;
-		}
-		break;
-	}
-	if (argc - i > 1) {
-		com_err(argv[0], 0, "Usage: %s [-S] filename", argv[0]);
-		exit_status++;
-		return;
-	}
-	if (!dbactive) {
-		com_err(argv[0], 0, Err_no_database);
-		exit_status++;
-		return;
-	}
-	if (argc - i == 1) {
-		outname = argv[i];
-		/*
-		 * Make sure that we don't open and truncate on the fopen,
-		 * since that may hose an on-going kprop process.
-		 * 
-		 * We could also control this by opening for read and
-		 * write, doing an flock with LOCK_EX, and then
-		 * truncating the file once we have gotten the lock,
-		 * but that would involve more OS dependancies than I
-		 * want to get into.
-		 */
-		unlink(outname);
-		if (!(f = fopen(outname, "w"))) {
-			com_err(argv[0], errno,
-				"While opening file %s for writing", outname);
-			exit_status++;
-			return;
-		}
-	} else {
-		f = stdout;
-	}
-
-	arg.comerr_name = argv[0];
-	arg.f = f;
-	v4init(&arg, 0);
-	handle_keys(&arg);
-
-	/* special handling for K.M since it isn't preserved */
-	{
-	  des_cblock v4key;
-	  int i2;
-
-	  /* assume:
-	     max lifetime (255)
-	     key version == 1 (actually, should be whatever the v5 one is)
-	     master key version == key version
-	     args == 0 (none are preserved)
-	     expiration date is the default 2000
-	     last mod time is near zero (arbitrarily.)
-	     creator is db_creation *
-	     */
-
-	  fprintf(f,"K M 255 1 1 0 ");
-	  
-#ifndef	KDB4_DISABLE
-	  kdb_encrypt_key (arg.v4_master_key, v4key, 
-			   arg.v4_master_key, arg.v4_master_key_schedule, 
-			   ENCRYPT);
-#else	/* KDB4_DISABLE */
-	  pcbc_encrypt((C_Block *) arg.v4_master_key,
-		       (C_Block *) v4key,
-		       (long) sizeof(C_Block),
-		       arg.v4_master_key_schedule,
-		       (C_Block *) arg.v4_master_key,
-		       ENCRYPT);
-#endif	/* KDB4_DISABLE */
-
-	  for (i2=0; i2<8; i2++) {
-	    fprintf(f, "%02x", ((unsigned char*)v4key)[i2]);
-	    if (i2 == 3) fputc(' ', f);
-	  }
-	  fprintf(f," 200001010459 197001020000 db_creation *\n");
-	}
-
-	(void) krb5_db_iterate(util_context, dump_v4_iterator, 
-			       (krb5_pointer) &arg);
-	if (argc == 2)
-		fclose(f);
-	if (outname)
-		update_ok_file(outname);
-}
-
-static int handle_keys(arg)
-    struct dump_record *arg;
-{
-    krb5_error_code retval;
-    char *defrealm;
-    char *mkey_name = 0;
-    char *mkey_fullname;
-    krb5_principal l_master_princ;
-
-    if ((retval = krb5_get_default_realm(util_context, &defrealm))) {
-      com_err(arg->comerr_name, retval, 
-	      "while retrieving default realm name");
-      exit(1);
-    }	    
-    arg->realm = defrealm;
-
-    /* assemble & parse the master key name */
-
-    if ((retval = krb5_db_setup_mkey_name(util_context, mkey_name, arg->realm, 
-					  &mkey_fullname, &l_master_princ))) {
-	com_err(arg->comerr_name, retval, "while setting up master key name");
-	exit(1);
-    }
-
-    if ((retval = krb5_db_fetch_mkey(util_context, l_master_princ, 
-				     master_keyblock.enctype, 0,
-				     0, global_params.stash_file, 0,
-				     &master_keyblock))) { 
-	com_err(arg->comerr_name, retval, "while reading master key");
-	exit(1);
-    }
-    arg->v5mkey = &master_keyblock;
-    return(0);
-}
-
-static krb5_error_code
-handle_one_key(arg, v5mkey, v5key, v4key)
-    struct dump_record *arg;
-    krb5_keyblock *v5mkey;
-    krb5_key_data *v5key;
-    des_cblock v4key;
-{
-    krb5_error_code retval;
-
-    krb5_keyblock v5plainkey;
-    /* v4key is the actual v4 key from the file. */
-
-    retval = krb5_dbekd_decrypt_key_data(util_context, v5mkey, v5key, 
-					 &v5plainkey, NULL);
-    if (retval) 
-	return retval;
-
-    memcpy(v4key, v5plainkey.contents, sizeof(des_cblock));
-#ifndef	KDB4_DISABLE
-    kdb_encrypt_key (v4key, v4key, 
-		     arg->v4_master_key, arg->v4_master_key_schedule, 
-		     ENCRYPT);
-#else	/* KDB4_DISABLE */
-    pcbc_encrypt((C_Block *) v4key,
-		 (C_Block *) v4key,
-		 (long) sizeof(C_Block),
-		 arg->v4_master_key_schedule,
-		 (C_Block *) arg->v4_master_key,
-		 ENCRYPT);
-#endif	/* KDB4_DISABLE */
-    return 0;
-}
-
-#else /* KRB5_KRB4_COMPAT */
-void dump_v4db(argc, argv)
-	int	argc;
-	char	**argv;
-{
-	printf("This version of krb5_edit does not support the V4 dump command.\n");
-}
-#endif /* KRB5_KRB4_COMPAT */
diff --git a/src/kadmin/dbutil/kdb5_util.M b/src/kadmin/dbutil/kdb5_util.M
index d58c972..dc34bc8 100644
--- a/src/kadmin/dbutil/kdb5_util.M
+++ b/src/kadmin/dbutil/kdb5_util.M
@@ -213,59 +213,6 @@ is required and overrides the value specified on the command line or the
 default.
 .RE
 .TP
-\fBdump_v4\fP [\fB\-S\fP] [\fIfilename\fP]
-Dumps the current database into the Kerberos 4 database dump format.
-The \-S option specifies the short lifetime algorithm.
-.TP
-\fBload_v4\fP [\fB\-T\fP] [\fB\-v\fP] [\fB\-h\fP] [\fB\-S\fP]
-[\fB\-t\fP] [\fB-n\fP] [\fB\-K\fP] [\fB\-s\fP\ \fIstashfile\fP]
-\fIinputfile\fP
-.br
-Loads a Kerberos 4 database dump file.  Options:
-.RS
-.TP
-.B \-K
-prompts for the V5 master key instead of using the stashed version.
-.TP
-.B \-n
-prompts for the V4 master key, instead of reading from the stash file.
-.TP
-.B \-s \fIstashfile
-gets the V4 master key out of \fIstashfile\fP instead of /.k
-.TP
-.B \-T
-creates a new \fIkrbtgt\fP instead of converting the V4 one.  The V5 server
-will thus not recognize outstanding tickets, so this should be used 
-with caution.
-.TP
-.B \-v
-lists each principal as it is converted or ignored.
-.TP
-.B \-t
-uses a temporary database, then moves that into place, instead of adding 
-the keys to the current database.
-.TP
-.B \-S
-Uses the short lifetime algorithm for conversion.
-.TP
-.B \-h
-Stores the database as a hash instead of a btree.  This option is
-not recommended, as databases stored in hash format are known to
-corrupt data and lose principals.
-.PP
-Note: if the Kerberos 4 database had a default expiration date of 12/31/1999
-or 12/31/2009 (the compiled in defaults for older or newer Kerberos
-releases) then any entries which have the same expiration date will be
-converted to "never" expire in the version 5 database.  If the default
-did not match either value, all expiration dates will be preserved. 
-.PP
-Also, Kerberos 4 stored a single modification time for any change to a
-record; Version 5 stores a seperate modification time and last
-password change time.  In practice, Version 4 "modifications" were
-always password changes.  \fIload_v4\fP copies the value into both
-fields.
-.RE
-.TP
 \fBark\fP
 Adds a random key.
 .SH SEE ALSO
diff --git a/src/kadmin/dbutil/kdb5_util.c b/src/kadmin/dbutil/kdb5_util.c
index a61469a..9bc8537 100644
--- a/src/kadmin/dbutil/kdb5_util.c
+++ b/src/kadmin/dbutil/kdb5_util.c
@@ -120,8 +120,6 @@ struct _cmd_table {
      {"stash", kdb5_stash, 1},
      {"dump", dump_db, 1},
      {"load", load_db, 0},
-/*      {"dump_v4", dump_v4db, 1}, */
-/*      {"load_v4", load_v4db, 0}, */
      {"ark", add_random_key, 1},
      {NULL, NULL, 0},
 };
diff --git a/src/kadmin/dbutil/kdb5_util.h b/src/kadmin/dbutil/kdb5_util.h
index 69dfba9..59f92d4 100644
--- a/src/kadmin/dbutil/kdb5_util.h
+++ b/src/kadmin/dbutil/kdb5_util.h
@@ -77,8 +77,6 @@ extern int process_ov_principal (char *fname, krb5_context kcontext,
 
 extern void load_db (int argc, char **argv);
 extern void dump_db (int argc, char **argv);
-extern void load_v4db (int argc, char **argv);
-extern void dump_v4db (int argc, char **argv);
 extern void kdb5_create (int argc, char **argv);
 extern void kdb5_destroy (int argc, char **argv);
 extern void kdb5_stash (int argc, char **argv);
diff --git a/src/kadmin/dbutil/loadv4.c b/src/kadmin/dbutil/loadv4.c
deleted file mode 100644
index 91b31fe..0000000
--- a/src/kadmin/dbutil/loadv4.c
+++ /dev/null
@@ -1,977 +0,0 @@
-/*
- * kadmin/dbutil/loadv4.c
- *
- * Copyright 1996 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.
- * 
- *
- * Generate (from scratch) a Kerberos V5 KDC database, filling it in with the
- * entries from a V4 database.
- */
-
-/*
- * Copyright (C) 1998 by the FundsXpress, INC.
- * 
- * 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 FundsXpress. not be used in advertising or publicity pertaining
- * to distribution of the software without specific, written prior
- * permission.  FundsXpress makes no representations about the suitability of
- * this software for any purpose.  It is provided "as is" without express
- * or implied warranty.
- * 
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-#include <stdio.h>
-
-#ifdef KRB5_KRB4_COMPAT
-
-#include "k5-int.h"
-#include "com_err.h"
-
-#include <des.h>
-#include <krb.h>
-#include <krb_db.h>
-/* MKEYFILE is now defined in kdc.h */
-#include <kdc.h>
-
-static C_Block master_key;
-static Key_schedule master_key_schedule;
-
-static char *v4_mkeyfile = "/.k";
-
-#include <kadm5/admin.h>
-/* Define to make certain blocks private */
-#define V4_DECLARES_STATIC
-#include "kdb5_util.h"
-#include "kadm5/adb.h"                  /* osa_adb_create_policy_db */
-#include <netinet/in.h>			/* ntohl */
-
-#define PROGNAME argv[0]
-
-enum ap_op {
-    NULL_KEY,				/* setup null keys */
-    MASTER_KEY,				/* use master key as new key */
-    RANDOM_KEY				/* choose a random key */
-};
-
-struct realm_info {
-    krb5_deltat max_life;
-    krb5_deltat max_rlife;
-    krb5_timestamp expiration;
-    krb5_flags flags;
-    krb5_keyblock *key;
-};
-
-static struct realm_info rblock = { /* XXX */
-    KRB5_KDB_MAX_LIFE,
-    KRB5_KDB_MAX_RLIFE,
-    KRB5_KDB_EXPIRATION,
-    KRB5_KDB_DEF_FLAGS,
-    0
-};
-
-static int verbose = 0;
-
-static int shortlife = 0;
-
-static krb5_error_code add_principal 
-		  (krb5_context,
-		   krb5_principal, 
-		   enum ap_op,
-		   struct realm_info *);
-
-static int v4init (char *, int, char *);
-static krb5_error_code enter_in_v5_db (krb5_context,
-				       char *, Principal *);
-static krb5_error_code process_v4_dump (krb5_context, char *,
-					char *, long);
-static krb5_error_code v4_dump_find_default (krb5_context, char *,
-					     char *, long *);
-static krb5_error_code fixup_database (krb5_context, char *);
-	
-static int create_local_tgt = 0;
-
-static krb5_keyblock master_keyblock;
-static krb5_principal master_princ;
-
-static krb5_data tgt_princ_entries[] = {
-	{0, KRB5_TGS_NAME_SIZE, KRB5_TGS_NAME},
-	{0, 0, 0} };
-
-static krb5_data db_creator_entries[] = {
-	{0, sizeof("db_creation")-1, "db_creation"} };
-
-/* XXX knows about contents of krb5_principal, and that tgt names
- are of form TGT/REALM@REALM */
-static krb5_principal_data tgt_princ = {
-        0,					/* magic number */
-	{0, 0, 0},				/* krb5_data realm */
-	tgt_princ_entries,			/* krb5_data *data */
-	2,					/* int length */
-	KRB5_NT_SRV_INST			/* int type */
-};
-
-static krb5_principal_data db_create_princ = {
-        0,					/* magic number */
-	{0, 0, 0},				/* krb5_data realm */
-	db_creator_entries,			/* krb5_data *data */
-	1,					/* int length */
-	KRB5_NT_SRV_INST			/* int type */
-};
-
-
-void
-load_v4db(argc, argv)
-    int argc;
-    char *argv[];
-{
-    krb5_error_code retval;
-    /* The kdb library will default to this, but it is convenient to
-       make it explicit (error reporting and temporary filename generation
-       use it).  */
-    char *dbname = DEFAULT_KDB_FILE;
-    char *v4dumpfile = 0;
-    char *realm = 0;
-    char *mkey_name = 0;
-    char *mkey_fullname;
-    char *defrealm;
-    int v4manual = 0;
-    krb5_boolean read_mkey = 0;
-    int tempdb = 0;
-    char *tempdbname;
-    krb5_context context;
-    char *stash_file = (char *) NULL;
-    int	persist, op_ind;
-    kadm5_config_params newparams;
-    extern kadm5_config_params global_params;
-    long exp_time = 0;
-    krb5_int32 crflags = KRB5_KDB_CREATE_BTREE;
-    krb5_data seed;
-
-    retval = kadm5_init_krb5_context(&context);
-    if (retval) {
-	fprintf(stderr, "%s: Could not initialize krb5 context.\n", PROGNAME);
-	return;
-    }
-
-    if (strrchr(argv[0], '/'))
-	argv[0] = strrchr(argv[0], '/')+1;
-
-    persist = 1;
-    op_ind = 1;
-    while (persist && (op_ind < argc)) {
-	if (!strcmp(argv[op_ind], "-T")) {
-	    create_local_tgt = 1;
-	}
-	else if (!strcmp(argv[op_ind], "-t")) {
-	    tempdb = 1;
-	}
-	else if (!strcmp(argv[op_ind], "-K")) {
-	    read_mkey = 1;
-	}
-	else if (!strcmp(argv[op_ind], "-v")) {
-	    verbose = 1;
-	}
-	else if (!strcmp(argv[op_ind], "-n")) {
-	    v4manual++;
-	} 
-	else if (!strcmp(argv[op_ind], "-S")) {
-	    shortlife++;
-	}
-	else if (!strcmp(argv[op_ind], "-s")) {
-	    if ((argc - op_ind) >= 1) {
-	        v4_mkeyfile = argv[op_ind+1];
-		op_ind++;
-	    } else {
-		usage();
-	    }
-	}
-	else if (!strcmp(argv[op_ind], "-h")) {
-	    crflags = KRB5_KDB_CREATE_HASH;
-	}
-	else if ((argc - op_ind) >= 1) {
-	    v4dumpfile = argv[op_ind];
-	    op_ind++;
-	}
-	else
-	    usage();
-	op_ind++;
-    }
-
-    realm = global_params.realm;
-    dbname = global_params.dbname;
-    mkey_name = global_params.mkey_name;
-    master_keyblock.enctype = global_params.enctype;
-    if (global_params.stash_file)
-	    stash_file = strdup(global_params.stash_file);
-    rblock.max_life = global_params.max_life;
-    rblock.max_rlife = global_params.max_rlife;
-    rblock.expiration = global_params.expiration;
-    rblock.flags = global_params.flags;
-
-    if (!v4dumpfile) {
-	usage();
-	krb5_free_context(context);
-	return;
-    }
-
-    if (!krb5_c_valid_enctype(master_keyblock.enctype)) {
-	com_err(PROGNAME, KRB5_PROG_KEYTYPE_NOSUPP,
-		"while setting up enctype %d", master_keyblock.enctype);
-	krb5_free_context(context);
-	return;
-    }
-
-    /* If the user has not requested locking, don't modify an existing database. */
-    if (! tempdb) {
-	retval = krb5_db_set_name(context, dbname);
-	if (retval != ENOENT) {
-	    fprintf(stderr,
-		    "%s: The v5 database appears to already exist.\n",
-		    PROGNAME);
-	    krb5_free_context(context);
-	    return;
-	}
-	tempdbname = dbname;
-    } else {
-	if (asprintf(&tempdbname, "%s~", dbname) < 0)
-	    com_err(PROGNAME, ENOMEM, "allocating temporary filename");
-	    krb5_free_context(context);
-	    return;
-	}
-	(void) krb5_db_destroy(context, tempdbname);
-    }
-	
-
-    if (!realm) {
-	retval = krb5_get_default_realm(context, &defrealm);
-	if (retval) {
-	    com_err(PROGNAME, retval, "while retrieving default realm name");
-	    krb5_free_context(context);
-	    return;
-	}	    
-	realm = defrealm;
-    }
-
-    /* assemble & parse the master key name */
-    
-    retval = krb5_db_setup_mkey_name(context, mkey_name, realm,
-				     &mkey_fullname, &master_princ);
-    if (retval) {
-	com_err(PROGNAME, retval, "while setting up master key name");
-	krb5_free_context(context);
-	return;
-    }
-
-    krb5_princ_set_realm_data(context, &db_create_princ, realm);
-    krb5_princ_set_realm_length(context, &db_create_princ, strlen(realm));
-    krb5_princ_set_realm_data(context, &tgt_princ, realm);
-    krb5_princ_set_realm_length(context, &tgt_princ, strlen(realm));
-    krb5_princ_component(context, &tgt_princ,1)->data = realm;
-    krb5_princ_component(context, &tgt_princ,1)->length = strlen(realm);
-
-    printf("Initializing database '%s' for realm '%s',\n\
-master key name '%s'\n",
-	   dbname, realm, mkey_fullname);
-
-    if (read_mkey) {
-	puts("You will be prompted for the version 5 database Master Password.");
-	puts("It is important that you NOT FORGET this password.");
-	fflush(stdout);
-    }
-
-
-    retval = krb5_db_fetch_mkey(context, master_princ,
-				master_keyblock.enctype,
-				read_mkey, read_mkey, stash_file, 0, 
-				&master_keyblock);
-    if (retval) {
-	com_err(PROGNAME, retval, "while reading master key");
-	krb5_free_context(context);
-	return;
-    }
-
-    rblock.key = &master_keyblock;
-
-    seed.length = master_keyblock.length;
-    seed.data = master_keyblock.contents;
-
-    retval = krb5_c_random_seed(context, &seed);
-    if (retval) {
-	com_err(PROGNAME, retval, "while initializing random key generator");
-	krb5_free_context(context);
-	return;
-    }
-
-    retval = krb5_db_create(context, tempdbname, crflags);
-    if (retval) {
-	com_err(PROGNAME, retval, "while creating %sdatabase '%s'",
-		tempdb ? "temporary " : "", tempdbname);
-	krb5_free_context(context);
-	return;
-    }
-
-    retval = krb5_db_set_name(context, tempdbname);
-    if (retval) {
-	(void) krb5_db_destroy(context, tempdbname);
-        com_err(PROGNAME, retval, "while setting active database to '%s'",
-                tempdbname);
-	krb5_free_context(context);
-        return;
-    }
-    if (v4init(PROGNAME, v4manual, v4dumpfile)) {
-	(void) krb5_db_destroy(context, tempdbname);
-	krb5_free_context(context);
-	return;
-    }
-    if ((retval = krb5_db_init(context)) || 
-	(retval = krb5_db_open_database(context))) {
-	(void) krb5_db_destroy(context, tempdbname);
-	com_err(PROGNAME, retval, "while initializing the database '%s'",
-		tempdbname);
-	krb5_free_context(context);
-	return;
-    }
-
-    retval = add_principal(context, master_princ, MASTER_KEY, &rblock);
-    if (retval) {
-	(void) krb5_db_fini(context);
-	(void) krb5_db_destroy(context, tempdbname);
-	com_err(PROGNAME, retval, "while adding K/M to the database");
-	krb5_free_context(context);
-	return;
-    }
-
-    if (create_local_tgt &&
-	(retval = add_principal(context, &tgt_princ, RANDOM_KEY, &rblock))) {
-	(void) krb5_db_fini(context);
-	(void) krb5_db_destroy(context, tempdbname);
-	com_err(PROGNAME, retval, "while adding TGT service to the database");
-	krb5_free_context(context);
-	return;
-    }
-
-    retval = v4_dump_find_default(context, v4dumpfile, realm, &exp_time);
-    if (retval) {
-        com_err(PROGNAME, retval, "warning: default entry not found");
-    }
-
-    retval = process_v4_dump(context, v4dumpfile, realm, exp_time);
-    putchar('\n');
-    if (retval)
-	com_err(PROGNAME, retval, "while translating entries to the database");
-    else {
-	retval = fixup_database(context, realm);
-    }
-    
-    /* clean up; rename temporary database if there were no errors */
-    if (retval == 0) {
-	retval = krb5_db_fini (context);
-	if (retval)
-	    com_err(PROGNAME, retval, "while shutting down database");
-	else if (tempdb && (retval = krb5_db_rename(context, tempdbname,
-						    dbname)))
-	    com_err(PROGNAME, retval, "while renaming temporary database");
-    } else {
-	(void) krb5_db_fini (context);
-	if (tempdb)
-	    (void) krb5_db_destroy (context, tempdbname);
-    }
-    memset((char *)master_keyblock.contents, 0, master_keyblock.length);
-
-    /*
-     * Cons up config params for new database; using the global_params
-     * is just fine.
-     */
-    newparams = global_params;
-
-    /*
-     * Always create the policy db, even if we are not loading a dump
-     * file with policy info.
-     */
-    if (!tempdb && (retval = osa_adb_create_policy_db(&newparams))) {
-	com_err(PROGNAME, retval, "while creating policy database");
-	kadm5_free_config_params(context, &newparams);
-	krb5_free_context(context);
-	return;
-    }
-    /*
-     * Create the magic principals in the database.
-     */
-    retval = kadm5_create_magic_princs(&newparams, context);
-    if (retval) {
-	com_err(PROGNAME, retval, "while creating KADM5 principals");
-	krb5_free_context(context);
-	return;
-    }
-    
-    krb5_free_context(context);
-    return;
-}
-
-static int
-v4init(pname, manual, dumpfile)
-char *pname;
-int manual;
-char *dumpfile;
-{
-    int fd;
-    int ok = 0;
-
-    if (!manual) {
-	fd = open(v4_mkeyfile, O_RDONLY, 0600);
-	if (fd >= 0) {
-	    if (read(fd, master_key, sizeof(master_key)) == sizeof(master_key))
-		ok = 1;
-	    close(fd);
-	}
-    }
-    if (!ok) {
-	des_read_password(&master_key, "V4 Kerberos master key", 0);
-	printf("\n");
-    }
-    key_sched(master_key, master_key_schedule);
-    return 0;
-}
-
-static krb5_error_code
-enter_in_v5_db(context, realm, princ)
-krb5_context context;
-char *realm;
-Principal *princ;
-{
-    krb5_db_entry entry;
-    krb5_error_code retval;
-    krb5_keyblock v4v5key;
-    int nentries = 1;
-    des_cblock v4key;
-    char *name;
-    krb5_timestamp	mod_time;
-    krb5_principal	mod_princ;
-    krb5_keysalt	keysalt;
-
-    /* don't convert local TGT if we created a TGT already.... */
-    if (create_local_tgt && !strcmp(princ->name, "krbtgt") &&
-	!strcmp(princ->instance, realm)) {
-	    if (verbose)
-		    printf("\nignoring local TGT: '%s.%s' ...",
-			   princ->name, princ->instance);
-	    return 0;
-    }
-    if (!strcmp(princ->name, KERB_M_NAME) &&
-	!strcmp(princ->instance, KERB_M_INST)) {
-	des_cblock key_from_db;
-	int val;
-
-	/* here's our chance to verify the master key */
-	/*
-	 * use the master key to decrypt the key in the db, had better
-	 * be the same! 
-	 */
-	memcpy(key_from_db, (char *)&princ->key_low, 4);
-	memcpy(((char *) key_from_db) + 4, (char *)&princ->key_high, 4);
-	pcbc_encrypt((C_Block *) &key_from_db,
-		     (C_Block *) &key_from_db,
-		     (long) sizeof(C_Block),
-		     master_key_schedule,
-		     (C_Block *) master_key,
-		     DECRYPT);
-	val = memcmp((char *) master_key, (char *) key_from_db,
-		     sizeof(master_key));
-	memset((char *)key_from_db, 0, sizeof(key_from_db));
-	if (val) {
-	    return KRB5_KDB_BADMASTERKEY;
-	}
-	if (verbose)
-	    printf("\nignoring '%s.%s' ...", princ->name, princ->instance);
-	return 0;
-    }
-    memset((char *) &entry, 0, sizeof(entry));
-    retval = krb5_425_conv_principal(context, princ->name, princ->instance,
-				     realm, &entry.princ);
-    if (retval)
-	return retval;
-    if (verbose) {
-	retval = krb5_unparse_name(context, entry.princ, &name);
-	if (retval)
-	   name = strdup("<not unparsable name!>");
-	if (verbose)
-	    printf("\ntranslating %s...", name);
-	free(name);
-    }
-
-    retval = krb5_build_principal(context, &mod_princ,
-				  strlen(realm), realm, princ->mod_name,
-				  princ->mod_instance[0] ? 
-				  princ->mod_instance : NULL,
-				  NULL);
-    if (retval) {
-	krb5_free_principal(context, entry.princ);
-	return retval;
-    }
-    mod_time = princ->mod_date;
-
-    if (!shortlife)
-	entry.max_life = krb_life_to_time(0, princ->max_life);
-    else
-	entry.max_life = princ->max_life * 60 * 5;
-    entry.max_renewable_life = rblock.max_rlife;
-    entry.len = KRB5_KDB_V1_BASE_LENGTH;
-    entry.expiration = princ->exp_date;
-    entry.attributes = rblock.flags;	/* XXX is there a way to convert
-					   the old attrs? */
-
-    memcpy((char *)v4key, (char *)&(princ->key_low), 4);
-    memcpy((char *) (((char *) v4key) + 4), (char *)&(princ->key_high), 4);
-    pcbc_encrypt((C_Block *) &v4key,
-		 (C_Block *) &v4key,
-		 (long) sizeof(C_Block),
-		 master_key_schedule,
-		 (C_Block *) master_key,
-		 DECRYPT);
-
-    v4v5key.magic = KV5M_KEYBLOCK;
-    v4v5key.contents = (krb5_octet *)v4key;
-    v4v5key.enctype = ENCTYPE_DES_CBC_CRC;
-    v4v5key.length = sizeof(v4key);
-
-    retval = krb5_dbe_create_key_data(context, &entry);
-    if (retval) {
-	krb5_free_principal(context, entry.princ);
-	krb5_free_principal(context, mod_princ);
-	return retval;
-    }
-
-    keysalt.type = KRB5_KDB_SALTTYPE_V4;
-    keysalt.data.length = 0;
-    keysalt.data.data = (char *) NULL;
-    retval = krb5_dbekd_encrypt_key_data(context, rblock.key,
-					 &v4v5key, &keysalt, 
-					 princ->key_version,
-					 &entry.key_data[0]);
-    if (!retval)
-	retval = krb5_dbe_update_mod_princ_data(context, &entry,
-						mod_time, mod_princ);
-    if (!retval)
-        retval = krb5_dbe_update_last_pwd_change(context, &entry, mod_time);
-
-    if (retval) {
-	krb5_db_free_principal(context, &entry, 1);
-	krb5_free_principal(context, mod_princ);
-	return retval;
-    }
-    memset((char *)v4key, 0, sizeof(v4key));
-
-    retval = krb5_db_put_principal(context, &entry, &nentries);
-
-    if (!retval && !strcmp(princ->name, "krbtgt") &&
-	strcmp(princ->instance, realm) && princ->instance[0]) {
-	    krb5_free_principal(context, entry.princ);
-	    retval = krb5_build_principal(context, &entry.princ,
-					  strlen(princ->instance),
-					  princ->instance,
-					  "krbtgt", realm, NULL);
-	    if (retval)
-		    return retval;
-	    retval = krb5_db_put_principal(context, &entry, &nentries);
-    }
-
-    krb5_db_free_principal(context, &entry, 1);
-    krb5_free_principal(context, mod_princ);
-
-    return retval;
-}
-
-static krb5_error_code
-add_principal(context, princ, op, pblock)
-krb5_context context;
-krb5_principal princ;
-enum ap_op op;
-struct realm_info *pblock;
-{
-    krb5_db_entry entry;
-    krb5_error_code retval;
-    krb5_keyblock rkey;
-    int nentries = 1;
-    krb5_timestamp mod_time;
-
-    memset((char *) &entry, 0, sizeof(entry));
-    retval = krb5_copy_principal(context, princ, &entry.princ);
-    if (retval)
-	return(retval);
-    entry.max_life = pblock->max_life;
-    entry.max_renewable_life = pblock->max_rlife;
-    entry.len = KRB5_KDB_V1_BASE_LENGTH;
-    entry.expiration = pblock->expiration;
-    
-    retval = krb5_timeofday(context, &mod_time);
-    if (retval) {
-	krb5_db_free_principal(context, &entry, 1);
-	return retval;
-    }
-    entry.attributes = pblock->flags;
-
-    retval = krb5_dbe_create_key_data(context, &entry);
-    if (retval) {
-	krb5_db_free_principal(context, &entry, 1);
-	return(retval);
-    }
-
-    switch (op) {
-    case MASTER_KEY:
-	entry.attributes |= KRB5_KDB_DISALLOW_ALL_TIX;
-	retval = krb5_dbekd_encrypt_key_data(context, pblock->key,
-					     &master_keyblock,
-					     (krb5_keysalt *) NULL, 1,
-					     &entry.key_data[0]);
-	if (retval) {
-	    krb5_db_free_principal(context, &entry, 1);
-	    return retval;
-	}
-	break;
-    case RANDOM_KEY:
-	retval = krb5_c_make_random_key(context, pblock->key->enctype,
-					&rkey);
-	if (retval) {
-	    krb5_db_free_principal(context, &entry, 1);
-	    return retval;
-	}
-	retval = krb5_dbekd_encrypt_key_data(context, pblock->key,
-					     &rkey, (krb5_keysalt *) NULL, 
-					     1, &entry.key_data[0]);
-	if (retval) {
-	    krb5_db_free_principal(context, &entry, 1);
-	    return(retval);
-	}
-	krb5_free_keyblock_contents(context, &rkey);
-	break;
-    case NULL_KEY:
-	return EOPNOTSUPP;
-    default:
-	break;
-    }
-
-    retval = krb5_dbe_update_mod_princ_data(context, &entry,
-					    mod_time, &db_create_princ);
-    if (!retval)
-	retval = krb5_db_put_principal(context, &entry, &nentries);
-    krb5_db_free_principal(context, &entry, 1);
-    return retval;
-}
-
-/*
- * Convert a struct tm * to a UNIX time.
- */
-
-
-#define daysinyear(y) (((y) % 4) ? 365 : (((y) % 100) ? 366 : (((y) % 400) ? 365 : 366)))
-
-#define SECSPERDAY 24*60*60
-#define SECSPERHOUR 60*60
-#define SECSPERMIN 60
-
-static int cumdays[] = { 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334,
-			     365};
-
-static int leapyear[] = {31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
-static int nonleapyear[] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
-
-static long
-maketime(tp, local)
-register struct tm *tp;
-int local;
-{
-    register long retval;
-    int foo;
-    int *marray;
-
-    if (tp->tm_mon < 0 || tp->tm_mon > 11 ||
-	tp->tm_hour < 0 || tp->tm_hour > 23 ||
-	tp->tm_min < 0 || tp->tm_min > 59 ||
-	tp->tm_sec < 0 || tp->tm_sec > 59) /* out of range */
-	return 0;
-
-    retval = 0;
-    if (tp->tm_year < 1900)
-	foo = tp->tm_year + 1900;
-    else
-	foo = tp->tm_year;
-
-    if (foo < 1901 || foo > 2038)	/* year is too small/large */
-	return 0;
-
-    if (daysinyear(foo) == 366) {
-	if (tp->tm_mon > 1)
-	    retval+= SECSPERDAY;	/* add leap day */
-	marray = leapyear;
-    } else
-	marray = nonleapyear;
-
-    if (tp->tm_mday < 0 || tp->tm_mday > marray[tp->tm_mon])
-	return 0;			/* out of range */
-
-    while (--foo >= 1970)
-	retval += daysinyear(foo) * SECSPERDAY;
-
-    retval += cumdays[tp->tm_mon] * SECSPERDAY;
-    retval += (tp->tm_mday-1) * SECSPERDAY;
-    retval += tp->tm_hour * SECSPERHOUR + tp->tm_min * SECSPERMIN + tp->tm_sec;
-
-    if (local) {
-	/* need to use local time, so we retrieve timezone info */
-	struct timezone tz;
-	struct timeval tv;
-	if (gettimeofday(&tv, &tz) < 0) {
-	    /* some error--give up? */
-	    return(retval);
-	}
-	retval += tz.tz_minuteswest * SECSPERMIN;
-    }
-    return(retval);
-}
-
-static long
-time_explode(cp)
-register char *cp;
-{
-    char wbuf[5];
-    struct tm tp;
-    int local;
-
-    memset((char *)&tp, 0, sizeof(tp));
-    
-    if (strlen(cp) > 10) {		/* new format */
-	(void) strncpy(wbuf, cp, 4);
-	wbuf[4] = 0;
-	tp.tm_year = atoi(wbuf);
-	cp += 4;			/* step over the year */
-	local = 0;			/* GMT */
-    } else {				/* old format: local time, 
-					   year is 2 digits, assuming 19xx */
-	wbuf[0] = *cp++;
-	wbuf[1] = *cp++;
-	wbuf[2] = 0;
-	tp.tm_year = 1900 + atoi(wbuf);
-	local = 1;			/* local */
-    }
-
-    wbuf[0] = *cp++;
-    wbuf[1] = *cp++;
-    wbuf[2] = 0;
-    tp.tm_mon = atoi(wbuf)-1;
-
-    wbuf[0] = *cp++;
-    wbuf[1] = *cp++;
-    tp.tm_mday = atoi(wbuf);
-    
-    wbuf[0] = *cp++;
-    wbuf[1] = *cp++;
-    tp.tm_hour = atoi(wbuf);
-    
-    wbuf[0] = *cp++;
-    wbuf[1] = *cp++;
-    tp.tm_min = atoi(wbuf);
-
-
-    return(maketime(&tp, local));
-}
-
-static krb5_error_code
-process_v4_dump(context, dumpfile, realm, default_exp_time)
-krb5_context context;
-char *dumpfile;
-char *realm;
-long default_exp_time;
-{
-    krb5_error_code retval;
-    FILE *input_file;
-    Principal aprinc;
-    char    exp_date_str[50];
-    char    mod_date_str[50];
-    int     temp1, temp2, temp3;
-
-    input_file = fopen(dumpfile, "r");
-    if (!input_file)
-	return errno;
-
-    for (;;) {			/* explicit break on eof from fscanf */
-	int nread;
-
-	memset((char *)&aprinc, 0, sizeof(aprinc));
-	nread = fscanf(input_file,
-		       "%s %s %d %d %d %hd %lx %lx %s %s %s %s\n",
-		       aprinc.name,
-		       aprinc.instance,
-		       &temp1,
-		       &temp2,
-		       &temp3,
-		       &aprinc.attributes,
-		       &aprinc.key_low,
-		       &aprinc.key_high,
-		       exp_date_str,
-		       mod_date_str,
-		       aprinc.mod_name,
-		       aprinc.mod_instance);
-	if (nread != 12) {
-	    retval = nread == EOF ? 0 : KRB5_KDB_DB_CORRUPT;
-	    break;
-	}
-	aprinc.key_low = ntohl (aprinc.key_low);
-	aprinc.key_high = ntohl (aprinc.key_high);
-	aprinc.max_life = (unsigned char) temp1;
-	aprinc.kdc_key_ver = (unsigned char) temp2;
-	aprinc.key_version = (unsigned char) temp3;
-	aprinc.exp_date = time_explode(exp_date_str);
-	if (aprinc.exp_date == default_exp_time)
-	    aprinc.exp_date = 0;
-	aprinc.mod_date = time_explode(mod_date_str);
-	if (aprinc.instance[0] == '*')
-	    aprinc.instance[0] = '\0';
-	if (aprinc.mod_name[0] == '*')
-	    aprinc.mod_name[0] = '\0';
-	if (aprinc.mod_instance[0] == '*')
-	    aprinc.mod_instance[0] = '\0';
-	retval = enter_in_v5_db(context, realm, &aprinc);
-	if (retval)
-	    break;
-    }
-    (void) fclose(input_file);
-    return retval;
-}
-
-static krb5_error_code
-v4_dump_find_default(context, dumpfile, realm, exptime)
-krb5_context context;
-char *dumpfile;
-char *realm;
-long *exptime;
-{
-    krb5_error_code retval = 0;
-    FILE *input_file;
-    Principal aprinc;
-    char    exp_date_str[50];
-    char    mod_date_str[50];
-    int     temp1, temp2, temp3;
-    long foundtime, guess1, guess2;
-
-    /* kdb_init is usually the only thing to touch the time in the 
-       default entry, and everything else just copies that time.  If
-       the site hasn't changed it, we can assume that "never" is an
-       appropriate value for V5.  There have been two values compiled
-       in, typically:
-
-       MIT V4 had the code
-       principal.exp_date = 946702799;
-       strncpy(principal.exp_date_txt, "12/31/99", DATE_SZ);
-
-       Cygnus CNS V4 had the code
-       principal.exp_date = 946702799+((365*10+3)*24*60*60);
-       strncpy(principal.exp_date_txt, "12/31/2009", DATE_SZ);
-
-       However, the dump files only store minutes -- so these values
-       are 59 seconds high.
-
-       Other values could be added later, but in practice these are
-       likely to be the only ones. */
-
-    guess1 = 946702799-59;
-    guess2 = 946702799+((365*10+3)*24*60*60);
-
-    input_file = fopen(dumpfile, "r");
-    if (!input_file)
-	return errno;
-
-    for (;;) {			/* explicit break on eof from fscanf */
-	int nread;
-
-	memset((char *)&aprinc, 0, sizeof(aprinc));
-	nread = fscanf(input_file,
-		       "%s %s %d %d %d %hd %lx %lx %s %s %s %s\n",
-		       aprinc.name,
-		       aprinc.instance,
-		       &temp1,
-		       &temp2,
-		       &temp3,
-		       &aprinc.attributes,
-		       &aprinc.key_low,
-		       &aprinc.key_high,
-		       exp_date_str,
-		       mod_date_str,
-		       aprinc.mod_name,
-		       aprinc.mod_instance);
-	if (nread != 12) {
-	    retval = nread == EOF ? 0 : KRB5_KDB_DB_CORRUPT;
-	    break;
-	}
-	if (!strcmp(aprinc.name, "default")
-	    && !strcmp(aprinc.instance, "*")) {
-	    foundtime = time_explode(exp_date_str);
-	    if (foundtime == guess1 || foundtime == guess2)
-	        *exptime = foundtime;
-	    if (verbose) {
-	        printf("\ndefault expiration found: ");
-	        if (foundtime == guess1) {
-		    printf("MIT or pre96q1 value (1999)");
-		} else if (foundtime == guess2) {
-		    printf("Cygnus CNS post 96q1 value (2009)");
-		} else {
-		    printf("non-default start time (%ld,%s)",
-			   foundtime, exp_date_str);
-		}
-	    }
-	    break;
-	}
-    }
-    (void) fclose(input_file);
-    return retval;
-}
-
-static krb5_error_code fixup_database(context, realm)
-    krb5_context context;
-    char * realm;
-{
-    return 0;
-}
-    
-#else /* KRB5_KRB4_COMPAT */
-void
-load_v4db(argc, argv)
-	int argc;
-	char *argv[];
-{
-	printf("This version of kdb5_util does not support the V4 load command.\n");
-}
-#endif /* KRB5_KRB4_COMPAT */