diff options
| author | Theodore Tso <tytso@mit.edu> | 1999-05-07 21:06:40 +0000 |
|---|---|---|
| committer | Theodore Tso <tytso@mit.edu> | 1999-05-07 21:06:40 +0000 |
| commit | 109db6f407e76e7150d9b9632d4dbf94cba2e507 (patch) | |
| tree | c9cb54a41574dde2f5f10f56d623c83a315ef522 /src/include | |
| parent | 4a91c1a052a43a10c3ca28b2c9a0a84396ea23fc (diff) | |
| download | krb5-109db6f407e76e7150d9b9632d4dbf94cba2e507.tar.gz krb5-109db6f407e76e7150d9b9632d4dbf94cba2e507.tar.xz krb5-109db6f407e76e7150d9b9632d4dbf94cba2e507.zip | |
Fix the existing kludge to deal with the fact that krb5_realm_params
is defined in two, count them two, header files. There's real
ugliness here that needs cleaning up eventually, but I don't have the
time now to deal with it.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@11426 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/krb5/ChangeLog | 8 | ||||
| -rw-r--r-- | src/include/krb5/adm_proto.h | 7 |
2 files changed, 14 insertions, 1 deletions
diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog index 49889913fb..191a1f2a02 100644 --- a/src/include/krb5/ChangeLog +++ b/src/include/krb5/ChangeLog @@ -1,3 +1,11 @@ +Fri May 7 15:26:44 1999 Theodore Y. Ts'o <tytso@mit.edu> + + * adm_proto.h: Fix the existing kludge to deal with the fact that + krb5_realm_params is defined in two, count them two, + header files. There's real ugliness here that needs + cleaning up eventually, but I don't have the time now to + deal with it. + Fri Apr 16 17:07:47 1999 Theodore Y. Ts'o <tytso@mit.edu> * Makefile.in (all-windows): Don't constantly recreate autoconf.h diff --git a/src/include/krb5/adm_proto.h b/src/include/krb5/adm_proto.h index 9134d94697..5e9b984bcf 100644 --- a/src/include/krb5/adm_proto.h +++ b/src/include/krb5/adm_proto.h @@ -33,7 +33,12 @@ typedef struct _krb5_db_entry krb5_db_entry; #endif /* KRB5_KDB5__ */ /* Ditto for adm.h */ -#ifndef KRB5_ADM_H__ + +/* + * XXXX krb5_realm params is defined in two header files!!!! + * This really needs to be fixed!!! + */ +#if !defined(KRB5_ADM_H__) && !defined(__KADM5_ADMIN_H__) struct ___krb5_realm_params; typedef struct ___krb5_realm_params krb5_realm_params; |