From 02ac69b0518ee20097ebef1c20abff44e4d021a0 Mon Sep 17 00:00:00 2001
From: Rich Megginson <rmeggins@xxxxxxxxxx>
Date: Fri, 30 Mar 2012 11:17:50 -0600
Subject: [PATCH] schema def must have DESC '' - close paren must be preceded by space
Some of the qmail schema had DESC with no quoted string - for an empty
DESC, the string must be specified as ''
For the multiline schema definitions, the close paren must not be the
first char on the line because that violates LDIF line wrapping - add
a space before the close paren
---
ldap/schema/60qmail.ldif | 20 ++++++++++----------
ldap/schema/60sabayon.ldif | 10 +++++-----
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/ldap/schema/60qmail.ldif b/ldap/schema/60qmail.ldif
index c118bef..b1bc391 100644
--- a/ldap/schema/60qmail.ldif
+++ b/ldap/schema/60qmail.ldif
@@ -308,7 +308,7 @@ attributeTypes: (
attributeTypes: (
1.3.6.1.4.1.7914.1.4.1.1
NAME 'qladnmanager'
- DESC
+ DESC ''
EQUALITY distinguishedNameMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.12
)
@@ -318,7 +318,7 @@ attributeTypes: (
attributeTypes: (
1.3.6.1.4.1.7914.1.4.1.2
NAME 'qlaDomainList'
- DESC
+ DESC ''
EQUALITY caseIgnoreIA5Match
SUBSTR caseIgnoreIA5SubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256}
@@ -329,7 +329,7 @@ attributeTypes: (
attributeTypes: (
1.3.6.1.4.1.7914.1.4.1.3
NAME 'qlaUidPrefix'
- DESC
+ DESC ''
EQUALITY caseIgnoreIA5Match
SUBSTR caseIgnoreIA5SubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256}
@@ -341,7 +341,7 @@ attributeTypes: (
attributeTypes: (
1.3.6.1.4.1.7914.1.4.1.4
NAME 'qlaQmailUid'
- DESC
+ DESC ''
EQUALITY integerMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
SINGLE-VALUE
@@ -352,7 +352,7 @@ attributeTypes: (
attributeTypes: (
1.3.6.1.4.1.7914.1.4.1.5
NAME 'qlaQmailGid'
- DESC
+ DESC ''
EQUALITY integerMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
SINGLE-VALUE
@@ -363,7 +363,7 @@ attributeTypes: (
attributeTypes: (
1.3.6.1.4.1.7914.1.4.1.6
NAME 'qlaMailMStorePrefix'
- DESC
+ DESC ''
EQUALITY caseIgnoreIA5Match
SUBSTR caseIgnoreIA5SubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256}
@@ -375,7 +375,7 @@ attributeTypes: (
attributeTypes: (
1.3.6.1.4.1.7914.1.4.1.7
NAME 'qlaMailQuotaSize'
- DESC
+ DESC ''
EQUALITY integerMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
SINGLE-VALUE
@@ -386,7 +386,7 @@ attributeTypes: (
attributeTypes: (
1.3.6.1.4.1.7914.1.4.1.8
NAME 'qlaMailQuotaCount'
- DESC
+ DESC ''
EQUALITY integerMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
SINGLE-VALUE
@@ -397,7 +397,7 @@ attributeTypes: (
attributeTypes: (
1.3.6.1.4.1.7914.1.4.1.9
NAME 'qlaMailSizeMax'
- DESC
+ DESC ''
EQUALITY integerMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
SINGLE-VALUE
@@ -408,7 +408,7 @@ attributeTypes: (
attributeTypes: (
1.3.6.1.4.1.7914.1.4.1.10
NAME 'qlaMailHostList'
- DESC
+ DESC ''
EQUALITY caseIgnoreIA5Match
SUBSTR caseIgnoreIA5SubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256}
diff --git a/ldap/schema/60sabayon.ldif b/ldap/schema/60sabayon.ldif
index 9441a41..7fbc455 100644
--- a/ldap/schema/60sabayon.ldif
+++ b/ldap/schema/60sabayon.ldif
@@ -15,7 +15,7 @@ attributeTypes: (
DESC 'The URL of a sabayon profile'
SUP labeledURI
X-ORIGIN 'Sabayon'
-)
+ )
# This attribute is used to store the name of a sabayon profile.
# It can refer to either a local zipfile (which will be looked up
# in /etc/desktop-profiles/$(name).zip), or it can be used to
@@ -29,7 +29,7 @@ attributeTypes: (
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
SINGLE-VALUE
X-ORIGIN 'Sabayon'
-)
+ )
# Simple example object to store profile information
# If you use this or something similar instead of a direct URL
# in your user object you get more flexibility.
@@ -42,7 +42,7 @@ objectClasses: (
MUST cn
MAY ( sabayonProfileURL $ description )
X-ORIGIN 'Sabayon'
-)
+ )
# Use these to put sabayonProfileName or sabayonProfileURL
# attributes in an objetc
objectClasses: (
@@ -53,7 +53,7 @@ objectClasses: (
AUXILIARY
MUST sabayonProfileName
X-ORIGIN 'Sabayon'
-)
+ )
objectClasses: (
1.3.6.1.4.1.2312.4.3.4.3
NAME 'sabayonProfileURLObject'
@@ -63,4 +63,4 @@ objectClasses: (
MUST cn
MAY sabayonProfileURL
X-ORIGIN 'Sabayon'
-)
+ )
--
1.7.1
--
389-devel mailing list
389-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/389-devel
