Attachment 14404 Details for Bug 13563 – backport of patch to 4.9

[patch] backport of patch to 4.9

patch-13563-4.9.patch (text/plain), 1.86 KB, created by Noel Power on 2018-08-09 11:37:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Noel Power

Created: 2018-08-09 11:37:38 UTC

Size: 1.86 KB

patch

obsolete

>From 68a1e2959b517a665da3d7a1784e1c6b40e3375e Mon Sep 17 00:00:00 2001
>From: Noel Power <noel.power@suse.com>
>Date: Tue, 7 Aug 2018 11:06:34 +0100
>Subject: [PATCH] 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 <noel.power@suse.com>
>---
> source3/smbd/smb2_getinfo.c | 5 +++++
> source3/smbd/smb2_setinfo.c | 5 +++++
> 2 files changed, 10 insertions(+)
>
>diff --git a/source3/smbd/smb2_getinfo.c b/source3/smbd/smb2_getinfo.c
>index 05c57db902d..7bded422520 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 819d9d658bd..cfd1d1ea3e5 100644
>--- a/source3/smbd/smb2_setinfo.c
>+++ b/source3/smbd/smb2_setinfo.c
>@@ -567,6 +567,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;
>@@ -599,6 +600,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);
>-- 
>2.13.7
>

Flags:

jra: review+

Actions: View

Attachments on bug 13563: 14399 | 14403 | 14404