SliTaz Repositories

     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/busybox/stuff/busybox-1.21-nfs-segfault.u	Wed Oct 30 18:29:11 2013 +0100
     1.3 @@ -0,0 +1,39 @@
     1.4 +--- a/util-linux/mount.c
     1.5 ++++ b/util-linux/mount.c
     1.6 +@@ -334,9 +334,6 @@
     1.7 + 
     1.8 + 
     1.9 + struct globals {
    1.10 +-#if ENABLE_FEATURE_MOUNT_NFS
    1.11 +-	smalluint nfs_mount_version;
    1.12 +-#endif
    1.13 + #if ENABLE_FEATURE_MOUNT_VERBOSE
    1.14 + 	unsigned verbose;
    1.15 + #endif
    1.16 +@@ -345,7 +342,7 @@
    1.17 + } FIX_ALIASING;
    1.18 + enum { GETMNTENT_BUFSIZE = COMMON_BUFSIZE - offsetof(struct globals, getmntent_buf) };
    1.19 + #define G (*(struct globals*)&bb_common_bufsiz1)
    1.20 +-#define nfs_mount_version (G.nfs_mount_version)
    1.21 ++#define nfs_mount_version 4 /* assume kernel>= 2.4, use v4 nfs mount protocol */
    1.22 + #if ENABLE_FEATURE_MOUNT_VERBOSE
    1.23 + #define verbose           (G.verbose          )
    1.24 + #else
    1.25 +@@ -993,7 +990,8 @@
    1.26 + static void
    1.27 + find_kernel_nfs_mount_version(void)
    1.28 + {
    1.29 +-	int kernel_version;
    1.30 ++#if 0
    1.31 ++		int kernel_version;
    1.32 + 
    1.33 + 	if (nfs_mount_version)
    1.34 + 		return;
    1.35 +@@ -1006,6 +1004,7 @@
    1.36 + 			nfs_mount_version = 3;
    1.37 + 		/* else v4 since 2.3.99pre4 */
    1.38 + 	}
    1.39 ++#endif	
    1.40 + }
    1.41 + 
    1.42 + static void