diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2016-06-27 18:00:49 +1000 |
|---|---|---|
| committer | Martin Schwenke <martins@samba.org> | 2016-07-05 10:53:15 +0200 |
| commit | ca35d8149d987258440ed2f8746a953ad74effdf (patch) | |
| tree | 6b56fe075ad913647a0801b84920f5bad105d4f9 /ctdb | |
| parent | e582d2153742d89478d0eba47c1b948199d245ec (diff) | |
| download | samba-ca35d8149d987258440ed2f8746a953ad74effdf.tar.gz | |
ctdb-daemon: Check if method is initialized before calling
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
Diffstat (limited to 'ctdb')
| -rw-r--r-- | ctdb/server/ctdb_daemon.c | 2 | ||||
| -rw-r--r-- | ctdb/server/ctdb_fork.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ctdb/server/ctdb_daemon.c b/ctdb/server/ctdb_daemon.c index 0f17b0f4681..d9275f8fd38 100644 --- 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 93977d9c3be..4edbe88e154 100644 --- 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); } |