[28503] in CVS-changelog-for-Kerberos-V5
krb5 commit: Stop locking around iprop dumps
daemon@ATHENA.MIT.EDU (Tom Yu)
Sat Aug 2 14:24:56 2014
Date: Sat, 2 Aug 2014 14:24:30 -0400
From: Tom Yu <tlyu@mit.edu>
Message-Id: <201408021824.s72IOUeN005040@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/71dff2ba654260a870dfc2adc35b2a90a458ce35
commit 71dff2ba654260a870dfc2adc35b2a90a458ce35
Author: Tom Yu <tlyu@mit.edu>
Date: Sat Aug 2 14:20:35 2014 -0400
Stop locking around iprop dumps
ticket: 7977
src/kadmin/dbutil/dump.c | 13 +------------
1 files changed, 1 insertions(+), 12 deletions(-)
diff --git a/src/kadmin/dbutil/dump.c b/src/kadmin/dbutil/dump.c
index 06942de..c146b04 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);
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
