>From d0429b49f5a9494c50764e975be492fa70e7cb06 Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn@redhat.com>
Date: Fri, 11 Sep 2015 13:39:20 +0200
Subject: [PATCH 2/4] test_ipa_subdomains_server: Use unique dorectory for
 keytabs

Resolves:
https://fedorahosted.org/sssd/ticket/2694
---
 Makefile.am                                   | 2 +-
 src/tests/cmocka/test_ipa_subdomains_server.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 80a7e329452caf2b037e9bc7d508e46ce99e9867..cacde092b348d57b9d824eca71042dd8656b6fae 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2516,7 +2516,7 @@ test_ipa_subdom_server_SOURCES = \
     $(NULL)
 test_ipa_subdom_server_CFLAGS = \
     $(AM_CFLAGS) \
-    -DIPA_TRUST_KEYTAB_DIR=TEST_DIR \
+    -DIPA_TRUST_KEYTAB_DIR=TEST_DIR\"/tp_test_ipa_subdom_server-test_ipa_subdomains_server\" \
     $(NULL)
 test_ipa_subdom_server_LDFLAGS = \
     -Wl,-wrap,krb5_kt_default \
diff --git a/src/tests/cmocka/test_ipa_subdomains_server.c b/src/tests/cmocka/test_ipa_subdomains_server.c
index fc9a73cf699ea7aa1dd9f0dbf93756bda3720fd9..3c40f04e3712b22ffc497e08a5b8f38921f4b8b1 100644
--- a/src/tests/cmocka/test_ipa_subdomains_server.c
+++ b/src/tests/cmocka/test_ipa_subdomains_server.c
@@ -30,6 +30,8 @@
 #include <ifaddrs.h>
 #include <arpa/inet.h>
 
+#define TESTS_PATH "tp_" BASE_FILE_STEM
+
 #include "providers/ipa/ipa_subdomains.h"
 #include "providers/ipa/ipa_opts.h"
 #include "providers/data_provider.h"
@@ -45,7 +47,7 @@
 
 #define TEST_AUTHID       "host/"HOSTNAME
 #define KEYTAB_TEST_PRINC TEST_AUTHID"@"DOM_REALM
-#define KEYTAB_PATH       TEST_DIR"/keytab_test.keytab"
+#define KEYTAB_PATH       TEST_DIR"/"TESTS_PATH"/keytab_test.keytab"
 
 #define SUBDOM_NAME  "twoway.subdom.test"
 #define SUBDOM_REALM "TWOWAY.SUBDOM.TEST"
@@ -57,12 +59,11 @@
 #define CHILD_FLAT  "CHILD"
 #define CHILD_SID   "S-1-2-3-4"
 
-#define TESTS_PATH "tp_" BASE_FILE_STEM
 #define TEST_CONF_DB "test_ipa_subdom_server.ldb"
 #define TEST_DOM_NAME "ipa_subdom_server_test"
 #define TEST_ID_PROVIDER "ipa"
 
-#define ONEWAY_KEYTAB   TEST_DIR"/"SUBDOM_REALM".keytab"
+#define ONEWAY_KEYTAB   TEST_DIR"/"TESTS_PATH"/"SUBDOM_REALM".keytab"
 #define ONEWAY_PRINC    DOM_FLAT"$"
 #define ONEWAY_AUTHID   ONEWAY_PRINC"@"SUBDOM_REALM
 
-- 
2.5.0