[PATCHES] Two fixup to recent quota-related commits
Jeremy Allison
jra at samba.org
Fri Apr 29 00:10:40 UTC 2016
On Thu, Apr 28, 2016 at 10:03:32AM +0300, Uri Simchoni wrote:
> Hi,
>
> Attached pls find two fixes to recent quota-related commits that I've
> submitted recently. Those commits were re-factoring commits that landed
> only in master.
>
> Review & push appreciated.
LGTM. Pushed - thanks !
> From 1be64d86d5f6e07188d833f038b09b021d53d93e Mon Sep 17 00:00:00 2001
> From: Uri Simchoni <uri at samba.org>
> Date: Wed, 27 Apr 2016 23:21:20 +0300
> Subject: [PATCH 1/2] nt-quotas: fixup failure case for
> TRANSACT_GET_USER_QUOTA_FOR_SID
>
> Fixup commit 0e01ed06a40146d145ffe439a65fb9035ab7b1cf
> Add a missing return statement after generating error response to
> the request.
>
> Signed-off-by: Uri Simchoni <uri at samba.org>
> ---
> source3/smbd/nttrans.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
> index fa3f74c..05f3cae 100644
> --- a/source3/smbd/nttrans.c
> +++ b/source3/smbd/nttrans.c
> @@ -2513,6 +2513,7 @@ static void call_nt_transact_get_user_quota(connection_struct *conn,
> &sid, &qt);
> if (!NT_STATUS_IS_OK(nt_status)) {
> reply_nterror(req, nt_status);
> + return;
> }
>
> /* Realloc the size of parameters and data we will return */
> --
> 2.5.5
>
>
> From 684572782c51edbb1493a3834809dd2ecaf0347f Mon Sep 17 00:00:00 2001
> From: Uri Simchoni <uri at samba.org>
> Date: Wed, 27 Apr 2016 23:21:51 +0300
> Subject: [PATCH 2/2] xfs quotas - fix case of no quota for user
>
> Fixup commit ce82f66b9fdc611124f7284e32e44ed3df2d7295
> Add missing success return value when user has no quota record
> (this is considered success with no quota)
>
> Signed-off-by: Uri Simchoni <uri at samba.org>
> ---
> source3/lib/sysquotas_xfs.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/source3/lib/sysquotas_xfs.c b/source3/lib/sysquotas_xfs.c
> index bea86d5..8db52bd 100644
> --- a/source3/lib/sysquotas_xfs.c
> +++ b/source3/lib/sysquotas_xfs.c
> @@ -98,6 +98,8 @@ int sys_get_xfs_quota(const char *path, const char *bdev, enum SMB_QUOTA_TYPE qt
> if (ret != 0 && errno != ENOENT) {
> return ret;
> }
> +
> + ret = 0;
> break;
> #ifdef HAVE_GROUP_QUOTA
> case SMB_GROUP_QUOTA_TYPE:
> --
> 2.5.5
>
More information about the samba-technical
mailing list