Add flag word to KDB iteration APIs

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

diff --git a/src/include/kdb.h b/src/include/kdb.h
index 69817bcb8762dc2fa3c6003a5c3c33fad7173626..e89c7aa0c37c04ff9f912a678ee7c5b4bc222082 100644 (file)
--- a/src/include/kdb.h
+++ b/src/include/kdb.h
@@ -69,7 +69,7 @@
 
 /* This version will be incremented when incompatible changes are made to the
  * KDB API, and will be kept in sync with the libkdb major version. */
-#define KRB5_KDB_API_VERSION 7
+#define KRB5_KDB_API_VERSION 8
 
 /* Salt types */
 #define KRB5_KDB_SALTTYPE_NORMAL        0
@@ -131,6 +131,10 @@
 #define KRB5_KDB_FLAGS_S4U                      ( KRB5_KDB_FLAG_PROTOCOL_TRANSITION | \
                                                   KRB5_KDB_FLAG_CONSTRAINED_DELEGATION )
 
+/* KDB iteration flags */
+#define KRB5_DB_ITER_WRITE      0x00000001
+#define KRB5_DB_ITER_REV        0x00000002
+
 /* String attribute names recognized by krb5 */
 #define KRB5_KDB_SK_SESSION_ENCTYPES            "session_enctypes"
 
@@ -380,7 +384,7 @@ krb5_error_code krb5_db_delete_principal ( krb5_context kcontext,
 krb5_error_code krb5_db_iterate ( krb5_context kcontext,
                                   char *match_entry,
                                   int (*func) (krb5_pointer, krb5_db_entry *),
-                                  krb5_pointer func_arg );
+                                  krb5_pointer func_arg, krb5_flags iterflags );
 
 
 krb5_error_code krb5_db_store_master_key  ( krb5_context kcontext,
@@ -1016,7 +1020,7 @@ typedef struct _kdb_vftabl {
     krb5_error_code (*iterate)(krb5_context kcontext,
                                char *match_entry,
                                int (*func)(krb5_pointer, krb5_db_entry *),
-                               krb5_pointer func_arg);
+                               krb5_pointer func_arg, krb5_flags iterflags);
 
     /*
      * Optional: Create a password policy entry.  Return an error if the policy

diff --git a/src/kadmin/dbutil/dump.c b/src/kadmin/dbutil/dump.c
index 9f5d26aa8fde75bdcbd39c7354e8a9bc6b4e4456..06942de6830c4cf3e1e6cf9136162a27cfeda26f 100644 (file)
--- a/src/kadmin/dbutil/dump.c
+++ b/src/kadmin/dbutil/dump.c
@@ -1420,7 +1420,7 @@ dump_db(int argc, char **argv)
     if (dump->header[strlen(dump->header)-1] != '\n')
         fputc('\n', args.ofile);
 
-    ret = krb5_db_iterate(util_context, NULL, dump_iterator, &args);
+    ret = krb5_db_iterate(util_context, NULL, dump_iterator, &args, 0);
     if (ret) {
         com_err(progname, ret, _("performing %s dump"), dump->name);
         goto error;

diff --git a/src/kadmin/dbutil/kdb5_mkey.c b/src/kadmin/dbutil/kdb5_mkey.c
index bc10b44ffc82c23995b78f5cc9adb9290430d141..aefde7b673584b8f5cf63f4fd6ebf745afb5d2bc 100644 (file)
--- a/src/kadmin/dbutil/kdb5_mkey.c
+++ b/src/kadmin/dbutil/kdb5_mkey.c
@@ -1033,7 +1033,7 @@ kdb5_update_princ_encryption(int argc, char *argv[])
     }
 
     retval = krb5_db_iterate(util_context, name_pattern,
-                             update_princ_encryption_1, &data);
+                             update_princ_encryption_1, &data, 0);
     /* If exit_status is set, then update_princ_encryption_1 already
        printed a message.  */
     if (retval != 0 && exit_status == 0) {
@@ -1209,7 +1209,7 @@ kdb5_purge_mkeys(int argc, char *argv[])
     if ((retval = krb5_db_iterate(util_context,
                                   NULL,
                                   find_mkvnos_in_use,
-                                  (krb5_pointer) &args))) {
+                                  (krb5_pointer) &args, 0))) {
         com_err(progname, retval, _("while finding master keys in use"));
         exit_status++;
         goto cleanup_return;

diff --git a/src/lib/kadm5/srv/server_kdb.c b/src/lib/kadm5/srv/server_kdb.c
index f99bf5855e16f17f275cef1335080c24ca3ecf3e..b9664f4ce520e59e8944cf935bef1d5cd982975b 100644 (file)
--- a/src/lib/kadm5/srv/server_kdb.c
+++ b/src/lib/kadm5/srv/server_kdb.c
@@ -437,7 +437,7 @@ kdb_iter_entry(kadm5_server_handle_t handle, char *match_entry,
     id.func = iter_fct;
     id.data = data;
 
-    ret = krb5_db_iterate(handle->context, match_entry, kdb_iter_func, &id);
+    ret = krb5_db_iterate(handle->context, match_entry, kdb_iter_func, &id, 0);
     if (ret)
         return(ret);
 

diff --git a/src/lib/kdb/Makefile.in b/src/lib/kdb/Makefile.in
index 4390cb67c04d78894189db98939a7781c8e177e2..b6b6ddfd26cfc7393f794419c5b53fbb878fd9d5 100644 (file)
--- a/src/lib/kdb/Makefile.in
+++ b/src/lib/kdb/Makefile.in
@@ -5,7 +5,7 @@ LOCALINCLUDES= -I.
 
 # Keep LIBMAJOR in sync with KRB5_KDB_API_VERSION in include/kdb.h.
 LIBBASE=kdb5
-LIBMAJOR=7
+LIBMAJOR=8
 LIBMINOR=0
 LIBINITFUNC=kdb_init_lock_list
 LIBFINIFUNC=kdb_fini_lock_list

diff --git a/src/lib/kdb/kdb5.c b/src/lib/kdb/kdb5.c
index 7c82399b785f9bcd0d35a0122106d070d35f419a..6864af5c46c9573253f42fab44b3fc438ef0cf52 100644 (file)
--- a/src/lib/kdb/kdb5.c
+++ b/src/lib/kdb/kdb5.c
@@ -950,7 +950,7 @@ krb5_db_delete_principal(krb5_context kcontext, krb5_principal search_for)
 krb5_error_code
 krb5_db_iterate(krb5_context kcontext, char *match_entry,
                 int (*func)(krb5_pointer, krb5_db_entry *),
-                krb5_pointer func_arg)
+                krb5_pointer func_arg, krb5_flags iterflags)
 {
     krb5_error_code status = 0;
     kdb_vftabl *v;
@@ -960,7 +960,7 @@ krb5_db_iterate(krb5_context kcontext, char *match_entry,
         return status;
     if (v->iterate == NULL)
         return KRB5_PLUGIN_OP_NOTSUPP;
-    return v->iterate(kcontext, match_entry, func, func_arg);
+    return v->iterate(kcontext, match_entry, func, func_arg, iterflags);
 }
 
 /* Return a read only pointer alias to mkey list.  Do not free this! */

diff --git a/src/plugins/kdb/db2/db2_exp.c b/src/plugins/kdb/db2/db2_exp.c
index c2bad737874a8ae03cd72eda1f5c161d52d7ed83..529b94390fa5b6606f75290c75aafae343061094 100644 (file)
--- 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 b2c449f5b3decb05358ec680c0acce0fea5bbdfa..f4e945884d30ae06539c3173f65c09b3c812e794 100644 (file)
--- 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 df4818afd70ddbe3a386dbf56d5fc821af5e7e7f..3fb775ddbfee8d4500c40326fb9f500cea2eb351 100644 (file)
--- 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 a001ee3163df3ed336e7380e58b5e8afe3b28208..2a274d5e4871f3622b2d243f20bfa9863feb42fb 100644 (file)
--- 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 af0eaf1ce5fd1297d42a309b572c2e174dceba95..b5629703334cca823de974f3c53023d838c267b7 100644 (file)
--- 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 d3392c07ae888192818d5bbbbcc0d39c96d36847..4c51e79e7e4b3c8a149b33ddf7880043e4b51651 100644 (file)
--- 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 *);

diff --git a/src/tests/kdbtest.c b/src/tests/kdbtest.c
index d21126558c1c38897bf72d64248442d0acee042b..7c1d5158d9fe617066df496850484ed63252f92b 100644 (file)
--- a/src/tests/kdbtest.c
+++ b/src/tests/kdbtest.c
@@ -388,7 +388,7 @@ main()
 
     /* Exercise principal iteration code. */
     count = 0;
-    CHECK(krb5_db_iterate(ctx, "xy*", iter_princ_handler, &count));
+    CHECK(krb5_db_iterate(ctx, "xy*", iter_princ_handler, &count, 0));
     CHECK_COND(count == 1);
 
     CHECK(krb5_db_fini(ctx));