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@csupomona.edu.

ticket: 6875
version_fixed: 1.9.1

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-9@24674 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/kadmin/dbutil/dump.c b/src/kadmin/dbutil/dump.c
index caff137a40d92ca7812508168089002511895549..6d4e6bbbc0187dadc51cf3913553a3b85384f28c 100644 (file)
--- a/src/kadmin/dbutil/dump.c
+++ b/src/kadmin/dbutil/dump.c
@@ -1283,14 +1283,6 @@ dump_db(argc, argv)
         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.

diff --git a/src/kadmin/dbutil/kdb5_util.c b/src/kadmin/dbutil/kdb5_util.c
index 6c8e364c611ba6ae3bbbbc25c4b2624d4438242d..11b1a558f54af47b044ecb0e0efaffa5ae3b4d7d 100644 (file)
--- a/src/kadmin/dbutil/kdb5_util.c
+++ b/src/kadmin/dbutil/kdb5_util.c
@@ -499,6 +499,17 @@ static int open_db_and_mkey()
         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;