Add flag word to KDB iteration APIs

ticket: 7977 (new)
subject: Enable unlocked KDB iteration

6 files changed, 10 insertions, 10 deletions

diff --git a/src/plugins/kdb/db2/db2_exp.c b/src/plugins/kdb/db2/db2_exp.c
index c2bad73..529b943 100644
--- a/src/plugins/kdb/db2/db2_exp.c
+++ b/src/plugins/kdb/db2/db2_exp.c
@@ -135,8 +135,8 @@ WRAP_K (krb5_db2_iterate,
         (krb5_context ctx, char *s,
          krb5_error_code (*f) (krb5_pointer,
                                krb5_db_entry *),
-         krb5_pointer p),
-        (ctx, s, f, p));
+         krb5_pointer p, krb5_flags flags),
+        (ctx, s, f, p, flags));
 
 WRAP_K (krb5_db2_create_policy,
         (krb5_context context, osa_policy_ent_t entry),
diff --git a/src/plugins/kdb/db2/kdb_db2.c b/src/plugins/kdb/db2/kdb_db2.c
index b2c449f..f4e9458 100644
--- a/src/plugins/kdb/db2/kdb_db2.c
+++ b/src/plugins/kdb/db2/kdb_db2.c
@@ -928,7 +928,7 @@ typedef krb5_error_code (*ctx_iterate_cb)(krb5_pointer, krb5_db_entry *);
 
 static krb5_error_code
 ctx_iterate(krb5_context context, krb5_db2_context *dbc,
-            ctx_iterate_cb func, krb5_pointer func_arg)
+            ctx_iterate_cb func, krb5_pointer func_arg, krb5_flags iterflags)
 {
     DBT key, contents;
     krb5_data contdata;
@@ -969,12 +969,12 @@ ctx_iterate(krb5_context context, krb5_db2_context *dbc,
 
 krb5_error_code
 krb5_db2_iterate(krb5_context context, char *match_expr, ctx_iterate_cb func,
-                 krb5_pointer func_arg)
+                 krb5_pointer func_arg, krb5_flags iterflags)
 {
     if (!inited(context))
         return KRB5_KDB_DBNOTINITED;
     return ctx_iterate(context, context->dal_handle->db_context, func,
-                       func_arg);
+                       func_arg, iterflags);
 }
 
 krb5_boolean
@@ -1257,7 +1257,7 @@ ctx_merge_nra(krb5_context context, krb5_db2_context *dbc_temp,
 
     nra.kcontext = context;
     nra.db_context = dbc_real;
-    return ctx_iterate(context, dbc_temp, krb5_db2_merge_nra_iterator, &nra);
+    return ctx_iterate(context, dbc_temp, krb5_db2_merge_nra_iterator, &nra, 0);
 }
 
 /*
diff --git a/src/plugins/kdb/db2/kdb_db2.h b/src/plugins/kdb/db2/kdb_db2.h
index df4818a..3fb775d 100644
--- a/src/plugins/kdb/db2/kdb_db2.h
+++ b/src/plugins/kdb/db2/kdb_db2.h
@@ -60,7 +60,7 @@ krb5_error_code krb5_db2_put_principal(krb5_context, krb5_db_entry *,
 krb5_error_code krb5_db2_iterate(krb5_context, char *,
                                  krb5_error_code (*)(krb5_pointer,
                                                      krb5_db_entry *),
-                                 krb5_pointer);
+                                 krb5_pointer, krb5_flags);
 krb5_error_code krb5_db2_set_nonblocking(krb5_context, krb5_boolean,
                                          krb5_boolean *);
 krb5_boolean krb5_db2_set_lockmode(krb5_context, krb5_boolean);
diff --git a/src/plugins/kdb/hdb/kdb_hdb.c b/src/plugins/kdb/hdb/kdb_hdb.c
index a001ee3..2a274d5 100644
--- a/src/plugins/kdb/hdb/kdb_hdb.c
+++ b/src/plugins/kdb/hdb/kdb_hdb.c
@@ -888,7 +888,7 @@ static krb5_error_code
 kh_db_iterate(krb5_context context,
               char *match_entry,
               int (*func)(krb5_pointer, krb5_db_entry *),
-              krb5_pointer func_arg)
+              krb5_pointer func_arg, krb5_flags iterflags)
 {
     krb5_error_code code;
     kh_db_context *kh = KH_DB_CONTEXT(context);
diff --git a/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal.c b/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal.c
index af0eaf1..b562970 100644
--- a/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal.c
+++ b/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal.c
@@ -131,7 +131,7 @@ krb5_ldap_free_principal(krb5_context kcontext, krb5_db_entry *entry)
 krb5_error_code
 krb5_ldap_iterate(krb5_context context, char *match_expr,
                   krb5_error_code (*func)(krb5_pointer, krb5_db_entry *),
-                  krb5_pointer func_arg)
+                  krb5_pointer func_arg, krb5_flags iterflags)
 {
     krb5_db_entry            entry;
     krb5_principal           principal;
diff --git a/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal.h b/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal.h
index d3392c0..4c51e79 100644
--- a/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal.h
+++ b/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal.h
@@ -109,7 +109,7 @@ krb5_ldap_free_principal(krb5_context, krb5_db_entry *);
 krb5_error_code
 krb5_ldap_iterate(krb5_context, char *,
                   krb5_error_code (*)(krb5_pointer, krb5_db_entry *),
-                  krb5_pointer/*, int */);
+                  krb5_pointer, krb5_flags);
 
 void
 krb5_dbe_free_contents(krb5_context, krb5_db_entry *);