Merge remote-tracking branch 'origin/mdb.master'

[openldap] / servers / slapd / back-sock / init.c

diff --git a/servers/slapd/back-sock/init.c b/servers/slapd/back-sock/init.c
index 30f834513fdc52a8a84e362e830f844f2cf2e22c..ce145bc65eb76ca4ddbdb23e28db9cbbfe0d3618 100644 (file)
--- a/servers/slapd/back-sock/init.c
+++ b/servers/slapd/back-sock/init.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2007 The OpenLDAP Foundation.
+ * Copyright 2007-2012 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -13,6 +13,10 @@
  * top-level directory of the distribution or, alternatively, at
  * <http://www.OpenLDAP.org/license.html>.
  */
+/* ACKNOWLEDGEMENTS:
+ * This work was initially developed by Brian Candler for inclusion
+ * in OpenLDAP Software.
+ */
 
 #include "portable.h"
 
@@ -34,7 +38,7 @@ sock_back_initialize(
        bi->bi_destroy = 0;
 
        bi->bi_db_init = sock_back_db_init;
-       bi->bi_db_config = sock_back_db_config;
+       bi->bi_db_config = 0;
        bi->bi_db_open = 0;
        bi->bi_db_close = 0;
        bi->bi_db_destroy = sock_back_db_destroy;
@@ -56,7 +60,7 @@ sock_back_initialize(
        bi->bi_connection_init = 0;
        bi->bi_connection_destroy = 0;
 
-       return 0;
+       return sock_back_init_cf( bi );
 }
 
 int
@@ -70,6 +74,7 @@ sock_back_db_init(
        si = (struct sockinfo *) ch_calloc( 1, sizeof(struct sockinfo) );
 
        be->be_private = si;
+       be->be_cf_ocs = be->bd_info->bi_cf_ocs;
 
        return si == NULL;
 }