smbd: Slightly simplify set_current_case_sensitive()

Remove a global cache of calculating case sensivity. The calculation
is really simple: It only references a bool per-share parameter and a
global variable. I really doubt there is any measurable benefit from
this cache, and if there was, I don't care if SMB1 gets a tiny bit
slower in response to reduced global state.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/source3/smbd/globals.c b/source3/smbd/globals.c
index 4d4553649c0da1c575b6c8fb77c201356c531e02..9989a73dc85c33cb9d9fa217baa0b72f9a4baff7 100644 (file)
--- a/source3/smbd/globals.c
+++ b/source3/smbd/globals.c
@@ -61,9 +61,6 @@ int sec_ctx_stack_ndx = 0;
 bool become_uid_done = false;
 bool become_gid_done = false;
 
-connection_struct *last_conn = NULL;
-uint16_t last_flags = 0;
-
 uint32_t global_client_caps = 0;
 
 uint16_t fnf_handle = 257;

diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h
index 44be970510a2b25cf9368b2f388fd46c487f893f..d1c0d145de757060b2189d8caea745591919a348 100644 (file)
--- a/source3/smbd/globals.h
+++ b/source3/smbd/globals.h
@@ -79,9 +79,6 @@ extern int sec_ctx_stack_ndx;
 extern bool become_uid_done;
 extern bool become_gid_done;
 
-extern connection_struct *last_conn;
-extern uint16_t last_flags;
-
 extern uint32_t global_client_caps;
 
 extern uint16_t fnf_handle;

diff --git a/source3/smbd/smb1_process.c b/source3/smbd/smb1_process.c
index 8ea68e57a62c1a94f6a0233d2e26e97874d04c4d..1834c67b91f5de912f6299ca5700964ac31843b6 100644 (file)
--- a/source3/smbd/smb1_process.c
+++ b/source3/smbd/smb1_process.c
@@ -1027,13 +1027,6 @@ static void set_current_case_sensitive(connection_struct *conn, uint16_t flags)
 
        snum = SNUM(conn);
 
-       if ((conn == last_conn) && (last_flags == flags)) {
-               return;
-       }
-
-       last_conn = conn;
-       last_flags = flags;
-
        /*
         * Obey the client case sensitivity requests - only for clients that
         * support it. */
@@ -1060,7 +1053,6 @@ static void set_current_case_sensitive(connection_struct *conn, uint16_t flags)
                conn->case_sensitive = false;
                break;
        }
-       return;
 }
 
 /****************************************************************************