From d7b3b9e7c2b0435e9f202d279754f873904ac83c Mon Sep 17 00:00:00 2001
From: Johan Danielsson <joda@pdc.kth.se>
Date: Wed, 23 Jul 1997 02:22:20 +0000
Subject: [PATCH] Include salt in dump.

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@2533 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 admin/dump.c  | 22 ++++++++++++++++------
 kadmin/dump.c | 22 ++++++++++++++++------
 2 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/admin/dump.c b/admin/dump.c
index bd32dad3b..d3e5f23c5 100644
--- a/admin/dump.c
+++ b/admin/dump.c
@@ -40,6 +40,16 @@
 
 RCSID("$Id$");
 
+static void
+append_hex(char *str, krb5_data *data)
+{
+    int i;
+    char *p = malloc(data->length * 2 + 1);
+    for(i = 0; i < data->length; i++)
+	sprintf(p + 2 * i, "%02x", ((u_char*)data->data)[i]);
+    strcat(str, p);
+    free(p);
+}
 
 int
 hdb_entry2string(hdb_entry *ent, char **str)
@@ -60,12 +70,12 @@ hdb_entry2string(hdb_entry *ent, char **str)
 		 ent->keys.val[i].key.keytype);
 	strcat(buf, p);
 	free(p);
-	for(j = 0; j < ent->keys.val[i].key.keyvalue.length; j++){
-	    asprintf(&p, "%02x", 
-		     ((unsigned char*)ent->keys.val[i].key.keyvalue.data)[j]);
-	    strcat(buf, p);
-	    free(p);
-	}
+	append_hex(buf, &ent->keys.val[i].key.keyvalue);
+	strcat(buf, ":");
+	if(ent->keys.val[i].salt)
+	    append_hex(buf, ent->keys.val[i].salt);
+	else
+	    strcat(buf, "-");
     }
     strcat(buf, " ");
     event2string(&ent->created_by, &p);
diff --git a/kadmin/dump.c b/kadmin/dump.c
index bd32dad3b..d3e5f23c5 100644
--- a/kadmin/dump.c
+++ b/kadmin/dump.c
@@ -40,6 +40,16 @@
 
 RCSID("$Id$");
 
+static void
+append_hex(char *str, krb5_data *data)
+{
+    int i;
+    char *p = malloc(data->length * 2 + 1);
+    for(i = 0; i < data->length; i++)
+	sprintf(p + 2 * i, "%02x", ((u_char*)data->data)[i]);
+    strcat(str, p);
+    free(p);
+}
 
 int
 hdb_entry2string(hdb_entry *ent, char **str)
@@ -60,12 +70,12 @@ hdb_entry2string(hdb_entry *ent, char **str)
 		 ent->keys.val[i].key.keytype);
 	strcat(buf, p);
 	free(p);
-	for(j = 0; j < ent->keys.val[i].key.keyvalue.length; j++){
-	    asprintf(&p, "%02x", 
-		     ((unsigned char*)ent->keys.val[i].key.keyvalue.data)[j]);
-	    strcat(buf, p);
-	    free(p);
-	}
+	append_hex(buf, &ent->keys.val[i].key.keyvalue);
+	strcat(buf, ":");
+	if(ent->keys.val[i].salt)
+	    append_hex(buf, ent->keys.val[i].salt);
+	else
+	    strcat(buf, "-");
     }
     strcat(buf, " ");
     event2string(&ent->created_by, &p);