[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  dcdc9859b90 gpo: Halt Cert Auto Enroll process if data corrupted
       via  144878ce45c gpo: Supress error caused by ldap Cert Auto Enroll config
      from  c4e576052fa s4-samr: Fix missing check for GnuTLS errors from E_old_pw_hash()

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit dcdc9859b90132795e0a266c8722e09d02cf6be2
Author: David Mulder <dmulder at suse.com>
Date:   Fri May 6 09:46:44 2022 -0600

    gpo: Halt Cert Auto Enroll process if data corrupted
    
    If the CA URL cannot be processed, then halt
    processing. Otherwise we'll end up in a broken
    state later when trying to read from the end
    points with missing data.
    
    Signed-off-by: David Mulder <dmulder at suse.com>
    Revewed-by: Andreas Schneider <asn at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Thu May 12 18:45:41 UTC 2022 on sn-devel-184

commit 144878ce45cad445f04ff180d647317b67c0a2e6
Author: David Mulder <dmulder at suse.com>
Date:   Fri May 6 09:41:19 2022 -0600

    gpo: Supress error caused by ldap Cert Auto Enroll config
    
    When the CA url specified on the SYSVOL is 'LDAP:'
    this means that configuration should be fetched
    from LDAP. This corrects an error message that
    was being reported when the URL appeared improper
    but really is not. This does not change the
    code behavior (it was still working), but
    removes the invalid error.
    
    Signed-off-by: David Mulder <dmulder at suse.com>
    Revewed-by: Andreas Schneider <asn at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 python/samba/gp_cert_auto_enroll_ext.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/python/samba/gp_cert_auto_enroll_ext.py b/python/samba/gp_cert_auto_enroll_ext.py
index e6c40462d33..7b604e5065d 100644
--- a/python/samba/gp_cert_auto_enroll_ext.py
+++ b/python/samba/gp_cert_auto_enroll_ext.py
@@ -116,9 +116,10 @@ def obtain_end_point_information(entries):
             ca['name'] = name
             ca['hostname'] = m.group('server')
             ca['auth'] = m.group('auth')
-        else:
+        elif ca['URL'].lower() != 'ldap:':
             edata = { 'endpoint': ca['URL'] }
             log.error('Failed to parse the endpoint', edata)
+            return {}
     end_point_information = \
         group_and_sort_end_point_information(end_point_information.values())
     return end_point_information


-- 
Samba Shared Repository