Commit 4492ce0f authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

ITS#5458

parent 39210fd0
......@@ -2,6 +2,7 @@ OpenLDAP 2.4 Change Log
OpenLDAP 2.4.9 Engineering
Fixed libldap to use unsigned port (ITS#5436)
Fixed libldap error message for missing close paren (ITS#5458)
Fixed libldap_r tpool pause checks (ITS#5364, #5407)
Fixed slapcat error checking (ITS#5387)
Fixed slapd add operations requiring naming attrs (ITS#5412)
......
......@@ -30,6 +30,8 @@
#include <ldap_schema.h>
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:
......
Supports Markdown
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