Changeset 989 for vendor/current/source3/smbd/dfree.c

Timestamp:

Nov 25, 2016, 8:04:54 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.7

File:

• vendor/current/source3/smbd/dfree.c (modified) (6 diffs)

vendor/current/source3/smbd/dfree.c

@@ -50 +50 @@
 ****************************************************************************/
 
-uint64_t sys_disk_free(connection_struct *conn, const char *path,
+uint64_t sys_disk_free(connection_struct *conn, struct smb_filename *fname,
                        uint64_t *bsize, uint64_t *dfree, uint64_t *dsize)
 {
@@ -59 +59 @@
         const char *dfree_command;
         static bool dfree_broken = false;
+        const char *path = fname->base_name;
 
         (*dfree) = (*dsize) = 0;
@@ -124 +125 @@
         }
 
-        if (disk_quotas(conn, path, &bsize_q, &dfree_q, &dsize_q)) {
+        if (disk_quotas(conn, fname, &bsize_q, &dfree_q, &dsize_q)) {
                 uint64_t min_bsize = MIN(*bsize, bsize_q);
 
@@ -168 +169 @@
 ****************************************************************************/
 
-uint64_t get_dfree_info(connection_struct *conn,
-                        const char *path,
-                        uint64_t *bsize,
-                        uint64_t *dfree,
-                        uint64_t *dsize)
+uint64_t get_dfree_info(connection_struct *conn, struct smb_filename *fname,
+                        uint64_t *bsize, uint64_t *dfree, uint64_t *dsize)
 {
         int dfree_cache_time = lp_dfree_cache_time(SNUM(conn));
@@ -179 +177 @@
 
         if (!dfree_cache_time) {
-                return sys_disk_free(conn, path, bsize, dfree, dsize);
+                return sys_disk_free(conn, fname, bsize, dfree, dsize);
         }
 
@@ -190 +188 @@
         }
 
-        dfree_ret = sys_disk_free(conn, path, bsize, dfree, dsize);
+        dfree_ret = sys_disk_free(conn, fname, bsize, dfree, dsize);
 
         if (dfree_ret == (uint64_t)-1) {