sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-22 22:04:08 +03:00
Code

s3:smbd: remove smbd_server_connection argument from session_claim()

Browse Source 
retrieve the server connection from the smbXsrv_session  argument instead.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Michael Adam <obnox@samba.org>
This commit is contained in:
Gregor Beck 2012-08-27 09:21:58 +02:00 committed by Michael Adam
parent 4878769f8e
commit 02b9b79447
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source3/smbd/proto.h
View File

@ -995,7 +995,7 @@ void close_cnum(connection_struct *conn, uint64_t vuid);
struct sessionid;
struct smbXsrv_session;
bool session_init(void);
bool session_claim(struct smbd_server_connection *sconn, struct smbXsrv_session *session);
bool session_claim(struct smbXsrv_session *session);
void session_yield(struct smbXsrv_session *session);
int list_sessions(TALLOC_CTX *mem_ctx, struct sessionid **session_list);

5
source3/smbd/session.c
View File

@ -40,9 +40,10 @@
called when a session is created
********************************************************************/
bool session_claim(struct smbd_server_connection *sconn, struct smbXsrv_session *session)
bool session_claim(struct smbXsrv_session *session)
{
struct user_struct *vuser = session->compat;
struct smbd_server_connection *sconn = session->connection->sconn;
struct server_id pid = messaging_server_id(sconn->msg_ctx);
TDB_DATA data;
int i = 0;
@ -137,7 +138,7 @@ bool session_claim(struct smbd_server_connection *sconn, struct smbXsrv_session
SMB_ASSERT(rec != NULL);
raddr = tsocket_address_inet_addr_string(sconn->remote_address,
raddr = tsocket_address_inet_addr_string(session->connection->remote_address,
talloc_tos());
if (raddr == NULL) {
return false;

4
source3/smbd/sesssetup.c
View File

@ -326,7 +326,7 @@ static void reply_sesssetup_and_X_spnego(struct smb_request *req)
register_homes_share(session_info->unix_info->unix_name);
}
if (!session_claim(sconn, session)) {
if (!session_claim(session)) {
DEBUG(1, ("smb1: Failed to claim session for vuid=%llu\n",
(unsigned long long)session->compat->vuid));
data_blob_free(&out_blob);
@ -1008,7 +1008,7 @@ void reply_sesssetup_and_X(struct smb_request *req)
register_homes_share(session_info->unix_info->unix_name);
}
if (!session_claim(sconn, session)) {
if (!session_claim(session)) {
DEBUG(1, ("smb1: Failed to claim session for vuid=%llu\n",
(unsigned long long)session->compat->vuid));
data_blob_free(&nt_resp);

2
source3/smbd/smb2_sesssetup.c
View File

@ -330,7 +330,7 @@ static NTSTATUS smbd_smb2_auth_generic_return(struct smbXsrv_session *session,
register_homes_share(session_info->unix_info->unix_name);
}
if (!session_claim(smb2req->sconn, session)) {
if (!session_claim(session)) {
DEBUG(1, ("smb2: Failed to claim session "
"for vuid=%llu\n",
(unsigned long long)session->compat->vuid));