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_parse/parse_net.c | 8 ++++---- source3/rpc_parse/parse_prs.c | 16 ++++++++-------- source3/rpc_parse/parse_samr.c | 14 +++++++------- 3 files changed, 19 insertions(+), 19 deletions(-) (limited to 'source3/rpc_parse') diff --git a/source3/rpc_parse/parse_net.c b/source3/rpc_parse/parse_net.c index a620781a2f..3eb31ad55f 100644 --- a/source3/rpc_parse/parse_net.c +++ b/source3/rpc_parse/parse_net.c @@ -1150,10 +1150,10 @@ void init_id_info1(NET_ID_INFO_1 *id, const char *domain_name, unsigned char key[16]; #ifdef DEBUG_PASSWORD DEBUG(100,("lm cypher:")); - dump_data(100, (char *)lm_cypher, 16); + dump_data(100, lm_cypher, 16); DEBUG(100,("nt cypher:")); - dump_data(100, (char *)nt_cypher, 16); + dump_data(100, nt_cypher, 16); #endif memset(key, 0, 16); @@ -1166,10 +1166,10 @@ void init_id_info1(NET_ID_INFO_1 *id, const char *domain_name, #ifdef DEBUG_PASSWORD DEBUG(100,("encrypt of lm owf password:")); - dump_data(100, (char *)lm_owf, 16); + dump_data(100, lm_owf, 16); DEBUG(100,("encrypt of nt owf password:")); - dump_data(100, (char *)nt_owf, 16); + dump_data(100, nt_owf, 16); #endif /* set up pointers to cypher blocks */ lm_cypher = lm_owf; diff --git a/source3/rpc_parse/parse_prs.c b/source3/rpc_parse/parse_prs.c index ca46807932..0fb429b591 100644 --- a/source3/rpc_parse/parse_prs.c +++ b/source3/rpc_parse/parse_prs.c @@ -1332,7 +1332,7 @@ BOOL prs_string(const char *name, prs_struct *ps, int depth, char *str, int max_ ps->data_offset += len+1; - dump_data(5+depth, q, len); + dump_data(5+depth, (uint8 *)q, len); return True; } @@ -1503,13 +1503,13 @@ BOOL prs_hash1(prs_struct *ps, uint32 offset, int len) #ifdef DEBUG_PASSWORD DEBUG(100, ("prs_hash1\n")); - dump_data(100, ps->sess_key, 16); - dump_data(100, q, len); + dump_data(100, (uint8 *)ps->sess_key, 16); + dump_data(100, (uint8 *)q, len); #endif SamOEMhash((uchar *) q, (const unsigned char *)ps->sess_key, len); #ifdef DEBUG_PASSWORD - dump_data(100, q, len); + dump_data(100, (uint8 *)q, len); #endif return True; @@ -1754,9 +1754,9 @@ BOOL schannel_decode(struct schannel_auth_struct *a, enum pipe_auth_level auth_l checksum after the decode, below */ DEBUG(2, ("schannel_decode: FAILED: packet sequence number:\n")); - dump_data(2, (const char*)verf->seq_num, sizeof(verf->seq_num)); + dump_data(2, (const uint8 *)verf->seq_num, sizeof(verf->seq_num)); DEBUG(2, ("should be:\n")); - dump_data(2, (const char*)seq_num, sizeof(seq_num)); + dump_data(2, (const uint8 *)seq_num, sizeof(seq_num)); return False; } @@ -1764,9 +1764,9 @@ BOOL schannel_decode(struct schannel_auth_struct *a, enum pipe_auth_level auth_l if (memcmp(verf->sig, schannel_sig, sizeof(verf->sig))) { /* Validate that the other end sent the expected header */ DEBUG(2, ("schannel_decode: FAILED: packet header:\n")); - dump_data(2, (const char*)verf->sig, sizeof(verf->sig)); + dump_data(2, (const uint8 *)verf->sig, sizeof(verf->sig)); DEBUG(2, ("should be:\n")); - dump_data(2, (const char*)schannel_sig, sizeof(schannel_sig)); + dump_data(2, (const uint8 *)schannel_sig, sizeof(schannel_sig)); return False; } diff --git a/source3/rpc_parse/parse_samr.c b/source3/rpc_parse/parse_samr.c index e0f5f7f294..18d1a66e71 100644 --- a/source3/rpc_parse/parse_samr.c +++ b/source3/rpc_parse/parse_samr.c @@ -6661,13 +6661,13 @@ static void init_samr_userinfo_ctr(SAM_USERINFO_CTR * ctr, DATA_BLOB *sess_key, switch (switch_value) { case 0x18: SamOEMhashBlob(ctr->info.id24->pass, 516, sess_key); - dump_data(100, (char *)sess_key->data, sess_key->length); - dump_data(100, (char *)ctr->info.id24->pass, 516); + dump_data(100, sess_key->data, sess_key->length); + dump_data(100, ctr->info.id24->pass, 516); break; case 0x17: SamOEMhashBlob(ctr->info.id23->pass, 516, sess_key); - dump_data(100, (char *)sess_key->data, sess_key->length); - dump_data(100, (char *)ctr->info.id23->pass, 516); + dump_data(100, sess_key->data, sess_key->length); + dump_data(100, ctr->info.id23->pass, 516); break; case 0x07: break; @@ -6970,9 +6970,9 @@ void init_samr_q_set_userinfo2(SAMR_Q_SET_USERINFO2 * q_u, case 18: SamOEMhashBlob(ctr->info.id18->lm_pwd, 16, sess_key); SamOEMhashBlob(ctr->info.id18->nt_pwd, 16, sess_key); - dump_data(100, (char *)sess_key->data, sess_key->length); - dump_data(100, (char *)ctr->info.id18->lm_pwd, 16); - dump_data(100, (char *)ctr->info.id18->nt_pwd, 16); + dump_data(100, sess_key->data, sess_key->length); + dump_data(100, ctr->info.id18->lm_pwd, 16); + dump_data(100, ctr->info.id18->nt_pwd, 16); break; } } -- cgit