[patch] Fix compile with -caps

vsftpd-caps.patch (text/plain), 1.00 KB, created by Roy Marples (RETIRED) on 2007-01-05 10:02:47 UTC

diff -ur vsftpd-2.0.5.orig/sysdeputil.c vsftpd-2.0.5/sysdeputil.c
--- vsftpd-2.0.5.orig/sysdeputil.c	2007-01-05 17:58:28.000000000 +0000
+++ vsftpd-2.0.5/sysdeputil.c	2007-01-05 17:55:30.000000000 +0000
@@ -154,11 +154,8 @@
 #include <sys/capability.h>
 
 #if defined(VSF_SYSDEP_HAVE_CAPABILITIES) && !defined(VSF_SYSDEP_HAVE_LIBCAP)
-#include <linux/unistd.h>
 #include <linux/capability.h>
-#include <errno.h>
-#include <syscall.h>
-_syscall2(int, capset, cap_user_header_t, header, const cap_user_data_t, data)
+#include <sys/syscall.h>
 /* Gross HACK to avoid warnings - linux headers overlap glibc headers */
 #undef __NFDBITS
 #undef __FDMASK
@@ -508,6 +505,18 @@
 }
   
   #ifndef VSF_SYSDEP_HAVE_LIBCAP
+
+static int
+capset(struct __user_cap_header_struct *header,
+       const struct __user_cap_data_struct *data);
+
+static int
+capset(struct __user_cap_header_struct *header,
+       const struct __user_cap_data_struct *data)
+{
+  return syscall(__NR_capset, header, data);
+}
+
 static int
 do_checkcap(void)
 {