summaryrefslogtreecommitdiff
path: root/source4/smb_server/sesssetup.c
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2004-06-05 01:39:08 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:56:28 -0500
commit0d466258be1fc7156de469daec07b79701557168 (patch)
treeec4af23d2117cafbf39a062f44eebc8b68182324 /source4/smb_server/sesssetup.c
parentb553acce4b426e1a2e4fda3a9acbfbf41003154a (diff)
downloadsamba-0d466258be1fc7156de469daec07b79701557168.tar.gz
samba-0d466258be1fc7156de469daec07b79701557168.tar.bz2
samba-0d466258be1fc7156de469daec07b79701557168.zip
r1019: Push the auth subsystem away from using typedef, and over to the 'all
goodness and light' struct ;-) Break apart the auth subsystem's return strucutres, into the parts that a netlogon call cares about, and the parts that are for a local session. This is the 'struct session_info' and it will almost completly replace the current information stored on a vuid, but be generic to all login methods (RPC over TCP, for example). Andrew Bartlett (This used to be commit d199697014d9562f9439a30b950fda798c5ef419)
Diffstat (limited to 'source4/smb_server/sesssetup.c')
-rw-r--r--source4/smb_server/sesssetup.c38
1 files changed, 19 insertions, 19 deletions
diff --git a/source4/smb_server/sesssetup.c b/source4/smb_server/sesssetup.c
index fdcc1d298a..12b17c366a 100644
--- a/source4/smb_server/sesssetup.c
+++ b/source4/smb_server/sesssetup.c
@@ -41,10 +41,10 @@ static void sesssetup_common_strings(struct request_context *req,
static NTSTATUS sesssetup_old(struct request_context *req, union smb_sesssetup *sess)
{
NTSTATUS status;
- auth_usersupplied_info *user_info = NULL;
- auth_serversupplied_info *server_info = NULL;
+ struct auth_usersupplied_info *user_info = NULL;
+ struct auth_serversupplied_info *server_info = NULL;
+ struct auth_session_info *session_info;
DATA_BLOB null_blob;
- DATA_BLOB session_key;
if (!req->smb->negotiate.done_sesssetup) {
req->smb->negotiate.max_send = sess->old.in.bufsize;
@@ -67,14 +67,13 @@ static NTSTATUS sesssetup_old(struct request_context *req, union smb_sesssetup *
return nt_status_squash(status);
}
- if (server_info->user_session_key.data) {
- session_key = data_blob(server_info->user_session_key.data, server_info->user_session_key.length);
- } else {
- session_key = data_blob(NULL, 0);
+ status = make_session_info(server_info, &session_info);
+ if (!NT_STATUS_IS_OK(status)) {
+ return nt_status_squash(status);
}
sess->old.out.action = 0;
- sess->old.out.vuid = register_vuid(req->smb, server_info, &session_key, sess->old.in.user);
+ sess->old.out.vuid = register_vuid(req->smb, session_info, sess->old.in.user);
sesssetup_common_strings(req,
&sess->old.out.os,
&sess->old.out.lanman,
@@ -90,9 +89,9 @@ static NTSTATUS sesssetup_old(struct request_context *req, union smb_sesssetup *
static NTSTATUS sesssetup_nt1(struct request_context *req, union smb_sesssetup *sess)
{
NTSTATUS status;
- auth_usersupplied_info *user_info = NULL;
- auth_serversupplied_info *server_info = NULL;
- DATA_BLOB session_key;
+ struct auth_usersupplied_info *user_info = NULL;
+ struct auth_serversupplied_info *server_info = NULL;
+ struct auth_session_info *session_info;
if (!req->smb->negotiate.done_sesssetup) {
req->smb->negotiate.max_send = sess->nt1.in.bufsize;
@@ -114,21 +113,22 @@ static NTSTATUS sesssetup_nt1(struct request_context *req, union smb_sesssetup *
return nt_status_squash(status);
}
- if (server_info->user_session_key.data) {
- session_key = data_blob(server_info->user_session_key.data, server_info->user_session_key.length);
- } else {
- session_key = data_blob(NULL, 0);
+ status = make_session_info(server_info, &session_info);
+ if (!NT_STATUS_IS_OK(status)) {
+ return nt_status_squash(status);
}
sess->nt1.out.action = 0;
- sess->nt1.out.vuid = register_vuid(req->smb, server_info, &session_key, sess->old.in.user);
+ sess->nt1.out.vuid = register_vuid(req->smb, session_info, sess->old.in.user);
+ if (sess->nt1.out.vuid == UID_FIELD_INVALID) {
+ return NT_STATUS_ACCESS_DENIED;
+ }
sesssetup_common_strings(req,
&sess->nt1.out.os,
&sess->nt1.out.lanman,
&sess->nt1.out.domain);
-
- srv_setup_signing(req->smb, &session_key, &sess->nt1.in.password2);
-
+
+ srv_setup_signing(req->smb, &session_info->session_key, &sess->nt1.in.password2);
return NT_STATUS_OK;
}