sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-20 22:50:26 +03:00
Code

mdssvc: fix long running backend queries

Browse Source 
If a query is still running in the backend and we have no results yet, returning
0 triggers a search termination by the client in latest macOS releases. macOS
returns 0x23 in this case.

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

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit 925fefae20e52a3c89a56bdd0cd5b98cc951db5f)
This commit is contained in:
Ralph Boehme 2023-03-23 16:39:11 +01:00 committed by Jule Anger
parent 9d97cd0164
commit 19f10cb9d7
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source3/rpc_server/mdssvc/mdssvc.c
View File

@ -306,10 +306,21 @@ static bool create_result_handle(struct sl_query *slq)
static bool add_results(sl_array_t *array, struct sl_query *slq)
{
sl_filemeta_t *fm;
uint64_t status = 0;
uint64_t status;
int result;
bool ok;
/*
* Taken from a network trace against a macOS SMB Spotlight server. If
* the first fetch-query-results has no results yet because the search
* is still running, macOS returns 0x23, otherwise 0x0.
*/
if (slq->state >= SLQ_STATE_RESULTS ) {
status = 0;
} else {
status = 0x23;
}
/* FileMeta */
fm = dalloc_zero(array, sl_filemeta_t);
if (fm == NULL) {