Update samba to 2.2.0. Changes from version 2.0.9 include:

* Integration between Windows oplocks and NFS file opens (IRIX and Linux
  2.4 kernel only). This gives complete data and locking integrity between
  Windows and UNIX file access to the same data files.

* Ability to act as an authentication source for Windows 2000 clients as
  well as for NT4.x clients.

* Integration with the winbind daemon that provides a single
  sign on facility for UNIX servers in Windows 2000/NT4 networks
  driven by a Windows 2000/NT4 PDC.

* Support for native Windows 2000/NT4 printing RPCs. This includes
  support for automatic printer driver download.

* Support for server supported Access Control Lists (ACLs).

* On PAM (Pluggable Authentication Module) based systems - better debugging
  messages and encrypted password users now have access control verified via
  PAM - Note: Authentication still uses the encrypted password database.

* Rewritten internal locking semantics for more robustness.
  This release supports full 64 bit locking semantics on all
  (even 32 bit) platforms. SMB locks are mapped onto POSIX
  locks (32 bit or 64 bit) as the underlying system allows.

* Conversion of various internal flat data structures to use
  database records for increased performance and
  flexibility.

* Support for acting as a MS-DFS (Distributed File System) server.

* Support for manipulating Samba shares using Windows client tools
  (server manager). Per share security can be set using these tools
  and Samba will obey the access restrictions applied.

* Samba profiling support

* Compile time option for enabling a (Virtual file system) VFS layer
  to allow non-disk resources to be exported as Windows filesystems
  (such as databases etc.).

3 files changed, 226 insertions, 98 deletions

diff --git a/net/samba/pkg/DEINSTALL b/net/samba/pkg/DEINSTALL
index 4a564fd8d8c..4f20195cc8a 100644
--- a/net/samba/pkg/DEINSTALL
+++ b/net/samba/pkg/DEINSTALL
@@ -1,27 +1,97 @@
 #!/bin/sh
 #
-# $NetBSD: DEINSTALL,v 1.2 2000/06/26 23:07:37 jlam Exp $
+# $NetBSD: DEINSTALL,v 1.3 2001/05/14 18:56:17 jlam Exp $
 
 PKGNAME=$1
 STAGE=$2
 
-SAMBA_PRIVATE=@SAMBA_PRIVATE@
+CAT="@CAT@"
+RM="@RM@"
+RMDIR="@RMDIR@"
+TRUE="@TRUE@"
+
+SAMBA_PRIVATE="@SAMBA_PRIVATE@"
+SAMBA_LOCKDIR="@SAMBA_LOCKDIR@"
+ROOT_GROUP="@ROOT_GROUP@"
+SAMPLECONFDIR=${PKG_PREFIX}/share/examples/samba
+CONFDIR=@SAMBA_ETCDIR@
+CONFFILES="smb.conf"
 
 case ${STAGE} in
 DEINSTALL)
+	# Remove configuration files if they don't differ from the default
+	# config file.
+	#
+	for file in ${CONFFILES}
+	do
+		FILE=${CONFDIR}/${file}
+		SAMPLEFILE=${SAMPLECONFDIR}/${file}.sample
+		if diff -q ${FILE} ${SAMPLEFILE} >/dev/null
+		then
+			${RM} -f ${FILE}
+		fi
+	done
 	;;
+
 POST-DEINSTALL)
-	cat << EOF
+	modified_files=''
+	for file in ${CONFFILES}
+	do
+		FILE=${CONFDIR}/${file}
+		if [ -f ${FILE} ]
+		then
+			modified_files="${modified_files} ${FILE}"
+		fi
+	done
+
+	${RMDIR} ${SAMBA_PRIVATE} 2>/dev/null || ${TRUE}
+	${RMDIR} ${SAMBA_LOCKDIR} 2>/dev/null || ${TRUE}
+	${RMDIR} ${CONFDIR} 2>/dev/null || ${TRUE}
+
+	existing_dirs=''
+	for dir in ${CONFDIR} ${SAMBA_PRIVATE} ${SAMBA_LOCKDIR}
+	do
+		if [ -d ${dir} ]
+		then
+			existing_dirs="${existing_dirs} ${dir}"
+		fi
+	done
+
+	${CAT} << EOF
 ===========================================================================
-If you won't be using ${PKGNAME} any longer, you may want to remove the
-following files:
-	
-	${SAMBA_PRIVATE}/smbpasswd
+If you won't be using ${PKGNAME} any longer, you may want to remove:
+EOF
+	if [ -n "${modified_files}" ]
+	then
+		${CAT} << EOF
+
+  * the following files:
+
+EOF
+		for file in ${modified_files}
+		do
+			echo "	${file}"
+		done
+	fi
+	if [ -n "${existing_dirs}" ]
+	then
+		${CAT} << EOF
+
+  * the following directories:
+
+EOF
+		for dir in ${existing_dirs}
+		do
+			echo "	${dir}"
+		done
+	fi
+	${CAT} << EOF
 ===========================================================================
 EOF
 	;;
+
 *)
-	echo "Unexpected argument: $2"
+	echo "Unexpected argument: ${STAGE}"
 	exit 1
 	;;
 esac
diff --git a/net/samba/pkg/INSTALL b/net/samba/pkg/INSTALL
index 0b365aeb0ba..6e960ac774a 100644
--- a/net/samba/pkg/INSTALL
+++ b/net/samba/pkg/INSTALL
@@ -1,32 +1,59 @@
 #!/bin/sh
 #
-# $NetBSD: INSTALL,v 1.4 2000/05/17 09:22:28 veego Exp $
+# $NetBSD: INSTALL,v 1.5 2001/05/14 18:56:17 jlam Exp $
 
 PKGNAME=$1
 STAGE=$2
 
-SAMBA_PRIVATE=@SAMBA_PRIVATE@
-ROOT_GROUP=@ROOT_GROUP@
+CAT="@CAT@"
+CHMOD="@CHMOD@"
+CHOWN="@CHOWN@"
+CP="@CP@"
+MKDIR="@MKDIR@"
+RM="@RM@"
+
+SAMBA_PRIVATE="@SAMBA_PRIVATE@"
+SAMBA_LOCKDIR="@SAMBA_LOCKDIR@"
+SAMPLECONFDIR=${PKG_PREFIX}/share/examples/samba
+CONFDIR=@SAMBA_ETCDIR@
+CONFFILES="smb.conf"
 
 case ${STAGE} in
 PRE-INSTALL)
 	;;
+
 POST-INSTALL)
-	mkdir -p ${SAMBA_PRIVATE}
+	${MKDIR} -p ${CONFDIR} ${SAMBA_PRIVATE} ${SAMBA_LOCKDIR}
+	echo "Installing configuration files:"
+	for file in ${CONFFILES}
+	do
+		FILE=${CONFDIR}/${file}
+		SAMPLEFILE=${SAMPLECONFDIR}/${file}.sample
+		if [ -f ${FILE} ]
+		then
+			echo "    ${FILE} already exists"
+		else
+			echo "    ${FILE}"
+			${CP} ${SAMPLEFILE} ${FILE}
+			${CHMOD} 644 ${FILE}
+                fi
+	done
+
+	# Create SMB password file
 	if [ ! -f ${SAMBA_PRIVATE}/smbpasswd ]
 	then
 		echo -n "Creating ${SAMBA_PRIVATE}/smbpasswd..."
-		chown -R root ${SAMBA_PRIVATE}
-		chgrp -R ${ROOT_GROUP} ${SAMBA_PRIVATE}
-		cat /etc/passwd | ${PKG_PREFIX}/bin/mksmbpasswd.sh \
-			>${SAMBA_PRIVATE}/smbpasswd
-		chmod 500 ${SAMBA_PRIVATE}
-		chmod 600 ${SAMBA_PRIVATE}/smbpasswd
+		${CHOWN} -R 0:0 ${SAMBA_PRIVATE}
+		${CAT} /etc/passwd | ${PKG_PREFIX}/sbin/mksmbpasswd	\
+			> ${SAMBA_PRIVATE}/smbpasswd
+		${CHMOD} 600 ${SAMBA_PRIVATE}/smbpasswd
+		${CHMOD} 500 ${SAMBA_PRIVATE}
 		echo "done."
 	fi
 	;;
+
 *)
-	echo "Unexpected argument: $2"
+	echo "Unexpected argument: ${STAGE}"
 	exit 1
 	;;
 esac
diff --git a/net/samba/pkg/PLIST b/net/samba/pkg/PLIST
index c6d3033cce6..da0ad32fbbf 100644
--- a/net/samba/pkg/PLIST
+++ b/net/samba/pkg/PLIST
@@ -1,13 +1,13 @@
-@comment $NetBSD: PLIST,v 1.22 2001/04/18 12:54:47 tron Exp $
-bin/addtosmbpass
+@comment $NetBSD: PLIST,v 1.23 2001/05/14 18:56:17 jlam Exp $
 bin/convert_smbpasswd
 bin/make_printerdef
 bin/make_smbcodepage
 bin/make_unicodemap
-bin/mksmbpasswd.sh
 bin/nmblookup
 bin/rpcclient
+bin/smbcacls
 bin/smbclient
+bin/smbcontrol
 bin/smbpasswd
 bin/smbspool
 bin/smbstatus
@@ -22,6 +22,7 @@ lib/codepages/codepage.737
 lib/codepages/codepage.775
 lib/codepages/codepage.850
 lib/codepages/codepage.852
+lib/codepages/codepage.857
 lib/codepages/codepage.861
 lib/codepages/codepage.866
 lib/codepages/codepage.932
@@ -30,8 +31,10 @@ lib/codepages/codepage.949
 lib/codepages/codepage.950
 lib/codepages/unicode_map.437
 lib/codepages/unicode_map.737
+lib/codepages/unicode_map.775
 lib/codepages/unicode_map.850
 lib/codepages/unicode_map.852
+lib/codepages/unicode_map.857
 lib/codepages/unicode_map.861
 lib/codepages/unicode_map.866
 lib/codepages/unicode_map.932
@@ -39,20 +42,28 @@ lib/codepages/unicode_map.936
 lib/codepages/unicode_map.949
 lib/codepages/unicode_map.950
 lib/codepages/unicode_map.ISO8859-1
+lib/codepages/unicode_map.ISO8859-13
+lib/codepages/unicode_map.ISO8859-15
 lib/codepages/unicode_map.ISO8859-2
 lib/codepages/unicode_map.ISO8859-5
 lib/codepages/unicode_map.ISO8859-7
+lib/codepages/unicode_map.ISO8859-9
 lib/codepages/unicode_map.KOI8-R
+man/man1/findsmb.1
 man/man1/make_smbcodepage.1
 man/man1/make_unicodemap.1
 man/man1/nmblookup.1
+man/man1/rpcclient.1
+man/man1/smbcacls.1
 man/man1/smbclient.1
+man/man1/smbcontrol.1
 man/man1/smbrun.1
 man/man1/smbsh.1
 man/man1/smbstatus.1
 man/man1/smbtar.1
 man/man1/testparm.1
 man/man1/testprns.1
+man/man1/wbinfo.1
 man/man5/lmhosts.5
 man/man5/smb.conf.5
 man/man5/smbpasswd.5
@@ -65,91 +76,97 @@ man/man8/smbpasswd.8
 man/man8/smbspool.8
 man/man8/smbumount.8
 man/man8/swat.8
+man/man8/winbindd.8
+sbin/mksmbpasswd
 sbin/nmbd
 sbin/smbd
 sbin/swat
+share/doc/html/samba/Samba-Server-FAQ-1.html
+share/doc/html/samba/Samba-Server-FAQ-2.html
+share/doc/html/samba/Samba-Server-FAQ.html
+share/doc/html/samba/Samba-meta-FAQ-1.html
+share/doc/html/samba/Samba-meta-FAQ-2.html
+share/doc/html/samba/Samba-meta-FAQ-3.html
+share/doc/html/samba/Samba-meta-FAQ-4.html
+share/doc/html/samba/Samba-meta-FAQ-5.html
+share/doc/html/samba/Samba-meta-FAQ-6.html
+share/doc/html/samba/Samba-meta-FAQ.html
+share/doc/html/samba/sambafaq-1.html
+share/doc/html/samba/sambafaq-2.html
+share/doc/html/samba/sambafaq-3.html
+share/doc/html/samba/sambafaq-4.html
+share/doc/html/samba/sambafaq-5.html
+share/doc/html/samba/sambafaq.html
 share/doc/samba/NT4-Locking.reg
-share/doc/samba/NT4-Locking.txt
 share/doc/samba/NT4_PlainPassword.reg
-share/doc/samba/THANKS
 share/doc/samba/Win2000_PlainPassword.reg
 share/doc/samba/Win95_PlainPassword.reg
 share/doc/samba/Win98_PlainPassword.reg
 share/doc/samba/Win9X-CacheHandling.reg
+share/doc/samba/WinME_PlainPassword.reg
 share/doc/samba/WindowsTerminalServer.reg
 share/doc/samba/announce
-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
-share/doc/samba/faq/Samba-meta-FAQ-1.html
-share/doc/samba/faq/Samba-meta-FAQ-2.html
-share/doc/samba/faq/Samba-meta-FAQ-3.html
-share/doc/samba/faq/Samba-meta-FAQ-4.html
-share/doc/samba/faq/Samba-meta-FAQ-5.html
-share/doc/samba/faq/Samba-meta-FAQ-6.html
-share/doc/samba/faq/Samba-meta-FAQ.html
-share/doc/samba/faq/sambafaq-1.html
-share/doc/samba/faq/sambafaq-2.html
-share/doc/samba/faq/sambafaq-3.html
-share/doc/samba/faq/sambafaq-4.html
-share/doc/samba/faq/sambafaq-5.html
-share/doc/samba/faq/sambafaq.html
-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/CRLF-LF-Conversions.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/File-Cacheing.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/NT-Guest-Access.txt
-share/doc/samba/textdocs/NTDOMAIN.txt
-share/doc/samba/textdocs/NT_Security.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/textdocs/smbmount.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/Faxing.txt
+share/doc/samba/GOTCHAS.txt
+share/doc/samba/HINTS.txt
+share/doc/samba/INSTALL.sambatar
+share/doc/samba/Imprints.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/PRINTER_DRIVER.txt
+share/doc/samba/PROFILES.txt
+share/doc/samba/PROJECTS
+share/doc/samba/Passwords.txt
+share/doc/samba/Printing.txt
+share/doc/samba/README.DCEDFS
+share/doc/samba/README.jis
+share/doc/samba/README.sambatar
+share/doc/samba/Recent-FAQs.txt
+share/doc/samba/RoutedNetworks.txt
+share/doc/samba/SCO.txt
+share/doc/samba/SMBTAR.notes
+share/doc/samba/SSLeay.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_SECURITY.txt
+share/doc/samba/Win95.txt
+share/doc/samba/WinNT.txt
+share/doc/samba/cifsntdomain.txt
+share/doc/samba/kurs.pdf
+share/doc/samba/kurs.tex
+share/doc/samba/logo.ps
+share/doc/samba/samba-pdc-faq.txt
+share/doc/samba/samba-pdc-howto.txt
+share/doc/samba/security_level.txt
 share/examples/samba/README
-share/examples/samba/autofs/README
+share/examples/samba/VFS/Makefile
+share/examples/samba/VFS/README
+share/examples/samba/VFS/audit.c
+share/examples/samba/VFS/skel.c
+share/examples/samba/appliance/Makefile
+share/examples/samba/appliance/README
+share/examples/samba/appliance/appliance.spec
+share/examples/samba/appliance/build.sh
+share/examples/samba/appliance/smb.conf-appliance
 share/examples/samba/autofs/auto.a
 share/examples/samba/dce-dfs/README
 share/examples/samba/dce-dfs/smb.conf
 share/examples/samba/misc/extra_smbstatus
+share/examples/samba/misc/swat.pl
 share/examples/samba/misc/wall.perl
 share/examples/samba/printer-accounting/README
 share/examples/samba/printer-accounting/acct-all
@@ -158,6 +175,7 @@ share/examples/samba/printer-accounting/hp5-redir
 share/examples/samba/printer-accounting/lp-acct
 share/examples/samba/printer-accounting/printcap
 share/examples/samba/printing/smbprint
+share/examples/samba/printing/smbprint.newer
 share/examples/samba/printing/smbprint.sysv
 share/examples/samba/simple/README
 share/examples/samba/simple/smb.conf
@@ -177,18 +195,28 @@ share/examples/samba/validchars/nwdos70.out
 share/examples/samba/validchars/readme
 share/examples/samba/validchars/validchr.c
 share/examples/samba/validchars/validchr.com
-share/examples/samba/wins_hook/README
-share/examples/samba/wins_hook/dns_update
 share/swat/help/DOMAIN_MEMBER.html
+share/swat/help/ENCRYPTION.html
 share/swat/help/NT_Security.html
+share/swat/help/OS2-Client-HOWTO.html
+share/swat/help/Samba-HOWTO-Collection.html
+share/swat/help/Samba-PDC-HOWTO.html
+share/swat/help/UNIX_INSTALL.html
+share/swat/help/findsmb.1.html
 share/swat/help/lmhosts.5.html
 share/swat/help/make_smbcodepage.1.html
-share/swat/help/make_unicodemap.1.html
+share/swat/help/msdfs_setup.html
 share/swat/help/nmbd.8.html
 share/swat/help/nmblookup.1.html
+share/swat/help/printer_driver2.html
+share/swat/help/rpcclient.1.html
+share/swat/help/samba-pdc-faq.html
+share/swat/help/samba-pdc-howto.html
 share/swat/help/samba.7.html
 share/swat/help/smb.conf.5.html
+share/swat/help/smbcacls.1.html
 share/swat/help/smbclient.1.html
+share/swat/help/smbcontrol.1.html
 share/swat/help/smbd.8.html
 share/swat/help/smbmnt.8.html
 share/swat/help/smbmount.8.html
@@ -199,11 +227,14 @@ share/swat/help/smbsh.1.html
 share/swat/help/smbspool.8.html
 share/swat/help/smbstatus.1.html
 share/swat/help/smbtar.1.html
+share/swat/help/smbumount.8.html
 share/swat/help/swat.8.html
 share/swat/help/testparm.1.html
 share/swat/help/testprns.1.html
+share/swat/help/wbinfo.1.html
 share/swat/help/welcome.html
-share/swat/help/welcome.ja_JP.ujis.html
+share/swat/help/winbind.html
+share/swat/help/winbindd.8.html
 share/swat/images/globals.gif
 share/swat/images/home.gif
 share/swat/images/passwd.gif
@@ -380,7 +411,6 @@ share/swat/using_samba/this_edition.html
 @dirrm share/swat/images
 @dirrm share/swat/help
 @dirrm share/swat
-@dirrm share/examples/samba/wins_hook
 @dirrm share/examples/samba/validchars
 @dirrm share/examples/samba/tridge
 @dirrm share/examples/samba/thoralf
@@ -391,8 +421,9 @@ share/swat/using_samba/this_edition.html
 @dirrm share/examples/samba/misc
 @dirrm share/examples/samba/dce-dfs
 @dirrm share/examples/samba/autofs
+@dirrm share/examples/samba/appliance
+@dirrm share/examples/samba/VFS
 @dirrm share/examples/samba
-@dirrm share/doc/samba/textdocs
-@dirrm share/doc/samba/faq
 @dirrm share/doc/samba
+@dirrm share/doc/html/samba
 @dirrm lib/codepages