pull up r18692 from trunk

 r18692@cathode-dark-space:  raeburn | 2006-10-11 23:50:15 -0400
 ticket: 4354
 version_reported: 1.5
 tags: pullup

 (krb5_db2_db_init): When creating a temporary database, use the suffix
 "~.kadm5" for the policy database filename.

ticket: 4354
version_fixed: 1.5.2

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

diff --git a/src/plugins/kdb/db2/kdb_db2.c b/src/plugins/kdb/db2/kdb_db2.c
index 0316c7153f99ae609a5eb1946e93fe7c8ca91ea5..45377d12fab0caae6d321cf89e9770921ee265ec 100644 (file)
--- a/src/plugins/kdb/db2/kdb_db2.c
+++ b/src/plugins/kdb/db2/kdb_db2.c
@@ -337,7 +337,8 @@ krb5_db2_db_init(krb5_context context)
     if ((retval = krb5_db2_db_get_age(context, NULL, &db_ctx->db_lf_time)))
        goto err_out;
 
-    sprintf(policy_db_name, "%s.kadm5", db_ctx->db_name);
+    sprintf(policy_db_name, db_ctx->tempdb ? "%s~.kadm5" : "%s.kadm5",
+           db_ctx->db_name);
     sprintf(policy_lock_name, "%s.lock", policy_db_name);
 
     if ((retval = osa_adb_init_db(&db_ctx->policy_db, policy_db_name,