krb5 commit [krb5-1.11]: Fix iprop safety net in kdb5_util load

Tom Yu tlyu at MIT.EDU
Thu Jan 31 17:55:04 EST 2013


https://github.com/krb5/krb5/commit/f16751c9806c0ef9bbbd86eaca937b364cb2ebee
commit f16751c9806c0ef9bbbd86eaca937b364cb2ebee
Author: Greg Hudson <ghudson at mit.edu>
Date:   Thu Jan 17 12:49:57 2013 -0500

    Fix iprop safety net in kdb5_util load
    
    The error message was missing a newline, and the exit behavior causes
    the database to be destroyed.
    
    (cherry picked from commit b264161818eba43263b4d7f137dbae6b266907f0)
    
    ticket: 7370
    version_fixed: 1.11.1
    status: resolved

 src/kadmin/dbutil/dump.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/kadmin/dbutil/dump.c b/src/kadmin/dbutil/dump.c
index 7b515bd..417aa59 100644
--- a/src/kadmin/dbutil/dump.c
+++ b/src/kadmin/dbutil/dump.c
@@ -2807,10 +2807,12 @@ load_db(argc, argv)
         if (log_ctx->ulog != NULL && log_ctx->ulog->kdb_first_time.seconds &&
             (log_ctx->ulog->kdb_first_sno || log_ctx->ulog->kdb_last_sno)) {
             fprintf(stderr, _("%s: Loads disallowed when iprop is enabled "
-                              "and a ulog is present"),
+                              "and a ulog is present\n"),
                     progname);
             exit_status++;
-            goto error;
+            if (dumpfile)
+                fclose(f);
+            return;
         }
     }
 


More information about the cvs-krb5 mailing list