[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-1201-g7f0341d

Andrew Bartlett abartlet at samba.org
Tue Mar 4 02:47:27 GMT 2008


The branch, v4-0-test has been updated
       via  7f0341dd589150ab01563957460cdcf42515cadc (commit)
       via  cdff1b0802437d713652b89f4522d3cce97c30ec (commit)
       via  1adc74c65a3219fc110964ccdf9a9d60a84831da (commit)
      from  272eb765b81e3eab216a07249334f9b7d20e530b (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit 7f0341dd589150ab01563957460cdcf42515cadc
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Tue Mar 4 13:45:31 2008 +1100

    Try to return sane ldb error strings
    
    We don't just want to return just strerror(ret) when things go wrong.
    
    Andrew Bartlett

commit cdff1b0802437d713652b89f4522d3cce97c30ec
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Tue Mar 4 13:40:50 2008 +1100

    The DN in objectCategory should, if possible, be returned pretty...
    
    This avoids going via the canonicalise_fn(), which will upper case the DN
    
    Andrew Bartlett

commit 1adc74c65a3219fc110964ccdf9a9d60a84831da
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Tue Mar 4 11:27:57 2008 +1100

    Don't hardcode objectCategory into the schema, even in the schema.
    
    We now load the schema early enough that we can generate this too!
    
    Andrew Bartlett

-----------------------------------------------------------------------

Summary of changes:
 source/dsdb/samdb/ldb_modules/normalise.c       |    4 +-
 source/dsdb/samdb/ldb_modules/simple_ldap_map.c |    8 +
 source/lib/ldb/ldb.i                            |   11 +-
 source/setup/schema.ldif                        |  545 -----------------------
 testprogs/ejs/minschema.js                      |    3 -
 5 files changed, 20 insertions(+), 551 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/dsdb/samdb/ldb_modules/normalise.c b/source/dsdb/samdb/ldb_modules/normalise.c
index 695393d..a0eff43 100644
--- a/source/dsdb/samdb/ldb_modules/normalise.c
+++ b/source/dsdb/samdb/ldb_modules/normalise.c
@@ -106,8 +106,8 @@ static int normalise_search_callback(struct ldb_context *ldb, void *context, str
 			continue;
 		}
 		/* Look to see if this attributeSyntax is a DN */
-		if ((strcmp(attribute->attributeSyntax_oid, "2.5.5.1") != 0) &&
-		    (strcmp(attribute->attributeSyntax_oid, "2.5.5.7") != 0)) {
+		if (!((strcmp(attribute->attributeSyntax_oid, "2.5.5.1") == 0) ||
+		      (strcmp(attribute->attributeSyntax_oid, "2.5.5.7") == 0))) {
 			continue;
 		}
 		for (j = 0; j < ares->message->elements[i].num_values; j++) {
diff --git a/source/dsdb/samdb/ldb_modules/simple_ldap_map.c b/source/dsdb/samdb/ldb_modules/simple_ldap_map.c
index 3f4c19d..91896d7 100644
--- a/source/dsdb/samdb/ldb_modules/simple_ldap_map.c
+++ b/source/dsdb/samdb/ldb_modules/simple_ldap_map.c
@@ -153,9 +153,17 @@ static struct ldb_val sid_always_binary(struct ldb_module *module, TALLOC_CTX *c
 /* Ensure we always convert objectCategory into a DN */
 static struct ldb_val objectCategory_always_dn(struct ldb_module *module, TALLOC_CTX *ctx, const struct ldb_val *val)
 {
+	struct ldb_dn *dn;
 	struct ldb_val out = data_blob(NULL, 0);
 	const struct ldb_schema_attribute *a = ldb_schema_attribute_by_name(module->ldb, "objectCategory");
 
+	dn = ldb_dn_new(ctx, module->ldb, val->data);
+	if (dn && ldb_dn_is_valid(dn)) {
+		talloc_free(dn);
+		return val_copy(module, ctx, val);
+	}
+	talloc_free(dn);
+
 	if (a->syntax->canonicalise_fn(module->ldb, ctx, val, &out) != LDB_SUCCESS) {
 		return data_blob(NULL, 0);
 	}
diff --git a/source/lib/ldb/ldb.i b/source/lib/ldb/ldb.i
index da4c52f..0d9679d 100644
--- a/source/lib/ldb/ldb.i
+++ b/source/lib/ldb/ldb.i
@@ -42,6 +42,7 @@ typedef struct ldb_dn ldb_dn;
 typedef struct ldb_ldif ldb_ldif;
 typedef struct ldb_message_element ldb_msg_element;
 typedef int ldb_error;
+typedef int ldb_int_error;
 
 %}
 
@@ -521,6 +522,14 @@ PyObject *PyExc_LdbError;
 
 %typemap(out,noblock=1) ldb_error {
     if ($1 != LDB_SUCCESS) {
+        PyErr_SetObject(PyExc_LdbError, Py_BuildValue((char *)"(i,s)", $1, ldb_errstring(arg1)));
+        SWIG_fail;
+    }
+    $result = Py_None;
+};
+
+%typemap(out,noblock=1) ldb_int_error {
+    if ($1 != LDB_SUCCESS) {
         PyErr_SetObject(PyExc_LdbError, Py_BuildValue((char *)"(i,s)", $1, ldb_strerror($1)));
         SWIG_fail;
     }
@@ -761,4 +770,4 @@ time_t ldb_string_to_time(const char *s);
 }
 
 %rename(register_module) ldb_register_module;
-ldb_error ldb_register_module(const struct ldb_module_ops *);
+ldb_int_error ldb_register_module(const struct ldb_module_ops *);
diff --git a/source/setup/schema.ldif b/source/setup/schema.ldif
index be68ed2..e96cf5f 100644
--- a/source/setup/schema.ldif
+++ b/source/setup/schema.ldif
@@ -14,7 +14,6 @@ schemaIDGUID: c3dbafa6-33df-11d2-98b2-0000f87a57d4
 attributeSecurityGUID: 59ba2f42-79a2-11d0-9020-00c04fc2d3cf
 systemOnly: FALSE
 systemFlags: 134217748
-objectCategory: CN=Attribute-Schema,${SCHEMADN}
 
 dn: CN=ms-Exch-Owner-BL,${SCHEMADN}
 objectClass: top
@@ -33,7 +32,6 @@ lDAPDisplayName: ownerBL
 schemaIDGUID: bf9679f4-0de6-11d0-a285-00aa003049e2
 systemOnly: TRUE
 systemFlags: 17
-objectCategory: CN=Attribute-Schema,${SCHEMADN}
 
 dn: CN=Is-Member-Of-DL,${SCHEMADN}
 objectClass: top
@@ -54,7 +52,6 @@ schemaIDGUID: bf967991-0de6-11d0-a285-00aa003049e2
 attributeSecurityGUID: bc0ac240-79a9-11d0-9020-00c04fc2d4cf
 systemOnly: TRUE
 systemFlags: 17
-objectCategory: CN=Attribute-Schema,${SCHEMADN}
 
 dn: CN=Search-Guide,${SCHEMADN}
 objectClass: top
@@ -72,7 +69,6 @@ lDAPDisplayName: searchGuide
 schemaIDGUID: bf967a2e-0de6-11d0-a285-00aa003049e2
 systemOnly: FALSE
 systemFlags: 16
-objectCategory: CN=Attribute-Schema,${SCHEMADN}
 
 dn: CN=ms-DS-ReplicationEpoch,${SCHEMADN}
 objectClass: top
@@ -89,7 +85,6 @@ lDAPDisplayName: msDS-ReplicationEpoch
 schemaIDGUID: 08e3aa79-eb1c-45b5-af7b-8f94246c8e41
 systemOnly: FALSE
 systemFlags: 17
-objectCategory: CN=Attribute-Schema,${SCHEMADN}
 
 dn: CN=Auditing-Policy,${SCHEMADN}
 objectClass: top
@@ -106,7 +101,6 @@ lDAPDisplayName: auditingPolicy
 schemaIDGUID: 6da8a4fe-0e52-11d0-a286-00aa003049e2
 systemOnly: FALSE
 systemFlags: 16
-objectCategory: CN=Attribute-Schema,${SCHEMADN}
 
 dn: CN=Phone-Fax-Other,${SCHEMADN}
 objectClass: top
@@ -126,7 +120,6 @@ schemaIDGUID: 0296c11d-40da-11d1-a9c0-0000f80367c1
 attributeSecurityGUID: 77b5b886-944a-11d1-aebd-0000f80367c1
 systemOnly: FALSE
 systemFlags: 16
-objectCategory: CN=Attribute-Schema,${SCHEMADN}
 
 dn: CN=Address,${SCHEMADN}
 objectClass: top
@@ -147,7 +140,6 @@ schemaIDGUID: f0f8ff84-1191-11d0-a060-00aa006c33ed
 attributeSecurityGUID: 77b5b886-944a-11d1-aebd-0000f80367c1
 systemOnly: FALSE
 systemFlags: 16
-objectCategory: CN=Attribute-Schema,${SCHEMADN}
 
 dn: CN=Security-Identifier,${SCHEMADN}
 objectClass: top
@@ -165,7 +157,6 @@ schemaIDGUID: bf967a2f-0de6-11d0-a285-00aa003049e2
 systemOnly: FALSE
 systemFlags: 16
 isMemberOfPartialAttributeSet: TRUE
-objectCategory: CN=Attribute-Schema,${SCHEMADN}
 
 dn: CN=ms-DS-KeyVersionNumber,${SCHEMADN}
 objectClass: top
@@ -182,7 +173,6 @@ lDAPDisplayName: msDS-KeyVersionNumber
 schemaIDGUID: c523e9c0-33b5-4ac8-8923-b57b927f42f6
 systemOnly: TRUE
 systemFlags: 20
-objectCategory: CN=Attribute-Schema,${SCHEMADN}
 
 dn: CN=Account-Name-History,${SCHEMADN}
 objectClass: top
@@ -199,7 +189,6 @@ lDAPDisplayName: accountNameHistory
 schemaIDGUID: 031952ec-3b72-11d2-90cc-00c04fd91ab1
 systemOnly: FALSE
 systemFlags: 16
-objectCategory: CN=Attribute-Schema,${SCHEMADN}
 
 dn: CN=preferredLanguage,${SCHEMADN}
 objectClass: top
@@ -216,7 +205,6 @@ lDAPDisplayName: preferredLanguage
 schemaIDGUID: 856be0d0-18e7-46e1-8f5f-7ee4d9020e0d
 systemOnly: FALSE
 systemFlags: 0
-objectCategory: CN=Attribute-Schema,${SCHEMADN}
 
 dn: CN=User-Shared-Folder-Other,${SCHEMADN}
 objectClass: top
@@ -234,7 +222,6 @@ schemaIDGUID: 9a9a0220-4a5b-11d1-a9c3-0000f80367c1
 attributeSecurityGUID: 77b5b886-944a-11d1-aebd-0000f80367c1
 systemOnly: FALSE
 systemFlags: 16
-objectCategory: CN=Attribute-Schema,${SCHEMADN}
 
 dn: CN=User-Shared-Folder,${SCHEMADN}
 objectClass: top
@@ -252,7 +239,6 @@ schemaIDGUID: 9a9a021f-4a5b-11d1-a9c3-0000f80367c1
 attributeSecurityGUID: 77b5b886-944a-11d1-aebd-0000f80367c1
 systemOnly: FALSE
 systemFlags: 16
-objectCategory: CN=Attribute-Schema,${SCHEMADN}
 
 dn: CN=MSMQ-Digests-Mig,${SCHEMADN}
 objectClass: top
@@ -270,7 +256,6 @@ schemaIDGUID: 0f71d8e0-da3b-11d1-90a5-00c04fd91ab1
 systemOnly: FALSE
 systemFlags: 16
 isMemberOfPartialAttributeSet: TRUE
-objectCategory: CN=Attribute-Schema,${SCHEMADN}
 
 dn: CN=Domain-Identifier,${SCHEMADN}
 objectClass: top
@@ -287,7 +272,6 @@ lDAPDisplayName: domainIdentifier
 schemaIDGUID: 7f561278-5301-11d1-a9c5-0000f80367c1
 systemOnly: TRUE
 systemFlags: 16
-objectCategory: CN=Attribute-Schema,${SCHEMADN}
 
 dn: CN=Legacy-Exchange-DN,${SCHEMADN}
 objectClass: top
@@ -306,7 +290,6 @@ attributeSecurityGUID: e48d0154-bcf8-11d1-8702-00c04fb96050
 systemOnly: FALSE
 systemFlags: 16
 isMemberOfPartialAttributeSet: TRUE
-objectCategory: CN=Attribute-Schema,${SCHEMADN}
 
 dn: CN=Well-Known-Objects,${SCHEMADN}
 objectClass: top
@@ -327,7 +310,6 @@ schemaIDGUID: 05308983-7688-11d1-aded-00c04fd8d5cd
 systemOnly: TRUE
 systemFlags: 18
 isMemberOfPartialAttributeSet: TRUE
-objectCategory: CN=Attribute-Schema,${SCHEMADN}
 
 dn: CN=RDN,${SCHEMADN}
 objectClass: top
@@ -349,7 +331,6 @@ attributeSecurityGUID: e48d0154-bcf8-11d1-8702-00c04fb96050
 systemOnly: TRUE
 systemFlags: 18
 isMemberOfPartialAttributeSet: TRUE
-objectCategory: CN=Attribute-Schema,${SCHEMADN}
 
 dn: CN=Non-Security-Member-BL,${SCHEMADN}
 objectClass: top
@@ -368,7 +349,6 @@ lDAPDisplayName: nonSecurityMemberBL
 schemaIDGUID: 52458019-ca6a-11d0-afff-0000f80367c1
 systemOnly: TRUE
 systemFlags: 17
-objectCategory: CN=Attribute-Schema,${SCHEMADN}
 
 dn: CN=ms-DS-Repl-Attribute-Meta-Data,${SCHEMADN}
 objectClass: top
@@ -385,7 +365,6 @@ lDAPDisplayName: msDS-ReplAttributeMetaData
 schemaIDGUID: d7c53242-724e-4c39-9d4c-2df8c9d66c7a
 systemOnly: FALSE
 systemFlags: 20
-objectCategory: CN=Attribute-Schema,${SCHEMADN}
 
 dn: CN=DN-Reference-Update,${SCHEMADN}
 objectClass: top
@@ -403,7 +382,6 @@ lDAPDisplayName: dNReferenceUpdate
 schemaIDGUID: 2df90d86-009f-11d2-aa4c-00c04fd7d83a
 systemOnly: TRUE
 systemFlags: 16
-objectCategory: CN=Attribute-Schema,${SCHEMADN}
 
 dn: CN=GP-Options,${SCHEMADN}
 objectClass: top
@@ -420,7 +398,6 @@ lDAPDisplayName: gPOptions
 schemaIDGUID: f30e3bbf-9ff0-11d1-b603-0000f80367c1
 systemOnly: FALSE
 systemFlags: 16
-objectCategory: CN=Attribute-Schema,${SCHEMADN}
 
 dn: CN=MS-DS-Per-User-Trust-Tombstones-Quota,${SCHEMADN}
 objectClass: top
@@ -437,7 +414,6 @@ lDAPDisplayName: msDS-PerUserTrustTombstonesQuota
 schemaIDGUID: 8b70a6c6-50f9-4fa3-a71e-1ce03040449b
 systemOnly: FALSE
 systemFlags: 16
-objectCategory: CN=Attribute-Schema,${SCHEMADN}
 
 dn: CN=Phone-Pager-Primary,${SCHEMADN}
 objectClass: top
@@ -458,7 +434,6 @@ schemaIDGUID: f0f8ffa6-1191-11d0-a060-00aa006c33ed
 attributeSecurityGUID: 77b5b886-944a-11d1-aebd-0000f80367c1
 systemOnly: FALSE
 systemFlags: 16
-objectCategory: CN=Attribute-Schema,${SCHEMADN}
 
 dn: CN=Site-GUID,${SCHEMADN}
 objectClass: top
@@ -477,7 +452,6 @@ lDAPDisplayName: siteGUID
 schemaIDGUID: 3e978924-8c01-11d0-afda-00c04fd930c9
 systemOnly: FALSE
 systemFlags: 16
-objectCategory: CN=Attribute-Schema,${SCHEMADN}
 
 dn: CN=ms-DS-Az-Script-Engine-Cache-Max,${SCHEMADN}
 objectClass: top
@@ -495,7 +469,6 @@ lDAPDisplayName: msDS-AzScriptEngineCacheMax
 schemaIDGUID: 2629f66a-1f95-4bf3-a296-8e9d7b9e30c8
 systemOnly: FALSE
 systemFlags: 16
-objectCategory: CN=Attribute-Schema,${SCHEMADN}
 
 dn: CN=Token-Groups-No-GC-Acceptable,${SCHEMADN}
 objectClass: top
@@ -513,7 +486,6 @@ schemaIDGUID: 040fc392-33df-11d2-98b2-0000f87a57d4
 attributeSecurityGUID: 037088f8-0ae1-11d2-b422-00a0c968f939
 systemOnly: FALSE
 systemFlags: 134217748
-objectCategory: CN=Attribute-Schema,${SCHEMADN}
 
 dn: CN=Token-Groups-Global-And-Universal,${SCHEMADN}
 objectClass: top
@@ -531,7 +503,6 @@ schemaIDGUID: 46a9b11d-60ae-405a-b7e8-ff8a58d456d2
 attributeSecurityGUID: 037088f8-0ae1-11d2-b422-00a0c968f939
 systemOnly: FALSE
 systemFlags: 134217748
-objectCategory: CN=Attribute-Schema,${SCHEMADN}
 
 dn: CN=Alt-Security-Identities,${SCHEMADN}
 objectClass: top
@@ -550,7 +521,6 @@ attributeSecurityGUID: e48d0154-bcf8-11d1-8702-00c04fb96050
 systemOnly: FALSE
 systemFlags: 18
 isMemberOfPartialAttributeSet: TRUE
-objectCategory: CN=Attribute-Schema,${SCHEMADN}
 
 dn: CN=labeledURI,${SCHEMADN}
 objectClass: top
@@ -567,7 +537,6 @@ lDAPDisplayName: labeledURI
 schemaIDGUID: c569bb46-c680-44bc-a273-e6c227d71b45
 systemOnly: FALSE
 systemFlags: 0
-objectCategory: CN=Attribute-Schema,${SCHEMADN}
 
 dn: CN=Pwd-Last-Set,${SCHEMADN}
 objectClass: top
@@ -585,7 +554,6 @@ schemaIDGUID: bf967a0a-0de6-11d0-a285-00aa003049e2
 attributeSecurityGUID: 4c164200-20c0-11d0-a768-00aa006e0529
 systemOnly: FALSE
 systemFlags: 16
-objectCategory: CN=Attribute-Schema,${SCHEMADN}
 
 dn: CN=Object-Classes,${SCHEMADN}
 objectClass: top
@@ -602,7 +570,6 @@ lDAPDisplayName: objectClasses
 schemaIDGUID: 9a7ad94b-ca53-11d1-bbd0-0080c76670c0
 systemOnly: TRUE
 systemFlags: 134217748
-objectCategory: CN=Attribute-Schema,${SCHEMADN}
 
 dn: CN=Trust-Attributes,${SCHEMADN}
 objectClass: top
@@ -620,7 +587,6 @@ schemaIDGUID: 80a67e5a-9f22-11d0-afdd-00c04fd930c9
 systemOnly: FALSE
 systemFlags: 16
 isMemberOfPartialAttributeSet: TRUE
-objectCategory: CN=Attribute-Schema,${SCHEMADN}
 
 dn: CN=ms-DS-Trust-Forest-Trust-Info,${SCHEMADN}
 objectClass: top
@@ -638,7 +604,6 @@ schemaIDGUID: 29cc866e-49d3-4969-942e-1dbc0925d183
 systemOnly: FALSE
 systemFlags: 16
 isMemberOfPartialAttributeSet: TRUE
-objectCategory: CN=Attribute-Schema,${SCHEMADN}
 
 dn: CN=Site-Object,${SCHEMADN}
 objectClass: top
@@ -657,7 +622,6 @@ lDAPDisplayName: siteObject
 schemaIDGUID: 3e10944c-c354-11d0-aff8-0000f80367c1
 systemOnly: FALSE
 systemFlags: 16
-objectCategory: CN=Attribute-Schema,${SCHEMADN}
 
 dn: CN=Is-Privilege-Holder,${SCHEMADN}
 objectClass: top
@@ -676,7 +640,6 @@ lDAPDisplayName: isPrivilegeHolder
 schemaIDGUID: 19405b9c-3cfa-11d1-a9c0-0000f80367c1
 systemOnly: TRUE
 systemFlags: 17
-objectCategory: CN=Attribute-Schema,${SCHEMADN}
 
 dn: CN=Dns-Root,${SCHEMADN}
 objectClass: top
@@ -695,7 +658,6 @@ lDAPDisplayName: dnsRoot
 schemaIDGUID: bf967959-0de6-11d0-a285-00aa003049e2
 systemOnly: FALSE
 systemFlags: 16
-objectCategory: CN=Attribute-Schema,${SCHEMADN}
 
 dn: CN=Modified-Count,${SCHEMADN}
 objectClass: top
@@ -713,7 +675,6 @@ schemaIDGUID: bf9679c5-0de6-11d0-a285-00aa003049e2
 attributeSecurityGUID: b8119fd0-04f6-4762-ab7a-4986c76b3f9a
 systemOnly: FALSE
 systemFlags: 17
-objectCategory: CN=Attribute-Schema,${SCHEMADN}
 
 dn: CN=International-ISDN-Number,${SCHEMADN}
 objectClass: top
@@ -734,7 +695,6 @@ schemaIDGUID: bf96798d-0de6-11d0-a285-00aa003049e2
 attributeSecurityGUID: 77b5b886-944a-11d1-aebd-0000f80367c1
 systemOnly: FALSE
 systemFlags: 16
-objectCategory: CN=Attribute-Schema,${SCHEMADN}
 
 dn: CN=Business-Category,${SCHEMADN}
 objectClass: top
@@ -754,7 +714,6 @@ lDAPDisplayName: businessCategory
 schemaIDGUID: bf967931-0de6-11d0-a285-00aa003049e2
 systemOnly: FALSE
 systemFlags: 16
-objectCategory: CN=Attribute-Schema,${SCHEMADN}
 
 dn: CN=houseIdentifier,${SCHEMADN}
 objectClass: top
@@ -772,7 +731,6 @@ searchFlags: 0
 lDAPDisplayName: houseIdentifier
 schemaIDGUID: a45398b7-c44a-4eb6-82d3-13c10946dbfe
 systemOnly: FALSE
-objectCategory: CN=Attribute-Schema,${SCHEMADN}
 
 dn: CN=Other-Name,${SCHEMADN}
 objectClass: top
@@ -791,7 +749,6 @@ lDAPDisplayName: middleName
 schemaIDGUID: bf9679f2-0de6-11d0-a285-00aa003049e2
 systemOnly: FALSE
 systemFlags: 16
-objectCategory: CN=Attribute-Schema,${SCHEMADN}
 
 dn: CN=Attribute-ID,${SCHEMADN}
 objectClass: top
@@ -808,7 +765,6 @@ lDAPDisplayName: attributeID
 schemaIDGUID: bf967922-0de6-11d0-a285-00aa003049e2
 systemOnly: TRUE
 systemFlags: 16
-objectCategory: CN=Attribute-Schema,${SCHEMADN}
 
 dn: CN=Repl-Topology-Stay-Of-Execution,${SCHEMADN}
 objectClass: top
@@ -825,7 +781,6 @@ lDAPDisplayName: replTopologyStayOfExecution
 schemaIDGUID: 7bfdcb83-4807-11d1-a9c3-0000f80367c1
 systemOnly: FALSE
 systemFlags: 16
-objectCategory: CN=Attribute-Schema,${SCHEMADN}
 
 dn: CN=Netboot-GUID,${SCHEMADN}
 objectClass: top
@@ -845,7 +800,6 @@ schemaIDGUID: 3e978921-8c01-11d0-afda-00c04fd930c9
 systemOnly: FALSE
 systemFlags: 16
 isMemberOfPartialAttributeSet: TRUE
-objectCategory: CN=Attribute-Schema,${SCHEMADN}
 
 dn: CN=RDN-Att-ID,${SCHEMADN}
 objectClass: top
@@ -862,7 +816,6 @@ lDAPDisplayName: rDNAttID
 schemaIDGUID: bf967a0f-0de6-11d0-a285-00aa003049e2
 systemOnly: TRUE
 systemFlags: 16
-objectCategory: CN=Attribute-Schema,${SCHEMADN}
 
 dn: CN=May-Contain,${SCHEMADN}
 objectClass: top
@@ -879,7 +832,6 @@ lDAPDisplayName: mayContain
 schemaIDGUID: bf9679bf-0de6-11d0-a285-00aa003049e2
 systemOnly: FALSE
 systemFlags: 16
-objectCategory: CN=Attribute-Schema,${SCHEMADN}
 
 dn: CN=Trust-Auth-Outgoing,${SCHEMADN}
 objectClass: top
@@ -898,7 +850,6 @@ lDAPDisplayName: trustAuthOutgoing
 schemaIDGUID: bf967a5f-0de6-11d0-a285-00aa003049e2
 systemOnly: FALSE
 systemFlags: 16
-objectCategory: CN=Attribute-Schema,${SCHEMADN}
 
 dn: CN=GPC-WQL-Filter,${SCHEMADN}
 objectClass: top
@@ -915,7 +866,6 @@ lDAPDisplayName: gPCWQLFilter
 schemaIDGUID: 7bd4c7a6-1add-4436-8c04-3999a880154c
 systemOnly: FALSE
 systemFlags: 16
-objectCategory: CN=Attribute-Schema,${SCHEMADN}
 
 dn: CN=Server-Reference-BL,${SCHEMADN}
 objectClass: top
@@ -934,7 +884,6 @@ lDAPDisplayName: serverReferenceBL
 schemaIDGUID: 26d9736e-6070-11d1-a9c6-0000f80367c1
 systemOnly: TRUE
 systemFlags: 17
-objectCategory: CN=Attribute-Schema,${SCHEMADN}
 
 dn: CN=Create-Time-Stamp,${SCHEMADN}
 objectClass: top
@@ -951,7 +900,6 @@ lDAPDisplayName: createTimeStamp
 schemaIDGUID: 2df90d73-009f-11d2-aa4c-00c04fd7d83a
 systemOnly: TRUE
 systemFlags: 134217748
-objectCategory: CN=Attribute-Schema,${SCHEMADN}
 
 dn: CN=Attribute-Display-Names,${SCHEMADN}
 objectClass: top
@@ -968,7 +916,6 @@ lDAPDisplayName: attributeDisplayNames
 schemaIDGUID: cb843f80-48d9-11d1-a9c3-0000f80367c1
 systemOnly: FALSE
 systemFlags: 16
-objectCategory: CN=Attribute-Schema,${SCHEMADN}
 
 dn: CN=Admin-Context-Menu,${SCHEMADN}
 objectClass: top
@@ -985,7 +932,6 @@ lDAPDisplayName: adminContextMenu
 schemaIDGUID: 553fd038-f32e-11d0-b0bc-00c04fd8dca6


-- 
Samba Shared Repository


More information about the samba-cvs mailing list