The branch, master has been updated
via 9c13125 s3/smbd: Ensure quota code is only called when quota
support detected
from 8479401 lib: Add support to parse MS Catalog files
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 9c13125467b03d3a5a862654c2bacacd1e32578d
Author: Noel Power <[email protected]>
Date: Tue Aug 7 11:06:34 2018 +0100
s3/smbd: Ensure quota code is only called when quota support detected
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13563
Signed-off-by: Noel Power <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
Autobuild-User(master): Jeremy Allison <[email protected]>
Autobuild-Date(master): Fri Aug 10 02:43:33 CEST 2018 on sn-devel-144
-----------------------------------------------------------------------
Summary of changes:
source3/smbd/smb2_getinfo.c | 5 +++++
source3/smbd/smb2_setinfo.c | 5 +++++
2 files changed, 10 insertions(+)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/smb2_getinfo.c b/source3/smbd/smb2_getinfo.c
index 05c57db..7bded42 100644
--- a/source3/smbd/smb2_getinfo.c
+++ b/source3/smbd/smb2_getinfo.c
@@ -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:
diff --git a/source3/smbd/smb2_setinfo.c b/source3/smbd/smb2_setinfo.c
index 7ed2423..9b4620a 100644
--- a/source3/smbd/smb2_setinfo.c
+++ b/source3/smbd/smb2_setinfo.c
@@ -556,6 +556,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;
@@ -588,6 +589,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);
--
Samba Shared Repository
