The branch, master has been updated via d5fe21c s3: Fix some nonempty blank lines via 625ad07 s3: Fix a comment via a86c536 s3: Remove some leftovers of old ctdb tdb2 code from a354758 s4:torture:smb2: add durable_open_basic2 test: test durable open against all lease types
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit d5fe21c0037bdf7c95b1219911a3a5af6ee74b83 Author: Volker Lendecke <v...@samba.org> Date: Mon Oct 31 12:41:09 2011 +0100 s3: Fix some nonempty blank lines Autobuild-User: Volker Lendecke <vlen...@samba.org> Autobuild-Date: Mon Oct 31 14:25:14 CET 2011 on sn-devel-104 commit 625ad07f4fb5c3a44a7372d52e4d9123d943fbd6 Author: Volker Lendecke <v...@samba.org> Date: Mon Oct 31 12:40:58 2011 +0100 s3: Fix a comment commit a86c536227a693c40a2daf9c1b95844b503ccd08 Author: Volker Lendecke <v...@samba.org> Date: Mon Oct 31 12:37:09 2011 +0100 s3: Remove some leftovers of old ctdb tdb2 code ----------------------------------------------------------------------- Summary of changes: source3/lib/messages.c | 15 +++++++++------ source3/librpc/idl/messaging.idl | 17 +---------------- 2 files changed, 10 insertions(+), 22 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/lib/messages.c b/source3/lib/messages.c index b3917d0..ab655af 100644 --- a/source3/lib/messages.c +++ b/source3/lib/messages.c @@ -5,17 +5,17 @@ Copyright (C) 2001 by Martin Pool Copyright (C) 2002 by Jeremy Allison Copyright (C) 2007 by Volker Lendecke - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. - + This program 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 General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ @@ -24,7 +24,7 @@ @defgroup messages Internal messaging framework @{ @file messages.c - + @brief Module for internal messaging between Samba daemons. The idea is that if a part of Samba wants to do communication with @@ -115,8 +115,11 @@ static int traverse_fn(struct db_record *rec, const struct server_id *id, (const uint8 *)msg_all->buf, msg_all->len); if (NT_STATUS_EQUAL(status, NT_STATUS_INVALID_HANDLE)) { - - /* If the pid was not found delete the entry from connections.tdb */ + + /* + * If the pid was not found delete the entry from + * serverid.tdb + */ DEBUG(2, ("pid %s doesn't exist\n", procid_str_static(id))); diff --git a/source3/librpc/idl/messaging.idl b/source3/librpc/idl/messaging.idl index 53aabfa..96ca784 100644 --- a/source3/librpc/idl/messaging.idl +++ b/source3/librpc/idl/messaging.idl @@ -101,7 +101,7 @@ interface messaging MSG_DUMP_EVENT_LIST = 0x0500, /* dbwrap messages 4001-4999 (0x0FA0 - 0x1387) */ - MSG_DBWRAP_TDB2_CHANGES = 4001, + /* MSG_DBWRAP_TDB2_CHANGES = 4001, */ MSG_DBWRAP_G_LOCK_RETRY = 4002 } messaging_type; @@ -119,19 +119,4 @@ interface messaging uint32 num_messages; messaging_rec messages[num_messages]; } messaging_array; - - /* - * struct used for change notify messages - * in the dbwrap_tdb2 code - */ - typedef [public] struct { - [charset(DOS),value("TDB2")] uint8 magic_string[4]; - [value(1)] uint32 magic_version; - [charset(UTF8),string] uint8 name[]; - uint32 old_seqnum; - uint32 new_seqnum; - uint32 num_changes; - uint32 num_keys; - DATA_BLOB keys[num_keys]; - } dbwrap_tdb2_changes; } -- Samba Shared Repository