mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

ITS#5458 fix error message for missing closing paren

Browse Source
This commit is contained in:
Howard Chu 2008-04-10 18:36:15 +00:00
parent 0669adf635
commit 8810ef26b6
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libraries/libldap/schema.c
View File

@ -30,6 +30,8 @@
#include <ldap_schema.h> #include <ldap_schema.h>
static const char EndOfInput[] = "end of input";
static const char * static const char *
choose_name( char *names[], const char *fallback ) choose_name( char *names[], const char *fallback )
{ {
@ -1514,7 +1516,7 @@ ldap_str2syntax( LDAP_CONST char * s,
switch (kind) { switch (kind) {
case TK_EOS: case TK_EOS:
*code = LDAP_SCHERR_NORIGHTPAREN; *code = LDAP_SCHERR_NORIGHTPAREN;
*errp = ss; *errp = EndOfInput;
ldap_syntax_free(syn); ldap_syntax_free(syn);
return NULL; return NULL;
case TK_RIGHTPAREN: case TK_RIGHTPAREN:
@ -1679,7 +1681,7 @@ ldap_str2matchingrule( LDAP_CONST char * s,
switch (kind) { switch (kind) {
case TK_EOS: case TK_EOS:
*code = LDAP_SCHERR_NORIGHTPAREN; *code = LDAP_SCHERR_NORIGHTPAREN;
*errp = ss; *errp = EndOfInput;
ldap_matchingrule_free(mr); ldap_matchingrule_free(mr);
return NULL; return NULL;
case TK_RIGHTPAREN: case TK_RIGHTPAREN:
@ -1878,7 +1880,7 @@ ldap_str2matchingruleuse( LDAP_CONST char * s,
switch (kind) { switch (kind) {
case TK_EOS: case TK_EOS:
*code = LDAP_SCHERR_NORIGHTPAREN; *code = LDAP_SCHERR_NORIGHTPAREN;
*errp = ss; *errp = EndOfInput;
ldap_matchingruleuse_free(mru); ldap_matchingruleuse_free(mru);
return NULL; return NULL;
case TK_RIGHTPAREN: case TK_RIGHTPAREN:
@ -2110,7 +2112,7 @@ ldap_str2attributetype( LDAP_CONST char * s,
switch (kind) { switch (kind) {
case TK_EOS: case TK_EOS:
*code = LDAP_SCHERR_NORIGHTPAREN; *code = LDAP_SCHERR_NORIGHTPAREN;
*errp = ss; *errp = EndOfInput;
ldap_attributetype_free(at); ldap_attributetype_free(at);
return NULL; return NULL;
case TK_RIGHTPAREN: case TK_RIGHTPAREN:
@ -2483,7 +2485,7 @@ ldap_str2objectclass( LDAP_CONST char * s,
switch (kind) { switch (kind) {
case TK_EOS: case TK_EOS:
*code = LDAP_SCHERR_NORIGHTPAREN; *code = LDAP_SCHERR_NORIGHTPAREN;
*errp = ss; *errp = EndOfInput;
ldap_objectclass_free(oc); ldap_objectclass_free(oc);
return NULL; return NULL;
case TK_RIGHTPAREN: case TK_RIGHTPAREN:
@ -2762,7 +2764,7 @@ ldap_str2contentrule( LDAP_CONST char * s,
switch (kind) { switch (kind) {
case TK_EOS: case TK_EOS:
*code = LDAP_SCHERR_NORIGHTPAREN; *code = LDAP_SCHERR_NORIGHTPAREN;
*errp = ss; *errp = EndOfInput;
ldap_contentrule_free(cr); ldap_contentrule_free(cr);
return NULL; return NULL;
case TK_RIGHTPAREN: case TK_RIGHTPAREN:
@ -2987,7 +2989,7 @@ ldap_str2structurerule( LDAP_CONST char * s,
switch (kind) { switch (kind) {
case TK_EOS: case TK_EOS:
*code = LDAP_SCHERR_NORIGHTPAREN; *code = LDAP_SCHERR_NORIGHTPAREN;
*errp = ss; *errp = EndOfInput;
ldap_structurerule_free(sr); ldap_structurerule_free(sr);
return NULL; return NULL;
case TK_RIGHTPAREN: case TK_RIGHTPAREN:
@ -3176,7 +3178,7 @@ ldap_str2nameform( LDAP_CONST char * s,
switch (kind) { switch (kind) {
case TK_EOS: case TK_EOS:
*code = LDAP_SCHERR_NORIGHTPAREN; *code = LDAP_SCHERR_NORIGHTPAREN;
*errp = ss; *errp = EndOfInput;
ldap_nameform_free(nf); ldap_nameform_free(nf);
return NULL; return NULL;
case TK_RIGHTPAREN: case TK_RIGHTPAREN: