afs: pioctl kernel memory overrun

[openafs.git] / acinclude.m4

diff --git a/acinclude.m4 b/acinclude.m4
index 84199ff..3f0d297 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -76,9 +76,6 @@ AC_ARG_WITH([afs-sysname],
 ])
 
 dnl General feature options.
-AC_ARG_ENABLE([gtx],
-    [AS_HELP_STRING([--disable-gtx], [disable gtx curses-based terminal tools])])
-
 AC_ARG_ENABLE([namei-fileserver],
     [AS_HELP_STRING([--enable-namei-fileserver],
        [force compilation of namei fileserver in preference to inode
@@ -800,6 +797,10 @@ else
                        if test "x${AFS_SYSKVERS}" = "x"; then
                         AC_MSG_ERROR(Couldn't guess your Linux version. Please use the --with-afs-sysname option to configure an AFS sysname.)
                        fi
+                       if test "x${AFS_SYSKVERS}" = "x24" ||
+                               test "x${AFS_SYSKVERS}" = "x22"; then
+                           AC_MSG_ERROR([Linux 2.4.x and older are no longer supported by OpenAFS.  Please use an OpenAFS 1.6.x release on those systems.])
+                       fi
                        _AFS_SYSNAME=`echo $AFS_SYSNAME|sed s/XX\$/$AFS_SYSKVERS/`
                        AFS_SYSNAME="$_AFS_SYSNAME"
                        AC_TRY_KBUILD(
@@ -862,12 +863,8 @@ case $AFS_SYSNAME in
     *_obsd52)   AFS_PARAM_COMMON=param.obsd52.h  ;;
     *_obsd53)   AFS_PARAM_COMMON=param.obsd53.h  ;;
     *_obsd54)   AFS_PARAM_COMMON=param.obsd54.h  ;;
-    *_linux22)  AFS_PARAM_COMMON=param.linux22.h ;;
-    *_linux24)  AFS_PARAM_COMMON=param.linux24.h ;;
     *_linux26)  AFS_PARAM_COMMON=param.linux26.h ;;
 # Linux alpha adds an extra underscore for no good reason.
-    *_linux_22) AFS_PARAM_COMMON=param.linux22.h ;;
-    *_linux_24) AFS_PARAM_COMMON=param.linux24.h ;;
     *_linux_26) AFS_PARAM_COMMON=param.linux26.h ;;
     *_fbsd_*)   AFS_PARAM_COMMON=param.generic_fbsd.h ;;
 esac
@@ -901,6 +898,16 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
                 LINUX_KBUILD_USES_EXTRA_CFLAGS
                 LINUX_KERNEL_COMPILE_WORKS
 
+                dnl Operation signature checks
+                AC_CHECK_LINUX_OPERATION([inode_operations], [follow_link], [no_nameidata],
+                                         [#include <linux/fs.h>],
+                                         [const char *],
+                                         [struct dentry *dentry, void **link_data])
+                AC_CHECK_LINUX_OPERATION([inode_operations], [put_link], [no_nameidata],
+                                         [#include <linux/fs.h>],
+                                         [void],
+                                         [struct inode *inode, void *link_data])
+
                 dnl Check for header files
                 AC_CHECK_LINUX_HEADER([config.h])
                 AC_CHECK_LINUX_HEADER([completion.h])
@@ -958,6 +965,7 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
                 AC_CHECK_LINUX_STRUCT([task_struct], [sigmask_lock], [sched.h])
                 AC_CHECK_LINUX_STRUCT([task_struct], [tgid], [sched.h])
                 AC_CHECK_LINUX_STRUCT([task_struct], [thread_info], [sched.h])
+                AC_CHECK_LINUX_STRUCT([task_struct], [total_link_count], [sched.h])
                 LINUX_SCHED_STRUCT_TASK_STRUCT_HAS_SIGNAL_RLIM
 
                 dnl Check for typed structure elements
@@ -966,6 +974,9 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
 
                 dnl Function existence checks
 
+                AC_CHECK_LINUX_FUNC([__vfs_read],
+                                    [#include <linux/fs.h>],
+                                    [__vfs_read(NULL, NULL, 0, NULL);])
                  AC_CHECK_LINUX_FUNC([bdi_init],
                                     [#include <linux/backing-dev.h>],
                                     [bdi_init(NULL);])
@@ -1050,6 +1061,9 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
                 AC_CHECK_LINUX_FUNC([sock_create_kern],
                                     [#include <linux/net.h>],
                                     [sock_create_kern(0, 0, 0, NULL);])
+                AC_CHECK_LINUX_FUNC([sock_create_kern_ns],
+                                    [#include <linux/net.h>],
+                                    [sock_create_kern(NULL, 0, 0, 0, NULL);])
                 AC_CHECK_LINUX_FUNC([splice_direct_to_actor],
                                     [#include <linux/splice.h>],
                                     [splice_direct_to_actor(NULL,NULL,NULL);])
@@ -1428,6 +1442,7 @@ else
 fi
 AC_SUBST(XBSA_CFLAGS)
 AC_SUBST(XBSA_XLIBS) 
+XLIBS="$XBSA_XLIBS $XLIBS"
 
 dnl checks for header files.
 AC_HEADER_STDC
@@ -1536,17 +1551,6 @@ AC_CHECK_TYPES([fsblkcnt_t],,,[
 dnl see what struct stat has for timestamps
 AC_CHECK_MEMBERS([struct stat.st_ctimespec, struct stat.st_ctimensec])
 
-dnl check for curses-lib
-AS_IF([test "x$enable_gtx" != "xno"],
-      [save_LIBS=$LIBS
-      AC_CHECK_LIB( [ncurses], [setupterm],
-      [LIB_curses=-lncurses],
-        [AC_CHECK_LIB([Hcurses], [setupterm], [LIB_curses=-lHcurses],
-          [AC_CHECK_LIB([curses], [setupterm], [LIB_curses=-lcurses])])
-      ])
-      LIBS=$save_LIBS
-      AC_SUBST(LIB_curses)])
-       
 OPENAFS_TEST_PACKAGE(libintl,[#include <libintl.h>],[-lintl],,,INTL)
 
 if test "$enable_debug_locks" = yes; then
@@ -1610,6 +1614,7 @@ AC_CHECK_FUNCS([ \
 
 OPENAFS_ROKEN()
 OPENAFS_HCRYPTO()
+OPENAFS_CURSES()
 OPENAFS_C_ATTRIBUTE()
 
 dnl Functions that Heimdal's libroken provides, but that we