[SCM] Samba Shared Repository - branch v3-6-test updated
Jeremy Allison
jra at samba.org
Mon Apr 18 12:23:13 MDT 2011
The branch, v3-6-test has been updated
via 7abd8b7 s3: Fix a typo
via 3eb3a4f s3: Remove an unused variable (cherry picked from commit 35c71231accaa2f24a70f4066b967fa4999428f1)
via 8894994 s3: Use tevent_req_nterror properly in a few places (cherry picked from commit 10a552a9570bd274796639ba80d46d2d22828271)
via 269af1a s3: guest sesssetup is only 13 words (cherry picked from commit 69650a2aaa8649570261df7efccb35ad76d7cfc1)
via 3038237 s3: Use
from e55baa4 Trying to track down the SMB2 error. Add an invariant test.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit 7abd8b7b865cab12504ea337c1bbd3c4ee9e0c05
Author: Volker Lendecke <vl at samba.org>
Date: Thu Apr 14 11:06:00 2011 +0200
s3: Fix a typo
Autobuild-User: Volker Lendecke <vlendec at samba.org>
Autobuild-Date: Thu Apr 14 11:55:56 CEST 2011 on sn-devel-104
(cherry picked from commit 15d6c7070770b3146c510996ab24afbdf8034ee8)
commit 3eb3a4f733b5a042f0ad5e0bcc59d2db011e7c73
Author: Volker Lendecke <vl at samba.org>
Date: Sat Apr 16 15:27:53 2011 +0200
s3: Remove an unused variable
(cherry picked from commit 35c71231accaa2f24a70f4066b967fa4999428f1)
commit 8894994b61dd8701806daae123bc615f5ee47390
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
(cherry picked from commit 10a552a9570bd274796639ba80d46d2d22828271)
commit 269af1a75eeb89f7fb9eb4eaa8291c9f8d58e108
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
(cherry picked from commit ca5dcf241289fb3489bf9da9ea5dfd1de0a67fab)
commit 3038237d1674013d523897c342e39b90c3ffe9cd
Author: Volker Lendecke <vl at samba.org>
Date: Sun Apr 17 11:32:28 2011 +0200
s3: Use \0 instead of NULL when 0-terminating a string
Autobuild-User: Volker Lendecke <vlendec at samba.org>
Autobuild-Date: Sun Apr 17 12:26:15 CEST 2011 on sn-devel-104
(cherry picked from commit 0bf7c9646413673e24cfea94eb74dce88f79c470)
-----------------------------------------------------------------------
Summary of changes:
.../examples/netdomjoin-gui/netdomjoin-gui.c | 2 +-
source3/lib/tldap.c | 3 ---
source3/libsmb/cliconnect.c | 2 +-
source3/libsmb/clireadwrite.c | 18 ++++++------------
source3/smbd/process.c | 2 +-
5 files changed, 9 insertions(+), 18 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c b/source3/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c
index 50c22d9..a2582a1 100644
--- a/source3/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c
+++ b/source3/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c
@@ -478,7 +478,7 @@ static void callback_do_hostname_change(GtkWidget *widget,
p = strchr(newname, '.');
if (p) {
- *p = NULL;
+ *p = '\0';
}
if (!state->account || !state->password) {
diff --git a/source3/lib/tldap.c b/source3/lib/tldap.c
index db5d562..a18a20d 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 b08d47d..b8b1f0d 100644
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -176,7 +176,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;
}
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index b5fc88b..248b3e4 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -2905,7 +2905,7 @@ void smbd_process(struct smbd_server_connection *sconn)
if (lp_maxprotocol() == PROTOCOL_SMB2 &&
!lp_async_smb_echo_handler()) {
/*
- * We're not making the desion here,
+ * We're not making the decision here,
* we're just allowing the client
* to decide between SMB1 and SMB2
* with the first negprot
--
Samba Shared Repository
More information about the samba-cvs
mailing list