From 56ba44766854ed7cda265bdaf85913f2a1008282 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 28 Mar 2007 13:34:59 +0000 Subject: r22001: change prototype of dump_data(), so that it takes unsigned char * now, which matches what samba4 has. also fix all the callers to prevent compiler warnings metze (This used to be commit fa322f0cc9c26a9537ba3f0a7d4e4a25941317e7) --- source3/rpc_server/srv_lsa_hnd.c | 6 +++--- source3/rpc_server/srv_netlog_nt.c | 2 +- source3/rpc_server/srv_pipe_hnd.c | 2 +- source3/rpc_server/srv_samr_nt.c | 12 ++++++------ source3/rpc_server/srv_spoolss_nt.c | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) (limited to 'source3/rpc_server') diff --git a/source3/rpc_server/srv_lsa_hnd.c b/source3/rpc_server/srv_lsa_hnd.c index 88c59ee895..a95415c9ce 100644 --- a/source3/rpc_server/srv_lsa_hnd.c +++ b/source3/rpc_server/srv_lsa_hnd.c @@ -146,7 +146,7 @@ BOOL create_policy_hnd(pipes_struct *p, POLICY_HND *hnd, void (*free_fn)(void *) *hnd = pol->pol_hnd; DEBUG(4,("Opened policy hnd[%d] ", (int)p->pipe_handles->count)); - dump_data(4, (char *)hnd, sizeof(*hnd)); + dump_data(4, (uint8 *)hnd, sizeof(*hnd)); return True; } @@ -166,7 +166,7 @@ static struct policy *find_policy_by_hnd_internal(pipes_struct *p, POLICY_HND *h for (i = 0, pol=p->pipe_handles->Policy;pol;pol=pol->next, i++) { if (memcmp(&pol->pol_hnd, hnd, sizeof(*hnd)) == 0) { DEBUG(4,("Found policy hnd[%d] ", (int)i)); - dump_data(4, (char *)hnd, sizeof(*hnd)); + dump_data(4, (uint8 *)hnd, sizeof(*hnd)); if (data_p) *data_p = pol->data_ptr; return pol; @@ -174,7 +174,7 @@ static struct policy *find_policy_by_hnd_internal(pipes_struct *p, POLICY_HND *h } DEBUG(4,("Policy not found: ")); - dump_data(4, (char *)hnd, sizeof(*hnd)); + dump_data(4, (uint8 *)hnd, sizeof(*hnd)); p->bad_handle_fault_state = True; diff --git a/source3/rpc_server/srv_netlog_nt.c b/source3/rpc_server/srv_netlog_nt.c index b8c776964e..0c12cb3b7c 100644 --- a/source3/rpc_server/srv_netlog_nt.c +++ b/source3/rpc_server/srv_netlog_nt.c @@ -296,7 +296,7 @@ static NTSTATUS get_md4pw(char *md4pw, char *mach_acct, uint16 sec_chan_type) } memcpy(md4pw, pass, 16); - dump_data(5, md4pw, 16); + dump_data(5, (uint8 *)md4pw, 16); TALLOC_FREE(sampass); diff --git a/source3/rpc_server/srv_pipe_hnd.c b/source3/rpc_server/srv_pipe_hnd.c index 8aa5bb3e6d..d65696668e 100644 --- a/source3/rpc_server/srv_pipe_hnd.c +++ b/source3/rpc_server/srv_pipe_hnd.c @@ -937,7 +937,7 @@ ssize_t write_to_pipe(smb_np_struct *p, char *data, size_t n) DEBUG(6,(" name: %s open: %s len: %d\n", p->name, BOOLSTR(p->open), (int)n)); - dump_data(50, data, n); + dump_data(50, (uint8 *)data, n); return p->namedpipe_write(p->np_state, data, n); } diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c index ca7185f527..c743e68530 100644 --- a/source3/rpc_server/srv_samr_nt.c +++ b/source3/rpc_server/srv_samr_nt.c @@ -3553,7 +3553,7 @@ NTSTATUS _samr_set_userinfo(pipes_struct *p, SAMR_Q_SET_USERINFO *q_u, SAMR_R_SE } SamOEMhashBlob(ctr->info.id24->pass, 516, &p->session_key); - dump_data(100, (char *)ctr->info.id24->pass, 516); + dump_data(100, ctr->info.id24->pass, 516); if (!set_user_info_pw(ctr->info.id24->pass, pwd)) r_u->status = NT_STATUS_ACCESS_DENIED; @@ -3565,7 +3565,7 @@ NTSTATUS _samr_set_userinfo(pipes_struct *p, SAMR_Q_SET_USERINFO *q_u, SAMR_R_SE } encode_or_decode_arc4_passwd_buffer(ctr->info.id25->pass, &p->session_key); - dump_data(100, (char *)ctr->info.id25->pass, 532); + dump_data(100, ctr->info.id25->pass, 532); r_u->status = set_user_info_25(p->mem_ctx, ctr->info.id25, pwd); @@ -3582,7 +3582,7 @@ NTSTATUS _samr_set_userinfo(pipes_struct *p, SAMR_Q_SET_USERINFO *q_u, SAMR_R_SE } encode_or_decode_arc4_passwd_buffer(ctr->info.id26->pass, &p->session_key); - dump_data(100, (char *)ctr->info.id26->pass, 516); + dump_data(100, ctr->info.id26->pass, 516); if (!set_user_info_pw(ctr->info.id26->pass, pwd)) r_u->status = NT_STATUS_ACCESS_DENIED; @@ -3594,7 +3594,7 @@ NTSTATUS _samr_set_userinfo(pipes_struct *p, SAMR_Q_SET_USERINFO *q_u, SAMR_R_SE } SamOEMhashBlob(ctr->info.id23->pass, 516, &p->session_key); - dump_data(100, (char *)ctr->info.id23->pass, 516); + dump_data(100, ctr->info.id23->pass, 516); r_u->status = set_user_info_23(p->mem_ctx, ctr->info.id23, pwd); @@ -3728,7 +3728,7 @@ NTSTATUS _samr_set_userinfo2(pipes_struct *p, SAMR_Q_SET_USERINFO2 *q_u, SAMR_R_ } SamOEMhashBlob(ctr->info.id23->pass, 516, &p->session_key); - dump_data(100, (char *)ctr->info.id23->pass, 516); + dump_data(100, ctr->info.id23->pass, 516); r_u->status = set_user_info_23(p->mem_ctx, ctr->info.id23, pwd); @@ -3739,7 +3739,7 @@ NTSTATUS _samr_set_userinfo2(pipes_struct *p, SAMR_Q_SET_USERINFO2 *q_u, SAMR_R_ } encode_or_decode_arc4_passwd_buffer(ctr->info.id26->pass, &p->session_key); - dump_data(100, (char *)ctr->info.id26->pass, 516); + dump_data(100, ctr->info.id26->pass, 516); if (!set_user_info_pw(ctr->info.id26->pass, pwd)) r_u->status = NT_STATUS_ACCESS_DENIED; diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c index 958e9d81fe..e06d613c74 100644 --- a/source3/rpc_server/srv_spoolss_nt.c +++ b/source3/rpc_server/srv_spoolss_nt.c @@ -1097,7 +1097,7 @@ static BOOL notify2_unpack_msg( SPOOLSS_NOTIFY_MSG *msg, struct timeval *tv, voi DEBUG(3, ("notify2_unpack_msg: value1 = %d, value2 = %d\n", msg->notify.value[0], msg->notify.value[1])); else - dump_data(3, msg->notify.data, msg->len); + dump_data(3, (uint8 *)msg->notify.data, msg->len); return True; } -- cgit