diff options
author | Simo Sorce <idra@samba.org> | 2010-07-16 09:57:03 -0400 |
---|---|---|
committer | Simo Sorce <idra@samba.org> | 2010-07-16 09:57:03 -0400 |
commit | 378e4d5b8d30733f0f28cc2bceb28d9b9b594707 (patch) | |
tree | 9f6faebdcf58c73e0297bfdf3b905ef256f8e478 /source4/dsdb/samdb/samdb.c | |
parent | 2f249538ac8f2a54d9c8f8dbf0107db2f33bfe16 (diff) | |
parent | 6b266b85cf34145ac1f03d8f787b81121e4ec92b (diff) | |
download | samba-378e4d5b8d30733f0f28cc2bceb28d9b9b594707.tar.gz samba-378e4d5b8d30733f0f28cc2bceb28d9b9b594707.tar.bz2 samba-378e4d5b8d30733f0f28cc2bceb28d9b9b594707.zip |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source4/dsdb/samdb/samdb.c')
-rw-r--r-- | source4/dsdb/samdb/samdb.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/dsdb/samdb/samdb.c b/source4/dsdb/samdb/samdb.c index 67b55385cb..2b4e9a1438 100644 --- a/source4/dsdb/samdb/samdb.c +++ b/source4/dsdb/samdb/samdb.c @@ -83,7 +83,7 @@ static int samdb_credentials_destructor(struct cli_credentials *creds) that we always get the same pointer in ldb_wrap_connect() */ struct cli_credentials *samdb_credentials(struct tevent_context *event_ctx, - struct loadparm_context *lp_ctx) + struct loadparm_context *lp_ctx) { static struct cli_credentials *static_credentials; struct cli_credentials *cred; @@ -126,9 +126,9 @@ struct ldb_context *samdb_connect(TALLOC_CTX *mem_ctx, struct auth_session_info *session_info) { struct ldb_context *ldb; - ldb = ldb_wrap_connect(mem_ctx, ev_ctx, lp_ctx, - lp_sam_url(lp_ctx), session_info, - samdb_credentials(ev_ctx, lp_ctx), + ldb = ldb_wrap_connect(mem_ctx, ev_ctx, lp_ctx, + lpcfg_sam_url(lp_ctx), session_info, + samdb_credentials(ev_ctx, lp_ctx), 0); if (!ldb) { return NULL; |