diff options
| author | Barry Jaspan <bjaspan@mit.edu> | 1996-12-03 21:05:21 +0000 |
|---|---|---|
| committer | Barry Jaspan <bjaspan@mit.edu> | 1996-12-03 21:05:21 +0000 |
| commit | 37f94362d977e2af27a5ecd0f2a921c53edab9ac (patch) | |
| tree | a41d91f18c3344bf720c89cd6e8fa9e2b3cb865c /src | |
| parent | 073771e88ad5cd708d3ee18e206cb06d9f138c0a (diff) | |
| download | krb5-37f94362d977e2af27a5ecd0f2a921c53edab9ac.tar.gz krb5-37f94362d977e2af27a5ecd0f2a921c53edab9ac.tar.xz krb5-37f94362d977e2af27a5ecd0f2a921c53edab9ac.zip | |
* 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
Diffstat (limited to 'src')
| -rw-r--r-- | src/kadmin/dbutil/ChangeLog | 4 | ||||
| -rw-r--r-- | src/kadmin/dbutil/kdb5_util.c | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/kadmin/dbutil/ChangeLog b/src/kadmin/dbutil/ChangeLog index 4d29322d9..9a23a69b3 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 c259eba32..5f4a0dfbf 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; |