pyrox.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 161e5ad..9f50049 100644
49--- a/k5test/realm.py
50+++ b/k5test/realm.py
51@@ -90,7 +90,7 @@ class K5Realm(metaclass=abc.ABCMeta):
52
53 if provider_cls == K5Realm:
54 krb5_config = _discover_path('krb5-config',
55- '/usr/bin/krb5-config', kwargs)
56+ '@krb5Full@/bin/krb5-config', kwargs)
57
58 try:
59 krb5_version = subprocess.check_output(
60@@ -101,7 +101,7 @@ class K5Realm(metaclass=abc.ABCMeta):
61 # macOS output doesn't contain Heimdal
62 if 'heimdal' in krb5_version.lower() or (
63 sys.platform == 'darwin' and
64- krb5_config == '/usr/bin/krb5-config'):
65+ krb5_config == '@krb5Full@/bin/krb5-config'):
66 provider_cls = HeimdalRealm
67 else:
68 provider_cls = MITRealm
69@@ -434,14 +434,14 @@ class MITRealm(K5Realm):
70 @property
71 def _default_paths(self):
72 return [
73- ('kdb5_util', 'kdb5_util', '/usr/sbin/kdb5_util'),
74- ('krb5kdc', 'krb5kdc', '/usr/sbin/kdb5kdc'),
75- ('kadmin', 'kadmin', '/usr/bin/admin'),
76- ('kadmin_local', 'kadmin.local', '/usr/sbin/kadmin.local'),
77- ('kadmind', 'kadmind', '/usr/sbin/kadmind'),
78- ('kprop', 'kprop', '/usr/sbin/kprop'),
79- ('_kinit', 'kinit', '/usr/bin/kinit'),
80- ('_klist', 'klist', '/usr/bin/klist'),
81+ ('kdb5_util', 'kdb5_util', '@krb5Full@/bin/kdb5_util'),
82+ ('krb5kdc', 'krb5kdc', '@krb5Full@/bin/kdb5kdc'),
83+ ('kadmin', 'kadmin', '@krb5Full@/bin/admin'),
84+ ('kadmin_local', 'kadmin.local', '@krb5Full@/bin/kadmin.local'),
85+ ('kadmind', 'kadmind', '@krb5Full@/bin/kadmind'),
86+ ('kprop', 'kprop', '@krb5Full@/bin/kprop'),
87+ ('_kinit', 'kinit', '@krb5Full@/bin/kinit'),
88+ ('_klist', 'klist', '@krb5Full@/bin/klist'),
89 ]
90
91 @property
92@@ -585,12 +585,12 @@ class HeimdalRealm(K5Realm):
93
94 return [
95 ('krb5kdc', 'kdc', os.path.join(base, 'kdc')),
96- ('kadmin', 'kadmin', '/usr/bin/kadmin'),
97- ('kadmin_local', 'kadmin', '/usr/bin/kadmin'),
98+ ('kadmin', 'kadmin', '@krb5Full@/bin/kadmin'),
99+ ('kadmin_local', 'kadmin', '@krb5Full@/bin/kadmin'),
100 ('kadmind', 'kadmind', os.path.join(base, 'kadmind')),
101- ('_kinit', 'kinit', '/usr/bin/kinit'),
102- ('_klist', 'klist', '/usr/bin/klist'),
103- ('_ktutil', 'ktutil', '/usr/bin/ktutil'),
104+ ('_kinit', 'kinit', '@krb5Full@/bin/kinit'),
105+ ('_klist', 'klist', '@krb5Full@/bin/klist'),
106+ ('_ktutil', 'ktutil', '@krb5Full@/bin/ktutil'),
107 ]
108
109 @property
110diff --git a/k5test/unit.py b/k5test/unit.py
111index 3c64b9e..59da1ab 100644
112--- a/k5test/unit.py
113+++ b/k5test/unit.py
114@@ -38,7 +38,7 @@ _KRB_VERSION = None
115 def krb_minversion_test(target_version, problem, provider=None):
116 global _KRB_VERSION
117 if _KRB_VERSION is None:
118- _KRB_VERSION = _utils.get_output("krb5-config --version")
119+ _KRB_VERSION = _utils.get_output("@krb5FullDev@/bin/krb5-config --version")
120 _KRB_VERSION = _KRB_VERSION.split(' ')[-1].split('.')
121
122 def make_ext_test(func):