r25446: Merge some changes I made on the way home from SFO:

[jelmer/samba4-debian.git] / source / lib / db_wrap.c

diff --git a/source/lib/db_wrap.c b/source/lib/db_wrap.c
index e7d3388f7224505281633a957e2acb9fc2852826..c33786a1e43a8c0b83b8259c9972357e23ff33d6 100644 (file)
--- a/source/lib/db_wrap.c
+++ b/source/lib/db_wrap.c
@@ -7,7 +7,7 @@
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -16,8 +16,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 /*
@@ -33,9 +32,10 @@
 #include "lib/tdb/include/tdb.h"
 #include "lib/ldb/include/ldb.h"
 #include "lib/ldb/include/ldb_errors.h"
-#include "lib/ldb/samba/ldif_handlers.h"
+#include "lib/ldb-samba/ldif_handlers.h"
 #include "db_wrap.h"
 #include "dsdb/samdb/samdb.h"
+#include "param/param.h"
 
 static struct tdb_wrap *tdb_list;
 
@@ -48,13 +48,23 @@ static void ldb_wrap_debug(void *context, enum ldb_debug_level level,
 static void ldb_wrap_debug(void *context, enum ldb_debug_level level, 
                           const char *fmt, va_list ap)
 {
+       int samba_level;
        char *s = NULL;
-       if (DEBUGLEVEL < 4 && level > LDB_DEBUG_WARNING) {
-               return;
-       }
-       if (DEBUGLEVEL < 2 && level > LDB_DEBUG_ERROR) {
-               return;
-       }
+       switch (level) {
+       case LDB_DEBUG_FATAL:
+               samba_level = 0;
+               break;
+       case LDB_DEBUG_ERROR:
+               samba_level = 1;
+               break;
+       case LDB_DEBUG_WARNING:
+               samba_level = 2;
+               break;
+       case LDB_DEBUG_TRACE:
+               samba_level = 5;
+               break;
+               
+       };
        vasprintf(&s, fmt, ap);
        if (!s) return;
        DEBUG(level, ("ldb: %s\n", s));
@@ -71,7 +81,7 @@ static int ldb_wrap_destructor(struct ldb_context *ldb)
 {
        size_t *startup_blocks = (size_t *)ldb_get_opaque(ldb, "startup_blocks");
        if (startup_blocks &&
-           talloc_total_blocks(ldb) > *startup_blocks + 100) {
+           talloc_total_blocks(ldb) > *startup_blocks + 400) {
                DEBUG(0,("WARNING: probable memory leak in ldb %s - %lu blocks (startup %lu) %lu bytes\n",
                         (char *)ldb_get_opaque(ldb, "wrap_url"), 
                         (unsigned long)talloc_total_blocks(ldb), 
@@ -79,6 +89,8 @@ static int ldb_wrap_destructor(struct ldb_context *ldb)
                         (unsigned long)talloc_total_size(ldb)));
 #if 0
                talloc_report_full(ldb, stdout);
+               call_backtrace();
+               smb_panic("probable memory leak in ldb");
 #endif
        }
        return 0;
@@ -91,6 +103,7 @@ static int ldb_wrap_destructor(struct ldb_context *ldb)
   TODO:  We need an error_string parameter
  */
 struct ldb_context *ldb_wrap_connect(TALLOC_CTX *mem_ctx,
+                                    struct loadparm_context *lp_ctx,
                                     const char *url,
                                     struct auth_session_info *session_info,
                                     struct cli_credentials *credentials,
@@ -108,6 +121,9 @@ struct ldb_context *ldb_wrap_connect(TALLOC_CTX *mem_ctx,
                return NULL;
        }
 
+       ldb_set_modules_dir(ldb, 
+                           talloc_asprintf(ldb, "%s/ldb", lp_modulesdir(lp_ctx)));
+
        /* we want to use the existing event context if possible. This
           relies on the fact that in smbd, everything is a child of
           the main event_context */
@@ -128,7 +144,7 @@ struct ldb_context *ldb_wrap_connect(TALLOC_CTX *mem_ctx,
                return NULL;
        }
        
-       if (strcmp(lp_sam_url(), url) == 0) {
+       if (strcmp(lp_sam_url(lp_ctx), url) == 0) {
                dsdb_set_global_schema(ldb);
        }
 
@@ -138,14 +154,18 @@ struct ldb_context *ldb_wrap_connect(TALLOC_CTX *mem_ctx,
                return NULL;
        }
 
-       real_url = private_path(ldb, url);
+       ldb_set_debug(ldb, ldb_wrap_debug, NULL);
+
+       ldb_set_utf8_fns(ldb, NULL, wrap_casefold);
+
+       real_url = private_path(ldb, lp_ctx, url);
        if (real_url == NULL) {
                talloc_free(ldb);
                return NULL;
        }
 
        /* allow admins to force non-sync ldb for all databases */
-       if (lp_parm_bool(-1, "ldb", "nosync", False)) {
+       if (lp_parm_bool(lp_ctx, NULL, "ldb", "nosync", false)) {
                flags |= LDB_FLG_NOSYNC;
        }
 
@@ -160,10 +180,6 @@ struct ldb_context *ldb_wrap_connect(TALLOC_CTX *mem_ctx,
                return NULL;
        }
 
-       ldb_set_debug(ldb, ldb_wrap_debug, NULL);
-
-       ldb_set_utf8_fns(ldb, NULL, wrap_casefold);
-
        /* setup for leak detection */
        ldb_set_opaque(ldb, "wrap_url", real_url);
        startup_blocks = talloc(ldb, size_t);