- Upgrade to 3.0.23 (including security fix).

   o Improved 'make test'
   o New offline mode in winbindd.
   o New Kerberos support for pam_winbind.so.
   o New handling of unmapped users and groups.
   o New non-root share management tools.
   o Improved support for local and BUILTIN groups.
   o Winbind IDMAP integration with RFC2307 schema objects supported
     by Windows 2003 R2.
   o Rewritten 'net ads join' to mimic Windows XP without requiring
     administrative rights to join a domain.

PR:		ports/100100
Submitted by:	maintainer

1 files changed, 173 insertions, 174 deletions

diff --git a/net/samba3/pkg-plist b/net/samba3/pkg-plist
index 9a2799f28472..5e1e21ccdb58 100644
--- a/net/samba3/pkg-plist
+++ b/net/samba3/pkg-plist
@@ -23,10 +23,9 @@ bin/tdbtool
 bin/testparm
 %%SMBSH%%bin/smbsh
 %%WINBIND%%bin/wbinfo
-@unexec %D/etc/rc.d/samba.sh forcestop 2>/dev/null || true
-etc/rc.d/samba.sh
-@unexec if cmp -s %%SAMBA_CONFIG%% %%SAMBA_CONFIG%%.default; then rm -f %%SAMBA_CONFIG%%; fi
-@unexec rm -f %%SAMBA_CONFIG%%.default
+@unexec %D/etc/rc.d/samba forcestop 2>/dev/null || true
+@unexec if cmp -s %%SAMBA_CONFIG%% %%SAMBA_CONFIG%%.sample; then rm -f %%SAMBA_CONFIG%%; fi
+@unexec rm -f %%SAMBA_CONFIG%%.sample
 sbin/smbd
 sbin/nmbd
 sbin/swat
@@ -76,11 +75,9 @@ sbin/swat
 %%EXAMPLESDIR%%/nss/nss_winbind.c
 %%EXAMPLESDIR%%/nss/nss_winbind.h
 %%EXAMPLESDIR%%/nss/wbtest.c
+%%EXAMPLESDIR%%/pam_winbind/pam_winbind.conf
 %%EXAMPLESDIR%%/pdb/Makefile
 %%EXAMPLESDIR%%/pdb/README
-%%EXAMPLESDIR%%/pdb/mysql/mysql.dump
-%%EXAMPLESDIR%%/pdb/mysql/smb.conf
-%%EXAMPLESDIR%%/pdb/sambapdb.dtd
 %%EXAMPLESDIR%%/pdb/test.c
 %%EXAMPLESDIR%%/perfcounter/Makefile
 %%EXAMPLESDIR%%/perfcounter/perf.h
@@ -145,8 +142,8 @@ sbin/swat
 @dirrm %%EXAMPLESDIR%%/printing
 @dirrm %%EXAMPLESDIR%%/printer-accounting
 @dirrm %%EXAMPLESDIR%%/perfcounter
-@dirrm %%EXAMPLESDIR%%/pdb/mysql
 @dirrm %%EXAMPLESDIR%%/pdb
+@dirrm %%EXAMPLESDIR%%/pam_winbind
 @dirrm %%EXAMPLESDIR%%/nss
 @dirrm %%EXAMPLESDIR%%/misc
 @dirrm %%EXAMPLESDIR%%/logon/ntlogon
@@ -280,6 +277,7 @@ share/swat/help/Samba3-HOWTO/AdvancedNetworkManagement.html
 share/swat/help/Samba3-HOWTO/Appendix.html
 share/swat/help/Samba3-HOWTO/Backup.html
 share/swat/help/Samba3-HOWTO/CUPS-printing.html
+share/swat/help/Samba3-HOWTO/ChangeNotes.html
 share/swat/help/Samba3-HOWTO/ClientConfig.html
 share/swat/help/Samba3-HOWTO/DNSDHCP.html
 share/swat/help/Samba3-HOWTO/FastStart.html
@@ -301,7 +299,7 @@ share/swat/help/Samba3-HOWTO/VFS.html
 share/swat/help/Samba3-HOWTO/bugreport.html
 share/swat/help/Samba3-HOWTO/cfgsmarts.html
 share/swat/help/Samba3-HOWTO/ch-ldap-tls.html
-share/swat/help/Samba3-HOWTO/ch45.html
+share/swat/help/Samba3-HOWTO/ch46.html
 share/swat/help/Samba3-HOWTO/classicalprinting.html
 share/swat/help/Samba3-HOWTO/compiling.html
 share/swat/help/Samba3-HOWTO/diagnosis.html
@@ -430,169 +428,6 @@ share/swat/help/manpages/umount.cifs.8.html
 share/swat/help/manpages/vfstest.1.html
 share/swat/help/manpages/wbinfo.1.html
 share/swat/help/manpages/winbindd.8.html
-share/swat/help/using_samba/appa.html
-share/swat/help/using_samba/appb.html
-share/swat/help/using_samba/appc.html
-share/swat/help/using_samba/appd.html
-share/swat/help/using_samba/appe.html
-share/swat/help/using_samba/appf.html
-share/swat/help/using_samba/appg.html
-share/swat/help/using_samba/ch00.html
-share/swat/help/using_samba/ch01.html
-share/swat/help/using_samba/ch02.html
-share/swat/help/using_samba/ch03.html
-share/swat/help/using_samba/ch04.html
-share/swat/help/using_samba/ch05.html
-share/swat/help/using_samba/ch06.html
-share/swat/help/using_samba/ch07.html
-share/swat/help/using_samba/ch08.html
-share/swat/help/using_samba/ch09.html
-share/swat/help/using_samba/ch10.html
-share/swat/help/using_samba/ch11.html
-share/swat/help/using_samba/ch12.html
-share/swat/help/using_samba/figs/sam2_0101.gif
-share/swat/help/using_samba/figs/sam2_0102.gif
-share/swat/help/using_samba/figs/sam2_0103.gif
-share/swat/help/using_samba/figs/sam2_0104.gif
-share/swat/help/using_samba/figs/sam2_0105.gif
-share/swat/help/using_samba/figs/sam2_0106.gif
-share/swat/help/using_samba/figs/sam2_0107.gif
-share/swat/help/using_samba/figs/sam2_0108.gif
-share/swat/help/using_samba/figs/sam2_0109.gif
-share/swat/help/using_samba/figs/sam2_0110.gif
-share/swat/help/using_samba/figs/sam2_0111.gif
-share/swat/help/using_samba/figs/sam2_0112.gif
-share/swat/help/using_samba/figs/sam2_0113.gif
-share/swat/help/using_samba/figs/sam2_0114.gif
-share/swat/help/using_samba/figs/sam2_0201.gif
-share/swat/help/using_samba/figs/sam2_0202.gif
-share/swat/help/using_samba/figs/sam2_0203.gif
-share/swat/help/using_samba/figs/sam2_0204.gif
-share/swat/help/using_samba/figs/sam2_0301.gif
-share/swat/help/using_samba/figs/sam2_0302.gif
-share/swat/help/using_samba/figs/sam2_0303.gif
-share/swat/help/using_samba/figs/sam2_0304.gif
-share/swat/help/using_samba/figs/sam2_0305.gif
-share/swat/help/using_samba/figs/sam2_0306.gif
-share/swat/help/using_samba/figs/sam2_0307.gif
-share/swat/help/using_samba/figs/sam2_0308.gif
-share/swat/help/using_samba/figs/sam2_0309.gif
-share/swat/help/using_samba/figs/sam2_0310.gif
-share/swat/help/using_samba/figs/sam2_0311.gif
-share/swat/help/using_samba/figs/sam2_0312.gif
-share/swat/help/using_samba/figs/sam2_0313.gif
-share/swat/help/using_samba/figs/sam2_0314.gif
-share/swat/help/using_samba/figs/sam2_0315.gif
-share/swat/help/using_samba/figs/sam2_0316.gif
-share/swat/help/using_samba/figs/sam2_0317.gif
-share/swat/help/using_samba/figs/sam2_0318.gif
-share/swat/help/using_samba/figs/sam2_0319.gif
-share/swat/help/using_samba/figs/sam2_0320.gif
-share/swat/help/using_samba/figs/sam2_0321.gif
-share/swat/help/using_samba/figs/sam2_0322.gif
-share/swat/help/using_samba/figs/sam2_0323.gif
-share/swat/help/using_samba/figs/sam2_0324.gif
-share/swat/help/using_samba/figs/sam2_0325.gif
-share/swat/help/using_samba/figs/sam2_0326.gif
-share/swat/help/using_samba/figs/sam2_0327.gif
-share/swat/help/using_samba/figs/sam2_0328.gif
-share/swat/help/using_samba/figs/sam2_0329.gif
-share/swat/help/using_samba/figs/sam2_0330.gif
-share/swat/help/using_samba/figs/sam2_0331.gif
-share/swat/help/using_samba/figs/sam2_0332.gif
-share/swat/help/using_samba/figs/sam2_0333.gif
-share/swat/help/using_samba/figs/sam2_0334.gif
-share/swat/help/using_samba/figs/sam2_0335.gif
-share/swat/help/using_samba/figs/sam2_0336.gif
-share/swat/help/using_samba/figs/sam2_0337.gif
-share/swat/help/using_samba/figs/sam2_0338.gif
-share/swat/help/using_samba/figs/sam2_0339.gif
-share/swat/help/using_samba/figs/sam2_0340.gif
-share/swat/help/using_samba/figs/sam2_0341.gif
-share/swat/help/using_samba/figs/sam2_0342.gif
-share/swat/help/using_samba/figs/sam2_0343.gif
-share/swat/help/using_samba/figs/sam2_0344.gif
-share/swat/help/using_samba/figs/sam2_0345.gif
-share/swat/help/using_samba/figs/sam2_0346.gif
-share/swat/help/using_samba/figs/sam2_0347.gif
-share/swat/help/using_samba/figs/sam2_0348.gif
-share/swat/help/using_samba/figs/sam2_0349.gif
-share/swat/help/using_samba/figs/sam2_0350.gif
-share/swat/help/using_samba/figs/sam2_0351.gif
-share/swat/help/using_samba/figs/sam2_0352.gif
-share/swat/help/using_samba/figs/sam2_0353.gif
-share/swat/help/using_samba/figs/sam2_0354.gif
-share/swat/help/using_samba/figs/sam2_0355.gif
-share/swat/help/using_samba/figs/sam2_0356.gif
-share/swat/help/using_samba/figs/sam2_0357.gif
-share/swat/help/using_samba/figs/sam2_0358.gif
-share/swat/help/using_samba/figs/sam2_0359.gif
-share/swat/help/using_samba/figs/sam2_0360.gif
-share/swat/help/using_samba/figs/sam2_0361.gif
-share/swat/help/using_samba/figs/sam2_0401.gif
-share/swat/help/using_samba/figs/sam2_0402.gif
-share/swat/help/using_samba/figs/sam2_0403.gif
-share/swat/help/using_samba/figs/sam2_0404.gif
-share/swat/help/using_samba/figs/sam2_0405.gif
-share/swat/help/using_samba/figs/sam2_0406.gif
-share/swat/help/using_samba/figs/sam2_0407.gif
-share/swat/help/using_samba/figs/sam2_0408.gif
-share/swat/help/using_samba/figs/sam2_0409.gif
-share/swat/help/using_samba/figs/sam2_0410.gif
-share/swat/help/using_samba/figs/sam2_0411.gif
-share/swat/help/using_samba/figs/sam2_0412.gif
-share/swat/help/using_samba/figs/sam2_0413.gif
-share/swat/help/using_samba/figs/sam2_0414.gif
-share/swat/help/using_samba/figs/sam2_0415.gif
-share/swat/help/using_samba/figs/sam2_0416.gif
-share/swat/help/using_samba/figs/sam2_0417.gif
-share/swat/help/using_samba/figs/sam2_0501.gif
-share/swat/help/using_samba/figs/sam2_0502.gif
-share/swat/help/using_samba/figs/sam2_0503.gif
-share/swat/help/using_samba/figs/sam2_0504.gif
-share/swat/help/using_samba/figs/sam2_0505.gif
-share/swat/help/using_samba/figs/sam2_0506.gif
-share/swat/help/using_samba/figs/sam2_0507.gif
-share/swat/help/using_samba/figs/sam2_0508.gif
-share/swat/help/using_samba/figs/sam2_0601.gif
-share/swat/help/using_samba/figs/sam2_0602.gif
-share/swat/help/using_samba/figs/sam2_0603.gif
-share/swat/help/using_samba/figs/sam2_0604.gif
-share/swat/help/using_samba/figs/sam2_0605.gif
-share/swat/help/using_samba/figs/sam2_0701.gif
-share/swat/help/using_samba/figs/sam2_0801.gif
-share/swat/help/using_samba/figs/sam2_0802.gif
-share/swat/help/using_samba/figs/sam2_0803.gif
-share/swat/help/using_samba/figs/sam2_0804.gif
-share/swat/help/using_samba/figs/sam2_0805.gif
-share/swat/help/using_samba/figs/sam2_0806.gif
-share/swat/help/using_samba/figs/sam2_0807.gif
-share/swat/help/using_samba/figs/sam2_0808.gif
-share/swat/help/using_samba/figs/sam2_0809.gif
-share/swat/help/using_samba/figs/sam2_0810.gif
-share/swat/help/using_samba/figs/sam2_0811.gif
-share/swat/help/using_samba/figs/sam2_0901.gif
-share/swat/help/using_samba/figs/sam2_0902.gif
-share/swat/help/using_samba/figs/sam2_0903.gif
-share/swat/help/using_samba/figs/sam2_1001.gif
-share/swat/help/using_samba/figs/sam2_1002.gif
-share/swat/help/using_samba/figs/sam2_1003.gif
-share/swat/help/using_samba/figs/sam2_1004.gif
-share/swat/help/using_samba/figs/sam2_1005.gif
-share/swat/help/using_samba/figs/sam2_1006.gif
-share/swat/help/using_samba/figs/sam2_1101.gif
-share/swat/help/using_samba/figs/sam2_1102.gif
-share/swat/help/using_samba/figs/sam2_af01.gif
-share/swat/help/using_samba/figs/sam2_af02.gif
-share/swat/help/using_samba/figs/sam2_af03.gif
-share/swat/help/using_samba/figs/sam2_af04.gif
-share/swat/help/using_samba/figs/sam2_af05.gif
-share/swat/help/using_samba/figs/sam2_af06.gif
-share/swat/help/using_samba/figs/sam2_af07.gif
-share/swat/help/using_samba/inx.html
-share/swat/help/using_samba/samba2_s.gif
-share/swat/help/using_samba/samba2_xs.gif
-share/swat/help/using_samba/toc.html
 share/swat/help/welcome-no-samba-doc.html
 share/swat/help/welcome.html
 share/swat/images/globals.gif
@@ -606,10 +441,174 @@ share/swat/images/viewconfig.gif
 share/swat/images/wizard.gif
 share/swat/include/footer.html
 share/swat/include/header.html
+share/swat/using_samba/appa.html
+share/swat/using_samba/appb.html
+share/swat/using_samba/appc.html
+share/swat/using_samba/appd.html
+share/swat/using_samba/appe.html
+share/swat/using_samba/appf.html
+share/swat/using_samba/appg.html
+share/swat/using_samba/ch00.html
+share/swat/using_samba/ch01.html
+share/swat/using_samba/ch02.html
+share/swat/using_samba/ch03.html
+share/swat/using_samba/ch04.html
+share/swat/using_samba/ch05.html
+share/swat/using_samba/ch06.html
+share/swat/using_samba/ch07.html
+share/swat/using_samba/ch08.html
+share/swat/using_samba/ch09.html
+share/swat/using_samba/ch10.html
+share/swat/using_samba/ch11.html
+share/swat/using_samba/ch12.html
+share/swat/using_samba/figs/sam2_0101.gif
+share/swat/using_samba/figs/sam2_0102.gif
+share/swat/using_samba/figs/sam2_0103.gif
+share/swat/using_samba/figs/sam2_0104.gif
+share/swat/using_samba/figs/sam2_0105.gif
+share/swat/using_samba/figs/sam2_0106.gif
+share/swat/using_samba/figs/sam2_0107.gif
+share/swat/using_samba/figs/sam2_0108.gif
+share/swat/using_samba/figs/sam2_0109.gif
+share/swat/using_samba/figs/sam2_0110.gif
+share/swat/using_samba/figs/sam2_0111.gif
+share/swat/using_samba/figs/sam2_0112.gif
+share/swat/using_samba/figs/sam2_0113.gif
+share/swat/using_samba/figs/sam2_0114.gif
+share/swat/using_samba/figs/sam2_0201.gif
+share/swat/using_samba/figs/sam2_0202.gif
+share/swat/using_samba/figs/sam2_0203.gif
+share/swat/using_samba/figs/sam2_0204.gif
+share/swat/using_samba/figs/sam2_0301.gif
+share/swat/using_samba/figs/sam2_0302.gif
+share/swat/using_samba/figs/sam2_0303.gif
+share/swat/using_samba/figs/sam2_0304.gif
+share/swat/using_samba/figs/sam2_0305.gif
+share/swat/using_samba/figs/sam2_0306.gif
+share/swat/using_samba/figs/sam2_0307.gif
+share/swat/using_samba/figs/sam2_0308.gif
+share/swat/using_samba/figs/sam2_0309.gif
+share/swat/using_samba/figs/sam2_0310.gif
+share/swat/using_samba/figs/sam2_0311.gif
+share/swat/using_samba/figs/sam2_0312.gif
+share/swat/using_samba/figs/sam2_0313.gif
+share/swat/using_samba/figs/sam2_0314.gif
+share/swat/using_samba/figs/sam2_0315.gif
+share/swat/using_samba/figs/sam2_0316.gif
+share/swat/using_samba/figs/sam2_0317.gif
+share/swat/using_samba/figs/sam2_0318.gif
+share/swat/using_samba/figs/sam2_0319.gif
+share/swat/using_samba/figs/sam2_0320.gif
+share/swat/using_samba/figs/sam2_0321.gif
+share/swat/using_samba/figs/sam2_0322.gif
+share/swat/using_samba/figs/sam2_0323.gif
+share/swat/using_samba/figs/sam2_0324.gif
+share/swat/using_samba/figs/sam2_0325.gif
+share/swat/using_samba/figs/sam2_0326.gif
+share/swat/using_samba/figs/sam2_0327.gif
+share/swat/using_samba/figs/sam2_0328.gif
+share/swat/using_samba/figs/sam2_0329.gif
+share/swat/using_samba/figs/sam2_0330.gif
+share/swat/using_samba/figs/sam2_0331.gif
+share/swat/using_samba/figs/sam2_0332.gif
+share/swat/using_samba/figs/sam2_0333.gif
+share/swat/using_samba/figs/sam2_0334.gif
+share/swat/using_samba/figs/sam2_0335.gif
+share/swat/using_samba/figs/sam2_0336.gif
+share/swat/using_samba/figs/sam2_0337.gif
+share/swat/using_samba/figs/sam2_0338.gif
+share/swat/using_samba/figs/sam2_0339.gif
+share/swat/using_samba/figs/sam2_0340.gif
+share/swat/using_samba/figs/sam2_0341.gif
+share/swat/using_samba/figs/sam2_0342.gif
+share/swat/using_samba/figs/sam2_0343.gif
+share/swat/using_samba/figs/sam2_0344.gif
+share/swat/using_samba/figs/sam2_0345.gif
+share/swat/using_samba/figs/sam2_0346.gif
+share/swat/using_samba/figs/sam2_0347.gif
+share/swat/using_samba/figs/sam2_0348.gif
+share/swat/using_samba/figs/sam2_0349.gif
+share/swat/using_samba/figs/sam2_0350.gif
+share/swat/using_samba/figs/sam2_0351.gif
+share/swat/using_samba/figs/sam2_0352.gif
+share/swat/using_samba/figs/sam2_0353.gif
+share/swat/using_samba/figs/sam2_0354.gif
+share/swat/using_samba/figs/sam2_0355.gif
+share/swat/using_samba/figs/sam2_0356.gif
+share/swat/using_samba/figs/sam2_0357.gif
+share/swat/using_samba/figs/sam2_0358.gif
+share/swat/using_samba/figs/sam2_0359.gif
+share/swat/using_samba/figs/sam2_0360.gif
+share/swat/using_samba/figs/sam2_0361.gif
+share/swat/using_samba/figs/sam2_0401.gif
+share/swat/using_samba/figs/sam2_0402.gif
+share/swat/using_samba/figs/sam2_0403.gif
+share/swat/using_samba/figs/sam2_0404.gif
+share/swat/using_samba/figs/sam2_0405.gif
+share/swat/using_samba/figs/sam2_0406.gif
+share/swat/using_samba/figs/sam2_0407.gif
+share/swat/using_samba/figs/sam2_0408.gif
+share/swat/using_samba/figs/sam2_0409.gif
+share/swat/using_samba/figs/sam2_0410.gif
+share/swat/using_samba/figs/sam2_0411.gif
+share/swat/using_samba/figs/sam2_0412.gif
+share/swat/using_samba/figs/sam2_0413.gif
+share/swat/using_samba/figs/sam2_0414.gif
+share/swat/using_samba/figs/sam2_0415.gif
+share/swat/using_samba/figs/sam2_0416.gif
+share/swat/using_samba/figs/sam2_0417.gif
+share/swat/using_samba/figs/sam2_0501.gif
+share/swat/using_samba/figs/sam2_0502.gif
+share/swat/using_samba/figs/sam2_0503.gif
+share/swat/using_samba/figs/sam2_0504.gif
+share/swat/using_samba/figs/sam2_0505.gif
+share/swat/using_samba/figs/sam2_0506.gif
+share/swat/using_samba/figs/sam2_0507.gif
+share/swat/using_samba/figs/sam2_0508.gif
+share/swat/using_samba/figs/sam2_0601.gif
+share/swat/using_samba/figs/sam2_0602.gif
+share/swat/using_samba/figs/sam2_0603.gif
+share/swat/using_samba/figs/sam2_0604.gif
+share/swat/using_samba/figs/sam2_0605.gif
+share/swat/using_samba/figs/sam2_0701.gif
+share/swat/using_samba/figs/sam2_0801.gif
+share/swat/using_samba/figs/sam2_0802.gif
+share/swat/using_samba/figs/sam2_0803.gif
+share/swat/using_samba/figs/sam2_0804.gif
+share/swat/using_samba/figs/sam2_0805.gif
+share/swat/using_samba/figs/sam2_0806.gif
+share/swat/using_samba/figs/sam2_0807.gif
+share/swat/using_samba/figs/sam2_0808.gif
+share/swat/using_samba/figs/sam2_0809.gif
+share/swat/using_samba/figs/sam2_0810.gif
+share/swat/using_samba/figs/sam2_0811.gif
+share/swat/using_samba/figs/sam2_0901.gif
+share/swat/using_samba/figs/sam2_0902.gif
+share/swat/using_samba/figs/sam2_0903.gif
+share/swat/using_samba/figs/sam2_1001.gif
+share/swat/using_samba/figs/sam2_1002.gif
+share/swat/using_samba/figs/sam2_1003.gif
+share/swat/using_samba/figs/sam2_1004.gif
+share/swat/using_samba/figs/sam2_1005.gif
+share/swat/using_samba/figs/sam2_1006.gif
+share/swat/using_samba/figs/sam2_1101.gif
+share/swat/using_samba/figs/sam2_1102.gif
+share/swat/using_samba/figs/sam2_af01.gif
+share/swat/using_samba/figs/sam2_af02.gif
+share/swat/using_samba/figs/sam2_af03.gif
+share/swat/using_samba/figs/sam2_af04.gif
+share/swat/using_samba/figs/sam2_af05.gif
+share/swat/using_samba/figs/sam2_af06.gif
+share/swat/using_samba/figs/sam2_af07.gif
+share/swat/using_samba/inx.html
+share/swat/using_samba/samba2_s.gif
+share/swat/using_samba/samba2_xs.gif
+share/swat/using_samba/toc.html
+@dirrm share/swat/using_samba/figs
+@dirrm share/swat/using_samba
+@dirrm share/swat/js
 @dirrm share/swat/include
 @dirrm share/swat/images
-@dirrm share/swat/help/using_samba/figs
-@dirrm share/swat/help/using_samba
 @dirrm share/swat/help/manpages
 @dirrm share/swat/help/Samba3-HOWTO/images
 @dirrm share/swat/help/Samba3-HOWTO