upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-24 08:39:37 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

some LDAP ASN.1 updates from 4511/4526

Browse source
This commit is contained in:
Kurt Zeilenga 2006-06-15 05:18:06 +00:00
parent 8f1c5c4df5
commit 3f9201e95b
3 changed files with 41 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libraries/libldap/controls.c
View file

@ -30,13 +30,13 @@
* can be found in the file "build/LICENSE-2.0.1" in this distribution
* of OpenLDAP Software.
*/
/* Portions Copyright (C) The Internet Society (1997)
* ASN.1 fragments are from RFC 2251; see RFC for full legal notices.
/* Portions Copyright (C) The Internet Society (2006)
* ASN.1 fragments are from RFC 4511; see RFC for full legal notices.
*/
/* LDAPv3 Controls (RFC2251)
/* LDAPv3 Controls (RFC 4511)
*
* Controls ::= SEQUENCE OF Control
* Controls ::= SEQUENCE OF control Control
*
* Control ::= SEQUENCE {
* controlType LDAPOID,

60
libraries/libldap/filter.c
View file

@ -16,8 +16,8 @@
/* Portions Copyright (c) 1990 Regents of the University of Michigan.
* All rights reserved.
*/
/* Portions Copyright (C) The Internet Society (1997).
* ASN.1 fragments are from RFC 2251; see RFC for full legal notices.
/* Portions Copyright (C) The Internet Society (2006)
* ASN.1 fragments are from RFC 4511; see RFC for full legal notices.
*/
#include "portable.h"
@ -334,36 +334,36 @@ ldap_pvt_put_filter( BerElement *ber, const char *str_in )
int parens, balance, escape;
/*
* A Filter looks like this:
* Filter ::= CHOICE {
* and [0] SET OF Filter,
* or [1] SET OF Filter,
* not [2] Filter,
* equalityMatch [3] AttributeValueAssertion,
* substrings [4] SubstringFilter,
* greaterOrEqual [5] AttributeValueAssertion,
* lessOrEqual [6] AttributeValueAssertion,
* present [7] AttributeType,
* approxMatch [8] AttributeValueAssertion,
* extensibleMatch [9] MatchingRuleAssertion -- LDAPv3
* }
* A Filter looks like this (RFC 4511 as extended by RFC 4526):
* Filter ::= CHOICE {
* and [0] SET SIZE (0..MAX) OF filter Filter,
* or [1] SET SIZE (0..MAX) OF filter Filter,
* not [2] Filter,
* equalityMatch [3] AttributeValueAssertion,
* substrings [4] SubstringFilter,
* greaterOrEqual [5] AttributeValueAssertion,
* lessOrEqual [6] AttributeValueAssertion,
* present [7] AttributeDescription,
* approxMatch [8] AttributeValueAssertion,
* extensibleMatch [9] MatchingRuleAssertion,
* ... }
*
* SubstringFilter ::= SEQUENCE {
* type AttributeType,
* SEQUENCE OF CHOICE {
* initial [0] IA5String,
* any [1] IA5String,
* final [2] IA5String
* }
* }
* SubstringFilter ::= SEQUENCE {
* type AttributeDescription,
* substrings SEQUENCE SIZE (1..MAX) OF substring CHOICE {
* initial [0] AssertionValue, -- only once
* any [1] AssertionValue,
* final [2] AssertionValue -- only once
* }
* }
*
* MatchingRuleAssertion ::= SEQUENCE { -- LDAPv3
* matchingRule [1] MatchingRuleId OPTIONAL,
* type [2] AttributeDescription OPTIONAL,
* matchValue [3] AssertionValue,
* dnAttributes [4] BOOLEAN DEFAULT FALSE }
* MatchingRuleAssertion ::= SEQUENCE {
* matchingRule [1] MatchingRuleId OPTIONAL,
* type [2] AttributeDescription OPTIONAL,
* matchValue [3] AssertionValue,
* dnAttributes [4] BOOLEAN DEFAULT FALSE }
*
* Note: tags in a choice are always explicit
* Note: tags in a CHOICE are always explicit
*/
Debug( LDAP_DEBUG_TRACE, "put_filter: \"%s\"\n", str_in, 0, 0 );
@ -586,7 +586,7 @@ put_simple_filter(
break;
case ':':
/* RFC2254 extensible filters are off the form:
/* RFC 4515 extensible filters are off the form:
* type [:dn] [:rule] := value
* or [:dn]:rule := value
*/

14
libraries/libldap/result.c
View file

@ -37,17 +37,17 @@
* can be found in the file "build/LICENSE-2.0.1" in this distribution
* of OpenLDAP Software.
*/
/* Portions Copyright (C) The Internet Society (1997)
* ASN.1 fragments are from RFC 2251; see RFC for full legal notices.
/* Portions Copyright (C) The Internet Society (2006)
* ASN.1 fragments are from RFC 4511; see RFC for full legal notices.
*/
/*
* LDAPv3 (RFC2251)
* LDAPv3 (RFC 4511)
* LDAPResult ::= SEQUENCE {
* resultCode ENUMERATED { ... },
* matchedDN LDAPDN,
* errorMessage LDAPString,
* referral Referral OPTIONAL
* resultCode ENUMERATED { ... },
* matchedDN LDAPDN,
* diagnosticMessage LDAPString,
* referral [3] Referral OPTIONAL
* }
* Referral ::= SEQUENCE OF LDAPURL (one or more)
* LDAPURL ::= LDAPString (limited to URL chars)