[SCM] Samba Shared Repository - branch v3-0-test updated - release-3-0-31-12-g04767e3

[Jeremy Allison]

The branch, v3-0-test has been updated
       via  04767e3b7c9abbc4c39fc2ff2a7fa7d54786f642 (commit)
      from  5410ad4f4eb0162806778833362a68804d69196e (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-0-test


- Log -----------------------------------------------------------------
commit 04767e3b7c9abbc4c39fc2ff2a7fa7d54786f642
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Aug 22 13:54:22 2008 -0700

    Don't re-initialize a token when we already have one. This fixes the build farm failures when winbindd connects as guest.
    This one took a *lot* of tracking down :-).
    Jeremy.

-----------------------------------------------------------------------

Summary of changes:
 source/smbd/sesssetup.c |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/smbd/sesssetup.c b/source/smbd/sesssetup.c
index 0257cfa..4da568a 100644
--- a/source/smbd/sesssetup.c
+++ b/source/smbd/sesssetup.c
@@ -1506,14 +1506,16 @@ int reply_sesssetup_and_X(connection_struct *conn, char *inbuf,char *outbuf,
 		return ERROR_NT(nt_status_squash(NT_STATUS_LOGON_FAILURE));
 	}
 
-	nt_status = create_local_token(server_info);
-	if (!NT_STATUS_IS_OK(nt_status)) {
-		DEBUG(10, ("create_local_token failed: %s\n",
-			   nt_errstr(nt_status)));
-		data_blob_free(&nt_resp);
-		data_blob_free(&lm_resp);
-		data_blob_clear_free(&plaintext_password);
-		return ERROR_NT(nt_status_squash(nt_status));
+	if (!server_info->ptok) {
+		nt_status = create_local_token(server_info);
+		if (!NT_STATUS_IS_OK(nt_status)) {
+			DEBUG(10, ("create_local_token failed: %s\n",
+				   nt_errstr(nt_status)));
+			data_blob_free(&nt_resp);
+			data_blob_free(&lm_resp);
+			data_blob_clear_free(&plaintext_password);
+			return ERROR_NT(nt_status_squash(nt_status));
+		}
 	}
 
 	if (server_info->user_session_key.data) {


-- 
Samba Shared Repository