From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Tue, 15 Apr 2008 00:32:48 +0000 (+0000)
Subject: ITS#5458
X-Git-Tag: OPENLDAP_REL_ENG_2_4_9~51
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4492ce0f1f518753aed94c6694199d77676820dc;p=openldap

ITS#5458
---

diff --git a/CHANGES b/CHANGES
index 1d6abcbf87..ad8de194b2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -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)
diff --git a/libraries/libldap/schema.c b/libraries/libldap/schema.c
index acefcc1efb..359022163d 100644
--- a/libraries/libldap/schema.c
+++ b/libraries/libldap/schema.c
@@ -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: