mirror of
https://git.freebsd.org/ports.git
synced 2025-06-30 09:00:33 -04:00
74538b648b
Submitted by: Reviewed by: Approved by: Obtained from: MFC after: Security: Major enhancements in Samba 3.3.10 include: o Fix changing of ACLs on writable file with "dos filemode=yes" (bug #5202). o Fix smbd crashes in dns_register_smbd_reply (bug #6696). o Fix Winbind crashes when queried from nss (bug #6889). o Fix Winbind crash when retrieving empty group members (bug #7014). o Fix interdomain trusts with Win2008R2 (bug #6697).
64 lines
1.9 KiB
C
64 lines
1.9 KiB
C
--- ./smbd/statvfs.c.orig 2010-01-14 10:12:10.000000000 +0000
|
|
+++ ./smbd/statvfs.c 2010-02-05 00:27:01.000000000 +0000
|
|
@@ -3,6 +3,7 @@
|
|
VFS API's statvfs abstraction
|
|
Copyright (C) Alexander Bokovoy 2005
|
|
Copyright (C) Steve French 2005
|
|
+ Copyright (C) Timur I. Bakeyev 2005
|
|
Copyright (C) James Peach 2006
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
@@ -47,9 +48,42 @@
|
|
}
|
|
return result;
|
|
}
|
|
-#endif
|
|
+#elif defined(FREEBSD)
|
|
+static int bsd_statvfs(const char *path, vfs_statvfs_struct *statbuf)
|
|
+{
|
|
+ struct statfs statfs_buf;
|
|
+ int result;
|
|
|
|
-#if defined(DARWINOS)
|
|
+ result = statfs(path, &statfs_buf);
|
|
+ if(result != 0) {
|
|
+ return result;
|
|
+ }
|
|
+
|
|
+ statbuf->OptimalTransferSize = statfs_buf.f_iosize;
|
|
+ statbuf->BlockSize = statfs_buf.f_bsize;
|
|
+ statbuf->TotalBlocks = statfs_buf.f_blocks;
|
|
+ statbuf->BlocksAvail = statfs_buf.f_bfree;
|
|
+ statbuf->UserBlocksAvail = statfs_buf.f_bavail;
|
|
+ statbuf->TotalFileNodes = statfs_buf.f_files;
|
|
+ statbuf->FreeFileNodes = statfs_buf.f_ffree;
|
|
+ statbuf->FsIdentifier =
|
|
+ (((SMB_BIG_UINT)statfs_buf.f_fsid.val[0]<<32) & 0xffffffff00000000LL) | (SMB_BIG_UINT)statfs_buf.f_fsid.val[1];
|
|
+ /* Try to extrapolate some of the fs flags into the
|
|
+ * capabilities
|
|
+ */
|
|
+ statbuf->FsCapabilities =
|
|
+ FILE_CASE_SENSITIVE_SEARCH | FILE_CASE_PRESERVED_NAMES;
|
|
+ if(statfs_buf.f_flags & MNT_ACLS)
|
|
+ statbuf->FsCapabilities |= FILE_PERSISTENT_ACLS;
|
|
+ if(statfs_buf.f_flags & MNT_QUOTA)
|
|
+ statbuf->FsCapabilities |= FILE_VOLUME_QUOTAS;
|
|
+ if(statfs_buf.f_flags & MNT_RDONLY)
|
|
+ statbuf->FsCapabilities |= FILE_READ_ONLY_VOLUME;
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+#elif defined(DARWINOS)
|
|
|
|
#include <sys/attr.h>
|
|
|
|
@@ -135,6 +169,8 @@
|
|
{
|
|
#if defined(LINUX) && defined(HAVE_FSID_INT)
|
|
return linux_statvfs(path, statbuf);
|
|
+#elif defined(FREEBSD)
|
|
+ return bsd_statvfs(path, statbuf);
|
|
#elif defined(DARWINOS)
|
|
return darwin_statvfs(path, statbuf);
|
|
#else
|