From 3db52feb1f3b2c07ce0b06ad4a7099fa6efe3fc7 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 13 Dec 1999 13:27:58 +0000
Subject: first pass at updating head branch to be to be the same as the
 SAMBA_2_0 branch (This used to be commit
 453a822a76780063dff23526c35408866d0c0154)

---
 packaging/PHT/TurboLinux/makefile-path.patch | 50 +++++-----------------------
 packaging/PHT/TurboLinux/smb.conf            |  2 +-
 2 files changed, 10 insertions(+), 42 deletions(-)

(limited to 'packaging/PHT/TurboLinux')

diff --git a/packaging/PHT/TurboLinux/makefile-path.patch b/packaging/PHT/TurboLinux/makefile-path.patch
index 5fddb7cbfb..88d5222e09 100644
--- a/packaging/PHT/TurboLinux/makefile-path.patch
+++ b/packaging/PHT/TurboLinux/makefile-path.patch
@@ -1,44 +1,12 @@
-diff -uNr samba-PVERSION/source/Makefile.in samba-kgc/source/Makefile.in
---- samba-PVERSION/source/Makefile.in	Wed Dec  2 14:35:18 1998
-+++ samba-kgc/source/Makefile.in	Wed Dec  2 15:06:02 1998
-@@ -27,7 +27,7 @@
+--- samba-2.0.1/source/Makefile.in.orig	Tue Dec  1 22:32:20 1998
++++ samba-2.0.1/source/Makefile.in	Wed Dec  2 17:11:33 1998
+@@ -25,9 +25,9 @@
+ BINDIR = @bindir@
+ # we don't use sbindir because we want full compatibility with
  # the previous releases of Samba
- SBINDIR = @bindir@
+-SBINDIR = @bindir@
++SBINDIR = @sbindir@
  LIBDIR = @libdir@
--VARDIR = $(BASEDIR)/var
-+VARDIR = /var
+-VARDIR = @localstatedir@
++VARDIR = /var/log/samba
  MANDIR = @mandir@
- 
- # The permissions to give the executables
-@@ -36,23 +36,23 @@
- # set these to where to find various files
- # These can be overridden by command line switches (see smbd(8))
- # or in smb.conf (see smb.conf(5))
--SMBLOGFILE = $(VARDIR)/log.smb
--NMBLOGFILE = $(VARDIR)/log.nmb
-+SMBLOGFILE = $(VARDIR)/log/samba/log.smb
-+NMBLOGFILE = $(VARDIR)/log/samba/log.nmb
- CONFIGFILE = $(LIBDIR)/smb.conf
- LMHOSTSFILE = $(LIBDIR)/lmhosts
- DRIVERFILE = $(LIBDIR)/printers.def
- PASSWD_PROGRAM = /bin/passwd
--SMB_PASSWD_FILE = $(BASEDIR)/private/smbpasswd
--SMB_PASSGRP_FILE = $(BASEDIR)/private/smbpassgrp
--SMB_GROUP_FILE = $(BASEDIR)/private/smbgroup
--SMB_ALIAS_FILE = $(BASEDIR)/private/smbalias
-+SMB_PASSWD_FILE = $(LIBDIR)/smbpasswd
-+SMB_PASSGRP_FILE = $(LIBDIR)/smbpassgrp
-+SMB_GROUP_FILE = $(LIBDIR)/smbgroup
-+SMB_ALIAS_FILE = $(LIBDIR)/smbalias
- SMB_PASSWD_PROGRAM = $(BINDIR)/smbpasswd
- 
- # This is where SWAT images and help files go
--SWATDIR = $(BASEDIR)/swat
-+SWATDIR = $(BASEDIR)/share/swat
- 
- # the directory where lock files go
--LOCKDIR = $(VARDIR)/locks
-+LOCKDIR = $(VARDIR)/lock/samba
- 
- # The directory where code page definition files go
- CODEPAGEDIR = $(LIBDIR)/codepages
diff --git a/packaging/PHT/TurboLinux/smb.conf b/packaging/PHT/TurboLinux/smb.conf
index bd9a8e15bc..e07d15c93e 100644
--- a/packaging/PHT/TurboLinux/smb.conf
+++ b/packaging/PHT/TurboLinux/smb.conf
@@ -85,7 +85,7 @@
 
 # Most people will find that this option gives better performance.
 # See speed.txt and the manual pages for details
-   socket options = TCP_NODELAY 
+   socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192
 
 # Configure Samba to use multiple interfaces
 # If you have multiple network interfaces then you must list them
-- 
cgit