build fixes with libunwind

Volker Lendecke Volker.Lendecke at SerNet.DE
Sun Jan 27 09:44:49 MST 2013


Hi!

If someone feels like it, please review and push.

Thanks,

Volker

-- 
SerNet GmbH, Bahnhofsallee 1b, 37081 Göttingen
phone: +49-551-370000-0, fax: +49-551-370000-9
AG Göttingen, HRB 2816, GF: Dr. Johannes Loxen
http://www.sernet.de, mailto:kontakt at sernet.de

**********************************************************
visit us at CeBIT: March 5th - 9th 2013, hall 6, booth E15
all about SAMBA and verinice, firewalls, Linux and Windows
free tickets available via email here : cebit at sernet.com !
**********************************************************
-------------- next part --------------
From 342145ed34b34efcae8c05a92f5257872c2e1c81 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl at samba.org>
Date: Sun, 27 Jan 2013 17:24:31 +0100
Subject: [PATCH 1/2] smbcontrol: Fix the build with libunwind

---
 source3/utils/smbcontrol.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c
index ac13dc4..8a69056 100644
--- a/source3/utils/smbcontrol.c
+++ b/source3/utils/smbcontrol.c
@@ -327,7 +327,7 @@ static int stack_trace_server(const struct server_id *id,
 			      void *priv)
 {
 	if (id->vnn == get_my_vnn()) {
-		print_stack_trace(procid_to_pid(&id->pid), (int *)priv);
+		print_stack_trace(procid_to_pid(id), (int *)priv);
 	}
 	return 0;
 }
-- 
1.7.9.5


From 56af76d5091ff2d33575ae5daf375f89aaccb68f Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl at samba.org>
Date: Sun, 27 Jan 2013 17:24:49 +0100
Subject: [PATCH 2/2] smbcontrol: Fix undefined serverid_traverse_read warning

---
 source3/utils/smbcontrol.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c
index 8a69056..0e4a8cc 100644
--- a/source3/utils/smbcontrol.c
+++ b/source3/utils/smbcontrol.c
@@ -33,6 +33,7 @@
 #include "messages.h"
 #include "util_tdb.h"
 #include "../lib/util/pidfile.h"
+#include "serverid.h"
 
 #if HAVE_LIBUNWIND_H
 #include <libunwind.h>
-- 
1.7.9.5



More information about the samba-technical mailing list