events:50.samba: wipe the local part of the serverid db before starting winbind/smnd...

[metze/ctdb/wip.git] / config / events.d / 50.samba

diff --git a/config/events.d/50.samba b/config/events.d/50.samba
index 5b5aa1e1337fcd88d1603c8843d9646e9e6faa19..23dd060682a37c24dda2b0da86ee72fc386cd51b 100755 (executable)
--- a/config/events.d/50.samba
+++ b/config/events.d/50.samba
@@ -53,7 +53,7 @@ start_samba() {
                }
        }
 
-       # restart the winbind service
+       # make sure winbind is not already started
        check_ctdb_manages_winbind
        [ "$CTDB_MANAGES_WINBIND" = "yes" ] && {
                service "$CTDB_SERVICE_WINBIND" stop > /dev/null 2>&1
@@ -62,6 +62,13 @@ start_samba() {
                    # make absolutely sure winbindd is dead
                    killall -q -9 winbindd
                }
+
+       }
+
+       /usr/bin/net serverid wipe
+
+       # start the winbind service
+       [ "$CTDB_MANAGES_WINBIND" = "yes" ] && {
                service "$CTDB_SERVICE_WINBIND" start
        }
 
@@ -196,7 +203,7 @@ periodic_cleanup() {
     smbstatus -np > /dev/null 2>&1 &
 }
 
-case $cmd in 
+case "$1" in 
      startup)
        ctdb_service_start
        ;;
@@ -251,10 +258,9 @@ case $cmd in
        }
        ;;
 
-    status)
-       ctdb_checkstatus || exit $?
+    *)
+       ctdb_standard_event_handler "$@"
        ;;
 esac
 
-# ignore unknown commands
 exit 0