ITS#4040 move initialization

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

diff --git a/servers/slapd/back-relay/config.c b/servers/slapd/back-relay/config.c
index a73eee0d6850b64073929c185bfa67a659c864bd..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 2003-2004 The OpenLDAP Foundation.
+ * Copyright 2004-2005 The OpenLDAP Foundation.
  * Portions Copyright 2004 Pierangelo Masarati.
  * All rights reserved.
  *
@@ -22,20 +22,16 @@
 
 #include <stdio.h>
 
-#include <ac/string.h>
-#include <ac/socket.h>
-
 #include "slap.h"
 #include "back-relay.h"
-#include "lutil.h"
 
 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;
@@ -43,20 +39,26 @@ relay_back_db_config(
        if ( ri == NULL ) {
                fprintf( stderr, "%s: line %d: relay backend info is null!\n",
                    fname, lineno );
-               return( 1 );
+               return 1;
        }
 
        /* real naming context */
        if ( strcasecmp( argv[0], "relay" ) == 0 ) {
                struct berval   dn, ndn, pdn;
                int             rc;
-               char            *cargv[ 4 ];
+               BackendDB       *bd;
+
+               if ( argc < 2 ) {
+                       fprintf( stderr,
+       "%s: line %d: missing relay suffix in \"relay <dn> [massage]\" line\n",
+                           fname, lineno );
+                       return 1;
 
-               if (argc != 2) {
+               } else if ( argc > 3 ) {
                        fprintf( stderr,
-       "%s: line %d: missing relay suffix in \"relay <dn>\" line\n",
+       "%s: line %d: too many args in \"relay <dn> [massage]\" line\n",
                            fname, lineno );
-                       return( 1 );
+                       return 1;
                }
 
                dn.bv_val = argv[ 1 ];
@@ -64,45 +66,62 @@ relay_back_db_config(
                rc = dnPrettyNormal( NULL, &dn, &pdn, &ndn, NULL );
                if ( rc != LDAP_SUCCESS ) {
                        fprintf( stderr, "%s: line %d: "
-                                       "relay dn \"%s\" is invalid\n",
+                                       "relay dn \"%s\" is invalid "
+                                       "in \"relay <dn> [massage]\" line\n",
                                        fname, lineno, argv[ 1 ] );
                        return 1;
                }
 
-               ri->ri_bd = select_backend( &ndn, 0, 1 );
-               if ( ri->ri_bd == NULL ) {
+               bd = select_backend( &ndn, 0, 1 );
+               if ( bd == NULL ) {
                        fprintf( stderr, "%s: line %d: "
                                        "cannot find database "
-                                       "of relay dn \"%s\"\n",
+                                       "of relay dn \"%s\" "
+                                       "in \"relay <dn> [massage]\" line\n",
                                        fname, lineno, argv[ 1 ] );
                        return 1;
 
-               } else if ( ri->ri_bd == be ) {
+               } else if ( bd == be ) {
                        fprintf( stderr, "%s: line %d: "
-                                       "relay dn \"%s\" would call self\n",
+                                       "relay dn \"%s\" would call self "
+                                       "in \"relay <dn> [massage]\" line\n",
                                        fname, lineno, pdn.bv_val );
                        return 1;
-               } 
-
-               if ( overlay_config( be, "rewrite-remap" ) ) {
-                       fprintf( stderr, "unable to install "
-                                       "rewrite-remap overlay "
-                                       "in back-relay \"%s\" => \"%s\"\n",
-                                       be->be_suffix[0].bv_val,
-                                       ri->ri_bd->be_suffix[0].bv_val ? 
-                                       ri->ri_bd->be_suffix[0].bv_val : "<unknown>" );
-                       return 1;
                }
 
-               cargv[ 0 ] = "suffixmassage";
-               cargv[ 1 ] = be->be_suffix[0].bv_val;
-               cargv[ 2 ] = ri->ri_bd->be_suffix[0].bv_val;
-               cargv[ 3 ] = NULL;
+               ri->ri_realsuffix = ndn;
 
-               if ( be->be_config( be, "back-relay", 1, 3, cargv ) ) {
+               if ( overlay_config( be, "rwm" ) ) {
+                       fprintf( stderr, "%s: line %d: unable to install "
+                                       "rwm overlay "
+                                       "in \"relay <dn> [massage]\" line\n",
+                                       fname, lineno );
                        return 1;
                }
 
+               if ( argc == 3 ) {
+                       char    *cargv[ 4 ];
+
+                       if ( strcmp( argv[2], "massage" ) != 0 ) {
+                               fprintf( stderr, "%s: line %d: "
+                                       "unknown directive \"%s\" "
+                                       "in \"relay <dn> [massage]\" line\n",
+                                       fname, lineno, argv[2] );
+                               return 1;
+                       }
+
+                       cargv[ 0 ] = "rwm-suffixmassage";
+                       cargv[ 1 ] = be->be_suffix[0].bv_val;
+                       cargv[ 2 ] = pdn.bv_val;
+                       cargv[ 3 ] = NULL;
+
+                       if ( be->be_config( be, fname, lineno, 3, cargv ) ) {
+                               return 1;
+                       }
+               }
+
+               ch_free( pdn.bv_val );
+
        /* anything else */
        } else {
                return SLAP_CONF_UNKNOWN;