summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2007-05-20 08:57:01 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:52:40 -0500
commitb691b4ad3d5b2ac813355d81d4c90f84977689a3 (patch)
tree8ecfd4511729dc5c3b5a757043e2eedc439542ac
parenta8716afce8819a6dd8e73b34c513f7f512b274d6 (diff)
downloadsamba-b691b4ad3d5b2ac813355d81d4c90f84977689a3.tar.gz
samba-b691b4ad3d5b2ac813355d81d4c90f84977689a3.tar.bz2
samba-b691b4ad3d5b2ac813355d81d4c90f84977689a3.zip
r23019: revert r23018 - this will require more thought.
(This used to be commit df60df9678e5c45fad6c7f7cb53ba8d0ce6b7cf0)
-rw-r--r--source4/smb_server/smb/sesssetup.c16
1 files changed, 2 insertions, 14 deletions
diff --git a/source4/smb_server/smb/sesssetup.c b/source4/smb_server/smb/sesssetup.c
index 56d9e64e31..b6bddaa5b1 100644
--- a/source4/smb_server/smb/sesssetup.c
+++ b/source4/smb_server/smb/sesssetup.c
@@ -60,7 +60,7 @@ static void sesssetup_old_send(struct auth_check_password_request *areq,
union smb_sesssetup *sess = talloc_get_type(req->io_ptr, union smb_sesssetup);
struct auth_serversupplied_info *server_info = NULL;
struct auth_session_info *session_info;
- struct smbsrv_session *smb_sess = NULL;
+ struct smbsrv_session *smb_sess;
NTSTATUS status;
status = auth_check_password_recv(areq, req, &server_info);
@@ -88,10 +88,6 @@ static void sesssetup_old_send(struct auth_check_password_request *areq,
sess->old.out.vuid = smb_sess->vuid;
failed:
- if (!NT_STATUS_IS_OK(status)) {
- talloc_free(smb_sess);
- req->session = NULL;
- }
status = auth_nt_status_squash(status);
smbsrv_sesssetup_backend_send(req, sess, status);
}
@@ -159,7 +155,7 @@ static void sesssetup_nt1_send(struct auth_check_password_request *areq,
union smb_sesssetup *sess = talloc_get_type(req->io_ptr, union smb_sesssetup);
struct auth_serversupplied_info *server_info = NULL;
struct auth_session_info *session_info;
- struct smbsrv_session *smb_sess = NULL;
+ struct smbsrv_session *smb_sess;
NTSTATUS status;
status = auth_check_password_recv(areq, req, &server_info);
@@ -208,10 +204,6 @@ static void sesssetup_nt1_send(struct auth_check_password_request *areq,
done:
status = NT_STATUS_OK;
failed:
- if (!NT_STATUS_IS_OK(status)) {
- talloc_free(smb_sess);
- req->session = NULL;
- }
status = auth_nt_status_squash(status);
smbsrv_sesssetup_backend_send(req, sess, status);
}
@@ -345,10 +337,6 @@ static void sesssetup_spnego_send(struct gensec_update_request *greq, void *priv
done:
sess->spnego.out.vuid = smb_sess->vuid;
failed:
- if (!NT_STATUS_IS_OK(status)) {
- talloc_free(smb_sess);
- req->session = NULL;
- }
status = auth_nt_status_squash(status);
smbsrv_sesssetup_backend_send(req, sess, status);
}