[SCM] CTDB repository - branch master updated - ctdb-1.0.114-6-ga1de6df

[Ronnie Sahlberg]

The branch, master has been updated
       via  a1de6dff2011dcc8edfd3940a92bd1104a2c3936 (commit)
       via  45b3fe253c1d00c571b351fc73415bc799df3083 (commit)
       via  4f807b3a2d859f13c3e59e1ae737e9b145d7d613 (commit)
       via  8956f32e571093db7f285b83e4dd32960f8afc7c (commit)
      from  787274374411116266ee66455a67c127b8d558c1 (commit)

http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit a1de6dff2011dcc8edfd3940a92bd1104a2c3936
Merge: 787274374411116266ee66455a67c127b8d558c1 45b3fe253c1d00c571b351fc73415bc799df3083
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Mon Mar 29 17:06:50 2010 +1100

    Merge root at 10.1.1.27:/shared/ctdb/ctdb-git

commit 45b3fe253c1d00c571b351fc73415bc799df3083
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Mar 24 10:35:10 2010 +0100

    In ctdb catdb, print the payload data length without the ctdb header length

commit 4f807b3a2d859f13c3e59e1ae737e9b145d7d613
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Feb 22 15:04:16 2010 +0100

    Fix a typo in run_startrecovery_eventscript

commit 8956f32e571093db7f285b83e4dd32960f8afc7c
Author: Michael Adam <obnox at samba.org>
Date:   Fri Mar 26 17:33:51 2010 +0100

    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

-----------------------------------------------------------------------

Summary of changes:
 config/events.d/50.samba |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

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


-- 
CTDB repository