Attachment 10477 Details for Bug 10834 – Patch from master

[patch] Patch from master

10834.patch (text/plain), 1.50 KB, created by Christian Ambach on 2014-12-02 21:49:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christian Ambach

Created: 2014-12-02 21:49:22 UTC

Size: 1.50 KB

patch

obsolete

>From 70af9ef0de6f1d4eff44d44fbd3c9d41bb5d8b6d Mon Sep 17 00:00:00 2001
>From: Ralph Boehme <rb@sernet.de>
>Date: Sat, 8 Nov 2014 22:18:08 +0100
>Subject: [PATCH] vfs_snapper: check for <linux/ioctl.h>
>
>Signed-off-by: Ralph Boehme <slow@samba.org>
>Reviewed-by: Volker Lendecke <vl@samba.org>
>
>Bug: https://bugzilla.samba.org/show_bug.cgi?id=10834
>
>Autobuild-User(master): Volker Lendecke <vl@samba.org>
>Autobuild-Date(master): Sun Nov  9 16:02:24 CET 2014 on sn-devel-104
>
>(cherry picked from commit 5f68f7289c3028f50a449120cce000dcf40db788)
>---
> 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 b285c5f..338daa0 100644
>--- a/source3/wscript
>+++ b/source3/wscript
>@@ -84,7 +84,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.1
>

Flags:

slow: review+

Actions: View

Attachments on bug 10834: 10477