Author: metze Date: 2007-07-24 10:35:44 +0000 (Tue, 24 Jul 2007) New Revision: 24030
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24030 Log: merge from http://samba.org/~tridge/samba_3_2_ctdb/: the claim_connection() must come after the sockets are open metze Modified: branches/SAMBA_3_2_0/source/smbd/server.c Changeset: Modified: branches/SAMBA_3_2_0/source/smbd/server.c =================================================================== --- branches/SAMBA_3_2_0/source/smbd/server.c 2007-07-24 10:35:10 UTC (rev 24029) +++ branches/SAMBA_3_2_0/source/smbd/server.c 2007-07-24 10:35:44 UTC (rev 24030) @@ -435,6 +435,14 @@ SAFE_FREE(ports); + + /* Setup the main smbd so that we can get messages. Note that + do this after starting listening. This is needed as when in + clustered mode, ctdb won't allow us to start doing database + operations until it has gone thru a full startup, which + includes checking to see that smbd is listening. */ + claim_connection(NULL,"",FLAG_MSG_GENERAL|FLAG_MSG_SMBD); + /* Listen to messages */ messaging_register(smbd_messaging_context(), NULL, @@ -1078,11 +1086,6 @@ return -1; } - /* Setup the main smbd so that we can get messages. */ - /* don't worry about general printing messages here */ - - claim_connection(NULL,"",FLAG_MSG_GENERAL|FLAG_MSG_SMBD); - /* only start the background queue daemon if we are running as a daemon -- bad things will happen if smbd is launched via inetd and we fork a copy of
