X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-relay%2Finit.c;h=3122858fd6dc01f384f8b65b06fe7f64b2ada9dc;hb=158e5727b4f330e1c17c242153eb8a821295286b;hp=66631c2e6029e70a461430914abeadfc9379cef7;hpb=3fe2cec561ce0b683e6edd0708b64bed1fe2e870;p=openldap

diff --git a/servers/slapd/back-relay/init.c b/servers/slapd/back-relay/init.c
index 66631c2e60..3122858fd6 100644
--- a/servers/slapd/back-relay/init.c
+++ b/servers/slapd/back-relay/init.c
@@ -1,7 +1,7 @@
 /* init.c - initialize relay backend */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2003-2004 The OpenLDAP Foundation.
+ * Copyright 2004 The OpenLDAP Foundation.
  * Portions Copyright 2004 Pierangelo Masarati.
  * All rights reserved.
  *
@@ -110,29 +110,10 @@ relay_back_db_open( Backend *be )
 
 	if ( ri->ri_realsuffix.bv_val != NULL ) {
 		ri->ri_bd = select_backend( &ri->ri_realsuffix, 0, 1 );
+		/* must be there: it was during config! */
 		assert( ri->ri_bd );
 	}
 
-#if 0
-	if ( ri->ri_massage ) {
-		char	*argv[ 4 ];
-
-		if ( be->be_suffix[0].bv_val == NULL ) {
-			fprintf( stderr, "suffix must be defined to require suffix massage\n" );
-			return 1;
-		}
-
-		argv[ 0 ] = "suffixmassage";
-		argv[ 1 ] = be->be_suffix[0].bv_val;
-		argv[ 2 ] = ri->ri_bd->be_suffix[0].bv_val;
-		argv[ 3 ] = NULL;
-
-		if ( be->be_config( be, "back-relay", 1, 3, argv ) ) {
-			return 1;
-		}
-	}
-#endif
-
 	return 0;
 }
 
@@ -148,8 +129,12 @@ relay_back_db_destroy( Backend *be )
 	relay_back_info		*ri = (relay_back_info *)be->be_private;
 
 	if ( ri ) {
+		if ( ri->ri_realsuffix.bv_val ) {
+			ch_free( ri->ri_realsuffix.bv_val );
+		}
 		ch_free( ri );
 	}
 
 	return 0;
 }
+