[SCM] Samba Shared Repository - branch master updated

[Ralph Böhme]

The branch, master has been updated
       via  f99fb9aa120 python:tests: Allocate OID range for testing to avoid collisions
       via  672ec6135f9 schema_samba4.ldif: Allocate previously added OIDs
      from  6d493a9d568 smbd: implement access checks for SMB2-GETINFO as per MS-SMB2 3.3.5.20.1

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


- Log -----------------------------------------------------------------
commit f99fb9aa120c5a7d499bff717b812d81ddd7e9f1
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date:   Thu Aug 25 20:21:01 2022 +1200

    python:tests: Allocate OID range for testing to avoid collisions
    
    sid_strings.py used the same OID range as ldap_schema.py, which
    occasionally led to test failures when the same OID was generated twice.
    Using a different range, and making use of the expected RID if we have
    it, should reduce the likelihood of collisions.
    
    Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
    Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>
    
    Autobuild-User(master): Ralph Böhme <slow at samba.org>
    Autobuild-Date(master): Thu Aug 25 13:55:47 UTC 2022 on sn-devel-184

commit 672ec6135f9ae3d7b5439523a4f456c19fb03a88
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date:   Thu Aug 25 20:15:33 2022 +1200

    schema_samba4.ldif: Allocate previously added OIDs
    
    DSDB_CONTROL_FORCE_ALLOW_VALIDATED_DNS_HOSTNAME_SPN_WRITE_OID was added
    to source4/dsdb/samdb/samdb.h in commit
    c2ab1f4696fa3f52918a126d0b37993a07f68bcb.
    
    DSDB_EXTENDED_SCHEMA_LOAD was added in commit
    1fd4cdfafaa6a41c824d1b3d76635bf3e446de0f.
    
    Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
    Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>

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

Summary of changes:
 python/samba/tests/sid_strings.py | 8 +++++++-
 source4/setup/schema_samba4.ldif  | 3 +++
 2 files changed, 10 insertions(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/python/samba/tests/sid_strings.py b/python/samba/tests/sid_strings.py
index ece35c12bfc..71b7756d235 100644
--- a/python/samba/tests/sid_strings.py
+++ b/python/samba/tests/sid_strings.py
@@ -88,11 +88,17 @@ class SidStringTests(TestCase):
 
         class_dn = f'CN={class_name},{self.schema_dn}'
 
+        governs_id = f'1.3.6.1.4.1.7165.4.6.2.9.{random_suffix}'
+        if expected_sid is not None:
+            # Append the RID to our OID to ensure more uniqueness.
+            rid = expected_sid.rsplit('-', 1)[1]
+            governs_id += f'.{rid}'
+
         ldif = f'''
 dn: {class_dn}
 objectClass: classSchema
 cn: {class_name}
-governsId: 1.3.6.1.4.1.7165.4.6.2.6.3.{random_suffix}
+governsId: {governs_id}
 subClassOf: top
 possSuperiors: domainDNS
 defaultSecurityDescriptor: O:{code}
diff --git a/source4/setup/schema_samba4.ldif b/source4/setup/schema_samba4.ldif
index a31b67750d4..d3a1f1c9ad7 100644
--- a/source4/setup/schema_samba4.ldif
+++ b/source4/setup/schema_samba4.ldif
@@ -32,6 +32,7 @@
 ## 1.3.6.1.4.1.7165.4.6.2.6.x - ldap_schema.py
 ## 1.3.6.1.4.1.7165.4.6.2.7.x - dsdb_schema_info.py
 ## 1.3.6.1.4.1.7165.4.6.2.8.x - getnc_schema.py
+## 1.3.6.1.4.1.7165.4.6.2.9.x - sid_strings.py
 
 ## 1.3.6.1.4.1.7165.4.255.x - mapped OIDs due to conflicts between AD and standards-track
 #
@@ -231,6 +232,7 @@
 #Allocated: DSDB_CONTROL_INVALID_NOT_IMPLEMENTED 1.3.6.1.4.1.7165.4.3.32
 #Allocated: DSDB_CONTROL_PASSWORD_ACL_VALIDATION_OID 1.3.6.1.4.1.7165.4.3.33
 #Allocated: DSDB_CONTROL_TRANSACTION_IDENTIFIER_OID 1.3.6.1.4.1.7165.4.3.34
+#Allocated: DSDB_CONTROL_FORCE_ALLOW_VALIDATED_DNS_HOSTNAME_SPN_WRITE_OID 1.3.6.1.4.1.7165.4.3.35
 
 
 # Extended 1.3.6.1.4.1.7165.4.4.x
@@ -243,6 +245,7 @@
 #Allocated: DSDB_EXTENDED_SEC_DESC_PROPAGATION_OID 1.3.6.1.4.1.7165.4.4.7
 #Allocated: DSDB_EXTENDED_CREATE_OWN_RID_SET 1.3.6.1.4.1.7165.4.4.8
 #Allocated: DSDB_EXTENDED_ALLOCATE_RID 1.3.6.1.4.1.7165.4.4.9
+#Allocated: DSDB_EXTENDED_SCHEMA_LOAD 1.3.6.1.4.1.7165.4.4.10
 
 
 ############


-- 
Samba Shared Repository