[SCM] Samba Shared Repository - branch master updated
Stefan Metzmacher
metze at samba.org
Tue Jul 31 05:35:02 MDT 2012
The branch, master has been updated
via eaa381a s3: Fix Coverity ID 710791 Resource leak
via 3bc1f45 s3: Fix Coverity ID 710803 Resource leak
via d1dccfb s3: Fix Coverity ID 710818 Resource leak
via 2ddc3a2 s3: Fix Coverity ID 710827 Resource leak
via c03e976 tevent: Refer to the correct header in testsuite.c
via d2eb26c s3: Make request_timed_out() static
from 35c0f16 s3:smbd: do a clean shutdown during release_ip() after CTDB_SRVID_RELEASE_IP
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit eaa381a292a6ccb88d969933d7946366d29a3cc4
Author: Volker Lendecke <vl at samba.org>
Date: Mon Jul 30 14:50:52 2012 +0200
s3: Fix Coverity ID 710791 Resource leak
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
Autobuild-Date(master): Tue Jul 31 13:34:53 CEST 2012 on sn-devel-104
commit 3bc1f4570e02a6df3a7eff227ef2f44c768b5d40
Author: Volker Lendecke <vl at samba.org>
Date: Mon Jul 30 14:48:28 2012 +0200
s3: Fix Coverity ID 710803 Resource leak
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit d1dccfbda650081d33dc2924c480b033b386d1e4
Author: Volker Lendecke <vl at samba.org>
Date: Mon Jul 30 14:45:25 2012 +0200
s3: Fix Coverity ID 710818 Resource leak
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit 2ddc3a280e14858ead92deca153588fe9f454e76
Author: Volker Lendecke <vl at samba.org>
Date: Mon Jul 30 14:41:42 2012 +0200
s3: Fix Coverity ID 710827 Resource leak
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit c03e9769cdaca15a8c1ced21374c4d7bd50a6300
Author: Volker Lendecke <vl at samba.org>
Date: Mon Jul 30 09:00:13 2012 +0200
tevent: Refer to the correct header in testsuite.c
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit d2eb26cfbd7d0ec664c653672125776db94ecc5f
Author: Volker Lendecke <vl at samba.org>
Date: Wed May 30 11:31:13 2012 +0200
s3: Make request_timed_out() static
Signed-off-by: Stefan Metzmacher <metze at samba.org>
-----------------------------------------------------------------------
Summary of changes:
lib/tevent/testsuite.c | 2 +-
source3/libsmb/libsmb_xattr.c | 1 +
source3/passdb/pdb_tdb.c | 1 +
source3/smbd/msdfs.c | 1 +
source3/smbd/open.c | 4 ++--
source3/smbd/proto.h | 2 --
source3/smbd/vfs.c | 1 +
7 files changed, 7 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/tevent/testsuite.c b/lib/tevent/testsuite.c
index e32ebf5..5868f0a 100644
--- a/lib/tevent/testsuite.c
+++ b/lib/tevent/testsuite.c
@@ -24,7 +24,7 @@
*/
#include "includes.h"
-#include "lib/events/events.h"
+#include "lib/tevent/tevent.h"
#include "system/filesys.h"
#include "torture/torture.h"
diff --git a/source3/libsmb/libsmb_xattr.c b/source3/libsmb/libsmb_xattr.c
index 199f225..03cdc34 100644
--- a/source3/libsmb/libsmb_xattr.c
+++ b/source3/libsmb/libsmb_xattr.c
@@ -577,6 +577,7 @@ dos_attr_query(SMBCCTX *context,
&inode)) {
errno = SMBC_errno(context, srv->cli);
DEBUG(5, ("dos_attr_query Failed to query old attributes\n"));
+ TALLOC_FREE(ret);
return NULL;
}
diff --git a/source3/passdb/pdb_tdb.c b/source3/passdb/pdb_tdb.c
index e0b6261..1295862 100644
--- a/source3/passdb/pdb_tdb.c
+++ b/source3/passdb/pdb_tdb.c
@@ -1189,6 +1189,7 @@ static bool tdbsam_search_next_entry(struct pdb_search *search,
}
if (state->current == state->num_rids) {
+ TALLOC_FREE(user);
return false;
}
diff --git a/source3/smbd/msdfs.c b/source3/smbd/msdfs.c
index 97775d6..b6ebaca 100644
--- a/source3/smbd/msdfs.c
+++ b/source3/smbd/msdfs.c
@@ -841,6 +841,7 @@ static NTSTATUS self_ref(TALLOC_CTX *ctx,
ref->alternate_path = talloc_strdup(ctx, dfs_path);
if (!ref->alternate_path) {
+ TALLOC_FREE(ref);
return NT_STATUS_NO_MEMORY;
}
ref->proximity = 0;
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 15f5888..d078638 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -1416,8 +1416,8 @@ static void grant_fsp_oplock_type(files_struct *fsp,
fsp->oplock_type, fsp_str_dbg(fsp)));
}
-bool request_timed_out(struct timeval request_time,
- struct timeval timeout)
+static bool request_timed_out(struct timeval request_time,
+ struct timeval timeout)
{
struct timeval now, end_time;
GetTimeOfDay(&now);
diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index 8449fe9..aa79688 100644
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -606,8 +606,6 @@ NTSTATUS change_dir_owner_to_parent(connection_struct *conn,
const char *fname,
SMB_STRUCT_STAT *psbuf);
bool is_stat_open(uint32 access_mask);
-bool request_timed_out(struct timeval request_time,
- struct timeval timeout);
bool open_match_attributes(connection_struct *conn,
uint32 old_dos_attr,
uint32 new_dos_attr,
diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c
index 349f0a0..474e476 100644
--- a/source3/smbd/vfs.c
+++ b/source3/smbd/vfs.c
@@ -1086,6 +1086,7 @@ NTSTATUS check_reduced_name_with_privilege(connection_struct *conn,
if (!NT_STATUS_IS_OK(status)) {
TALLOC_FREE(priv_paths);
}
+ TALLOC_FREE(dir_name);
return status;
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list