diff options
| -rw-r--r-- | source3/passdb/machine_account_secrets.c | 3 | ||||
| -rw-r--r-- | source4/lib/registry/tools/regshell.c | 3 | ||||
| -rw-r--r-- | source4/torture/drs/rpc/dssync.c | 2 | ||||
| -rw-r--r-- | source4/torture/ndr/ntprinting.c | 4 | ||||
| -rw-r--r-- | source4/torture/rpc/samsync.c | 4 | ||||
| -rw-r--r-- | source4/torture/smb2/ioctl.c | 9 |
6 files changed, 10 insertions, 15 deletions
diff --git a/source3/passdb/machine_account_secrets.c b/source3/passdb/machine_account_secrets.c index c551c3f344b..d404298502e 100644 --- a/source3/passdb/machine_account_secrets.c +++ b/source3/passdb/machine_account_secrets.c @@ -778,8 +778,7 @@ void secrets_debug_domain_info(int lvl, const struct secrets_domain_info1 *info1 sdib.info.info1 = discard_const_p(struct secrets_domain_info1, info1); - ndr_print_debug((ndr_print_fn_t)ndr_print_secrets_domain_infoB, - name, &sdib); + NDR_PRINT_DEBUG_LEVEL(lvl, secrets_domain_infoB, &sdib); } char *secrets_domain_info_string(TALLOC_CTX *mem_ctx, const struct secrets_domain_info1 *info1, diff --git a/source4/lib/registry/tools/regshell.c b/source4/lib/registry/tools/regshell.c index 1dd1cd5b8a1..dc7bf542550 100644 --- a/source4/lib/registry/tools/regshell.c +++ b/source4/lib/registry/tools/regshell.c @@ -143,8 +143,7 @@ static WERROR cmd_info(struct regshell_context *ctx, int argc, const char **argv printf("Error getting security descriptor: %s\n", win_errstr(error)); return WERR_OK; } - ndr_print_debug((ndr_print_fn_t)ndr_print_security_descriptor, - "Security", sec_desc); + NDR_PRINT_DEBUG(security_descriptor, sec_desc); talloc_free(sec_desc); return WERR_OK; diff --git a/source4/torture/drs/rpc/dssync.c b/source4/torture/drs/rpc/dssync.c index f63e8a4ae7d..d36c1a3112e 100644 --- a/source4/torture/drs/rpc/dssync.c +++ b/source4/torture/drs/rpc/dssync.c @@ -652,7 +652,7 @@ static bool test_analyse_objects(struct torture_context *tctx, ndr_err = ndr_pull_struct_blob(&plain_data, ptr, ptr, pull_fn); if (NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { - ndr_print_debug(print_fn, name, ptr); + (void)ndr_print_debug(1, print_fn, name, ptr, __location__, __func__); } else { DEBUG(0, ("Failed to decode %s\n", name)); } diff --git a/source4/torture/ndr/ntprinting.c b/source4/torture/ndr/ntprinting.c index 531e0040abd..d5e7e90a4ff 100644 --- a/source4/torture/ndr/ntprinting.c +++ b/source4/torture/ndr/ntprinting.c @@ -613,9 +613,7 @@ static bool ntprinting_printer_latin1_check(struct torture_context *tctx) ndr_err, "ndr_pull_ntprinting_printer"); #if 0 - ndr_print_debug((ndr_print_fn_t) ndr_print_ntprinting_printer, - "ntprinter", - &r); + NDR_PRINT_DEBUG(1, ntprinting_printer, &r); #endif torture_assert_str_equal(tctx, r.info.printername, diff --git a/source4/torture/rpc/samsync.c b/source4/torture/rpc/samsync.c index 6b9759b88fd..a8541d34641 100644 --- a/source4/torture/rpc/samsync.c +++ b/source4/torture/rpc/samsync.c @@ -328,8 +328,8 @@ static struct sec_desc_buf *samsync_query_lsa_sec_desc(struct torture_context *t if (!security_descriptor_mask_equal(sd1.sd, sdbuf->sd, \ ~SEC_DESC_SACL_PRESENT)) {\ torture_comment(tctx, "Security Descriptor Mismatch for %s:\n", #sd1);\ - ndr_print_debug((ndr_print_fn_t)ndr_print_security_descriptor, "SamSync", sd1.sd);\ - ndr_print_debug((ndr_print_fn_t)ndr_print_security_descriptor, "SamR", sdbuf->sd);\ + NDR_PRINT_DEBUG(security_descriptor, sd1.sd);\ + NDR_PRINT_DEBUG(security_descriptor, sdbuf->sd);\ ret = false;\ }\ }\ diff --git a/source4/torture/smb2/ioctl.c b/source4/torture/smb2/ioctl.c index a4d8885fe13..d5ebf93bd6a 100644 --- a/source4/torture/smb2/ioctl.c +++ b/source4/torture/smb2/ioctl.c @@ -112,7 +112,7 @@ static bool test_ioctl_req_resume_key(struct torture_context *torture, torture_assert_ndr_success(torture, ndr_ret, "ndr_pull_req_resume_key_rsp"); - ndr_print_debug((ndr_print_fn_t)ndr_print_req_resume_key_rsp, "yo", &res_key); + NDR_PRINT_DEBUG(req_resume_key_rsp, &res_key); talloc_free(tmp_ctx); return true; @@ -156,7 +156,7 @@ static bool test_ioctl_req_two_resume_keys(struct torture_context *torture, torture_assert_ndr_success(torture, ndr_ret, "ndr_pull_req_resume_key_rsp"); - ndr_print_debug((ndr_print_fn_t)ndr_print_req_resume_key_rsp, "yo", &res_key); + NDR_PRINT_DEBUG(req_resume_key_rsp, &res_key); ZERO_STRUCT(ioctl); ioctl.smb2.level = RAW_IOCTL_SMB2; @@ -173,7 +173,7 @@ static bool test_ioctl_req_two_resume_keys(struct torture_context *torture, torture_assert_ndr_success(torture, ndr_ret, "ndr_pull_req_resume_key_rsp"); - ndr_print_debug((ndr_print_fn_t)ndr_print_req_resume_key_rsp, "yo", &res_key); + NDR_PRINT_DEBUG(req_resume_key_rsp, &res_key); talloc_free(tmp_ctx); return true; @@ -3156,8 +3156,7 @@ static bool test_ioctl_network_interface_info(struct torture_context *torture, torture_assert_ndr_success(torture, ndr_ret, "ndr_pull_fsctl_net_iface_info"); - ndr_print_debug((ndr_print_fn_t)ndr_print_fsctl_net_iface_info, - "Network Interface Info", &net_iface); + NDR_PRINT_DEBUG(fsctl_net_iface_info, &net_iface); talloc_free(tmp_ctx); return true; |