Attachment 14978 Details for Bug 13854 – patch cherry-picked from master for 4.10

[patch] patch cherry-picked from master for 4.10

0001-s4-messaging-Fix-undefined-reference-in-linking-libM.patch (text/plain), 1.83 KB, created by Andrew Bartlett on 2019-03-22 06:46:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Bartlett

Created: 2019-03-22 06:46:40 UTC

Size: 1.83 KB

patch

obsolete

>From a1d7d5889a3aed68ab3e96ae5f1f8382b9910e69 Mon Sep 17 00:00:00 2001
>From: Anoop C S <anoopcs@redhat.com>
>Date: Thu, 27 Dec 2018 18:19:42 +0530
>Subject: [PATCH] s4/messaging: Fix undefined reference in linking
> libMESSAGING-samba4.so
>
>Early check for DEVELOPER or ENABLE_SELFTEST configure options inside
>messaging_handlers.c leaves us with the following undefined reference
>linkage error:
>
>[1315/3712] Linking bin/default/source4/lib/messaging/libMESSAGING-samba4.so
>/usr/bin/ld: source4/lib/messaging/messaging.c.4.o: in function
>						`imessaging_init_internal':
>/root/samba.git/bin/default/../../source4/lib/messaging/messaging.c:472:
>		undefined reference to `imessaging_register_extra_handlers'
>collect2: error: ld returned 1 exit status
>
>This happened due to failure in including "includes.h" before checking
>the above mentioned configure options.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=13854
>
>Signed-off-by: Anoop C S <anoopcs@redhat.com>
>Reviewed-by: Andreas Schneider <asn@samba.org>
>Reviewed-by: Andrew Bartlett <abartlet@samba.org>
>(cherry picked from commit 08ba013a2b8b2cf9fc17fdcb3d107e1434709036)
>---
> source4/lib/messaging/messaging_handlers.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/source4/lib/messaging/messaging_handlers.c b/source4/lib/messaging/messaging_handlers.c
>index aee7b66..342157d 100644
>--- a/source4/lib/messaging/messaging_handlers.c
>+++ b/source4/lib/messaging/messaging_handlers.c
>@@ -22,13 +22,13 @@
>    along with this program.  If not, see <http://www.gnu.org/licenses/>.
> */
> 
>-#if defined(DEVELOPER) || defined(ENABLE_SELFTEST)
>-
> #include "includes.h"
> #include "lib/util/server_id.h"
> #include "messaging/messaging.h"
> #include "messaging/messaging_internal.h"
> 
>+#if defined(DEVELOPER) || defined(ENABLE_SELFTEST)
>+
> /*
>  * Inject a fault into the currently running process
>  */
>-- 
>2.7.4
>

Flags:

asn: review+

Actions: View

Attachments on bug 13854: 14977 | 14978