You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by er...@apache.org on 2005/10/28 06:01:33 UTC
svn commit: r329077 - in /directory/apacheds/trunk/core/src/main/schema:
apache.schema apachedns.schema
Author: erodriguez
Date: Thu Oct 27 21:01:29 2005
New Revision: 329077
URL: http://svn.apache.org/viewcvs?rev=329077&view=rev
Log:
Updates to apacheds-core schema:
o Near total re-write of DNS schema to simply administration.
o Addition to apache.schema of objectClass and attribute types for configuring catalogs for DNS, Kerberos, and Change Password.
Modified:
directory/apacheds/trunk/core/src/main/schema/apache.schema
directory/apacheds/trunk/core/src/main/schema/apachedns.schema
Modified: directory/apacheds/trunk/core/src/main/schema/apache.schema
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/schema/apache.schema?rev=329077&r1=329076&r2=329077&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/schema/apache.schema (original)
+++ directory/apacheds/trunk/core/src/main/schema/apache.schema Thu Oct 27 21:01:29 2005
@@ -129,3 +129,47 @@
AUXILIARY
MUST prescriptiveACI )
+
+attributetype ( 1.2.6.1.4.1.18060.1.1.1.3.15
+ NAME 'apacheServicePid'
+ DESC 'A string up to 256 characters in length'
+ EQUALITY caseIgnoreIA5Match
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} SINGLE-VALUE )
+
+attributetype ( 1.2.6.1.4.1.18060.1.1.1.3.16
+ NAME 'apacheServiceFactoryPid'
+ DESC 'A string up to 256 characters in length'
+ EQUALITY caseIgnoreIA5Match
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} SINGLE-VALUE )
+
+objectclass ( 1.2.6.1.4.1.18060.1.1.1.4.3
+ NAME 'apacheServiceConfiguration'
+ SUP top
+ STRUCTURAL
+ MUST ( cn $ apacheServicePid )
+ MAY ( apacheServiceFactoryPid ) )
+
+objectclass ( 1.2.6.1.4.1.18060.1.1.1.4.4
+ NAME 'apacheFactoryConfiguration'
+ SUP top
+ STRUCTURAL
+ MUST ( cn $ apacheServicePid ) )
+
+attributetype ( 1.2.6.1.4.1.18060.1.1.1.3.17
+ NAME 'apacheCatalogEntryName'
+ DESC 'A string up to 256 characters in length'
+ EQUALITY caseIgnoreIA5Match
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} SINGLE-VALUE )
+
+attributetype ( 1.2.6.1.4.1.18060.1.1.1.3.18
+ NAME 'apacheCatalogEntryBaseDn'
+ DESC 'A string up to 256 characters in length'
+ EQUALITY caseIgnoreIA5Match
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} SINGLE-VALUE )
+
+objectclass ( 1.2.6.1.4.1.18060.1.1.1.4.5
+ NAME 'apacheCatalogEntry'
+ SUP top
+ STRUCTURAL
+ MUST ( cn $ apacheCatalogEntryBaseDn )
+ MAY ( apacheCatalogEntryName ) )
Modified: directory/apacheds/trunk/core/src/main/schema/apachedns.schema
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/schema/apachedns.schema?rev=329077&r1=329076&r2=329077&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/schema/apachedns.schema (original)
+++ directory/apacheds/trunk/core/src/main/schema/apachedns.schema Thu Oct 27 21:01:29 2005
@@ -11,91 +11,80 @@
# +---------------------------+-----------------+
# =============================================================================
-attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.1 NAME 'apacheDnsName'
- DESC 'A sequence of labels representing a domain name or host name'
- EQUALITY caseIgnoreIA5Match
- SUBSTR caseIgnoreIA5SubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
-
-attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.2 NAME 'apacheDnsType'
- DESC 'The type of a resource record'
- EQUALITY caseIgnoreIA5Match
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
-
-attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.3 NAME 'apacheDnsClass'
+attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.1 NAME 'apacheDnsClass'
DESC 'The class of a resource record'
EQUALITY caseIgnoreIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
-attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.4 NAME 'apacheDnsTtl'
+attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.2 NAME 'apacheDnsTtl'
DESC 'An integer denoting time to live'
EQUALITY integerMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
-attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.5 NAME 'apacheDnsDomainName'
+attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.3 NAME 'apacheDnsDomainName'
DESC 'A domain name represented as a sequence of labels'
EQUALITY caseIgnoreIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} SINGLE-VALUE )
-attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.6 NAME 'apacheDnsIpAddress'
+attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.4 NAME 'apacheDnsCharacterString'
+ DESC 'A string up to 256 characters in length'
+ EQUALITY caseIgnoreIA5Match
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} SINGLE-VALUE )
+
+attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.5 NAME 'apacheDnsIpAddress'
DESC 'A 4 octet IP address'
EQUALITY caseIgnoreIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{128} SINGLE-VALUE )
-attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.7 NAME 'apacheDnsSoaMName'
+attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.6 NAME 'apacheDnsSoaMName'
DESC 'The domain name of the name server that was the primary source of data for this zone'
SUP apacheDnsDomainName SINGLE-VALUE )
-attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.8 NAME 'apacheDnsSoaRName'
+attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.7 NAME 'apacheDnsSoaRName'
DESC 'The domain name which specifies the mailbox of the person responsible for this zone'
SUP apacheDnsDomainName SINGLE-VALUE )
-attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.9 NAME 'apacheDnsSoaSerial'
+attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.8 NAME 'apacheDnsSoaSerial'
DESC 'The unsigned 32 bit version number of the original copy of the zone'
EQUALITY integerMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
-attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.10 NAME 'apacheDnsSoaRefresh'
+attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.9 NAME 'apacheDnsSoaRefresh'
DESC 'A 32 bit time interval before the zone should be refreshed'
EQUALITY integerMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
-attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.11 NAME 'apacheDnsSoaRetry'
+attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.10 NAME 'apacheDnsSoaRetry'
DESC 'A 32 bit time interval that should elapse before a failed refresh should be retired'
EQUALITY integerMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
-attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.12 NAME 'apacheDnsSoaExpire'
+attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.11 NAME 'apacheDnsSoaExpire'
DESC 'A 32 bit time value that specifies the upper limit on the time interval that can elapse before the zone is no longer authoritative'
EQUALITY integerMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
-attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.13 NAME 'apacheDnsSoaMinimum'
+attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.12 NAME 'apacheDnsSoaMinimum'
DESC 'The unsigned 32 bit minimum TTL field that should be exported with any RR from this zone.'
EQUALITY integerMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
-attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.14 NAME 'apacheDnsMxPreference'
+attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.13 NAME 'apacheDnsMxPreference'
DESC 'An integer denoting the mail exchange preference'
EQUALITY integerMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
-attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.15 NAME 'apacheDnsCharacterString'
- DESC 'A string up to 256 characters in length'
- EQUALITY caseIgnoreIA5Match
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} SINGLE-VALUE )
-
-attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.16 NAME 'apacheDnsServicePriority'
+attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.14 NAME 'apacheDnsServicePriority'
DESC 'The unsigned 16 bit priority of this target host'
EQUALITY integerMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
-attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.17 NAME 'apacheDnsServiceWeight'
+attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.15 NAME 'apacheDnsServiceWeight'
DESC 'The unsigned 16 bit weight specifying a relative weight for entries with the same priority'
EQUALITY integerMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
-attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.18 NAME 'apacheDnsServicePort'
+attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.16 NAME 'apacheDnsServicePort'
DESC 'The unsigned 16 bit port on this target host of this service'
EQUALITY integerMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
@@ -104,8 +93,9 @@
NAME 'apacheDnsAbstractRecord'
DESC 'An abstract DNS record objectClass used to build other specific structural objectclasses for different record types'
SUP top
- ABSTRACT
- MUST ( apacheDnsName $ apacheDnsType $ apacheDnsClass $ apacheDnsTtl ) )
+ ABSTRACT
+ MUST cn
+ MAY ( apacheDnsTtl $ description ) )
objectclass ( 1.2.6.1.4.1.18060.1.1.2.4.2
NAME 'apacheDnsAddressRecord'
@@ -129,7 +119,8 @@
NAME 'apacheDnsStartOfAuthorityRecord'
DESC 'A start of authority SOA record'
SUP apacheDnsAbstractRecord
- MUST ( apacheDnsSoaMName $ apacheDnsSoaRName $ apacheDnsSoaSerial $ apacheDnsSoaRefresh $ apacheDnsSoaRetry $ apacheDnsSoaExpire $ apacheDnsSoaMinimum ) )
+ MUST ( apacheDnsSoaMName $ apacheDnsSoaRName $ apacheDnsSoaMinimum )
+ MAY ( apacheDnsClass $ apacheDnsSoaSerial $ apacheDnsSoaRefresh $ apacheDnsSoaRetry $ apacheDnsSoaExpire ) )
objectclass ( 1.2.6.1.4.1.18060.1.1.2.4.6
NAME 'apacheDnsCanonicalNameRecord'
@@ -154,3 +145,15 @@
DESC 'A service SRV record'
SUP apacheDnsAbstractRecord
MUST ( apacheDnsServicePriority $ apacheDnsServiceWeight $ apacheDnsServicePort $ apacheDnsDomainName ) )
+
+objectclass ( 1.2.6.1.4.1.18060.1.1.2.4.10
+ NAME 'apacheDnsReferralNameServer'
+ DESC 'A non-authoritative referral or delegation name server'
+ SUP apacheDnsAbstractRecord
+ MUST apacheDnsDomainName )
+
+objectclass ( 1.2.6.1.4.1.18060.1.1.2.4.11
+ NAME 'apacheDnsReferralAddress'
+ DESC 'A non-authoritative referral or glue address record'
+ SUP apacheDnsAbstractRecord
+ MUST ( apacheDnsDomainName $ apacheDnsIpAddress ) )