Fix str2anlist declaration, str is not const. (gets overwritten if

there is an error.)

diff --git a/servers/slapd/ad.c b/servers/slapd/ad.c
index 4c7efe97f2bd2108df0c0c4ecc75c5c20e76ac08..75193d93810576e95d09b92efd55522e1bdc9008 100644 (file)
--- a/servers/slapd/ad.c
+++ b/servers/slapd/ad.c
@@ -435,7 +435,7 @@ an_find(
  * to an existing list if it was given.
  */
 AttributeName *
-str2anlist( AttributeName *an, const char *in, const char *brkstr )
+str2anlist( AttributeName *an, char *in, const char *brkstr )
 {
        char    *str;
        char    *s;
@@ -473,7 +473,7 @@ str2anlist( AttributeName *an, const char *in, const char *brkstr )
                        if ( !anew->an_oc ) {
                                free( an );
                                /* overwrites input string on error! */
-                               strcpy( (char *)in, s );
+                               strcpy( in, s );
                                return NULL;
                        }
                }

diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h
index 1cbf8fc3144c45130fadff019279b6798f717db2..2495083af42d43b19433a19953979a29302a9f3c 100644 (file)
--- a/servers/slapd/proto-slap.h
+++ b/servers/slapd/proto-slap.h
@@ -54,7 +54,7 @@ LDAP_SLAPD_F (AttributeDescription *) ad_find_lang LDAP_P((
        struct berval *lang ));
 
 LDAP_SLAPD_F (AttributeName *) str2anlist LDAP_P(( AttributeName *an,
-       const char *str, const char *brkstr ));
+       char *str, const char *brkstr ));
 LDAP_SLAPD_F (int) an_find LDAP_P(( AttributeName *a, struct berval *s ));     
 
 /*