From: Martin Schwenke <martin@meltin.net>
Date: Thu, 29 Mar 2018 04:25:47 +0000 (+1100)
Subject: ctdb-daemon: Drop ctdbd --notification-script command-line option
X-Git-Tag: ldb-1.4.0~489
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0349d658547918f1fa33043849a0865e745c6e37;p=thirdparty%2Fsamba.git

ctdb-daemon: Drop ctdbd --notification-script command-line option

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

diff --git a/ctdb/doc/ctdbd.1.xml b/ctdb/doc/ctdbd.1.xml
index 05379cfec2a..71f23a94ea2 100644
--- a/ctdb/doc/ctdbd.1.xml
+++ b/ctdb/doc/ctdbd.1.xml
@@ -300,26 +300,6 @@
 	</listitem>
       </varlistentry>
 
-      <varlistentry>
-	<term>--notification-script=<parameter>FILENAME</parameter></term>
-	<listitem>
-	  <para>
-	    FILENAME specifying a script to be invoked by ctdbd when
-	    certain state changes occur.
-	  </para>
-	  <para>
-	    The default is
-	    <filename>/usr/local/etc/ctdb/notify.sh</filename>.
-	  </para>
-	  <para>
-	    Please see the <citetitle>NOTIFICATIONS</citetitle>
-	    section in <citerefentry><refentrytitle>ctdb</refentrytitle>
-	    <manvolnum>7</manvolnum></citerefentry> for more
-	    information.
-	  </para>
-	</listitem>
-      </varlistentry>
-
       <varlistentry>
 	<term>--reclock=<parameter>LOCK</parameter></term>
 	<listitem>
diff --git a/ctdb/server/ctdbd.c b/ctdb/server/ctdbd.c
index ff89a73c812..021fe907d8f 100644
--- a/ctdb/server/ctdbd.c
+++ b/ctdb/server/ctdbd.c
@@ -43,7 +43,6 @@ static struct {
 	const char *debuglevel;
 	const char *transport;
 	const char *myaddress;
-	const char *notification_script;
 	const char *logging;
 	const char *recovery_lock;
 	const char *db_dir;
@@ -115,7 +114,6 @@ int main(int argc, const char *argv[])
 		{ "debug", 'd', POPT_ARG_STRING, &options.debuglevel, 0, "debug level", NULL },
 		{ "interactive", 'i', POPT_ARG_NONE, &interactive, 0, "don't fork", NULL },
 		{ "logging", 0, POPT_ARG_STRING, &options.logging, 0, "logging method to be used", NULL },
-		{ "notification-script", 0, POPT_ARG_STRING, &options.notification_script, 0, "notification script", "filename" },
 		{ "listen", 0, POPT_ARG_STRING, &options.myaddress, 0, "address to listen on", "address" },
 		{ "transport", 0, POPT_ARG_STRING, &options.transport, 0, "protocol transport", NULL },
 		{ "dbdir", 0, POPT_ARG_STRING, &options.db_dir, 0, "directory for the tdb files", NULL },
@@ -312,14 +310,9 @@ int main(int argc, const char *argv[])
 		exit(1);
 	}
 
-	if (options.notification_script != NULL) {
-		ctdb->notification_script = talloc_strdup(
-				ctdb, options.notification_script);
-	} else {
-		ctdb->notification_script = talloc_asprintf(ctdb,
-							    "%s/notify.sh",
-							    ctdb_base);
-	}
+	ctdb->notification_script = talloc_asprintf(ctdb,
+						    "%s/notify.sh",
+						    ctdb_base);
 	if (ctdb->notification_script == NULL) {
 		D_ERR("Unable to set notification script\n");
 		exit(1);