Samba 1.9.18 is dead, upgrade to samba 2.0.2.

6 files changed, 382 insertions, 426 deletions

diff --git a/net/samba/Makefile b/net/samba/Makefile
index 9a3fc9179c9..a2a5b6e6f82 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,69 +1,81 @@
-# $NetBSD: Makefile,v 1.19 1999/01/29 10:39:18 bouyer Exp $
-# FreeBSD Id: Makefile,v 1.1.1.1 1997/10/23 15:17:43 max Exp
-#
+# $NetBSD: Makefile,v 1.20 1999/02/18 11:50:06 bouyer Exp $
 
-DISTNAME=	samba-1.9.18p10
+DISTNAME=	samba-2.0.2
 CATEGORIES=	net
-MASTER_SITES=	ftp://samba.anu.edu.au/pub/samba/
+MASTER_SITES=	ftp://ftp.samba.org/pub/samba/
 
-MAINTAINER=	tsarna@netbsd.org
-HOMEPAGE=	http://samba.anu.edu.au/samba/samba.html
+MAINTAINER=	bouyer@netbsd.org
+HOMEPAGE=	http://www.samba.org/
 
-CONFLICTS=      samba-1.9.18p8 samba-2.*
+CONFLICTS=      samba-1.* samba-2.0.0beta* samba-2.0.0
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/source
+GNU_CONFIGURE=	yes
 
 .include "../../mk/bsd.prefs.mk"
 
 STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/samba.sh.sample
-SAMPLE_CONFIG=	${PREFIX}/etc/smb.conf.sample
+SAMPLE_CONFIG=	${PREFIX}/share/examples/smb.conf.sample
 SAMBA_LOGDIR=	/var/log
 SAMBA_LOCKDIR=	/var/run/samba
 SAMBA_ETCDIR?=	/etc/samba
 SAMBA_PRIVATE?=	${SAMBA_ETCDIR}/private
 
-MAKE_ENV+=	ETCDIR=${SAMBA_ETCDIR} PRIVDIR=${SAMBA_PRIVATE}
-MAKE_ENV+=	LOGDIR=${SAMBA_LOGDIR} LOCKDIR=${SAMBA_LOCKDIR}
+MAKE_ENV+=	ETCDIR=${SAMBA_ETCDIR}
+MAKE_ENV+=	LOGDIR=${SAMBA_LOGDIR}
+
+CONFIGURE_ARGS+= --with-swatdir=${PREFIX}/share/swat \
+	--with-lockdir=${SAMBA_LOCKDIR} \
+	--with-privatedir=${SAMBA_PRIVATE}
 
 PLIST_SRC= ${WRKDIR}/.PLIST-src
 
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/samba/faq
-	for i in ${WRKDIR}/${DISTNAME}/docs/*.txt ${WRKDIR}/${DISTNAME}/docs/README* ; do \
+	${MKDIR} ${PREFIX}/share/doc/samba/textdocs
+	for i in ${WRKDIR}/${DISTNAME}/docs/NT4_PlainPassword.reg \
+	    ${WRKDIR}/${DISTNAME}/docs/Win95_PlainPassword.reg \
+	    ${WRKDIR}/${DISTNAME}/docs/THANKS ; do \
 		${INSTALL_DATA} $$i ${PREFIX}/share/doc/samba; \
 	done
 	for i in ${WRKDIR}/${DISTNAME}/docs/faq/* ; do \
 		${INSTALL_DATA} $$i ${PREFIX}/share/doc/samba/faq; \
 	done
+	for i in ${WRKDIR}/${DISTNAME}/docs/textdocs/* ; do \
+		${INSTALL_DATA} $$i ${PREFIX}/share/doc/samba/textdocs; \
+	done
 .endif
-	${ECHO} "Installing ${STARTUP_SCRIPT} startup file.";		\
-	${ECHO} '#!/bin/sh' > ${STARTUP_SCRIPT};			\
-	${ECHO} 'smbd=${PREFIX}/sbin/smbd' >> ${STARTUP_SCRIPT};	\
-	${ECHO} 'nmbd=${PREFIX}/sbin/nmbd' >> ${STARTUP_SCRIPT};	\
-	${ECHO} 'if [ -f $$smbd ]; then' >> ${STARTUP_SCRIPT};		\
-	${ECHO} "	${ECHO} -n ' Samba'" >> ${STARTUP_SCRIPT};	\
-	${ECHO} '	$$smbd -D' >> ${STARTUP_SCRIPT};		\
-	${ECHO} '	$$nmbd -D' >> ${STARTUP_SCRIPT};		\
-	${ECHO} "fi" >> ${STARTUP_SCRIPT};				\
-	chmod 755 ${STARTUP_SCRIPT};					\
+	@${ECHO} "Installing ${STARTUP_SCRIPT} startup file.";           \
+	${ECHO} '#!/bin/sh' > ${STARTUP_SCRIPT};                        \
+	${ECHO} 'smbd=${PREFIX}/sbin/smbd' >> ${STARTUP_SCRIPT};        \
+	${ECHO} 'nmbd=${PREFIX}/sbin/nmbd' >> ${STARTUP_SCRIPT};        \
+	${ECHO} 'if [ -f $$smbd ]; then' >> ${STARTUP_SCRIPT};          \
+	${ECHO} "       ${ECHO} -n ' Samba'" >> ${STARTUP_SCRIPT};      \
+	${ECHO} '       $$smbd -D' >> ${STARTUP_SCRIPT};                \
+	${ECHO} '       $$nmbd -D' >> ${STARTUP_SCRIPT};                \
+	${ECHO} "fi" >> ${STARTUP_SCRIPT};                              \
+	chmod 755 ${STARTUP_SCRIPT};                                    \
 	chown bin:bin ${STARTUP_SCRIPT};
-	@if [ ! -f ${SAMPLE_CONFIG} ]; then				\
-		${SED} -e 's:__LOGDIR__:${SAMBA_LOGDIR}:g'		\
-		    -e 's:__SAMBA_LOCKDIR__:${SAMBA_LOCKDIR}:g'		\
-			${FILESDIR}/smb.conf.sample			\
-			> ${SAMPLE_CONFIG} ;				\
+	@if [ ! -f ${SAMPLE_CONFIG} ]; then                             \
+		${SED} -e 's:__LOGDIR__:${SAMBA_LOGDIR}:g'              \
+		-e 's:__ETCDIR__:${SAMBA_ETCDIR}:g'			\
+		-e 's:__PREFIX__:${PREFIX}:g'				\
+			${FILESDIR}/smb.conf.sample                     \
+			> ${SAMPLE_CONFIG} ;                            \
 	fi
-	${INSTALL_SCRIPT} ${WRKSRC}/mksmbpasswd.sh ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/script/mksmbpasswd.sh ${PREFIX}/bin
 	if [ ! -d ${SAMBA_PRIVATE} ] ; then				\
 		${MKDIR} ${SAMBA_PRIVATE} ;				\
 		chown root:wheel ${SAMBA_PRIVATE} ;			\
 		chmod 700 ${SAMBA_PRIVATE} ;				\
 	fi
-	if [ ! -f ${SAMBA_PRIVATE}/smbpasswd ] ; then			\
-		${CAT} /etc/passwd | ${PREFIX}/bin/mksmbpasswd.sh > ${SAMBA_PRIVATE}/smbpasswd ; \
-		chmod 600 ${SAMBA_PRIVATE}/smbpasswd ;			\
+	if [ ! -f ${SAMBA_PRIVATE}/smbpasswd ] ; then                   \
+		${CAT} /etc/passwd | ${PREFIX}/bin/mksmbpasswd.sh	\
+			> ${SAMBA_PRIVATE}/smbpasswd ;			\
+		chmod 600 ${SAMBA_PRIVATE}/smbpasswd ;                  \
 	fi
-	${SED} -e 's:__SAMBA_PRIVATE__:${SAMBA_PRIVATE}:g' ${PKGDIR}/PLIST > ${PLIST_SRC}
+	${SED} -e 's:__SAMBA_PRIVATE__:${SAMBA_PRIVATE}:g' ${PKGDIR}/PLIST \
+		> ${PLIST_SRC}
 
 .include "../../mk/bsd.pkg.mk"
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
 
 
-
-
diff --git a/net/samba/patches/patch-aa b/net/samba/patches/patch-aa
index c95e583e0bd..28e4c0fdf54 100644
--- a/net/samba/patches/patch-aa
+++ b/net/samba/patches/patch-aa
@@ -1,36 +1,23 @@
-$NetBSD: patch-aa,v 1.6 1998/09/04 19:17:18 bad Exp $
-
---- Makefile.orig	Mon Jun  1 02:29:04 1998
-+++ Makefile	Sun Aug  2 14:52:27 1998
-@@ -5,11 +5,11 @@
- ###########################################################################
- 
- # 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,11 @@
- #       normally only applies to nmbd and smbd
- #       SBINDIR implies a secure binary directory
- BINDIR = $(BASEDIR)/bin
--SBINDIR = $(BASEDIR)/bin
-+SBINDIR = $(BASEDIR)/sbin
- LIBDIR = $(BASEDIR)/lib
--VARDIR = $(BASEDIR)/var
+$NetBSD: patch-aa,v 1.7 1999/02/18 11:50:07 bouyer Exp $
+--- Makefile.in.orig	Sat Feb  6 22:51:43 1999
++++ Makefile.in	Thu Feb 11 14:29:47 1999
+@@ -23,12 +23,11 @@
+ 
+ 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@
 +ETCDIR?= $(BASEDIR)/etc
 +LOGDIR?= $(BASEDIR)/log
-+PRIVDIR?= $(BASEDIR)/private
  
  # The permissions to give the executables
  INSTALLPERMS = 0755
-@@ -45,17 +47,17 @@
+@@ -36,12 +35,12 @@
  # 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))
@@ -39,56 +26,35 @@ $NetBSD: patch-aa,v 1.6 1998/09/04 19:17:18 bad Exp $
 -CONFIGFILE = $(LIBDIR)/smb.conf
 -LMHOSTSFILE = $(LIBDIR)/lmhosts
 -DRIVERFILE = $(LIBDIR)/printers.def
-+SMBLOGFILE = $(LOGDIR)/smb
-+NMBLOGFILE = $(LOGDIR)/nmb
+-PASSWD_PROGRAM = /bin/passwd
++SMBLOGFILE = $(LOGDIR)/log.smb
++NMBLOGFILE = $(LOGDIR)/log.nmb
 +CONFIGFILE = $(ETCDIR)/smb.conf
 +LMHOSTSFILE = $(ETCDIR)/lmhosts
 +DRIVERFILE = $(ETCDIR)/printers.def
- SMB_PASSWD = $(BINDIR)/smbpasswd
--SMB_PASSWD_FILE = $(BASEDIR)/private/smbpasswd
-+SMB_PASSWD_FILE = $(PRIVDIR)/smbpasswd
--WEB_ROOT = $(BASEDIR)
-+WEB_ROOT = $(BASEDIR)/http/htdocs
- 
- # the directory where lock files go
--LOCKDIR = $(VARDIR)/locks
-+LOCKDIR?= $(VARDIR)/locks
- 
- # The directory where code page definition files go
- CODEPAGEDIR = $(LIBDIR)/codepages
-@@ -352,10 +354,10 @@
- # LIBSM =   
- 
- 
--# This is for NetBSD. Add -DNETBSD_1_0 if you are using 1.0
-+# This is for NetBSD
- # contributed by noses@oink.rhein.de
--# FLAGSM = -DNETBSD -DSHADOW_PWD
--# LIBSM = -lcrypt 
-+FLAGSM = -DFAST_SHARE_MODES -DSHADOW_PWD -DNETGROUP -DALLOW_CHANGE_PASSWORD -DQUOTAS
-+LIBSM = -lcrypt 
++PASSWD_PROGRAM = /usr/bin/passwd
+ # This is where smbpasswd et al go
+ PRIVATEDIR = @privatedir@
  
- # This is for NetBSD 1.3  
- # contributed by sean@fuzzymagic.com  
-@@ -824,8 +826,8 @@
- install: installbin installman installscripts installcp
+@@ -430,8 +429,8 @@
+ 	$(BASEDIR) $(SBINDIR) $(BINDIR) $(LIBDIR) $(VARDIR) $(CODEPAGEDIR)
  
- installbin: all
--	@$(SHELL) $(srcdir)installbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(SPROGS)
--	@$(SHELL) $(srcdir)installbin.sh $(INSTALLPERMS) $(BASEDIR) $(BINDIR) $(LIBDIR) $(VARDIR) $(PROGS)
-+	@$(SHELL) $(srcdir)installbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(ETCDIR) $(LOGDIR) $(SPROGS)
-+	@$(SHELL) $(srcdir)installbin.sh $(INSTALLPERMS) $(BASEDIR) $(BINDIR) $(ETCDIR) $(LOGDIR) $(PROGS)
+ installbin: all installdirs
+-	@$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(SPROGS)
+-	@$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(BASEDIR) $(BINDIR) $(LIBDIR) $(VARDIR) $(PROGS)
++	@$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(ETCDIR) $(LOGDIR) $(SPROGS)
++	@$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(BASEDIR) $(BINDIR) $(ETCDIR) $(LOGDIR) $(PROGS)
  
- installscripts:
- 	@$(SHELL) $(srcdir)installscripts.sh $(INSTALLPERMS) $(BINDIR) $(SCRIPTS)
-@@ -847,8 +849,8 @@
- 	@$(SHELL) $(srcdir)uninstallman.sh $(MANDIR) $(srcdir)
+ installscripts: installdirs
+ 	@$(SHELL) $(srcdir)/script/installscripts.sh $(INSTALLPERMS) $(BINDIR) $(SCRIPTS)
+@@ -456,8 +455,8 @@
+ 	@$(SHELL) $(srcdir)/script/uninstallman.sh $(MANDIR) $(srcdir)
  
  uninstallbin:
--	@$(SHELL) $(srcdir)uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(SPROGS)
--	@$(SHELL) $(srcdir)uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(BINDIR) $(LIBDIR) $(VARDIR) $(PROGS)
-+	@$(SHELL) $(srcdir)uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(ETCDIR) $(LOGDIR) $(SPROGS)
-+	@$(SHELL) $(srcdir)uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(BINDIR) $(ETCDIR) $(LOGDIR) $(PROGS)
+-	@$(SHELL) $(srcdir)/script/uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(SPROGS)
+-	@$(SHELL) $(srcdir)/script/uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(BINDIR) $(LIBDIR) $(VARDIR) $(PROGS)
++	@$(SHELL) $(srcdir)/script/uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(ETCDIR) $(LOGDIR) $(SPROGS)
++	@$(SHELL) $(srcdir)/script/uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(BINDIR) $(ETCDIR) $(LOGDIR) $(PROGS)
  
  uninstallscripts:
- 	@$(SHELL) $(srcdir)uninstallscripts.sh $(INSTALLPERMS) $(BINDIR) $(SCRIPTS)
+ 	@$(SHELL) $(srcdir)/script/uninstallscripts.sh $(INSTALLPERMS) $(BINDIR) $(SCRIPTS)
diff --git a/net/samba/patches/patch-ab b/net/samba/patches/patch-ab
deleted file mode 100644
index d9c935d0948..00000000000
--- a/net/samba/patches/patch-ab
+++ /dev/null
@@ -1,140 +0,0 @@
-$NetBSD: patch-ab,v 1.5 1998/09/04 19:17:19 bad Exp $
-
---- includes.h.orig	Thu Aug 20 01:41:46 1998
-+++ includes.h	Tue Sep  1 17:35:13 1998
-@@ -200,7 +200,7 @@
- #include <pwdadj.h>
- #endif
- 
--#if defined(SHADOW_PWD) && !defined(NETBSD) && !defined(FreeBSD) && !defined(CONVEX) && !defined(__OpenBSD__)
-+#if defined(SHADOW_PWD) && !defined(CONVEX)  && !defined(__NetBSD__)
- #include <shadow.h>
- #endif
- 
-@@ -518,23 +518,22 @@
- #endif
- 
- 
--#ifdef NETBSD 
--#ifdef NetBSD1_3
--#include <string.h>
-+#ifdef __NetBSD__
-+#include <dirent.h>
-+#include <strings.h>
-+#include <netinet/tcp.h>
- #ifdef ALLOW_CHANGE_PASSWORD
- #include <termios.h>
- #endif /* ALLOW_CHANGE_PASSWORD */
--#else /* NetBSD1_3 */
--#include <strings.h>
--#endif /* NetBSD1_3 */
--#include <netinet/tcp.h>
--#include <netinet/in_systm.h> 
--#include <netinet/ip.h> 
--/* you may not need this */
- #define NO_GETSPNAM
- #define SIGNAL_CAST (void (*)())
--#define USE_DIRECT
--#define REPLACE_INNETGR
-+#define HAVE_BZERO
-+#define HAVE_PATHCONF
-+#define HAVE_GETGRNAM 1
-+#define HAVE_GETTIMEOFDAY
-+#define HAVE_MEMMOVE
-+#define USE_GETCWD
-+#define USE_SETSID
- #endif 
- 
- 
---- interface.c.orig	Tue May  5 01:27:35 1998
-+++ interface.c	Wed Jun 17 14:57:01 1998
-@@ -161,7 +161,7 @@
-       }
-     }
-   }
--#elif defined(__FreeBSD__) || defined(NETBSD) || defined(AMIGA) || defined(_AIX41) || defined(__OpenBSD__)
-+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(AMIGA) || defined(_AIX41) || defined(__OpenBSD__)
-   ifc.ifc_len = sizeof(buff);
-   ifc.ifc_buf = buff;
-   if (ioctl(sock, SIOCGIFCONF, &ifc) < 0) {
---- quotas.c.orig	Wed May 13 03:46:55 1998
-+++ quotas.c	Wed Jun 17 14:57:01 1998
-@@ -548,7 +548,7 @@
- 
- #else
- 
--#if    defined(__FreeBSD__) || defined(__OpenBSD__)
-+#if    defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
- #include <ufs/ufs/quota.h>
- #include <machine/param.h>
- #elif         AIX
-@@ -558,7 +558,7 @@
- #define dqb_curfiles dqb_curinodes
- #define dqb_fhardlimit dqb_ihardlimit
- #define dqb_fsoftlimit dqb_isoftlimit
--#else /* !__FreeBSD__ && !AIX && !__OpenBSD__ */
-+#else /* !__FreeBSD__ && !AIX && !__OpenBSD__ && !__NetBSD__ */
- #include <sys/quota.h>
- #include <devnm.h>
- #endif
-@@ -571,7 +571,7 @@
-   uid_t euser_id;
-   int r;
-   struct dqblk D;
--#if !defined(__FreeBSD__) && !defined(AIX) && !defined(__OpenBSD__)
-+#if !defined(__FreeBSD__) && !defined(AIX) && !defined(__OpenBSD__) && !defined(__NetBSD__)
-   char dev_disk[256];
-   struct stat S;
-   /* find the block device file */
-@@ -593,7 +593,7 @@
-       DEBUG(5,("Unable to reset uid to %d\n", user_id));
-   }
- #else /* USE_SETRES */
--#if defined(__FreeBSD__) || defined(__OpenBSD__)
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
-   {
-     /* FreeBSD patches from Marty Moll <martym@arbor.edu> */
-     uid_t user_id;
-@@ -617,17 +617,17 @@
-   /* AIX has both USER and GROUP quotas: 
-      Get the USER quota (ohnielse@fysik.dtu.dk) */
-   r= quotactl(path,QCMD(Q_GETQUOTA,USRQUOTA),euser_id,(char *) &D);
--#else /* !__FreeBSD__ && !AIX && !__OpenBSD__ */
-+#else /* !__FreeBSD__ && !AIX && !__OpenBSD__ && !__NetBSD__ */
-   r=quotactl(Q_GETQUOTA, dev_disk, euser_id, &D);
--#endif /* !__FreeBSD__ && !AIX && !__OpenBSD__ */
-+#endif /* !__FreeBSD__ && !AIX && !__OpenBSD__ && !__NetBSD__ */
- #endif /* USE_SETRES */
- 
-   /* Use softlimit to determine disk space, except when it has been exceeded */
--#if defined(__FreeBSD__) || defined(__OpenBSD__)
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
-   *bsize = DEV_BSIZE;
--#else /* !__FreeBSD__ && !__OpenBSD__ */
-+#else /* !__FreeBSD__ && !__OpenBSD__ && !__NetBSD__ */
-   *bsize = 1024;
--#endif /*!__FreeBSD__ && !__OpenBSD__ */
-+#endif /*!__FreeBSD__ && !__OpenBSD__ && !__NetBSD__ */
- 
-   if (r)
-     {
-@@ -643,7 +643,7 @@
-     return(False);
-   /* Use softlimit to determine disk space, except when it has been exceeded */
-   if ((D.dqb_curblocks>D.dqb_bsoftlimit)
--#if !defined(__FreeBSD__) && !defined(__OpenBSD__)
-+#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
- ||((D.dqb_curfiles>D.dqb_fsoftlimit) && (D.dqb_fsoftlimit != 0))
- #endif
-     ) {
---- util.c.orig	Sat Jun 13 03:44:21 1998
-+++ util.c	Wed Jun 17 14:57:01 1998
-@@ -3614,7 +3614,7 @@
-   
-   bzero((char *)&sock,sizeof(sock));
-   memcpy((char *)&sock.sin_addr,(char *)hp->h_addr, hp->h_length);
--#if defined(__FreeBSD__) || defined(NETBSD) || defined(__OpenBSD__) /* XXX not the right ifdef */
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) /* XXX not the right ifdef */
-   sock.sin_len = sizeof(sock);
- #endif
-   sock.sin_port = htons( port );
diff --git a/net/samba/pkg/PLIST b/net/samba/pkg/PLIST
index 84cf29d1f37..44ead133e24 100644
--- a/net/samba/pkg/PLIST
+++ b/net/samba/pkg/PLIST
@@ -1,34 +1,39 @@
-@comment $NetBSD: PLIST,v 1.9 1999/01/09 20:49:27 kleink Exp $
+@comment $NetBSD: PLIST,v 1.10 1999/02/18 11:50:08 bouyer Exp $
+bin/mksmbpasswd.sh
+bin/addtosmbpass
+bin/convert_smbpasswd
+bin/make_printerdef
+bin/make_smbcodepage
+bin/nmblookup
+bin/rpcclient
 bin/smbclient
-bin/testparm
-bin/testprns
+bin/smbpasswd
 bin/smbrun
 bin/smbstatus
-bin/smbpasswd
-bin/make_smbcodepage
-bin/nmblookup
-bin/make_printerdef
 bin/smbtar
-bin/addtosmbpass
-bin/mksmbpasswd.sh
+bin/testparm
+bin/testprns
 lib/codepages/codepage.437
 lib/codepages/codepage.737
 lib/codepages/codepage.850
 lib/codepages/codepage.852
 lib/codepages/codepage.861
-lib/codepages/codepage.932
 lib/codepages/codepage.866
+lib/codepages/codepage.932
+lib/codepages/codepage.936
 lib/codepages/codepage.949
 lib/codepages/codepage.950
-lib/codepages/codepage.936
 man/man1/make_smbcodepage.1
+man/man1/nmblookup.1
 man/man1/smbclient.1
 man/man1/smbrun.1
 man/man1/smbstatus.1
 man/man1/smbtar.1
 man/man1/testparm.1
 man/man1/testprns.1
+man/man5/lmhosts.5
 man/man5/smb.conf.5
+man/man5/smbpasswd.5
 man/man7/samba.7
 man/man8/nmbd.8
 man/man8/smbd.8
@@ -36,8 +41,38 @@ man/man8/smbmnt.8
 man/man8/smbmount.8
 man/man8/smbpasswd.8
 man/man8/smbumount.8
+man/man8/swat.8
+share/swat/help/DOMAIN_MEMBER.html
+share/swat/help/lmhosts.5.html
+share/swat/help/make_smbcodepage.1.html
+share/swat/help/nmbd.8.html
+share/swat/help/nmblookup.1.html
+share/swat/help/samba.7.html
+share/swat/help/smb.conf.5.html
+share/swat/help/smbclient.1.html
+share/swat/help/smbd.8.html
+share/swat/help/smbpasswd.5.html
+share/swat/help/smbpasswd.8.html
+share/swat/help/smbrun.1.html
+share/swat/help/smbstatus.1.html
+share/swat/help/smbtar.1.html
+share/swat/help/swat.8.html
+share/swat/help/testparm.1.html
+share/swat/help/testprns.1.html
+share/swat/help/welcome.html
+share/swat/images/globals.gif
+share/swat/images/home.gif
+share/swat/images/passwd.gif
+share/swat/images/printers.gif
+share/swat/images/samba.gif
+share/swat/images/shares.gif
+share/swat/images/status.gif
+share/swat/images/viewconfig.gif
+share/swat/include/footer.html
+share/swat/include/header.html
 sbin/smbd
 sbin/nmbd
+sbin/swat
 share/doc/samba/faq/Samba-Server-FAQ-1.html
 share/doc/samba/faq/Samba-Server-FAQ-2.html
 share/doc/samba/faq/Samba-Server-FAQ.html
@@ -59,49 +94,63 @@ share/doc/samba/faq/sambafaq-5.html
 share/doc/samba/faq/sambafaq.html
 share/doc/samba/faq/sambafaq.sgml
 share/doc/samba/faq/sambafaq.txt
-share/doc/samba/Application_Serving.txt
-share/doc/samba/BROWSING-Config.txt
-share/doc/samba/BROWSING.txt
-share/doc/samba/BUGS.txt
-share/doc/samba/CVS_ACCESS.txt
-share/doc/samba/DHCP-Server-Configuration.txt
-share/doc/samba/DIAGNOSIS.txt
-share/doc/samba/DNIX.txt
-share/doc/samba/DOMAIN.txt
-share/doc/samba/DOMAIN_CONTROL.txt
-share/doc/samba/ENCRYPTION.txt
-share/doc/samba/Faxing.txt
-share/doc/samba/GOTCHAS.txt
-share/doc/samba/HINTS.txt
-share/doc/samba/MIRRORS.txt
-share/doc/samba/Macintosh_Clients.txt
-share/doc/samba/NTDOMAIN.txt
-share/doc/samba/NetBIOS.txt
-share/doc/samba/OS2-Client-HOWTO.txt
-share/doc/samba/PRINTER_DRIVER.txt
-share/doc/samba/PROFILES.txt
-share/doc/samba/Passwords.txt
-share/doc/samba/Printing.txt
-share/doc/samba/Recent-FAQs.txt
-share/doc/samba/SCO.txt
-share/doc/samba/Speed.txt
-share/doc/samba/Speed2.txt
-share/doc/samba/Support.txt
-share/doc/samba/Tracing.txt
-share/doc/samba/UNIX-SMB.txt
-share/doc/samba/UNIX_INSTALL.txt
-share/doc/samba/UNIX_SECURITY.txt
-share/doc/samba/Win95.txt
-share/doc/samba/WinNT.txt
-share/doc/samba/cifsntdomain.txt
-share/doc/samba/security_level.txt
-share/doc/samba/README.DCEDFS
-share/doc/samba/README.jis
-share/doc/samba/README.sambatar
+share/doc/samba/textdocs/Application_Serving.txt
+share/doc/samba/textdocs/BROWSING-Config.txt
+share/doc/samba/textdocs/BROWSING.txt
+share/doc/samba/textdocs/BUGS.txt
+share/doc/samba/textdocs/CVS_ACCESS.txt
+share/doc/samba/textdocs/DHCP-Server-Configuration.txt
+share/doc/samba/textdocs/DIAGNOSIS.txt
+share/doc/samba/textdocs/DNIX.txt
+share/doc/samba/textdocs/DOMAIN.txt
+share/doc/samba/textdocs/DOMAIN_CONTROL.txt
+share/doc/samba/textdocs/DOMAIN_MEMBER.txt
+share/doc/samba/textdocs/ENCRYPTION.txt
+share/doc/samba/textdocs/Faxing.txt
+share/doc/samba/textdocs/GOTCHAS.txt
+share/doc/samba/textdocs/HINTS.txt
+share/doc/samba/textdocs/INSTALL.sambatar
+share/doc/samba/textdocs/MIRRORS.txt
+share/doc/samba/textdocs/Macintosh_Clients.txt
+share/doc/samba/textdocs/NTDOMAIN.txt
+share/doc/samba/textdocs/NetBIOS.txt
+share/doc/samba/textdocs/OS2-Client-HOWTO.txt
+share/doc/samba/textdocs/PRINTER_DRIVER.txt
+share/doc/samba/textdocs/PROFILES.txt
+share/doc/samba/textdocs/PROJECTS
+share/doc/samba/textdocs/Passwords.txt
+share/doc/samba/textdocs/Printing.txt
+share/doc/samba/textdocs/README.DCEDFS
+share/doc/samba/textdocs/README.jis
+share/doc/samba/textdocs/README.sambatar
+share/doc/samba/textdocs/Recent-FAQs.txt
+share/doc/samba/textdocs/RoutedNetworks.txt
+share/doc/samba/textdocs/SCO.txt
+share/doc/samba/textdocs/SMBTAR.notes
+share/doc/samba/textdocs/SSLeay.txt
+share/doc/samba/textdocs/Speed.txt
+share/doc/samba/textdocs/Speed2.txt
+share/doc/samba/textdocs/Support.txt
+share/doc/samba/textdocs/Tracing.txt
+share/doc/samba/textdocs/UNIX-SMB.txt
+share/doc/samba/textdocs/UNIX_INSTALL.txt
+share/doc/samba/textdocs/UNIX_SECURITY.txt
+share/doc/samba/textdocs/Win95.txt
+share/doc/samba/textdocs/WinNT.txt
+share/doc/samba/textdocs/cifsntdomain.txt
+share/doc/samba/textdocs/security_level.txt
+share/doc/samba/NT4_PlainPassword.reg
+share/doc/samba/Win95_PlainPassword.reg
+share/doc/samba/THANKS
 etc/rc.d/samba.sh.sample
-etc/smb.conf.sample
+share/examples/smb.conf.sample
 @dirrm share/doc/samba/faq
+@dirrm share/doc/samba/textdocs
 @dirrm share/doc/samba
+@dirrm share/swat/help
+@dirrm share/swat/images
+@dirrm share/swat/include
+@dirrm share/swat
 @dirrm lib/codepages
 @exec mkdir -p __SAMBA_PRIVATE__ ; if [ ! -f __SAMBA_PRIVATE__/smbpasswd ] ; then chown -R root:wheel __SAMBA_PRIVATE__ ;  cat /etc/passwd | %D/bin/mksmbpasswd.sh > __SAMBA_PRIVATE__/smbpasswd ; chmod 500 __SAMBA_PRIVATE__ ; chmod 600 __SAMBA_PRIVATE__/smbpasswd ; fi
 @unexec echo "Warning: If you will *NOT* use this package anymore, please remove __SAMBA_PRIVATE__/smbpasswd manually."