r20873: Some correctness fixes w.r.t. Samba4 torture BASE-DELETE.

Allow us to correctly refuse to set delete on close on a
non-empty directory. There are still some delete-on-close
wrinkles to be fixed, but I understand how to do that better
now. I'll fix this tomorrow.
Jeremy.

1 files changed, 10 insertions, 1 deletions

diff --git a/source/smbd/reply.c b/source/smbd/reply.c
index 4d139be98f4..2075939f5b8 100644
--- a/source/smbd/reply.c
+++ b/source/smbd/reply.c
@@ -1013,10 +1013,19 @@ int reply_search(connection_struct *conn, char *inbuf,char *outbuf, int dum_size
 	p = smb_buf(outbuf) + 3;
      
 	if (status_len == 0) {
-		nt_status = dptr_create(conn,directory,True,expect_close,SVAL(inbuf,smb_pid), mask, mask_contains_wcard, dirtype,&dptr_num);
+		nt_status = dptr_create(conn,
+					directory,
+					True,
+					expect_close,
+					SVAL(inbuf,smb_pid),
+					mask,
+					mask_contains_wcard,
+					dirtype,
+					&conn->dirptr);
 		if (!NT_STATUS_IS_OK(nt_status)) {
 			return ERROR_NT(nt_status);
 		}
+		dptr_num = dptr_dnum(conn->dirptr);
 	} else {
 		dirtype = dptr_attr(dptr_num);
 	}