Fix Heimdal pwcheck header probing

[kerberos/krb5-strength.git] / tests / plugin / heimdal-t.c

diff --git a/tests/plugin/heimdal-t.c b/tests/plugin/heimdal-t.c
index 622783833fd1430942e20b59202a4c12592b5b3c..3d644fc22702ae3e61b062aaac6ba715e600f5a1 100644 (file)
--- a/tests/plugin/heimdal-t.c
+++ b/tests/plugin/heimdal-t.c
@@ -14,6 +14,9 @@
 
 #include <dlfcn.h>
 #include <errno.h>
+#ifdef HAVE_KADM5_KADM5_PWCHECK_H
+# include <kadm5/kadm5-pwcheck.h>
+#endif
 
 #include <tests/tap/basic.h>
 #include <tests/tap/kerberos.h>
@@ -21,33 +24,6 @@
 #include <tests/tap/string.h>
 #include <util/macros.h>
 
-/* kadm5-pwcheck.h isn't always installed by Heimdal. */
-#ifdef HAVE_KADM5_PWCHECK_H
-# include <kadm5-pwcheck.h>
-#else
-# define KADM5_PASSWD_VERSION_V1 1
-
-typedef int
-(*kadm5_passwd_quality_check_func)(krb5_context context,
-                                   krb5_principal principal,
-                                   krb5_data *password,
-                                   const char *tuning,
-                                   char *message,
-                                   size_t length);
-
-struct kadm5_pw_policy_check_func {
-    const char *name;
-    kadm5_passwd_quality_check_func func;
-};
-
-struct kadm5_pw_policy_verifier {
-    const char *name;
-    int version;
-    const char *vendor;
-    const struct kadm5_pw_policy_check_func *funcs;
-};
-#endif /* !HAVE_KADM5_PWCHECK_H */
-
 /*
  * The password test data, generated from the JSON source.  Defines an arrays
  * named cdb_tests, cracklib_tests, and generic_tests.
@@ -59,6 +35,21 @@ struct kadm5_pw_policy_verifier {
 #include <tests/data/passwords/length.c>
 
 
+#ifndef HAVE_KADM5_KADM5_PWCHECK_H
+/*
+ * If we're not building with Heimdal, we can't run this test and much of the
+ * test won't even compile.  Replace this test with a small program that just
+ * calls skip_all.
+ */
+int
+main(void)
+{
+    skip_all("not built against Heimdal libraries");
+    return 0;
+}
+
+#else
+
 /*
  * Loads the Heimdal password change plugin and tests that its metadata is
  * correct.  Returns a pointer to the kadm5_pw_policy_verifier struct or bails
@@ -158,11 +149,6 @@ main(void)
         " configured in krb5.conf",
     };
 
-    /* If we're not building with Heimdal, we can't run this test. */
-#ifndef HAVE_KRB5_REALM
-    skip_all("not built against Heimdal libraries");
-#endif
-
     /*
      * Calculate how many tests we have.  There are five tests for the module
      * metadata, one more password test than the list of password tests we
@@ -273,3 +259,5 @@ main(void)
     free(krb5_config);
     return 0;
 }
+
+#endif /* HAVE_KADM5_KADM5_PWCHECK_H */