svn commit: samba r23019 - in branches/SAMBA_4_0/source/smb_server/smb: .

tridge at samba.org tridge at samba.org
Sun May 20 08:57:03 GMT 2007


Author: tridge
Date: 2007-05-20 08:57:01 +0000 (Sun, 20 May 2007)
New Revision: 23019

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23019

Log:

revert r23018 - this will require more thought.

Modified:
   branches/SAMBA_4_0/source/smb_server/smb/sesssetup.c


Changeset:
Modified: branches/SAMBA_4_0/source/smb_server/smb/sesssetup.c
===================================================================
--- branches/SAMBA_4_0/source/smb_server/smb/sesssetup.c	2007-05-20 08:43:03 UTC (rev 23018)
+++ branches/SAMBA_4_0/source/smb_server/smb/sesssetup.c	2007-05-20 08:57:01 UTC (rev 23019)
@@ -60,7 +60,7 @@
 	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 @@
 	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 @@
 	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 @@
 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 @@
 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);
 }



More information about the samba-cvs mailing list