tjh.dev
1diff --git a/k5test/_utils.py b/k5test/_utils.py
2index e289fac..e2f486a 100644
3--- a/k5test/_utils.py
4+++ b/k5test/_utils.py
5@@ -65,12 +65,12 @@ def find_plugin_dir():
6
7 # if there was no LD_LIBRARY_PATH, or the above failed
8 if _PLUGIN_DIR is None:
9- lib_dir = os.path.join(get_output('krb5-config --prefix'), 'lib64')
10+ lib_dir = os.path.join(get_output('@krb5FullDev@/bin/krb5-config --prefix'), 'lib64')
11 _PLUGIN_DIR = _decide_plugin_dir(_find_plugin_dirs_installed(lib_dir))
12
13 # /usr/lib64 seems only to be distinct on Fedora/RHEL/Centos family
14 if _PLUGIN_DIR is None:
15- lib_dir = os.path.join(get_output('krb5-config --prefix'), 'lib')
16+ lib_dir = os.path.join(get_output('@krb5FullDev@/bin/krb5-config --prefix'), 'lib')
17 _PLUGIN_DIR = _decide_plugin_dir(_find_plugin_dirs_installed(lib_dir))
18
19 if _PLUGIN_DIR is not None:
20@@ -89,7 +89,7 @@ def _decide_plugin_dir(dirs):
21
22 for path in shortest_first:
23 # check to see if it actually contains .so files
24- if get_output('find %s -name "*.so"' % path):
25+ if get_output('@findutils@/bin/find %s -name "*.so"' % path):
26 return path
27
28 return None
29@@ -97,7 +97,7 @@ def _decide_plugin_dir(dirs):
30
31 def _find_plugin_dirs_installed(search_path):
32 try:
33- options_raw = get_output('find %s/ -type d \( ! -executable -o ! -readable \) '
34+ options_raw = get_output('@findutils@/bin/find %s/ -type d \( ! -executable -o ! -readable \) '
35 '-prune -o '
36 '-type d -path "*/krb5/plugins" -print' % search_path,
37 stderr=subprocess.STDOUT)
38@@ -111,7 +111,7 @@ def _find_plugin_dirs_installed(search_path):
39
40
41 def _find_plugin_dirs_src(search_path):
42- options_raw = get_output('find %s/../ -type d -name plugins' % search_path)
43+ options_raw = get_output('@findutils@/bin/find %s/../ -type d -name plugins' % search_path)
44
45 if options_raw:
46 return options_raw.split('\n')
47diff --git a/k5test/realm.py b/k5test/realm.py
48index f57946b..ad78579 100644
49--- a/k5test/realm.py
50+++ b/k5test/realm.py
51@@ -181,19 +181,13 @@ class K5Realm(object):
52 return path
53
54 def _init_paths(self, **paths):
55- self.kdb5_util = self._discover_path('kdb5_util',
56- '/usr/sbin/kdb5_util', paths)
57- self.krb5kdc = self._discover_path('krb5kdc',
58- '/usr/sbin/krb5kdc', paths)
59- self.kadmin_local = self._discover_path('kadmin_local',
60- '/usr/sbin/kadmin.local',
61- paths)
62- self.kprop = self._discover_path('kprop', '/usr/sbin/kprop', paths)
63- self.kadmind = self._discover_path('kadmind',
64- '/usr/sbin/kadmind', paths)
65-
66- self._kinit = self._discover_path('kinit', '/usr/bin/kinit', paths)
67- self._klist = self._discover_path('klist', '/usr/bin/klist', paths)
68+ self.kdb5_util = '@krb5Full@/bin/kdb5_util'
69+ self.krb5kdc = '@krb5Full@/bin/krb5kdc'
70+ self.kadmin_local = '@krb5Full@/bin/kadmin.local'
71+ self.kprop = '@krb5Full@/bin/kprop'
72+ self.kadmind = '@krb5Full@/bin/kadmind'
73+ self._kinit = '@krb5Full@/bin/kinit'
74+ self._klist = '@krb5Full@/bin/klist'
75
76 def _create_conf(self, profile, filename):
77 with open(filename, 'w') as conf_file:
78diff --git a/k5test/unit.py b/k5test/unit.py
79index 4ee7f98..543d662 100644
80--- a/k5test/unit.py
81+++ b/k5test/unit.py
82@@ -38,7 +38,7 @@ _KRB_VERSION = None
83 def krb_minversion_test(target_version, problem):
84 global _KRB_VERSION
85 if _KRB_VERSION is None:
86- _KRB_VERSION = _utils.get_output("krb5-config --version")
87+ _KRB_VERSION = _utils.get_output("@krb5FullDev@/bin/krb5-config --version")
88 _KRB_VERSION = _KRB_VERSION.split(' ')[-1].split('.')
89
90 def make_ext_test(func):