From: Amitay Isaacs <amitay@gmail.com>
Date: Thu, 8 Dec 2011 04:41:55 +0000 (+1100)
Subject: samba-tool: Fix DN for GPO entries
X-Git-Url: http://git.samba.org/?p=kai%2Fsamba.git;a=commitdiff_plain;h=0cee9b01d9fbea94868a104d7140463923a3b95e

samba-tool: Fix DN for GPO entries
---

diff --git a/source4/scripting/python/samba/netcmd/gpo.py b/source4/scripting/python/samba/netcmd/gpo.py
index 1a0086c3223..ede28ccb834 100644
--- a/source4/scripting/python/samba/netcmd/gpo.py
+++ b/source4/scripting/python/samba/netcmd/gpo.py
@@ -873,11 +873,8 @@ class cmd_create(Command):
             raise CommandError("Error adding GPO in AD", e)
 
         # Add cn=User,cn=<guid>
-        child_dn = gpo_dn
-        child_dn.add_child(ldb.Dn(self.samdb, "CN=User"))
-
         m = ldb.Message()
-        m.dn = ldb.Dn(self.samdb, child_dn.get_linearized())
+        m.dn = ldb.Dn(self.samdb, "CN=User,%s" % str(gpo_dn))
         m['a01'] = ldb.MessageElement("container", ldb.FLAG_MOD_ADD, "objectClass")
         m['a02'] = ldb.MessageElement("TRUE", ldb.FLAG_MOD_ADD, "showInAdvancedViewOnly")
         try:
@@ -886,11 +883,8 @@ class cmd_create(Command):
             raise CommandError("Error adding GPO in AD", e)
 
         # Add cn=Machine,cn=<guid>
-        child_dn = gpo_dn
-        child_dn.add_child(ldb.Dn(self.samdb, "CN=Machine"))
-
         m = ldb.Message()
-        m.dn = ldb.Dn(self.samdb, child_dn.get_linearized())
+        m.dn = ldb.Dn(self.samdb, "CN=Machine,%s" % str(gpo_dn))
         m['a01'] = ldb.MessageElement("container", ldb.FLAG_MOD_ADD, "objectClass")
         m['a02'] = ldb.MessageElement("TRUE", ldb.FLAG_MOD_ADD, "showInAdvancedViewOnly")
         try: