From: Tom Yu <tlyu@mit.edu>
Date: Sat, 2 Aug 2014 18:20:35 +0000 (-0400)
Subject: Stop locking around iprop dumps
X-Git-Tag: krb5-1.13-alpha1~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=71dff2ba654260a870dfc2adc35b2a90a458ce35;p=thirdparty%2Fkrb5.git

Stop locking around iprop dumps

ticket: 7977
---

diff --git a/src/kadmin/dbutil/dump.c b/src/kadmin/dbutil/dump.c
index 06942de683..c146b04234 100644
--- a/src/kadmin/dbutil/dump.c
+++ b/src/kadmin/dbutil/dump.c
@@ -1229,7 +1229,7 @@ dump_db(int argc, char **argv)
     kdb_log_context *log_ctx;
     unsigned int ipropx_version = IPROPX_VERSION_0;
     krb5_kvno kt_kvno;
-    krb5_boolean conditional = FALSE, db_locked = FALSE;
+    krb5_boolean conditional = FALSE;
     kdb_last_t last;
 
     /* Parse the arguments. */
@@ -1396,15 +1396,6 @@ dump_db(int argc, char **argv)
     fprintf(args.ofile, "%s", dump->header);
 
     if (dump_sno) {
-        /* Make sure the dump reflects the serial number we're recording. */
-        ret = krb5_db_lock(util_context, KRB5_DB_LOCKMODE_SHARED);
-        if (ret == 0) {
-            db_locked = TRUE;
-        } else if (ret != KRB5_PLUGIN_OP_NOTSUPP) {
-            fprintf(stderr, _("%s: Couldn't grab lock\n"), progname);
-            goto error;
-        }
-
         ret = ulog_get_last(util_context, &last);
         if (ret) {
             com_err(progname, ret, _("while reading update log header"));
@@ -1442,8 +1433,6 @@ dump_db(int argc, char **argv)
     return;
 
 error:
-    if (db_locked)
-        krb5_db_unlock(util_context);
     if (tmpofile != NULL)
         unlink(tmpofile);
     free(tmpofile);