s3:smb2:sesssetup: s/session/smb2sess

This prepares the following commits.

metze

diff --git a/source3/smbd/smb2_sesssetup.c b/source3/smbd/smb2_sesssetup.c
index 96e8d40cdde5a0afe14178f3b45a92188e190ea4..ab5260ba92aa482057854a379ca1fd6a3899f69c 100644 (file)
--- a/source3/smbd/smb2_sesssetup.c
+++ b/source3/smbd/smb2_sesssetup.c
@@ -286,7 +286,7 @@ static NTSTATUS smbd_smb2_session_setup(struct smbd_smb2_request *smb2req,
                                        DATA_BLOB *out_security_buffer,
                                        uint64_t *out_session_id)
 {
-       struct smbd_smb2_session *session;
+       struct smbd_smb2_session *smb2sess;
 
        *out_session_flags = 0;
        *out_session_id = 0;
@@ -295,46 +295,46 @@ static NTSTATUS smbd_smb2_session_setup(struct smbd_smb2_request *smb2req,
                int id;
 
                /* create a new session */
-               session = talloc_zero(smb2req->sconn, struct smbd_smb2_session);
-               if (session == NULL) {
+               smb2sess = talloc_zero(smb2req->sconn, struct smbd_smb2_session);
+               if (smb2sess == NULL) {
                        return NT_STATUS_NO_MEMORY;
                }
-               session->status = NT_STATUS_MORE_PROCESSING_REQUIRED;
+               smb2sess->status = NT_STATUS_MORE_PROCESSING_REQUIRED;
                id = idr_get_new_random(smb2req->sconn->smb2.sessions.idtree,
-                                       session,
+                                       smb2sess,
                                        smb2req->sconn->smb2.sessions.limit);
                if (id == -1) {
                        return NT_STATUS_INSUFFICIENT_RESOURCES;
                }
-               session->vuid = id;
+               smb2sess->vuid = id;
 
-               session->tcons.idtree = idr_init(session);
-               if (session->tcons.idtree == NULL) {
+               smb2sess->tcons.idtree = idr_init(smb2sess);
+               if (smb2sess->tcons.idtree == NULL) {
                        return NT_STATUS_NO_MEMORY;
                }
-               session->tcons.limit = 0x0000FFFE;
-               session->tcons.list = NULL;
+               smb2sess->tcons.limit = 0x0000FFFE;
+               smb2sess->tcons.list = NULL;
 
-               DLIST_ADD_END(smb2req->sconn->smb2.sessions.list, session,
+               DLIST_ADD_END(smb2req->sconn->smb2.sessions.list, smb2sess,
                              struct smbd_smb2_session *);
-               session->sconn = smb2req->sconn;
-               talloc_set_destructor(session, smbd_smb2_session_destructor);
+               smb2sess->sconn = smb2req->sconn;
+               talloc_set_destructor(smb2sess, smbd_smb2_session_destructor);
        } else {
                void *p;
 
-               /* lookup an existing session */
+               /* lookup an existing smb2sess */
                p = idr_find(smb2req->sconn->smb2.sessions.idtree, in_session_id);
                if (p == NULL) {
                        return NT_STATUS_USER_SESSION_DELETED;
                }
-               session = talloc_get_type_abort(p, struct smbd_smb2_session);
+               smb2sess = talloc_get_type_abort(p, struct smbd_smb2_session);
        }
 
-       if (NT_STATUS_IS_OK(session->status)) {
+       if (NT_STATUS_IS_OK(smb2sess->status)) {
                return NT_STATUS_REQUEST_NOT_ACCEPTED;
        }
 
-       return smbd_smb2_auth_generic(session,
+       return smbd_smb2_auth_generic(smb2sess,
                                      smb2req,
                                      in_security_mode,
                                      in_security_buffer,