Commit 99b954e2 authored by Kurt Zeilenga's avatar Kurt Zeilenga
Browse files

LDAPBIS cleanup

parent 672f8ef3
......@@ -1073,7 +1073,7 @@ parse_comp_filter( Operation* op, ComponentAssertionValue* cav,
ber_tag_t tag;
int err;
ComponentFilter f;
/* TAG : item, and, or, not in RFC 2254 */
/* TAG : item, and, or, not in RFC 4515 */
tag = strip_cav_tag( cav );
if ( tag == LBER_ERROR ) {
......
......@@ -120,11 +120,11 @@ schema_info( Entry **entry, const char **text )
char timebuf[ LDAP_LUTIL_GENTIME_BUFSIZE ];
/*
* According to RFC 2251:
* According to RFC 4512:
Servers SHOULD provide the attributes createTimestamp and
modifyTimestamp in subschema entries, in order to allow clients to
maintain their caches of schema information.
Servers SHOULD maintain the 'creatorsName', 'createTimestamp',
'modifiersName', and 'modifyTimestamp' attributes for all entries of
the DIT.
* to be conservative, we declare schema created
* AND modified at server startup time ...
......
......@@ -710,11 +710,14 @@ bitStringValidate(
return LDAP_INVALID_SYNTAX;
}
/*
* RFC 2252 section 6.3 Bit String
* bitstring = "'" *binary-digit "'B"
* binary-digit = "0" / "1"
* example: '0101111101'B
/* RFC 4517 Section 3.3.2 Bit String:
* BitString = SQUOTE *binary-digit SQUOTE "B"
* binary-digit = "0" / "1"
*
* where SQUOTE [RFC4512] is
* SQUOTE = %x27 ; single quote ("'")
*
* Example: '0101111101'B
*/
if( in->bv_val[0] != '\'' ||
......@@ -734,39 +737,7 @@ bitStringValidate(
}
/*
* Syntax is [RFC2252]:
*
6.3. Bit String
( 1.3.6.1.4.1.1466.115.121.1.6 DESC 'Bit String' )
Values in this syntax are encoded according to the following BNF:
bitstring = "'" *binary-digit "'B"
binary-digit = "0" / "1"
...
6.21. Name And Optional UID
( 1.3.6.1.4.1.1466.115.121.1.34 DESC 'Name And Optional UID' )
Values in this syntax are encoded according to the following BNF:
NameAndOptionalUID = DistinguishedName [ "#" bitstring ]
Although the '#' character may occur in a string representation of a
distinguished name, no additional special quoting is done. This
syntax has been added subsequent to RFC 1778.
Example:
1.3.6.1.4.1.1466.0=#04024869,O=Test,C=GB#'0101'B
*
* draft-ietf-ldapbis-syntaxes-xx.txt says:
* Syntaxes from RFC 4517
*
3.3.2. Bit String
......
......@@ -157,7 +157,7 @@ LDAP_BEGIN_DECL
* on normalized/pretty DN, such that ';' is never used
* as RDN separator, and all occurrences of ';' must be escaped */
#define DN_SEPARATOR(c) ((c) == ',')
#define RDN_ATTRTYPEANDVALUE_SEPARATOR(c) ((c) == '+') /* RFC 2253 */
#define RDN_ATTRTYPEANDVALUE_SEPARATOR(c) ((c) == '+') /* RFC 4514 */
#define RDN_SEPARATOR(c) (DN_SEPARATOR(c) || RDN_ATTRTYPEANDVALUE_SEPARATOR(c))
#define RDN_NEEDSESCAPE(c) ((c) == '\\' || (c) == '"')
......@@ -461,7 +461,7 @@ typedef struct slap_matching_rule_use MatchingRuleUse;
typedef struct slap_matching_rule {
LDAPMatchingRule smr_mrule;
MatchingRuleUse *smr_mru;
/* RFC2252 string representation */
/* RFC 4512 string representation */
struct berval smr_str;
/*
* Note: the former
......@@ -590,7 +590,7 @@ typedef struct slap_matching_rule {
struct slap_matching_rule_use {
LDAPMatchingRuleUse smru_mruleuse;
MatchingRule *smru_mr;
/* RFC2252 string representation */
/* RFC 4512 string representation */
struct berval smru_str;
LDAP_SLIST_ENTRY(slap_matching_rule_use) smru_next;
......
/* str2filter.c - parse an RFC 2554 string filter */
/* str2filter.c - parse an RFC 4515 string filter */
/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment