[28499] in CVS-changelog-for-Kerberos-V5
krb5 commit: Support kdb5_util dump -rev again
daemon@ATHENA.MIT.EDU (Tom Yu)
Sat Aug 2 14:24:39 2014
Date: Sat, 2 Aug 2014 14:24:32 -0400
From: Tom Yu <tlyu@mit.edu>
Message-Id: <201408021824.s72IOWwd005106@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/22a7ac57eb48cdbd6e0560c11b190c51dd405632
commit 22a7ac57eb48cdbd6e0560c11b190c51dd405632
Author: Tom Yu <tlyu@mit.edu>
Date: Sat Aug 2 14:20:35 2014 -0400
Support kdb5_util dump -rev again
Restore kdb5_util dump support for reversed dumps.
ticket: 7978 (new)
src/kadmin/dbutil/dump.c | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/kadmin/dbutil/dump.c b/src/kadmin/dbutil/dump.c
index c146b04..bfb8577 100644
--- a/src/kadmin/dbutil/dump.c
+++ b/src/kadmin/dbutil/dump.c
@@ -1231,6 +1231,7 @@ dump_db(int argc, char **argv)
krb5_kvno kt_kvno;
krb5_boolean conditional = FALSE;
kdb_last_t last;
+ krb5_flags iterflags = 0;
/* Parse the arguments. */
dump = &r1_11_version;
@@ -1278,10 +1279,11 @@ dump_db(int argc, char **argv)
} else if (!strcmp(argv[aindex], "-new_mkey_file")) {
new_mkey_file = argv[++aindex];
mkey_convert = 1;
- } else if (!strcmp(argv[aindex], "-rev") ||
- !strcmp(argv[aindex], "-recurse")) {
- /* Accept these for compatibility, but do nothing since
- * krb5_db_iterate doesn't support them. */
+ } else if (!strcmp(argv[aindex], "-rev")) {
+ iterflags |= KRB5_DB_ITER_REV;
+ } else if (!strcmp(argv[aindex], "-recurse")) {
+ /* Accept this for compatibility, but do nothing since
+ * krb5_db_iterate doesn't support it. */
} else {
break;
}
@@ -1411,7 +1413,7 @@ dump_db(int argc, char **argv)
if (dump->header[strlen(dump->header)-1] != '\n')
fputc('\n', args.ofile);
- ret = krb5_db_iterate(util_context, NULL, dump_iterator, &args, 0);
+ ret = krb5_db_iterate(util_context, NULL, dump_iterator, &args, iterflags);
if (ret) {
com_err(progname, ret, _("performing %s dump"), dump->name);
goto error;
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
