[Pkg-samba-maint] r3575 - trunk/samba/debian/patches
bubulle at alioth.debian.org
bubulle at alioth.debian.org
Mon Sep 6 21:26:18 UTC 2010
Author: bubulle
Date: 2010-09-06 21:26:18 +0000 (Mon, 06 Sep 2010)
New Revision: 3575
Removed:
trunk/samba/debian/patches/bug_586337_upstream_7139.patch
Modified:
trunk/samba/debian/patches/series
Log:
Drop irrelevant patch for 3.5.*
Deleted: trunk/samba/debian/patches/bug_586337_upstream_7139.patch
===================================================================
--- trunk/samba/debian/patches/bug_586337_upstream_7139.patch 2010-09-06 20:54:34 UTC (rev 3574)
+++ trunk/samba/debian/patches/bug_586337_upstream_7139.patch 2010-09-06 21:26:18 UTC (rev 3575)
@@ -1,57 +0,0 @@
-Goal: 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.
-
-
-Fixes: #586337
-
-Status wrt upstream: Fixed in 3.5.0
-
-Author: Volker Lendecke <vl at samba.org>
-
-Index: samba/source3/smbd/sesssetup.c
-===================================================================
---- samba.orig/source3/smbd/sesssetup.c
-+++ samba/source3/smbd/sesssetup.c
-@@ -495,10 +495,40 @@
- }
-
- } 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);
Modified: trunk/samba/debian/patches/series
===================================================================
--- trunk/samba/debian/patches/series 2010-09-06 20:54:34 UTC (rev 3574)
+++ trunk/samba/debian/patches/series 2010-09-06 21:26:18 UTC (rev 3575)
@@ -10,4 +10,3 @@
smbtar-bashism.patch
no-unnecessary-cups.patch
autoconf.patch
-bug_586337_upstream_7139.patch
More information about the Pkg-samba-maint
mailing list