summaryrefslogtreecommitdiff
path: root/source4/scripting/bin/minschema
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2009-03-20 13:55:43 +1100
committerAndrew Bartlett <abartlet@samba.org>2009-03-20 16:28:41 +1100
commit5bfed623f5115a774f47e1cdceed862c53cd40a1 (patch)
tree1ac93daef2e8cc79a54f11266b933e7873552bca /source4/scripting/bin/minschema
parent6906c01cac226db508cd56a31b751eee3ac62bc9 (diff)
downloadsamba-5bfed623f5115a774f47e1cdceed862c53cd40a1.tar.gz
samba-5bfed623f5115a774f47e1cdceed862c53cd40a1.tar.bz2
samba-5bfed623f5115a774f47e1cdceed862c53cd40a1.zip
s4:minschma Fix aggregate schema generation in minschema
The conversion from EJS to python I did with Jelmer this morning was not quite complete, due mostly to the difference between print in EJS and python (python implies a newline). Andrew Bartlett
Diffstat (limited to 'source4/scripting/bin/minschema')
-rwxr-xr-xsource4/scripting/bin/minschema47
1 files changed, 23 insertions, 24 deletions
diff --git a/source4/scripting/bin/minschema b/source4/scripting/bin/minschema
index f2dfdcb564..4983502ba7 100755
--- a/source4/scripting/bin/minschema
+++ b/source4/scripting/bin/minschema
@@ -405,40 +405,40 @@ def attribute_list(objectclass, attr1, attr2):
def aggregate_list(name, list):
"""write out a list in aggregate form"""
- if list is None:
- return
- print "%s ( %s )" % (name, "$ ".join(list))
+ if list == []:
+ return ""
+ return " %s ( %s )" % (name, " $ ".join(list))
def write_aggregate_objectclass(objectclass):
"""write the aggregate record for an objectclass"""
- print "objectClasses: ( %s NAME '%s' " % (objectclass["governsID"], objectclass.name),
+ line = "objectClasses: ( %s NAME '%s' " % (objectclass["governsID"], objectclass.name)
if not objectclass.has_key('subClassOf'):
- print "SUP %s " % objectclass['subClassOf'],
+ line += "SUP %s" % objectclass['subClassOf']
if objectclass["objectClassCategory"] == 1:
- print "STRUCTURAL ",
+ line += "STRUCTURAL"
elif objectclass["objectClassCategory"] == 2:
- print "ABSTRACT ",
+ line += "ABSTRACT"
elif objectclass["objectClassCategory"] == 3:
- print "AUXILIARY ",
+ line += "AUXILIARY"
list = attribute_list(objectclass, "systemMustContain", "mustContain")
- aggregate_list("MUST", list)
+ line += aggregate_list("MUST", list)
list = attribute_list(objectclass, "systemMayContain", "mayContain")
- aggregate_list("MAY", list)
+ line += aggregate_list("MAY", list)
- print ")"
+ print line + " )"
def write_aggregate_ditcontentrule(objectclass):
"""write the aggregate record for an ditcontentrule"""
list = attribute_list(objectclass, "auxiliaryClass", "systemAuxiliaryClass")
- if list is None:
+ if list == []:
return
- print "dITContentRules: ( %s NAME '%s' " % (objectclass["governsID"], objectclass.name)
+ line = "dITContentRules: ( %s NAME '%s'" % (objectclass["governsID"], objectclass.name)
- aggregate_list("AUX", list)
+ line += aggregate_list("AUX", list)
may_list = []
must_list = []
@@ -451,31 +451,30 @@ def write_aggregate_ditcontentrule(objectclass):
"mustContain", "systemMustContain")
must_list = must_list + list2
- aggregate_list("MUST", must_list)
- aggregate_list("MAY", may_list)
+ line += aggregate_list("MUST", must_list)
+ line += aggregate_list("MAY", may_list)
- print ")\n"
+ print line + " )"
def write_aggregate_attribute(attrib):
"""write the aggregate record for an attribute"""
- print "attributeTypes: ( %s NAME '%s' SYNTAX '%s' " % (
+ line = "attributeTypes: ( %s NAME '%s' SYNTAX '%s' " % (
attrib["attributeID"], attrib.name,
map_attribute_syntax(attrib["attributeSyntax"]))
if attrib.get('isSingleValued') == "TRUE":
- print "SINGLE-VALUE "
+ line += "SINGLE-VALUE "
if attrib.get('systemOnly') == "TRUE":
- print "NO-USER-MODIFICATION "
+ line += "NO-USER-MODIFICATION "
- print ")\n"
+ print line + ")"
def write_aggregate():
"""write the aggregate record"""
- print "dn: CN=Aggregate,${SCHEMADN}\n"
+ print "dn: CN=Aggregate,${SCHEMADN}"
print """objectClass: top
objectClass: subSchema
-objectCategory: CN=SubSchema,${SCHEMADN}
-"""
+objectCategory: CN=SubSchema,${SCHEMADN}"""
if not opts.dump_subschema_auto:
return