Version up (Samba-2.0.0)

Reviewed by:	Tatsumi Hosokawa <hosokawa@jp.FreeBSD.org>
Submitted by:	Shigeyuki FUKUSHIMA <shige@kuis.kyoto-u.ac.jp>

5 files changed, 113 insertions, 122 deletions

diff --git a/net/samba/files/patch-aa b/net/samba/files/patch-aa
index c99001099c0a..c83a3c146655 100644
--- a/net/samba/files/patch-aa
+++ b/net/samba/files/patch-aa
@@ -1,49 +1,46 @@
---- Makefile.orig	Thu Jan  8 03:29:04 1998
-+++ Makefile	Thu Jan  8 14:52:32 1998
-@@ -5,11 +5,11 @@
- ###########################################################################
+--- Makefile.in.orig	Fri Jan 15 05:07:20 1999
++++ Makefile.in	Fri Jan 15 22:47:59 1999
+@@ -23,9 +23,7 @@
  
- # The base directory for all samba files
--BASEDIR = /usr/local/samba
-+BASEDIR = $(PREFIX)
- 
- # The base manpages directory to put the man pages in
- # Note: $(MANDIR)/man1, $(MANDIR)/man5 and $(MANDIR)/man8 must exist.
--MANDIR = /usr/local/man
-+MANDIR = $(PREFIX)/man
- 
- # The directories to put things in. If you use multiple
- # architectures or share the samba binaries across NFS then
-@@ -18,9 +18,9 @@
- #       normally only applies to nmbd and smbd
- #       SBINDIR implies a secure binary directory
- BINDIR = $(BASEDIR)/bin
--SBINDIR = $(BASEDIR)/bin
--LIBDIR = $(BASEDIR)/lib
--VARDIR = $(BASEDIR)/var
-+SBINDIR = $(BASEDIR)/sbin
-+LIBDIR = $(BASEDIR)/etc
-+VARDIR = /var/log
- 
- # The permissions to give the executables
- INSTALLPERMS = 0755
-@@ -55,7 +55,7 @@
- WEB_ROOT = $(BASEDIR)
+ BASEDIR= @prefix@
+ BINDIR = @bindir@
+-# we don't use sbindir because we want full compatibility with
+-# the previous releases of Samba
+-SBINDIR = @bindir@
++SBINDIR = @sbindir@
+ LIBDIR = @libdir@
+ VARDIR = @localstatedir@
+ MANDIR = @mandir@
+@@ -36,8 +34,9 @@
+ # 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
++LOGDIR=$(VARDIR)/log
++SMBLOGFILE = $(LOGDIR)/log.smb
++NMBLOGFILE = $(LOGDIR)/log.nmb
+ CONFIGFILE = $(LIBDIR)/smb.conf
+ LMHOSTSFILE = $(LIBDIR)/lmhosts
+ DRIVERFILE = $(LIBDIR)/printers.def
+@@ -52,7 +51,10 @@
+ SWATDIR = @swatdir@
  
  # the directory where lock files go
 -LOCKDIR = $(VARDIR)/locks
-+LOCKDIR = /var/spool/lock
++LOCKDIR = $(VARDIR)/spool/lock
++
++# the directory where pid files go
++PIDFILEDIR = $(VARDIR)/run
  
  # The directory where code page definition files go
  CODEPAGEDIR = $(LIBDIR)/codepages
-@@ -396,8 +396,8 @@
- # This is for FreeBSD
- # contributed by kuku@acds.physik.rwth-aachen.de
- # NOTE: You may need to add -DBSD44 if you have password problems
--# FLAGSM = -DFreeBSD -DFAST_SHARE_MODES
--# LIBSM = -lcrypt 
-+FLAGSM = -DFreeBSD -DFAST_SHARE_MODES
-+LIBSM = -lcrypt 
- 
- # This is for OpenBSD
- # contributed by todd@openbsd.org
+@@ -71,7 +73,7 @@
+ PASSWD_FLAGS = -DPASSWD_PROGRAM=\"$(PASSWD_PROGRAM)\" -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" -DSMB_PASSWD_PROGRAM=\"$(SMB_PASSWD_PROGRAM)\"
+ FLAGS1 = $(CFLAGS) -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I$(srcdir)/smbwrapper $(CPPFLAGS) -DSMBLOGFILE=\"$(SMBLOGFILE)\" -DNMBLOGFILE=\"$(NMBLOGFILE)\"
+ FLAGS2 = -DCONFIGFILE=\"$(CONFIGFILE)\" -DLMHOSTSFILE=\"$(LMHOSTSFILE)\"  
+-FLAGS3 = -DSWATDIR=\"$(SWATDIR)\" -DSBINDIR=\"$(SBINDIR)\" -DLOCKDIR=\"$(LOCKDIR)\" -DSMBRUN=\"$(SMBRUN)\" -DCODEPAGEDIR=\"$(CODEPAGEDIR)\"
++FLAGS3 = -DSWATDIR=\"$(SWATDIR)\" -DSBINDIR=\"$(SBINDIR)\" -DLOCKDIR=\"$(LOCKDIR)\" -DPIDFILEDIR=\"$(PIDFILEDIR)\" -DSMBRUN=\"$(SMBRUN)\" -DCODEPAGEDIR=\"$(CODEPAGEDIR)\"
+ FLAGS4 = -DDRIVERFILE=\"$(DRIVERFILE)\" -DBINDIR=\"$(BINDIR)\"
+ FLAGS5 = $(FLAGS1) $(FLAGS2) $(FLAGS3) $(FLAGS4) -DHAVE_INCLUDES_H
+ FLAGS  = $(FLAGS5) $(PASSWD_FLAGS)
diff --git a/net/samba/files/patch-ab b/net/samba/files/patch-ab
new file mode 100644
index 000000000000..b3d798c9f601
--- /dev/null
+++ b/net/samba/files/patch-ab
@@ -0,0 +1,35 @@
+--- param/loadparm.c.orig	Fri Jan 15 22:35:00 1999
++++ param/loadparm.c	Fri Jan 15 22:33:18 1999
+@@ -104,6 +104,7 @@
+ {
+   char *szPrintcapname;
+   char *szLockDir;
++  char *szPidDir;
+   char *szRootdir;
+   char *szDefaultService;
+   char *szDfree;
+@@ -747,6 +748,8 @@
+   {"auto services",    P_STRING,  P_GLOBAL, &Globals.szAutoServices,    NULL,   NULL,  0},
+   {"lock dir",         P_STRING,  P_GLOBAL, &Globals.szLockDir,         NULL,   NULL,  0},
+   {"lock directory",   P_STRING,  P_GLOBAL, &Globals.szLockDir,         NULL,   NULL,  0},
++  {"pidfile dir",      P_STRING,  P_GLOBAL, &Globals.szPidDir,          NULL,   NULL,  0},
++  {"pidfile directory",P_STRING,  P_GLOBAL, &Globals.szPidDir,          NULL,   NULL,  0},
+   {"default service",  P_STRING,  P_GLOBAL, &Globals.szDefaultService,  NULL,   NULL,  0},
+   {"default",          P_STRING,  P_GLOBAL, &Globals.szDefaultService,  NULL,   NULL,  0},
+   {"message command",  P_STRING,  P_GLOBAL, &Globals.szMsgCommand,      NULL,   NULL,  0},
+@@ -824,6 +827,7 @@
+   string_set(&Globals.szPrintcapname, PRINTCAP_NAME);
+   string_set(&Globals.szDriverFile, DRIVERFILE);
+   string_set(&Globals.szLockDir, LOCKDIR);
++  string_set(&Globals.szPidDir, PIDFILEDIR);
+   string_set(&Globals.szRootdir, "/");
+   string_set(&Globals.szSmbrun, SMBRUN);
+   string_set(&Globals.szSocketAddress, "0.0.0.0");
+@@ -1100,6 +1104,7 @@
+ FN_GLOBAL_STRING(lp_serverstring,&Globals.szServerString)
+ FN_GLOBAL_STRING(lp_printcapname,&Globals.szPrintcapname)
+ FN_GLOBAL_STRING(lp_lockdir,&Globals.szLockDir)
++FN_GLOBAL_STRING(lp_piddir,&Globals.szPidDir)
+ FN_GLOBAL_STRING(lp_rootdir,&Globals.szRootdir)
+ FN_GLOBAL_STRING(lp_defaultservice,&Globals.szDefaultService)
+ FN_GLOBAL_STRING(lp_msg_command,&Globals.szMsgCommand)
diff --git a/net/samba/files/patch-ac b/net/samba/files/patch-ac
new file mode 100644
index 000000000000..dd53b8418c1e
--- /dev/null
+++ b/net/samba/files/patch-ac
@@ -0,0 +1,20 @@
+--- lib/pidfile.c.orig	Fri Jan 15 22:40:47 1999
++++ lib/pidfile.c	Fri Jan 15 22:41:05 1999
+@@ -37,7 +37,7 @@
+ 	unsigned ret;
+ 	pstring pidFile;
+ 
+-	slprintf(pidFile, sizeof(pidFile)-1, "%s/%s.pid", lp_lockdir(), name);
++	slprintf(pidFile, sizeof(pidFile)-1, "%s/%s.pid", lp_piddir(), name);
+ 
+ 	fd = sys_open(pidFile, O_NONBLOCK | O_RDWR, 0644);
+ 	if (fd == -1) {
+@@ -78,7 +78,7 @@
+ 	pstring pidFile;
+ 	int pid;
+ 
+-	slprintf(pidFile, sizeof(pidFile)-1, "%s/%s.pid", lp_lockdir(), name);
++	slprintf(pidFile, sizeof(pidFile)-1, "%s/%s.pid", lp_piddir(), name);
+ 
+ 	pid = pidfile_pid(name);
+ 	if (pid != 0) {
diff --git a/net/samba/files/samba.sh.sample b/net/samba/files/samba.sh.sample
index 50b8968ec6c5..e6807ad6d145 100644
--- a/net/samba/files/samba.sh.sample
+++ b/net/samba/files/samba.sh.sample
@@ -1,13 +1,22 @@
 #!/bin/sh
 smbspool=/var/spool/samba
+pidfiledir=/var/run
 smbd=/usr/local/sbin/smbd
 nmbd=/usr/local/sbin/nmbd
 
-if [ -f $smbd ]; then
-	if [ -d $smbspool ]; then
-		rm -f $smbspool/*
+# start
+if [ "x$1" = "x" -o "x$1" = "xstart" ]; then
+	if [ -f $smbd ]; then
+		if [ -d $smbspool ]; then
+			rm -f $smbspool/*
+		fi
+		echo -n ' Samba'
+		$smbd -D
+		$nmbd -D
 	fi
-	echo -n ' Samba'
-	$smbd -D
-	$nmbd -D
+
+# stop
+elif [ "x$1" = "xstop" ]; then
+	kill `cat $pidfiledir/smbd.pid`
+	kill `cat $pidfiledir/nmbd.pid`
 fi
diff --git a/net/samba/files/smb.conf.default b/net/samba/files/smb.conf.default
index 012bcf719e1b..1b9d4d1f7ef7 100644
--- a/net/samba/files/smb.conf.default
+++ b/net/samba/files/smb.conf.default
@@ -14,7 +14,7 @@
 #======================= Global Settings =====================================
 [global]
 
-# workgroup = NT-Domain-Name or Workgroup-Name
+# workgroup = NT-Domain-Name or Workgroup-Name, eg: REDHAT4
    workgroup = MYGROUP
 
 # server string is the equivalent of the NT Description field
@@ -50,7 +50,7 @@
 
 # this tells Samba to use a separate log file for each machine
 # that connects
-   log file = __LOGDIR__/log.%m
+   log file = %%SAMBA_LOGDIR%%/log.%m
 
 # Put a capping on the size of the log files (in Kb).
    max log size = 50
@@ -61,22 +61,15 @@
 # Use password server option only with security = server
 ;   password server = <NT-Server-Name>
 
-# Password Level allows matching of _n_ characters of the password for
-# all combinations of upper and lower case.
-;  password level = 8
-
 # You may wish to use password encryption. Please read
 # ENCRYPTION.txt, Win95.txt and WinNT.txt in the Samba documentation.
 # Do not enable this option unless you have read those documents
 ;  encrypt passwords = yes
 
-# Unix users can map to different SMB User names
-;  username map = /etc/smbusers
-
 # Using the following line enables you to customise your configuration
 # on a per machine basis. The %m gets replaced with the netbios name
 # of the machine that is connecting
-;   include = /usr/local/samba/lib/smb.conf.%m
+;   include = %%SAMBA_CONFDIR%%/smb.conf.%m
 
 # Most people will find that this option gives better performance.
 # See speed.txt and the manual pages for details
@@ -87,13 +80,6 @@
 # here. See the man page for details.
 ;   interfaces = 192.168.12.2/24 192.168.13.2/24 
 
-# Configure remote browse list synchronisation here
-#  request announcement to, or browse list sync from:
-#	a specific host or from / to a whole subnet (see below)
-;   remote browse sync = 192.168.3.25 192.168.5.255
-# Cause this host to announce itself to local subnets here
-;   remote announce = 192.168.1.255 192.168.2.44
-
 # Browser Control Options:
 # set local master to no if you don't want Samba to become a master
 # browser on your network. Otherwise the normal election rules apply
@@ -150,62 +136,6 @@
 # this has been changed in version 1.9.18 to no.
    dns proxy = no 
 
-# Case Preservation can be handy - system default is _no_
-# NOTE: These can be set on a per share basis
-;  preserve case = no
-;  short preserve case = no
-# Default case is normally upper case for all DOS files
-;  default case = lower
-# Be very careful with case sensitivity - it can break things!
-;  case sensitive = no
-
-# Client codepage settings
-
-# for Greek users
-; client code page=737
-
-# for European users (Latin 1)
-; client code page=850
-
-# for European users (Latin 2)
-; client code page=852
-
-# for Icelandic users
-; client code page=861
-
-# for Cyrillic users
-; client code page=866
-
-# for Japanese Users
-; client code page=932
-; coding system=cap
-
-# for Simplified Chinese Users
-; client code page=936
-; coding system=cap
-
-# for Korean Users
-; client code page=949
-; coding system=cap
-
-# for Traditional Chinese Users
-; client code page=950
-; coding system=cap
-
-# Samba performance workaround:
-#  If you have performance problem, please test these parameters.
-# Simon Lindgren <simon@lindgren.no> 's example:
-;   getwd cache = Yes
-;   max xmit = 8192
-;   read raw = yes
-;   read prediction = yes
-;   read size = 8192
-;   socket options = IPTOS_LOWDELAY TCP_NODELAY
-# Jerry Bell <bell@reillyplating.com> 's example:
-;   socket options = IPTOS_LOWDELAY TCP_NODELAY SO_SNDBUF=16384 SO_RCVBUF=16384
-;   readsize = 16384
-;   read prediction = true
-
 #============================ Share Definitions ==============================
 [homes]
    comment = Home Directories
@@ -233,7 +163,7 @@
 # specifically define each individual printer
 [printers]
    comment = All Printers
-   path = __SAMBA_SPOOL__
+   path = %%SAMBA_SPOOL%%
    browseable = no
 # Set public = yes to allow user 'guest account' to print
    guest ok = no