sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

s3-cliquota: correctly handle no-more-entries

Browse Source 
When listing quota records, a Windows server would
return STATUS_SUCCESS until no more entries are available,
where it would return STATUS_NO_MORE_ENTRIES.

The fix keeps old behavior of empty answer also signifying
end of record, to maintain compatibility with Samba servers.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12270

Signed-off-by: Uri Simchoni <uri@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Uri Simchoni 2016-09-16 21:57:50 +03:00 committed by Jeremy Allison
parent 7c786f8982
commit 5a947d6ca1
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source3/libsmb/cliquota.c
View File

@ -242,13 +242,15 @@ NTSTATUS cli_list_user_quota(struct cli_state *cli, int quota_fnum,
&rparam, 0, &rparam_count,
&rdata, 0, &rdata_count);
if (!NT_STATUS_IS_OK(status)) {
if (!NT_STATUS_IS_OK(status) &&
!NT_STATUS_EQUAL(status, NT_STATUS_NO_MORE_ENTRIES)) {
DEBUG(1, ("NT_TRANSACT_GET_USER_QUOTA failed: %s\n",
nt_errstr(status)));
goto cleanup;
}
if (rdata_count == 0) {
if (NT_STATUS_EQUAL(status, NT_STATUS_NO_MORE_ENTRIES) ||
rdata_count == 0) {
*pqt_list = NULL;
return NT_STATUS_OK;
}
@ -304,13 +306,16 @@ NTSTATUS cli_list_user_quota(struct cli_state *cli, int quota_fnum,
&rparam, 0, &rparam_count,
&rdata, 0, &rdata_count);
if (!NT_STATUS_IS_OK(status)) {
if (!NT_STATUS_IS_OK(status) &&
!NT_STATUS_EQUAL(status, NT_STATUS_NO_MORE_ENTRIES)) {
DEBUG(1, ("NT_TRANSACT_GET_USER_QUOTA failed: %s\n",
nt_errstr(status)));
goto cleanup;
}
if (rdata_count == 0) {
if (NT_STATUS_EQUAL(status, NT_STATUS_NO_MORE_ENTRIES) ||
rdata_count == 0) {
status = NT_STATUS_OK;
break;
}