diff options
author | Stig Bjørlykke <stig@bjorlykke.org> | 2010-01-11 13:36:30 +0000 |
---|---|---|
committer | Stig Bjørlykke <stig@bjorlykke.org> | 2010-01-11 13:36:30 +0000 |
commit | df508b7b9618a72f6a3bce37f9e9e0717129cb98 (patch) | |
tree | fe7f613272c998f459023e95a40bed8e06768425 /asn1 | |
parent | 3a79a595173a89cc12466cb204ff99cfa8f27fe9 (diff) |
Update to X.518:08/2005 to add DitBridgeKnowledge.
Export Exclusions.
svn path=/trunk/; revision=31493
Diffstat (limited to 'asn1')
-rw-r--r-- | asn1/dsp/dsp.asn | 25 | ||||
-rw-r--r-- | asn1/dsp/dsp.cnf | 2 |
2 files changed, 20 insertions, 7 deletions
diff --git a/asn1/dsp/dsp.asn b/asn1/dsp/dsp.asn index 405a2bbc1d..e0f2a6508a 100644 --- a/asn1/dsp/dsp.asn +++ b/asn1/dsp/dsp.asn @@ -1,4 +1,4 @@ --- Module DistributedOperations (X.518:02/2001) +-- Module DistributedOperations (X.518:08/2005) DistributedOperations {joint-iso-itu-t ds(5) module(1) distributedOperations(3) 4} DEFINITIONS ::= BEGIN @@ -42,7 +42,7 @@ IMPORTS id-errcode-dsaReferral FROM DirectoryAccessProtocol {joint-iso-itu-t ds(5) module(1) dap(11) 4} -- from ITU-T Rec. X.520 | ISO/IEC 9594-6 - PresentationAddress, ProtocolInformation, UniqueIdentifier + DirectoryString{}, PresentationAddress, ProtocolInformation, UniqueIdentifier FROM SelectedAttributeTypes {joint-iso-itu-t ds(5) module(1) selectedAttributeTypes(5) 4} -- from ITU-T Rec. X.880 | ISO/IEC 13712-1 @@ -362,8 +362,7 @@ DSAReferral ::= CHOICE { ChainingArguments ::= SET { originator [0] DistinguishedName OPTIONAL, targetObject [1] DistinguishedName OPTIONAL, - operationProgress - [2] OperationProgress DEFAULT {nameResolutionPhase notStarted}, + operationProgress [2] OperationProgress DEFAULT {nameResolutionPhase notStarted}, traceInformation [3] TraceInformation, aliasDereferenced [4] BOOLEAN DEFAULT FALSE, aliasedRDNs [5] INTEGER OPTIONAL, @@ -382,7 +381,11 @@ ChainingArguments ::= SET { operationIdentifier [17] INTEGER OPTIONAL, searchRuleId [18] SearchRuleId OPTIONAL, chainedRelaxation [19] MRMapping OPTIONAL, - relatedEntry [20] INTEGER OPTIONAL + relatedEntry [20] INTEGER OPTIONAL, + dspPaging [21] BOOLEAN DEFAULT FALSE, + nonDapPdu [22] ENUMERATED { ldap (0) } OPTIONAL, + streamedResults [23] INTEGER OPTIONAL, + excludeWriteableCopies [24] BOOLEAN DEFAULT FALSE } Time ::= CHOICE {utcTime UTCTime, @@ -419,14 +422,17 @@ TraceItem ::= SET { ReferenceType ::= ENUMERATED { superior(1), subordinate(2), cross(3), nonSpecificSubordinate(4), - supplier(5), master(6), immediateSuperior(7), self(8)} + supplier(5), master(6), immediateSuperior(7), self(8), ditBridge(9)} AccessPoint ::= SET { ae-title [0] Name, address [1] PresentationAddress, - protocolInformation [2] SET --SIZE (1..MAX)-- OF ProtocolInformation OPTIONAL + protocolInformation [2] SET --SIZE (1..MAX)-- OF ProtocolInformation OPTIONAL, + labeledURI [6] LabeledURI OPTIONAL } +LabeledURI ::= DirectoryString{--ub-labeledURI--} + MasterOrShadowAccessPoint ::= SET { -- COMPONENTS OF AccessPoint, ae-title [0] Name, @@ -448,6 +454,11 @@ AccessPointInformation ::= SET { additionalPoints [4] MasterAndShadowAccessPoints OPTIONAL } +DitBridgeKnowledge ::= SEQUENCE { + domainLocalID DirectoryString{--ub-domainLocalID--} OPTIONAL, + accessPoints MasterAndShadowAccessPoints +} + Exclusions ::= SET --SIZE (1..MAX)-- OF RDNSequence ContinuationReference ::= SET { diff --git a/asn1/dsp/dsp.cnf b/asn1/dsp/dsp.cnf index 5a9fbf7dca..a5ee1386e2 100644 --- a/asn1/dsp/dsp.cnf +++ b/asn1/dsp/dsp.cnf @@ -13,6 +13,7 @@ ReferenceType ContinuationReference AccessPoint MasterAndShadowAccessPoints +Exclusions #.TYPE_RENAME @@ -32,3 +33,4 @@ AccessPoint B "2.5.12.1" "id-doa-myAccessPoint" AccessPoint B "2.5.12.2" "id-doa-superiorKnowledge" MasterAndShadowAccessPoints B "2.5.12.3" "id-doa-specificKnowledge" MasterAndShadowAccessPoints B "2.5.12.4" "id-doa-nonSpecificKnowledge" +DitBridgeKnowledge B "2.5.12.8" "id-doa-ditBridgeKnowledge" |