sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-10 12:58:35 +03:00
Code

Don't return DOS error on SMBsearch return if using NT error codes (NT1

Browse Source 
protocol level). Fix for Samba4 tester.
Jeremy.
(This used to be commit 74486ab9efbb555f830b0e5d1c88f7bf065ae039)
This commit is contained in:
Jeremy Allison 2003-08-19 01:02:41 +00:00
parent c236ac83c8
commit e83a8a40c8
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source3/smbd/reply.c
View File

@ -768,21 +768,23 @@ int reply_search(connection_struct *conn, char *inbuf,char *outbuf, int dum_size
SearchEmpty:
if (numentries == 0 || !ok) {
SCVAL(outbuf,smb_rcls,ERRDOS);
SSVAL(outbuf,smb_err,ERRnofiles);
dptr_close(&dptr_num);
}
/* If we were called as SMBffirst with smb_search_id == NULL
and no entries were found then return error and close dirptr
(X/Open spec) */
if(ok && expect_close && numentries == 0 && status_len == 0) {
SCVAL(outbuf,smb_rcls,ERRDOS);
SSVAL(outbuf,smb_err,ERRnofiles);
if (Protocol < PROTOCOL_NT1) {
SCVAL(outbuf,smb_rcls,ERRDOS);
SSVAL(outbuf,smb_err,ERRnofiles);
}
/* Also close the dptr - we know it's gone */
dptr_close(&dptr_num);
} else if (numentries == 0 || !ok) {
if (Protocol < PROTOCOL_NT1) {
SCVAL(outbuf,smb_rcls,ERRDOS);
SSVAL(outbuf,smb_err,ERRnofiles);
}
dptr_close(&dptr_num);
}
/* If we were called as SMBfunique, then we can close the dirptr now ! */