Merge remote branch 'origin/mdb.master'

[openldap] / servers / slapd / back-sql / api.c

diff --git a/servers/slapd/back-sql/api.c b/servers/slapd/back-sql/api.c
index e4584c3ebfd655da2d22171cd4e3a7ff13d91f9a..6f87973d8a8f230a00c52c07a506a00c8f08c8ec 100644 (file)
--- a/servers/slapd/back-sql/api.c
+++ b/servers/slapd/back-sql/api.c
@@ -1,6 +1,6 @@
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1999-2005 The OpenLDAP Foundation.
+ * Copyright 1999-2012 The OpenLDAP Foundation.
  * Portions Copyright 1999 Dmitry Kovalev.
  * Portions Copyright 2004 Pierangelo Masarati.
  * All rights reserved.
@@ -35,8 +35,8 @@ backsql_api_config( backsql_info *bi, const char *name, int argc, char *argv[] )
 {
        backsql_api     *ba;
 
-       assert( bi );
-       assert( name );
+       assert( bi != NULL );
+       assert( name != NULL );
 
        for ( ba = backsqlapi; ba; ba = ba->ba_next ) {
                if ( strcasecmp( name, ba->ba_name ) == 0 ) {
@@ -50,6 +50,13 @@ backsql_api_config( backsql_info *bi, const char *name, int argc, char *argv[] )
                                        ch_free( ba2 );
                                        return 1;
                                }
+                               ba2->ba_argc = argc;
+                               if ( argc ) {
+                                       int i;
+                                       ba2->ba_argv = ch_malloc( argc * sizeof(char *));
+                                       for ( i=0; i<argc; i++ )
+                                               ba2->ba_argv[i] = ch_strdup( argv[i] );
+                               }
                        }
                        
                        ba2->ba_next = bi->sql_api;
@@ -66,7 +73,7 @@ backsql_api_destroy( backsql_info *bi )
 {
        backsql_api     *ba;
 
-       assert( bi );
+       assert( bi != NULL );
 
        ba = bi->sql_api;
 
@@ -88,7 +95,7 @@ backsql_api_register( backsql_api *ba )
 {
        backsql_api     *ba2;
 
-       assert( ba );
+       assert( ba != NULL );
        assert( ba->ba_private == NULL );
 
        if ( ba->ba_name == NULL ) {