summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-10-10 17:34:21 +0200
committerJelmer Vernooij <jelmer@samba.org>2010-10-10 23:09:06 +0200
commit7f68870bc939e33df958f708ec7f46253fefadd9 (patch)
treee11061d30132281ea4cb53d6bf3bfac9222b8786
parent938cb40290af72bdd887d964f46ccc00d80ab744 (diff)
downloadsamba-7f68870bc939e33df958f708ec7f46253fefadd9.tar.gz
samba-7f68870bc939e33df958f708ec7f46253fefadd9.tar.bz2
samba-7f68870bc939e33df958f708ec7f46253fefadd9.zip
ldb-samba: Split up ldb_wrap_connect() a bit.
-rw-r--r--source4/lib/ldb-samba/ldb_wrap.c71
-rw-r--r--source4/lib/ldb-samba/ldb_wrap.h15
-rw-r--r--source4/lib/ldb-samba/wscript_build2
3 files changed, 52 insertions, 36 deletions
diff --git a/source4/lib/ldb-samba/ldb_wrap.c b/source4/lib/ldb-samba/ldb_wrap.c
index 9d1f5157a1..5aff11229e 100644
--- a/source4/lib/ldb-samba/ldb_wrap.c
+++ b/source4/lib/ldb-samba/ldb_wrap.c
@@ -94,20 +94,6 @@ static struct ldb_wrap {
struct ldb_context *ldb;
} *ldb_wrap_list;
-/*
- see if two database opens are equivalent
- */
-static bool ldb_wrap_same_context(const struct ldb_wrap_context *c1,
- const struct ldb_wrap_context *c2)
-{
- return (c1->ev == c2->ev &&
- c1->lp_ctx == c2->lp_ctx &&
- c1->session_info == c2->session_info &&
- c1->credentials == c2->credentials &&
- c1->flags == c2->flags &&
- (c1->url == c2->url || strcmp(c1->url, c2->url) == 0));
-}
-
/*
free a ldb_wrap structure
*/
@@ -117,13 +103,17 @@ static int ldb_wrap_destructor(struct ldb_wrap *w)
return 0;
}
-static ldb_context *samba_ldb_init(TALLOC_CTX *mem_ctx,
+ struct ldb_context *samba_ldb_init(TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
struct loadparm_context *lp_ctx,
struct auth_session_info *session_info,
- struct cli_credentials *credentials
+ struct cli_credentials *credentials,
+ int flags
)
{
+ struct ldb_context *ldb;
+ int ret;
+
/* 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 */
@@ -191,6 +181,28 @@ static ldb_context *samba_ldb_init(TALLOC_CTX *mem_ctx,
return ldb;
}
+ struct ldb_context *ldb_wrap_find(const char *url,
+ struct tevent_context *ev,
+ struct loadparm_context *lp_ctx,
+ struct auth_session_info *session_info,
+ struct cli_credentials *credentials,
+ int flags)
+{
+ struct ldb_wrap *w;
+ /* see if we can re-use an existing ldb */
+ for (w=ldb_wrap_list; w; w=w->next) {
+ if (w->context.ev == ev &&
+ w->context.lp_ctx == lp_ctx &&
+ w->context.session_info == session_info &&
+ w->context.credentials == credentials &&
+ w->context.flags == flags &&
+ (w->context.url == url || strcmp(w->context.url, url) == 0))
+ return w->ldb;
+ }
+
+ return NULL;
+}
+
/*
wrapped connection to a ldb database
to close just talloc_free() the returned ldb_context
@@ -208,24 +220,14 @@ static ldb_context *samba_ldb_init(TALLOC_CTX *mem_ctx,
struct ldb_context *ldb;
int ret;
char *real_url = NULL;
- struct ldb_wrap *w;
struct ldb_wrap_context c;
+ struct ldb_wrap *w;
- c.url = url;
- c.ev = ev;
- c.lp_ctx = lp_ctx;
- c.session_info = session_info;
- c.credentials = credentials;
- c.flags = flags;
+ ldb = ldb_wrap_find(url, ev, lp_ctx, session_info, credentials, flags);
+ if (ldb != NULL)
+ return talloc_reference(mem_ctx, ldb);
- /* see if we can re-use an existing ldb */
- for (w=ldb_wrap_list; w; w=w->next) {
- if (ldb_wrap_same_context(&c, &w->context)) {
- return talloc_reference(mem_ctx, w->ldb);
- }
- }
-
- ldb = samba_ldb_init(mem_ctx, ev, lp_ctx, session_info, credentials);
+ ldb = samba_ldb_init(mem_ctx, ev, lp_ctx, session_info, credentials, flags);
if (ldb == NULL)
return NULL;
@@ -257,6 +259,13 @@ static ldb_context *samba_ldb_init(TALLOC_CTX *mem_ctx,
return NULL;
}
+ c.url = url;
+ c.ev = ev;
+ c.lp_ctx = lp_ctx;
+ c.session_info = session_info;
+ c.credentials = credentials;
+ c.flags = flags;
+
w->context = c;
w->context.url = talloc_strdup(w, url);
if (w->context.url == NULL) {
diff --git a/source4/lib/ldb-samba/ldb_wrap.h b/source4/lib/ldb-samba/ldb_wrap.h
index 66281fde4a..f576802836 100644
--- a/source4/lib/ldb-samba/ldb_wrap.h
+++ b/source4/lib/ldb-samba/ldb_wrap.h
@@ -22,6 +22,8 @@
#ifndef _LDB_WRAP_H_
#define _LDB_WRAP_H_
+#include <talloc.h>
+
struct auth_session_info;
struct ldb_message;
struct ldb_dn;
@@ -41,12 +43,17 @@ struct ldb_context *ldb_wrap_connect(TALLOC_CTX *mem_ctx,
void ldb_wrap_fork_hook(void);
-static ldb_context *samba_ldb_init(TALLOC_CTX *mem_ctx,
+struct ldb_context *samba_ldb_init(TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
struct loadparm_context *lp_ctx,
struct auth_session_info *session_info,
- struct cli_credentials *credentials
- );
-
+ struct cli_credentials *credentials,
+ int flags);
+struct ldb_context *ldb_wrap_find(const char *url,
+ struct tevent_context *ev,
+ struct loadparm_context *lp_ctx,
+ struct auth_session_info *session_info,
+ struct cli_credentials *credentials,
+ int flags);
#endif /* _LDB_WRAP_H_ */
diff --git a/source4/lib/ldb-samba/wscript_build b/source4/lib/ldb-samba/wscript_build
index d647884353..fd07fd1aff 100644
--- a/source4/lib/ldb-samba/wscript_build
+++ b/source4/lib/ldb-samba/wscript_build
@@ -9,7 +9,7 @@ bld.SAMBA_SUBSYSTEM('LDBSAMBA',
autoproto='ldif_handlers_proto.h',
public_deps='ldb',
public_headers='ldb_wrap.h',
- deps='LIBSECURITY LIBNDR NDR_DRSBLOBS CREDENTIALS UTIL_LDB NDR_DNSP'
+ deps='LIBSECURITY LIBNDR NDR_DRSBLOBS CREDENTIALS UTIL_LDB NDR_DNSP SAMDB'
)