r19310: Add another conflicting oid

Cope with there being no attributes to skip in the ad2oLscheam tool

Andrew Bartlett
(This used to be commit 942d7ad0c3534770ad05977b180e1c8111a5b6a6)

diff --git a/source4/lib/ldb/tools/ad2oLschema.c b/source4/lib/ldb/tools/ad2oLschema.c
index 8b1203bff018884b096180d2329fb9a9f9f3a75d..62c6e01c2e277e5cf1824bf320473fbae02e36e0 100644 (file)
--- a/source4/lib/ldb/tools/ad2oLschema.c
+++ b/source4/lib/ldb/tools/ad2oLschema.c
@@ -330,7 +330,7 @@ static struct schema_conv process_convert(struct ldb_context *ldb, enum convert_
                int j;
 
                /* We have been asked to skip some attributes/objectClasses */
-               if (str_list_check_ci(attrs_skip, name)) {
+               if (attrs_skip && str_list_check_ci(attrs_skip, name)) {
                        ret.skipped++;
                        continue;
                }
@@ -436,7 +436,7 @@ static struct schema_conv process_convert(struct ldb_context *ldb, enum convert_
                int j;
 
                /* We have been asked to skip some attributes/objectClasses */
-               if (str_list_check_ci(attrs_skip, name)) {
+               if (attrs_skip && str_list_check_ci(attrs_skip, name)) {
                        ret.skipped++;
                        continue;
                }

diff --git a/source4/setup/schema-map-openldap-2.3 b/source4/setup/schema-map-openldap-2.3
index 485b58a44a51049a8018f468fce08af2b98ccce6..bb6aabd4cadcab7a181fba9252c27099d2229e34 100644 (file)
--- a/source4/setup/schema-map-openldap-2.3
+++ b/source4/setup/schema-map-openldap-2.3
@@ -21,6 +21,8 @@ subSchema
 #
 #MiddleName has a conflicting OID
 2.16.840.1.113730.3.1.34:1.3.6.1.4.1.7165.4.1.8
+#defaultGroup has a conflicting OID
+1.2.840.113556.1.4.480:1.3.6.1.4.1.7165.4.1.11
 #This large integer format is unimplemented in OpenLDAP 2.3
 1.2.840.113556.1.4.906:1.3.6.1.4.1.1466.115.121.1.27
 #This case insensitive string isn't available