krb5 commit [krb5-1.14]: Warn about dump -recurse nonfunctionality

Tom Yu tlyu at mit.edu
Fri Sep 2 17:04:16 EDT 2016


https://github.com/krb5/krb5/commit/08cd1eb86f09433de4e8b4153e4b53daa1ca4d92
commit 08cd1eb86f09433de4e8b4153e4b53daa1ca4d92
Author: Tom Yu <tlyu at 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.
    
    (cherry picked from commit eb8dc865efec4938d74a7955fdcd02bbee4c22b9)
    
    ticket: 8470
    version_fixed: 1.14.4

 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 07f62e9..253bf3f 100644
--- a/src/kadmin/dbutil/dump.c
+++ b/src/kadmin/dbutil/dump.c
@@ -1304,6 +1304,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;
         }


More information about the cvs-krb5 mailing list