[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  fd05d61 libcli/smb: Use helper function for finding session
      from  8f9bf74 smbd: Simplify check_access()

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


- Log -----------------------------------------------------------------
commit fd05d617a8860e6ed2db90c0396fdca9c15ef4a3
Author: Christof Schmitt <cs at samba.org>
Date:   Wed Oct 21 12:04:47 2015 -0700

    libcli/smb: Use helper function for finding session
    
    This removes some duplicated code.
    
    Signed-off-by: Christof Schmitt <cs at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Wed Nov 18 04:04:17 CET 2015 on sn-devel-104

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

Summary of changes:
 libcli/smb/smbXcli_base.c | 37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)


Changeset truncated at 500 lines:

diff --git a/libcli/smb/smbXcli_base.c b/libcli/smb/smbXcli_base.c
index 6fe4816..1f1b6cd 100644
--- a/libcli/smb/smbXcli_base.c
+++ b/libcli/smb/smbXcli_base.c
@@ -3295,6 +3295,21 @@ static void smb2cli_req_writev_done(struct tevent_req *subreq)
 	}
 }
 
+static struct smbXcli_session* smbXcli_session_by_uid(struct smbXcli_conn *conn,
+						     uint64_t uid)
+{
+	struct smbXcli_session *s = conn->sessions;
+
+	for (; s; s = s->next) {
+		if (s->smb2->session_id != uid) {
+			continue;
+		}
+		break;
+	}
+
+	return s;
+}
+
 static NTSTATUS smb2cli_inbuf_parse_compound(struct smbXcli_conn *conn,
 					     uint8_t *buf,
 					     size_t buflen,
@@ -3362,14 +3377,7 @@ static NTSTATUS smb2cli_inbuf_parse_compound(struct smbXcli_conn *conn,
 				goto inval;
 			}
 
-			s = conn->sessions;
-			for (; s; s = s->next) {
-				if (s->smb2->session_id != uid) {
-					continue;
-				}
-				break;
-			}
-
+			s = smbXcli_session_by_uid(conn, uid);
 			if (s == NULL) {
 				DEBUG(10, ("unknown session_id %llu\n",
 					   (unsigned long long)uid));
@@ -3588,17 +3596,8 @@ static NTSTATUS smb2cli_conn_dispatch_incoming(struct smbXcli_conn *conn,
 			uint64_t uid = BVAL(inhdr, SMB2_HDR_SESSION_ID);
 
 			if (session == NULL) {
-				struct smbXcli_session *s;
-
-				s = state->conn->sessions;
-				for (; s; s = s->next) {
-					if (s->smb2->session_id != uid) {
-						continue;
-					}
-
-					session = s;
-					break;
-				}
+				session = smbXcli_session_by_uid(state->conn,
+								 uid);
 			}
 
 			if (session == NULL) {


-- 
Samba Shared Repository