X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=libraries%2Flibldap%2Fschema.c;h=72e4618876d365e19160171425cd64906a0003ee;hb=427f4ee0f66cac081a712e4ccc08609813b17fdc;hp=acefcc1efb21d67cbc5e03d92ab676e4c253ef15;hpb=c890c96d13c53cf0fa1d9580fea2ab47a2c8caa9;p=openldap diff --git a/libraries/libldap/schema.c b/libraries/libldap/schema.c index acefcc1efb..72e4618876 100644 --- a/libraries/libldap/schema.c +++ b/libraries/libldap/schema.c @@ -1,7 +1,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2008 The OpenLDAP Foundation. + * Copyright 1998-2010 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -30,6 +30,8 @@ #include +static const char EndOfInput[] = "end of input"; + static const char * choose_name( char *names[], const char *fallback ) { @@ -1514,7 +1516,7 @@ ldap_str2syntax( LDAP_CONST char * s, switch (kind) { case TK_EOS: *code = LDAP_SCHERR_NORIGHTPAREN; - *errp = ss; + *errp = EndOfInput; ldap_syntax_free(syn); return NULL; case TK_RIGHTPAREN: @@ -1679,7 +1681,7 @@ ldap_str2matchingrule( LDAP_CONST char * s, switch (kind) { case TK_EOS: *code = LDAP_SCHERR_NORIGHTPAREN; - *errp = ss; + *errp = EndOfInput; ldap_matchingrule_free(mr); return NULL; case TK_RIGHTPAREN: @@ -1878,7 +1880,7 @@ ldap_str2matchingruleuse( LDAP_CONST char * s, switch (kind) { case TK_EOS: *code = LDAP_SCHERR_NORIGHTPAREN; - *errp = ss; + *errp = EndOfInput; ldap_matchingruleuse_free(mru); return NULL; case TK_RIGHTPAREN: @@ -2110,7 +2112,7 @@ ldap_str2attributetype( LDAP_CONST char * s, switch (kind) { case TK_EOS: *code = LDAP_SCHERR_NORIGHTPAREN; - *errp = ss; + *errp = EndOfInput; ldap_attributetype_free(at); return NULL; case TK_RIGHTPAREN: @@ -2483,7 +2485,7 @@ ldap_str2objectclass( LDAP_CONST char * s, switch (kind) { case TK_EOS: *code = LDAP_SCHERR_NORIGHTPAREN; - *errp = ss; + *errp = EndOfInput; ldap_objectclass_free(oc); return NULL; case TK_RIGHTPAREN: @@ -2762,7 +2764,7 @@ ldap_str2contentrule( LDAP_CONST char * s, switch (kind) { case TK_EOS: *code = LDAP_SCHERR_NORIGHTPAREN; - *errp = ss; + *errp = EndOfInput; ldap_contentrule_free(cr); return NULL; case TK_RIGHTPAREN: @@ -2987,7 +2989,7 @@ ldap_str2structurerule( LDAP_CONST char * s, switch (kind) { case TK_EOS: *code = LDAP_SCHERR_NORIGHTPAREN; - *errp = ss; + *errp = EndOfInput; ldap_structurerule_free(sr); return NULL; case TK_RIGHTPAREN: @@ -3176,7 +3178,7 @@ ldap_str2nameform( LDAP_CONST char * s, switch (kind) { case TK_EOS: *code = LDAP_SCHERR_NORIGHTPAREN; - *errp = ss; + *errp = EndOfInput; ldap_nameform_free(nf); return NULL; case TK_RIGHTPAREN: