Use portable/krb5.h and portable/kadmin.h

The hook glue code for MIT and Heimdal wasn't using the portable
header wrappers.  Fix that.

diff --git a/plugin/heimdal.c b/plugin/heimdal.c
index 3ab6f81e7ef2318d3f5e45ca1b9bd6c2325c68ea..00c2f43d11c5dfd5cc775cc0a8d02e3e10750c87 100644 (file)
--- a/plugin/heimdal.c
+++ b/plugin/heimdal.c
@@ -7,21 +7,18 @@
  * future.
  *
  * Written by Russ Allbery <eagle@eyrie.org>
- * Copyright 2010
+ * Copyright 2010, 2013
  *     The Board of Trustees of the Leland Stanford Junior University
  *
  * See LICENSE for licensing terms.
  */
 
 #include <config.h>
+#include <portable/kadmin.h>
+#include <portable/krb5.h>
 #include <portable/system.h>
 
 #include <errno.h>
-#include <kadm5/admin.h>
-#ifdef HAVE_KADM5_KADM5_ERR_H
-# include <kadm5/kadm5_err.h>
-#endif
-#include <krb5.h>
 
 #include <plugin/internal.h>
 #include <util/macros.h>

diff --git a/plugin/mit.c b/plugin/mit.c
index 8b33941e55ee11ecbd765db43678a42d8255f119..7da7f81ce2929f6f9b29d86caec8496a0b33cfad 100644 (file)
--- a/plugin/mit.c
+++ b/plugin/mit.c
@@ -7,8 +7,8 @@
  * for the Heimdal hook API.
  *
  * Written by Russ Allbery <eagle@eyrie.org>
- *     and updated by Sam Hartman <hartmans@painless-security.com>
- * Copyright 2010, 2011
+ * Contributions by Sam Hartman <hartmans@painless-security.com>
+ * Copyright 2010, 2011, 2013
  *     The Board of Trustees of the Leland Stanford Junior University
  * Copyright 2010 The Massachusetts Institute of Technology
  *
@@ -16,25 +16,24 @@
  */
 
 #include <config.h>
+#include <portable/kadmin.h>
+#include <portable/krb5.h>
 #include <portable/system.h>
 
-/*
- * Skip this entire file if the relevant MIT Kerberos header isn't available,
- * since without that header we don't have the data types that we need.
- */
-#ifdef HAVE_KRB5_KADM5_HOOK_PLUGIN_H
-
 #include <errno.h>
-#include <kadm5/admin.h>
-#ifdef HAVE_KADM5_KADM5_ERR_H
-# include <kadm5/kadm5_err.h>
+#ifdef HAVE_KRB5_KADM5_HOOK_PLUGIN_H
+# include <krb5/kadm5_hook_plugin.h>
 #endif
-#include <krb5.h>
-#include <krb5/kadm5_hook_plugin.h>
 
 #include <plugin/internal.h>
 #include <util/macros.h>
 
+/*
+ * Skip this entire file if the relevant MIT Kerberos header isn't available,
+ * since without that header we don't have the data types that we need.
+ */
+#ifdef HAVE_KRB5_KADM5_HOOK_PLUGIN_H
+
 /*
  * The public function that the MIT kadm5 library looks for.  It contains the
  * module name, so it can't be prototyped by the MIT headers.