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/dns | |
| 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/dns')
| -rw-r--r-- | source4/torture/dns/dlz_bind9.c | 46 |
1 files changed, 26 insertions, 20 deletions
diff --git a/source4/torture/dns/dlz_bind9.c b/source4/torture/dns/dlz_bind9.c index f16d16ec061..c29f26802f5 100644 --- a/source4/torture/dns/dlz_bind9.c +++ b/source4/torture/dns/dlz_bind9.c @@ -174,7 +174,8 @@ static bool test_dlz_bind9_gensec(struct torture_context *tctx, const char *mech status = gensec_set_target_service(gensec_client_context, "dns"); torture_assert_ntstatus_ok(tctx, status, "gensec_set_target_service failed"); - status = gensec_set_credentials(gensec_client_context, cmdline_credentials); + status = gensec_set_credentials(gensec_client_context, + popt_get_cmdline_credentials()); torture_assert_ntstatus_ok(tctx, status, "gensec_set_credentials (client) failed"); status = gensec_start_mech_by_sasl_name(gensec_client_context, mech); @@ -188,14 +189,16 @@ static bool test_dlz_bind9_gensec(struct torture_context *tctx, const char *mech torture_assert_ntstatus_ok(tctx, status, "gensec_update (client) failed"); } - torture_assert_int_equal(tctx, dlz_ssumatch(cli_credentials_get_username(cmdline_credentials), - lpcfg_dnsdomain(tctx->lp_ctx), - "127.0.0.1", "type", "key", - client_to_server.length, - client_to_server.data, - dbdata), - ISC_TRUE, - "Failed to check key for update rights samba_dlz"); + torture_assert_int_equal(tctx, dlz_ssumatch( + cli_credentials_get_username( + popt_get_cmdline_credentials()), + lpcfg_dnsdomain(tctx->lp_ctx), + "127.0.0.1", "type", "key", + client_to_server.length, + client_to_server.data, + dbdata), + ISC_TRUE, + "Failed to check key for update rights samba_dlz"); dlz_destroy(dbdata); @@ -653,7 +656,8 @@ static bool test_dlz_bind9_update01(struct torture_context *tctx) status = gensec_set_target_service(gensec_client_context, "dns"); torture_assert_ntstatus_ok(tctx, status, "gensec_set_target_service failed"); - status = gensec_set_credentials(gensec_client_context, cmdline_credentials); + status = gensec_set_credentials(gensec_client_context, + popt_get_cmdline_credentials()); torture_assert_ntstatus_ok(tctx, status, "gensec_set_credentials (client) failed"); status = gensec_start_mech_by_sasl_name(gensec_client_context, "GSS-SPNEGO"); @@ -667,16 +671,18 @@ static bool test_dlz_bind9_update01(struct torture_context *tctx) torture_assert_ntstatus_ok(tctx, status, "gensec_update (client) failed"); } - torture_assert_int_equal(tctx, dlz_ssumatch(cli_credentials_get_username(cmdline_credentials), - name, - "127.0.0.1", - expected1->records[0].type, - "key", - client_to_server.length, - client_to_server.data, - dbdata), - ISC_TRUE, - "Failed to check key for update rights samba_dlz"); + torture_assert_int_equal(tctx, dlz_ssumatch( + cli_credentials_get_username( + popt_get_cmdline_credentials()), + name, + "127.0.0.1", + expected1->records[0].type, + "key", + client_to_server.length, + client_to_server.data, + dbdata), + ISC_TRUE, + "Failed to check key for update rights samba_dlz"); /* * We test the following: |