summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2006-10-16 01:36:22 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:21:06 -0500
commite0294c9f66ef328e3d8dc62494f681a767c673be (patch)
treed7e66abf372a90d68fc85cb833e21b1f220b3ea3
parent2ac52f809afcd85ee7ed80bbac64594f1e780942 (diff)
downloadsamba-e0294c9f66ef328e3d8dc62494f681a767c673be.tar.gz
samba-e0294c9f66ef328e3d8dc62494f681a767c673be.tar.bz2
samba-e0294c9f66ef328e3d8dc62494f681a767c673be.zip
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)
-rw-r--r--source4/lib/ldb/tools/ad2oLschema.c4
-rw-r--r--source4/setup/schema-map-openldap-2.32
2 files changed, 4 insertions, 2 deletions
diff --git a/source4/lib/ldb/tools/ad2oLschema.c b/source4/lib/ldb/tools/ad2oLschema.c
index 8b1203bff0..62c6e01c2e 100644
--- 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 485b58a44a..bb6aabd4ca 100644
--- 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