krb5 commit: Make kdb5_util dump work with LDAP again

[Greg Hudson]

https://github.com/krb5/krb5/commit/2df36dd4a52c2b08fbacf1648dc76e8e313ce1b5
commit 2df36dd4a52c2b08fbacf1648dc76e8e313ce1b5
Author: Greg Hudson <ghudson at mit.edu>
Date:   Mon Nov 12 22:08:05 2012 -0500

    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

 src/kadmin/dbutil/dump.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/kadmin/dbutil/dump.c b/src/kadmin/dbutil/dump.c
index b15e116..cbd2d47 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;