Close #135832

Add Nalin's kerberos patches.

samba.spec

@@ -3,7 +3,7 @@
 Summary: The Samba SMB server.
 Name: samba
 Version: 3.0.8
-Release: 0.pre1.1
+Release: 0.pre1.2
 Epoch: 0
 License: GNU GPL Version 2
 Group: System Environment/Daemons
@@ -42,6 +42,8 @@ Patch13: samba-3.0.5rc1-64bit-timestamps.patch
 Patch14: samba-3.0.8pre1-x_fclose.patch
 Patch15: samba-3.0.8pre1-smbmnt.patch
 Patch16: samba-3.0.7-disable-sendfile.patch
+Patch17: samba-3.0.8pre1-fqdn.patch
+Patch18: samba-3.0.8pre1-salt.patch
 
 Requires: pam >= 0:0.64 %{auth} samba-common = %{epoch}:%{version} 
 Requires: logrotate >= 0:3.4 initscripts >= 0:5.54-1 
@@ -117,9 +119,11 @@ cp %{SOURCE8} packaging/RedHat/winbind.init
 %patch10 -p1 -b .smbclient-kerberos
 %patch11 -p1 -b .use_authtok
 %patch13 -p1 -b .64bit-timestamps
-#%patch14 -p1 -b .x_fclose
+%patch14 -p1 -b .x_fclose
 %patch15 -p1 -b .smbmnt
 %patch16 -p1 -b .disable-sendfile
+%patch17 -p1 -b .fqdn
+%patch18 -p1 -b .salt
 
 # crap
 rm -f examples/VFS/.cvsignore
@@ -459,6 +463,11 @@ fi
 #%lang(ja) %{_mandir}/ja/man8/smbpasswd.8*
 
 %changelog
+* Fri Oct 15 2004 Jay Fenlason <fenlason@redhat.com> 3.0.8-0.pre1.2
+- Re-enable the x_fclose patch that was accidentally disabled
+  in 3.0.8-0.pre1.1.  This closes #135832
+- include Nalin's -fqdn and -salt patches.
+
 * Wed Oct 13 2004 Jay Fenlason <fenlason@redhat.com> 3.0.8-0.pre1.1
 - Include disable-sendfile patch to default "use sendfile" to "no".
   This closes #132779