diff options
| author | Jeremy Allison <jra@samba.org> | 2017-05-09 16:10:03 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2017-05-11 20:30:13 +0200 |
| commit | b2de5a81bf2e5a79b101859c738fc057af7308ed (patch) | |
| tree | 439e0d660e3ab059deb4b0108170f3a31a9a8d70 /source4/torture/ldap | |
| parent | dd4a3ce92792c4687f92d4b9e88f7bbee6cad593 (diff) | |
| download | samba-b2de5a81bf2e5a79b101859c738fc057af7308ed.tar.gz | |
s4: popt: Global replace of cmdline_credentials -> popt_get_cmdline_credentials().
Add one use of popt_set_cmdline_credentials().
Fix 80 column limits when cmdline_credentials changes
to popt_get_cmdline_credentials().
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'source4/torture/ldap')
| -rw-r--r-- | source4/torture/ldap/basic.c | 4 | ||||
| -rw-r--r-- | source4/torture/ldap/ldap_sort.c | 2 | ||||
| -rw-r--r-- | source4/torture/ldap/nested_search.c | 2 | ||||
| -rw-r--r-- | source4/torture/ldap/schema.c | 2 | ||||
| -rw-r--r-- | source4/torture/ldap/uptodatevector.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/source4/torture/ldap/basic.c b/source4/torture/ldap/basic.c index 5f758a95029..fd287bde73c 100644 --- a/source4/torture/ldap/basic.c +++ b/source4/torture/ldap/basic.c @@ -724,7 +724,7 @@ static bool test_referrals(struct torture_context *tctx, TALLOC_CTX *mem_ctx, } ldb = ldb_wrap_connect(mem_ctx, tctx->ev, tctx->lp_ctx, url, - NULL, cmdline_credentials, 0); + NULL, popt_get_cmdline_credentials(), 0); /* "partitions[i]" are the partitions for which we search the parents */ for (i = 1; partitions[i] != NULL; i++) { @@ -968,7 +968,7 @@ bool torture_ldap_basic(struct torture_context *torture) ret = false; } - if (!test_bind_sasl(torture, conn, cmdline_credentials)) { + if (!test_bind_sasl(torture, conn, popt_get_cmdline_credentials())) { ret = false; } diff --git a/source4/torture/ldap/ldap_sort.c b/source4/torture/ldap/ldap_sort.c index 643ff3ffbcf..7aa0d54bf6f 100644 --- a/source4/torture/ldap/ldap_sort.c +++ b/source4/torture/ldap/ldap_sort.c @@ -62,7 +62,7 @@ bool torture_ldap_sort(struct torture_context *torture) ldb = ldb_wrap_connect(torture, torture->ev, torture->lp_ctx, url, NULL, - cmdline_credentials, + popt_get_cmdline_credentials(), 0); torture_assert(torture, ldb, "Failed to make LDB connection to target"); diff --git a/source4/torture/ldap/nested_search.c b/source4/torture/ldap/nested_search.c index 9699919ecc1..31e127d04ff 100644 --- a/source4/torture/ldap/nested_search.c +++ b/source4/torture/ldap/nested_search.c @@ -162,7 +162,7 @@ bool test_ldap_nested_search(struct torture_context *tctx) torture_comment(tctx, "Connecting to: %s\n", url); sctx->ldb = ldb_wrap_connect(sctx, tctx->ev, tctx->lp_ctx, url, NULL, - cmdline_credentials, + popt_get_cmdline_credentials(), 0); torture_assert(tctx, sctx->ldb, "Failed to create ldb connection"); diff --git a/source4/torture/ldap/schema.c b/source4/torture/ldap/schema.c index 8f40d944234..b6da873e7fc 100644 --- a/source4/torture/ldap/schema.c +++ b/source4/torture/ldap/schema.c @@ -388,7 +388,7 @@ bool torture_ldap_schema(struct torture_context *torture) ldb = ldb_wrap_connect(torture, torture->ev, torture->lp_ctx, url, NULL, - cmdline_credentials, + popt_get_cmdline_credentials(), 0); if (!ldb) goto failed; diff --git a/source4/torture/ldap/uptodatevector.c b/source4/torture/ldap/uptodatevector.c index d2a8980f3ba..289ff6d863b 100644 --- a/source4/torture/ldap/uptodatevector.c +++ b/source4/torture/ldap/uptodatevector.c @@ -159,7 +159,7 @@ bool torture_ldap_uptodatevector(struct torture_context *torture) ldb = ldb_wrap_connect(torture, torture->ev, torture->lp_ctx, url, NULL, - cmdline_credentials, + popt_get_cmdline_credentials(), 0); if (!ldb) goto failed; |