URL: https://github.com/SSSD/sssd/pull/824 Author: thalman Title: #824: CONFDB: Files domain if activated without .conf Action: synchronized
To pull the PR as Git branch: git remote add ghsssd https://github.com/SSSD/sssd git fetch ghsssd pull/824/head:pr824 git checkout pr824
From 2509748c862d8196f5cd15d47d9e58ebd3cb1e46 Mon Sep 17 00:00:00 2001 From: Tomas Halman <thal...@redhat.com> Date: Thu, 5 Sep 2019 09:28:55 +0200 Subject: [PATCH 1/2] CONFDB: Files domain if activated without .conf Implicit files domain gets activated when no sssd.conf present and sssd is started. This does not respect --disable-files-domain configure option Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1713352 --- src/confdb/confdb_setup.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/confdb/confdb_setup.c b/src/confdb/confdb_setup.c index 5e35589659..e9944957da 100644 --- a/src/confdb/confdb_setup.c +++ b/src/confdb/confdb_setup.c @@ -34,7 +34,6 @@ "version: 2\n\n" \ "dn: cn=sssd,cn=config\n" \ "cn: sssd\n" \ -"enable_files_domain: true\n" \ "services: nss\n\n" #endif /* SSSD_FALLBACK_CONFIG_LDIF */ From a1ec441ba960a5bf4a6c9df5bad6093791baf993 Mon Sep 17 00:00:00 2001 From: Tomas Halman <thal...@redhat.com> Date: Thu, 5 Sep 2019 09:30:04 +0200 Subject: [PATCH 2/2] TESTS: adapt tests to enabled default files domain Some tests expect that SSSD is compiled with --enable-files-domain option (test_no_sssd_conf). But having this enabled by default breaks some other tests. This patch adds --enable-files-domain to test build and explicitly disables the domain in configuration of some tests (ldap, enumeration). Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1713352 --- Makefile.am | 2 ++ src/tests/intg/test_enumeration.py | 1 + src/tests/intg/test_ldap.py | 1 + 3 files changed, 4 insertions(+) diff --git a/Makefile.am b/Makefile.am index 0c24ae6649..0c335ac1db 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3763,6 +3763,8 @@ intgcheck-prepare: --enable-intgcheck-reqs \ --without-semanage \ --with-session-recording-shell=/bin/false \ + --enable-local-provider \ + --enable-files-domain \ $(INTGCHECK_CONFIGURE_FLAGS) \ CFLAGS="-O2 -g $$CFLAGS -DKCM_PEER_UID=$$(id -u)"; \ $(MAKE) $(AM_MAKEFLAGS) ; \ diff --git a/src/tests/intg/test_enumeration.py b/src/tests/intg/test_enumeration.py index 669fd86c7a..c105c6df02 100644 --- a/src/tests/intg/test_enumeration.py +++ b/src/tests/intg/test_enumeration.py @@ -113,6 +113,7 @@ def format_basic_conf(ldap_conn, schema): debug_level = 0xffff domains = LDAP services = nss, pam + enable_files_domain = false [nss] debug_level = 0xffff diff --git a/src/tests/intg/test_ldap.py b/src/tests/intg/test_ldap.py index 787255f92d..c432068f91 100644 --- a/src/tests/intg/test_ldap.py +++ b/src/tests/intg/test_ldap.py @@ -117,6 +117,7 @@ def format_basic_conf(ldap_conn, schema): debug_level = 0xffff domains = LDAP services = nss, pam + enable_files_domain = false [nss] debug_level = 0xffff
_______________________________________________ sssd-devel mailing list -- sssd-devel@lists.fedorahosted.org To unsubscribe send an email to sssd-devel-le...@lists.fedorahosted.org Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedorahosted.org/archives/list/sssd-devel@lists.fedorahosted.org
