Attachment 5358 Details for Bug 7139 – Proposed patch

[patch] Proposed patch

7139.patch (text/plain), 1.90 KB, created by Volker Lendecke on 2010-02-16 16:33:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Volker Lendecke

Created: 2010-02-16 16:33:47 UTC

Size: 1.90 KB

patch

obsolete

>From 1706d17ceb20bb6d76ff41201750833bd0a626a8 Mon Sep 17 00:00:00 2001
>From: Volker Lendecke <vl@samba.org>
>Date: Tue, 16 Feb 2010 23:29:48 +0100
>Subject: [PATCH] s3: Fix bug 7139
>
>To provide the user with the same SID when doing Kerberos logins, attempt to do
>a make_server_info_sam instead of a make_server_info_pw.
>---
> source3/smbd/sesssetup.c |   34 ++++++++++++++++++++++++++++++++--
> 1 files changed, 32 insertions(+), 2 deletions(-)
>
>diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c
>index addd386..1529166 100644
>--- a/source3/smbd/sesssetup.c
>+++ b/source3/smbd/sesssetup.c
>@@ -485,10 +485,40 @@ static void reply_spnego_kerberos(struct smb_request *req,
> 		}
> 
> 	} else {
>-		ret = make_server_info_pw(&server_info, real_username, pw);
>+		/*
>+		 * We didn't get a PAC, we have to make up the user
>+		 * ourselves. Try to ask the pdb backend to provide
>+		 * SID consistency with ntlmssp session setup
>+		 */
>+		struct samu *sampass;
>+
>+		sampass = samu_new(talloc_tos());
>+		if (sampass == NULL) {
>+			ret = NT_STATUS_NO_MEMORY;
>+			data_blob_free(&ap_rep);
>+			data_blob_free(&session_key);
>+			TALLOC_FREE(mem_ctx);
>+			reply_nterror(req, nt_status_squash(ret));
>+			return;
>+		}
>+
>+		if (pdb_getsampwnam(sampass, real_username)) {
>+			DEBUG(10, ("found user %s in passdb, calling "
>+				   "make_server_info_sam\n", real_username));
>+			ret = make_server_info_sam(&server_info, sampass);
>+		} else {
>+			/*
>+			 * User not in passdb, make it up artificially
>+			 */
>+			TALLOC_FREE(sampass);
>+			DEBUG(10, ("didn't find user %s in passdb, calling "
>+				   "make_server_info_pw\n", real_username));
>+			ret = make_server_info_pw(&server_info, real_username,
>+						  pw);
>+		}
> 
> 		if ( !NT_STATUS_IS_OK(ret) ) {
>-			DEBUG(1,("make_server_info_pw failed: %s!\n",
>+			DEBUG(1,("make_server_info_[sam|pw] failed: %s!\n",
> 				 nt_errstr(ret)));
> 			data_blob_free(&ap_rep);
> 			data_blob_free(&session_key);
>-- 
>1.6.0.4
>

Flags:

jra: review+

Actions: View

Attachments on bug 7139: 5356 | 5357 | 5358