The branch, master has been updated
via fac6191 s3: Make vfswrap_audit_file static
via 2e77833 s3: Fix Coverity ID 703870 Uninitialized scalar variable
via 386be83 s3: Save errno around a TALLOC_FREE
via 1004218 s3: Fix Coverity ID 703871 Unused pointer value
from 1b0690f s3/doc: some spelling fixes
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit fac6191f3c1f719a482f04e60ce7828197858e9a
Author: Volker Lendecke <v...@samba.org>
Date: Fri Jun 8 11:59:18 2012 +0200
s3: Make vfswrap_audit_file static
Signed-off-by: Jeremy Allison <j...@samba.org>
Autobuild-User(master): Jeremy Allison <j...@samba.org>
Autobuild-Date(master): Tue Jun 12 02:26:31 CEST 2012 on sn-devel-104
commit 2e77833641934da8ca0f7c2ee172190ea43df903
Author: Volker Lendecke <v...@samba.org>
Date: Mon Jun 11 11:16:12 2012 +0200
s3: Fix Coverity ID 703870 Uninitialized scalar variable
According to man 2 recvmsg this might be unnecessary, but it does
not hurt either
Signed-off-by: Jeremy Allison <j...@samba.org>
commit 386be83cbd9ea9814a1039199cb83897fece14ec
Author: Volker Lendecke <v...@samba.org>
Date: Mon Jun 11 11:00:27 2012 +0200
s3: Save errno around a TALLOC_FREE
Signed-off-by: Jeremy Allison <j...@samba.org>
commit 100421844cd068c9ebe20d0965d7d5d848c5a375
Author: Volker Lendecke <v...@samba.org>
Date: Mon Jun 11 10:59:23 2012 +0200
s3: Fix Coverity ID 703871 Unused pointer value
Signed-off-by: Jeremy Allison <j...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
source3/modules/vfs_aio_fork.c | 8 ++++++++
source3/modules/vfs_default.c | 10 +++++-----
2 files changed, 13 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/modules/vfs_aio_fork.c b/source3/modules/vfs_aio_fork.c
index f3e8f7f..4be21f7 100644
--- a/source3/modules/vfs_aio_fork.c
+++ b/source3/modules/vfs_aio_fork.c
@@ -145,6 +145,7 @@ static ssize_t read_fd(int fd, void *ptr, size_t nbytes,
int *recvfd)
msg.msg_name = NULL;
msg.msg_namelen = 0;
+ msg.msg_flags = 0;
iov[0].iov_base = (void *)ptr;
iov[0].iov_len = nbytes;
@@ -794,6 +795,7 @@ static int aio_fork_suspend(struct vfs_handle_struct
*handle,
int i;
int ret = -1;
bool timed_out = false;
+ int err;
children = init_aio_children(handle);
if (children == NULL) {
@@ -861,6 +863,10 @@ static int aio_fork_suspend(struct vfs_handle_struct
*handle,
EVENT_FD_READ,
handle_aio_completion,
child);
+ if (event == NULL) {
+ errno = ENOMEM;
+ goto out;
+ }
child->called_from_suspend = true;
@@ -881,7 +887,9 @@ static int aio_fork_suspend(struct vfs_handle_struct
*handle,
out:
+ err = errno;
TALLOC_FREE(frame);
+ errno = err;
return ret;
}
diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index 9745a73..a39e10a 100644
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -1874,11 +1874,11 @@ static NTSTATUS vfswrap_fset_nt_acl(vfs_handle_struct
*handle, files_struct *fsp
return result;
}
-NTSTATUS vfswrap_audit_file(struct vfs_handle_struct *handle,
- struct smb_filename *file,
- struct security_acl *sacl,
- uint32_t access_requested,
- uint32_t access_denied)
+static NTSTATUS vfswrap_audit_file(struct vfs_handle_struct *handle,
+ struct smb_filename *file,
+ struct security_acl *sacl,
+ uint32_t access_requested,
+ uint32_t access_denied)
{
return NT_STATUS_OK; /* Nothing to do here ... */
}
--
Samba Shared Repository
