Attachment 6683 Details for Bug 8303 – fix for bug #8303

[patch] fix for bug #8303

fix-bug-8303.patch (text/plain), 1.43 KB, created by Björn Baumbach on 2011-07-12 17:16:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Björn Baumbach

Created: 2011-07-12 17:16:17 UTC

Size: 1.43 KB

patch

obsolete

>From 10a52c2a640f9dab20b99bdc4a74ebaaf5fbf4c5 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Bj=C3=B6rn=20Baumbach?= <bb@sernet.de>
>Date: Tue, 12 Jul 2011 17:32:55 +0200
>Subject: [PATCH] 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@samba.org>
>
>Autobuild-User: Stefan Metzmacher <metze@samba.org>
>Autobuild-Date: Tue Jul 12 18:56:30 CEST 2011 on sn-devel-104
>(cherry picked from commit b807c58b655f1ffbf849f5de9eef66136bdb4a52)
>---
> source3/lib/dbwrap_ctdb.c |    4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
>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
> 
>-- 
>1.7.3.4
>

Flags:

metze: review+
obnox: review+

Actions: View

Attachments on bug 8303: 6683