update autostart/stop to work for samba

diff --git a/config/events.d/50.samba b/config/events.d/50.samba
index 5338c927e012cd1a76eccd05b92fef16cc2a6ba5..54a29cf00d123ebc48b5399699e6fd576ebb0145 100755 (executable)
--- a/config/events.d/50.samba
+++ b/config/events.d/50.samba
@@ -77,6 +77,7 @@ start_samba() {
                nice_service "$CTDB_SERVICE_NMB" start
                nice_service "$CTDB_SERVICE_SMB" start
        }
+       return 0
 }
 
 stop_samba() {
@@ -91,6 +92,8 @@ stop_samba() {
        [ "$CTDB_MANAGES_WINBIND" = "yes" ] && {
                service "$CTDB_SERVICE_WINBIND" stop
        }
+
+       return 0
 }
 
 # set default samba cleanup period - in minutes
@@ -204,7 +207,7 @@ periodic_cleanup() {
 ###########################
 
 ctdb_start_stop_service
-ctdb_start_stop_service "windbind"
+ctdb_start_stop_service "winbind"
 
 is_ctdb_managed_service || is_ctdb_managed_service "winbind" || exit 0
 

diff --git a/config/functions b/config/functions
index 5dd31fe09a8883c13f53e7f6135c69b00e29f569..ee382257b1933a50a0360c9ce9589a18f9dc85e0 100755 (executable)
--- a/config/functions
+++ b/config/functions
@@ -669,7 +669,7 @@ is_ctdb_managed_service ()
     ctdb_compat_managed_service "$CTDB_MANAGES_VSFTPD"   "vsftpd"
     ctdb_compat_managed_service "$CTDB_MANAGES_SAMBA"    "samba"
     ctdb_compat_managed_service "$CTDB_MANAGES_SCP"      "scp"
-    ctdb_compat_managed_service "$CTDB_MANAGES_WINDBIND" "windbind"
+    ctdb_compat_managed_service "$CTDB_MANAGES_WINBIND"  "winbind"
     ctdb_compat_managed_service "$CTDB_MANAGES_HTTPD"    "httpd"
     ctdb_compat_managed_service "$CTDB_MANAGES_ISCSI"    "iscsi"
     ctdb_compat_managed_service "$CTDB_MANAGES_CLAMD"    "clamd"
@@ -684,8 +684,7 @@ ctdb_start_stop_service ()
     _service_name="${1:-${service_name}}"
 
     _active="$ctdb_active_dir/$_service_name"
-
-    if is_ctdb_managed_service ; then
+    if is_ctdb_managed_service "$_service_name"; then
        if ! [ -e "$_active" ] ; then
            echo "Starting service $_service_name"
            ctdb_service_start || exit $?
@@ -693,13 +692,13 @@ ctdb_start_stop_service ()
            touch "$_active"
            exit 0
        fi
-    elif ! is_ctdb_managed_service ; then
+    else
        if [ -e "$_active" ] ; then
            echo "Stopping service $_service_name"
            ctdb_service_stop || exit $?
            rm -f "$_active"
+           exit 0
        fi
-       exit 0
     fi
 }