sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-30 06:50:24 +03:00
Code

s4-libcli Remove resolve_name() as it conflicts with Samba3.

Browse Source 
This was just a wrapper around resolve_name_ex(), so just call that
instead.

Andrew Bartlett
This commit is contained in:
Andrew Bartlett 2011-05-02 16:36:48 +10:00
parent 62931369ee
commit 7261a9b9f7
9 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libcli/echo/tests/echo.c
View File

@ -64,8 +64,10 @@ static bool torture_echo_udp(struct torture_context *tctx)
make_nbt_name_server(&name,
torture_setting_string(tctx, "host", NULL));
status = resolve_name(lpcfg_resolve_context(tctx->lp_ctx), &name, tctx,
&address, tctx->ev);
status = resolve_name_ex(lpcfg_resolve_context(tctx->lp_ctx),
0, 0,
&name, tctx,
&address, tctx->ev);
if (!NT_STATUS_IS_OK(status)) {
printf("Failed to resolve %s - %s\n", name.name,
nt_errstr(status));

2
source4/libcli/raw/clisocket.c
View File

@ -229,7 +229,7 @@ _PUBLIC_ struct smbcli_socket *smbcli_sock_connect_byname(const char *host, cons
make_nbt_name(&nbt_name, host, name_type);
status = resolve_name(resolve_ctx, &nbt_name, tmp_ctx, &address, event_ctx);
status = resolve_name_ex(resolve_ctx, 0, 0, &nbt_name, tmp_ctx, &address, event_ctx);
if (!NT_STATUS_IS_OK(status)) {
talloc_free(tmp_ctx);
return NULL;

12
source4/libcli/resolve/resolve.c
View File

@ -316,18 +316,6 @@ NTSTATUS resolve_name_ex(struct resolve_context *ctx,
}
/*
general name resolution - sync call
*/
NTSTATUS resolve_name(struct resolve_context *ctx,
struct nbt_name *name,
TALLOC_CTX *mem_ctx,
const char **reply_addr,
struct tevent_context *ev)
{
return resolve_name_ex(ctx, 0, 0, name, mem_ctx, reply_addr, ev);
}
/* Initialise a struct nbt_name with a NULL scope */
void make_nbt_name(struct nbt_name *nbt, const char *name, int type)

4
source4/libnet/libnet_site.c
View File

@ -168,7 +168,9 @@ NTSTATUS libnet_JoinSite(struct libnet_context *ctx,
}
make_nbt_name_client(&name, libnet_r->out.samr_binding->host);
status = resolve_name(lpcfg_resolve_context(ctx->lp_ctx), &name, r, &dest_addr, ctx->event_ctx);
status = resolve_name_ex(lpcfg_resolve_context(ctx->lp_ctx),
0, 0,
&name, r, &dest_addr, ctx->event_ctx);
if (!NT_STATUS_IS_OK(status)) {
libnet_r->out.error_string = NULL;
talloc_free(tmp_ctx);

5
source4/torture/drs/rpc/dssync.c
View File

@ -105,8 +105,9 @@ static struct DsSyncTest *test_create_context(struct torture_context *tctx)
make_nbt_name_server(&name, ctx->drsuapi_binding->host);
/* do an initial name resolution to find its IP */
status = resolve_name(lpcfg_resolve_context(tctx->lp_ctx), &name, tctx,
&ctx->dest_address, tctx->ev);
status = resolve_name_ex(lpcfg_resolve_context(tctx->lp_ctx),
0, 0, &name, tctx,
&ctx->dest_address, tctx->ev);
if (!NT_STATUS_IS_OK(status)) {
printf("Failed to resolve %s - %s\n",
name.name, nt_errstr(status));

3
source4/torture/ldap/cldapbench.c
View File

@ -215,7 +215,8 @@ bool torture_bench_cldap(struct torture_context *torture)
make_nbt_name_server(&name, torture_setting_string(torture, "host", NULL));
/* do an initial name resolution to find its IP */
status = resolve_name(lpcfg_resolve_context(torture->lp_ctx), &name, torture, &address, torture->ev);
status = resolve_name_ex(lpcfg_resolve_context(torture->lp_ctx),
0, 0, &name, torture, &address, torture->ev);
if (!NT_STATUS_IS_OK(status)) {
printf("Failed to resolve %s - %s\n",
name.name, nt_errstr(status));

5
source4/torture/libnet/libnet_BecomeDC.c
View File

@ -67,8 +67,9 @@ bool torture_net_become_dc(struct torture_context *torture)
make_nbt_name_server(&name, torture_setting_string(torture, "host", NULL));
/* do an initial name resolution to find its IP */
status = resolve_name(lpcfg_resolve_context(torture->lp_ctx),
&name, torture, &address, torture->ev);
status = resolve_name_ex(lpcfg_resolve_context(torture->lp_ctx),
0, 0,
&name, torture, &address, torture->ev);
torture_assert_ntstatus_ok(torture, status, talloc_asprintf(torture,
"Failed to resolve %s - %s\n",
name.name, nt_errstr(status)));

11
source4/torture/nbt/dgram.c
View File

@ -86,7 +86,9 @@ static bool nbt_test_netlogon(struct torture_context *tctx)
/* do an initial name resolution to find its IP */
torture_assert_ntstatus_ok(tctx,
resolve_name(lpcfg_resolve_context(tctx->lp_ctx), &name, tctx, &address, tctx->ev),
resolve_name_ex(lpcfg_resolve_context(tctx->lp_ctx),
0, 0,
&name, tctx, &address, tctx->ev),
talloc_asprintf(tctx, "Failed to resolve %s", name.name));
load_interfaces(tctx, lpcfg_interfaces(tctx->lp_ctx), &ifaces);
@ -180,7 +182,9 @@ static bool nbt_test_netlogon2(struct torture_context *tctx)
/* do an initial name resolution to find its IP */
torture_assert_ntstatus_ok(tctx,
resolve_name(lpcfg_resolve_context(tctx->lp_ctx), &name, tctx, &address, tctx->ev),
resolve_name_ex(lpcfg_resolve_context(tctx->lp_ctx),
0, 0,
&name, tctx, &address, tctx->ev),
talloc_asprintf(tctx, "Failed to resolve %s", name.name));
load_interfaces(tctx, lpcfg_interfaces(tctx->lp_ctx), &ifaces);
@ -450,7 +454,8 @@ static bool nbt_test_ntlogon(struct torture_context *tctx)
/* do an initial name resolution to find its IP */
torture_assert_ntstatus_ok(tctx,
resolve_name(lpcfg_resolve_context(tctx->lp_ctx), &name, tctx, &address, tctx->ev),
resolve_name_ex(lpcfg_resolve_context(tctx->lp_ctx),
0, 0, &name, tctx, &address, tctx->ev),
talloc_asprintf(tctx, "Failed to resolve %s", name.name));
load_interfaces(tctx, lpcfg_interfaces(tctx->lp_ctx), &ifaces);

4
source4/torture/nbt/nbt.c
View File

@ -39,7 +39,9 @@ bool torture_nbt_get_name(struct torture_context *tctx,
/* do an initial name resolution to find its IP */
torture_assert_ntstatus_ok(tctx,
resolve_name(lpcfg_resolve_context(tctx->lp_ctx), name, tctx, address, tctx->ev),
resolve_name_ex(lpcfg_resolve_context(tctx->lp_ctx),
0, 0,
name, tctx, address, tctx->ev),
talloc_asprintf(tctx,
"Failed to resolve %s", name->name));