From 1ff11167219aa8c21eb49d586d71f33c9d8e8277 Mon Sep 17 00:00:00 2001 From: Corbin Whitton Date: Sun, 1 Dec 2024 11:10:28 -0700 Subject: [PATCH 1/2] (bug) renamed erroneous nslcd.conf header to sssd.conf --- src/middlewared/middlewared/etc_files/sssd/sssd.conf.mako | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/middlewared/middlewared/etc_files/sssd/sssd.conf.mako b/src/middlewared/middlewared/etc_files/sssd/sssd.conf.mako index 50e5fe13085d0..fbe25f6ca2428 100644 --- a/src/middlewared/middlewared/etc_files/sssd/sssd.conf.mako +++ b/src/middlewared/middlewared/etc_files/sssd/sssd.conf.mako @@ -1,5 +1,5 @@ # -# NSLCD.CONF(5) The configuration file for LDAP nameservice daemon +# SSSD.CONF(5) The configuration file for SSSD # <% from middlewared.plugins.etc import FileShouldNotExist From 918a6db8ae4af52c2b638edede3a07a51bd424eb Mon Sep 17 00:00:00 2001 From: Corbin Whitton Date: Sun, 1 Dec 2024 11:11:40 -0700 Subject: [PATCH 2/2] (feat) added sections for helping to debug --- .../middlewared/etc_files/sssd/sssd.conf.mako | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/middlewared/middlewared/etc_files/sssd/sssd.conf.mako b/src/middlewared/middlewared/etc_files/sssd/sssd.conf.mako index fbe25f6ca2428..f5508ef496168 100644 --- a/src/middlewared/middlewared/etc_files/sssd/sssd.conf.mako +++ b/src/middlewared/middlewared/etc_files/sssd/sssd.conf.mako @@ -84,17 +84,23 @@ enumerate = ${not ldap['disable_freenas_cache']} % if kerberos_realm: ldap_sasl_mech = GSSAPI ldap_sasl_realm = ${kerberos_realm} - % if ldap['kerberos_principal']: +% if ldap['kerberos_principal']: ldap_sasl_authid = ${ldap['kerberos_principal']} - % endif +% endif % endif timeout = ${ldap['timeout']} ldap_schema = ${ldap['schema'].lower()} min_id = ${min_uid} -${'\n '.join(search_params)} -${'\n '.join(map_params)} +% if search_params: +# Search Parameters +${'\n'.join(search_params)} +% endif +% if search_params: +# Map Parameters +${'\n'.join(map_params)} +% endif % if aux: -${'\n '.join(aux)} +${'\n'.join(aux)} % endif % elif ds_type == DSType.IPA.value: [sssd]