svn commit: samba r19310 - in branches/SAMBA_4_0/source: lib/ldb/tools setup

abartlet at samba.org abartlet at samba.org
Mon Oct 16 01:36:25 GMT 2006


Author: abartlet
Date: 2006-10-16 01:36:22 +0000 (Mon, 16 Oct 2006)
New Revision: 19310

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19310

Log:
Add another conflicting oid

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

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/lib/ldb/tools/ad2oLschema.c
   branches/SAMBA_4_0/source/setup/schema-map-openldap-2.3


Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/tools/ad2oLschema.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/tools/ad2oLschema.c	2006-10-16 01:20:31 UTC (rev 19309)
+++ branches/SAMBA_4_0/source/lib/ldb/tools/ad2oLschema.c	2006-10-16 01:36:22 UTC (rev 19310)
@@ -330,7 +330,7 @@
 		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 @@
 		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;
 		}

Modified: branches/SAMBA_4_0/source/setup/schema-map-openldap-2.3
===================================================================
--- branches/SAMBA_4_0/source/setup/schema-map-openldap-2.3	2006-10-16 01:20:31 UTC (rev 19309)
+++ branches/SAMBA_4_0/source/setup/schema-map-openldap-2.3	2006-10-16 01:36:22 UTC (rev 19310)
@@ -21,6 +21,8 @@
 #
 #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



More information about the samba-cvs mailing list