[29531] in CVS-changelog-for-Kerberos-V5
krb5 commit: Warn about dump -recurse nonfunctionality
daemon@ATHENA.MIT.EDU (Tom Yu)
Thu Aug 4 12:27:27 2016
Date: Thu, 4 Aug 2016 12:27:23 -0400
From: Tom Yu <tlyu@mit.edu>
Message-Id: <201608041627.u74GRNP3002912@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/eb8dc865efec4938d74a7955fdcd02bbee4c22b9
commit eb8dc865efec4938d74a7955fdcd02bbee4c22b9
Author: Tom Yu <tlyu@mit.edu>
Date: Wed Aug 3 17:00:05 2016 -0400
Warn about dump -recurse nonfunctionality
kdb5_util dump -recurse hasn't behaved as documented since krb5-1.5,
when the DAL was integrated. Restoring it is a nontrivial amount of
work, so just document it for now.
ticket: 8470 (new)
target_version: 1.14-next
target_version: 1.13-next
tags: pullup
doc/admin/admin_commands/kdb5_util.rst | 6 ++++++
src/kadmin/dbutil/dump.c | 3 +++
2 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/doc/admin/admin_commands/kdb5_util.rst b/doc/admin/admin_commands/kdb5_util.rst
index c21bf62..f43bcf1 100644
--- a/doc/admin/admin_commands/kdb5_util.rst
+++ b/doc/admin/admin_commands/kdb5_util.rst
@@ -182,6 +182,12 @@ load_dump version 7". If filename is not specified, or is the string
corruption, this option will probably retrieve more principals
than the **-rev** option will.
+ .. note::
+ The **-recurse** option currently doesn't modify the dump
+ functionality as described above; it does a normal dump.
+
+ .. deprecated:: 1.5
+
.. _kdb5_util_dump_end:
load
diff --git a/src/kadmin/dbutil/dump.c b/src/kadmin/dbutil/dump.c
index e3b0f7c..90fa87f 100644
--- a/src/kadmin/dbutil/dump.c
+++ b/src/kadmin/dbutil/dump.c
@@ -1303,6 +1303,9 @@ dump_db(int argc, char **argv)
} else if (!strcmp(argv[aindex], "-recurse")) {
/* Accept this for compatibility, but do nothing since
* krb5_db_iterate doesn't support it. */
+ fprintf(stderr,
+ _("%s: WARNING: the -recurse option is currently "
+ "unimplemented\n"), progname);
} else {
break;
}
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5