Attachment 2222 Details for Bug 4233 – Proposed fix

[patch] Proposed fix

16837.diff (text/plain), 1.39 KB, created by Volker Lendecke on 2006-11-17 02:15:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Volker Lendecke

Created: 2006-11-17 02:15:16 UTC

Size: 1.39 KB

patch

obsolete

>Index: source/smbd/statvfs.c
>===================================================================
>--- source/smbd/statvfs.c	(Revision 16836)
>+++ source/smbd/statvfs.c	(Revision 16837)
>@@ -21,7 +21,7 @@
> 
> #include "includes.h"
> 
>-#if defined(LINUX)
>+#if defined(LINUX) && defined(HAVE_FSID_INT)
> static int linux_statvfs(const char *path, vfs_statvfs_struct *statbuf)
> {
> 	struct statvfs statvfs_buf;
>@@ -51,7 +51,7 @@
> */
> int sys_statvfs(const char *path, vfs_statvfs_struct *statbuf)
> {
>-#if defined(LINUX)
>+#if defined(LINUX) && defined(HAVE_FSID_INT)
> 	return linux_statvfs(path, statbuf);
> #else
> 	/* BB change this to return invalid level */
>Index: source/configure.in
>===================================================================
>--- source/configure.in	(Revision 16836)
>+++ source/configure.in	(Revision 16837)
>@@ -4579,6 +4579,16 @@
>   fi
> fi
> 
>+# smbd/statvfs.c assumes that statvfs.f_fsid is an integer.
>+# This is not the case on ancient Linux systems.
>+
>+AC_CACHE_CHECK([that statvfs.f_fsid is an integer],samba_cv_fsid_int, [
>+    AC_TRY_COMPILE([#include <sys/statvfs.h>],[struct statvfs buf; buf.f_fsid = 0],
>+	samba_cv_fsid_int=yes,samba_cv_fsid_int=no)])
>+if test x"$samba_cv_fsid_int" = x"yes"; then
>+    AC_DEFINE(HAVE_FSID_INT, 1, [Whether statvfs.f_fsid is an integer])
>+fi
>+
> if test $space = no; then
>   # DEC Alpha running OSF/1
>   AC_MSG_CHECKING([for 3-argument statfs function (DEC OSF/1)])

Actions: View

Attachments on bug 4233: 2222