From ae65b971ac1492da53b1259d113f686504e570cd Mon Sep 17 00:00:00 2001 From: Amitay Isaacs Date: Fri, 12 Aug 2011 15:43:04 +1000 Subject: s4-dsdb: Provide additional method to connect to specified database path samdb_connect() now calls samdb_connect_url() with default "sam.ldb". Pair-Programmed-With: Andrew Bartlett --- source4/dsdb/samdb/samdb.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) (limited to 'source4/dsdb/samdb/samdb.c') diff --git a/source4/dsdb/samdb/samdb.c b/source4/dsdb/samdb/samdb.c index d761107b15..cfbca40220 100644 --- a/source4/dsdb/samdb/samdb.c +++ b/source4/dsdb/samdb/samdb.c @@ -89,22 +89,20 @@ struct cli_credentials *samdb_credentials(struct loadparm_context *lp_ctx) } /* - connect to the SAM database + connect to the SAM database specified by URL return an opaque context pointer on success, or NULL on failure */ -struct ldb_context *samdb_connect(TALLOC_CTX *mem_ctx, +struct ldb_context *samdb_connect_url(TALLOC_CTX *mem_ctx, struct tevent_context *ev_ctx, struct loadparm_context *lp_ctx, struct auth_session_info *session_info, - unsigned int flags) + unsigned int flags, const char *url) { struct ldb_context *ldb; struct dsdb_schema *schema; - const char *url; struct cli_credentials *credentials; int ret; - url = "sam.ldb"; credentials = samdb_credentials(lp_ctx); ldb = ldb_wrap_find(url, ev_ctx, lp_ctx, session_info, credentials, flags); @@ -139,6 +137,19 @@ struct ldb_context *samdb_connect(TALLOC_CTX *mem_ctx, } +/* + connect to the SAM database + return an opaque context pointer on success, or NULL on failure + */ +struct ldb_context *samdb_connect(TALLOC_CTX *mem_ctx, + struct tevent_context *ev_ctx, + struct loadparm_context *lp_ctx, + struct auth_session_info *session_info, + unsigned int flags) +{ + return samdb_connect_url(mem_ctx, ev_ctx, lp_ctx, session_info, flags, "sam.ldb"); +} + /**************************************************************************** Create the SID list for this user. ****************************************************************************/ -- cgit