aboutsummaryrefslogtreecommitdiff
path: root/src/include/adm_proto.h
diff options
context:
space:
mode:
authorGreg Hudson <ghudson@mit.edu>2013-01-10 12:43:57 -0500
committerGreg Hudson <ghudson@mit.edu>2013-01-10 15:43:16 -0500
commitf6961fb388a563420a7f198117a8a7cf508af474 (patch)
tree00aa54a6bc136486e6b253f8378a23fd719a729e /src/include/adm_proto.h
parent7803d919d906547228d2fb7552d856f7b8ca07de (diff)
downloadkrb5-f6961fb388a563420a7f198117a8a7cf508af474.zip
krb5-f6961fb388a563420a7f198117a8a7cf508af474.tar.gz
krb5-f6961fb388a563420a7f198117a8a7cf508af474.tar.bz2
Get rid of adm.h
adm.h predates the ovsec kadm5 integration. It contains a bunch of obsolete defines and a redundant definition of krb5_realm_params. Get rid of it, and include <kadm5/admin.h> where we currently include it.
Diffstat (limited to 'src/include/adm_proto.h')
-rw-r--r--src/include/adm_proto.h8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/include/adm_proto.h b/src/include/adm_proto.h
index d79e362..e9cbab6 100644
--- a/src/include/adm_proto.h
+++ b/src/include/adm_proto.h
@@ -35,13 +35,9 @@ struct _krb5_db_entry;
typedef struct _krb5_db_entry krb5_db_entry;
#endif /* KRB5_KDB5__ */
-/* Ditto for adm.h */
+/* Ditto for admin.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__)
+#if !defined(__KADM5_ADMIN_H__)
struct ___krb5_realm_params;
typedef struct ___krb5_realm_params krb5_realm_params;
#endif /* KRB5_ADM_H__ */