[sssd PR#5766][comment] Sources cleanup - part 3.
by alexey-tikhonov
URL: https://github.com/SSSD/sssd/pull/5766
Title: #5766: Sources cleanup - part 3.
alexey-tikhonov commented:
"""
Also there is an issue with a spec file:
```
/usr/bin/install -p -m 644 src/sysv/systemd/sssd.service src/sysv/systemd/sssd-nss.socket src/sysv/systemd/sssd-nss.service src/sysv/systemd/sssd-pam.socket src/sysv/systemd/sssd-pam-priv.socket src/sysv/systemd/sssd-pam.service src/sysv/systemd/sssd-autofs.socket src/sysv/systemd/sssd-autofs.service src/sysv/systemd/sssd-ifp.service src/sysv/systemd/sssd-pac.socket src/sysv/systemd/sssd-pac.service src/sysv/systemd/sssd-ssh.socket src/sysv/systemd/sssd-ssh.service src/sysv/systemd/sssd-sudo.socket src/sysv/systemd/sssd-sudo.service ./src/sysv/systemd/sssd-kcm.socket src/sysv/systemd/sssd-kcm.service '/builddir/build/BUILDROOT/sssd-2.5.3-0.210827.210238.git9841f13e6.fc34.x86_64/usr/lib/systemd/system'
/usr/bin/install: cannot stat './src/sysv/systemd/sssd-kcm.socket': No such file or directory
```
"""
See the full comment at https://github.com/SSSD/sssd/pull/5766#issuecomment-908203913
2 years, 6 months
[sssd PR#5766][comment] Sources cleanup - part 3.
by pbrezina
URL: https://github.com/SSSD/sssd/pull/5766
Title: #5766: Sources cleanup - part 3.
pbrezina commented:
"""
This will fix the tests
```diff
diff --git a/src/tests/intg/kdc.py b/src/tests/intg/kdc.py
index 2f1426138..b0cc073a1 100644
--- a/src/tests/intg/kdc.py
+++ b/src/tests/intg/kdc.py
@@ -76,7 +76,7 @@ class KDC(object):
self._create_kdb()
def get_krb5_env(self):
- my_env = os.environ
+ my_env = os.environ.copy()
my_env['KRB5_CONFIG'] = self.krb5_conf_path
my_env['KRB5_KDC_PROFILE'] = self.kdc_conf_path
return my_env
diff --git a/src/tests/intg/krb5utils.py b/src/tests/intg/krb5utils.py
index 3da4c6a91..2d1b79e76 100644
--- a/src/tests/intg/krb5utils.py
+++ b/src/tests/intg/krb5utils.py
@@ -38,7 +38,7 @@ class Krb5Utils(object):
self.krb5_conf_path = krb5_conf_path
def spawn_in_env(self, args, stdin=None, extra_env=None):
- my_env = os.environ
+ my_env = os.environ.copy()
my_env['KRB5_CONFIG'] = self.krb5_conf_path
if 'KRB5CCNAME' in my_env:
diff --git a/src/tests/intg/test_pam_responder.py b/src/tests/intg/test_pam_responder.py
index 072be68e9..73682d469 100644
--- a/src/tests/intg/test_pam_responder.py
+++ b/src/tests/intg/test_pam_responder.py
@@ -733,6 +733,10 @@ def setup_krb5(request, kdc_instance, passwd_ops_setup):
"""
conf = format_pam_krb5_auth(config, kdc_instance)
create_conf_fixture(request, conf)
+
+ os.environ['KRB5_CONFIG'] = kdc_instance.krb5_conf_path
+ os.environ['KRB5_KDC_PROFILE'] = kdc_instance.kdc_conf_path
+
create_sssd_fixture(request)
passwd_ops_setup.useradd(**USER1)
passwd_ops_setup.useradd(**USER2)
@@ -798,6 +802,10 @@ def setup_krb5_domains(request, kdc_instance, passwd_ops_setup):
"""
conf = format_pam_krb5_auth_domains(config, kdc_instance)
create_conf_fixture(request, conf)
+
+ os.environ['KRB5_CONFIG'] = kdc_instance.krb5_conf_path
+ os.environ['KRB5_KDC_PROFILE'] = kdc_instance.kdc_conf_path
+
create_sssd_fixture(request)
passwd_ops_setup.useradd(**USER1)
passwd_ops_setup.useradd(**USER2)
```
There will be probably cleaner way to propagate the krb5 environment to sssd and sssctl, I'll leave that up to you.
"""
See the full comment at https://github.com/SSSD/sssd/pull/5766#issuecomment-931275616
2 years, 6 months