diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-05-02 16:36:48 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-05-03 07:37:07 +0200 |
| commit | 7261a9b9f76d19e6a2179a48e903e2fee4ee64a1 (patch) | |
| tree | 3d45a1652b32f830b2dd4c5fef59401c3a5a380a /source4/torture | |
| parent | 62931369ee5ca2dfcab3d59afac56c55a70d49e7 (diff) | |
| download | samba-7261a9b9f76d19e6a2179a48e903e2fee4ee64a1.tar.gz samba-7261a9b9f76d19e6a2179a48e903e2fee4ee64a1.tar.bz2 samba-7261a9b9f76d19e6a2179a48e903e2fee4ee64a1.zip | |
s4-libcli Remove resolve_name() as it conflicts with Samba3.
This was just a wrapper around resolve_name_ex(), so just call that
instead.
Andrew Bartlett
Diffstat (limited to 'source4/torture')
| -rw-r--r-- | source4/torture/drs/rpc/dssync.c | 5 | ||||
| -rw-r--r-- | source4/torture/ldap/cldapbench.c | 3 | ||||
| -rw-r--r-- | source4/torture/libnet/libnet_BecomeDC.c | 5 | ||||
| -rw-r--r-- | source4/torture/nbt/dgram.c | 11 | ||||
| -rw-r--r-- | source4/torture/nbt/nbt.c | 4 |
5 files changed, 19 insertions, 9 deletions
diff --git a/source4/torture/drs/rpc/dssync.c b/source4/torture/drs/rpc/dssync.c index 2ec3ded287..733e55ded5 100644 --- a/source4/torture/drs/rpc/dssync.c +++ b/source4/torture/drs/rpc/dssync.c @@ -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)); diff --git a/source4/torture/ldap/cldapbench.c b/source4/torture/ldap/cldapbench.c index 5c7e56f40b..7d02a2580b 100644 --- a/source4/torture/ldap/cldapbench.c +++ b/source4/torture/ldap/cldapbench.c @@ -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)); diff --git a/source4/torture/libnet/libnet_BecomeDC.c b/source4/torture/libnet/libnet_BecomeDC.c index 0fbad00d7b..b532e071c7 100644 --- a/source4/torture/libnet/libnet_BecomeDC.c +++ b/source4/torture/libnet/libnet_BecomeDC.c @@ -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))); diff --git a/source4/torture/nbt/dgram.c b/source4/torture/nbt/dgram.c index 36914bdcc3..7306c54deb 100644 --- a/source4/torture/nbt/dgram.c +++ b/source4/torture/nbt/dgram.c @@ -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); diff --git a/source4/torture/nbt/nbt.c b/source4/torture/nbt/nbt.c index 7c45f867e7..1b7fe49cf8 100644 --- a/source4/torture/nbt/nbt.c +++ b/source4/torture/nbt/nbt.c @@ -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)); |