Fix compilation without TinyCDB

The build without TinyCDB support was apparently not retested
after some refactoring, so some functions had the wrong signatures
or were not properly prototyped.

diff --git a/plugin/cdb.c b/plugin/cdb.c
index 708b24b7fa422df989a423bcd1680a913ce7327c..dc80d86f22a1ede207d3fdc23c0376e5b2d84a70 100644 (file)
--- a/plugin/cdb.c
+++ b/plugin/cdb.c
@@ -35,9 +35,8 @@
  * Stub for strength_init_cdb if not built with CDB support.
  */
 #ifndef HAVE_CDB
-static krb5_error_code
-strength_init_cdb(krb5_context ctx, krb5_pwqual_moddata data UNUSED,
-                  const char *database UNUSED)
+krb5_error_code
+strength_init_cdb(krb5_context ctx, krb5_pwqual_moddata data UNUSED)
 {
     char *path = NULL;
 

diff --git a/plugin/internal.h b/plugin/internal.h
index 5063db32bcb8630178ba787bb225381dc7edddfb..1ae5f3f1f0a549c5d2ae07943c401db827f319aa 100644 (file)
--- a/plugin/internal.h
+++ b/plugin/internal.h
@@ -67,8 +67,8 @@ krb5_error_code strength_init(krb5_context, const char *dictionary,
 krb5_error_code strength_check(krb5_context, krb5_pwqual_moddata,
                                const char *principal, const char *password);
 
-/* Free the subset of internal data used by the CDB dictionary checks. */
-void strength_close_cdb(krb5_context, krb5_pwqual_moddata);
+/* Free the internal plugin state. */
+void strength_close(krb5_context, krb5_pwqual_moddata);
 
 /*
  * CDB handling.  strength_init_cdb gets the dictionary configuration and sets
@@ -83,7 +83,7 @@ krb5_error_code strength_init_cdb(krb5_context, krb5_pwqual_moddata);
 #ifdef HAVE_CDB
 krb5_error_code strength_check_cdb(krb5_context, krb5_pwqual_moddata,
                                    const char *password);
-void strength_close(krb5_context, krb5_pwqual_moddata);
+void strength_close_cdb(krb5_context, krb5_pwqual_moddata);
 #else
 # define strength_check_cdb(c, d, p) 0
 # define strength_close_cdb(c, d)    /* empty */