[PATCH] Remove duplicate protocol definitions

[Amitay Isaacs]

On Tue, Nov 3, 2015 at 8:25 PM, Volker Lendecke <Volker.Lendecke at sernet.de>
wrote:

> On Tue, Nov 03, 2015 at 12:52:12PM +1100, Amitay Isaacs wrote:
> > The problem is that source3/smbd/server.c and
> > source3/smbd/notifyd/notifyd.c include CTDB headers without checking for
> > CLUSTER_SUPPORT.  There are two ways to fix this:
> >
> > 1. Always check for CLUSTER_SUPPORT before including CTDB headers.
> >
> > Additional patches to fix the above two files attached.  These patches
> add
> > #ifdef CLUSTER_SUPPORT checks to the above mentioned files.
> >
> > 2. If we need to build smbd with clustering, but restrict the
> functionality
> > at runtime using lp_clustering(), then always build with CTDB and drop
> the
> > --with-cluster-support configure option.
> >
> > Volker, if we prefer option 1 then can you please review the patches?
>
> Pushed.
>
> Volker
>

I noticed that the build failed with the following error.

 [2904/4075] Compiling source3/smbd/notifyd/notifyd.c
cc1: warnings being treated as errors
../source3/smbd/notifyd/notifyd.c:1255: error: 'notifyd_peer_new' defined
but not used
../source3/smbd/notifyd/notifyd.c:1282: error: 'notifyd_apply_reclog'
defined but not used
Waf: Leaving directory `/memdisk/vlendec/a/b22048/samba/bin'
Build failed:  -> task failed (err #1):
    {task: cc notifyd.c -> notifyd_1.o}

Attached is modified patch which moves #ifdef CLUSTER_SUPPORT to include
the above functions.

Amitay.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: patches
Type: application/octet-stream
Size: 7195 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20151103/f53eff05/patches.obj>