[SCM] CTDB repository - branch master updated - ctdb-1.0.114-106-g53df35a

[Ronnie Sahlberg]

The branch, master has been updated
       via  53df35aff1e10201a38931bbb82fb266a38892c0 (commit)
       via  bdd250b9afdd1060cfd1e2b0f0a5a567150bb380 (commit)
      from  3587df065669972a631ba08918df37536c9cb633 (commit)

http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 53df35aff1e10201a38931bbb82fb266a38892c0
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Wed May 26 13:55:19 2010 +1000

    add a gplv3 boilerplate to the example application for libctdb

commit bdd250b9afdd1060cfd1e2b0f0a5a567150bb380
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Wed May 26 13:43:28 2010 +1000

    check if vnn is a valid pointer before dereferencing it
    
    based on rustys patch for bz62783

-----------------------------------------------------------------------

Summary of changes:
 libctdb/tst.c          |   19 +++++++++++++++++++
 server/ctdb_takeover.c |    4 +++-
 2 files changed, 22 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/libctdb/tst.c b/libctdb/tst.c
index 8ab631d..32dc3a0 100644
--- a/libctdb/tst.c
+++ b/libctdb/tst.c
@@ -1,3 +1,22 @@
+/*
+ * Example program to demonstrate the libctdb api
+ *
+ * This program needs to be linked with libtdb.
+ * (libtdb and libtdb-devel packages)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
 #include <stdio.h>
 #include <stdint.h>
 #include <poll.h>
diff --git a/server/ctdb_takeover.c b/server/ctdb_takeover.c
index b18c030..e80e303 100644
--- a/server/ctdb_takeover.c
+++ b/server/ctdb_takeover.c
@@ -2300,7 +2300,9 @@ static void ctdb_tickle_sentenced_connections(struct event_context *ev, struct t
  */
 static int ctdb_killtcp_destructor(struct ctdb_kill_tcp *killtcp)
 {
-	killtcp->vnn->killtcp = NULL;
+	if (killtcp->vnn) {
+		killtcp->vnn->killtcp = NULL;
+	}
 	return 0;
 }
 


-- 
CTDB repository