diff options
| author | Simo Sorce <idra@samba.org> | 2008-06-14 11:24:17 -0400 |
|---|---|---|
| committer | Simo Sorce <idra@samba.org> | 2008-06-14 11:59:19 -0400 |
| commit | 929adc9efa5cf985f0585214d30d18521aa1a821 (patch) | |
| tree | 2a0f3e4dedc1336fb29aa4f36f302f29c5439f55 /source4/param | |
| parent | 2aba4107915611b223daa8c27c52352f57b25bbc (diff) | |
| download | samba-929adc9efa5cf985f0585214d30d18521aa1a821.tar.gz samba-929adc9efa5cf985f0585214d30d18521aa1a821.tar.bz2 samba-929adc9efa5cf985f0585214d30d18521aa1a821.zip | |
Make up the right dependencies now that ldb depends on libevents
(This used to be commit 3b8eec7ca334528cad3cdcd5e3fc5ee555d8d0e0)
Diffstat (limited to 'source4/param')
| -rw-r--r-- | source4/param/secrets.c | 9 | ||||
| -rw-r--r-- | source4/param/secrets.h | 5 |
2 files changed, 9 insertions, 5 deletions
diff --git a/source4/param/secrets.c b/source4/param/secrets.c index 06dc850c8e..16fbb3b108 100644 --- a/source4/param/secrets.c +++ b/source4/param/secrets.c @@ -85,7 +85,9 @@ struct tdb_wrap *secrets_init(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_c /** connect to the secrets ldb */ -struct ldb_context *secrets_db_connect(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx) +struct ldb_context *secrets_db_connect(TALLOC_CTX *mem_ctx, + struct event_context *ev_ctx, + struct loadparm_context *lp_ctx) { char *path; const char *url; @@ -103,7 +105,7 @@ struct ldb_context *secrets_db_connect(TALLOC_CTX *mem_ctx, struct loadparm_cont /* Secrets.ldb *must* always be local. If we call for a * system_session() we will recurse */ - ldb = ldb_init(mem_ctx); + ldb = ldb_init(mem_ctx, ev_ctx); if (!ldb) { talloc_free(path); return NULL; @@ -127,6 +129,7 @@ struct ldb_context *secrets_db_connect(TALLOC_CTX *mem_ctx, struct loadparm_cont * @return pointer to a SID object if the SID could be obtained, NULL otherwise */ struct dom_sid *secrets_get_domain_sid(TALLOC_CTX *mem_ctx, + struct event_context *ev_ctx, struct loadparm_context *lp_ctx, const char *domain) { @@ -138,7 +141,7 @@ struct dom_sid *secrets_get_domain_sid(TALLOC_CTX *mem_ctx, const struct ldb_val *v; enum ndr_err_code ndr_err; - ldb = secrets_db_connect(mem_ctx, lp_ctx); + ldb = secrets_db_connect(mem_ctx, ev_ctx, lp_ctx); if (ldb == NULL) { DEBUG(5, ("secrets_db_connect failed\n")); return NULL; diff --git a/source4/param/secrets.h b/source4/param/secrets.h index bd6ff4a401..fa162ea66a 100644 --- a/source4/param/secrets.h +++ b/source4/param/secrets.h @@ -43,9 +43,10 @@ struct machine_acct_pass { * @note Not called by systems with a working /dev/urandom. */ struct loadparm_context; +struct event_context; struct tdb_wrap *secrets_init(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx); -struct ldb_context *secrets_db_connect(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx); -struct dom_sid *secrets_get_domain_sid(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx, const char *domain); +struct ldb_context *secrets_db_connect(TALLOC_CTX *mem_ctx, struct event_context *ev_ctx, struct loadparm_context *lp_ctx); +struct dom_sid *secrets_get_domain_sid(TALLOC_CTX *mem_ctx, struct event_context *ev_ctx, struct loadparm_context *lp_ctx, const char *domain); #endif /* _SECRETS_H */ |