Attachment 8135 Details for Bug 9175 – Patches for v4-0-test

[patch] Patches for v4-0-test

tmp40.diff (text/plain), 5.44 KB, created by Stefan Metzmacher on 2012-11-02 09:29:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Metzmacher

Created: 2012-11-02 09:29:08 UTC

Size: 5.44 KB

patch

obsolete

>From 4b04383225f8d872b0c9f454f9b02a3e185e84ce Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Mon, 22 Oct 2012 14:18:20 +0200
>Subject: [PATCH 1/3] libcli/smb: add smbXcli_session_set_disconnect_expired()
> (bug #9175)
>
>This should be a short term hack until the upper layers have implemented
>re-authentication.
>
>Signed-off-by: Stefan Metzmacher <metze@samba.org>
>Reviewed-by: Michael Adam <obnox@samba.org>
>(cherry picked from commit c5cd22b5bbce724dcd68fe94320382b3f772cabf)
>---
> libcli/smb/smbXcli_base.c |   34 ++++++++++++++++++++++++++++++++++
> libcli/smb/smbXcli_base.h |    1 +
> 2 files changed, 35 insertions(+)
>
>diff --git a/libcli/smb/smbXcli_base.c b/libcli/smb/smbXcli_base.c
>index 02d02276..c547515 100644
>--- a/libcli/smb/smbXcli_base.c
>+++ b/libcli/smb/smbXcli_base.c
>@@ -157,6 +157,13 @@ struct smbXcli_session {
> 	struct {
> 		DATA_BLOB signing_key;
> 	} smb2_channel;
>+
>+	/*
>+	 * this should be a short term hack
>+	 * until the upper layers have implemented
>+	 * re-authentication.
>+	 */
>+	bool disconnect_expired;
> };
> 
> struct smbXcli_tcon {
>@@ -1970,6 +1977,17 @@ static NTSTATUS smb1cli_conn_dispatch_incoming(struct smbXcli_conn *conn,
> 	cmd = CVAL(inhdr, HDR_COM);
> 	status = smb1cli_pull_raw_error(inhdr);
> 
>+	if (NT_STATUS_EQUAL(status, NT_STATUS_NETWORK_SESSION_EXPIRED) &&
>+	    (state->session != NULL) && state->session->disconnect_expired)
>+	{
>+		/*
>+		 * this should be a short term hack
>+		 * until the upper layers have implemented
>+		 * re-authentication.
>+		 */
>+		return status;
>+	}
>+
> 	if (state->smb1.chained_requests == NULL) {
> 		if (num_iov != 3) {
> 			return NT_STATUS_INVALID_NETWORK_RESPONSE;
>@@ -3442,6 +3460,17 @@ static NTSTATUS smb2cli_conn_dispatch_incoming(struct smbXcli_conn *conn,
> 			}
> 		}
> 
>+		if (NT_STATUS_EQUAL(status, NT_STATUS_NETWORK_SESSION_EXPIRED) &&
>+		    (session != NULL) && session->disconnect_expired)
>+		{
>+			/*
>+			 * this should be a short term hack
>+			 * until the upper layers have implemented
>+			 * re-authentication.
>+			 */
>+			return status;
>+		}
>+
> 		smbXcli_req_unset_pending(req);
> 
> 		/*
>@@ -4483,6 +4512,11 @@ NTSTATUS smbXcli_session_application_key(struct smbXcli_session *session,
> 	return NT_STATUS_OK;
> }
> 
>+void smbXcli_session_set_disconnect_expired(struct smbXcli_session *session)
>+{
>+	session->disconnect_expired = true;
>+}
>+
> uint16_t smb1cli_session_current_id(struct smbXcli_session *session)
> {
> 	return session->smb1.session_id;
>diff --git a/libcli/smb/smbXcli_base.h b/libcli/smb/smbXcli_base.h
>index 03cb280..b720bc6 100644
>--- a/libcli/smb/smbXcli_base.h
>+++ b/libcli/smb/smbXcli_base.h
>@@ -263,6 +263,7 @@ struct smbXcli_session *smbXcli_session_create(TALLOC_CTX *mem_ctx,
> NTSTATUS smbXcli_session_application_key(struct smbXcli_session *session,
> 					 TALLOC_CTX *mem_ctx,
> 					 DATA_BLOB *key);
>+void smbXcli_session_set_disconnect_expired(struct smbXcli_session *session);
> uint16_t smb1cli_session_current_id(struct smbXcli_session* session);
> void smb1cli_session_set_id(struct smbXcli_session* session,
> 			    uint16_t session_id);
>-- 
>1.7.9.5
>
>
>From 6f26c6ea1eef33850a7a2bda51a4d3fa7148eeab Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Mon, 22 Oct 2012 14:31:20 +0200
>Subject: [PATCH 2/3] s3:winbindd: disconnection after getting
> NETWORK_SESSION_EXPIRED (bug #9175)
>
>Signed-off-by: Stefan Metzmacher <metze@samba.org>
>Reviewed-by: Michael Adam <obnox@samba.org>
>(cherry picked from commit 45105afffc5678082b23165ff74610d67e57a82a)
>---
> source3/winbindd/winbindd_cm.c |   11 +++++++++++
> 1 file changed, 11 insertions(+)
>
>diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
>index 0639be1..c403b32 100644
>--- a/source3/winbindd/winbindd_cm.c
>+++ b/source3/winbindd/winbindd_cm.c
>@@ -979,6 +979,17 @@ static NTSTATUS cm_prepare_connection(const struct winbindd_domain *domain,
> 
>  session_setup_done:
> 
>+	/*
>+	 * This should be a short term hack until
>+	 * dynamic re-authentication is implemented.
>+	 *
>+	 * See Bug 9175 - winbindd doesn't recover from
>+	 * NT_STATUS_NETWORK_SESSION_EXPIRED
>+	 */
>+	if (smbXcli_conn_protocol((*cli)->conn) >= PROTOCOL_SMB2_02) {
>+		smbXcli_session_set_disconnect_expired((*cli)->smb2.session);
>+	}
>+
> 	/* cache the server name for later connections */
> 
> 	saf_store(domain->name, controller);
>-- 
>1.7.9.5
>
>
>From a328714dd8beb983c33d2510fcfab4ee6afd6ed6 Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Mon, 22 Oct 2012 14:35:41 +0200
>Subject: [PATCH 3/3] s3:winbindd: use PROTOCOL_LATEST instead of
> PROTOCOL_SMB2_02 (bug #9175)
>
>We should use the latest supported dialect.
>
>Signed-off-by: Stefan Metzmacher <metze@samba.org>
>Reviewd-by: Michael Adam <obnox@samba.org>
>
>Autobuild-User(master): Michael Adam <obnox@samba.org>
>Autobuild-Date(master): Thu Nov  1 18:11:27 CET 2012 on sn-devel-104
>(cherry picked from commit 2a3eb641fe34fb95bf713f0e7184581847af1357)
>---
> source3/winbindd/winbindd_cm.c |    2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
>index c403b32..79b5839 100644
>--- a/source3/winbindd/winbindd_cm.c
>+++ b/source3/winbindd/winbindd_cm.c
>@@ -832,7 +832,7 @@ static NTSTATUS cm_prepare_connection(const struct winbindd_domain *domain,
> 	cli_set_timeout(*cli, 10000); /* 10 seconds */
> 
> 	result = smbXcli_negprot((*cli)->conn, (*cli)->timeout, PROTOCOL_CORE,
>-				 PROTOCOL_SMB2_02);
>+				 PROTOCOL_LATEST);
> 
> 	if (!NT_STATUS_IS_OK(result)) {
> 		DEBUG(1, ("cli_negprot failed: %s\n", nt_errstr(result)));
>-- 
>1.7.9.5
>

Flags:

obnox: review+

Actions: View

Attachments on bug 9175: 8097 | 8135 | 14660