The branch, master has been updated
via 196973fef38a9b258e0976d5454161d11d573ddc (commit)
via fb7f69b1d6dd8b0715258dde736dc03e1c5e43aa (commit)
via 96df98d9f86ecc6bb1a458eb2101e5c1bc0f96e6 (commit)
from c94b295b078dc009c18aa416d0de232a12241014 (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 196973fef38a9b258e0976d5454161d11d573ddc
Author: Ronnie Sahlberg <[EMAIL PROTECTED]>
Date: Mon Aug 11 23:50:42 2008 +1000
new version 1.0.56
commit fb7f69b1d6dd8b0715258dde736dc03e1c5e43aa
Merge: 96df98d9f86ecc6bb1a458eb2101e5c1bc0f96e6
c94b295b078dc009c18aa416d0de232a12241014
Author: Andrew Tridgell <[EMAIL PROTECTED]>
Date: Mon Aug 11 23:33:46 2008 +1000
Merge commit 'ronnie/master'
commit 96df98d9f86ecc6bb1a458eb2101e5c1bc0f96e6
Author: Andrew Tridgell <[EMAIL PROTECTED]>
Date: Mon Aug 11 23:33:05 2008 +1000
fixed a memory leak in the recovery daemon
thanks to vl for spotting this
-----------------------------------------------------------------------
Summary of changes:
packaging/RPM/ctdb.spec | 4 +++-
server/ctdb_recoverd.c | 4 ++--
2 files changed, 5 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/packaging/RPM/ctdb.spec b/packaging/RPM/ctdb.spec
index cb5cd6a..93b9d3f 100644
--- a/packaging/RPM/ctdb.spec
+++ b/packaging/RPM/ctdb.spec
@@ -5,7 +5,7 @@ Vendor: Samba Team
Packager: Samba Team <[EMAIL PROTECTED]>
Name: ctdb
Version: 1.0
-Release: 55
+Release: 56
Epoch: 0
License: GNU GPL version 3
Group: System Environment/Daemons
@@ -118,6 +118,8 @@ fi
%{_includedir}/ctdb_private.h
%changelog
+* Mon Aug 11 2008 : Version 1.0.56
+ - fix a memory leak in the recovery daemon.
* Mon Aug 11 2008 : Version 1.0.55
- Fix the releaseip message we seond to samba.
* Fri Aug 8 2008 : Version 1.0.54
diff --git a/server/ctdb_recoverd.c b/server/ctdb_recoverd.c
index 3295229..c503aa5 100644
--- a/server/ctdb_recoverd.c
+++ b/server/ctdb_recoverd.c
@@ -2153,7 +2153,7 @@ static int verify_ip_allocation(struct ctdb_context
*ctdb, uint32_t pnn)
struct ctdb_uptime *uptime2 = NULL;
int ret, j;
- ret = ctdb_ctrl_uptime(ctdb, ctdb, CONTROL_TIMEOUT(),
+ ret = ctdb_ctrl_uptime(ctdb, mem_ctx, CONTROL_TIMEOUT(),
CTDB_CURRENT_NODE, &uptime1);
if (ret != 0) {
DEBUG(DEBUG_ERR, ("Unable to get uptime from local node %u\n",
pnn));
@@ -2169,7 +2169,7 @@ static int verify_ip_allocation(struct ctdb_context
*ctdb, uint32_t pnn)
return -1;
}
- ret = ctdb_ctrl_uptime(ctdb, ctdb, CONTROL_TIMEOUT(),
+ ret = ctdb_ctrl_uptime(ctdb, mem_ctx, CONTROL_TIMEOUT(),
CTDB_CURRENT_NODE, &uptime2);
if (ret != 0) {
DEBUG(DEBUG_ERR, ("Unable to get uptime from local node %u\n",
pnn));
--
CTDB repository
