svn commit: samba r23011 - in branches/SAMBA_4_0/source/scripting/ejs/ejsnet: .
Author: tridge
Date: 2007-05-19 06:49:01 + (Sat, 19 May 2007)
New Revision: 23011
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23011
Log:
initialisation functions must return NTSTATUS, otherwise we get bus
errors on platforms like sparc. This is why sun1 died during
provision.
Modified:
branches/SAMBA_4_0/source/scripting/ejs/ejsnet/net_ctx.c
Changeset:
Modified: branches/SAMBA_4_0/source/scripting/ejs/ejsnet/net_ctx.c
===
--- branches/SAMBA_4_0/source/scripting/ejs/ejsnet/net_ctx.c2007-05-19
04:59:00 UTC (rev 23010)
+++ branches/SAMBA_4_0/source/scripting/ejs/ejsnet/net_ctx.c2007-05-19
06:49:01 UTC (rev 23011)
@@ -222,7 +222,8 @@
}
-void smb_setup_ejs_net(void)
+NTSTATUS smb_setup_ejs_net(void)
{
ejsDefineCFunction(-1, NetContext, ejs_net_context, NULL,
MPR_VAR_SCRIPT_HANDLE);
+ return NT_STATUS_OK;
}
svn commit: samba r23012 - in branches/SAMBA_4_0/source/scripting/libjs: .
Author: tridge Date: 2007-05-19 06:51:34 + (Sat, 19 May 2007) New Revision: 23012 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23012 Log: we need a POLICYGUID in provision Modified: branches/SAMBA_4_0/source/scripting/libjs/provision.js Changeset: Modified: branches/SAMBA_4_0/source/scripting/libjs/provision.js === --- branches/SAMBA_4_0/source/scripting/libjs/provision.js 2007-05-19 06:49:01 UTC (rev 23011) +++ branches/SAMBA_4_0/source/scripting/libjs/provision.js 2007-05-19 06:51:34 UTC (rev 23012) @@ -781,6 +781,7 @@ subobj.HOSTIP = hostip(); subobj.DOMAINSID= randsid(); subobj.INVOCATIONID = randguid(); + subobj.POLICYGUID = randguid(); subobj.KRBTGTPASS = randpass(12); subobj.MACHINEPASS = randpass(12); subobj.ADMINPASS= randpass(12);
svn commit: samba r23013 - in branches/SAMBA_4_0/source/lib/charset: .
Author: tridge
Date: 2007-05-19 07:05:14 + (Sat, 19 May 2007)
New Revision: 23013
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23013
Log:
fixed a bug in the string_replace_w() test that caused OpenBSD to die
Modified:
branches/SAMBA_4_0/source/lib/charset/testsuite.c
Changeset:
Modified: branches/SAMBA_4_0/source/lib/charset/testsuite.c
===
--- branches/SAMBA_4_0/source/lib/charset/testsuite.c 2007-05-19 06:51:34 UTC
(rev 23012)
+++ branches/SAMBA_4_0/source/lib/charset/testsuite.c 2007-05-19 07:05:14 UTC
(rev 23013)
@@ -83,7 +83,7 @@
static bool test_string_replace_w(struct torture_context *tctx)
{
- char data[] = bla;
+ char data[6] = bla;
string_replace_w(data, 'b', 'c');
torture_assert_str_equal(tctx, data, cla, first char replaced);
memcpy(data, bab, 4);
Rev 327: merge from ronnie in http://samba.org/~tridge/ctdb
revno: 327
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell [EMAIL PROTECTED]
branch nick: tridge
timestamp: Sat 2007-05-19 17:21:58 +1000
message:
merge from ronnie
modified:
common/ctdb.c ctdb.c-20061127094323-t50f58d65iaao5of-2
common/ctdb_monitor.c
ctdb_monitor.c-20070518100625-8jf4ft1mjzmb22ck-1
include/ctdb_private.h
ctdb_private.h-20061117234101-o3qt14umlg9en8z0-13
revno: 326.1.1
merged: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Ronnie Sahlberg [EMAIL PROTECTED]
branch nick: ctdb
timestamp: Sat 2007-05-19 16:59:10 +1000
message:
use ctdb_dead_node() instead of reimplementing the same code again
this leaves only one single function where a node is marked as dead
instead of two places
=== modified file 'common/ctdb.c'
--- a/common/ctdb.c 2007-05-19 04:04:48 +
+++ b/common/ctdb.c 2007-05-19 07:21:58 +
@@ -380,11 +380,12 @@
/*
called by the transport layer when a node is dead
*/
-static void ctdb_node_dead(struct ctdb_node *node)
+void ctdb_node_dead(struct ctdb_node *node)
{
node-ctdb-num_connected--;
node-flags = ~NODE_FLAGS_CONNECTED;
node-rx_cnt = 0;
+ node-dead_count = 0;
DEBUG(1,(%s: node %s is dead: %d connected\n,
node-ctdb-name, node-name, node-ctdb-num_connected));
ctdb_daemon_cancel_controls(node-ctdb, node);
@@ -393,9 +394,10 @@
/*
called by the transport layer when a node is connected
*/
-static void ctdb_node_connected(struct ctdb_node *node)
+void ctdb_node_connected(struct ctdb_node *node)
{
node-ctdb-num_connected++;
+ node-dead_count = 0;
node-flags |= NODE_FLAGS_CONNECTED;
DEBUG(1,(%s: connected to %s - %d connected\n,
node-ctdb-name, node-name, node-ctdb-num_connected));
=== modified file 'common/ctdb_monitor.c'
--- a/common/ctdb_monitor.c 2007-05-19 00:20:19 +
+++ b/common/ctdb_monitor.c 2007-05-19 07:21:58 +
@@ -43,8 +43,8 @@
/* it might have come alive again */
if (!(node-flags NODE_FLAGS_CONNECTED) node-rx_cnt != 0)
{
- DEBUG(0,(Node %u is alive again - marking as
connected\n, node-vnn));
- node-flags |= NODE_FLAGS_CONNECTED;
+ ctdb_node_connected(node);
+ continue;
}
if (node-rx_cnt == 0) {
@@ -56,9 +56,7 @@
node-rx_cnt = 0;
if (node-dead_count = CTDB_MONITORING_DEAD_COUNT) {
- DEBUG(0,(Node %u is dead - marking as not
connected\n, node-vnn));
- node-flags = ~NODE_FLAGS_CONNECTED;
- ctdb_daemon_cancel_controls(ctdb, node);
+ ctdb_node_dead(node);
/* maybe tell the transport layer to kill the
sockets as well?
*/
=== modified file 'include/ctdb_private.h'
--- a/include/ctdb_private.h2007-05-19 03:45:24 +
+++ b/include/ctdb_private.h2007-05-19 07:21:58 +
@@ -826,5 +826,7 @@
void ctdb_daemon_cancel_controls(struct ctdb_context *ctdb, struct ctdb_node
*node);
void ctdb_call_resend_all(struct ctdb_context *ctdb);
+void ctdb_node_dead(struct ctdb_node *node);
+void ctdb_node_connected(struct ctdb_node *node);
#endif
Rev 328: show ctdb control timeout in http://samba.org/~tridge/ctdb
revno: 328
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell [EMAIL PROTECTED]
branch nick: tridge
timestamp: Sat 2007-05-19 21:11:06 +1000
message:
show ctdb control timeout
modified:
common/ctdb_client.c ctdb_client.c-20070411010216-3kd8v37k61steeya-1
=== modified file 'common/ctdb_client.c'
--- a/common/ctdb_client.c 2007-05-17 04:10:38 +
+++ b/common/ctdb_client.c 2007-05-19 11:11:06 +
@@ -754,6 +754,11 @@
}
if (timed_out) {
talloc_free(state);
+ if (errormsg) {
+ (*errormsg) = talloc_strdup(mem_ctx, control timed
out);
+ } else {
+ DEBUG(0,(ctdb_control timed out\n));
+ }
return -1;
}
svn commit: samba r23014 - in branches: SAMBA_3_0/source/locking SAMBA_3_0/source/smbd SAMBA_3_0_25/source/locking SAMBA_3_0_25/source/smbd SAMBA_3_0_26/source/locking SAMBA_3_0_26/source/smbd
Author: jra Date: 2007-05-19 20:57:12 + (Sat, 19 May 2007) New Revision: 23014 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23014 Log: For all branches, ensure that if we're blocked on a POSIX lock we know nothing about that we retry the lock every 10 seconds instead of waiting for the standard select timeout. This is how we used to (and are supposed to) work. Jeremy. Modified: branches/SAMBA_3_0/source/locking/brlock.c branches/SAMBA_3_0/source/locking/locking.c branches/SAMBA_3_0/source/smbd/blocking.c branches/SAMBA_3_0/source/smbd/reply.c branches/SAMBA_3_0/source/smbd/trans2.c branches/SAMBA_3_0_25/source/locking/brlock.c branches/SAMBA_3_0_25/source/locking/locking.c branches/SAMBA_3_0_25/source/smbd/blocking.c branches/SAMBA_3_0_25/source/smbd/reply.c branches/SAMBA_3_0_25/source/smbd/trans2.c branches/SAMBA_3_0_26/source/locking/brlock.c branches/SAMBA_3_0_26/source/locking/locking.c branches/SAMBA_3_0_26/source/smbd/blocking.c branches/SAMBA_3_0_26/source/smbd/reply.c branches/SAMBA_3_0_26/source/smbd/trans2.c Changeset: Sorry, the patch is too large (867 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23014
svn commit: samba r23015 - in branches: SAMBA_3_0/source/lib SAMBA_3_0/source/nmbd SAMBA_3_0/source/nsswitch SAMBA_3_0/source/rpc_server SAMBA_3_0/source/smbd SAMBA_3_0_26/source/lib SAMBA_3_0_26/sour
Author: vlendec Date: 2007-05-19 21:53:28 + (Sat, 19 May 2007) New Revision: 23015 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23015 Log: Make message_(de)register static to messages.c Modified: branches/SAMBA_3_0/source/lib/dmallocmsg.c branches/SAMBA_3_0/source/lib/events.c branches/SAMBA_3_0/source/lib/messages.c branches/SAMBA_3_0/source/nmbd/nmbd.c branches/SAMBA_3_0/source/nmbd/nmbd_elections.c branches/SAMBA_3_0/source/nmbd/nmbd_winsserver.c branches/SAMBA_3_0/source/nsswitch/winbindd_cm.c branches/SAMBA_3_0/source/rpc_server/srv_spoolss_nt.c branches/SAMBA_3_0/source/smbd/blocking.c branches/SAMBA_3_0_26/source/lib/dmallocmsg.c branches/SAMBA_3_0_26/source/lib/events.c branches/SAMBA_3_0_26/source/lib/messages.c branches/SAMBA_3_0_26/source/nmbd/nmbd.c branches/SAMBA_3_0_26/source/nmbd/nmbd_elections.c branches/SAMBA_3_0_26/source/nmbd/nmbd_winsserver.c branches/SAMBA_3_0_26/source/nsswitch/winbindd_cm.c branches/SAMBA_3_0_26/source/rpc_server/srv_spoolss_nt.c branches/SAMBA_3_0_26/source/smbd/blocking.c Changeset: Sorry, the patch is too large (919 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23015
svn commit: samba r23016 - in branches: SAMBA_3_0/source/smbd SAMBA_3_0_26/source/smbd
Author: jra
Date: 2007-05-19 22:29:59 + (Sat, 19 May 2007)
New Revision: 23016
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23016
Log:
Remove extra - thanks to Volker for spotting this.
Jeremy.
Modified:
branches/SAMBA_3_0/source/smbd/reply.c
branches/SAMBA_3_0_26/source/smbd/reply.c
Changeset:
Modified: branches/SAMBA_3_0/source/smbd/reply.c
===
--- branches/SAMBA_3_0/source/smbd/reply.c 2007-05-19 21:53:28 UTC (rev
23015)
+++ branches/SAMBA_3_0/source/smbd/reply.c 2007-05-19 22:29:59 UTC (rev
23016)
@@ -2645,7 +2645,7 @@
normal_read:
- if ((smb_maxcnt 0xFF) 0x1) {
+ if ((smb_maxcnt 0xFF) 0x1) {
int sendlen = setup_readX_header(inbuf,outbuf,smb_maxcnt) -
smb_maxcnt;
/* Send out the header. */
if (write_data(smbd_server_fd(),outbuf,sendlen) != sendlen) {
Modified: branches/SAMBA_3_0_26/source/smbd/reply.c
===
--- branches/SAMBA_3_0_26/source/smbd/reply.c 2007-05-19 21:53:28 UTC (rev
23015)
+++ branches/SAMBA_3_0_26/source/smbd/reply.c 2007-05-19 22:29:59 UTC (rev
23016)
@@ -2643,7 +2643,7 @@
#endif
- if ((smb_maxcnt 0xFF) 0x1) {
+ if ((smb_maxcnt 0xFF) 0x1) {
int sendlen = setup_readX_header(outbuf,smb_maxcnt) -
smb_maxcnt;
/* Send out the header. */
if (write_data(smbd_server_fd(),outbuf,sendlen) != sendlen) {
Build status as of Sun May 20 00:00:02 2007
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2007-05-19 00:02:35.0 + +++ /home/build/master/cache/broken_results.txt 2007-05-20 00:01:37.0 + @@ -1,10 +1,10 @@ -Build status as of Sat May 19 00:00:01 2007 +Build status as of Sun May 20 00:00:02 2007 Build counts: Tree Total Broken Panic SOC 0 0 0 build_farm 0 0 0 -ccache 37 6 0 +ccache 36 6 0 ctdb 0 0 0 distcc 3 0 0 ldb 36 7 0 @@ -17,9 +17,9 @@ samba0 0 0 samba-docs 0 0 0 samba-gtk3 3 0 -samba4 32 21 6 -samba_3_037 17 0 +samba4 32 18 5 +samba_3_037 16 0 smb-build33 32 0 -talloc 37 2 0 +talloc 36 2 0 tdb 36 3 0
