[27259] in CVS-changelog-for-Kerberos-V5
krb5 commit [krb5-1.11]: Make kdb5_util dump work with LDAP again
daemon@ATHENA.MIT.EDU (Tom Yu)
Fri Nov 16 14:58:19 2012
Date: Fri, 16 Nov 2012 14:58:16 -0500
From: Tom Yu <tlyu@mit.edu>
Message-Id: <201211161958.qAGJwGCS022190@drugstore.mit.edu>
To: cvs-krb5@mit.edu
Reply-To: krbdev@mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
https://github.com/krb5/krb5/commit/de07156559a08f8dc7924ad867a5a66d4794d952
commit de07156559a08f8dc7924ad867a5a66d4794d952
Author: Greg Hudson <ghudson@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.
(cherry picked from commit 2df36dd4a52c2b08fbacf1648dc76e8e313ce1b5)
ticket: 7445
version_fixed: 1.11
status: resolved
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;
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
