Changeset 989 for vendor/current/source3/smbd/quotas.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/quotas.c (modified) (7 diffs)

vendor/current/source3/smbd/quotas.c

@@ -237 +237 @@
 ****************************************************************************/
 
-bool disk_quotas(connection_struct *conn, const char *path, uint64_t *bsize,
-                 uint64_t *dfree, uint64_t *dsize)
+bool disk_quotas(connection_struct *conn, struct smb_filename *fname,
+                 uint64_t *bsize, uint64_t *dfree, uint64_t *dsize)
 {
         uid_t euser_id;
@@ -255 +255 @@
         SMB_DEV_T devno;
         bool found = false;
+        const char *path = fname->base_name;
 
         euser_id = geteuid();
 
-        if (sys_stat(path, &sbuf, false) == -1) {
-                return false;
-        }
-
-        devno = sbuf.st_ex_dev ;
+        devno = fname->st.st_ex_dev;
         DEBUG(5,("disk_quotas: looking for path \"%s\" devno=%x\n",
                 path, (unsigned int)devno));
@@ -427 +424 @@
 ****************************************************************************/
 
-bool disk_quotas(connection_struct *conn, const char *path, uint64_t *bsize,
-                 uint64_t *dfree, uint64_t *dsize)
+bool disk_quotas(connection_struct *conn, struct smb_filename *fname,
+                 uint64_t *bsize, uint64_t *dfree, uint64_t *dsize)
 {
   int r;
   struct dqblk D;
   uid_t euser_id;
+  const char *path = fname->base_name;
 #if !defined(AIX)
   char dev_disk[256];
-  SMB_STRUCT_STAT S;
+  SMB_STRUCT_STAT S = fname->st;
 
   /* find the block device file */
@@ -658 +656 @@
 #else /* WITH_QUOTAS */
 
-bool disk_quotas(connection_struct *conn, const char *path, uint64_t *bsize,
-                 uint64_t *dfree, uint64_t *dsize)
+bool disk_quotas(connection_struct *conn, struct smb_filename *fname,
+                 uint64_t *bsize, uint64_t *dfree, uint64_t *dsize)
 {
         (*bsize) = 512; /* This value should be ignored */
@@ -677 +675 @@
    this file should be removed later
    */
-bool disk_quotas(connection_struct *conn, const char *path, uint64_t *bsize,
-                 uint64_t *dfree, uint64_t *dsize)
+bool disk_quotas(connection_struct *conn, struct smb_filename *fname,
+                 uint64_t *bsize, uint64_t *dfree, uint64_t *dsize)
 {
         int r;
@@ -684 +682 @@
         unid_t id;
 
+        /*
+         * First of all, check whether user quota is
+         * enforced. If the call fails, assume it is
+         * not enforced.
+         */
+        ZERO_STRUCT(D);
+        id.uid = -1;
+        r = SMB_VFS_GET_QUOTA(conn, fname->base_name, SMB_USER_FS_QUOTA_TYPE,
+                              id, &D);
+        if (r == -1 && errno != ENOSYS) {
+                goto try_group_quota;
+        }
+        if (r == 0 && (D.qflags & QUOTAS_DENY_DISK) == 0) {
+                goto try_group_quota;
+        }
+
+        ZERO_STRUCT(D);
         id.uid = geteuid();
 
-        ZERO_STRUCT(D);
-        r = SMB_VFS_GET_QUOTA(conn, path, SMB_USER_QUOTA_TYPE, id, &D);
+        /* if new files created under this folder get this
+         * folder's UID, then available space is governed by
+         * the quota of the folder's UID, not the creating user.
+         */
+        if (lp_inherit_owner(SNUM(conn)) &&
+            id.uid != fname->st.st_ex_uid && id.uid != sec_initial_uid()) {
+                int save_errno;
+
+                id.uid = fname->st.st_ex_uid;
+                become_root();
+                r = SMB_VFS_GET_QUOTA(conn, fname->base_name,
+                                      SMB_USER_QUOTA_TYPE, id, &D);
+                save_errno = errno;
+                unbecome_root();
+                errno = save_errno;
+        } else {
+                r = SMB_VFS_GET_QUOTA(conn, fname->base_name,
+                                      SMB_USER_QUOTA_TYPE, id, &D);
+        }
 
         /* Use softlimit to determine disk space, except when it has been exceeded */
@@ -723 +755 @@
         
 try_group_quota:
+        /*
+         * First of all, check whether group quota is
+         * enforced. If the call fails, assume it is
+         * not enforced.
+         */
+        ZERO_STRUCT(D);
+        id.gid = -1;
+        r = SMB_VFS_GET_QUOTA(conn, fname->base_name, SMB_GROUP_FS_QUOTA_TYPE,
+                              id, &D);
+        if (r == -1 && errno != ENOSYS) {
+                return false;
+        }
+        if (r == 0 && (D.qflags & QUOTAS_DENY_DISK) == 0) {
+                return false;
+        }
+
         id.gid = getegid();
 
         ZERO_STRUCT(D);
-        r = SMB_VFS_GET_QUOTA(conn, path, SMB_GROUP_QUOTA_TYPE, id, &D);
+        r = SMB_VFS_GET_QUOTA(conn, fname->base_name, SMB_GROUP_QUOTA_TYPE, id,
+                              &D);
 
         /* Use softlimit to determine disk space, except when it has been exceeded */