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

[openldap] / libraries / librewrite / rewrite.c

diff --git a/libraries/librewrite/rewrite.c b/libraries/librewrite/rewrite.c
index 6753f996003d08df551eb18f002edd7c1fbebd2f..586b50c91016265f5e2984f19036639cd78dbd0d 100644 (file)
--- a/libraries/librewrite/rewrite.c
+++ b/libraries/librewrite/rewrite.c
@@ -25,11 +25,13 @@
 #include <portable.h>
 
 #include <ac/stdlib.h>
+#include <ac/string.h>
 #include <ac/syslog.h>
 #include <ac/regex.h>
 #include <ac/socket.h>
 #include <ac/unistd.h>
 #include <ac/ctype.h>
+#include <ac/string.h>
 
 #include <rewrite.h>
 
@@ -37,12 +39,6 @@ int ldap_debug;
 int ldap_syslog;
 int ldap_syslog_level;
 
-extern int
-read_rewrite(
-               FILE *fin,
-               struct rewrite_info *info
-);
-
 char *
 apply( 
                FILE *fin, 
@@ -57,7 +53,7 @@ apply(
 
        info = rewrite_info_init(REWRITE_MODE_ERR);
 
-       if ( read_rewrite( fin, info ) != 0 ) {
+       if ( rewrite_read( fin, info ) != 0 ) {
                exit( EXIT_FAILURE );
        }
 
@@ -74,7 +70,7 @@ apply(
                        sep[ 0 ] = '\0';
                        sep++;
                }
-               // rc = rewrite( info, rewriteContext, string, &result );
+               /* rc = rewrite( info, rewriteContext, string, &result ); */
                rc = rewrite_session( info, rewriteContext, string,
                                cookie, &result );