[SCM] Samba Shared Repository - branch master updated

Volker Lendecke vlendec at samba.org
Sat Apr 16 08:21:02 MDT 2011


The branch, master has been updated
       via  ca5dcf2 s3: guest sesssetup is only 13 words (cherry picked from commit 69650a2aaa8649570261df7efccb35ad76d7cfc1)
       via  35c7123 s3: Remove an unused variable
       via  10a552a s3: Use tevent_req_nterror properly in a few places
      from  9f9d183 Remove broken link.

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


- Log -----------------------------------------------------------------
commit ca5dcf241289fb3489bf9da9ea5dfd1de0a67fab
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Apr 2 23:53:27 2011 +0200

    s3: guest sesssetup is only 13 words
    (cherry picked from commit 69650a2aaa8649570261df7efccb35ad76d7cfc1)
    
    Autobuild-User: Volker Lendecke <vlendec at samba.org>
    Autobuild-Date: Sat Apr 16 16:20:08 CEST 2011 on sn-devel-104

commit 35c71231accaa2f24a70f4066b967fa4999428f1
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Apr 16 15:27:53 2011 +0200

    s3: Remove an unused variable

commit 10a552a9570bd274796639ba80d46d2d22828271
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Apr 2 16:02:23 2011 +0200

    s3: Use tevent_req_nterror properly in a few places

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

Summary of changes:
 source3/lib/tldap.c           |    3 ---
 source3/libsmb/cliconnect.c   |    2 +-
 source3/libsmb/clireadwrite.c |   18 ++++++------------
 3 files changed, 7 insertions(+), 16 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/tldap.c b/source3/lib/tldap.c
index 2f45a05..cd1dea5 100644
--- a/source3/lib/tldap.c
+++ b/source3/lib/tldap.c
@@ -558,7 +558,6 @@ static void tldap_msg_received(struct tevent_req *subreq)
 		subreq, struct tldap_context);
 	struct tevent_req *req;
 	struct tldap_msg_state *state;
-	struct tevent_context *ev;
 	struct asn1_data *data;
 	uint8_t *inbuf;
 	ssize_t received;
@@ -617,8 +616,6 @@ static void tldap_msg_received(struct tevent_req *subreq)
 	state->inbuf = talloc_move(state, &inbuf);
 	state->data = talloc_move(state, &data);
 
-	ev = state->ev;
-
 	talloc_set_destructor(req, NULL);
 	tldap_msg_unset_pending(req);
 	num_pending = talloc_array_length(ld->pending);
diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index aa9207f..e3d97b6 100644
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -169,7 +169,7 @@ static uint32 cli_session_setup_capabilities(struct cli_state *cli)
 
 struct cli_session_setup_guest_state {
 	struct cli_state *cli;
-	uint16_t vwv[16];
+	uint16_t vwv[13];
 	struct iovec bytes;
 };
 
diff --git a/source3/libsmb/clireadwrite.c b/source3/libsmb/clireadwrite.c
index 59f8ac3..e243f8a 100644
--- a/source3/libsmb/clireadwrite.c
+++ b/source3/libsmb/clireadwrite.c
@@ -148,8 +148,7 @@ struct tevent_req *cli_read_andx_send(TALLOC_CTX *mem_ctx,
 	}
 
 	status = cli_smb_req_send(subreq);
-	if (!NT_STATUS_IS_OK(status)) {
-		tevent_req_nterror(req, status);
+	if (tevent_req_nterror(req, status)) {
 		return tevent_req_post(req, ev);
 	}
 	return req;
@@ -282,8 +281,7 @@ static void cli_readall_done(struct tevent_req *subreq)
 	NTSTATUS status;
 
 	status = cli_read_andx_recv(subreq, &received, &buf);
-	if (!NT_STATUS_IS_OK(status)) {
-		tevent_req_nterror(req, status);
+	if (tevent_req_nterror(req, status)) {
 		return;
 	}
 
@@ -569,8 +567,7 @@ static void cli_pull_read_done(struct tevent_req *subreq)
 
 		status = state->sink((char *)top_subreq->buf,
 				     top_subreq->received, state->priv);
-		if (!NT_STATUS_IS_OK(status)) {
-			tevent_req_nterror(state->req, status);
+		if (tevent_req_nterror(state->req, status)) {
 			return;
 		}
 		state->pushed += top_subreq->received;
@@ -1013,8 +1010,7 @@ struct tevent_req *cli_write_andx_send(TALLOC_CTX *mem_ctx,
 	}
 
 	status = cli_smb_req_send(subreq);
-	if (!NT_STATUS_IS_OK(status)) {
-		tevent_req_nterror(req, status);
+	if (tevent_req_nterror(req, status)) {
 		return tevent_req_post(req, ev);
 	}
 	return req;
@@ -1114,8 +1110,7 @@ static void cli_writeall_written(struct tevent_req *subreq)
 
 	status = cli_write_andx_recv(subreq, &written);
 	TALLOC_FREE(subreq);
-	if (!NT_STATUS_IS_OK(status)) {
-		tevent_req_nterror(req, status);
+	if (tevent_req_nterror(req, status)) {
 		return;
 	}
 
@@ -1313,8 +1308,7 @@ static void cli_push_written(struct tevent_req *subreq)
 	status = cli_writeall_recv(subreq);
 	TALLOC_FREE(subreq);
 	TALLOC_FREE(substate);
-	if (!NT_STATUS_IS_OK(status)) {
-		tevent_req_nterror(req, status);
+	if (tevent_req_nterror(req, status)) {
 		return;
 	}
 


-- 
Samba Shared Repository


More information about the samba-cvs mailing list