[OpenCA-Devel] [PATCH 13 of 15] schema

[Tim R. <ti...@mu...>]

#
#	schema.patch
#
#	contrib/openldap/openca.schema
#	comment out parts that conflict with openldap's core.schema
#
--- openca-base-1.1.0/contrib/openldap/openca.schema.old	2007-11-07 11:53:59.000000000 -0800
+++ openca-base-1.1.0/contrib/openldap/openca.schema	2010-09-05 14:04:23.502320002 -0700
@@ -117,13 +117,15 @@
 ##    ID    see OpenCA OID description
 ##
 
-objectclass ( 2.5.6.21 NAME 'pkiUser' SUP top AUXILIARY
-	MAY ( userCertificate )
-	)
+## conflicts with openldap's core.schema
+##objectclass ( 2.5.6.21 NAME 'pkiUser' SUP top AUXILIARY
+##	MAY ( userCertificate )
+##	)
 
-objectclass ( 2.5.6.22 NAME 'pkiCA' SUP top AUXILIARY
-	MAY ( cACertificate $ certificateRevocationList $ authorityRevocationList $ crossCertificatePair )
-	)
+## conflicts with openldap's core.schema
+##objectclass ( 2.5.6.22 NAME 'pkiCA' SUP top AUXILIARY
+##	MAY ( cACertificate $ certificateRevocationList $ authorityRevocationList $ crossCertificatePair )
+##	)
 
 objectclass ( 1.3.6.1.4.1.18227.2.1.1 NAME 'opencaUniquelyIdentifiedUser' SUP top AUXILIARY
 	MAY ( serialNumber )

-- 
Tim Rice				Multitalents	(707) 887-1469
ti...@mu...