]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s3/smbd: Ensure quota code is only called when quota support detected
authorNoel Power <noel.power@suse.com>
Tue, 7 Aug 2018 10:06:34 +0000 (11:06 +0100)
committerKarolin Seeger <kseeger@samba.org>
Mon, 13 Aug 2018 15:25:22 +0000 (17:25 +0200)
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13563
Signed-off-by: Noel Power <noel.power@suse.com>
Autobuild-User(v4-8-test): Karolin Seeger <kseeger@samba.org>
Autobuild-Date(v4-8-test): Mon Aug 13 17:25:23 CEST 2018 on sn-devel-144

source3/smbd/smb2_getinfo.c
source3/smbd/smb2_setinfo.c

index 2b5bb0772fd64b40599227e9c51875af30c0586d..4f30a9710eb0dca70e6962a48a0cf907065018d2 100644 (file)
@@ -523,6 +523,7 @@ static struct tevent_req *smbd_smb2_getinfo_send(TALLOC_CTX *mem_ctx,
        }
 
        case SMB2_GETINFO_QUOTA: {
+#ifdef HAVE_SYS_QUOTAS
                struct smb2_query_quota_info info;
                enum ndr_err_code err;
                uint8_t *data = NULL;
@@ -602,6 +603,10 @@ static struct tevent_req *smbd_smb2_getinfo_send(TALLOC_CTX *mem_ctx,
                status  = NT_STATUS_OK;
                TALLOC_FREE(tmp_ctx);
                break;
+#else
+               tevent_req_nterror(req, NT_STATUS_NOT_SUPPORTED);
+               return tevent_req_post(req, ev);
+#endif
        }
 
        default:
index 610adcae714dd09aa94f52c7afff7373d1b32a71..b998455879729685714dc75e4a1a3c5ce9f98e2f 100644 (file)
@@ -572,6 +572,7 @@ static struct tevent_req *smbd_smb2_setinfo_send(TALLOC_CTX *mem_ctx,
 
        case 0x04:/* SMB2_SETINFO_QUOTA */
        {
+#ifdef HAVE_SYS_QUOTAS
                struct file_quota_information info = {0};
                SMB_NTQUOTA_STRUCT qt = {0};
                enum ndr_err_code err;
@@ -604,6 +605,10 @@ static struct tevent_req *smbd_smb2_setinfo_send(TALLOC_CTX *mem_ctx,
                }
                status = NT_STATUS_OK;
                break;
+#else
+               tevent_req_nterror(req, NT_STATUS_NOT_SUPPORTED);
+               return tevent_req_post(req, ev);
+#endif
        }
        default:
                tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);