[PATCH] Fix include

Ralph Böhme slow at samba.org
Fri Jun 29 06:05:17 UTC 2018


Hi!

Attached is a simple fix for s3/lib/ctdbd_conn. Fixes my own copy&paste error
that now fell on my feet with a failing wafsamba.duplicate_symbols test.

Please review&push if happy. Thanks!

-slow

-- 
Ralph Boehme, Samba Team       https://samba.org/
Samba Developer, SerNet GmbH   https://sernet.de/en/samba/
GPG Key Fingerprint:           FAE2 C608 8A24 2520 51C5
                               59E4 AA1E 9B71 2639 9E46
-------------- next part --------------
From f0bdf99570abc6808da9038718d73d584512a40a Mon Sep 17 00:00:00 2001
From: Ralph Boehme <slow at samba.org>
Date: Fri, 29 Jun 2018 08:00:10 +0200
Subject: [PATCH] s3: lib/ctdbd_conn: include .h, not .c

Probably a copy/paste mistake. Detected by a failing autobuild on
sn-devel and a local make test:

Build failed: default/examples/libsmbclient/testbrowse2: Symbol
tevent_req_is_unix_error linked in multiple libraries
['samba-cluster-support', 'tevent-util']
UNEXPECTED(failure): wafsamba.duplicate_symbols.duplicate_symbols(none)

Wonder why this didn't fail before in autobuild.

Signed-off-by: Ralph Boehme <slow at samba.org>
---
 source3/lib/ctdbd_conn.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c
index 9832dfae7b4..dc6aa282316 100644
--- a/source3/lib/ctdbd_conn.c
+++ b/source3/lib/ctdbd_conn.c
@@ -32,7 +32,7 @@
 #include "lib/util/genrand.h"
 #include "lib/util/fault.h"
 #include "lib/util/dlinklist.h"
-#include "lib/util/tevent_unix.c"
+#include "lib/util/tevent_unix.h"
 #include "lib/util/sys_rw.h"
 #include "lib/util/blocking.h"
 #include "ctdb/include/ctdb_protocol.h"
-- 
2.13.6



More information about the samba-technical mailing list