From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 19 Jun 2010 23:43:51 +0000 (+0200)
Subject: Move convert_to_openldap onto Schema class.
X-Git-Tag: samba-3.6.0pre1~906
X-Git-Url: http://git.samba.org/samba.git/?p=kai%2Fsamba-autobuild%2F.git;a=commitdiff_plain;h=d3d7ff66d4a7952a50e7d9175528985358cb3522

Move convert_to_openldap onto Schema class.
---

diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py
index 25b8ff9c3dd..ca433127ba2 100644
--- a/source4/scripting/python/samba/__init__.py
+++ b/source4/scripting/python/samba/__init__.py
@@ -286,9 +286,6 @@ class Ldb(_Ldb):
     def write_prefixes_from_schema(self):
         dsdb.dsdb_write_prefixes_from_schema_to_ldb(self)
 
-    def convert_schema_to_openldap(self, target, mapping):
-        return dsdb.dsdb_convert_schema_to_openldap(self, target, mapping)
-
 
 def substitute_var(text, values):
     """Substitute strings of the form ${NAME} in str, replacing
diff --git a/source4/scripting/python/samba/provisionbackend.py b/source4/scripting/python/samba/provisionbackend.py
index a40a4b347a6..ccb793f3e5e 100644
--- a/source4/scripting/python/samba/provisionbackend.py
+++ b/source4/scripting/python/samba/provisionbackend.py
@@ -484,7 +484,7 @@ class OpenLDAPBackend(LDAPBackend):
         backend_schema = "backend-schema.schema"
 
         f = open(self.setup_path(mapping), 'r')
-        backend_schema_data = self.schema.ldb.convert_schema_to_openldap(
+        backend_schema_data = self.schema.convert_to_openldap(
                 "openldap", f.read())
         assert backend_schema_data is not None
         f = open(os.path.join(self.ldapdir, backend_schema), 'w')
@@ -686,7 +686,7 @@ class FDSBackend(LDAPBackend):
         backend_schema = "99_ad.ldif"
     
         # Build a schema file in Fedora DS format
-        backend_schema_data = self.schema.ldb.convert_schema_to_openldap("fedora-ds", open(self.setup_path(mapping), 'r').read())
+        backend_schema_data = self.schema.convert_to_openldap("fedora-ds", open(self.setup_path(mapping), 'r').read())
         assert backend_schema_data is not None
         f = open(os.path.join(self.ldapdir, backend_schema), 'w')
         try:
diff --git a/source4/scripting/python/samba/schema.py b/source4/scripting/python/samba/schema.py
index bffb0e53da1..2495cf2e0c9 100644
--- a/source4/scripting/python/samba/schema.py
+++ b/source4/scripting/python/samba/schema.py
@@ -28,6 +28,7 @@ from samba.dcerpc import security
 from samba.ms_schema import read_ms_schema
 from samba.ndr import ndr_pack
 from samba.samdb import SamDB
+from samba import dsdb
 from ldb import SCOPE_SUBTREE, SCOPE_ONELEVEL
 import os
 
@@ -135,6 +136,10 @@ dn: @INDEXLIST
     def dnsyntax_attributes(self):
         return get_dnsyntax_attributes(self.schemadn, self.ldb)
 
+    def convert_to_openldap(self, target, mapping):
+        return dsdb.dsdb_convert_schema_to_openldap(self.ldb, target, mapping)
+
+
 # Return a hash with the forward attribute as a key and the back as the value 
 def get_linked_attributes(schemadn,schemaldb):
     attrs = ["linkID", "lDAPDisplayName"]