From: Martin Schwenke <martin@meltin.net>
Date: Thu, 29 Mar 2018 03:50:17 +0000 (+1100)
Subject: ctdb-daemon: Set ctdb->notification_script directly
X-Git-Tag: ldb-1.4.0~495
X-Git-Url: http://git.samba.org/?p=samba.git;a=commitdiff_plain;h=17ad7d9114bfc749350daa3988fe3223569ef945

ctdb-daemon: Set ctdb->notification_script directly

This doesn't need a wrapper function.  It gets in the way if building
a value involves allocating memory (e.g. talloc_asprintf()) and then
ctdb_set_notification_script() duplicates that memory.

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

diff --git a/ctdb/server/ctdbd.c b/ctdb/server/ctdbd.c
index 68e7e7d0455..38a5f9d3935 100644
--- a/ctdb/server/ctdbd.c
+++ b/ctdb/server/ctdbd.c
@@ -308,9 +308,10 @@ int main(int argc, const char *argv[])
 	}
 
 	if (options.notification_script != NULL) {
-		ret = ctdb_set_notification_script(ctdb, options.notification_script);
-		if (ret == -1) {
-			DEBUG(DEBUG_ERR,("Unable to setup notification script\n"));
+		ctdb->notification_script = talloc_strdup(
+				ctdb, options.notification_script);
+		if (ctdb->notification_script == NULL) {
+			D_ERR("Unable to set notification script\n");
 			exit(1);
 		}
 	}