[PATCH] Two fixes needed for building on Solaris

Ralph Böhme rb at sernet.de
Sun Nov 9 04:49:33 MST 2014


Hi all!

Here are two fixes needed building on Solaris.

Pleae review and push if ok. Thanks!

-Ralph

-- 
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@sernet.de
-------------- next part --------------
>From d974ab8165866ce6b4e149d16f3f4af064b51a22 Mon Sep 17 00:00:00 2001
From: Ralph Boehme <rb at sernet.de>
Date: Sun, 5 Oct 2014 17:44:08 +0200
Subject: [PATCH 1/2] s3:messaging: fix conversion specifier

Signed-off-by: Ralph Boehme <slow at samba.org>
---
 source3/lib/messages_ctdbd.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/source3/lib/messages_ctdbd.c b/source3/lib/messages_ctdbd.c
index 3d600bf..85c1b13 100644
--- a/source3/lib/messages_ctdbd.c
+++ b/source3/lib/messages_ctdbd.c
@@ -80,8 +80,8 @@ struct ctdbd_connection *messaging_ctdbd_connection(void)
 
 	if (global_ctdb_connection_pid != getpid()) {
 		DEBUG(0,("messaging_ctdbd_connection():"
-			 "valid for pid[%d] but it's [%d]\n",
-			 global_ctdb_connection_pid, getpid()));
+			 "valid for pid[%jd] but it's [%jd]\n",
+			 (intmax_t)global_ctdb_connection_pid, (intmax_t)getpid()));
 		smb_panic("messaging_ctdbd_connection() invalid process\n");
 	}
 
-- 
1.9.3


>From 45f1d3abcabd0fe63493d84f3683bd268be521bd Mon Sep 17 00:00:00 2001
From: Ralph Boehme <rb at sernet.de>
Date: Sat, 8 Nov 2014 22:18:08 +0100
Subject: [PATCH 2/2] vfs_snapper: check for <linux/ioctl.h>

Signed-off-by: Ralph Boehme <slow at samba.org>
---
 source3/modules/vfs_snapper.c | 2 ++
 source3/wscript               | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/source3/modules/vfs_snapper.c b/source3/modules/vfs_snapper.c
index f0f0b5c..12a3b9a 100644
--- a/source3/modules/vfs_snapper.c
+++ b/source3/modules/vfs_snapper.c
@@ -25,7 +25,9 @@
  */
 
 #include <dbus/dbus.h>
+#ifdef HAVE_LINUX_IOCTL_H
 #include <linux/ioctl.h>
+#endif
 #include <sys/ioctl.h>
 #include <dirent.h>
 #include <libgen.h>
diff --git a/source3/wscript b/source3/wscript
index ba1125e..f61c049 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -77,7 +77,7 @@ def configure(conf):
         conf.ADD_LDFLAGS("-Wl,--export-dynamic", testflags=True)
 
     conf.CHECK_HEADERS('execinfo.h libexc.h libunwind.h netdb.h')
-    conf.CHECK_HEADERS('linux/falloc.h')
+    conf.CHECK_HEADERS('linux/falloc.h linux/ioctl.h')
 
     conf.CHECK_FUNCS('getcwd fchown chmod fchmod mknod')
     conf.CHECK_FUNCS('strtol strchr strupr chflags')
-- 
1.9.3



More information about the samba-technical mailing list