Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local

(This used to be commit 5cd3310b78a85243eb436d05db3228c3495f9162)

diff --combined source4/lib/ldb/common/ldb.c
index 5601a3319126926d829ea710911ffbd728a713c4,5f2e5e3ffc7a0cb9439b995271a4fa35495ba7b4..3c9ef3ff6939f8095952e48766318be9bb52500c
--- 1/source4/lib/ldb/common/ldb.c
--- 2/source4/lib/ldb/common/ldb.c
+++ b/source4/lib/ldb/common/ldb.c
@@@ -56,20 -56,51 +56,51 @@@ struct ldb_context *ldb_init(void *mem_
        return ldb;
  }
  
- struct ldb_backend {
-       const char *name;
-       ldb_connect_fn connect_fn;
-       struct ldb_backend *prev, *next;
+ static struct backends_list_entry {
+       struct ldb_backend_ops *ops;
+       struct backends_list_entry *prev, *next;
  } *ldb_backends = NULL;
  
+ #ifndef STATIC_LIBLDB_BACKENDS 
+ 
+ #ifdef HAVE_LDB_LDAP
+ #define LDAP_INIT &ldb_ldap_backend_ops, \
+                                 &ldb_ildap_backend_ops, \
+                                 &ldb_ldaps_backend_ops,
+ #else
+ #define LDAP_INIT
+ #endif
+ 
+ #ifdef HAVE_LDB_SQLITE3
+ #define SQLITE3_INIT &ldb_sqlite3_backend_ops,
+ #else
+ #define SQLITE3_INIT
+ #endif
+ 
+ #define STATIC_LIBLDB_BACKENDS \
+       LDAP_INIT \
+       SQLITE3_INIT \
+       &ldb_tdb_backend_ops,   \
+       NULL
+ #endif
+ 
+ const static struct ldb_backend_ops *builtin_backends[] = {
+       STATIC_LIBLDB_BACKENDS
+ };
  
  static ldb_connect_fn ldb_find_backend(const char *url)
  {
-       struct ldb_backend *backend;
+       struct backends_list_entry *backend;
+       int i;
+ 
+       for (i = 0; builtin_backends[i]; i++) {
+               if (strncmp(builtin_backends[i]->name, url, strlen(builtin_backends[i]->name)) == 0)
+                       return builtin_backends[i]->connect_fn;
+       }
  
        for (backend = ldb_backends; backend; backend = backend->next) {
-               if (strncmp(backend->name, url, strlen(backend->name)) == 0) {
-                       return backend->connect_fn;
+               if (strncmp(backend->ops->name, url, strlen(backend->ops->name)) == 0) {
+                       return backend->ops->connect_fn;
                }
        }
  
@@@ -81,7 -112,8 +112,8 @@@
  */
  int ldb_register_backend(const char *url_prefix, ldb_connect_fn connectfn)
  {
-       struct ldb_backend *backend = talloc(talloc_autofree_context(), struct ldb_backend);
+       struct ldb_backend_ops *backend = talloc(talloc_autofree_context(), struct ldb_backend_ops);
+       struct backends_list_entry *entry = talloc(talloc_autofree_context(), struct backends_list_entry);
  
        if (ldb_find_backend(url_prefix)) {
                return LDB_SUCCESS;
@@@ -91,7 -123,8 +123,8 @@@
  
        backend->name = talloc_strdup(backend, url_prefix);
        backend->connect_fn = connectfn;
-       DLIST_ADD(ldb_backends, backend);
+       entry->ops = backend;
+       DLIST_ADD(ldb_backends, entry);
  
        return LDB_SUCCESS;
  }
@@@ -135,6 -168,19 +168,19 @@@ int ldb_connect_backend(struct ldb_cont
                }
        }
  
+       if (fn == NULL) {
+               struct ldb_backend_ops *ops;
+               char *symbol_name = talloc_asprintf(ldb, "ldb_%s_backend_ops", backend);
+               if (symbol_name == NULL) {
+                       return LDB_ERR_OPERATIONS_ERROR;
+               }
+               ops = ldb_dso_load_symbol(ldb, backend, symbol_name);
+               if (ops != NULL) {
+                       fn = ops->connect_fn;
+               }
+               talloc_free(symbol_name);
+       }
+ 
        talloc_free(backend);
  
        if (fn == NULL) {
@@@ -236,7 -282,6 +282,6 @@@ int ldb_connect(struct ldb_context *ldb
        int ret;
        const char *url2;
        /* We seem to need to do this here, or else some utilities don't get ldb backends */
-       ldb_global_init();
  
        ldb->flags = flags;
  
@@@ -463,17 -508,11 +508,17 @@@ static int ldb_autotransaction_request(
  
  int ldb_wait(struct ldb_handle *handle, enum ldb_wait_type type)
  {
 +      int ret;
        if (!handle) {
                return LDB_SUCCESS;
        }
  
 -      return handle->module->ops->wait(handle, type);
 +      ret = handle->module->ops->wait(handle, type);
 +      if (!ldb_errstring(handle->module->ldb)) {
 +              /* Set a default error string, to place the blame somewhere */
 +              ldb_asprintf_errstring(handle->module->ldb, "error waiting on module %s: %s (%d)", handle->module->ops->name, ldb_strerror(ret), ret);
 +      }
 +      return ret;
  }
  
  /* set the specified timeout or, if timeout is 0 set the default timeout */