From b5a9f4d951e8ab8bfe2fd64b6f75b8333907679b Mon Sep 17 00:00:00 2001
From: gdeschne <gdeschne>
Date: Fri, 16 Mar 2007 17:52:39 +0000
Subject: [PATCH] Adding upstream arch_macro patch to fix Samba appear as Vista
 towards Samba clients.

Guenther
---
 samba-3.0.24-arch_macro.patch | 23 +++++++++++++++++++++++
 samba.spec                    |  7 ++++++-
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 samba-3.0.24-arch_macro.patch

diff --git a/samba-3.0.24-arch_macro.patch b/samba-3.0.24-arch_macro.patch
new file mode 100644
index 0000000..7ee617b
--- /dev/null
+++ b/samba-3.0.24-arch_macro.patch
@@ -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
diff --git a/samba.spec b/samba.spec
index 33df84b..44d1a50 100644
--- a/samba.spec
+++ b/samba.spec
@@ -3,7 +3,7 @@
 Summary: The Samba SMB server.
 Name: samba
 Version: 3.0.24
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 0
 License: GNU GPL Version 2
 Group: System Environment/Daemons
@@ -46,6 +46,7 @@ Patch112: samba-3.0.15pre2-bug106483.patch
 #Patch113: samba-3.0.21-warnings.patch
 Patch114: samba-3.0.24-msdfs-root-no.patch
 Patch115: samba-3.0.24-vista-patchset.patch
+Patch116: samba-3.0.24-arch_macro.patch
 
 Requires(pre): /usr/sbin/groupadd
 Requires(pre): samba-common = %{epoch}:%{version}-%{release}
@@ -158,6 +159,7 @@ cp %{SOURCE8} packaging/Fedora/winbind.init
 #%patch113 -p1 -b .warnings
 %patch114 -p1 -b .dfsroot
 %patch115 -p1 -b .vista
+%patch116 -p0 -b .arch_macro
 
 # crap
 rm -f examples/VFS/.cvsignore
@@ -550,6 +552,9 @@ exit 0
 %{_libdir}/libsmbclient.a
 
 %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
 - Directories reorg, tdb files must go to /var/lib, not
   to /var/cache, add migration script in %post common