From 6dfb09c5a5b85fa7fce85b518cc2a6ee008b0bbd Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 2 Nov 2005 02:32:25 +0000
Subject: r11463: more progress on the schema generator. mmc now accepts all
 parts except the attributeTypes fields of the Aggregrate record. Proxying
 just that field and the display specifiers gives us a working mmc client

hopefully i'll work out what it doesn't like about the attributeTypes
field soon
(This used to be commit 3af867a3f4a5fd702089400d1687e2aff017f48a)
---
 testprogs/ejs/minschema.js | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

(limited to 'testprogs/ejs')

diff --git a/testprogs/ejs/minschema.js b/testprogs/ejs/minschema.js
index b2daea51c4..7d82240745 100755
--- a/testprogs/ejs/minschema.js
+++ b/testprogs/ejs/minschema.js
@@ -46,7 +46,8 @@ class_attrs = new Array("objectClass",
 			"objectClassCategory", "subClassOf", 
 			"defaultObjectCategory", "defaultHidingValue", 
 			"systemFlags", "systemOnly", "defaultSecurityDescriptor",
-			"objectCategory");
+			"objectCategory", "possibleInferiors", "displaySpecification",
+			"schemaIDGUID");
 
 attrib_attrs = new Array("objectClass", "lDAPDisplayName", 
 			 "isSingleValued", "linkID", "systemFlags", "systemOnly",
@@ -91,6 +92,24 @@ function obj_attribute(name) {
 }
 
 
+syntaxmap = new Object();
+syntaxmap['2.5.5.9']  = '1.3.6.1.4.1.1466.115.121.1.27';
+syntaxmap['2.5.5.10'] = '1.3.6.1.4.1.1466.115.121.1.40';
+syntaxmap['2.5.5.11'] = '1.3.6.1.4.1.1466.115.121.1.24';
+syntaxmap['2.5.5.12'] = '1.3.6.1.4.1.1466.115.121.1.15';
+
+/*
+  map some attribute syntaxes from some apparently MS specific
+  syntaxes to the standard syntaxes
+*/
+function map_attribute_syntax(s) {
+	if (syntaxmap[s] != undefined) {
+		return syntaxmap[s];
+	}
+	return s;
+}
+
+
 /*
   fix a string DN to use ${BASEDN}
 */
@@ -108,6 +127,7 @@ function fix_dn(dn) {
 function write_ldif_one(o, attrs) {
 	var i;
 	printf("dn: CN=%s,CN=Schema,CN=Configuration,${BASEDN}\n", o.name);
+	printf("cn: %s\n", o.name);
 	printf("name: %s\n", o.name);
 	for (i=0;i<attrs.length;i++) {
 		var a = attrs[i];
@@ -476,7 +496,8 @@ function write_aggregate_ditcontentrule(class) {
 */
 function write_aggregate_attribute(attrib) {
 	printf("attributeTypes: ( %s NAME '%s' SYNTAX '%s' ", 
-	       attrib.attributeID, attrib.name, attrib.attributeSyntax);
+	       attrib.attributeID, attrib.name, 
+	       map_attribute_syntax(attrib.attributeSyntax));
 	if (attrib['isSingleValued'] == "TRUE") {
 		printf("SINGLE-VALUE ");
 	}
@@ -492,7 +513,6 @@ function write_aggregate() {
 	print("objectClass: top
 objectClass: subSchema
 cn: Aggregate
-distinguishedName: CN=Aggregate,CN=Schema,CN=Configuration,${BASEDN}
 instanceType: 4
 name: Aggregate
 objectCategory: CN=SubSchema,CN=Schema,CN=Configuration,${BASEDN}
-- 
cgit