The branch, master has been updated
via fe1bcdb s3: Re-add (), fix a gcc hint
via f5081df s3: Remove an unused variable
via b7b7ce5 s3: Fix an uninitialized variable warning
via 0834ecc s3: Fix a C++ warning
via 2622575 s3: Fix a C++ warning
from 27e2a4a Second part of bug #8494 - Remove "experimental" label on
VFS ACL modules.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit fe1bcdb4b9cddf1f8e85f1bc89e540f6cca90a29
Author: Volker Lendecke <[email protected]>
Date: Fri Sep 30 10:11:31 2011 +0200
s3: Re-add (), fix a gcc hint
Autobuild-User: Volker Lendecke <[email protected]>
Autobuild-Date: Fri Sep 30 15:06:47 CEST 2011 on sn-devel-104
commit f5081df369468b8b3324ed2a502e684f7068ace2
Author: Volker Lendecke <[email protected]>
Date: Fri Sep 30 10:10:14 2011 +0200
s3: Remove an unused variable
commit b7b7ce5aa45a1f0f72caa92b2adeee4d8c8b2535
Author: Volker Lendecke <[email protected]>
Date: Fri Sep 30 10:09:19 2011 +0200
s3: Fix an uninitialized variable warning
commit 0834ecc6f3f68d70c4bbf6b5ad745f4992a7f0f6
Author: Volker Lendecke <[email protected]>
Date: Fri Sep 30 10:07:35 2011 +0200
s3: Fix a C++ warning
commit 26225754ec257181e2c50e08c1703c0b65110ef7
Author: Volker Lendecke <[email protected]>
Date: Fri Sep 30 10:07:30 2011 +0200
s3: Fix a C++ warning
-----------------------------------------------------------------------
Summary of changes:
source3/lib/server_prefork.c | 6 ++++--
source3/librpc/crypto/cli_spnego.c | 2 --
source3/libsmb/smb2cli_base.c | 2 +-
source3/modules/vfs_default.c | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/server_prefork.c b/source3/lib/server_prefork.c
index 89600aa..f9df914 100644
--- a/source3/lib/server_prefork.c
+++ b/source3/lib/server_prefork.c
@@ -92,7 +92,8 @@ bool prefork_create_pool(TALLOC_CTX *mem_ctx,
pfp->pool_size = max_children;
data_size = sizeof(struct pf_worker_data) * max_children;
- pfp->pool = anonymous_shared_allocate(data_size);
+ pfp->pool = (struct pf_worker_data *)anonymous_shared_allocate(
+ data_size);
if (pfp->pool == NULL) {
DEBUG(1, ("Failed to mmap memory for prefork pool!\n"));
talloc_free(pfp);
@@ -158,7 +159,8 @@ int prefork_expand_pool(struct prefork_pool *pfp, int
new_max)
old_size = sizeof(struct pf_worker_data) * pfp->pool_size;
new_size = sizeof(struct pf_worker_data) * new_max;
- pool = anonymous_shared_resize(&pfp->pool, new_size, false);
+ pool = (struct prefork_pool *)anonymous_shared_resize(
+ &pfp->pool, new_size, false);
if (pool == NULL) {
ret = errno;
DEBUG(3, ("Failed to mremap memory (%d: %s)!\n",
diff --git a/source3/librpc/crypto/cli_spnego.c
b/source3/librpc/crypto/cli_spnego.c
index 65b5050..63a84a8 100644
--- a/source3/librpc/crypto/cli_spnego.c
+++ b/source3/librpc/crypto/cli_spnego.c
@@ -326,8 +326,6 @@ NTSTATUS spnego_get_negotiated_mech(struct spnego_context
*sp_ctx,
DATA_BLOB spnego_get_session_key(TALLOC_CTX *mem_ctx,
struct spnego_context *sp_ctx)
{
- DATA_BLOB sk;
-
switch (sp_ctx->mech) {
case SPNEGO_KRB5:
return gse_get_session_key(mem_ctx,
diff --git a/source3/libsmb/smb2cli_base.c b/source3/libsmb/smb2cli_base.c
index b85158f..52b7d05 100644
--- a/source3/libsmb/smb2cli_base.c
+++ b/source3/libsmb/smb2cli_base.c
@@ -519,7 +519,7 @@ static void smb2cli_inbuf_received(struct tevent_req
*subreq)
struct cli_state);
TALLOC_CTX *frame = talloc_stackframe();
struct tevent_req *req;
- struct smb2cli_req_state *state;
+ struct smb2cli_req_state *state = NULL;
struct iovec *iov;
int i, num_iov;
NTSTATUS status;
diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index 745b36c..55b6bc7 100644
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -1640,7 +1640,7 @@ static bool vfswrap_is_offline(struct vfs_handle_struct
*handle,
return false;
}
- offline = dmapi_file_flags(path) & FILE_ATTRIBUTE_OFFLINE != 0;
+ offline = (dmapi_file_flags(path) & FILE_ATTRIBUTE_OFFLINE) != 0;
TALLOC_FREE(path);
--
Samba Shared Repository
