diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-07 02:37:13 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:48:41 +0100 |
| commit | 6c77f353d3d952b46b401ab29837ba5b75e353c2 (patch) | |
| tree | c78d6030280662a3a96b5a94c677f76fa47d2ed4 /source4/libnet/libnet_join.c | |
| parent | 4c4323009fa83f00ed319de59a3aad48fcd65994 (diff) | |
| download | samba-6c77f353d3d952b46b401ab29837ba5b75e353c2.tar.gz samba-6c77f353d3d952b46b401ab29837ba5b75e353c2.tar.xz samba-6c77f353d3d952b46b401ab29837ba5b75e353c2.zip | |
r26328: remove more uses of global_loadparm.
(This used to be commit 40ae12c08647c47a9c504d39ee6f61c32b4e5748)
Diffstat (limited to 'source4/libnet/libnet_join.c')
| -rw-r--r-- | source4/libnet/libnet_join.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source4/libnet/libnet_join.c b/source4/libnet/libnet_join.c index 2f14799cedc..6d7fcd09ade 100644 --- a/source4/libnet/libnet_join.c +++ b/source4/libnet/libnet_join.c @@ -230,7 +230,7 @@ static NTSTATUS libnet_JoinADSDomain(struct libnet_context *ctx, struct libnet_J return NT_STATUS_NO_MEMORY; } - remote_ldb = ldb_wrap_connect(tmp_ctx, global_loadparm, + remote_ldb = ldb_wrap_connect(tmp_ctx, ctx->lp_ctx, remote_ldb_url, NULL, ctx->cred, 0, NULL); if (!remote_ldb) { @@ -538,8 +538,8 @@ NTSTATUS libnet_JoinDomain(struct libnet_context *ctx, TALLOC_CTX *mem_ctx, stru connect_with_info->out.domain_name = talloc_strdup(tmp_ctx, r->in.domain_name); } else { /* Bugger, we just lost our way to automaticly find the domain name */ - connect_with_info->out.domain_name = talloc_strdup(tmp_ctx, lp_workgroup(global_loadparm)); - connect_with_info->out.realm = talloc_strdup(tmp_ctx, lp_realm(global_loadparm)); + connect_with_info->out.domain_name = talloc_strdup(tmp_ctx, lp_workgroup(ctx->lp_ctx)); + connect_with_info->out.realm = talloc_strdup(tmp_ctx, lp_realm(ctx->lp_ctx)); } } @@ -891,7 +891,7 @@ static NTSTATUS libnet_Join_primary_domain(struct libnet_context *ctx, if (r->in.netbios_name != NULL) { netbios_name = r->in.netbios_name; } else { - netbios_name = talloc_reference(tmp_mem, lp_netbios_name(global_loadparm)); + netbios_name = talloc_reference(tmp_mem, lp_netbios_name(ctx->lp_ctx)); if (!netbios_name) { r->out.error_string = NULL; talloc_free(tmp_mem); @@ -910,7 +910,7 @@ static NTSTATUS libnet_Join_primary_domain(struct libnet_context *ctx, * Local secrets are stored in secrets.ldb * open it to make sure we can write the info into it after the join */ - ldb = secrets_db_connect(tmp_mem, global_loadparm); + ldb = secrets_db_connect(tmp_mem, ctx->lp_ctx); if (!ldb) { r->out.error_string = talloc_asprintf(mem_ctx, |