[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  5f68f72 vfs_snapper: check for <linux/ioctl.h>
       via  d840f11 s3:messaging: fix conversion specifier
      from  dbb191f libcli/smb: Add smb2_lease_equal() which compares client_guids and keys.

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 5f68f7289c3028f50a449120cce000dcf40db788
Author: Ralph Boehme <rb at sernet.de>
Date:   Sat Nov 8 22:18:08 2014 +0100

    vfs_snapper: check for <linux/ioctl.h>
    
    Signed-off-by: Ralph Boehme <slow at samba.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    
    Autobuild-User(master): Volker Lendecke <vl at samba.org>
    Autobuild-Date(master): Sun Nov  9 16:02:24 CET 2014 on sn-devel-104

commit d840f11386d9b45918ff19064f71090569d1a26d
Author: Ralph Boehme <rb at sernet.de>
Date:   Sun Oct 5 17:44:08 2014 +0200

    s3:messaging: fix conversion specifier
    
    Signed-off-by: Ralph Boehme <slow at samba.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 source3/lib/messages_ctdbd.c  | 5 +++--
 source3/modules/vfs_snapper.c | 2 ++
 source3/wscript               | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/messages_ctdbd.c b/source3/lib/messages_ctdbd.c
index 3d600bf..eb7e929 100644
--- a/source3/lib/messages_ctdbd.c
+++ b/source3/lib/messages_ctdbd.c
@@ -80,8 +80,9 @@ 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");
 	}
 
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')


-- 
Samba Shared Repository