From: Greg Hudson <ghudson@mit.edu>
Date: Tue, 13 Nov 2012 03:08:05 +0000 (-0500)
Subject: Make kdb5_util dump work with LDAP again
X-Git-Tag: krb5-1.12-alpha1~490
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2df36dd4a52c2b08fbacf1648dc76e8e313ce1b5;p=thirdparty%2Fkrb5.git

Make kdb5_util dump work with LDAP again

The LDAP module doesn't support locking.  There's code to ignore this
in load but not in dump.  dump used to only lock for iprop dumps, but
now locks all the time after e65a16d898f3a686525e83661f4fd86c76e27bbf
(#7384), causing it to fail with LDAP.

ticket: 7445 (new)
target_version: 1.11
tags: pullup
---

diff --git a/src/kadmin/dbutil/dump.c b/src/kadmin/dbutil/dump.c
index b15e116f37..cbd2d477a4 100644
--- a/src/kadmin/dbutil/dump.c
+++ b/src/kadmin/dbutil/dump.c
@@ -1480,7 +1480,8 @@ dump_db(argc, argv)
          * We grab the lock twice (once again in the iterator call),
          * but that's ok since the lock func handles incr locks held.
          */
-        if (krb5_db_lock(util_context, KRB5_LOCKMODE_SHARED)) {
+        kret = krb5_db_lock(util_context, KRB5_LOCKMODE_SHARED);
+        if (kret != 0 && kret != KRB5_PLUGIN_OP_NOTSUPP) {
             fprintf(stderr,
                     _("%s: Couldn't grab lock\n"), progname);
             goto error;