ITS#6254

[openldap] / libraries / libldap / schema.c

diff --git a/libraries/libldap/schema.c b/libraries/libldap/schema.c
index 46271968e663fa2fb965fe59dbbadc10474f2e2a..691d6adddee60535413f6eb611bc775b6d036ad1 100644 (file)
--- a/libraries/libldap/schema.c
+++ b/libraries/libldap/schema.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2006 The OpenLDAP Foundation.
+ * Copyright 1998-2009 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -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 )
 {
@@ -1028,7 +1030,7 @@ get_token( const char ** sp, char ** token_val )
                        **sp != '$' &&
                        **sp != '\'' &&
                        /* for suggested minimum upper bound on the number
-                        * of characters <draft-ietf-ldapbis-syntaxes> */
+                        * of characters (RFC 4517) */
                        **sp != '{' &&
                        **sp != '\0' )
                        (*sp)++;
@@ -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: