[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  4d1f043... Don't return a potentially uninitialized NT_STATUS. We can now see user lists in Windows ACLs.
       via  33256e4... Add debug statements so I can track the flow of RPC data.
      from  f56d900... s3-lanman: use spoolss for api_WPrintDestGetInfo() and api_WPrintDestEnum().

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 4d1f0436bd4f63887173473541efa205fb98210f
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Apr 27 17:09:40 2010 -0700

    Don't return a potentially uninitialized NT_STATUS. We can now see user lists in Windows ACLs.
    
    Jeremy.

commit 33256e41e1ed7a4a2caeef2f0cf26d0abb9032ca
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Apr 27 17:07:44 2010 -0700

    Add debug statements so I can track the flow of RPC data.
    
    Jeremy.

-----------------------------------------------------------------------

Summary of changes:
 source3/smbd/smb2_ioctl.c |   31 ++++++++++++++++++++++++++++---
 1 files changed, 28 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/smb2_ioctl.c b/source3/smbd/smb2_ioctl.c
index 0041e5f..c7775b4 100644
--- a/source3/smbd/smb2_ioctl.c
+++ b/source3/smbd/smb2_ioctl.c
@@ -127,6 +127,12 @@ static void smbd_smb2_request_ioctl_done(struct tevent_req *subreq)
 	NTSTATUS error; /* transport error */
 
 	status = smbd_smb2_ioctl_recv(subreq, req, &out_output_buffer);
+
+	DEBUG(10,("smbd_smb2_request_ioctl_done: smbd_smb2_ioctl_recv returned "
+		"%u status %s\n",
+		(unsigned int)out_output_buffer.length,
+		nt_errstr(status) ));
+
 	TALLOC_FREE(subreq);
 	if (NT_STATUS_EQUAL(status, STATUS_BUFFER_OVERFLOW)) {
 		/* also ok */
@@ -353,6 +359,9 @@ static struct tevent_req *smbd_smb2_ioctl_send(TALLOC_CTX *mem_ctx,
 			return tevent_req_post(req, ev);
 		}
 
+		DEBUG(10,("smbd_smb2_ioctl_send: np_write_send of size %u\n",
+			(unsigned int)in_input.length ));
+
 		subreq = np_write_send(state, ev,
 				       fsp->fake_file_handle,
 				       in_input.data,
@@ -388,6 +397,10 @@ static void smbd_smb2_ioctl_pipe_write_done(struct tevent_req *subreq)
 	ssize_t nwritten = -1;
 
 	status = np_write_recv(subreq, &nwritten);
+
+	DEBUG(10,("smbd_smb2_ioctl_pipe_write_done: received %ld\n",
+		(long int)nwritten ));
+
 	TALLOC_FREE(subreq);
 	if (!NT_STATUS_IS_OK(status)) {
 		tevent_req_nterror(req, status);
@@ -405,6 +418,11 @@ static void smbd_smb2_ioctl_pipe_write_done(struct tevent_req *subreq)
 		return;
 	}
 
+	DEBUG(10,("smbd_smb2_ioctl_pipe_write_done: issuing np_read_send "
+		"of size %u\n",
+		(unsigned int)state->out_output.length ));
+
+	TALLOC_FREE(subreq);
 	subreq = np_read_send(state->smbreq->conn,
 			      state->smb2req->sconn->smb2.event_ctx,
 			      state->fsp->fake_file_handle,
@@ -423,10 +441,17 @@ static void smbd_smb2_ioctl_pipe_read_done(struct tevent_req *subreq)
 	struct smbd_smb2_ioctl_state *state = tevent_req_data(req,
 					      struct smbd_smb2_ioctl_state);
 	NTSTATUS status;
-	ssize_t nread;
-	bool is_data_outstanding;
+	ssize_t nread = -1;
+	bool is_data_outstanding = false;
 
 	status = np_read_recv(subreq, &nread, &is_data_outstanding);
+
+	DEBUG(10,("smbd_smb2_ioctl_pipe_read_done: np_read_recv nread = %d "
+		 "is_data_outstanding = %d, status = %s\n",
+		(int)nread,
+		(int)is_data_outstanding,
+		nt_errstr(status) ));
+
 	TALLOC_FREE(subreq);
 	if (!NT_STATUS_IS_OK(status)) {
 		tevent_req_nterror(req, status);
@@ -442,7 +467,7 @@ static NTSTATUS smbd_smb2_ioctl_recv(struct tevent_req *req,
 				     TALLOC_CTX *mem_ctx,
 				     DATA_BLOB *out_output)
 {
-	NTSTATUS status;
+	NTSTATUS status = NT_STATUS_OK;
 	struct smbd_smb2_ioctl_state *state = tevent_req_data(req,
 					      struct smbd_smb2_ioctl_state);
 


-- 
Samba Shared Repository