* kdb5_util.c: fix multiply defined globals [krb5-admin/260]

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

diff --git a/src/kadmin/dbutil/ChangeLog b/src/kadmin/dbutil/ChangeLog
index 4d29322d9edba998ded08ff7d8d57fe814314e20..9a23a69b3d2a2380e9cb2e7801e5d1675273d1d9 100644 (file)
--- 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 c259eba32d99341db4dce50fcb202c9cf2a72fc6..5f4a0dfbfd23376746e62ce4a27e19c9ebdce759 100644 (file)
--- 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;