[SCM] CTDB repository - branch 1.0.112 updated - ctdb-1.0.111-56-gf5ac659

[Ronnie Sahlberg]

The branch, 1.0.112 has been updated
       via  f5ac659e4df9ba6ee4652aeb9b4f5a01b532fd99 (commit)
       via  c73a7b0bad05ce02bb2199dae8975101265c9b2d (commit)
      from  ba22bcd467bf6ec6184bef71035fc03fb3cc7180 (commit)

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


- Log -----------------------------------------------------------------
commit f5ac659e4df9ba6ee4652aeb9b4f5a01b532fd99
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Mon Mar 29 16:58:53 2010 +1100

    New version 1.0.112-14
    
    -   events:50.samba: wipe the local part of the serverid db before starting winb
        This is necessary for the new serverid approach.

commit c73a7b0bad05ce02bb2199dae8975101265c9b2d
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 ++++++++-
 packaging/RPM/ctdb.spec.in |    4 +++-
 2 files changed, 11 insertions(+), 2 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
 	}
 
diff --git a/packaging/RPM/ctdb.spec.in b/packaging/RPM/ctdb.spec.in
index 5843bb2..023551b 100644
--- a/packaging/RPM/ctdb.spec.in
+++ b/packaging/RPM/ctdb.spec.in
@@ -5,7 +5,7 @@ Vendor: Samba Team
 Packager: Samba Team <samba at samba.org>
 Name: ctdb
 Version: 1.0.112
-Release: 13
+Release: 14
 Epoch: 0
 License: GNU GPL version 3
 Group: System Environment/Daemons
@@ -123,6 +123,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_docdir}/ctdb/tests/bin/ctdb_transaction
 
 %changelog
+* Mon Mar 29 2010 : Version 1.0.112-14
+ - Wipe the new serverid database before starting winbind
 * Wed Mar 25 2010 : Version 1.0.112-13
  - Try to restart NFS if "service nfs start" failed.
    BZ 61827


-- 
CTDB repository