ctdb-daemon: Check if method is initialized before calling

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>

diff --git a/ctdb/server/ctdb_daemon.c b/ctdb/server/ctdb_daemon.c
index 0f17b0f46812795a1020c53cf68b55e55fca622c..d9275f8fd38322c571449101d6a334660b00f7b0 100644 (file)
--- a/ctdb/server/ctdb_daemon.c
+++ b/ctdb/server/ctdb_daemon.c
@@ -1821,7 +1821,7 @@ void ctdb_shutdown_sequence(struct ctdb_context *ctdb, int exit_code)
        ctdb_stop_monitoring(ctdb);
        ctdb_release_all_ips(ctdb);
        ctdb_event_script(ctdb, CTDB_EVENT_SHUTDOWN);
-       if (ctdb->methods != NULL) {
+       if (ctdb->methods != NULL && ctdb->methods->shutdown != NULL) {
                ctdb->methods->shutdown(ctdb);
        }
 

diff --git a/ctdb/server/ctdb_fork.c b/ctdb/server/ctdb_fork.c
index 93977d9c3beb1602aaa6c3332e97e71620415e24..4edbe88e15434eaae4109bbcffdbdf0444ebf1ce 100644 (file)
--- a/ctdb/server/ctdb_fork.c
+++ b/ctdb/server/ctdb_fork.c
@@ -91,7 +91,7 @@ pid_t ctdb_fork(struct ctdb_context *ctdb)
                        close(ctdb->daemon.sd);
                        ctdb->daemon.sd = -1;
                }
-               if (ctdb->methods != NULL) {
+               if (ctdb->methods != NULL && ctdb->methods->shutdown != NULL) {
                        ctdb->methods->shutdown(ctdb);
                }