From: Garming Sam <garming@catalyst.net.nz>
Date: Mon, 19 Sep 2016 01:52:54 +0000 (+1200)
Subject: ms_schema: Allow for CN=X and DC=X replacements
X-Git-Tag: talloc-2.1.11~207
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ed6a3ddb2ac127e086af748710750320d46f13d4;p=thirdparty%2Fsamba.git

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 245ce3f2a60..a9575b089be 100644
--- 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