Attachment 14307 Details for Bug 13499 – Proposed additional patch for 4.7 to fix the build

[patch] Proposed additional patch for 4.7 to fix the build

0001-s3-notifyd.c-Rename-CTDB_BROADCAST_VNNMAP-to-CTDB_BRO.patch (text/plain), 1.44 KB, created by Karolin Seeger on 2018-07-06 10:49:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Karolin Seeger

Created: 2018-07-06 10:49:45 UTC

Size: 1.44 KB

patch

obsolete

>From d91da58efbf43b1f68a9f7c31ee95ca657a20a97 Mon Sep 17 00:00:00 2001
>From: Karolin Seeger <kseeger@samba.org>
>Date: Fri, 6 Jul 2018 12:38:02 +0200
>Subject: [PATCH] s3/notifyd.c: Rename CTDB_BROADCAST_VNNMAP to
> CTDB_BROADCAST_ACTIVE.
>
>This fixes the build. Was introduced by a fix for
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=13499.
>
>Signed-off-by: Karolin Seeger <kseeger@samba.org>
>---
> source3/smbd/notifyd/notifyd.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/source3/smbd/notifyd/notifyd.c b/source3/smbd/notifyd/notifyd.c
>index caf894e956e..693b924f2dc 100644
>--- a/source3/smbd/notifyd/notifyd.c
>+++ b/source3/smbd/notifyd/notifyd.c
>@@ -81,7 +81,7 @@ struct notifyd_state {
> 	 * broadcasts its messaging_reclog to every other notifyd in
> 	 * the cluster. This is done by making ctdb send a message to
> 	 * srvid CTDB_SRVID_SAMBA_NOTIFY_PROXY with destination node
>-	 * number CTDB_BROADCAST_VNNMAP. Everybody in the cluster who
>+	 * number CTDB_BROADCAST_ACTIVE. Everybody in the cluster who
> 	 * had called register_with_ctdbd this srvid will receive the
> 	 * broadcasts.
> 	 *
>@@ -998,7 +998,7 @@ static void notifyd_broadcast_reclog(struct ctdbd_connection *ctdbd_conn,
> 				  .iov_len = blob.length };
> 
> 	ret = ctdbd_messaging_send_iov(
>-		ctdbd_conn, CTDB_BROADCAST_VNNMAP,
>+		ctdbd_conn, CTDB_BROADCAST_ACTIVE,
> 		CTDB_SRVID_SAMBA_NOTIFY_PROXY, iov, ARRAY_SIZE(iov));
> 	TALLOC_FREE(blob.data);
> 	if (ret != 0) {
>-- 
>2.11.0
>

Flags:

martins: review+
amitay: review+

Actions: View

Attachments on bug 13499: 14286 | 14287 | 14307