svn rev #24278: branches/plugins2/ pwqual_combo/ src/include/krb5/

[ghudson@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=24278
Commit By: ghudson
Log Message:
Bring back <kadm5/admin.h> as a dependency of <krb5/pwqual_plugin.h> so
that modules can return appropriate error codes.



Changed Files:
U   branches/plugins2/pwqual_combo/combo.c
U   branches/plugins2/src/include/krb5/pwqual_plugin.h
Modified: branches/plugins2/pwqual_combo/combo.c
===================================================================
--- branches/plugins2/pwqual_combo/combo.c	2010-08-30 16:20:34 UTC (rev 24277)
+++ branches/plugins2/pwqual_combo/combo.c	2010-08-30 16:28:58 UTC (rev 24278)
@@ -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>

Modified: branches/plugins2/src/include/krb5/pwqual_plugin.h
===================================================================
--- branches/plugins2/src/include/krb5/pwqual_plugin.h	2010-08-30 16:20:34 UTC (rev 24277)
+++ branches/plugins2/src/include/krb5/pwqual_plugin.h	2010-08-30 16:28:58 UTC (rev 24278)
@@ -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 @@
 /*
  * 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,