From 2ebe95bf862029edb8d768de83864dd183c4e672 Mon Sep 17 00:00:00 2001 From: =?utf-8?q?G=C3=BCnther=20Deschner?= Date: Wed, 4 Nov 2009 15:58:08 +0100 Subject: [PATCH] s3: Fix Bug #6869: Various annoying build warnings. Guenther --- lib/async_req/async_req.c | 4 ++-- lib/async_req/async_req.h | 2 +- source3/modules/vfs_default.c | 1 - source3/rpc_client/cli_netlogon.c | 2 +- source3/rpc_server/srv_samr_nt.c | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/lib/async_req/async_req.c b/lib/async_req/async_req.c index 4dfe809..9024738 100644 --- a/lib/async_req/async_req.c +++ b/lib/async_req/async_req.c @@ -272,7 +272,7 @@ bool async_req_enqueue(struct async_req_queue *queue, struct tevent_context *ev, } bool _async_req_setup(TALLOC_CTX *mem_ctx, struct async_req **preq, - void *pstate, size_t state_size, const char *typename) + void *pstate, size_t state_size, const char *_typename) { struct async_req *req; void **ppstate = (void **)pstate; @@ -287,7 +287,7 @@ bool _async_req_setup(TALLOC_CTX *mem_ctx, struct async_req **preq, TALLOC_FREE(req); return false; } - talloc_set_name_const(state, typename); + talloc_set_name_const(state, _typename); req->private_data = state; *preq = req; diff --git a/lib/async_req/async_req.h b/lib/async_req/async_req.h index fdec1b7..a06e824 100644 --- a/lib/async_req/async_req.h +++ b/lib/async_req/async_req.h @@ -149,7 +149,7 @@ bool async_req_enqueue(struct async_req_queue *queue, void (*trigger)(struct async_req *req)); bool _async_req_setup(TALLOC_CTX *mem_ctx, struct async_req **preq, - void *pstate, size_t state_size, const char *typename); + void *pstate, size_t state_size, const char *_typename); #define async_req_setup(_mem_ctx, _preq, _pstate, type) \ _async_req_setup((_mem_ctx), (_preq), (_pstate), sizeof(type), #type) diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c index ca401b6..f5cee4c 100644 --- a/source3/modules/vfs_default.c +++ b/source3/modules/vfs_default.c @@ -95,7 +95,6 @@ static uint32_t vfswrap_fs_capabilities(struct vfs_handle_struct *handle) connection_struct *conn = handle->conn; uint32_t caps = FILE_CASE_SENSITIVE_SEARCH | FILE_CASE_PRESERVED_NAMES; SMB_STRUCT_STAT st; - NTSTATUS status; struct timespec mtime_ts, ctime_ts, atime_ts; int ret = -1; diff --git a/source3/rpc_client/cli_netlogon.c b/source3/rpc_client/cli_netlogon.c index 4d7347f..d9e81ef 100644 --- a/source3/rpc_client/cli_netlogon.c +++ b/source3/rpc_client/cli_netlogon.c @@ -602,7 +602,7 @@ NTSTATUS rpccli_netlogon_set_trust_password(struct rpc_pipe_client *cli, struct samr_Password new_password; des_crypt112_16(new_password.hash, - new_trust_passwd_hash, + (unsigned char *)new_trust_passwd_hash, cli->dc->sess_key, 1); result = rpccli_netr_ServerPasswordSet(cli, mem_ctx, diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c index a608f16..21f4094 100644 --- a/source3/rpc_server/srv_samr_nt.c +++ b/source3/rpc_server/srv_samr_nt.c @@ -3042,7 +3042,7 @@ NTSTATUS _samr_QueryUserInfo(pipes_struct *p, uint32 rid; bool ret = false; struct samu *pwd = NULL; - uint32_t acc_required, acc_granted; + uint32_t acc_required, acc_granted = 0; /* search for the handle */ if (!find_policy_by_hnd(p, r->in.user_handle, (void **)(void *)&info)) -- 1.6.2.5