s4:dsdb:tests: Use sAMAccountName GUID constant

Signed-off-by: Jennifer Sutton <jennifersutton@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>

diff --git a/libds/common/flags.h b/libds/common/flags.h
index e8e5d625b5e9cc96bd63abc9a5cab5a8ffaf4f66..5e9a2364535d678b19b538577eea84cd8bcaa8ba 100644 (file)
--- a/libds/common/flags.h
+++ b/libds/common/flags.h
@@ -245,6 +245,7 @@
 #define DS_GUID_SCHEMA_ATTR_MS_SFU_30                 "16c5d1d3-35c2-4061-a870-a5cefda804f0"
 #define DS_GUID_SCHEMA_ATTR_NT_SECURITY_DESCRIPTOR    "bf9679e3-0de6-11d0-a285-00aa003049e2"
 #define DS_GUID_SCHEMA_ATTR_PRIMARY_GROUP_ID          "bf967a00-0de6-11d0-a285-00aa003049e2"
+#define DS_GUID_SCHEMA_ATTR_SAM_ACCOUNT_NAME          "3e0abfd0-126a-11d0-a060-00aa006c33ed"
 #define DS_GUID_SCHEMA_ATTR_SERVICE_PRINCIPAL_NAME    "f3a64788-5306-11d1-a9c5-0000f80367c1"
 #define DS_GUID_SCHEMA_ATTR_USER_ACCOUNT_CONTROL      "bf967a68-0de6-11d0-a285-00aa003049e2"
 #define DS_GUID_SCHEMA_ATTR_USER_PASSWORD             "bf967a6e-0de6-11d0-a285-00aa003049e2"

diff --git a/source4/dsdb/pydsdb.c b/source4/dsdb/pydsdb.c
index 5c943c8893b8a118e40489b74666401e7dbbe70c..3c010afdd4e7387efb9bfce5ea59ca5a14aea392 100644 (file)
--- a/source4/dsdb/pydsdb.c
+++ b/source4/dsdb/pydsdb.c
@@ -2072,6 +2072,7 @@ MODULE_INIT_FUNC(dsdb)
        ADD_DSDB_STRING(DS_GUID_SCHEMA_ATTR_MS_SFU_30);
        ADD_DSDB_STRING(DS_GUID_SCHEMA_ATTR_NT_SECURITY_DESCRIPTOR);
        ADD_DSDB_STRING(DS_GUID_SCHEMA_ATTR_PRIMARY_GROUP_ID);
+       ADD_DSDB_STRING(DS_GUID_SCHEMA_ATTR_SAM_ACCOUNT_NAME);
        ADD_DSDB_STRING(DS_GUID_SCHEMA_ATTR_SERVICE_PRINCIPAL_NAME);
        ADD_DSDB_STRING(DS_GUID_SCHEMA_ATTR_USER_ACCOUNT_CONTROL);
        ADD_DSDB_STRING(DS_GUID_SCHEMA_ATTR_USER_PASSWORD);

diff --git a/source4/dsdb/tests/python/acl.py b/source4/dsdb/tests/python/acl.py
index cc2b31ce753461ca6d2fa74fa36740e62831d4a9..fed603b175cf3fb502a95f93ac80c0c739b7adcb 100755 (executable)
--- a/source4/dsdb/tests/python/acl.py
+++ b/source4/dsdb/tests/python/acl.py
@@ -3723,7 +3723,7 @@ Member: CN=test_modify_user2,CN=Users,""" + self.base_dn
 
         self.ldb_admin.create_ou(ou_dn)
 
-        sam_account_name = '3e0abfd0-126a-11d0-a060-00aa006c33ed'
+        sam_account_name = samba.dsdb.DS_GUID_SCHEMA_ATTR_SAM_ACCOUNT_NAME
 
         # Grant Write Property.
         mod = (f'(OA;CI;WP;{sam_account_name};;'
@@ -3776,7 +3776,7 @@ Member: CN=test_modify_user2,CN=Users,""" + self.base_dn
 
         self.ldb_admin.create_ou(ou_dn)
 
-        sam_account_name = '3e0abfd0-126a-11d0-a060-00aa006c33ed'
+        sam_account_name = samba.dsdb.DS_GUID_SCHEMA_ATTR_SAM_ACCOUNT_NAME
 
         # Grant Write Property.
         mod = (f'(OA;CI;WP;{sam_account_name};;'