Attachment 12470 Details for Bug 12045 – revert gencache of remote arch

[patch] revert gencache of remote arch

0001-Revert-smbd-use-remote-arch-caching.patch (text/plain), 2.62 KB, created by Andrew Bartlett on 2016-09-16 18:28:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Bartlett

Created: 2016-09-16 18:28:04 UTC

Size: 2.62 KB

patch

obsolete

>From a0f2b633fa7f587e251bd2df573804a370eb7ad9 Mon Sep 17 00:00:00 2001
>From: Andrew Bartlett <abartlet@samba.org>
>Date: Sat, 17 Sep 2016 06:13:53 +1200
>Subject: [PATCH] Revert "smbd: use remote arch caching"
>
>This reverts commit a2c59d3e45e71b44d9135b35c1cf5522e04dec0e.
>---
> source3/smbd/smb2_negprot.c   | 13 +------------
> source3/smbd/smb2_sesssetup.c | 11 -----------
> 2 files changed, 1 insertion(+), 23 deletions(-)
>
>diff --git a/source3/smbd/smb2_negprot.c b/source3/smbd/smb2_negprot.c
>index 6cfa64f..9c03b2c 100644
>--- a/source3/smbd/smb2_negprot.c
>+++ b/source3/smbd/smb2_negprot.c
>@@ -162,7 +162,6 @@ NTSTATUS smbd_smb2_request_process_negprot(struct smbd_smb2_request *req)
> 	uint32_t max_write = lp_smb2_max_write();
> 	NTTIME now = timeval_to_nttime(&req->request_time);
> 	bool signing_required = true;
>-	bool ok;
> 
> 	status = smbd_smb2_request_verify_sizes(req, 0x24);
> 	if (!NT_STATUS_IS_OK(status)) {
>@@ -261,17 +260,6 @@ NTSTATUS smbd_smb2_request_process_negprot(struct smbd_smb2_request *req)
> 		}
> 	}
> 
>-	if ((dialect != SMB2_DIALECT_REVISION_2FF) &&
>-	    (protocol >= PROTOCOL_SMB2_10) &&
>-	    !GUID_all_zero(&in_guid))
>-	{
>-		ok = remote_arch_cache_update(&in_guid);
>-		if (!ok) {
>-			return smbd_smb2_request_error(
>-				req, NT_STATUS_UNSUCCESSFUL);
>-		}
>-	}
>-
> 	switch (get_remote_arch()) {
> 	case RA_VISTA:
> 	case RA_SAMBA:
>@@ -544,6 +532,7 @@ NTSTATUS smbd_smb2_request_process_negprot(struct smbd_smb2_request *req)
> 		static const uint8_t zeros[8];
> 		size_t pad = 0;
> 		size_t ofs;
>+		bool ok;
> 
> 		outdyn = data_blob_dup_talloc(req, security_buffer);
> 		if (outdyn.length != security_buffer.length) {
>diff --git a/source3/smbd/smb2_sesssetup.c b/source3/smbd/smb2_sesssetup.c
>index 6a0caac..821024f 100644
>--- a/source3/smbd/smb2_sesssetup.c
>+++ b/source3/smbd/smb2_sesssetup.c
>@@ -1306,9 +1306,6 @@ static void smbd_smb2_logoff_shutdown_done(struct tevent_req *subreq)
> 	struct smbd_smb2_logoff_state *state = tevent_req_data(
> 		req, struct smbd_smb2_logoff_state);
> 	NTSTATUS status;
>-	bool ok;
>-	const struct GUID *client_guid =
>-		&state->smb2req->session->client->connections->smb2.client.guid;
> 
> 	status = smb2srv_session_shutdown_recv(subreq);
> 	if (tevent_req_nterror(req, status)) {
>@@ -1316,14 +1313,6 @@ static void smbd_smb2_logoff_shutdown_done(struct tevent_req *subreq)
> 	}
> 	TALLOC_FREE(subreq);
> 
>-	if (!GUID_all_zero(client_guid)) {
>-		ok = remote_arch_cache_delete(client_guid);
>-		if (!ok) {
>-			/* Most likely not an error, but not in cache */
>-			DBG_DEBUG("Deletion from remote arch cache failed\n");
>-		}
>-	}
>-
> 	/*
> 	 * As we've been awoken, we may have changed
> 	 * uid in the meantime. Ensure we're still
>-- 
>2.7.4
>

Actions: View

Attachments on bug 12045: 12356 | 12357 | 12364 | 12459 | 12468 | 12469 | 12470 | 12471 | 12472 | 12478 | 12479 | 12480 | 12481 | 12482 | 12483 | 12484 | 12485 | 12486 | 12487 | 12490 | 12491 | 12494 | 12499