[SCM] Samba Shared Repository - branch master updated

David Mulder dmulder at samba.org
Thu May 26 19:37:01 UTC 2022


The branch, master has been updated
       via  5e00c230ec8 py:gpo: Fix testing of 0x8000 bit
      from  37c6a327ed7 [ci-images] remove use of sudo in image building smoke test

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


- Log -----------------------------------------------------------------
commit 5e00c230ec8d37044205a16c3a6ceaa64de382d0
Author: Pavel Filipenský <pfilipen at redhat.com>
Date:   Thu May 26 15:38:23 2022 +0200

    py:gpo: Fix testing of 0x8000 bit
    
    Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
    Reviewed-by: David Mulder <dmulder at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>
    
    Autobuild-User(master): David Mulder <dmulder at samba.org>
    Autobuild-Date(master): Thu May 26 19:36:52 UTC 2022 on sn-devel-184

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

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


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 585dc560550..fe86d7f3428 100644
--- a/python/samba/gp_cert_auto_enroll_ext.py
+++ b/python/samba/gp_cert_auto_enroll_ext.py
@@ -356,7 +356,7 @@ class gp_cert_auto_enroll_ext(gp_pol_ext):
                 for e in pol_conf.entries:
                     if e.keyname == section and e.valuename == 'AEPolicy':
                         # This policy applies as specified in [MS-CAESO] 4.4.5.1
-                        if e.data == 0x8000:
+                        if e.data & 0x8000:
                             continue # The policy is disabled
                         enroll = e.data & 0x1 == 0x1
                         manage = e.data & 0x2 == 0x2
@@ -462,8 +462,8 @@ class gp_cert_auto_enroll_ext(gp_pol_ext):
                 return output
             for e in pol_conf.entries:
                 if e.keyname == section and e.valuename == 'AEPolicy':
-                    enroll = e.data & 0x1 == 1
-                    if e.data == 0x8000 or not enroll:
+                    enroll = e.data & 0x1 == 0x1
+                    if e.data & 0x8000 or not enroll:
                         continue
                     output['Auto Enrollment Policy'] = {}
                     url = 'ldap://%s' % get_dc_hostname(self.creds, self.lp)


-- 
Samba Shared Repository



More information about the samba-cvs mailing list