Remove DESCRIPTION from generated schema lines.
[kai/samba.git] / source4 / dsdb / schema / schema_description.c
index e152f44b9751d7785d19ed54e32938d94fa6431a..c3c37b46533320b56bb2e4ebcb8f6f68c6843aa8 100644 (file)
@@ -33,7 +33,6 @@ char *schema_attribute_description(TALLOC_CTX *mem_ctx,
                                          const char *seperator,
                                          const char *oid, 
                                          const char *name,
-                                         const char *description,
                                          const char *equality, 
                                          const char *substring, 
                                          const char *syntax,
@@ -46,15 +45,6 @@ char *schema_attribute_description(TALLOC_CTX *mem_ctx,
                                              "NAME '%s'%s", name, seperator);
        IF_NULL_FAIL_RET(schema_entry);
        
-       if (description) {
-#if 0          
-               /* Need a way to escape ' characters from the description */
-               schema_entry = talloc_asprintf_append(schema_entry, 
-                                                     "DESC '%s'%s", description, seperator);
-               IF_NULL_FAIL_RET(schema_entry);
-#endif
-       }
-
        if (equality) {
                schema_entry = talloc_asprintf_append(schema_entry, 
                                                      "EQUALITY %s%s", equality, seperator);
@@ -104,7 +94,7 @@ char *schema_attribute_to_description(TALLOC_CTX *mem_ctx, const struct dsdb_att
                                               " ",
                                               attribute->attributeID_oid,
                                               attribute->lDAPDisplayName,
-                                              NULL, NULL, NULL, talloc_asprintf(tmp_ctx, "'%s'", syntax),
+                                              NULL, NULL, talloc_asprintf(tmp_ctx, "'%s'", syntax),
                                               attribute->isSingleValued,
                                               attribute->systemOnly);
        talloc_free(tmp_ctx);
@@ -149,7 +139,6 @@ char *schema_class_description(TALLOC_CTX *mem_ctx,
                               const char *oid, 
                               const char *name,
                               const char **auxillary_classes,
-                              const char *description,
                               const char *subClassOf,
                               int objectClassCategory,
                               char **must,
@@ -164,12 +153,6 @@ char *schema_class_description(TALLOC_CTX *mem_ctx,
                                              "NAME '%s'%s", name, seperator);
        IF_NULL_FAIL_RET(schema_entry);
        
-       if (description) {
-               schema_entry = talloc_asprintf_append(schema_entry, 
-                                                     "DESC '%s'%s", description, seperator);
-               IF_NULL_FAIL_RET(schema_entry);
-       }
-
        if (auxillary_classes) {
                schema_entry = talloc_asprintf_append(schema_entry, 
                                                      "AUX ( ");
@@ -262,7 +245,6 @@ char *schema_class_to_description(TALLOC_CTX *mem_ctx, const struct dsdb_class *
                                           " ",
                                           class->governsID_oid,
                                           class->lDAPDisplayName,
-                                          NULL,
                                           NULL, 
                                           class->subClassOf,
                                           class->objectClassCategory,
@@ -308,7 +290,6 @@ char *schema_class_to_dITContentRule(TALLOC_CTX *mem_ctx, const struct dsdb_clas
                                           class->governsID_oid,
                                           class->lDAPDisplayName,
                                           (const char **)aux_class_list,
-                                          NULL, 
                                           NULL, /* Must not specify a
                                                  * SUP (subclass) in
                                                  * ditContentRules