Changeset 480 for trunk/server/source3/modules

Timestamp:

Aug 2, 2010, 8:16:45 PM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: trunk update to 3.5.4

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/modules/vfs_full_audit.c (modified) (1 diff)
• source3/modules/vfs_scannedonly.c (modified) (1 diff)
• source3/modules/vfs_streams_xattr.c (modified) (3 diffs)

trunk/server/source3/modules/vfs_full_audit.c

@@ -1095 +1095 @@
                        files_struct *fsp, const SMB_STRUCT_STAT *sbuf)
 {
-        int result;
+        uint64_t result;
 
         result = SMB_VFS_NEXT_GET_ALLOC_SIZE(handle, fsp, sbuf);

trunk/server/source3/modules/vfs_scannedonly.c

@@ -54 +54 @@
 #define SENDBUFFERSIZE 1450
 
+#ifndef       SUN_LEN
+#define       SUN_LEN(sunp)   ((size_t)((struct sockaddr_un *)0)->sun_path \
+                                + strlen((sunp)->sun_path))
+#endif
+
+
 struct Tscannedonly {
         int socket;

trunk/server/source3/modules/vfs_streams_xattr.c

@@ -238 +238 @@
         sbuf->st_ex_mode &= ~S_IFMT;
         sbuf->st_ex_mode |= S_IFREG;
-        sbuf->st_ex_blocks = sbuf->st_ex_size % STAT_ST_BLOCKSIZE + 1;
+        sbuf->st_ex_blocks = sbuf->st_ex_size / STAT_ST_BLOCKSIZE + 1;
 
         return 0;
@@ -291 +291 @@
         smb_fname->st.st_ex_mode |= S_IFREG;
         smb_fname->st.st_ex_blocks =
-            smb_fname->st.st_ex_size % STAT_ST_BLOCKSIZE + 1;
+            smb_fname->st.st_ex_size / STAT_ST_BLOCKSIZE + 1;
 
         result = 0;
@@ -342 +342 @@
         smb_fname->st.st_ex_mode |= S_IFREG;
         smb_fname->st.st_ex_blocks =
-            smb_fname->st.st_ex_size % STAT_ST_BLOCKSIZE + 1;
+            smb_fname->st.st_ex_size / STAT_ST_BLOCKSIZE + 1;
 
         result = 0;