diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-07-16 14:32:42 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-07-16 18:24:27 +1000 |
| commit | 6b266b85cf34145ac1f03d8f787b81121e4ec92b (patch) | |
| tree | 9f6faebdcf58c73e0297bfdf3b905ef256f8e478 /source4/torture/ldap | |
| parent | e4c35c5a09dd66c9280caa39130b7e3b941b7e51 (diff) | |
| download | samba-6b266b85cf34145ac1f03d8f787b81121e4ec92b.tar.gz samba-6b266b85cf34145ac1f03d8f787b81121e4ec92b.tar.bz2 samba-6b266b85cf34145ac1f03d8f787b81121e4ec92b.zip | |
s4-loadparm: 2nd half of lp_ to lpcfg_ conversion
this converts all callers that use the Samba4 loadparm lp_ calling
convention to use the lpcfg_ prefix.
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source4/torture/ldap')
| -rw-r--r-- | source4/torture/ldap/cldap.c | 10 | ||||
| -rw-r--r-- | source4/torture/ldap/cldapbench.c | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/source4/torture/ldap/cldap.c b/source4/torture/ldap/cldap.c index 8b6794374b..689e518e77 100644 --- a/source4/torture/ldap/cldap.c +++ b/source4/torture/ldap/cldap.c @@ -50,7 +50,7 @@ static bool test_cldap_netlogon(struct torture_context *tctx, const char *dest) ret = tsocket_address_inet_from_strings(tctx, "ip", dest, - lp_cldap_port(tctx->lp_ctx), + lpcfg_cldap_port(tctx->lp_ctx), &dest_addr); CHECK_VAL(ret, 0); @@ -283,7 +283,7 @@ static bool test_cldap_netlogon_flags(struct torture_context *tctx, ret = tsocket_address_inet_from_strings(tctx, "ip", dest, - lp_cldap_port(tctx->lp_ctx), + lpcfg_cldap_port(tctx->lp_ctx), &dest_addr); CHECK_VAL(ret, 0); @@ -403,7 +403,7 @@ static bool test_cldap_netlogon_flag_ds_dns_forest(struct torture_context *tctx, ret = tsocket_address_inet_from_strings(tctx, "ip", dest, - lp_cldap_port(tctx->lp_ctx), + lpcfg_cldap_port(tctx->lp_ctx), &dest_addr); CHECK_VAL(ret, 0); @@ -440,7 +440,7 @@ static bool test_cldap_netlogon_flag_ds_dns_forest(struct torture_context *tctx, "rootDomainNamingContext" */ ZERO_STRUCT(search2); search2.in.dest_address = dest; - search2.in.dest_port = lp_cldap_port(tctx->lp_ctx); + search2.in.dest_port = lpcfg_cldap_port(tctx->lp_ctx); search2.in.timeout = 10; search2.in.retries = 3; search2.in.filter = "(objectclass=*)"; @@ -485,7 +485,7 @@ static bool test_cldap_generic(struct torture_context *tctx, const char *dest) ret = tsocket_address_inet_from_strings(tctx, "ip", dest, - lp_cldap_port(tctx->lp_ctx), + lpcfg_cldap_port(tctx->lp_ctx), &dest_addr); CHECK_VAL(ret, 0); diff --git a/source4/torture/ldap/cldapbench.c b/source4/torture/ldap/cldapbench.c index 27c0746e9a..5c7e56f40b 100644 --- a/source4/torture/ldap/cldapbench.c +++ b/source4/torture/ldap/cldapbench.c @@ -67,7 +67,7 @@ static bool bench_cldap_netlogon(struct torture_context *tctx, const char *addre ret = tsocket_address_inet_from_strings(tctx, "ip", address, - lp_cldap_port(tctx->lp_ctx), + lpcfg_cldap_port(tctx->lp_ctx), &dest_addr); CHECK_VAL(ret, 0); @@ -150,7 +150,7 @@ static bool bench_cldap_rootdse(struct torture_context *tctx, const char *addres ret = tsocket_address_inet_from_strings(tctx, "ip", address, - lp_cldap_port(tctx->lp_ctx), + lpcfg_cldap_port(tctx->lp_ctx), &dest_addr); CHECK_VAL(ret, 0); @@ -215,7 +215,7 @@ 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(lp_resolve_context(torture->lp_ctx), &name, torture, &address, torture->ev); + status = resolve_name(lpcfg_resolve_context(torture->lp_ctx), &name, torture, &address, torture->ev); if (!NT_STATUS_IS_OK(status)) { printf("Failed to resolve %s - %s\n", name.name, nt_errstr(status)); |