summaryrefslogtreecommitdiffstats
path: root/src/kadmin
diff options
context:
space:
mode:
Diffstat (limited to 'src/kadmin')
-rw-r--r--src/kadmin/dbutil/ChangeLog4
-rw-r--r--src/kadmin/dbutil/kdb5_util.c6
2 files changed, 7 insertions, 3 deletions
diff --git a/src/kadmin/dbutil/ChangeLog b/src/kadmin/dbutil/ChangeLog
index 4d29322d9e..9a23a69b3d 100644
--- a/src/kadmin/dbutil/ChangeLog
+++ b/src/kadmin/dbutil/ChangeLog
@@ -1,3 +1,7 @@
+Tue Dec 3 16:04:24 1996 Barry Jaspan <bjaspan@mit.edu>
+
+ * kdb5_util.c: fix multiply defined globals [krb5-admin/260]
+
Wed Nov 13 00:06:40 1996 Mark Eichin <eichin@cygnus.com>
* dump.c (load_db): lock the database directly (having fixed the
diff --git a/src/kadmin/dbutil/kdb5_util.c b/src/kadmin/dbutil/kdb5_util.c
index c259eba32d..5f4a0dfbfd 100644
--- a/src/kadmin/dbutil/kdb5_util.c
+++ b/src/kadmin/dbutil/kdb5_util.c
@@ -64,10 +64,10 @@ usage()
exit(1);
}
-krb5_keyblock master_keyblock;
-krb5_principal master_princ;
+extern krb5_keyblock master_keyblock;
+extern krb5_principal master_princ;
+extern krb5_encrypt_block master_encblock;
krb5_db_entry master_entry;
-krb5_encrypt_block master_encblock;
krb5_pointer master_random;
int valid_master_key = 0;