Bring back <kadm5/admin.h> as a dependency of <krb5/pwqual_plugin.h> so

that modules can return appropriate error codes.

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/plugins2@24278 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/pwqual_combo/combo.c b/pwqual_combo/combo.c
index 69c2bcd36fb2172cec31ddd83e5f56af0506a109..34e6daa1679a309fb09167e2f38e8070f6a6f42b 100644 (file)
--- a/pwqual_combo/combo.c
+++ b/pwqual_combo/combo.c
@@ -31,7 +31,6 @@
 
 #include <krb5.h>
 #include <krb5/pwqual_plugin.h>
-#include <kadm5/admin.h> /* XXX */
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>

diff --git a/src/include/krb5/pwqual_plugin.h b/src/include/krb5/pwqual_plugin.h
index 0613705be4c1ac679a00141eab031aae568a4f29..8fe5c61b68e3dcfcc9f45aad11da1408416965fb 100644 (file)
--- a/src/include/krb5/pwqual_plugin.h
+++ b/src/include/krb5/pwqual_plugin.h
@@ -51,6 +51,7 @@
 
 #include <krb5/krb5.h>
 #include <krb5/plugin.h>
+#include <kadm5/admin.h>
 
 /* An abstract type for password quality module data. */
 typedef struct krb5_pwqual_moddata_st *krb5_pwqual_moddata;
@@ -66,7 +67,11 @@ typedef krb5_error_code
 /*
  * Mandatory: Check a password for the principal princ, which has an associated
  * password policy named policy_name (or no associated policy if policy_name is
- * NULL).  Return an error if the password check fails.
+ * NULL).  Return one of the following errors if the password check fails:
+ *
+ * - KADM5_PASS_Q_TOOSHORT
+ * - KADM5_PASS_Q_CLASS
+ * - KADM5_PASS_Q_DICT
  */
 typedef krb5_error_code
 (*krb5_pwqual_check_fn)(krb5_context context, krb5_pwqual_moddata data,