From: Michael Adam <obnox@samba.org>
Date: Fri, 26 Mar 2010 16:33:51 +0000 (+0100)
Subject: events:50.samba: wipe the local part of the serverid db before starting winbind/smnd... 
X-Git-Tag: ctdb-1.9.1~93^2~2^2~2
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=8956f32e571093db7f285b83e4dd32960f8afc7c;hp=b07beb68bf2adf65e837669be0c7464852f829ac;p=sahlberg%2Fctdb.git

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

This is necessary for the new serverid approach.

Michael
---

diff --git a/config/events.d/50.samba b/config/events.d/50.samba
index 5c10b19e..23dd0606 100755
--- 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
 	}