diff options
| author | Jeremy Allison <jra@samba.org> | 2006-02-18 00:27:31 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:10:13 -0500 |
| commit | 9132acff082381b32961eb2b3244b8fedd4df218 (patch) | |
| tree | 344dc24de1501de59edc6036480efaf29807d92f /source3/rpc_server | |
| parent | 3403fc2d4966e7b2e29ec45ecdc53332302427e4 (diff) | |
| download | samba-9132acff082381b32961eb2b3244b8fedd4df218.tar.gz samba-9132acff082381b32961eb2b3244b8fedd4df218.tar.bz2 samba-9132acff082381b32961eb2b3244b8fedd4df218.zip | |
r13553: Fix all our warnings at -O6 on an x86_64 box.
Jeremy.
(This used to be commit ea82958349a57ef4b7ce9638eec5f1388b0fba2a)
Diffstat (limited to 'source3/rpc_server')
| -rw-r--r-- | source3/rpc_server/srv_lsa_nt.c | 20 | ||||
| -rw-r--r-- | source3/rpc_server/srv_netlog_nt.c | 4 |
2 files changed, 12 insertions, 12 deletions
diff --git a/source3/rpc_server/srv_lsa_nt.c b/source3/rpc_server/srv_lsa_nt.c index a9886363d2..bdfb742f7a 100644 --- a/source3/rpc_server/srv_lsa_nt.c +++ b/source3/rpc_server/srv_lsa_nt.c @@ -137,12 +137,12 @@ static int init_dom_ref(DOM_R_REF *ref, const char *dom_name, DOM_SID *dom_sid) static NTSTATUS lookup_lsa_rids(TALLOC_CTX *mem_ctx, DOM_R_REF *ref, DOM_RID *prid, - int num_entries, + uint32 num_entries, const UNISTR2 *name, int flags, - int *pmapped_count) + uint32 *pmapped_count) { - int mapped_count, i; + uint32 mapped_count, i; SMB_ASSERT(num_entries <= MAX_LOOKUP_SIDS); @@ -212,12 +212,12 @@ static NTSTATUS lookup_lsa_rids(TALLOC_CTX *mem_ctx, static NTSTATUS lookup_lsa_sids(TALLOC_CTX *mem_ctx, DOM_R_REF *ref, LSA_TRANSLATED_SID3 *trans_sids, - int num_entries, + uint32 num_entries, const UNISTR2 *name, int flags, - int *pmapped_count) + uint32 *pmapped_count) { - int mapped_count, i; + uint32 mapped_count, i; SMB_ASSERT(num_entries <= MAX_LOOKUP_SIDS); @@ -1030,7 +1030,7 @@ NTSTATUS _lsa_lookup_names(pipes_struct *p,LSA_Q_LOOKUP_NAMES *q_u, LSA_R_LOOKUP { struct lsa_info *handle; UNISTR2 *names = q_u->uni_name; - int num_entries = q_u->num_entries; + uint32 num_entries = q_u->num_entries; DOM_R_REF *ref; DOM_RID *rids; uint32 mapped_count = 0; @@ -1090,7 +1090,7 @@ NTSTATUS _lsa_lookup_names2(pipes_struct *p, LSA_Q_LOOKUP_NAMES2 *q_u, LSA_R_LOO { struct lsa_info *handle; UNISTR2 *names = q_u->uni_name; - int num_entries = q_u->num_entries; + uint32 num_entries = q_u->num_entries; DOM_R_REF *ref; DOM_RID *rids; DOM_RID2 *rids2; @@ -1163,7 +1163,7 @@ NTSTATUS _lsa_lookup_names3(pipes_struct *p, LSA_Q_LOOKUP_NAMES3 *q_u, LSA_R_LOO { struct lsa_info *handle; UNISTR2 *names = q_u->uni_name; - int num_entries = q_u->num_entries; + uint32 num_entries = q_u->num_entries; DOM_R_REF *ref = NULL; LSA_TRANSLATED_SID3 *trans_sids = NULL; uint32 mapped_count = 0; @@ -1224,7 +1224,7 @@ lsa_reply_lookup_names4. NTSTATUS _lsa_lookup_names4(pipes_struct *p, LSA_Q_LOOKUP_NAMES4 *q_u, LSA_R_LOOKUP_NAMES4 *r_u) { UNISTR2 *names = q_u->uni_name; - int num_entries = q_u->num_entries; + uint32 num_entries = q_u->num_entries; DOM_R_REF *ref = NULL; LSA_TRANSLATED_SID3 *trans_sids = NULL; uint32 mapped_count = 0; diff --git a/source3/rpc_server/srv_netlog_nt.c b/source3/rpc_server/srv_netlog_nt.c index af1f0ebdcf..1813fd6c1e 100644 --- a/source3/rpc_server/srv_netlog_nt.c +++ b/source3/rpc_server/srv_netlog_nt.c @@ -338,7 +338,7 @@ NTSTATUS _net_auth(pipes_struct *p, NET_Q_AUTH *q_u, NET_R_AUTH *r_u) p->dc, &p->dc->clnt_chal, /* Stored client chal. */ &p->dc->srv_chal, /* Stored server chal. */ - (const char *)p->dc->mach_pw, + p->dc->mach_pw, &srv_chal_out); /* Check client credentials are valid. */ @@ -416,7 +416,7 @@ NTSTATUS _net_auth_2(pipes_struct *p, NET_Q_AUTH_2 *q_u, NET_R_AUTH_2 *r_u) p->dc, &p->dc->clnt_chal, /* Stored client chal. */ &p->dc->srv_chal, /* Stored server chal. */ - (const char *)p->dc->mach_pw, + p->dc->mach_pw, &srv_chal_out); /* Check client credentials are valid. */ |