blob: b8a6c9fdbd516534883ba724836b048628349398 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
|
--- a/configure.orig 2017-11-03 09:14:07.000000000 -0600
+++ b/configure 2017-11-18 14:25:52.095495407 -0700
@@ -47,6 +47,29 @@ check_header()
echo "[*] Checking system headers."
#############################################################################################
+# Does auto_fs4 define AUTOFS_IOC_EXPIRE_(IN)DIRECT?
+echo -n "[*] Checking autofs headers ... "
+rm -f "$TMP" || exit 1
+
+cat >"$TMP.c" << EOF
+#include <linux/auto_fs4.h>
+
+int main()
+{
+ return AUTOFS_IOC_EXPIRE_INDIRECT + AUTOFS_IOC_EXPIRE_DIRECT;
+}
+EOF
+
+${CC} ${CFLAGS} "$TMP.c" -o "$TMP" &>"$TMP.log"
+if [ ! -x "$TMP" ]; then
+ echo $RED "[NO]" $COL_RESET
+ MISSING_DEFS=1
+else
+ echo $GREEN "[YES]" $COL_RESET
+ echo "#define USE_AUTOFS_EXPIRE 1" >> $CONFIGH
+fi
+
+#############################################################################################
# Are ipv6 headers usable ?
[ -z "$IPV6" ] && IPV6=yes
if [[ "$IPV6" == "yes" ]]; then
@@ -290,6 +313,7 @@ fi
#############################################################################################
+check_header linux/auto_fs4.h USE_AUTOFS_EXPIRE
check_header linux/caif/caif_socket.h USE_CAIF
check_header linux/fsmap.h USE_FSMAP
check_header linux/if_alg.h USE_IF_ALG
--- a/ioctls/autofs.c.orig 2017-11-03 09:14:07.000000000 -0600
+++ b/ioctls/autofs.c 2017-11-18 14:21:14.487774564 -0700
@@ -238,8 +238,10 @@ static const struct ioctl autofs_ioctls[
IOCTL(AUTOFS_IOC_SETTIMEOUT),
IOCTL(AUTOFS_IOC_EXPIRE),
IOCTL(AUTOFS_IOC_EXPIRE_MULTI),
+#ifdef PRE_4_14_KERNEL
IOCTL(AUTOFS_IOC_EXPIRE_INDIRECT),
IOCTL(AUTOFS_IOC_EXPIRE_DIRECT),
+#endif
IOCTL(AUTOFS_IOC_PROTOSUBVER),
IOCTL(AUTOFS_IOC_ASKUMOUNT),
|
