[SCM] Samba Shared Repository - branch v3-6-test updated

Karolin Seeger kseeger at samba.org
Sun Jul 31 13:14:31 MDT 2011


The branch, v3-6-test has been updated
       via  3932178 s3: dbwrap_ctdb.c: Fix bug #8303 #ifdef CTDB_CONTROL_SCHEDULE_FOR_DELETION issue
      from  3e85456 Second part of bugfix for bug #8335 - file copy aborts with smb2_validate_message_id: bad message_id

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit 3932178dd3a54723484e833cddf58ff68e7c3417
Author: Björn Baumbach <bb at sernet.de>
Date:   Tue Jul 12 17:32:55 2011 +0200

    s3: dbwrap_ctdb.c: Fix bug #8303 #ifdef CTDB_CONTROL_SCHEDULE_FOR_DELETION issue
    
    Check for HAVE_CTDB_CONTROL_SCHEDULE_FOR_DELETION_DECL instead of
    CTDB_CONTROL_SCHEDULE_FOR_DELETION, which is an enum member and not a
    define.
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Tue Jul 12 18:56:30 CEST 2011 on sn-devel-104
    (cherry picked from commit b807c58b655f1ffbf849f5de9eef66136bdb4a52)

-----------------------------------------------------------------------

Summary of changes:
 source3/lib/dbwrap_ctdb.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/dbwrap_ctdb.c b/source3/lib/dbwrap_ctdb.c
index 298f4c1..468a74f 100644
--- a/source3/lib/dbwrap_ctdb.c
+++ b/source3/lib/dbwrap_ctdb.c
@@ -911,7 +911,7 @@ static NTSTATUS db_ctdb_store(struct db_record *rec, TDB_DATA data, int flag)
 
 
 
-#ifdef CTDB_CONTROL_SCHEDULE_FOR_DELETION
+#ifdef HAVE_CTDB_CONTROL_SCHEDULE_FOR_DELETION_DECL
 static NTSTATUS db_ctdb_send_schedule_for_deletion(struct db_record *rec)
 {
 	NTSTATUS status;
@@ -974,7 +974,7 @@ static NTSTATUS db_ctdb_delete(struct db_record *rec)
 		return status;
 	}
 
-#ifdef CTDB_CONTROL_SCHEDULE_FOR_DELETION
+#ifdef HAVE_CTDB_CONTROL_SCHEDULE_FOR_DELETION_DECL
 	status = db_ctdb_send_schedule_for_deletion(rec);
 #endif
 


-- 
Samba Shared Repository


More information about the samba-cvs mailing list