From 13f011fef45fef3f25af8f3a158983f36115ba45 Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Fri, 05 Nov 2010 09:57:49 +0000
Subject: [PATCH] Fix OPENDJ-8: Some objectclasses are incorrectly considered structural. The definition was not compliant with RFC 4512 syntax and the kind was ignored, defaulting to STRUCTURAL.
---
opends/resource/schema/03-rfc2926.ldif | 2 +-
opends/resource/schema/03-rfc3712.ldif | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/opends/resource/schema/03-rfc2926.ldif b/opends/resource/schema/03-rfc2926.ldif
index 43082dd..d0eac4e 100644
--- a/opends/resource/schema/03-rfc2926.ldif
+++ b/opends/resource/schema/03-rfc2926.ldif
@@ -63,7 +63,7 @@
DESC 'The authenticator for the attribute list, null if none.'
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE X-ORIGIN 'RFC 2926' )
objectClasses: ( 1.3.6.1.4.1.6252.2.27.6.2.1 NAME 'slpService'
- DESC 'parent superclass for SLP services' ABSTRACT SUP top
+ DESC 'parent superclass for SLP services' SUP top ABSTRACT
MUST ( template-major-version-number $ template-minor-version-number $
description $ template-url-syntax $ service-advert-service-type $
service-advert-scopes ) MAY ( service-advert-url-authenticator $
diff --git a/opends/resource/schema/03-rfc3712.ldif b/opends/resource/schema/03-rfc3712.ldif
index 746fc06..875bd7a 100644
--- a/opends/resource/schema/03-rfc3712.ldif
+++ b/opends/resource/schema/03-rfc3712.ldif
@@ -179,10 +179,10 @@
SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{127}
X-ORIGIN 'RFC 3712' )
objectClasses: ( 1.3.18.0.2.6.254 NAME 'slpServicePrinter'
- DESC 'Service Location Protocol (SLP) information.' AUXILIARY SUP slpService
+ DESC 'Service Location Protocol (SLP) information.' SUP slpService AUXILIARY
X-ORIGIN 'RFC 3712' )
objectClasses: ( 1.3.18.0.2.6.258 NAME 'printerAbstract'
- DESC 'Printer related information.' ABSTRACT SUP top
+ DESC 'Printer related information.' SUP top ABSTRACT
MAY ( printer-name $ printer-natural-language-configured $
printer-location $ printer-info $ printer-more-info $
printer-make-and-model $ printer-multiple-document-jobs-supported $
@@ -200,16 +200,16 @@
printer-stacking-order-supported $ printer-output-features-supported )
X-ORIGIN 'RFC 3712' )
objectClasses: ( 1.3.18.0.2.6.255 NAME 'printerService'
- DESC 'Printer information.' STRUCTURAL SUP printerAbstract
+ DESC 'Printer information.' SUP printerAbstract STRUCTURAL
MAY ( printer-uri $ printer-xri-supported ) X-ORIGIN 'RFC 3712' )
objectClasses: ( 1.3.18.0.2.6.257 NAME 'printerServiceAuxClass'
- DESC 'Printer information.' AUXILIARY SUP printerAbstract
+ DESC 'Printer information.' SUP printerAbstract AUXILIARY
MAY ( printer-uri $ printer-xri-supported ) X-ORIGIN 'RFC 3712' )
objectClasses: ( 1.3.18.0.2.6.256 NAME 'printerIPP'
- DESC 'Internet Printing Protocol (IPP) information.' AUXILIARY SUP top
+ DESC 'Internet Printing Protocol (IPP) information.' SUP top AUXILIARY
MAY ( printer-ipp-versions-supported $
printer-multiple-document-jobs-supported ) X-ORIGIN 'RFC 3712' )
objectClasses: ( 1.3.18.0.2.6.253 NAME 'printerLPR' DESC 'LPR information.'
- AUXILIARY SUP top MUST ( printer-name ) MAY ( printer-aliases )
+ SUP top AUXILIARY MUST ( printer-name ) MAY ( printer-aliases )
X-ORIGIN 'RFC 3712' )
--
Gitblit v1.10.0