upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-11 01:12:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

don't allow '{' in TK_BAREWORD (ITS#4116)

Browse source
This commit is contained in:
Pierangelo Masarati 2005-11-07 22:53:43 +00:00
parent 1faf38448b
commit 5be72fe816
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libraries/libldap/schema.c
View file

@ -1027,6 +1027,9 @@ get_token( const char ** sp, char ** token_val )
**sp != ')' &&
**sp != '$' &&
**sp != '\'' &&
/* for suggested minimum upper bound on the number
* of characters <draft-ietf-ldapbis-syntaxes> */
**sp != '{' &&
**sp != '\0' )
(*sp)++;
q = *sp;
@ -2053,7 +2056,8 @@ ldap_str2attributetype( LDAP_CONST char * s,
if ( !at->at_oid ) {
if ( ( flags & ( LDAP_SCHEMA_ALLOW_NO_OID
| LDAP_SCHEMA_ALLOW_OID_MACRO ) )
&& (ss == savepos) ) {
&& (ss == savepos) )
{
/* Backtracking */
ss = savepos;
kind = get_token(&ss,&sval);
@ -2070,11 +2074,13 @@ ldap_str2attributetype( LDAP_CONST char * s,
!strcasecmp(sval, "COLLECTIVE") ||
!strcasecmp(sval, "NO-USER-MODIFICATION") ||
!strcasecmp(sval, "USAGE") ||
!strncasecmp(sval, "X-", 2) ) {
!strncasecmp(sval, "X-", 2) )
{
/* Missing OID, backtrack */
ss = savepos;
} else if ( flags
& LDAP_SCHEMA_ALLOW_OID_MACRO) {
& LDAP_SCHEMA_ALLOW_OID_MACRO)
{
/* Non-numerical OID ... */
int len = ss-savepos;
at->at_oid = LDAP_MALLOC(len+1);