andykimpe / rpms / 389-ds-base

Forked from rpms/389-ds-base 5 months ago
Clone
dc8c34
From f7fa6b1b952847137424a42758681a59b3bd8df2 Mon Sep 17 00:00:00 2001
dc8c34
From: Mark Reynolds <mreynolds@redhat.com>
dc8c34
Date: Fri, 7 Jun 2013 14:48:07 -0400
dc8c34
Subject: [PATCH 56/99] Ticket 47376 - DESC should not be empty as per RFC 2252
dc8c34
 (ldapv3)
dc8c34
dc8c34
Bug Description:  RFC 2252 (ldapv3), DESC, defined as a qdstring, should not
dc8c34
                  be an empty string.  In the standard schema there are
dc8c34
                  several attributes/objectclasses that have " DESC '' ",
dc8c34
                  which violates the RFC.
dc8c34
dc8c34
Fix Description:  Set all empty DESC's with values.
dc8c34
dc8c34
https://fedorahosted.org/389/ticket/47376
dc8c34
dc8c34
Reviewed by: richm & nkinder (Thanks!!)
dc8c34
(cherry picked from commit 9f73f01a408cef05f112f4ec406949f3d48afe78)
dc8c34
(cherry picked from commit 4a29fe1a3fae5a81007c7dec126f48baa03948e0)
dc8c34
---
dc8c34
 ldap/schema/50ns-mail.ldif |  10 ++--
dc8c34
 ldap/schema/60qmail.ldif   |  20 +++----
dc8c34
 ldap/schema/60radius.ldif  | 132 ++++++++++++++++++++++-----------------------
dc8c34
 ldap/schema/60samba3.ldif  |   2 +-
dc8c34
 4 files changed, 82 insertions(+), 82 deletions(-)
dc8c34
dc8c34
diff --git a/ldap/schema/50ns-mail.ldif b/ldap/schema/50ns-mail.ldif
dc8c34
index 8d06119..27006e0 100644
dc8c34
--- a/ldap/schema/50ns-mail.ldif
dc8c34
+++ b/ldap/schema/50ns-mail.ldif
dc8c34
@@ -73,8 +73,8 @@ attributeTypes: ( 2.16.840.1.113730.3.1.17 NAME ( 'mailForwardingAddress' ) DESC
dc8c34
 attributeTypes: ( 2.16.840.1.113730.3.1.32 NAME ( 'mgrpMsgMaxSize' ) DESC 'Netscape Messaging Server 4.x defined attribute' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE X-ORIGIN 'Netscape Messaging Server 4.x' )
dc8c34
 attributeTypes: ( 2.16.840.1.113730.3.1.29 NAME ( 'mgrpMsgRejectText' ) DESC 'Netscape Messaging Server 4.x defined attribute' SYNTAX 1.3.6.1.4.1.1466.115.121.1.26  X-ORIGIN 'Netscape Messaging Server 4.x' )
dc8c34
 attributeTypes: ( 2.16.840.1.113730.3.1.789 NAME ( 'mgrpNoDuplicateChecks' ) DESC 'Netscape Messaging Server 4.x defined attribute' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE X-ORIGIN 'Netscape Messaging Server 4.x' )
dc8c34
-objectclasses: ( 2.16.840.1.113730.3.2.3 NAME 'mailRecipient' DESC '' SUP top AUXILIARY MUST ( objectClass ) MAY ( cn $ mail $ mailAlternateAddress $ mailHost $ mailRoutingAddress $ mailAccessDomain $ mailAutoReplyMode $ mailAutoReplyText $ mailDeliveryOption $ mailForwardingAddress $ mailMessageStore $ mailProgramDeliveryInfo $ mailQuota $ multiLineDescription $ uid $ userPassword ) X-ORIGIN 'Netscape Messaging Server 4.x' )
dc8c34
-objectclasses: ( 2.16.840.113730.3.2.37 NAME 'nsMessagingServerUser' DESC '' SUP top AUXILIARY MUST ( objectClass ) MAY ( cn $ mailAccessDomain $ mailAutoReplyMode $ mailAutoReplyText $ mailDeliveryOption $ mailForwardingAddress $ mailMessageStore $ mailProgramDeliveryInfo $ mailQuota $ nsmsgDisallowAccess $ nsmsgNumMsgQuota $ nswmExtendedUserPrefs $ vacationstartdate $ vacationenddate ) X-ORIGIN 'Netscape Messaging Server 4.x' )
dc8c34
-objectclasses: ( 2.16.840.1.113730.3.2.4 NAME 'mailGroup' DESC '' SUP top AUXILIARY MUST ( objectClass ) MAY ( cn $ mail $ mailAlternateAddress $ mailHost $ mailRoutingAddress $ mgrpAddHeader $ mgrpAllowedBroadcaster $ mgrpAllowedDomain $ mgrpApprovePassword $ mgrpBroadcasterPolicy $ mgrpDeliverTo $ mgrpErrorsTo $ mgrpModerator $ mgrpMsgMaxSize $ mgrpMsgRejectAction $ mgrpMsgRejectText $ mgrpNoDuplicateChecks $ mgrpRemoveHeader $ mgrpRFC822MailMember $ owner ) X-ORIGIN 'Netscape Messaging Server 4.x' )
dc8c34
-objectclasses: ( 2.16.840.1.113730.3.2.5 NAME 'groupOfMailEnhancedUniqueNames' DESC '' SUP top AUXILIARY MUST ( objectClass $ cn ) MAY ( businessCategory $ description $ mailEnhancedUniqueMember $ o $ ou $ owner $ seeAlso ) X-ORIGIN 'Netscape Messaging Server 4.x' )
dc8c34
-objectclasses: ( 2.16.840.1.113730.3.2.24 NAME 'netscapeMailServer' DESC '' SUP top AUXILIARY MUST ( objectClass ) X-ORIGIN 'Netscape Messaging Server 4.x' )
dc8c34
+objectclasses: ( 2.16.840.1.113730.3.2.3 NAME 'mailRecipient' DESC 'Netscape Messaging Server 4.x defined objectclass' SUP top AUXILIARY MUST ( objectClass ) MAY ( cn $ mail $ mailAlternateAddress $ mailHost $ mailRoutingAddress $ mailAccessDomain $ mailAutoReplyMode $ mailAutoReplyText $ mailDeliveryOption $ mailForwardingAddress $ mailMessageStore $ mailProgramDeliveryInfo $ mailQuota $ multiLineDescription $ uid $ userPassword ) X-ORIGIN 'Netscape Messaging Server 4.x' )
dc8c34
+objectclasses: ( 2.16.840.113730.3.2.37 NAME 'nsMessagingServerUser' DESC 'Netscape Messaging Server 4.x defined objectclass' SUP top AUXILIARY MUST ( objectClass ) MAY ( cn $ mailAccessDomain $ mailAutoReplyMode $ mailAutoReplyText $ mailDeliveryOption $ mailForwardingAddress $ mailMessageStore $ mailProgramDeliveryInfo $ mailQuota $ nsmsgDisallowAccess $ nsmsgNumMsgQuota $ nswmExtendedUserPrefs $ vacationstartdate $ vacationenddate ) X-ORIGIN 'Netscape Messaging Server 4.x' )
dc8c34
+objectclasses: ( 2.16.840.1.113730.3.2.4 NAME 'mailGroup' DESC 'Netscape Messaging Server 4.x defined objectclass' SUP top AUXILIARY MUST ( objectClass ) MAY ( cn $ mail $ mailAlternateAddress $ mailHost $ mailRoutingAddress $ mgrpAddHeader $ mgrpAllowedBroadcaster $ mgrpAllowedDomain $ mgrpApprovePassword $ mgrpBroadcasterPolicy $ mgrpDeliverTo $ mgrpErrorsTo $ mgrpModerator $ mgrpMsgMaxSize $ mgrpMsgRejectAction $ mgrpMsgRejectText $ mgrpNoDuplicateChecks $ mgrpRemoveHeader $ mgrpRFC822MailMember $ owner ) X-ORIGIN 'Netscape Messaging Server 4.x' )
dc8c34
+objectclasses: ( 2.16.840.1.113730.3.2.5 NAME 'groupOfMailEnhancedUniqueNames' DESC 'Netscape Messaging Server 4.x defined objectclass' SUP top AUXILIARY MUST ( objectClass $ cn ) MAY ( businessCategory $ description $ mailEnhancedUniqueMember $ o $ ou $ owner $ seeAlso ) X-ORIGIN 'Netscape Messaging Server 4.x' )
dc8c34
+objectclasses: ( 2.16.840.1.113730.3.2.24 NAME 'netscapeMailServer' DESC 'Netscape Messaging Server 4.x defined objectclass' SUP top AUXILIARY MUST ( objectClass ) X-ORIGIN 'Netscape Messaging Server 4.x' )
dc8c34
diff --git a/ldap/schema/60qmail.ldif b/ldap/schema/60qmail.ldif
dc8c34
index b1bc391..98d0810 100644
dc8c34
--- a/ldap/schema/60qmail.ldif
dc8c34
+++ b/ldap/schema/60qmail.ldif
dc8c34
@@ -308,7 +308,7 @@ attributeTypes: (
dc8c34
 attributeTypes: (
dc8c34
   1.3.6.1.4.1.7914.1.4.1.1
dc8c34
   NAME 'qladnmanager'
dc8c34
-  DESC ''
dc8c34
+  DESC 'qladnmanager'
dc8c34
   EQUALITY distinguishedNameMatch
dc8c34
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.12
dc8c34
   )
dc8c34
@@ -318,7 +318,7 @@ attributeTypes: (
dc8c34
 attributeTypes: (
dc8c34
   1.3.6.1.4.1.7914.1.4.1.2
dc8c34
   NAME 'qlaDomainList'
dc8c34
-  DESC ''
dc8c34
+  DESC 'qlaDomainList'
dc8c34
   EQUALITY caseIgnoreIA5Match
dc8c34
   SUBSTR caseIgnoreIA5SubstringsMatch
dc8c34
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256}
dc8c34
@@ -329,7 +329,7 @@ attributeTypes: (
dc8c34
 attributeTypes: (
dc8c34
   1.3.6.1.4.1.7914.1.4.1.3
dc8c34
   NAME 'qlaUidPrefix'
dc8c34
-  DESC ''
dc8c34
+  DESC 'qlaUidPrefix'
dc8c34
   EQUALITY caseIgnoreIA5Match
dc8c34
   SUBSTR caseIgnoreIA5SubstringsMatch
dc8c34
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256}
dc8c34
@@ -341,7 +341,7 @@ attributeTypes: (
dc8c34
 attributeTypes: (
dc8c34
   1.3.6.1.4.1.7914.1.4.1.4
dc8c34
   NAME 'qlaQmailUid'
dc8c34
-  DESC ''
dc8c34
+  DESC 'qlaQmailUid'
dc8c34
   EQUALITY integerMatch
dc8c34
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
dc8c34
   SINGLE-VALUE
dc8c34
@@ -352,7 +352,7 @@ attributeTypes: (
dc8c34
 attributeTypes: (
dc8c34
   1.3.6.1.4.1.7914.1.4.1.5
dc8c34
   NAME 'qlaQmailGid'
dc8c34
-  DESC ''
dc8c34
+  DESC 'qlaQmailGid'
dc8c34
   EQUALITY integerMatch
dc8c34
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
dc8c34
   SINGLE-VALUE
dc8c34
@@ -363,7 +363,7 @@ attributeTypes: (
dc8c34
 attributeTypes: (
dc8c34
   1.3.6.1.4.1.7914.1.4.1.6
dc8c34
   NAME 'qlaMailMStorePrefix'
dc8c34
-  DESC ''
dc8c34
+  DESC 'qlaMailMStorePrefix'
dc8c34
   EQUALITY caseIgnoreIA5Match
dc8c34
   SUBSTR caseIgnoreIA5SubstringsMatch
dc8c34
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256}
dc8c34
@@ -375,7 +375,7 @@ attributeTypes: (
dc8c34
 attributeTypes: (
dc8c34
   1.3.6.1.4.1.7914.1.4.1.7
dc8c34
   NAME 'qlaMailQuotaSize'
dc8c34
-  DESC ''
dc8c34
+  DESC 'qlaMailQuotaSize'
dc8c34
   EQUALITY integerMatch
dc8c34
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
dc8c34
   SINGLE-VALUE
dc8c34
@@ -386,7 +386,7 @@ attributeTypes: (
dc8c34
 attributeTypes: (
dc8c34
   1.3.6.1.4.1.7914.1.4.1.8
dc8c34
   NAME 'qlaMailQuotaCount'
dc8c34
-  DESC ''
dc8c34
+  DESC 'qlaMailQuotaCount'
dc8c34
   EQUALITY integerMatch
dc8c34
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
dc8c34
   SINGLE-VALUE
dc8c34
@@ -397,7 +397,7 @@ attributeTypes: (
dc8c34
 attributeTypes: (
dc8c34
   1.3.6.1.4.1.7914.1.4.1.9
dc8c34
   NAME 'qlaMailSizeMax'
dc8c34
-  DESC ''
dc8c34
+  DESC 'qlaMailSizeMax'
dc8c34
   EQUALITY integerMatch
dc8c34
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
dc8c34
   SINGLE-VALUE
dc8c34
@@ -408,7 +408,7 @@ attributeTypes: (
dc8c34
 attributeTypes: (
dc8c34
   1.3.6.1.4.1.7914.1.4.1.10
dc8c34
   NAME 'qlaMailHostList'
dc8c34
-  DESC ''
dc8c34
+  DESC 'qlaMailHostList'
dc8c34
   EQUALITY caseIgnoreIA5Match
dc8c34
   SUBSTR caseIgnoreIA5SubstringsMatch
dc8c34
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256}
dc8c34
diff --git a/ldap/schema/60radius.ldif b/ldap/schema/60radius.ldif
dc8c34
index 93a5ba3..3350a9c 100644
dc8c34
--- a/ldap/schema/60radius.ldif
dc8c34
+++ b/ldap/schema/60radius.ldif
dc8c34
@@ -14,7 +14,7 @@ dn: cn=schema
dc8c34
 attributeTypes:
dc8c34
     ( 1.3.6.1.4.1.3317.4.3.1.1
dc8c34
         NAME 'radiusArapFeatures'
dc8c34
-        DESC ''
dc8c34
+        DESC 'radiusAttribute'
dc8c34
         EQUALITY caseIgnoreIA5Match
dc8c34
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
dc8c34
         SINGLE-VALUE
dc8c34
@@ -22,7 +22,7 @@ attributeTypes:
dc8c34
 attributeTypes:
dc8c34
     ( 1.3.6.1.4.1.3317.4.3.1.2
dc8c34
         NAME 'radiusArapSecurity'
dc8c34
-        DESC ''
dc8c34
+        DESC 'radiusAttribute'
dc8c34
         EQUALITY caseIgnoreIA5Match
dc8c34
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
dc8c34
         SINGLE-VALUE
dc8c34
@@ -30,7 +30,7 @@ attributeTypes:
dc8c34
 attributeTypes:
dc8c34
     ( 1.3.6.1.4.1.3317.4.3.1.3
dc8c34
         NAME 'radiusArapZoneAccess'
dc8c34
-        DESC ''
dc8c34
+        DESC 'radiusAttribute'
dc8c34
         EQUALITY caseIgnoreIA5Match
dc8c34
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
dc8c34
         SINGLE-VALUE
dc8c34
@@ -38,7 +38,7 @@ attributeTypes:
dc8c34
 attributeTypes:
dc8c34
     ( 1.3.6.1.4.1.3317.4.3.1.44
dc8c34
      NAME 'radiusAuthType'
dc8c34
-     DESC ''
dc8c34
+     DESC 'radiusAttribute'
dc8c34
      EQUALITY caseIgnoreIA5Match
dc8c34
      SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
dc8c34
      SINGLE-VALUE
dc8c34
@@ -46,7 +46,7 @@ attributeTypes:
dc8c34
 attributeTypes:
dc8c34
     ( 1.3.6.1.4.1.3317.4.3.1.4
dc8c34
         NAME 'radiusCallbackId'
dc8c34
-        DESC ''
dc8c34
+        DESC 'radiusAttribute'
dc8c34
         EQUALITY caseIgnoreIA5Match
dc8c34
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
dc8c34
         SINGLE-VALUE
dc8c34
@@ -54,7 +54,7 @@ attributeTypes:
dc8c34
 attributeTypes:
dc8c34
     ( 1.3.6.1.4.1.3317.4.3.1.5
dc8c34
         NAME 'radiusCallbackNumber'
dc8c34
-        DESC ''
dc8c34
+        DESC 'radiusAttribute'
dc8c34
         EQUALITY caseIgnoreIA5Match
dc8c34
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
dc8c34
         SINGLE-VALUE
dc8c34
@@ -62,7 +62,7 @@ attributeTypes:
dc8c34
 attributeTypes:
dc8c34
     ( 1.3.6.1.4.1.3317.4.3.1.6
dc8c34
         NAME 'radiusCalledStationId'
dc8c34
-        DESC ''
dc8c34
+        DESC 'radiusAttribute'
dc8c34
         EQUALITY caseIgnoreIA5Match
dc8c34
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
dc8c34
         SINGLE-VALUE
dc8c34
@@ -70,7 +70,7 @@ attributeTypes:
dc8c34
 attributeTypes:
dc8c34
     ( 1.3.6.1.4.1.3317.4.3.1.7
dc8c34
         NAME 'radiusCallingStationId'
dc8c34
-        DESC ''
dc8c34
+        DESC 'radiusAttribute'
dc8c34
         EQUALITY caseIgnoreIA5Match
dc8c34
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
dc8c34
         SINGLE-VALUE
dc8c34
@@ -78,14 +78,14 @@ attributeTypes:
dc8c34
 attributeTypes:
dc8c34
     ( 1.3.6.1.4.1.3317.4.3.1.8
dc8c34
         NAME 'radiusClass'
dc8c34
-        DESC ''
dc8c34
+        DESC 'radiusAttribute'
dc8c34
         EQUALITY caseIgnoreIA5Match
dc8c34
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
dc8c34
     )
dc8c34
 attributeTypes:
dc8c34
     ( 1.3.6.1.4.1.3317.4.3.1.45
dc8c34
      NAME 'radiusClientIPAddress'
dc8c34
-     DESC ''
dc8c34
+     DESC 'radiusAttribute'
dc8c34
      EQUALITY caseIgnoreIA5Match
dc8c34
      SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
dc8c34
      SINGLE-VALUE
dc8c34
@@ -93,14 +93,14 @@ attributeTypes:
dc8c34
 attributeTypes:
dc8c34
     ( 1.3.6.1.4.1.3317.4.3.1.9
dc8c34
         NAME 'radiusFilterId'
dc8c34
-        DESC ''
dc8c34
+        DESC 'radiusAttribute'
dc8c34
         EQUALITY caseIgnoreIA5Match
dc8c34
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
dc8c34
     )
dc8c34
 attributeTypes:
dc8c34
     ( 1.3.6.1.4.1.3317.4.3.1.10
dc8c34
         NAME 'radiusFramedAppleTalkLink'
dc8c34
-        DESC ''
dc8c34
+        DESC 'radiusAttribute'
dc8c34
         EQUALITY caseIgnoreIA5Match
dc8c34
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
dc8c34
         SINGLE-VALUE
dc8c34
@@ -108,14 +108,14 @@ attributeTypes:
dc8c34
 attributeTypes:
dc8c34
     ( 1.3.6.1.4.1.3317.4.3.1.11
dc8c34
         NAME 'radiusFramedAppleTalkNetwork'
dc8c34
-        DESC ''
dc8c34
+        DESC 'radiusAttribute'
dc8c34
         EQUALITY caseIgnoreIA5Match
dc8c34
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
dc8c34
     )
dc8c34
 attributeTypes:
dc8c34
     ( 1.3.6.1.4.1.3317.4.3.1.12
dc8c34
         NAME 'radiusFramedAppleTalkZone'
dc8c34
-        DESC ''
dc8c34
+        DESC 'radiusAttribute'
dc8c34
         EQUALITY caseIgnoreIA5Match
dc8c34
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
dc8c34
         SINGLE-VALUE
dc8c34
@@ -123,14 +123,14 @@ attributeTypes:
dc8c34
 attributeTypes:
dc8c34
     ( 1.3.6.1.4.1.3317.4.3.1.13
dc8c34
         NAME 'radiusFramedCompression'
dc8c34
-        DESC ''
dc8c34
+        DESC 'radiusAttribute'
dc8c34
         EQUALITY caseIgnoreIA5Match
dc8c34
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
dc8c34
     )
dc8c34
 attributeTypes:
dc8c34
     ( 1.3.6.1.4.1.3317.4.3.1.14
dc8c34
         NAME 'radiusFramedIPAddress'
dc8c34
-        DESC ''
dc8c34
+        DESC 'radiusAttribute'
dc8c34
         EQUALITY caseIgnoreIA5Match
dc8c34
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
dc8c34
         SINGLE-VALUE
dc8c34
@@ -138,7 +138,7 @@ attributeTypes:
dc8c34
 attributeTypes:
dc8c34
     ( 1.3.6.1.4.1.3317.4.3.1.15
dc8c34
         NAME 'radiusFramedIPNetmask'
dc8c34
-        DESC ''
dc8c34
+        DESC 'radiusAttribute'
dc8c34
         EQUALITY caseIgnoreIA5Match
dc8c34
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
dc8c34
         SINGLE-VALUE
dc8c34
@@ -146,7 +146,7 @@ attributeTypes:
dc8c34
 attributeTypes:
dc8c34
     ( 1.3.6.1.4.1.3317.4.3.1.16
dc8c34
         NAME 'radiusFramedIPXNetwork'
dc8c34
-        DESC ''
dc8c34
+        DESC 'radiusAttribute'
dc8c34
         EQUALITY caseIgnoreIA5Match
dc8c34
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
dc8c34
         SINGLE-VALUE
dc8c34
@@ -154,7 +154,7 @@ attributeTypes:
dc8c34
 attributeTypes:
dc8c34
     ( 1.3.6.1.4.1.3317.4.3.1.17
dc8c34
         NAME 'radiusFramedMTU'
dc8c34
-        DESC ''
dc8c34
+        DESC 'radiusAttribute'
dc8c34
         EQUALITY caseIgnoreIA5Match
dc8c34
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
dc8c34
         SINGLE-VALUE
dc8c34
@@ -162,7 +162,7 @@ attributeTypes:
dc8c34
 attributeTypes:
dc8c34
     ( 1.3.6.1.4.1.3317.4.3.1.18
dc8c34
         NAME 'radiusFramedProtocol'
dc8c34
-        DESC ''
dc8c34
+        DESC 'radiusAttribute'
dc8c34
         EQUALITY caseIgnoreIA5Match
dc8c34
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
dc8c34
         SINGLE-VALUE
dc8c34
@@ -170,14 +170,14 @@ attributeTypes:
dc8c34
 attributeTypes:
dc8c34
     ( 1.3.6.1.4.1.3317.4.3.1.19
dc8c34
         NAME 'radiusFramedRoute'
dc8c34
-        DESC ''
dc8c34
+        DESC 'radiusAttribute'
dc8c34
         EQUALITY caseIgnoreIA5Match
dc8c34
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
dc8c34
     )
dc8c34
 attributeTypes:
dc8c34
     ( 1.3.6.1.4.1.3317.4.3.1.20
dc8c34
         NAME 'radiusFramedRouting'
dc8c34
-        DESC ''
dc8c34
+        DESC 'radiusAttribute'
dc8c34
         EQUALITY caseIgnoreIA5Match
dc8c34
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
dc8c34
         SINGLE-VALUE
dc8c34
@@ -185,14 +185,14 @@ attributeTypes:
dc8c34
 attributeTypes:
dc8c34
     ( 1.3.6.1.4.1.3317.4.3.1.46
dc8c34
         NAME 'radiusGroupName'
dc8c34
-        DESC ''
dc8c34
+        DESC 'radiusAttribute'
dc8c34
         EQUALITY caseIgnoreIA5Match
dc8c34
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
dc8c34
     )
dc8c34
 attributeTypes:
dc8c34
     ( 1.3.6.1.4.1.3317.4.3.1.47
dc8c34
         NAME 'radiusHint'
dc8c34
-        DESC ''
dc8c34
+        DESC 'radiusAttribute'
dc8c34
         EQUALITY caseIgnoreIA5Match
dc8c34
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
dc8c34
         SINGLE-VALUE
dc8c34
@@ -200,14 +200,14 @@ attributeTypes:
dc8c34
 attributeTypes:
dc8c34
     ( 1.3.6.1.4.1.3317.4.3.1.48
dc8c34
         NAME 'radiusHuntgroupName'
dc8c34
-        DESC ''
dc8c34
+        DESC 'radiusAttribute'
dc8c34
         EQUALITY caseIgnoreIA5Match
dc8c34
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
dc8c34
     )
dc8c34
 attributeTypes:
dc8c34
     ( 1.3.6.1.4.1.3317.4.3.1.21
dc8c34
         NAME 'radiusIdleTimeout'
dc8c34
-        DESC ''
dc8c34
+        DESC 'radiusAttribute'
dc8c34
         EQUALITY caseIgnoreIA5Match
dc8c34
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
dc8c34
         SINGLE-VALUE
dc8c34
@@ -215,14 +215,14 @@ attributeTypes:
dc8c34
 attributeTypes:
dc8c34
     ( 1.3.6.1.4.1.3317.4.3.1.22
dc8c34
         NAME 'radiusLoginIPHost'
dc8c34
-        DESC ''
dc8c34
+        DESC 'radiusAttribute'
dc8c34
         EQUALITY caseIgnoreIA5Match
dc8c34
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
dc8c34
     )
dc8c34
 attributeTypes:
dc8c34
     ( 1.3.6.1.4.1.3317.4.3.1.23
dc8c34
         NAME 'radiusLoginLATGroup'
dc8c34
-        DESC ''
dc8c34
+        DESC 'radiusAttribute'
dc8c34
         EQUALITY caseIgnoreIA5Match
dc8c34
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
dc8c34
         SINGLE-VALUE
dc8c34
@@ -230,7 +230,7 @@ attributeTypes:
dc8c34
 attributeTypes:
dc8c34
     ( 1.3.6.1.4.1.3317.4.3.1.24
dc8c34
         NAME 'radiusLoginLATNode'
dc8c34
-        DESC ''
dc8c34
+        DESC 'radiusAttribute'
dc8c34
         EQUALITY caseIgnoreIA5Match
dc8c34
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
dc8c34
         SINGLE-VALUE
dc8c34
@@ -238,7 +238,7 @@ attributeTypes:
dc8c34
 attributeTypes:
dc8c34
     ( 1.3.6.1.4.1.3317.4.3.1.25
dc8c34
         NAME 'radiusLoginLATPort'
dc8c34
-        DESC ''
dc8c34
+        DESC 'radiusAttribute'
dc8c34
         EQUALITY caseIgnoreIA5Match
dc8c34
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
dc8c34
         SINGLE-VALUE
dc8c34
@@ -246,7 +246,7 @@ attributeTypes:
dc8c34
 attributeTypes:
dc8c34
     ( 1.3.6.1.4.1.3317.4.3.1.26
dc8c34
         NAME 'radiusLoginLATService'
dc8c34
-        DESC ''
dc8c34
+        DESC 'radiusAttribute'
dc8c34
         EQUALITY caseIgnoreIA5Match
dc8c34
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
dc8c34
         SINGLE-VALUE
dc8c34
@@ -254,7 +254,7 @@ attributeTypes:
dc8c34
 attributeTypes:
dc8c34
     ( 1.3.6.1.4.1.3317.4.3.1.27
dc8c34
         NAME 'radiusLoginService'
dc8c34
-        DESC ''
dc8c34
+        DESC 'radiusAttribute'
dc8c34
         EQUALITY caseIgnoreIA5Match
dc8c34
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
dc8c34
         SINGLE-VALUE
dc8c34
@@ -262,7 +262,7 @@ attributeTypes:
dc8c34
 attributeTypes:
dc8c34
     ( 1.3.6.1.4.1.3317.4.3.1.28
dc8c34
         NAME 'radiusLoginTCPPort'
dc8c34
-        DESC ''
dc8c34
+        DESC 'radiusAttribute'
dc8c34
         EQUALITY caseIgnoreIA5Match
dc8c34
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
dc8c34
         SINGLE-VALUE
dc8c34
@@ -270,7 +270,7 @@ attributeTypes:
dc8c34
 attributeTypes:
dc8c34
     ( 1.3.6.1.4.1.3317.4.3.1.29
dc8c34
         NAME 'radiusPasswordRetry'
dc8c34
-        DESC ''
dc8c34
+        DESC 'radiusAttribute'
dc8c34
         EQUALITY caseIgnoreIA5Match
dc8c34
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
dc8c34
         SINGLE-VALUE
dc8c34
@@ -278,7 +278,7 @@ attributeTypes:
dc8c34
 attributeTypes:
dc8c34
     ( 1.3.6.1.4.1.3317.4.3.1.30
dc8c34
         NAME 'radiusPortLimit'
dc8c34
-        DESC ''
dc8c34
+        DESC 'radiusAttribute'
dc8c34
         EQUALITY caseIgnoreIA5Match
dc8c34
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
dc8c34
         SINGLE-VALUE
dc8c34
@@ -286,7 +286,7 @@ attributeTypes:
dc8c34
 attributeTypes:
dc8c34
     ( 1.3.6.1.4.1.3317.4.3.1.49
dc8c34
         NAME 'radiusProfileDn'
dc8c34
-        DESC ''
dc8c34
+        DESC 'radiusAttribute'
dc8c34
         EQUALITY distinguishedNameMatch
dc8c34
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.12
dc8c34
         SINGLE-VALUE
dc8c34
@@ -294,7 +294,7 @@ attributeTypes:
dc8c34
 attributeTypes:
dc8c34
     ( 1.3.6.1.4.1.3317.4.3.1.31
dc8c34
         NAME 'radiusPrompt'
dc8c34
-        DESC ''
dc8c34
+        DESC 'radiusAttribute'
dc8c34
         EQUALITY caseIgnoreIA5Match
dc8c34
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
dc8c34
         SINGLE-VALUE
dc8c34
@@ -302,7 +302,7 @@ attributeTypes:
dc8c34
 attributeTypes:
dc8c34
     ( 1.3.6.1.4.1.3317.4.3.1.50
dc8c34
         NAME 'radiusProxyToRealm'
dc8c34
-        DESC ''
dc8c34
+        DESC 'radiusAttribute'
dc8c34
         EQUALITY caseIgnoreIA5Match
dc8c34
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
dc8c34
         SINGLE-VALUE
dc8c34
@@ -310,7 +310,7 @@ attributeTypes:
dc8c34
 attributeTypes:
dc8c34
     ( 1.3.6.1.4.1.3317.4.3.1.51
dc8c34
         NAME 'radiusReplicateToRealm'
dc8c34
-        DESC ''
dc8c34
+        DESC 'radiusAttribute'
dc8c34
         EQUALITY caseIgnoreIA5Match
dc8c34
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
dc8c34
         SINGLE-VALUE
dc8c34
@@ -318,7 +318,7 @@ attributeTypes:
dc8c34
 attributeTypes:
dc8c34
     ( 1.3.6.1.4.1.3317.4.3.1.52
dc8c34
         NAME 'radiusRealm'
dc8c34
-        DESC ''
dc8c34
+        DESC 'radiusAttribute'
dc8c34
         EQUALITY caseIgnoreIA5Match
dc8c34
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
dc8c34
         SINGLE-VALUE
dc8c34
@@ -326,7 +326,7 @@ attributeTypes:
dc8c34
 attributeTypes:
dc8c34
     ( 1.3.6.1.4.1.3317.4.3.1.32
dc8c34
         NAME 'radiusServiceType'
dc8c34
-        DESC ''
dc8c34
+        DESC 'radiusAttribute'
dc8c34
         EQUALITY caseIgnoreIA5Match
dc8c34
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
dc8c34
         SINGLE-VALUE
dc8c34
@@ -334,7 +334,7 @@ attributeTypes:
dc8c34
 attributeTypes:
dc8c34
     ( 1.3.6.1.4.1.3317.4.3.1.33
dc8c34
         NAME 'radiusSessionTimeout'
dc8c34
-        DESC ''
dc8c34
+        DESC 'radiusAttribute'
dc8c34
         EQUALITY caseIgnoreIA5Match
dc8c34
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
dc8c34
         SINGLE-VALUE
dc8c34
@@ -342,7 +342,7 @@ attributeTypes:
dc8c34
 attributeTypes:
dc8c34
     ( 1.3.6.1.4.1.3317.4.3.1.34
dc8c34
         NAME 'radiusTerminationAction'
dc8c34
-        DESC ''
dc8c34
+        DESC 'radiusAttribute'
dc8c34
         EQUALITY caseIgnoreIA5Match
dc8c34
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
dc8c34
         SINGLE-VALUE
dc8c34
@@ -350,21 +350,21 @@ attributeTypes:
dc8c34
 attributeTypes:
dc8c34
     ( 1.3.6.1.4.1.3317.4.3.1.35
dc8c34
         NAME 'radiusTunnelAssignmentId'
dc8c34
-        DESC ''
dc8c34
+        DESC 'radiusAttribute'
dc8c34
         EQUALITY caseIgnoreIA5Match
dc8c34
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
dc8c34
     )
dc8c34
 attributeTypes:
dc8c34
     ( 1.3.6.1.4.1.3317.4.3.1.36
dc8c34
         NAME 'radiusTunnelMediumType'
dc8c34
-        DESC ''
dc8c34
+        DESC 'radiusAttribute'
dc8c34
         EQUALITY caseIgnoreIA5Match
dc8c34
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
dc8c34
     )
dc8c34
 attributeTypes:
dc8c34
     ( 1.3.6.1.4.1.3317.4.3.1.37
dc8c34
         NAME 'radiusTunnelPassword'
dc8c34
-        DESC ''
dc8c34
+        DESC 'radiusAttribute'
dc8c34
         EQUALITY caseIgnoreIA5Match
dc8c34
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
dc8c34
         SINGLE-VALUE
dc8c34
@@ -372,42 +372,42 @@ attributeTypes:
dc8c34
 attributeTypes:
dc8c34
     ( 1.3.6.1.4.1.3317.4.3.1.38
dc8c34
         NAME 'radiusTunnelPreference'
dc8c34
-        DESC ''
dc8c34
+        DESC 'radiusAttribute'
dc8c34
         EQUALITY caseIgnoreIA5Match
dc8c34
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
dc8c34
     )
dc8c34
 attributeTypes:
dc8c34
     ( 1.3.6.1.4.1.3317.4.3.1.39
dc8c34
         NAME 'radiusTunnelPrivateGroupId'
dc8c34
-        DESC ''
dc8c34
+        DESC 'radiusAttribute'
dc8c34
         EQUALITY caseIgnoreIA5Match
dc8c34
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
dc8c34
     )
dc8c34
 attributeTypes:
dc8c34
     ( 1.3.6.1.4.1.3317.4.3.1.40
dc8c34
         NAME 'radiusTunnelServerEndpoint'
dc8c34
-        DESC ''
dc8c34
+        DESC 'radiusAttribute'
dc8c34
         EQUALITY caseIgnoreIA5Match
dc8c34
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
dc8c34
     )
dc8c34
 attributeTypes:
dc8c34
     ( 1.3.6.1.4.1.3317.4.3.1.41
dc8c34
         NAME 'radiusTunnelType'
dc8c34
-        DESC ''
dc8c34
+        DESC 'radiusAttribute'
dc8c34
         EQUALITY caseIgnoreIA5Match
dc8c34
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
dc8c34
     )
dc8c34
 attributeTypes:
dc8c34
     ( 1.3.6.1.4.1.3317.4.3.1.42
dc8c34
         NAME 'radiusVSA'
dc8c34
-        DESC ''
dc8c34
+        DESC 'radiusAttribute'
dc8c34
         EQUALITY caseIgnoreIA5Match
dc8c34
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
dc8c34
     )
dc8c34
 attributeTypes:
dc8c34
     ( 1.3.6.1.4.1.3317.4.3.1.43
dc8c34
         NAME 'radiusTunnelClientEndpoint'
dc8c34
-        DESC ''
dc8c34
+        DESC 'radiusAttribute'
dc8c34
         EQUALITY caseIgnoreIA5Match
dc8c34
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
dc8c34
     )
dc8c34
@@ -415,14 +415,14 @@ attributeTypes:
dc8c34
 attributeTypes:
dc8c34
     ( 1.3.6.1.4.1.3317.4.3.1.53
dc8c34
         NAME 'radiusSimultaneousUse'
dc8c34
-        DESC ''
dc8c34
+        DESC 'radiusAttribute'
dc8c34
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
dc8c34
         SINGLE-VALUE
dc8c34
     )
dc8c34
 attributeTypes:
dc8c34
     ( 1.3.6.1.4.1.3317.4.3.1.54
dc8c34
         NAME 'radiusLoginTime'
dc8c34
-        DESC ''
dc8c34
+        DESC 'radiusAttribute'
dc8c34
         EQUALITY caseIgnoreIA5Match
dc8c34
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
dc8c34
         SINGLE-VALUE
dc8c34
@@ -430,7 +430,7 @@ attributeTypes:
dc8c34
 attributeTypes:
dc8c34
     ( 1.3.6.1.4.1.3317.4.3.1.55
dc8c34
         NAME 'radiusUserCategory'
dc8c34
-        DESC ''
dc8c34
+        DESC 'radiusAttribute'
dc8c34
         EQUALITY caseIgnoreIA5Match
dc8c34
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
dc8c34
         SINGLE-VALUE
dc8c34
@@ -438,14 +438,14 @@ attributeTypes:
dc8c34
 attributeTypes:
dc8c34
     ( 1.3.6.1.4.1.3317.4.3.1.56
dc8c34
         NAME 'radiusStripUserName'
dc8c34
-        DESC ''
dc8c34
+        DESC 'radiusAttribute'
dc8c34
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
dc8c34
         SINGLE-VALUE
dc8c34
     )
dc8c34
 attributeTypes:
dc8c34
     ( 1.3.6.1.4.1.3317.4.3.1.57
dc8c34
         NAME 'dialupAccess'
dc8c34
-        DESC ''
dc8c34
+        DESC 'radiusAttribute'
dc8c34
         EQUALITY caseIgnoreIA5Match
dc8c34
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
dc8c34
         SINGLE-VALUE
dc8c34
@@ -453,7 +453,7 @@ attributeTypes:
dc8c34
 attributeTypes:
dc8c34
     ( 1.3.6.1.4.1.3317.4.3.1.58
dc8c34
         NAME 'radiusExpiration'
dc8c34
-        DESC ''
dc8c34
+        DESC 'radiusAttribute'
dc8c34
         EQUALITY caseIgnoreIA5Match
dc8c34
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
dc8c34
         SINGLE-VALUE
dc8c34
@@ -461,21 +461,21 @@ attributeTypes:
dc8c34
 attributeTypes:
dc8c34
     ( 1.3.6.1.4.1.3317.4.3.1.59
dc8c34
         NAME 'radiusCheckItem'
dc8c34
-        DESC ''
dc8c34
+        DESC 'radiusAttribute'
dc8c34
         EQUALITY caseIgnoreIA5Match
dc8c34
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
dc8c34
     )
dc8c34
 attributeTypes:
dc8c34
     ( 1.3.6.1.4.1.3317.4.3.1.60
dc8c34
         NAME 'radiusReplyItem'
dc8c34
-        DESC ''
dc8c34
+        DESC 'radiusAttribute'
dc8c34
         EQUALITY caseIgnoreIA5Match
dc8c34
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
dc8c34
     )
dc8c34
 attributeTypes:
dc8c34
     ( 1.3.6.1.4.1.3317.4.3.1.61
dc8c34
         NAME 'radiusNASIpAddress'
dc8c34
-        DESC ''
dc8c34
+        DESC 'radiusAttribute'
dc8c34
         EQUALITY caseIgnoreIA5Match
dc8c34
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
dc8c34
         SINGLE-VALUE
dc8c34
@@ -483,7 +483,7 @@ attributeTypes:
dc8c34
 attributeTypes:
dc8c34
     ( 1.3.6.1.4.1.3317.4.3.1.62
dc8c34
         NAME 'radiusReplyMessage'
dc8c34
-        DESC ''
dc8c34
+        DESC 'radiusAttribute'
dc8c34
         EQUALITY caseIgnoreIA5Match
dc8c34
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
dc8c34
     )
dc8c34
@@ -491,7 +491,7 @@ objectClasses:
dc8c34
     ( 1.3.6.1.4.1.3317.4.3.2.1
dc8c34
         NAME 'radiusprofile'
dc8c34
         SUP top AUXILIARY
dc8c34
-        DESC ''
dc8c34
+        DESC 'radiusObjectclass'
dc8c34
         MUST uid
dc8c34
         MAY ( radiusArapFeatures $ radiusArapSecurity $ radiusArapZoneAccess $
dc8c34
             radiusAuthType $ radiusCallbackId $ radiusCallbackNumber $
dc8c34
@@ -529,7 +529,7 @@ objectClasses:
dc8c34
 attributeTypes:
dc8c34
     ( 1.3.6.1.4.1.3317.4.3.1.64
dc8c34
         NAME 'radiusClientSecret'
dc8c34
-        DESC ''
dc8c34
+        DESC 'radiusAttribute'
dc8c34
         EQUALITY caseIgnoreIA5Match
dc8c34
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
dc8c34
         SINGLE-VALUE
dc8c34
@@ -537,7 +537,7 @@ attributeTypes:
dc8c34
 attributeTypes:
dc8c34
     ( 1.3.6.1.4.1.3317.4.3.1.65
dc8c34
         NAME 'radiusClientNASType'
dc8c34
-        DESC ''
dc8c34
+        DESC 'radiusAttribute'
dc8c34
         EQUALITY caseIgnoreIA5Match
dc8c34
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
dc8c34
         SINGLE-VALUE
dc8c34
@@ -545,7 +545,7 @@ attributeTypes:
dc8c34
 attributeTypes:
dc8c34
     ( 1.3.6.1.4.1.3317.4.3.1.66
dc8c34
         NAME 'radiusClientShortName'
dc8c34
-        DESC ''
dc8c34
+        DESC 'radiusAttribute'
dc8c34
         EQUALITY caseIgnoreIA5Match
dc8c34
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
dc8c34
     )
dc8c34
diff --git a/ldap/schema/60samba3.ldif b/ldap/schema/60samba3.ldif
dc8c34
index 5dd5f31..91c17be 100644
dc8c34
--- a/ldap/schema/60samba3.ldif
dc8c34
+++ b/ldap/schema/60samba3.ldif
dc8c34
@@ -204,7 +204,7 @@ attributeTypes: (
dc8c34
 attributeTypes: (
dc8c34
   1.3.6.1.4.1.7165.2.1.47
dc8c34
   NAME 'sambaMungedDial'
dc8c34
-  DESC ''
dc8c34
+  DESC 'sambaMungedDial'
dc8c34
   EQUALITY caseExactMatch
dc8c34
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1050}
dc8c34
   )
dc8c34
-- 
dc8c34
1.8.1.4
dc8c34