svn rev #24674: branches/krb5-1-9/src/kadmin/dbutil/

[tlyu@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=24674
Commit By: tlyu
Log Message:
ticket: 6875
version_fixed: 1.9.1

pull up r24667 from trunk

 ------------------------------------------------------------------------
 r24667 | ghudson | 2011-02-26 21:35:04 -0500 (Sat, 26 Feb 2011) | 8 lines

 ticket: 6875
 tags: pullup
 target_version: 1.9.1

 Make sure ulog_map() is invoked whenever we open the database in
 kdb5_util.  Fixes all of the master key rollover commands in the
 presence of iprop.  Reported by kacarstensen at csupomona.edu.


Changed Files:
U   branches/krb5-1-9/src/kadmin/dbutil/dump.c
U   branches/krb5-1-9/src/kadmin/dbutil/kdb5_util.c
Modified: branches/krb5-1-9/src/kadmin/dbutil/dump.c
===================================================================
--- branches/krb5-1-9/src/kadmin/dbutil/dump.c	2011-02-28 23:57:56 UTC (rev 24673)
+++ branches/krb5-1-9/src/kadmin/dbutil/dump.c	2011-03-01 22:21:01 UTC (rev 24674)
@@ -1283,14 +1283,6 @@
         fprintf(arglist.ofile, "%s", dump->header);
 
         if (dump_sno) {
-            if (ulog_map(util_context, global_params.iprop_logfile,
-                         global_params.iprop_ulogsize, FKCOMMAND, db_args)) {
-                fprintf(stderr,
-                        _("%s: Could not map log\n"), progname);
-                exit_status++;
-                goto unlock_and_return;
-            }
-
             /*
              * We grab the lock twice (once again in the iterator call),
              * but that's ok since the lock func handles incr locks held.

Modified: branches/krb5-1-9/src/kadmin/dbutil/kdb5_util.c
===================================================================
--- branches/krb5-1-9/src/kadmin/dbutil/kdb5_util.c	2011-02-28 23:57:56 UTC (rev 24673)
+++ branches/krb5-1-9/src/kadmin/dbutil/kdb5_util.c	2011-03-01 22:21:01 UTC (rev 24674)
@@ -499,6 +499,17 @@
         return(1);
     }
 
+    if (global_params.iprop_enabled) {
+        if (ulog_map(util_context, global_params.iprop_logfile,
+                     global_params.iprop_ulogsize, FKCOMMAND,
+                     db5util_db_args)) {
+            fprintf(stderr, _("%s: Could not map log\n"),
+                    progname);
+            exit_status++;
+            return(1);
+        }
+    }
+
     valid_master_key = 1;
     dbactive = TRUE;
     return 0;