From 644ab8e9b13970f6c6ea7f89760a01484b591172 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sun, 16 Mar 2003 13:16:42 +0000
Subject: Try to avoid dereferencing a null pointer.

Andrew Bartlett
(This used to be commit 4e96585b60512905776c2c6692c76d45241f089d)
---
 source3/smbd/sesssetup.c | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

(limited to 'source3')

diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c
index 674f6145d3..e36760c148 100644
--- a/source3/smbd/sesssetup.c
+++ b/source3/smbd/sesssetup.c
@@ -273,10 +273,11 @@ static BOOL reply_spnego_ntlmssp(connection_struct *conn, char *outbuf,
 {
 	BOOL ret;
 	DATA_BLOB response;
-	struct auth_serversupplied_info *server_info;
-	server_info = (*auth_ntlmssp_state)->server_info;
+	struct auth_serversupplied_info *server_info = NULL;
 
-	if (!NT_STATUS_IS_OK(nt_status)) {
+	if (NT_STATUS_IS_OK(nt_status)) {
+		server_info = (*auth_ntlmssp_state)->server_info;
+	} else {
 		nt_status = do_map_to_guest(nt_status, 
 					    &server_info, 
 					    (*auth_ntlmssp_state)->ntlmssp_state->user, 
@@ -387,19 +388,22 @@ static int reply_spnego_auth(connection_struct *conn, char *inbuf, char *outbuf,
 			     DATA_BLOB blob1)
 {
 	DATA_BLOB auth, auth_reply;
-	NTSTATUS nt_status;
+	NTSTATUS nt_status = NT_STATUS_INVALID_PARAMETER;
 
 	if (!spnego_parse_auth(blob1, &auth)) {
 #if 0
 		file_save("auth.dat", blob1.data, blob1.length);
 #endif
-		return ERROR_NT(NT_STATUS_LOGON_FAILURE);
+		return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
 	}
-
-	if ( global_ntlmssp_state ) {
-	nt_status = auth_ntlmssp_update(global_ntlmssp_state, 
-					  auth, &auth_reply);
+	
+	if (!global_ntlmssp_state) {
+		/* auth before negotiatiate? */
+		return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
 	}
+	
+	nt_status = auth_ntlmssp_update(global_ntlmssp_state, 
+						auth, &auth_reply);
 
 	data_blob_free(&auth);
 
-- 
cgit