From: Tom Yu <tlyu@mit.edu>
Date: Wed, 3 Aug 2016 21:00:05 +0000 (-0400)
Subject: Warn about dump -recurse nonfunctionality
X-Git-Tag: krb5-1.15-beta1~127
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F502%2Fhead;p=thirdparty%2Fkrb5.git

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
---

diff --git a/doc/admin/admin_commands/kdb5_util.rst b/doc/admin/admin_commands/kdb5_util.rst
index c21bf62baa..f43bcf1f9d 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 e3b0f7ca78..90fa87f940 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;
         }