Fix Bug #6551 (vuid and tid not set in sessionsetupX and tconX)

Guenther
This commit is contained in:
Guenther Deschner 2009-07-16 22:58:23 +00:00
parent 6d76452800
commit ebdd95022f
2 changed files with 54 additions and 1 deletions

48
samba-3.4.0-bug6551.patch Normal file
View File

@ -0,0 +1,48 @@
From 94565270786003d6fb97ec7289b904948db281cd Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Wed, 15 Jul 2009 14:00:41 -0700
Subject: [PATCH] Fix bug #6551 - win98 clients cannot connect after server upgrade to samba-3.4.0.
The values of vuid and tid were not being correctly updated in the struct smb_request
when passed to chain_reply inside sessionsetupX and tconX.
Jeremy.
---
source3/smbd/reply.c | 2 ++
source3/smbd/sesssetup.c | 1 +
2 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 6fe4f88..f76ab6d 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -759,6 +759,7 @@ void reply_tcon_and_X(struct smb_request *req)
END_PROFILE(SMBtconX);
+ req->tid = conn->cnum;
chain_reply(req);
return;
}
@@ -1924,6 +1925,7 @@ void reply_ulogoffX(struct smb_request *req)
DEBUG( 3, ( "ulogoffX vuid=%d\n", req->vuid ) );
END_PROFILE(SMBulogoffX);
+ req->vuid = UID_FIELD_INVALID;
chain_reply(req);
}
diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c
index 2c92c41..044e398 100644
--- a/source3/smbd/sesssetup.c
+++ b/source3/smbd/sesssetup.c
@@ -1805,6 +1805,7 @@ void reply_sesssetup_and_X(struct smb_request *req)
SSVAL(req->outbuf,smb_uid,sess_vuid);
SSVAL(req->inbuf,smb_uid,sess_vuid);
+ req->vuid = sess_vuid;
if (!done_sesssetup)
max_send = MIN(max_send,smb_bufsize);
--
1.5.4.3

View File

@ -1,4 +1,4 @@
%define main_release 40
%define main_release 41
%define samba_version 3.4.0
%define tdb_version 1.1.3
%define talloc_version 1.2.0
@ -49,6 +49,7 @@ Patch104: samba-3.0.0rc3-nmbd-netbiosname.patch
Patch107: samba-3.2.0pre1-grouppwd.patch
Patch200: samba-3.2.5-inotify.patch
Patch201: samba-3.4.0-build.patch
Patch202: samba-3.4.0-bug6551.patch
Requires(pre): samba-common = %{epoch}:%{samba_version}-%{release}
Requires: pam >= 0:0.64
@ -260,6 +261,7 @@ cp %{SOURCE11} packaging/Fedora/
%patch107 -p1 -b .grouppwd
%patch200 -p0 -b .inotify
%patch201 -p1 -b .build
%patch202 -p1 -b .bug6551
mv %samba_source/VERSION %samba_source/VERSION.orig
sed -e 's/SAMBA_VERSION_VENDOR_SUFFIX=$/&\"%{samba_release}\"/' < %samba_source/VERSION.orig > %samba_source/VERSION
@ -886,6 +888,9 @@ exit 0
%{_datadir}/pixmaps/samba/logo-small.png
%changelog
* Fri Jul 17 2009 Guenther Deschner <gdeschner@redhat.com> - 3.4.0-0.41
- Fix Bug #6551 (vuid and tid not set in sessionsetupX and tconX)
* Fri Jul 03 2009 Guenther Deschner <gdeschner@redhat.com> - 3.4.0-0.40
- Update to 3.4.0