From c5b73c7c19d8ed069d34baa8f1170c229820b195 Mon Sep 17 00:00:00 2001 From: Xavier Beaudouin Date: Mon, 6 May 2024 11:01:28 +0200 Subject: [PATCH] Backup --- .../files/patch-src_config_cfg__rules.ini | 26 ++++----- security/sssd2.old/pkg-plist | 54 +++++++++---------- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/security/sssd2.old/files/patch-src_config_cfg__rules.ini b/security/sssd2.old/files/patch-src_config_cfg__rules.ini index f6bc19e..c5a89de 100644 --- a/security/sssd2.old/files/patch-src_config_cfg__rules.ini +++ b/security/sssd2.old/files/patch-src_config_cfg__rules.ini @@ -5,21 +5,21 @@ section = session_recording section_re = ^prompting/password$ -section_re = ^prompting/password/[^/\@]\+$ -+section_re = ^prompting/password/[^/\@]+$ ++section_re = ^prompting/password/[^/\@]\{1,\}$ section_re = ^prompting/2fa$ -section_re = ^prompting/2fa/[^/\@]\+$ -+section_re = ^prompting/2fa/[^/\@]+$ ++section_re = ^prompting/2fa/[^/\@]\{1,\}$ section_re = ^prompting/passkey$ -section_re = ^prompting/passkey/[^/\@]\+$ -section_re = ^domain/[^/\@]\+$ -section_re = ^domain/[^/\@]\+/[^/\@]\+$ -section_re = ^application/[^/\@]\+$ -section_re = ^certmap/[^/\@]\+/[^/\@]\+$ -+section_re = ^prompting/passkey/[^/\@]+$ -+section_re = ^domain/[^/\@]+$ -+section_re = ^domain/[^/\@]+/[^/\@]+$ -+section_re = ^application/[^/\@]+$ -+section_re = ^certmap/[^/\@]+/[^/\@]+$ ++section_re = ^prompting/passkey/[^/\@]\{1,\}$ ++section_re = ^domain/[^/\@]\{1,\}$ ++section_re = ^domain/[^/\@]\{1,\}/[^/\@]\{1,\}$ ++section_re = ^application/[^/\@]\{1,\}$ ++section_re = ^certmap/[^/\@]\{1,\}/[^/\@]\{1,\}$ [rule/allowed_sssd_options] @@ -28,14 +28,14 @@ [rule/allowed_prompting_password_subsec_options] validator = ini_allowed_options -section_re = ^prompting/password/[^/\@]\+$ -+section_re = ^prompting/password/[^/\@]+$ ++section_re = ^prompting/password/[^/\@]\{1,\}$ option = password_prompt [rule/allowed_prompting_2fa_subsec_options] validator = ini_allowed_options -section_re = ^prompting/2fa/[^/\@]\+$ -+section_re = ^prompting/2fa/[^/\@]+$ ++section_re = ^prompting/2fa/[^/\@]\{1,\}$ option = single_prompt option = first_prompt @@ -44,7 +44,7 @@ [rule/allowed_prompting_passkey_subsec_options] validator = ini_allowed_options -section_re = ^prompting/passkey/[^/\@]\+$ -+section_re = ^prompting/passkey/[^/\@]+$ ++section_re = ^prompting/passkey/[^/\@]\{1,\}$ option = interactive option = interactive_prompt @@ -53,7 +53,7 @@ [rule/allowed_domain_options] validator = ini_allowed_options -section_re = ^\(domain\|application\)/[^/]\+$ -+section_re = ^(domain|application)/[^/]+$ ++section_re = ^(domain|application)/[^/]\{1,\}$ option = debug option = debug_level @@ -62,7 +62,7 @@ [rule/allowed_subdomain_options] validator = ini_allowed_options -section_re = ^domain/[^/\@]\+/[^/\@]\+$ -+section_re = ^domain/[^/\@]+/[^/\@]+$ ++section_re = ^domain/[^/\@]+/[^/\@]\{1,\}$ option = ldap_search_base option = ldap_user_search_base @@ -71,7 +71,7 @@ [rule/allowed_certmap_options] validator = ini_allowed_options -section_re = ^certmap/[^/\@]\+/[^/\@]\+$ -+section_re = ^certmap/[^/\@]+/[^/\@]+$ ++section_re = ^certmap/[^/\@]+/[^/\@]\{1,\}$ option = matchrule option = maprule diff --git a/security/sssd2.old/pkg-plist b/security/sssd2.old/pkg-plist index 23ef3cc..c4bd100 100644 --- a/security/sssd2.old/pkg-plist +++ b/security/sssd2.old/pkg-plist @@ -92,33 +92,6 @@ libexec/sssd/sssd_pac libexec/sssd/sssd_pam libexec/sssd/sssd_ssh libexec/sssd/sssd_sudo -share/man1/sss_ssh_authorizedkeys.1.gz -share/man1/sss_ssh_knownhostsproxy.1.gz -share/man5/sss-certmap.5.gz -share/man5/sssd-ad.5.gz -share/man5/sssd-files.5.gz -share/man5/sssd-ifp.5.gz -share/man5/sssd-ipa.5.gz -share/man5/sssd-krb5.5.gz -share/man5/sssd-ldap-attributes.5.gz -share/man5/sssd-ldap.5.gz -share/man5/sssd-session-recording.5.gz -share/man5/sssd-simple.5.gz -share/man5/sssd-sudo.5.gz -share/man5/sssd.conf.5.gz -share/man8/idmap_sss.8.gz -share/man8/pam_sss.8.gz -share/man8/pam_sss_gss.8.gz -share/man8/sss_cache.8.gz -share/man8/sss_debuglevel.8.gz -share/man8/sss_obfuscate.8.gz -share/man8/sss_override.8.gz -share/man8/sss_seed.8.gz -share/man8/sssctl.8.gz -share/man8/sssd-kcm.8.gz -share/man8/sssd.8.gz -/shareman8/sssd_krb5_localauth_plugin.8.gz -share/man8/sssd_krb5_locator_plugin.8.gz sbin/sss_cache sbin/sss_debuglevel sbin/sss_obfuscate @@ -128,6 +101,33 @@ sbin/sssctl sbin/sssd share/dbus-1/system-services/org.freedesktop.sssd.infopipe.service share/dbus-1/system.d/org.freedesktop.sssd.infopipe.conf +share/man/man1/sss_ssh_authorizedkeys.1.gz +share/man/man1/sss_ssh_knownhostsproxy.1.gz +share/man/man5/sss-certmap.5.gz +share/man/man5/sssd-ad.5.gz +share/man/man5/sssd-files.5.gz +share/man/man5/sssd-ifp.5.gz +share/man/man5/sssd-ipa.5.gz +share/man/man5/sssd-krb5.5.gz +share/man/man5/sssd-ldap-attributes.5.gz +share/man/man5/sssd-ldap.5.gz +share/man/man5/sssd-session-recording.5.gz +share/man/man5/sssd-simple.5.gz +share/man/man5/sssd-sudo.5.gz +share/man/man5/sssd.conf.5.gz +share/man/man8/idmap_sss.8.gz +share/man/man8/pam_sss.8.gz +share/man/man8/pam_sss_gss.8.gz +share/man/man8/sss_cache.8.gz +share/man/man8/sss_debuglevel.8.gz +share/man/man8/sss_obfuscate.8.gz +share/man/man8/sss_override.8.gz +share/man/man8/sss_seed.8.gz +share/man/man8/sssctl.8.gz +share/man/man8/sssd-kcm.8.gz +share/man/man8/sssd.8.gz +share/man/man8/sssd_krb5_localauth_plugin.8.gz +share/man/man8/sssd_krb5_locator_plugin.8.gz %%DATADIR%%/dbus-1/system-services/org.freedesktop.sssd.infopipe.service %%DATADIR%%/dbus-1/system.d/org.freedesktop.sssd.infopipe.conf %%DATADIR%%/sssd-kcm/kcm_default_ccache