From a8c51aa5947f4d51e03f9c35d1e38482ce9d7a7a Mon Sep 17 00:00:00 2001
From: =?utf8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= <lha@h5l.org>
Date: Wed, 29 Feb 2012 08:32:57 -0800
Subject: [PATCH] add basic sqlite tests (from Nico)

---
 tests/kdc/check-kdc.in | 11 ++++++-----
 tests/kdc/krb5.conf.in |  7 +++++++
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/tests/kdc/check-kdc.in b/tests/kdc/check-kdc.in
index 09003c5cd..182f79256 100644
--- a/tests/kdc/check-kdc.in
+++ b/tests/kdc/check-kdc.in
@@ -57,6 +57,7 @@ R7=SOME-REALM7.UK
 port=@port@
 
 kadmin="${kadmin} -l -r $R"
+kadmin5="${kadmin} -l -r $R5"
 kdc="${kdc} --addresses=localhost -P $port"
 
 server=host/datan.test.h5l.se
@@ -116,7 +117,7 @@ ${kadmin} \
     --realm-max-renewable-life=1month \
     ${R4} || exit 1
 
-${kadmin} \
+${kadmin5} \
     init \
     --realm-max-ticket-life=1day \
     --realm-max-renewable-life=1month \
@@ -149,7 +150,7 @@ ${kadmin} add -p foo --use-defaults foo@${R} || exit 1
 ${kadmin} add -p foo --use-defaults foo@${R2} || exit 1
 ${kadmin} add -p foo --use-defaults foo@${R3} || exit 1
 ${kadmin} add -p foo --use-defaults foo@${R4} || exit 1
-${kadmin} add -p foo --use-defaults foo@${R5} || exit 1
+${kadmin5} add -p foo --use-defaults foo@${R5} || exit 1
 ${kadmin} add -p foo --use-defaults foo@${R6} || exit 1
 ${kadmin} add -p foo --use-defaults foo@${R7} || exit 1
 ${kadmin} add -p bar --use-defaults bar@${R} || exit 1
@@ -189,9 +190,9 @@ ${kadmin} add -p cross1 --use-defaults krbtgt/${R4}@${R3} || exit 1
 ${kadmin} add -p cross2 --use-defaults krbtgt/${R3}@${R4} || exit 1
 
 ${kadmin} add -p cross1 --use-defaults krbtgt/${R5}@${R} || exit 1
-${kadmin} add -p cross2 --use-defaults krbtgt/${R}@${R5} || exit 1
+${kadmin5} add -p cross2 --use-defaults krbtgt/${R}@${R5} || exit 1
 
-${kadmin} add -p cross1 --use-defaults krbtgt/${R6}@${R5} || exit 1
+${kadmin5} add -p cross1 --use-defaults krbtgt/${R6}@${R5} || exit 1
 ${kadmin} add -p cross2 --use-defaults krbtgt/${R5}@${R6} || exit 1
 
 ${kadmin} add -p cross1 --use-defaults krbtgt/${R7}@${R6} || exit 1
@@ -211,7 +212,7 @@ ${kadmin} check ${R} || exit 1
 ${kadmin} check ${R2} || exit 1
 ${kadmin} check ${R3} || exit 1
 ${kadmin} check ${R4} || exit 1
-${kadmin} check ${R5} || exit 1
+${kadmin5} check ${R5} || exit 1
 ${kadmin} check ${R6} || exit 1
 ${kadmin} check ${R7} || exit 1
 
diff --git a/tests/kdc/krb5.conf.in b/tests/kdc/krb5.conf.in
index 596dc04a7..bffec3b11 100644
--- a/tests/kdc/krb5.conf.in
+++ b/tests/kdc/krb5.conf.in
@@ -78,6 +78,13 @@
 			acl_file = @srcdir@/heimdal.acl
 			log_file = @objdir@/current@kdc@.log
 		}
+		label3 = { 
+			dbname = sqlite:@objdir@/current-db@kdc@.sqlite3
+			realm = SOME-REALM5.FR
+			mkey_file = @objdir@/mkey.file
+			acl_file = @srcdir@/heimdal.acl
+			log_file = @objdir@/current@kdc@.log
+		}
 	}
 
 	signal_socket = @objdir@/signal
-- 
2.11.4.GIT