From fc3c776c5b32a338cba4a2b1c2ea07c9a3b7a0d6 Mon Sep 17 00:00:00 2001
From: Johan Danielsson <joda@pdc.kth.se>
Date: Sun, 16 Nov 1997 11:00:53 +0000
Subject: [PATCH] Incorporate into kadmin.

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@4033 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 kadmin/dump.c | 28 +++++++++++++++++++++++++++-
 kadmin/load.c |  4 +++-
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/kadmin/dump.c b/kadmin/dump.c
index 3e99811d4..6ce2bf053 100644
--- a/kadmin/dump.c
+++ b/kadmin/dump.c
@@ -36,7 +36,8 @@
  * SUCH DAMAGE. 
  */
 
-#include "admin_locl.h"
+#include "kadmin_locl.h"
+#include <kadm5/private.h>
 
 RCSID("$Id$");
 
@@ -73,6 +74,29 @@ append_hex(char *str, krb5_data *data)
     free(p);
 }
 
+char *
+time2str(time_t t)
+{
+    static char buf[128];
+    strftime(buf, sizeof(buf), "%Y%m%d%H%M%S", gmtime(&t));
+    return buf;
+}
+
+void
+event2string(Event *ev, char **str)
+{
+    char *p;
+    char *pr;
+    if(ev == NULL){
+	*str = strdup("-");
+	return;
+    }
+    krb5_unparse_name(context, ev->principal, &pr);
+    asprintf(&p, "%s:%s", time2str(ev->time), pr);
+    free(pr);
+    *str = p;
+}
+
 static int
 hdb_entry2string(hdb_entry *ent, char **str)
 {
@@ -172,6 +196,8 @@ dump(int argc, char **argv)
     krb5_error_code ret;
     FILE *f;
 
+    HDB *db = _kadm5_s_get_db(kadm_handle);
+
     if(argc < 2)
 	f = stdout;
     else
diff --git a/kadmin/load.c b/kadmin/load.c
index 72e3cb3c5..d609f6455 100644
--- a/kadmin/load.c
+++ b/kadmin/load.c
@@ -36,7 +36,8 @@
  * SUCH DAMAGE. 
  */
 
-#include "admin_locl.h"
+#include "kadmin_locl.h"
+#include <kadm5/private.h>
 
 RCSID("$Id$");
 
@@ -192,6 +193,7 @@ doit(char *filename, int merge)
     int flags = O_RDWR;
     struct entry e;
     hdb_entry ent;
+    HDB *db = _kadm5_s_get_db(kadm_handle);
 
     f = fopen(filename, "r");
     if(f == NULL){