svn rev #25740: branches/krb5-1-10/src/plugins/kdb/db2/

[tlyu@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=25740
Commit By: tlyu
Log Message:
ticket: 7096
version_fixed: 1.10.1
status: resolved

Pull up r25723 from trunk

 ------------------------------------------------------------------------
 r25723 | ghudson | 2012-03-01 15:49:17 -0500 (Thu, 01 Mar 2012) | 16 lines

 ticket: 7096
 subject: Fix KDB iteration when callback does write calls
 target_version: 1.10.1
 tags: pullup

 kdb_db2's ctx_iterate makes an convenience alias to dbc->db in order
 to call more invoke call the DB's seq method.  This alias may become
 invalidated if the callback writes to the DB, since ctx_lock() may
 re-open the DB in order to acquire a write lock.  Fix the bug by
 getting rid of the convenience alias.

 Most KDB iteration operations in the code base do not write to the DB,
 but kdb5_util update_princ_encryption does.

 Bug discovered and diagnosed by will.fiveash at oracle.com.


Changed Files:
U   branches/krb5-1-10/src/plugins/kdb/db2/kdb_db2.c
Modified: branches/krb5-1-10/src/plugins/kdb/db2/kdb_db2.c
===================================================================
--- branches/krb5-1-10/src/plugins/kdb/db2/kdb_db2.c	2012-03-07 23:44:28 UTC (rev 25739)
+++ branches/krb5-1-10/src/plugins/kdb/db2/kdb_db2.c	2012-03-07 23:44:32 UTC (rev 25740)
@@ -940,7 +940,6 @@
             krb5_error_code (*func)(krb5_pointer, krb5_db_entry *),
             krb5_pointer func_arg)
 {
-    DB *db;
     DBT key, contents;
     krb5_data contdata;
     krb5_db_entry *entry;
@@ -951,8 +950,7 @@
     if (retval)
         return retval;
 
-    db = dbc->db;
-    dbret = db->seq(db, &key, &contents, R_FIRST);
+    dbret = dbc->db->seq(dbc->db, &key, &contents, R_FIRST);
     while (dbret == 0) {
         contdata.data = contents.data;
         contdata.length = contents.size;
@@ -974,7 +972,7 @@
             retval = retval2;
             break;
         }
-        dbret = db->seq(db, &key, &contents, R_NEXT);
+        dbret = dbc->db->seq(dbc->db, &key, &contents, R_NEXT);
     }
     switch (dbret) {
     case 1: