From: Tom Yu <tlyu@mit.edu>
Date: Fri, 30 Jun 2006 23:11:37 +0000 (+0000)
Subject: pull up r18296 from trunk
X-Git-Tag: krb5-1.5-final~9
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=06536b4ec2e691d907185dc04b8770d14a57d572;p=krb5.git

pull up r18296 from trunk

 r18296@cathode-dark-space:  raeburn | 2006-06-30 17:07:25 -0400
 ticket: 3964
 status: open

 * dump.c (load_db): Call krb5_db_promote instead of krb5_db_fini.


ticket: 3964
version_fixed: 1.5

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-5@18306 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/kadmin/dbutil/dump.c b/src/kadmin/dbutil/dump.c
index b1f119808..cd94bdeb4 100644
--- a/src/kadmin/dbutil/dump.c
+++ b/src/kadmin/dbutil/dump.c
@@ -2314,14 +2314,24 @@ load_db(argc, argv)
 	 exit_status++;
     }
 
+#if 0
     if ((kret = krb5_db_fini(kcontext))) {
 	 fprintf(stderr, close_err_fmt,
 		 programname, error_message(kret));
 	 exit_status++;
     }
+#endif
 
     /* close policy db below */
 
+    if (exit_status == 0
+	&& !update
+	&& (kret = krb5_db_promote(kcontext, db5util_db_args))) {
+	fprintf(stderr, "%s: cannot make newly loaded database live (%s)\n",
+		programname, error_message(kret));
+	exit_status++;
+    }
+
 error:
     /*
      * If not an update: if there was an error, destroy the temp database,