svn commit: samba r22528 - in branches/SAMBA_4_0/source/librpc/rpc: .
Author: metze Date: 2007-04-27 05:45:53 + (Fri, 27 Apr 2007) New Revision: 22528 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22528 Log: remember that the connection was marked dead and don't allow sending packet over the broken connection, as we would segfault... metze Modified: branches/SAMBA_4_0/source/librpc/rpc/dcerpc_smb.c branches/SAMBA_4_0/source/librpc/rpc/dcerpc_smb2.c Changeset: Modified: branches/SAMBA_4_0/source/librpc/rpc/dcerpc_smb.c === --- branches/SAMBA_4_0/source/librpc/rpc/dcerpc_smb.c 2007-04-26 17:36:19 UTC (rev 22527) +++ branches/SAMBA_4_0/source/librpc/rpc/dcerpc_smb.c 2007-04-27 05:45:53 UTC (rev 22528) @@ -31,6 +31,7 @@ uint16_t fnum; struct smbcli_tree *tree; const char *server_name; + bool dead; }; @@ -39,6 +40,14 @@ */ static void pipe_dead(struct dcerpc_connection *c, NTSTATUS status) { + struct smb_private *smb = c->transport.private; + + smb->dead = true; + + if (smb->dead) { + return; + } + if (NT_STATUS_EQUAL(NT_STATUS_UNSUCCESSFUL, status)) { status = NT_STATUS_UNEXPECTED_NETWORK_ERROR; } @@ -189,6 +198,12 @@ */ static NTSTATUS send_read_request(struct dcerpc_connection *c) { + struct smb_private *smb = c->transport.private; + + if (smb->dead) { + return NT_STATUS_CONNECTION_DISCONNECTED; + } + return send_read_request_continue(c, NULL); } @@ -302,6 +317,10 @@ union smb_write io; struct smbcli_request *req; + if (smb->dead) { + return NT_STATUS_CONNECTION_DISCONNECTED; + } + if (trigger_read) { return smb_send_trans_request(c, blob); } @@ -505,6 +524,8 @@ smb->server_name= strupper_talloc(smb, state->tree->session->transport->called.name); if (composite_nomem(smb->server_name, ctx)) return; + smb->dead = false; + c->transport.private = smb; composite_done(ctx); Modified: branches/SAMBA_4_0/source/librpc/rpc/dcerpc_smb2.c === --- branches/SAMBA_4_0/source/librpc/rpc/dcerpc_smb2.c 2007-04-26 17:36:19 UTC (rev 22527) +++ branches/SAMBA_4_0/source/librpc/rpc/dcerpc_smb2.c 2007-04-27 05:45:53 UTC (rev 22528) @@ -33,6 +33,7 @@ struct smb2_handle handle; struct smb2_tree *tree; const char *server_name; + bool dead; }; @@ -41,6 +42,14 @@ */ static void pipe_dead(struct dcerpc_connection *c, NTSTATUS status) { + struct smb2_private *smb = c->transport.private; + + smb->dead = true; + + if (smb->dead) { + return; + } + if (NT_STATUS_EQUAL(NT_STATUS_UNSUCCESSFUL, status)) { status = NT_STATUS_UNEXPECTED_NETWORK_ERROR; } @@ -183,6 +192,12 @@ */ static NTSTATUS send_read_request(struct dcerpc_connection *c) { + struct smb2_private *smb = c->transport.private; + + if (smb->dead) { + return NT_STATUS_CONNECTION_DISCONNECTED; + } + return send_read_request_continue(c, NULL); } @@ -287,6 +302,10 @@ struct smb2_write io; struct smb2_request *req; + if (smb->dead) { + return NT_STATUS_CONNECTION_DISCONNECTED; + } + if (trigger_read) { return smb2_send_trans_request(c, blob); } @@ -461,6 +480,7 @@ smb->server_name= strupper_talloc(smb, tree->session->transport->socket->hostname); if (composite_nomem(smb->server_name, ctx)) return; + smb->dead = false; c->transport.private = smb;
Build status as of Fri Apr 27 00:00:02 2007
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2007-04-26 00:01:10.0 + +++ /home/build/master/cache/broken_results.txt 2007-04-27 00:00:23.0 + @@ -1,25 +1,25 @@ -Build status as of Thu Apr 26 00:00:02 2007 +Build status as of Fri Apr 27 00:00:02 2007 Build counts: Tree Total Broken Panic SOC 0 0 0 build_farm 0 0 0 -ccache 36 6 0 +ccache 35 6 0 ctdb 0 0 0 distcc 4 0 0 -ldb 34 4 0 -libreplace 32 9 0 -lorikeet-heimdal 30 14 0 -pidl 20 6 0 -ppp 15 0 0 +ldb 33 5 0 +libreplace 32 11 0 +lorikeet-heimdal 29 14 0 +pidl 18 6 0 +ppp 14 0 0 python 0 0 0 -rsync37 12 0 +rsync37 18 0 samba0 0 0 samba-docs 0 0 0 samba-gtk3 3 0 -samba4 38 26 4 -samba_3_041 22 1 -smb-build31 30 0 -talloc 35 1 0 -tdb 34 2 0 +samba4 37 26 4 +samba_3_040 21 1 +smb-build30 29 0 +talloc 36 2 0 +tdb 33 2 0
svn commit: samba-docs r1105 - in trunk/smbdotconf/security: .
Author: jht Date: 2007-04-26 23:44:45 + (Thu, 26 Apr 2007) New Revision: 1105 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-docs&rev=1105 Log: Fix for Bug#3182. Modified: trunk/smbdotconf/security/security.xml Changeset: Modified: trunk/smbdotconf/security/security.xml === --- trunk/smbdotconf/security/security.xml 2007-04-25 11:27:12 UTC (rev 1104) +++ trunk/smbdotconf/security/security.xml 2007-04-26 23:44:45 UTC (rev 1105) @@ -32,7 +32,7 @@ There is a bug in WfWg that has relevance to this setting. When in user or server level security a WfWg client -will totally ignore the password you type in the "connect +will totally ignore the username and password you type in the "connect drive" dialog box. This makes it very difficult (if not impossible) to connect to a Samba service as anyone except the user that you are logged into WfWg as.
Rev 197: null terminate a string in http://samba.org/~tridge/ctdb
revno: 197 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell <[EMAIL PROTECTED]> branch nick: tridge timestamp: Thu 2007-04-26 23:29:26 +0200 message: null terminate a string modified: common/ctdb_control.c ctdb_control.c-20070426122724-j6gkpiofhbwdin63-1 === modified file 'common/ctdb_control.c' --- a/common/ctdb_control.c 2007-04-26 21:10:35 + +++ b/common/ctdb_control.c 2007-04-26 21:29:26 + @@ -78,7 +78,7 @@ ctdb_db = find_ctdb_db(ctdb, db_id); if (ctdb_db == NULL) return -1; outdata->dptr = discard_const(ctdb_db->db_path); - outdata->dsize = strlen(ctdb_db->db_path); + outdata->dsize = strlen(ctdb_db->db_path)+1; return 0; }
Rev 196: got rid of the getdbpath call in http://samba.org/~tridge/ctdb
revno: 196 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell <[EMAIL PROTECTED]> branch nick: tridge timestamp: Thu 2007-04-26 23:10:35 +0200 message: got rid of the getdbpath call modified: common/ctdb_client.c ctdb_client.c-20070411010216-3kd8v37k61steeya-1 common/ctdb_control.c ctdb_control.c-20070426122724-j6gkpiofhbwdin63-1 common/ctdb_daemon.c ctdb_daemon.c-20070409200331-3el1kqgdb9m4ib0g-1 common/ctdb_ltdb.c ctdb_ltdb.c-20061128065342-to93h6eejj5kon81-2 include/ctdb.h ctdb.h-20061117234101-o3qt14umlg9en8z0-11 include/ctdb_private.h ctdb_private.h-20061117234101-o3qt14umlg9en8z0-13 tests/ctdb_test.c ctdb_test.c-20061117234101-o3qt14umlg9en8z0-16 Diff too large for email (342, the limit is 200).
svn commit: samba r22527 - in branches/SAMBA_3_0/docs: .
Author: jpeach Date: 2007-04-26 17:36:19 + (Thu, 26 Apr 2007) New Revision: 22527 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22527 Log: note the svn location of samba-docs on svnanon.samba.org Modified: branches/SAMBA_3_0/docs/README-NOW Changeset: Modified: branches/SAMBA_3_0/docs/README-NOW === --- branches/SAMBA_3_0/docs/README-NOW 2007-04-26 17:23:33 UTC (rev 22526) +++ branches/SAMBA_3_0/docs/README-NOW 2007-04-26 17:36:19 UTC (rev 22527) @@ -7,3 +7,5 @@ See http://svn.samba.org/samba/subversion.html for details on accessing Samba svn trees. +For anonymous access to samba-docs, point svn here: +svn://svnanon.samba.org/samba-docs/trunk
Rev 195: added a ctdb_get_config call in http://samba.org/~tridge/ctdb
revno: 195 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell <[EMAIL PROTECTED]> branch nick: tridge timestamp: Thu 2007-04-26 19:27:07 +0200 message: added a ctdb_get_config call added a ctdb ping control modified: common/cmdline.c cmdline.c-20070416041216-w1zvz91bkdsgjckw-1 common/ctdb_client.c ctdb_client.c-20070411010216-3kd8v37k61steeya-1 common/ctdb_control.c ctdb_control.c-20070426122724-j6gkpiofhbwdin63-1 common/ctdb_daemon.c ctdb_daemon.c-20070409200331-3el1kqgdb9m4ib0g-1 include/ctdb.h ctdb.h-20061117234101-o3qt14umlg9en8z0-11 include/ctdb_private.h ctdb_private.h-20061117234101-o3qt14umlg9en8z0-13 tools/ctdb_control.c ctdb_control.c-20070426122705-9ehj1l5lu2gn9kuj-1 Diff too large for email (232, the limit is 200).
svn commit: samba r22526 - in branches/SAMBA_3_0/source/client: .
Author: sfrench Date: 2007-04-26 17:23:33 + (Thu, 26 Apr 2007) New Revision: 22526 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22526 Log: Support deep tree mounts after share (instead of having to specify prepath) Modified: branches/SAMBA_3_0/source/client/mount.cifs.c Changeset: Modified: branches/SAMBA_3_0/source/client/mount.cifs.c === --- branches/SAMBA_3_0/source/client/mount.cifs.c 2007-04-26 17:22:13 UTC (rev 22525) +++ branches/SAMBA_3_0/source/client/mount.cifs.c 2007-04-26 17:23:33 UTC (rev 22526) @@ -78,6 +78,7 @@ static char * user_name = NULL; static char * mountpassword = NULL; char * domain_name = NULL; +char * prefixpath = NULL; /* BB finish BB @@ -804,6 +805,11 @@ host_entry = gethostbyname(unc_name); } *(share - 1) = '/'; /* put the slash back */ + if ((prefixpath = strchr(share, '/'))) { + *prefixpath = 0; /* permanently terminate the string */ + if (!strlen(++prefixpath)) + prefixpath = NULL; /* this needs to be done explicitly */ + } if(got_ip) { if(verboseflag) printf("ip address specified explicitly\n"); @@ -1196,6 +1202,10 @@ strcat(options,","); strcat(options,orgoptions); } + if(prefixpath) { + strncat(options,",prefixpath=",12); + strcat(options,prefixpath); /* no need to cat the / */ + } if(verboseflag) printf("\nmount.cifs kernel mount options %s \n",options); if(mount(share_name, mountpoint, "cifs", flags, options)) {
svn commit: samba r22525 - in branches/SAMBA_3_0_25/source/client: .
Author: sfrench Date: 2007-04-26 17:22:13 + (Thu, 26 Apr 2007) New Revision: 22525 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22525 Log: Allow prepath Modified: branches/SAMBA_3_0_25/source/client/mount.cifs.c Changeset: Modified: branches/SAMBA_3_0_25/source/client/mount.cifs.c === --- branches/SAMBA_3_0_25/source/client/mount.cifs.c2007-04-26 12:09:25 UTC (rev 22524) +++ branches/SAMBA_3_0_25/source/client/mount.cifs.c2007-04-26 17:22:13 UTC (rev 22525) @@ -78,6 +78,7 @@ static char * user_name = NULL; static char * mountpassword = NULL; char * domain_name = NULL; +char * prefixpath = NULL; /* BB finish BB @@ -804,6 +805,11 @@ host_entry = gethostbyname(unc_name); } *(share - 1) = '/'; /* put the slash back */ + if ((prefixpath = strchr(share, '/'))) { + *prefixpath = 0; /* permanently terminate the string */ + if (!strlen(++prefixpath)) + prefixpath = NULL; /* this needs to be done explicitly */ + } if(got_ip) { if(verboseflag) printf("ip address specified explicitly\n"); @@ -1196,6 +1202,10 @@ strcat(options,","); strcat(options,orgoptions); } + if(prefixpath) { + strncat(options,",prefixpath=",12); + strcat(options,prefixpath); /* no need to cat the / */ + } if(verboseflag) printf("\nmount.cifs kernel mount options %s \n",options); if(mount(share_name, mountpoint, "cifs", flags, options)) {
Rev 194: removed some bogus debug lines in http://samba.org/~tridge/ctdb
revno: 194 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell <[EMAIL PROTECTED]> branch nick: tridge timestamp: Thu 2007-04-26 18:31:13 +0200 message: removed some bogus debug lines modified: common/ctdb_control.c ctdb_control.c-20070426122724-j6gkpiofhbwdin63-1 common/ctdb_daemon.c ctdb_daemon.c-20070409200331-3el1kqgdb9m4ib0g-1 === modified file 'common/ctdb_control.c' --- a/common/ctdb_control.c 2007-04-26 12:51:41 + +++ b/common/ctdb_control.c 2007-04-26 16:31:13 + @@ -124,8 +124,6 @@ data.dptr = &c->data[0]; data.dsize = c->datalen; - DEBUG(0,("data.dsize=%u\n", data.dsize)); - state->callback(ctdb, c->status, data, state->private_data); talloc_free(state); } === modified file 'common/ctdb_daemon.c' --- a/common/ctdb_daemon.c 2007-04-26 13:33:17 + +++ b/common/ctdb_daemon.c 2007-04-26 16:31:13 + @@ -564,12 +564,12 @@ client->ctdb->status.client_packets_recv++; if (cnt < sizeof(*hdr)) { - ctdb_set_error(client->ctdb, "Bad packet length %d in daemon\n", cnt); + ctdb_set_error(client->ctdb, "Bad packet length %u in daemon\n", cnt); return; } hdr = (struct ctdb_req_header *)data; if (cnt != hdr->length) { - ctdb_set_error(client->ctdb, "Bad header length %d expected %d\n in daemon", + ctdb_set_error(client->ctdb, "Bad header length %u expected %u\n in daemon", hdr->length, cnt); return; } @@ -773,13 +773,6 @@ struct ctdb_reply_control *r; size_t len; - DEBUG(0,("callback: size=%u\n", data.dsize)); - DEBUG(0,("callback: size=%u\n", data.dsize)); - DEBUG(0,("callback: size=%u\n", data.dsize)); - DEBUG(0,("callback: size=%u\n", data.dsize)); - DEBUG(0,("callback: size=%u\n", data.dsize)); - DEBUG(0,("callback: size=%u\n", data.dsize)); - /* construct a message to send to the client containing the data */ len = offsetof(struct ctdb_req_control, data) + data.dsize; r = ctdbd_allocate_pkt(client, len);
Rev 193: merge from peter in http://samba.org/~tridge/ctdb
revno: 193 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell <[EMAIL PROTECTED]> branch nick: tridge timestamp: Thu 2007-04-26 17:13:58 +0200 message: merge from peter modified: ib/ibw_ctdb.c ibw_ctdb.c-20070102171255-7krov7858dqza466-1 ib/ibw_ctdb.h ibw_ctdb.h-20070102171259-nmuvtzt98aqzg7xp-1 ib/ibw_ctdb_init.c ibw_ctdb_init.c-20070102171305-cn2z4k7ibx8141d5-1 ib/ibwrapper.c ibwrapper.c-20061204130028-0125b4f5a72f4b11 ib/ibwrapper_test.c ibwrapper_test.c-20061214171730-h11a2z5ed6pt66hj-1 revno: 44.1.42 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Peter Somogyi <[EMAIL PROTECTED]> branch nick: ctdb timestamp: Thu 2007-04-26 17:09:30 +0200 message: fixed prev. ibwrapper_test options revno: 44.1.41 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Peter Somogyi <[EMAIL PROTECTED]> branch nick: ctdb timestamp: Thu 2007-04-26 17:06:36 +0200 message: ctdb/ib: swapped ibwrapper_tets options (-d, -a, -g) revno: 44.1.40 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Peter Somogyi <[EMAIL PROTECTED]> branch nick: ctdb timestamp: Thu 2007-04-26 16:54:24 +0200 message: ctdb/ib: reduce debug output; allow not only ip revno: 44.1.39 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Peter Somogyi <[EMAIL PROTECTED]> branch nick: ctdb timestamp: Thu 2007-04-26 15:35:03 +0200 message: merged tridge's branch Diff too large for email (205, the limit is 200).
Rev 86: fixed prev. ibwrapper_test options in http://samba.org/~tridge/psomogyi/
revno: 86 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Peter Somogyi <[EMAIL PROTECTED]> branch nick: ctdb timestamp: Thu 2007-04-26 17:09:30 +0200 message: fixed prev. ibwrapper_test options modified: ib/ibwrapper_test.c ibwrapper_test.c-20061214171730-h11a2z5ed6pt66hj-1 === modified file 'ib/ibwrapper_test.c' --- a/ib/ibwrapper_test.c 2007-04-26 15:06:36 + +++ b/ib/ibwrapper_test.c 2007-04-26 15:09:30 + @@ -561,7 +561,7 @@ signal(SIGINT, ibwtest_sigint_handler); srand((unsigned)time(NULL)); - while ((op=getopt(argc, argv, "i:o:d:m:st:n:l:v:g:")) != -1) { + while ((op=getopt(argc, argv, "i:o:d:m:st:n:l:v:a:")) != -1) { switch (op) { case 'i': tcx->id = talloc_strdup(tcx, optarg);
Rev 85: ctdb/ib: swapped ibwrapper_tets options (-d, -a, -g) in http://samba.org/~tridge/psomogyi/
revno: 85 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Peter Somogyi <[EMAIL PROTECTED]> branch nick: ctdb timestamp: Thu 2007-04-26 17:06:36 +0200 message: ctdb/ib: swapped ibwrapper_tets options (-d, -a, -g) modified: ib/ibwrapper_test.c ibwrapper_test.c-20061214171730-h11a2z5ed6pt66hj-1 === modified file 'ib/ibwrapper_test.c' --- a/ib/ibwrapper_test.c 2007-04-26 14:54:24 + +++ b/ib/ibwrapper_test.c 2007-04-26 15:06:36 + @@ -531,14 +531,14 @@ printf("\t%s -i -o {name:value} -d {addr:port} -t nsec -s\n", name); printf("\t-i is a free text, acting as a server id, max 23 chars [mandatory]\n"); printf("\t-o name1:value1,name2:value2,... is a list of (name, value) pairs\n"); - printf("\t-d addr1:port1,addr2:port2,... is a list of destination ip addresses\n"); + printf("\t-a addr1:port1,addr2:port2,... is a list of destination ip addresses\n"); printf("\t-t nsec delta time between sends in nanosec [default %d]\n", tcx->nsec); printf("\t\t send message periodically and endless when nsec is non-zero\n"); printf("\t-s server mode (you have to give exactly one -d address:port in this case)\n"); printf("\t-n number of messages to send [default %d]\n", tcx->nmsg); printf("\t-l usec time to sleep in the main loop [default %d]\n", tcx->sleep_usec); printf("\t-v max variable msg size in bytes [default %d], 0=don't send var. size\n", tcx->maxsize); - printf("\t-g LogLevel [default %d]\n", LogLevel); + printf("\t-d LogLevel [default %d]\n", LogLevel); printf("Press ctrl+C to stop the program.\n"); } @@ -572,7 +572,7 @@ &tcx->nattrs, op)) goto cleanup; break; - case 'd': + case 'a': if (ibwtest_getdests(tcx, op)) goto cleanup; break; @@ -591,7 +591,7 @@ case 'v': tcx->maxsize = (unsigned int)atoi(optarg); break; - case 'g': + case 'd': LogLevel = atoi(optarg); break; default:
svn commit: linux-cifs-client r111 - in branches/linux-converged-for-old-kernels/fs/cifs: .
Author: sfrench Date: 2007-04-26 14:40:26 + (Thu, 26 Apr 2007) New Revision: 111 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=linux-cifs-client&rev=111 Log: Add missing file Added: branches/linux-converged-for-old-kernels/fs/cifs/export.c Changeset: Added: branches/linux-converged-for-old-kernels/fs/cifs/export.c === --- branches/linux-converged-for-old-kernels/fs/cifs/export.c 2007-04-26 14:40:07 UTC (rev 110) +++ branches/linux-converged-for-old-kernels/fs/cifs/export.c 2007-04-26 14:40:26 UTC (rev 111) @@ -0,0 +1,52 @@ +/* + * fs/cifs/export.c + * + * Copyright (C) International Business Machines Corp., 2007 + * Author(s): Steve French ([EMAIL PROTECTED]) + * + * Common Internet FileSystem (CIFS) client + * + * Operations related to support for exporting files via NFSD + * + * This library is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published + * by the Free Software Foundation; either version 2.1 of the License, or + * (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See + * the GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + + /* + * See Documentation/filesystems/Exporting + * and examples in fs/exportfs + */ + +#include + +#ifdef CONFIG_CIFS_EXPERIMENTAL + +static struct dentry *cifs_get_parent(struct dentry *dentry) +{ + /* BB need to add code here eventually to enable export via NFSD */ + return ERR_PTR(-EACCES); +} + +struct export_operations cifs_export_ops = { + .get_parent = cifs_get_parent, +/* Following five export operations are unneeded so far and can default */ +/* .get_dentry = + .get_name = + .find_exported_dentry = + .decode_fh = + .encode_fs = */ + }; + +#endif /* EXPERIMENTAL */ +
svn commit: linux-cifs-client r110 - in branches/linux-converged-for-old-kernels/fs/cifs: .
Author: sfrench Date: 2007-04-26 14:40:07 + (Thu, 26 Apr 2007) New Revision: 110 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=linux-cifs-client&rev=110 Log: Update cifs version to 1.49 Modified: branches/linux-converged-for-old-kernels/fs/cifs/TODO branches/linux-converged-for-old-kernels/fs/cifs/cifsfs.h Changeset: Modified: branches/linux-converged-for-old-kernels/fs/cifs/TODO === --- branches/linux-converged-for-old-kernels/fs/cifs/TODO 2007-04-26 14:21:22 UTC (rev 109) +++ branches/linux-converged-for-old-kernels/fs/cifs/TODO 2007-04-26 14:40:07 UTC (rev 110) @@ -1,4 +1,4 @@ -Version 1.39 November 30, 2005 +Version 1.49 April 26, 2007 A Partial List of Missing Features == @@ -18,7 +18,7 @@ d) Kerberos/SPNEGO session setup support - (started) -e) NTLMv2 authentication (mostly implemented - double check +e) More testing of NTLMv2 authentication (mostly implemented - double check that NTLMv2 signing works, also need to cleanup now unneeded SessSetup code in fs/cifs/connect.c) @@ -27,55 +27,44 @@ and raw NTLMSSP already. This is important when enabling extended security and mounting to Windows 2003 Servers -f) Directory entry caching relies on a 1 second timer, rather than +g) Directory entry caching relies on a 1 second timer, rather than using FindNotify or equivalent. - (started) -g) A few byte range testcases fail due to POSIX vs. Windows/CIFS -style byte range lock differences. Save byte range locks so -reconnect can replay them. - -h) Support unlock all (unlock 0,MAX_OFFSET) -by unlocking all known byte range locks that we locked on the file. - -i) quota support (needs minor kernel change since quota calls +h) quota support (needs minor kernel change since quota calls to make it to network filesystems or deviceless filesystems) -j) investigate sync behavior (including syncpage) and check +i) investigate sync behavior (including syncpage) and check for proper behavior of intr/nointr -k) hook lower into the sockets api (as NFS/SunRPC does) to avoid the +j) hook lower into the sockets api (as NFS/SunRPC does) to avoid the extra copy in/out of the socket buffers in some cases. -l) finish support for IPv6. This is mostly complete but -needs a simple conversion of ipv6 to sin6_addr from the -address in string representation. - -m) Better optimize open (and pathbased setfilesize) to reduce the +k) Better optimize open (and pathbased setfilesize) to reduce the oplock breaks coming from windows srv. Piggyback identical file opens on top of each other by incrementing reference count rather than resending (helps reduce server resource utilization and avoid spurious oplock breaks). -o) Improve performance of readpages by sending more than one read +l) Improve performance of readpages by sending more than one read at a time when 8 pages or more are requested. In conjuntion add support for async_cifs_readpages. -p) Add support for storing symlink info to Windows servers +m) Add support for storing symlink info to Windows servers in the Extended Attribute format their SFU clients would recognize. -q) Finish fcntl D_NOTIFY support so kde and gnome file list windows +n) Finish fcntl D_NOTIFY support so kde and gnome file list windows will autorefresh (partially complete by Asser). Needs minor kernel vfs change to support removing D_NOTIFY on a file. -r) Add GUI tool to configure /proc/fs/cifs settings and for display of +o) Add GUI tool to configure /proc/fs/cifs settings and for display of the CIFS statistics (started) -s) implement support for security and trusted categories of xattrs +p) implement support for security and trusted categories of xattrs (requires minor protocol extension) to enable better support for SELINUX -t) Implement O_DIRECT flag on open (already supported on mount) +q) Implement O_DIRECT flag on open (already supported on mount) -u) Create UID mapping facility so server UIDs can be mapped on a per +r) Create UID mapping facility so server UIDs can be mapped on a per mount or a per server basis to client UIDs or nobody if no mapping exists. This is helpful when Unix extensions are negotiated to allow better permission checking when UIDs differ on the server @@ -83,19 +72,26 @@ standard for asking the server for the corresponding name of a particular uid. -v) Add support for CIFS Unix and also the newer POSIX extensions to the +s) Add support for CIFS Unix and also the newer POSIX extensions to the server side for Samba 4. -w) Finish up the dos time conversion routines needed to return old server -time to the client (default time, of now or time 0 is used now for these -very old servers) - -x) In support for OS/2 (LANMAN 1.2 and LANMAN2.1 based SMB servers) +t) In support for OS/2 (LANMAN 1.2 and LANMAN2.1 based SMB servers) need to add ability to set time to server
svn commit: linux-cifs-client r109 - in branches/linux-converged-for-old-kernels/fs/cifs: .
Author: sfrench Date: 2007-04-26 14:21:22 + (Thu, 26 Apr 2007) New Revision: 109 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=linux-cifs-client&rev=109 Log: Merge with cifs-converged-for-old-kernels git tree on kernel.org Modified: branches/linux-converged-for-old-kernels/fs/cifs/CHANGES branches/linux-converged-for-old-kernels/fs/cifs/asn1.c branches/linux-converged-for-old-kernels/fs/cifs/cifs_unicode.c branches/linux-converged-for-old-kernels/fs/cifs/cifsfs.c branches/linux-converged-for-old-kernels/fs/cifs/cifsfs24.c branches/linux-converged-for-old-kernels/fs/cifs/cifspdu.h branches/linux-converged-for-old-kernels/fs/cifs/cifsproto.h branches/linux-converged-for-old-kernels/fs/cifs/cifssmb.c branches/linux-converged-for-old-kernels/fs/cifs/connect.c branches/linux-converged-for-old-kernels/fs/cifs/inode.c branches/linux-converged-for-old-kernels/fs/cifs/netmisc.c branches/linux-converged-for-old-kernels/fs/cifs/readdir.c branches/linux-converged-for-old-kernels/fs/cifs/sess.c Changeset: Sorry, the patch is too large (1010 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=linux-cifs-client&rev=109
svn commit: linux-cifs-client r108 - in branches/linux-2.6-cifs-git-devel/fs/cifs: .
Author: sfrench Date: 2007-04-26 13:39:53 + (Thu, 26 Apr 2007) New Revision: 108 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=linux-cifs-client&rev=108 Log: Merge with cifs git tree Modified: branches/linux-2.6-cifs-git-devel/fs/cifs/CHANGES branches/linux-2.6-cifs-git-devel/fs/cifs/cifs_unicode.c branches/linux-2.6-cifs-git-devel/fs/cifs/cifsfs.c branches/linux-2.6-cifs-git-devel/fs/cifs/cifspdu.h branches/linux-2.6-cifs-git-devel/fs/cifs/cifsproto.h branches/linux-2.6-cifs-git-devel/fs/cifs/cifssmb.c branches/linux-2.6-cifs-git-devel/fs/cifs/connect.c branches/linux-2.6-cifs-git-devel/fs/cifs/file.c branches/linux-2.6-cifs-git-devel/fs/cifs/inode.c branches/linux-2.6-cifs-git-devel/fs/cifs/netmisc.c branches/linux-2.6-cifs-git-devel/fs/cifs/readdir.c Changeset: Sorry, the patch is too large (1276 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=linux-cifs-client&rev=108
Rev 190: fixed typo in http://samba.org/~tridge/ctdb
revno: 190 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell <[EMAIL PROTECTED]> branch nick: tridge timestamp: Thu 2007-04-26 15:33:17 +0200 message: fixed typo modified: common/ctdb_daemon.c ctdb_daemon.c-20070409200331-3el1kqgdb9m4ib0g-1 === modified file 'common/ctdb_daemon.c' --- a/common/ctdb_daemon.c 2007-04-26 13:28:13 + +++ b/common/ctdb_daemon.c 2007-04-26 13:33:17 + @@ -50,7 +50,7 @@ int ctdb_tcp_init(struct ctdb_context *); ret = ctdb_tcp_init(ctdb); } -#ifdef USE_INFINBAND +#ifdef USE_INFINIBAND if (strcmp(ctdb->transport, "ib") == 0) { int ctdb_ibw_init(struct ctdb_context *); ret = ctdb_ibw_init(ctdb);
Rev 191: validate the vnn in http://samba.org/~tridge/ctdb
revno: 191 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell <[EMAIL PROTECTED]> branch nick: tridge timestamp: Thu 2007-04-26 15:38:33 +0200 message: validate the vnn modified: common/ctdb.c ctdb.c-20061127094323-t50f58d65iaao5of-2 === modified file 'common/ctdb.c' --- a/common/ctdb.c 2007-04-26 13:28:13 + +++ b/common/ctdb.c 2007-04-26 13:38:33 + @@ -394,7 +394,15 @@ { struct ctdb_node *node; ctdb->status.node_packets_sent++; + + if (!ctdb_validate_vnn(ctdb, hdr->destnode)) { + DEBUG(0,(__location__ " cant send to node %u that does not exist\n", +hdr->destnode)); + return; + } + node = ctdb->nodes[hdr->destnode]; + if (hdr->destnode == ctdb->vnn && !(ctdb->flags & CTDB_FLAG_SELF_CONNECT)) { ctdb_defer_packet(ctdb, hdr); } else if (ctdb->methods->queue_pkt(node, (uint8_t *)hdr, hdr->length) != 0) {
Rev 192: ignore generated nodes.txt in http://samba.org/~tridge/ctdb
revno: 192 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell <[EMAIL PROTECTED]> branch nick: tridge timestamp: Thu 2007-04-26 15:40:14 +0200 message: ignore generated nodes.txt modified: .bzrignore bzrignore-20061117235536-slq8jlz2b5161dfm-1 === modified file '.bzrignore' --- a/.bzrignore2007-04-19 00:03:20 + +++ b/.bzrignore2007-04-26 13:40:14 + @@ -14,3 +14,4 @@ ctdb-1 ctdb-2 ctdb-3 +nodes.txt
Rev 189: merge from peter in http://samba.org/~tridge/ctdb
revno: 189 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell <[EMAIL PROTECTED]> branch nick: tridge timestamp: Thu 2007-04-26 15:28:13 +0200 message: merge from peter modified: common/ctdb.c ctdb.c-20061127094323-t50f58d65iaao5of-2 common/ctdb_daemon.c ctdb_daemon.c-20070409200331-3el1kqgdb9m4ib0g-1 ib/ibw_ctdb_init.c ibw_ctdb_init.c-20070102171305-cn2z4k7ibx8141d5-1 ib/ibwrapper.c ibwrapper.c-20061204130028-0125b4f5a72f4b11 ib/ibwrapper_test.c ibwrapper_test.c-20061214171730-h11a2z5ed6pt66hj-1 include/ctdb_private.h ctdb_private.h-20061117234101-o3qt14umlg9en8z0-13 lib/util/debug.c debug.c-20070417155854-2i3crb0irl716qft-1 tcp/tcp_init.c tcp_init.c-20061128004937-x70q1cu5xzg5g2tm-2 tests/ctdb_bench.c ctdb_bench.c-20061219052637-2liagoglohxb6p7s-1 revno: 44.1.38 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Peter Somogyi <[EMAIL PROTECTED]> branch nick: ctdb timestamp: Thu 2007-04-26 15:00:24 +0200 message: merged tridge's branch revno: 44.1.37 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Peter Somogyi <[EMAIL PROTECTED]> branch nick: ctdb timestamp: Thu 2007-04-26 14:37:06 +0200 message: made ofed-1.0 (and 1.1) compatible + fixed warnings revno: 44.1.36 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Peter Somogyi <[EMAIL PROTECTED]> branch nick: ctdb timestamp: Mon 2007-04-23 12:45:14 +0200 message: fixed ctdb/ib bug at reject event reverted my suggestion in debug.c (based on my false error detection) revno: 44.1.35 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Peter Somogyi <[EMAIL PROTECTED]> branch nick: ctdb timestamp: Fri 2007-04-20 17:04:00 +0200 message: use talloc_vasprintf revno: 44.1.34 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Peter Somogyi <[EMAIL PROTECTED]> branch nick: ctdb timestamp: Fri 2007-04-20 16:22:57 +0200 message: removing my dirt from tridge's code (this change wasn't necessary) revno: 44.1.33 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Peter Somogyi <[EMAIL PROTECTED]> branch nick: ctdb timestamp: Fri 2007-04-20 14:50:10 +0200 message: merged tridge's branch revno: 44.1.32 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Peter Somogyi <[EMAIL PROTECTED]> branch nick: ctdb timestamp: Fri 2007-04-20 14:47:52 +0200 message: Simplified code in ctdb_init_transport. revno: 44.1.31 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Peter Somogyi <[EMAIL PROTECTED]> branch nick: ctdb timestamp: Fri 2007-04-20 14:26:19 +0200 message: - ctdb/ib minor bugfixes (error case) - make ctdb capable of alternative connection (like ib) again, solved the fork problem - do_debug memory overwrite bugfix (occured using ibwrapper_test with wrong address given) revno: 44.1.30 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Peter Somogyi <[EMAIL PROTECTED]> branch nick: ctdb timestamp: Thu 2007-04-19 15:52:08 +0200 message: Merged tridge's ctdb branch. revno: 44.1.29 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Peter Somogyi <[EMAIL PROTECTED]> branch nick: ctdb timestamp: Mon 2007-04-16 16:28:29 +0200 message: merged tridge's branch revno: 44.1.28 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Peter Somogyi <[EMAIL PROTECTED]> branch nick: ctdb timestamp: Thu 2007-03-29 18:46:02 +0200 message: ib: test scenario was wrong it sent message in both (or all) direction at the same time. Now it measures normal pingpong. Diff too large for email (429, the l
Rev 188: moved status to ctdb_control in http://samba.org/~tridge/ctdb
revno: 188 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell <[EMAIL PROTECTED]> branch nick: tridge timestamp: Thu 2007-04-26 14:51:41 +0200 message: moved status to ctdb_control removed: tools/ctdb_status.cctdb_status.c-20070420100703-w2y116bm9be7hmlv-2 modified: Makefile.inmakefile.in-20061117234101-o3qt14umlg9en8z0-1 common/ctdb_client.c ctdb_client.c-20070411010216-3kd8v37k61steeya-1 common/ctdb_control.c ctdb_control.c-20070426122724-j6gkpiofhbwdin63-1 common/ctdb_daemon.c ctdb_daemon.c-20070409200331-3el1kqgdb9m4ib0g-1 include/ctdb.h ctdb.h-20061117234101-o3qt14umlg9en8z0-11 include/ctdb_private.h ctdb_private.h-20061117234101-o3qt14umlg9en8z0-13 tools/ctdb_control.c ctdb_control.c-20070426122705-9ehj1l5lu2gn9kuj-1 Diff too large for email (588, the limit is 200).
Rev 187: added a ctdb control message, and tool in http://samba.org/~tridge/ctdb
revno: 187 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell <[EMAIL PROTECTED]> branch nick: tridge timestamp: Thu 2007-04-26 14:27:49 +0200 message: added a ctdb control message, and tool removed: tests/bench1.shbench1.sh-20070405031753-caneu8tv5v8e93ws-1 added: common/ctdb_control.c ctdb_control.c-20070426122724-j6gkpiofhbwdin63-1 tools/ctdb_control.c ctdb_control.c-20070426122705-9ehj1l5lu2gn9kuj-1 modified: Makefile.inmakefile.in-20061117234101-o3qt14umlg9en8z0-1 common/cmdline.c cmdline.c-20070416041216-w1zvz91bkdsgjckw-1 common/ctdb.c ctdb.c-20061127094323-t50f58d65iaao5of-2 common/ctdb_client.c ctdb_client.c-20070411010216-3kd8v37k61steeya-1 common/ctdb_daemon.c ctdb_daemon.c-20070409200331-3el1kqgdb9m4ib0g-1 include/ctdb.h ctdb.h-20061117234101-o3qt14umlg9en8z0-11 include/ctdb_private.h ctdb_private.h-20061117234101-o3qt14umlg9en8z0-13 tests/bench-ssh.sh benchssh.sh-20070220022243-k2evfudau0j1bwmn-1 tests/bench.sh bench.sh-20070209014602-vdolpr6esqsa58s7-1 tests/fetch.sh fetch.sh-20070405031756-lomzqpjyqg3xd1kv-1 tests/messaging.sh messaging.sh-20070411034158-e1c175kqm9vzasb6-1 tests/test.sh test.sh-20061128065333-cla80zaxd9eb4o4a-2 tools/ctdb_status.cctdb_status.c-20070420100703-w2y116bm9be7hmlv-2 Diff too large for email (1039, the limit is 200).
svn commit: samba r22524 - in branches: SAMBA_3_0/source/printing SAMBA_3_0_25/source/printing
Author: gd Date: 2007-04-26 12:09:25 + (Thu, 26 Apr 2007) New Revision: 22524 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22524 Log: Fix memleak. Guenther Modified: branches/SAMBA_3_0/source/printing/nt_printing.c branches/SAMBA_3_0_25/source/printing/nt_printing.c Changeset: Modified: branches/SAMBA_3_0/source/printing/nt_printing.c === --- branches/SAMBA_3_0/source/printing/nt_printing.c2007-04-26 09:32:26 UTC (rev 22523) +++ branches/SAMBA_3_0/source/printing/nt_printing.c2007-04-26 12:09:25 UTC (rev 22524) @@ -3264,6 +3264,7 @@ if (!ADS_ERR_OK(ads_rc)) { DEBUG(3, ("ads_connect failed: %s\n", ads_errstr(ads_rc))); ads_destroy(&ads); + ads_kdestroy("MEMORY:prtpub_cache"); return WERR_ACCESS_DENIED; } @@ -3280,6 +3281,7 @@ } ads_destroy(&ads); + ads_kdestroy("MEMORY:prtpub_cache"); return WERR_OK; } Modified: branches/SAMBA_3_0_25/source/printing/nt_printing.c === --- branches/SAMBA_3_0_25/source/printing/nt_printing.c 2007-04-26 09:32:26 UTC (rev 22523) +++ branches/SAMBA_3_0_25/source/printing/nt_printing.c 2007-04-26 12:09:25 UTC (rev 22524) @@ -3274,6 +3274,7 @@ if (!ADS_ERR_OK(ads_rc)) { DEBUG(3, ("ads_connect failed: %s\n", ads_errstr(ads_rc))); ads_destroy(&ads); + ads_kdestroy("MEMORY:prtpub_cache"); return WERR_ACCESS_DENIED; } @@ -3290,6 +3291,7 @@ } ads_destroy(&ads); + ads_kdestroy("MEMORY:prtpub_cache"); return WERR_OK; }
svn commit: samba r22523 - in branches/SAMBA_4_0/testprogs/ejs: .
Author: abartlet Date: 2007-04-26 09:32:26 + (Thu, 26 Apr 2007) New Revision: 22523 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22523 Log: Give a hint why this test fails (helped debugging backend issues). Andrew Bartlett Modified: branches/SAMBA_4_0/testprogs/ejs/ldap.js Changeset: Modified: branches/SAMBA_4_0/testprogs/ejs/ldap.js === --- branches/SAMBA_4_0/testprogs/ejs/ldap.js2007-04-25 16:36:46 UTC (rev 22522) +++ branches/SAMBA_4_0/testprogs/ejs/ldap.js2007-04-26 09:32:26 UTC (rev 22523) @@ -428,6 +428,9 @@ var attrs = new Array("cn"); var res = ldb.search("objectClass=crossRef", base_dn, ldb.SCOPE_SUBTREE, attrs); assert(res.error == 0); + if (res.msgs.length != 0) { + println("Got configuration DN " + res.msgs[0].dn + " which should not be able to be seen from main search base"); + } assert(res.msgs.length == 0); println("Testing that we can get at the configuration DN from the main search base on the LDAP port with the 'phantom root' search_options control");
Rev 186: merge from ronnie in http://samba.org/~tridge/ctdb
revno: 186 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell <[EMAIL PROTECTED]> branch nick: tridge timestamp: Thu 2007-04-26 11:13:49 +0200 message: merge from ronnie modified: common/ctdb_call.c ctdb_call.c-20061128065342-to93h6eejj5kon81-1 common/ctdb_client.c ctdb_client.c-20070411010216-3kd8v37k61steeya-1 common/ctdb_daemon.c ctdb_daemon.c-20070409200331-3el1kqgdb9m4ib0g-1 common/ctdb_util.c ctdb_util.c-20061128065342-to93h6eejj5kon81-3 include/ctdb.h ctdb.h-20061117234101-o3qt14umlg9en8z0-11 include/ctdb_private.h ctdb_private.h-20061117234101-o3qt14umlg9en8z0-13 tests/ctdb_test.c ctdb_test.c-20061117234101-o3qt14umlg9en8z0-16 revno: 66.1.3.1.21.2.11.1.9 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Ronnie Sahlberg <[EMAIL PROTECTED]> branch nick: ctdb timestamp: Tue 2007-04-24 00:06:48 +1000 message: add pdu's that the client can use to query the ctdb daemon of the path to the database it created (so the client can open and access the same file) revno: 66.1.3.1.21.2.11.1.8 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Ronnie Sahlberg <[EMAIL PROTECTED]> branch nick: ctdb timestamp: Mon 2007-04-23 18:19:50 +1000 message: split the 32bit idr field into two. store the idr as the high 16 bits and use a rotating counter for the low 16 bits. revno: 66.1.3.1.21.2.11.1.7 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Ronnie Sahlberg <[EMAIL PROTECTED]> branch nick: ctdb timestamp: Mon 2007-04-23 17:05:09 +1000 message: add a comment that sometimes sending remote calls straight to the lmaster instead of what the nodes think is the dmaster (which might be stale) improve performance. revno: 66.1.3.1.21.2.11.1.6 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Ronnie Sahlberg <[EMAIL PROTECTED]> branch nick: ctdb timestamp: Mon 2007-04-23 02:35:05 +1000 message: merge from tridge revno: 66.1.3.1.21.2.11.1.5 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Ronnie Sahlberg <[EMAIL PROTECTED]> branch nick: ctdb timestamp: Sun 2007-04-22 22:31:11 +1000 message: merge from tridge revno: 66.1.3.1.21.2.11.1.4 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Ronnie Sahlberg <[EMAIL PROTECTED]> branch nick: ctdb timestamp: Sun 2007-04-22 20:55:49 +1000 message: merge from tridge revno: 66.1.3.1.21.2.11.1.3 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Ronnie Sahlberg <[EMAIL PROTECTED]> branch nick: ctdb timestamp: Sun 2007-04-22 17:03:36 +1000 message: merge from tridge revno: 66.1.3.1.21.2.11.1.2 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Ronnie Sahlberg <[EMAIL PROTECTED]> branch nick: ctdb timestamp: Sat 2007-04-21 17:57:50 +1000 message: merge from tridges tree revno: 66.1.3.1.21.2.11.1.1 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Ronnie Sahlberg <[EMAIL PROTECTED]> branch nick: ctdb timestamp: Fri 2007-04-20 07:19:07 +1000 message: merge from tridge Diff too large for email (547, the limit is 200).