updated to samba-1.9.18p3.

9 files changed, 90 insertions, 21 deletions

diff --git a/net/samba-devel/Makefile b/net/samba-devel/Makefile
index f40fb7fff09b..fd428dca1323 100644
--- a/net/samba-devel/Makefile
+++ b/net/samba-devel/Makefile
@@ -3,11 +3,11 @@
 # Date created:				11th Feb 1995
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.19 1998/01/14 01:17:14 itojun Exp $
+# $Id: Makefile,v 1.20 1998/01/27 01:59:25 jfieber Exp $
 #
 
-DISTNAME=	samba-1.9.18p2
-PKGNAME=	samba-1.9.18.2
+DISTNAME=	samba-1.9.18p3
+PKGNAME=	samba-1.9.18.3
 CATEGORIES=	net
 MASTER_SITES=	ftp://samba.anu.edu.au/pub/samba/
 
diff --git a/net/samba-devel/distinfo b/net/samba-devel/distinfo
index 10ae22a93c8a..08a65a0d480b 100644
--- a/net/samba-devel/distinfo
+++ b/net/samba-devel/distinfo
@@ -1 +1 @@
-MD5 (samba-1.9.18p2.tar.gz) = a6ab6ce3f246d05afa8c8118043d19d6
+MD5 (samba-1.9.18p3.tar.gz) = b7adc45f05547d0148cc0a722ca557a5
diff --git a/net/samba-devel/files/smb.conf.default b/net/samba-devel/files/smb.conf.default
index d66d9b744422..a155a73fab5d 100644
--- a/net/samba-devel/files/smb.conf.default
+++ b/net/samba-devel/files/smb.conf.default
@@ -14,7 +14,7 @@
 #======================= Global Settings =====================================
 [global]
 
-# workgroup = NT-Domain-Name or Workgroup-Name, eg: REDHAT4
+# workgroup = NT-Domain-Name or Workgroup-Name
    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 = /usr/local/samba/var/log.%m
 
 # Put a capping on the size of the log files (in Kb).
    max log size = 50
@@ -61,11 +61,18 @@
 # 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
@@ -80,6 +87,13 @@
 # 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
@@ -136,6 +150,15 @@
 # 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 setting
 # for Western European users
 ; client code page=850
@@ -170,7 +193,7 @@
 # specifically define each individual printer
 [printers]
    comment = All Printers
-   path = __SAMBA_SPOOL__
+   path = /usr/spool/samba
    browseable = no
 # Set public = yes to allow user 'guest account' to print
    guest ok = no
diff --git a/net/samba/Makefile b/net/samba/Makefile
index f40fb7fff09b..fd428dca1323 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -3,11 +3,11 @@
 # Date created:				11th Feb 1995
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.19 1998/01/14 01:17:14 itojun Exp $
+# $Id: Makefile,v 1.20 1998/01/27 01:59:25 jfieber Exp $
 #
 
-DISTNAME=	samba-1.9.18p2
-PKGNAME=	samba-1.9.18.2
+DISTNAME=	samba-1.9.18p3
+PKGNAME=	samba-1.9.18.3
 CATEGORIES=	net
 MASTER_SITES=	ftp://samba.anu.edu.au/pub/samba/
 
diff --git a/net/samba/distinfo b/net/samba/distinfo
index 10ae22a93c8a..08a65a0d480b 100644
--- a/net/samba/distinfo
+++ b/net/samba/distinfo
@@ -1 +1 @@
-MD5 (samba-1.9.18p2.tar.gz) = a6ab6ce3f246d05afa8c8118043d19d6
+MD5 (samba-1.9.18p3.tar.gz) = b7adc45f05547d0148cc0a722ca557a5
diff --git a/net/samba/files/smb.conf.default b/net/samba/files/smb.conf.default
index d66d9b744422..a155a73fab5d 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, eg: REDHAT4
+# workgroup = NT-Domain-Name or Workgroup-Name
    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 = /usr/local/samba/var/log.%m
 
 # Put a capping on the size of the log files (in Kb).
    max log size = 50
@@ -61,11 +61,18 @@
 # 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
@@ -80,6 +87,13 @@
 # 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
@@ -136,6 +150,15 @@
 # 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 setting
 # for Western European users
 ; client code page=850
@@ -170,7 +193,7 @@
 # specifically define each individual printer
 [printers]
    comment = All Printers
-   path = __SAMBA_SPOOL__
+   path = /usr/spool/samba
    browseable = no
 # Set public = yes to allow user 'guest account' to print
    guest ok = no
diff --git a/net/samba3/Makefile b/net/samba3/Makefile
index f40fb7fff09b..fd428dca1323 100644
--- a/net/samba3/Makefile
+++ b/net/samba3/Makefile
@@ -3,11 +3,11 @@
 # Date created:				11th Feb 1995
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.19 1998/01/14 01:17:14 itojun Exp $
+# $Id: Makefile,v 1.20 1998/01/27 01:59:25 jfieber Exp $
 #
 
-DISTNAME=	samba-1.9.18p2
-PKGNAME=	samba-1.9.18.2
+DISTNAME=	samba-1.9.18p3
+PKGNAME=	samba-1.9.18.3
 CATEGORIES=	net
 MASTER_SITES=	ftp://samba.anu.edu.au/pub/samba/
 
diff --git a/net/samba3/distinfo b/net/samba3/distinfo
index 10ae22a93c8a..08a65a0d480b 100644
--- a/net/samba3/distinfo
+++ b/net/samba3/distinfo
@@ -1 +1 @@
-MD5 (samba-1.9.18p2.tar.gz) = a6ab6ce3f246d05afa8c8118043d19d6
+MD5 (samba-1.9.18p3.tar.gz) = b7adc45f05547d0148cc0a722ca557a5
diff --git a/net/samba3/files/smb.conf.default b/net/samba3/files/smb.conf.default
index d66d9b744422..a155a73fab5d 100644
--- a/net/samba3/files/smb.conf.default
+++ b/net/samba3/files/smb.conf.default
@@ -14,7 +14,7 @@
 #======================= Global Settings =====================================
 [global]
 
-# workgroup = NT-Domain-Name or Workgroup-Name, eg: REDHAT4
+# workgroup = NT-Domain-Name or Workgroup-Name
    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 = /usr/local/samba/var/log.%m
 
 # Put a capping on the size of the log files (in Kb).
    max log size = 50
@@ -61,11 +61,18 @@
 # 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
@@ -80,6 +87,13 @@
 # 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
@@ -136,6 +150,15 @@
 # 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 setting
 # for Western European users
 ; client code page=850
@@ -170,7 +193,7 @@
 # specifically define each individual printer
 [printers]
    comment = All Printers
-   path = __SAMBA_SPOOL__
+   path = /usr/spool/samba
    browseable = no
 # Set public = yes to allow user 'guest account' to print
    guest ok = no