diff options
| author | Tom Yu <tlyu@mit.edu> | 2016-08-03 17:00:05 -0400 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2016-09-02 18:27:04 -0400 |
| commit | 1c297d294d37c1b8a0899e9993783027da9b72d6 (patch) | |
| tree | 90e92d253a291d39c58be4bf75b09869bdafcc11 | |
| parent | d9491fdd9a302c45513b5efc64bc5aaea6e4a9ae (diff) | |
| download | krb5-1c297d294d37c1b8a0899e9993783027da9b72d6.zip krb5-1c297d294d37c1b8a0899e9993783027da9b72d6.tar.gz krb5-1c297d294d37c1b8a0899e9993783027da9b72d6.tar.bz2 | |
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.13.7
| -rw-r--r-- | doc/admin/admin_commands/kdb5_util.rst | 6 | ||||
| -rw-r--r-- | 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 a818bb5..cceb179 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; } |