Samba 1.9.18 is dead, upgrade to samba 2.0.2.

2 files changed, 201 insertions, 132 deletions

diff --git a/net/samba/files/md5 b/net/samba/files/md5
index 27e5c4d95b6..781dda9ea3e 100644
--- a/net/samba/files/md5
+++ b/net/samba/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.8 1998/09/04 19:17:18 bad Exp $
+$NetBSD: md5,v 1.9 1999/02/18 11:50:07 bouyer Exp $
 
-MD5 (samba-1.9.18p10.tar.gz) = 31535614d61ccefd9dd6881685201d24
+MD5 (samba-2.0.2.tar.gz) = 67a3e3765570aa35ed6cc8fa0e819aad
diff --git a/net/samba/files/smb.conf.sample b/net/samba/files/smb.conf.sample
index e1edcca4acf..e6e262bd47e 100644
--- a/net/samba/files/smb.conf.sample
+++ b/net/samba/files/smb.conf.sample
@@ -1,114 +1,197 @@
-; $NetBSD: smb.conf.sample,v 1.3 1998/09/04 19:17:18 bad Exp $
-; Configuration file for smbd.
-; ============================================================================
-; For the format of this file and comprehensive descriptions of all the
-; configuration option, please refer to the man page for smb.conf(5).
-;
-; The following configuration should suit most systems for basic usage and 
-; initial testing. It gives all clients access to their home directories and
-; allows access to all printers specified in /etc/printcap.
-;
-; Things you need to check:
-; --------------------------
-;
-; 1: Check the path to your printcap file. If you are using a system that does 
-;    not use printcap (eg., Solaris), create a file containing lines of the 
-;    form
-;
-;       printername|printername|printername|
-;
-;    where each "printername" is the name of a printer you want to provide 
-;    access to. Then alter the "printcap =" entry to point to the new file.
-;
-;    If using Solaris, the following command will generate a suitable printcap
-;    file:
-;
-;       lpc status | grep ":" | sed s/:/\|/ > myprintcap
-;
-; 2: Make sure the "print command" entry is correct for your system. This 
-;    command should submit a file (represented by %s) to a printer 
-;    (represented by %p) for printing and should REMOVE the file after 
-;    printing.
-;  
-;    One most systems the default will be OK, as long as you get "printing ="
-;    right.
-;    
-;    It is also a good idea to use an absolute path in the print command
-;    as there is no guarantee the search path will be set correctly.
-;
-; 3: Make sure the "printing =" option is set correctly for your system.
-;    Possible values are "sysv", "bsd" or "aix".
-;
-; 4: Make sure the "lpq command" entry is correct for your system. The default
-;    may not work for you.
-;
-; 5: Make sure that the user specified in "guest account" exists. Typically
-;    this will be a user that cannot log in and has minimal privileges.
-;    Often the "nobody" account doesn't work (very system dependant).
-;
-; 6: You should consider the "security =" option. See a full description
-;    in the main documentation and the smb.conf(5) manual page
-;
-; 7: Look at the "hosts allow" option, unless you want everyone on the internet
-;    to be able to access your files.
-;
+# This is the main Samba configuration file. You should read the
+# smb.conf(5) manual page in order to understand the options listed
+# here. Samba has a huge number of configurable options (perhaps too
+# many!) most of which are not shown in this example
+#
+# Any line which starts with a ; (semi-colon) or a # (hash) 
+# is a comment and is ignored. In this example we will use a #
+# for commentry and a ; for parts of the config file that you
+# may wish to enable
+#
+# NOTE: Whenever you modify this file you should run the command "testparm"
+# to check that you have not many any basic syntactic errors. 
+#
+#======================= Global Settings =====================================
 [global]
-   comment = NetBSD - Samba %v
-   workgroup = WORKGROUP
-   printing = bsd
-   printcap name = /etc/printcap
+
+# workgroup = NT-Domain-Name or Workgroup-Name, eg: REDHAT4
+   workgroup = MYGROUP
+
+# server string is the equivalent of the NT Description field
+   server string = NetBSD - Samba %v
+
+# This option is important for security. It allows you to restrict
+# connections to machines which are on your local network. The
+# following example restricts access to two C class networks and
+# the "loopback" interface. For more examples of the syntax see
+# the smb.conf man page
+;   hosts allow = 192.168.1. 192.168.2. 127.
+
+# If you want to automatically load your printer list rather
+# than setting them up individually then you'll need this
    load printers = yes
-   guest account = nobody
-;  This next option sets a separate log file for each client. Uncomment
-;  it if you want a combined log file.
-;   log file = __LOGDIR__/sambalog.%m
-   dont descend = /dev,/proc,/root,/stand
-
-;  You will need a world readable lock directory and "share modes=yes"
-;  if you want to support the file sharing modes for multiple users
-;  of the same files
-;  lock directory = __SAMBA_LOCKDIR__
-;  share modes = yes
-
-   map archive = no
-   status = yes
-   public = yes
-   read only = no
-   preserve case = yes
-   strip dot = yes
-   security = share
-   guest ok = no
 
+# you may wish to override the location of the printcap file
+;   printcap name = /etc/printcap
+
+# on SystemV system setting printcap name to lpstat should allow
+# you to automatically obtain a printer list from the SystemV spool
+# system
+;   printcap name = lpstat
+
+# It should not be necessary to specify the print system type unless
+# it is non-standard. Currently supported print systems include:
+# bsd, sysv, plp, lprng, aix, hpux, qnx
+;   printing = bsd
+
+# Uncomment this if you want a guest account, you must add this to /etc/passwd
+# otherwise the user "nobody" is used
+;  guest account = pcguest
+
+# this tells Samba to use a separate log file for each machine
+# that connects
+   log file = __LOGDIR__/log.%m
+
+# Put a capping on the size of the log files (in Kb).
+   max log size = 50
+
+# Security mode. Most people will want user level security. See
+# security_level.txt for details.
+   security = user
+# Use password server option only with security = server
+;   password server = <NT-Server-Name>
+
+# 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
+
+# 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 = __ETCDIR__/smb.conf.%m
+
+# Most people will find that this option gives better performance.
+# See speed.txt and the manual pages for details
+   socket options = TCP_NODELAY 
+
+# Configure Samba to use multiple interfaces
+# If you have multiple network interfaces then you must list them
+# here. See the man page for details.
+;   interfaces = 192.168.12.2/24 192.168.13.2/24 
+
+# 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
+;   local master = no
+
+# OS Level determines the precedence of this server in master browser
+# elections. The default value should be reasonable
+;   os level = 33
+
+# Domain Master specifies Samba to be the Domain Master Browser. This
+# allows Samba to collate browse lists between subnets. Don't use this
+# if you already have a Windows NT domain controller doing this job
+;   domain master = yes 
+
+# Preferred Master causes Samba to force a local browser election on startup
+# and gives it a slightly higher chance of winning the election
+;   preferred master = yes
+
+# Use only if you have an NT server on your network that has been
+# configured at install time to be a primary domain controller.
+;   domain controller = <NT-Domain-Controller-SMBName>
+
+# Enable this if you want Samba to be a domain logon server for 
+# Windows95 workstations. 
+;   domain logons = yes
+
+# if you enable domain logons then you may want a per-machine or
+# per user logon script
+# run a specific logon batch file per workstation (machine)
+;   logon script = %m.bat
+# run a specific logon batch file per username
+;   logon script = %U.bat
+
+# Where to store roving profiles (only for Win95 and WinNT)
+#        %L substitutes for this servers netbios name, %U is username
+#        You must uncomment the [Profiles] share below
+;   logon path = \\%L\Profiles\%U
+
+# Windows Internet Name Serving Support Section:
+# WINS Support - Tells the NMBD component of Samba to enable it's WINS Server
+;   wins support = yes
+
+# WINS Server - Tells the NMBD components of Samba to be a WINS Client
+#	Note: Samba can be either a WINS Server, or a WINS Client, but NOT both
+;   wins server = w.x.y.z
+
+# WINS Proxy - Tells Samba to answer name resolution queries on
+# behalf of a non WINS capable client, for this to work there must be
+# at least one	WINS Server on the network. The default is NO.
+;   wins proxy = yes
+
+# DNS Proxy - tells Samba whether or not to try to resolve NetBIOS names
+# via DNS nslookups. The built-in default for versions 1.9.17 is yes,
+# this has been changed in version 1.9.18 to no.
+   dns proxy = no 
+
+#============================ Share Definitions ==============================
 [homes]
    comment = Home Directories
    browseable = no
-   read only = no
-   create mode = 0750
+   writable = yes
 
+# Un-comment the following and create the netlogon directory for Domain Logons
+; [netlogon]
+;   comment = Network Logon Service
+;   path = __PREFIX__/lib/netlogon
+;   guest ok = yes
+;   writable = no
+;   share modes = no
+
+
+# Un-comment the following to provide a specific roving profile share
+# the default is to use the user's home directory
+;[Profiles]
+;    path = /usr/local/samba/profiles
+;    browseable = no
+;    guest ok = yes
+
+
+# NOTE: If you have a BSD-style print system there is no need to 
+# specifically define each individual printer
 [printers]
    comment = All Printers
-   path = /tmp
+   path = /var/tmp
    browseable = no
-   printable = yes
-   public = no
+# Set public = yes to allow user 'guest account' to print
+   guest ok = no
    writable = no
-   create mode = 0700
+   printable = yes
 
-; you might also want this one, notice that it is read only so as not to give
-; people without an account write access. 
-;
-; [tmp]
+# This one is useful for people to share files
+;[tmp]
 ;   comment = Temporary file space
 ;   path = /tmp
-;   read only = yes
+;   read only = no
 ;   public = yes
 
-;
-; Other examples. 
-;
-; A private printer, usable only by fred. Spool data will be placed in fred's
-; home directory. Note that fred must have write access to the spool directory,
-; wherever it is.
+# A publicly accessible directory, but read only, except for people in
+# the "staff" group
+;[public]
+;   comment = Public Stuff
+;   path = /home/samba
+;   public = yes
+;   writable = yes
+;   printable = no
+;   write list = @staff
+
+# Other examples. 
+#
+# A private printer, usable only by fred. Spool data will be placed in fred's
+# home directory. Note that fred must have write access to the spool directory,
+# wherever it is.
 ;[fredsprn]
 ;   comment = Fred's Printer
 ;   valid users = fred
@@ -117,9 +200,9 @@
 ;   public = no
 ;   writable = no
 ;   printable = yes
-;
-; A private directory, usable only by fred. Note that fred requires write
-; access to the directory.
+
+# A private directory, usable only by fred. Note that fred requires write
+# access to the directory.
 ;[fredsdir]
 ;   comment = Fred's Service
 ;   path = /usr/somewhere/private
@@ -127,46 +210,34 @@
 ;   public = no
 ;   writable = yes
 ;   printable = no
-;
-; A publicly accessible directory, but read only, except for people in
-; the staff group
-;[public]
-;   comment = Public Stuff
-;   path = /usr/somewhere/public
-;   public = yes
-;   writable = no
-;   printable = no
-;   write list = @staff
-;
-; a service which has a different directory for each machine that connects
-; this allows you to tailor configurations to incoming machines. You could
-; also use the %u option to tailor it by user name.
-; The %m gets replaced with the machine name that is connecting.
+
+# a service which has a different directory for each machine that connects
+# this allows you to tailor configurations to incoming machines. You could
+# also use the %U option to tailor it by user name.
+# The %m gets replaced with the machine name that is connecting.
 ;[pchome]
 ;  comment = PC Directories
 ;  path = /usr/pc/%m
 ;  public = no
-;  writeable = yes
-;
-;
-; A publicly accessible directory, read/write to all users. Note that all files
-; created in the directory by users will be owned by the default user, so
-; any user with access can delete any other user's files. Obviously this
-; directory must be writable by the default user. Another user could of course
-; be specified, in which case all files would be owned by that user instead.
+;  writable = yes
+
+# A publicly accessible directory, read/write to all users. Note that all files
+# created in the directory by users will be owned by the default user, so
+# any user with access can delete any other user's files. Obviously this
+# directory must be writable by the default user. Another user could of course
+# be specified, in which case all files would be owned by that user instead.
 ;[public]
 ;   path = /usr/somewhere/else/public
 ;   public = yes
 ;   only guest = yes
 ;   writable = yes
 ;   printable = no
-;
-;
-; The following two entries demonstrate how to share a directory so that two
-; users can place files there that will be owned by the specific users. In this
-; setup, the directory should be writable by both users and should have the
-; sticky bit set on it to prevent abuse. Obviously this could be extended to
-; as many users as required.
+
+# The following two entries demonstrate how to share a directory so that two
+# users can place files there that will be owned by the specific users. In this
+# setup, the directory should be writable by both users and should have the
+# sticky bit set on it to prevent abuse. Obviously this could be extended to
+# as many users as required.
 ;[myshare]
 ;   comment = Mary's and Fred's stuff
 ;   path = /usr/somewhere/shared
@@ -177,5 +248,3 @@
 ;   create mask = 0765
 
 
-
-