From dbf9750989597e4c1d539ececdb8c10ee89967de Mon Sep 17 00:00:00 2001
From: Nicolas Williams <nico@twosigma.com>
Date: Fri, 19 Feb 2016 22:55:21 -0600
Subject: [PATCH] Tests: set db-dir so tests don't use /var/heimdal

---
 tests/can/krb5.conf.in           | 4 ++++
 tests/can/mit-pkinit-20070607.xf | 3 +++
 tests/db/krb5-mit.conf.in        | 4 ++++
 tests/db/krb5.conf.in            | 6 +++++-
 tests/gss/krb5.conf.in           | 4 ++++
 tests/java/krb5.conf.in          | 4 ++++
 tests/kdc/krb5-authz.conf.in     | 3 +++
 tests/kdc/krb5-authz2.conf.in    | 3 +++
 tests/kdc/krb5-canon.conf.in     | 3 +++
 tests/kdc/krb5-canon2.conf.in    | 3 +++
 tests/kdc/krb5-pkinit.conf.in    | 4 ++++
 tests/kdc/krb5.conf.keys.in      | 4 ++++
 tests/ldap/krb5.conf.in          | 4 ++++
 tests/plugin/krb5.conf.in        | 4 ++++
 14 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/tests/can/krb5.conf.in b/tests/can/krb5.conf.in
index a73a56447..8cf1ca57c 100644
--- a/tests/can/krb5.conf.in
+++ b/tests/can/krb5.conf.in
@@ -17,8 +17,12 @@
 		dbname = @objdir@/current-db
 		realm = TEST.H5L.SE
 		mkey_file = @objdir@/mkey.file
+                log_file = @objdir@/current.log
 	}
 
+[hdb]
+	db-dir = @objdir@
+
 [logging]
 	kdc = 0-/FILE:@objdir@/messages.log
 	default = 0-/FILE:@objdir@/messages.log
diff --git a/tests/can/mit-pkinit-20070607.xf b/tests/can/mit-pkinit-20070607.xf
index 062112e65..1c7478676 100644
--- a/tests/can/mit-pkinit-20070607.xf
+++ b/tests/can/mit-pkinit-20070607.xf
@@ -23,6 +23,9 @@
 		mkey_file = @objdir@/mkey.file
 	}
 
+[hdb]
+        db-dir = @objdir@
+
 [logging]
 	kdc = 0-/FILE:@objdir@/messages.log
 	default = 0-/FILE:@objdir@/messages.log
diff --git a/tests/db/krb5-mit.conf.in b/tests/db/krb5-mit.conf.in
index 0a59d75cc..99ffe4a65 100644
--- a/tests/db/krb5-mit.conf.in
+++ b/tests/db/krb5-mit.conf.in
@@ -7,8 +7,12 @@
 			realm = EXAMPLE.ORG
 			dbname = mit-db:@srcdir@/mit-db
 			mkey_file = @srcdir@/mit-db-master-stash
+                        log_file = @objdir@/current.log
 		}
 	}
 
+[hdb]
+	db-dir = @objdir@
+
 [logging]
 	default = 0-/FILE:@objdir@/messages.log
diff --git a/tests/db/krb5.conf.in b/tests/db/krb5.conf.in
index 0e91fee7b..f5324cb5a 100644
--- a/tests/db/krb5.conf.in
+++ b/tests/db/krb5.conf.in
@@ -12,17 +12,21 @@
 			realm = LABEL.TEST.H5L.SE
 			dbname = @type@@objdir@/label-db
 			mkey_file = @objdir@/mkey.file
+                        log_file = @objdir@/current.log
 		}
 		label2 = {
 			dbname = @type@@objdir@/lable2-db
 			realm = LABEL2.TEST.H5L.SE
 			mkey_file = @objdir@/mkey2.file
+                        log_file = @objdir@/current.log
 		}
 		dbname = @type@@objdir@/current-db
 		realm = EXAMPLE.ORG
 		mkey_file = @objdir@/mkey.file
-		log_file = @objdir@/log.current-db.log
 	}
 
+[hdb]
+	db-dir = @objdir@
+
 [logging]
 	default = 0-/FILE:@objdir@/messages.log
diff --git a/tests/gss/krb5.conf.in b/tests/gss/krb5.conf.in
index bf254d55c..d372c9adf 100644
--- a/tests/gss/krb5.conf.in
+++ b/tests/gss/krb5.conf.in
@@ -25,8 +25,12 @@
 		dbname = @objdir@/current-db
 		realm = TEST.H5L.SE
 		mkey_file = @objdir@/mkey.file
+                log_file = @objdir@/current.log
 	}
 
+[hdb]
+	db-dir = @objdir@
+
 [logging]
 	kdc = 0-/FILE:@objdir@/messages.log
 	default = 0-/FILE:@objdir@/messages.log
diff --git a/tests/java/krb5.conf.in b/tests/java/krb5.conf.in
index ec4a578ad..ca6b74f3d 100644
--- a/tests/java/krb5.conf.in
+++ b/tests/java/krb5.conf.in
@@ -14,8 +14,12 @@
 		dbname = @objdir@/current-db
 		realm = TEST.H5L.SE
 		mkey_file = @objdir@/mkey.file
+                log_file = @objdir@/current.log
 	}
 
+[hdb]
+	db-dir = @objdir@
+
 [logging]
 	kdc = 0-/FILE:@objdir@/messages.log
 	default = 0-/FILE:@objdir@/messages.log
diff --git a/tests/kdc/krb5-authz.conf.in b/tests/kdc/krb5-authz.conf.in
index ea4cc5f83..0d4f38b74 100644
--- a/tests/kdc/krb5-authz.conf.in
+++ b/tests/kdc/krb5-authz.conf.in
@@ -18,6 +18,9 @@
 	    auth_to_local = DB:@srcdir@/an2ln-db.txt DEFAULT
 	}
 
+[hdb]
+	db-dir = @objdir@
+
 [logging]
 	default = 0-/FILE:@objdir@/messages.log
 
diff --git a/tests/kdc/krb5-authz2.conf.in b/tests/kdc/krb5-authz2.conf.in
index bc4a9b220..9a8efb0c7 100644
--- a/tests/kdc/krb5-authz2.conf.in
+++ b/tests/kdc/krb5-authz2.conf.in
@@ -19,6 +19,9 @@
 	    auth_to_local = DB:@srcdir@/an2ln-db.txt DEFAULT
 	}
 
+[hdb]
+	db-dir = @objdir@
+
 [logging]
 	default = 0-/FILE:@objdir@/messages.log
 
diff --git a/tests/kdc/krb5-canon.conf.in b/tests/kdc/krb5-canon.conf.in
index f8cbc3e20..d01d355fa 100644
--- a/tests/kdc/krb5-canon.conf.in
+++ b/tests/kdc/krb5-canon.conf.in
@@ -73,6 +73,9 @@
 	iprop-stats = @objdir@/iprop-stats
 	iprop-acl = @srcdir@/iprop-acl
 
+[hdb]
+	db-dir = @objdir@
+
 [logging]
 	kdc = 0-/FILE:@objdir@/messages.log
 	default = 0-/FILE:@objdir@/messages.log
diff --git a/tests/kdc/krb5-canon2.conf.in b/tests/kdc/krb5-canon2.conf.in
index 01d33f663..444effd50 100644
--- a/tests/kdc/krb5-canon2.conf.in
+++ b/tests/kdc/krb5-canon2.conf.in
@@ -70,6 +70,9 @@
 	iprop-stats = @objdir@/iprop-stats
 	iprop-acl = @srcdir@/iprop-acl
 
+[hdb]
+	db-dir = @objdir@
+
 [logging]
 	kdc = 0-/FILE:@objdir@/messages.log
 	default = 0-/FILE:@objdir@/messages.log
diff --git a/tests/kdc/krb5-pkinit.conf.in b/tests/kdc/krb5-pkinit.conf.in
index 57299bc4d..a319fd42e 100644
--- a/tests/kdc/krb5-pkinit.conf.in
+++ b/tests/kdc/krb5-pkinit.conf.in
@@ -22,8 +22,12 @@
 		dbname = @objdir@/current-db
 		realm = TEST.H5L.SE
 		mkey_file = @objdir@/mkey.file
+                log_file = @objdir@/log.current-db.log
 	}
 
+[hdb]
+	db-dir = @objdir@
+
 [logging]
 	kdc = 0-/FILE:@objdir@/messages.log
 	default = 0-/FILE:@objdir@/messages.log
diff --git a/tests/kdc/krb5.conf.keys.in b/tests/kdc/krb5.conf.keys.in
index 059ffcb50..2ba61f321 100644
--- a/tests/kdc/krb5.conf.keys.in
+++ b/tests/kdc/krb5.conf.keys.in
@@ -7,8 +7,12 @@
 		realm = TEST.H5L.SE
 		mkey_file = @objdir@/mkey.file
 		acl_file = @srcdir@/heimdal.acl
+                log_file = @objdir@/log.current-db.log
 	}
 
+[hdb]
+	db-dir = @objdir@
+
 
 [kadmin]
 	default_keys = @keys@
diff --git a/tests/ldap/krb5.conf.in b/tests/ldap/krb5.conf.in
index 0bd3abbd9..6f6b87838 100644
--- a/tests/ldap/krb5.conf.in
+++ b/tests/ldap/krb5.conf.in
@@ -14,8 +14,12 @@
 		dbname = ldapi://ldap-socket:OU=KerberosPrincipals,o=test,DC=h5l,DC=se
 		realm = TEST.H5L.SE
 		mkey_file = @objdir@/mkey.file
+                log_file = @objdir@/log.current-db.log
 	}
 
+[hdb]
+	db-dir = @objdir@
+
 [logging]
 	kdc = 0-/FILE:@objdir@/messages.log
 	default = 0-/FILE:@objdir@/messages.log
diff --git a/tests/plugin/krb5.conf.in b/tests/plugin/krb5.conf.in
index 2e4e9aed6..70939fd03 100644
--- a/tests/plugin/krb5.conf.in
+++ b/tests/plugin/krb5.conf.in
@@ -19,8 +19,12 @@
 		dbname = @objdir@/current-db
 		realm = TEST.H5L.SE
 		mkey_file = @objdir@/mkey.file
+                log_file = @objdir@/log.current-db.log
 	}
 
+[hdb]
+	db-dir = @objdir@
+
 [logging]
 	kdc = 0-/FILE:@objdir@/messages.log
 	default = 0-/FILE:@objdir@/messages.log