rpms/samba
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Adding upstream arch_macro patch to fix Samba appear as

Browse Source 
Vista towards Samba clients.

Guenther
This commit is contained in:
gdeschne 2007-03-16 17:52:39 +00:00
parent 23b112d13d
commit b5a9f4d951
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
samba-3.0.24-arch_macro.patch Normal file
View File

@ -0,0 +1,23 @@
------------------------------------------------------------------------
r21857 | gd | 2007-03-16 17:20:47 +0100 (Fri, 16 Mar 2007) | 4 lines
Stop pretending to be Vista in the %a macro towards Samba clients.
Guenther
------------------------------------------------------------------------
Index: source/smbd/negprot.c
===================================================================
--- source/smbd/negprot.c (revision 21856)
+++ source/smbd/negprot.c (revision 21857)
@@ -259,7 +259,9 @@ static int reply_nt1(char *inbuf, char *
if ( (SVAL(inbuf, smb_flg2) & FLAGS2_EXTENDED_SECURITY) &&
((SVAL(inbuf, smb_flg2) & FLAGS2_UNKNOWN_BIT4) == 0) )
{
- set_remote_arch( RA_VISTA );
+ if (get_remote_arch() != RA_SAMBA) {
+ set_remote_arch( RA_VISTA );
+ }
}
/* do spnego in user level security if the client

7
samba.spec
View File

@ -3,7 +3,7 @@
Summary: The Samba SMB server. Summary: The Samba SMB server.
Name: samba Name: samba
Version: 3.0.24 Version: 3.0.24
Release: 3%{?dist} Release: 4%{?dist}
Epoch: 0 Epoch: 0
License: GNU GPL Version 2 License: GNU GPL Version 2
Group: System Environment/Daemons Group: System Environment/Daemons
@ -46,6 +46,7 @@ Patch112: samba-3.0.15pre2-bug106483.patch
#Patch113: samba-3.0.21-warnings.patch #Patch113: samba-3.0.21-warnings.patch
Patch114: samba-3.0.24-msdfs-root-no.patch Patch114: samba-3.0.24-msdfs-root-no.patch
Patch115: samba-3.0.24-vista-patchset.patch Patch115: samba-3.0.24-vista-patchset.patch
Patch116: samba-3.0.24-arch_macro.patch
Requires(pre): /usr/sbin/groupadd Requires(pre): /usr/sbin/groupadd
Requires(pre): samba-common = %{epoch}:%{version}-%{release} Requires(pre): samba-common = %{epoch}:%{version}-%{release}
@ -158,6 +159,7 @@ cp %{SOURCE8} packaging/Fedora/winbind.init
#%patch113 -p1 -b .warnings #%patch113 -p1 -b .warnings
%patch114 -p1 -b .dfsroot %patch114 -p1 -b .dfsroot
%patch115 -p1 -b .vista %patch115 -p1 -b .vista
%patch116 -p0 -b .arch_macro
# crap # crap
rm -f examples/VFS/.cvsignore rm -f examples/VFS/.cvsignore
@ -550,6 +552,9 @@ exit 0
%{_libdir}/libsmbclient.a %{_libdir}/libsmbclient.a
%changelog %changelog
* Fri Mar 16 2007 Guenther Deschner <gdeschner@redhat.com> 3.0.24-4.fc7
- fix arch macro which reported Vista to Samba clients.
* Thu Mar 15 2007 Simo Sorce <ssorce@redhat.com> 3.0.24-3.fc7 * Thu Mar 15 2007 Simo Sorce <ssorce@redhat.com> 3.0.24-3.fc7
- Directories reorg, tdb files must go to /var/lib, not - Directories reorg, tdb files must go to /var/lib, not
to /var/cache, add migration script in %post common to /var/cache, add migration script in %post common