ms_schema: Allow for CN=X and DC=X replacements

These occur in the newer 2012 and 2016 schemas.

Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/python/samba/ms_schema.py b/python/samba/ms_schema.py
index 245ce3f2a60832e89d6ff54498245f42c0c794eb..a9575b089bee6b85087fd43434ba62010aeac911 100644 (file)
--- a/python/samba/ms_schema.py
+++ b/python/samba/ms_schema.py
@@ -162,6 +162,10 @@ def fix_dn(dn):
         dn = dn.replace("\n ", "")
         dn = dn.replace(" ", "")
         return dn.replace("CN=Schema,CN=Configuration,<RootDomainDN>", "${SCHEMADN}")
+    elif dn.endswith("DC=X"):
+        return dn.replace("CN=Schema,CN=Configuration,DC=X", "${SCHEMADN}")
+    elif dn.endswith("CN=X"):
+        return dn.replace("CN=Schema,CN=Configuration,CN=X", "${SCHEMADN}")
     else:
         return dn