ACIs almost entirely factored out of slapd

[openldap] / servers / slapd / back-relay / config.c

diff --git a/servers/slapd/back-relay/config.c b/servers/slapd/back-relay/config.c
index ba1d3da54429f62fe1d49f340c6bc60eed29920a..56cd2b98ecbd7e79a6bafedfc59131ecc18bd820 100644 (file)
--- a/servers/slapd/back-relay/config.c
+++ b/servers/slapd/back-relay/config.c
@@ -1,7 +1,7 @@
 /* config.c - relay backend configuration file routine */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2004 The OpenLDAP Foundation.
+ * Copyright 2004-2005 The OpenLDAP Foundation.
  * Portions Copyright 2004 Pierangelo Masarati.
  * All rights reserved.
  *
@@ -27,11 +27,11 @@
 
 int
 relay_back_db_config(
-    BackendDB  *be,
-    const char *fname,
-    int                lineno,
-    int                argc,
-    char       **argv
+       BackendDB       *be,
+       const char      *fname,
+       int             lineno,
+       int             argc,
+       char            **argv
 )
 {
        relay_back_info *ri = (struct relay_back_info *)be->be_private;
@@ -91,10 +91,9 @@ relay_back_db_config(
 
                ri->ri_realsuffix = ndn;
 
-               if ( overlay_config( be, "rewrite-remap" ) ) {
+               if ( overlay_config( be, "rwm" ) ) {
                        fprintf( stderr, "%s: line %d: unable to install "
-                                       "rewrite-remap overlay "
-                                       "in back-relay "
+                                       "rwm overlay "
                                        "in \"relay <dn> [massage]\" line\n",
                                        fname, lineno );
                        return 1;
@@ -111,7 +110,7 @@ relay_back_db_config(
                                return 1;
                        }
 
-                       cargv[ 0 ] = "suffixmassage";
+                       cargv[ 0 ] = "rwm-suffixmassage";
                        cargv[ 1 ] = be->be_suffix[0].bv_val;
                        cargv[ 2 ] = pdn.bv_val;
                        cargv[ 3 ] = NULL;