diff options
| author | Michael Adam <obnox@samba.org> | 2015-07-29 10:23:14 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2015-07-29 18:26:07 +0200 |
| commit | d6acf950e4bbff294fe8d6cabadee39717910d1e (patch) | |
| tree | 721865b1fd9437755e027c51d08bd370423497d5 /source3/smbd | |
| parent | c765d11347048c46dc0e1cb5cc1e0da747b73524 (diff) | |
| download | samba-d6acf950e4bbff294fe8d6cabadee39717910d1e.tar.gz | |
smbXsrv: rename smb2srv_session_lookup -> smb2srv_session_lookup_conn
This is in preparation of adding a variant that operates
on the client and does in particular not verify that the
connection belongs to a session as a channel.
Pair-Programmed-With: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Michael Adam <obnox@samba.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/globals.h | 6 | ||||
| -rw-r--r-- | source3/smbd/smb2_break.c | 8 | ||||
| -rw-r--r-- | source3/smbd/smb2_server.c | 9 | ||||
| -rw-r--r-- | source3/smbd/smbXsrv_session.c | 6 |
4 files changed, 15 insertions, 14 deletions
diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h index 35a3ee95394..dbdc9e8d8e2 100644 --- a/source3/smbd/globals.h +++ b/source3/smbd/globals.h @@ -553,9 +553,9 @@ NTSTATUS smb1srv_session_lookup(struct smbXsrv_connection *conn, uint16_t vuid, NTTIME now, struct smbXsrv_session **session); NTSTATUS smb2srv_session_table_init(struct smbXsrv_connection *conn); -NTSTATUS smb2srv_session_lookup(struct smbXsrv_connection *conn, - uint64_t session_id, NTTIME now, - struct smbXsrv_session **session); +NTSTATUS smb2srv_session_lookup_conn(struct smbXsrv_connection *conn, + uint64_t session_id, NTTIME now, + struct smbXsrv_session **session); struct smbXsrv_session_global0; NTSTATUS smbXsrv_session_global_traverse( int (*fn)(struct smbXsrv_session_global0 *, void *), diff --git a/source3/smbd/smb2_break.c b/source3/smbd/smb2_break.c index 5eab0a19a2a..4c5d62e73d6 100644 --- a/source3/smbd/smb2_break.c +++ b/source3/smbd/smb2_break.c @@ -450,10 +450,10 @@ void send_break_message_smb2(files_struct *fsp, */ xconn = fsp->conn->sconn->client->connections; - status = smb2srv_session_lookup(xconn, - fsp->vuid, - now, - &session); + status = smb2srv_session_lookup_conn(xconn, + fsp->vuid, + now, + &session); if (NT_STATUS_EQUAL(status, NT_STATUS_USER_SESSION_DELETED) || (session == NULL)) { diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c index 2ea997e896e..442b3617609 100644 --- a/source3/smbd/smb2_server.c +++ b/source3/smbd/smb2_server.c @@ -393,7 +393,8 @@ static NTSTATUS smbd_smb2_inbuf_parse_compound(struct smbXsrv_connection *xconn, goto inval; } - status = smb2srv_session_lookup(xconn, uid, now, &s); + status = smb2srv_session_lookup_conn(xconn, uid, now, + &s); if (s == NULL) { DEBUG(1, ("invalid session[%llu] in " "SMB2_TRANSFORM header\n", @@ -1833,9 +1834,9 @@ static NTSTATUS smbd_smb2_request_check_session(struct smbd_smb2_request *req) req->last_session_id = 0; /* lookup an existing session */ - status = smb2srv_session_lookup(req->xconn, - in_session_id, now, - &session); + status = smb2srv_session_lookup_conn(req->xconn, + in_session_id, now, + &session); if (session) { req->session = session; req->last_session_id = in_session_id; diff --git a/source3/smbd/smbXsrv_session.c b/source3/smbd/smbXsrv_session.c index 12cc43e7f24..8e275ad8fc6 100644 --- a/source3/smbd/smbXsrv_session.c +++ b/source3/smbd/smbXsrv_session.c @@ -1767,9 +1767,9 @@ static NTSTATUS smb2srv_session_lookup_raw(struct smbXsrv_session_table *table, session); } -NTSTATUS smb2srv_session_lookup(struct smbXsrv_connection *conn, - uint64_t session_id, NTTIME now, - struct smbXsrv_session **session) +NTSTATUS smb2srv_session_lookup_conn(struct smbXsrv_connection *conn, + uint64_t session_id, NTTIME now, + struct smbXsrv_session **session) { struct smbXsrv_session_table *table = conn->client->session_table; return smb2srv_session_lookup_raw(table, conn, session_id, now, |