selftest/Samba4: make use of get_cmd_env_vars() to setup all relevant env variables

[samba.git] / source3 / modules / vfs_default_quota.c

diff --git a/source3/modules/vfs_default_quota.c b/source3/modules/vfs_default_quota.c
index 7b9b0c8470541ee609967a2bada548f9b14c6290..326eb8c8f0a79345be6d088fc17ecff3fe1a7908 100644 (file)
--- a/source3/modules/vfs_default_quota.c
+++ b/source3/modules/vfs_default_quota.c
@@ -92,11 +92,16 @@
 #define DEFAULT_QUOTA_GID_NOLIMIT(handle) \
        lp_parm_bool(SNUM((handle)->conn),DEFAULT_QUOTA_NAME,"gid nolimit",DEFAULT_QUOTA_GID_NOLIMIT_DEFAULT)
 
-static int default_quota_get_quota(vfs_handle_struct *handle, enum SMB_QUOTA_TYPE qtype, unid_t id, SMB_DISK_QUOTA *dq)
+static int default_quota_get_quota(vfs_handle_struct *handle,
+                               const struct smb_filename *smb_fname,
+                               enum SMB_QUOTA_TYPE qtype,
+                               unid_t id,
+                               SMB_DISK_QUOTA *dq)
 {
        int ret = -1;
 
-       if ((ret=SMB_VFS_NEXT_GET_QUOTA(handle, qtype, id, dq))!=0) {
+       if ((ret = SMB_VFS_NEXT_GET_QUOTA(handle, smb_fname,
+                               qtype, id, dq)) != 0) {
                return ret;
        }
 
@@ -120,9 +125,10 @@ static int default_quota_get_quota(vfs_handle_struct *handle, enum SMB_QUOTA_TYP
                case SMB_USER_FS_QUOTA_TYPE:
                        {
                                unid_t qid;
-                               uint32 qflags = dq->qflags;
+                               uint32_t qflags = dq->qflags;
                                qid.uid = DEFAULT_QUOTA_UID(handle);
-                               SMB_VFS_NEXT_GET_QUOTA(handle, SMB_USER_QUOTA_TYPE, qid, dq);
+                               SMB_VFS_NEXT_GET_QUOTA(handle, smb_fname,
+                                       SMB_USER_QUOTA_TYPE, qid, dq);
                                dq->qflags = qflags;
                        }
                        break;
@@ -130,9 +136,11 @@ static int default_quota_get_quota(vfs_handle_struct *handle, enum SMB_QUOTA_TYP
                case SMB_GROUP_FS_QUOTA_TYPE:
                        {
                                unid_t qid;
-                               uint32 qflags = dq->qflags;
+                               uint32_t qflags = dq->qflags;
                                qid.gid = DEFAULT_QUOTA_GID(handle);
-                               SMB_VFS_NEXT_GET_QUOTA(handle, SMB_GROUP_QUOTA_TYPE, qid, dq);
+                               SMB_VFS_NEXT_GET_QUOTA(handle, smb_fname,
+                                                      SMB_GROUP_QUOTA_TYPE,
+                                                      qid, dq);
                                dq->qflags = qflags;
                        }
                        break;
@@ -220,8 +228,8 @@ static struct vfs_fn_pointers vfs_default_quota_fns = {
        .set_quota_fn = default_quota_set_quota
 };
 
-NTSTATUS vfs_default_quota_init(void);
-NTSTATUS vfs_default_quota_init(void)
+static_decl_vfs;
+NTSTATUS vfs_default_quota_init(TALLOC_CTX *ctx)
 {
        return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, DEFAULT_QUOTA_NAME,
                                &vfs_default_quota_fns);