s3: Fix Bug #6869: Various annoying build warnings.

Guenther

diff --git a/lib/async_req/async_req.c b/lib/async_req/async_req.c
index 4dfe809738e516f14cbc9423b65873a03f4c621a..90247389f6d3745a9c3bd7adb601c47b0979c4a4 100644 (file)
--- 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 fdec1b708e275f23709169f06bed57d64d6e5bc3..a06e824d958d59a7a5fb20ec49cc7be8fa7a8ac2 100644 (file)
--- 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 ca401b694a1cd85adb887e580d43f3080c2837fe..f5cee4c5b576146da5a0f40e8b465f5e6036cef0 100644 (file)
--- 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 4d7347f36d9cf7ee06526804dda600a407152434..d9e81ef1cb7f0fba8813628867dfc90479a2b21d 100644 (file)
--- 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 a608f16726f749240171303ca9e28af5f921c4b5..21f40942c345fc7899f611df8ac0b0e3bd7f40d3 100644 (file)
--- 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))