upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-23 16:19:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

All empty IA5 and Printable strings, but not Directory strings.

Browse source
This commit is contained in:
Kurt Zeilenga 2002-01-03 20:03:27 +00:00
parent 32b764a9b0
commit f5ab06738b
1 changed files with 4 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
servers/slapd/schema_init.c
View file

@ -1939,8 +1939,6 @@ printableStringValidate(
{ {
ber_len_t i; ber_len_t i;
if( !val->bv_len ) return LDAP_INVALID_SYNTAX;
for(i=0; i < val->bv_len; i++) { for(i=0; i < val->bv_len; i++) {
if( !SLAP_PRINTABLE(val->bv_val[i]) ) { if( !SLAP_PRINTABLE(val->bv_val[i]) ) {
return LDAP_INVALID_SYNTAX; return LDAP_INVALID_SYNTAX;
@ -1957,8 +1955,6 @@ printablesStringValidate(
{ {
ber_len_t i; ber_len_t i;
if( !val->bv_len ) return LDAP_INVALID_SYNTAX;
for(i=0; i < val->bv_len; i++) { for(i=0; i < val->bv_len; i++) {
if( !SLAP_PRINTABLES(val->bv_val[i]) ) { if( !SLAP_PRINTABLES(val->bv_val[i]) ) {
return LDAP_INVALID_SYNTAX; return LDAP_INVALID_SYNTAX;
@ -1975,10 +1971,10 @@ IA5StringValidate(
{ {
ber_len_t i; ber_len_t i;
if( !val->bv_len ) return LDAP_INVALID_SYNTAX;
for(i=0; i < val->bv_len; i++) { for(i=0; i < val->bv_len; i++) {
if( !isascii(val->bv_val[i]) ) return LDAP_INVALID_SYNTAX; if( !LDAP_ASCII(val->bv_val[i]) ) {
return LDAP_INVALID_SYNTAX;
}
} }
return LDAP_SUCCESS; return LDAP_SUCCESS;
@ -1999,10 +1995,6 @@ IA5StringNormalize(
p++; p++;
} }
if( *p == '\0' ) {
return LDAP_INVALID_SYNTAX;
}
normalized->bv_val = ch_strdup( p ); normalized->bv_val = ch_strdup( p );
p = q = normalized->bv_val; p = q = normalized->bv_val;
@ -2019,12 +2011,9 @@ IA5StringNormalize(
} }
} }
assert( normalized->bv_val < p ); assert( normalized->bv_val <= p );
assert( q <= p ); assert( q <= p );
/* cannot start with a space */
assert( !ASCII_SPACE(*normalized->bv_val) );
/* /*
* If the string ended in space, backup the pointer one * If the string ended in space, backup the pointer one
* position. One is enough because the above loop collapsed * position. One is enough because the above loop collapsed
@ -2035,9 +2024,6 @@ IA5StringNormalize(
--q; --q;
} }
/* cannot end with a space */
assert( !ASCII_SPACE( q[-1] ) );
/* null terminate */ /* null terminate */
*q = '\0'; *q = '\0';