The branch, master has been updated
via d28282c xfs quotas - fix case of no quota for user
via 2c03d00 nt-quotas: fixup failure case for
TRANSACT_GET_USER_QUOTA_FOR_SID
from f198abc Provide fallback code for non-portable clearenv(3)
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit d28282ce573380f230bd683e655bfc77d358a706
Author: Uri Simchoni <u...@samba.org>
Date: Wed Apr 27 23:21:51 2016 +0300
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 <u...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
Autobuild-User(master): Jeremy Allison <j...@samba.org>
Autobuild-Date(master): Fri Apr 29 05:39:14 CEST 2016 on sn-devel-144
commit 2c03d004f8ef36fb10e879580999ebb70d440d43
Author: Uri Simchoni <u...@samba.org>
Date: Wed Apr 27 23:21:20 2016 +0300
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 <u...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
source3/lib/sysquotas_xfs.c | 2 ++
source3/smbd/nttrans.c | 1 +
2 files changed, 3 insertions(+)
Changeset truncated at 500 lines:
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:
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 */
--
Samba Shared Repository
