Fix up abandon merge. Hallvard will holler if I get this wrong. :-)

[openldap] / libraries / librewrite / rule.c

diff --git a/libraries/librewrite/rule.c b/libraries/librewrite/rule.c
index 2347383480c56557c2f7f6449f737fa96df9b2ad..c8a1c07a14dca4379d45a31a57ef3ed901b1caa2 100644 (file)
--- a/libraries/librewrite/rule.c
+++ b/libraries/librewrite/rule.c
@@ -205,7 +205,7 @@ rewrite_rule_compile(
                                /* XXX Need to free stuff */
                                return REWRITE_ERR;
                        }
-                       strncpy( buf, p + 2, l );
+                       AC_MEMCPY( buf, p + 2, l );
                        buf[ l ] = '\0';
 
                        d = malloc( sizeof( int ) );
@@ -269,7 +269,7 @@ rewrite_rule_compile(
         */
        rule = calloc( sizeof( struct rewrite_rule ), 1 );
        if ( rule == NULL ) {
-               // charray_free( res );
+               /* charray_free( res ); */
                /*
                 * XXX need to free the value subst stuff!
                 */
@@ -280,7 +280,7 @@ rewrite_rule_compile(
         * REGEX compilation (luckily I don't need to take care of this ...)
         */
        if ( regcomp( &rule->lr_regex, ( char * )pattern, flags ) != 0 ) {
-               // charray_free( res );
+               /* charray_free( res ); */
                /*
                 *XXX need to free the value subst stuff!
                 */