[Midnightbsd-cvs] mports: net/samba3: update to 3.0.32
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Mon Oct 20 14:35:45 EDT 2008
Log Message:
-----------
update to 3.0.32
Modified Files:
--------------
mports/net/samba3:
Makefile (r1.9 -> r1.10)
distinfo (r1.3 -> r1.4)
pkg-plist (r1.4 -> r1.5)
pkg-plist.swat (r1.2 -> r1.3)
mports/net/samba3/files:
patch-Makefile.in (r1.2 -> r1.3)
pkg-message.in (r1.2 -> r1.3)
Added Files:
-----------
mports/net/samba3/files:
patch-lib__replace__libreplace.m4 (r1.1)
patch-lib_replace_autoconf-2.60.m4 (r1.1)
patch-smbd_quotas.c (r1.1)
Removed Files:
-------------
mports/net/samba3/files:
patch-CVE-2008-1105
patch-utils_ntlm_auth.c
-------------- next part --------------
Index: pkg-plist.swat
===================================================================
RCS file: /home/cvs/mports/net/samba3/pkg-plist.swat,v
retrieving revision 1.2
retrieving revision 1.3
diff -L net/samba3/pkg-plist.swat -L net/samba3/pkg-plist.swat -u -r1.2 -r1.3
--- net/samba3/pkg-plist.swat
+++ net/samba3/pkg-plist.swat
@@ -5,10 +5,10 @@
share/swat/help/Samba3-ByExample/ExNetworks.html
share/swat/help/Samba3-ByExample/HA.html
share/swat/help/Samba3-ByExample/RefSection.html
+share/swat/help/Samba3-ByExample/apa.html
share/swat/help/Samba3-ByExample/appendix.html
share/swat/help/Samba3-ByExample/ch14.html
share/swat/help/Samba3-ByExample/go01.html
-share/swat/help/Samba3-ByExample/gpl.html
share/swat/help/Samba3-ByExample/happy.html
share/swat/help/Samba3-ByExample/images/AccountingNetwork.png
share/swat/help/Samba3-ByExample/images/Charity-Network.png
@@ -111,16 +111,16 @@
share/swat/help/Samba3-HOWTO/StandAloneServer.html
share/swat/help/Samba3-HOWTO/TOSHpreface.html
share/swat/help/Samba3-HOWTO/VFS.html
+share/swat/help/Samba3-HOWTO/apa.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/ch46.html
+share/swat/help/Samba3-HOWTO/ch47.html
share/swat/help/Samba3-HOWTO/classicalprinting.html
share/swat/help/Samba3-HOWTO/compiling.html
share/swat/help/Samba3-HOWTO/diagnosis.html
share/swat/help/Samba3-HOWTO/domain-member.html
share/swat/help/Samba3-HOWTO/go01.html
-share/swat/help/Samba3-HOWTO/gpl.html
share/swat/help/Samba3-HOWTO/groupmapping.html
share/swat/help/Samba3-HOWTO/idmapper.html
share/swat/help/Samba3-HOWTO/images/10small.png
@@ -235,7 +235,6 @@
share/swat/help/manpages/smbmount.8.html
share/swat/help/manpages/smbpasswd.5.html
share/swat/help/manpages/smbpasswd.8.html
-share/swat/help/manpages/smbsh.1.html
share/swat/help/manpages/smbspool.8.html
share/swat/help/manpages/smbstatus.1.html
share/swat/help/manpages/smbtar.1.html
@@ -264,6 +263,7 @@
share/swat/help/manpages/vfs_readonly.8.html
share/swat/help/manpages/vfs_recycle.8.html
share/swat/help/manpages/vfs_shadow_copy.8.html
+share/swat/help/manpages/vfs_xattr_tdb.8.html
share/swat/help/manpages/vfstest.1.html
share/swat/help/manpages/wbinfo.1.html
share/swat/help/manpages/winbindd.8.html
@@ -280,171 +280,171 @@
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
- at dirrm share/swat/using_samba/figs
- at dirrm share/swat/using_samba
+%%SAMBA_BOOK%%share/swat/using_samba/appa.html
+%%SAMBA_BOOK%%share/swat/using_samba/appb.html
+%%SAMBA_BOOK%%share/swat/using_samba/appc.html
+%%SAMBA_BOOK%%share/swat/using_samba/appd.html
+%%SAMBA_BOOK%%share/swat/using_samba/appe.html
+%%SAMBA_BOOK%%share/swat/using_samba/appf.html
+%%SAMBA_BOOK%%share/swat/using_samba/appg.html
+%%SAMBA_BOOK%%share/swat/using_samba/ch00.html
+%%SAMBA_BOOK%%share/swat/using_samba/ch01.html
+%%SAMBA_BOOK%%share/swat/using_samba/ch02.html
+%%SAMBA_BOOK%%share/swat/using_samba/ch03.html
+%%SAMBA_BOOK%%share/swat/using_samba/ch04.html
+%%SAMBA_BOOK%%share/swat/using_samba/ch05.html
+%%SAMBA_BOOK%%share/swat/using_samba/ch06.html
+%%SAMBA_BOOK%%share/swat/using_samba/ch07.html
+%%SAMBA_BOOK%%share/swat/using_samba/ch08.html
+%%SAMBA_BOOK%%share/swat/using_samba/ch09.html
+%%SAMBA_BOOK%%share/swat/using_samba/ch10.html
+%%SAMBA_BOOK%%share/swat/using_samba/ch11.html
+%%SAMBA_BOOK%%share/swat/using_samba/ch12.html
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0101.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0102.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0103.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0104.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0105.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0106.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0107.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0108.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0109.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0110.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0111.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0112.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0113.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0114.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0201.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0202.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0203.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0204.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0301.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0302.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0303.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0304.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0305.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0306.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0307.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0308.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0309.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0310.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0311.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0312.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0313.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0314.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0315.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0316.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0317.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0318.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0319.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0320.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0321.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0322.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0323.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0324.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0325.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0326.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0327.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0328.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0329.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0330.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0331.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0332.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0333.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0334.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0335.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0336.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0337.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0338.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0339.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0340.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0341.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0342.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0343.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0344.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0345.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0346.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0347.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0348.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0349.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0350.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0351.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0352.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0353.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0354.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0355.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0356.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0357.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0358.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0359.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0360.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0361.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0401.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0402.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0403.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0404.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0405.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0406.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0407.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0408.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0409.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0410.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0411.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0412.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0413.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0414.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0415.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0416.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0417.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0501.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0502.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0503.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0504.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0505.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0506.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0507.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0508.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0601.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0602.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0603.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0604.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0605.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0701.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0801.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0802.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0803.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0804.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0805.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0806.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0807.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0808.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0809.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0810.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0811.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0901.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0902.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0903.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_1001.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_1002.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_1003.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_1004.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_1005.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_1006.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_1101.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_1102.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_af01.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_af02.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_af03.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_af04.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_af05.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_af06.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_af07.gif
+%%SAMBA_BOOK%%share/swat/using_samba/inx.html
+%%SAMBA_BOOK%%share/swat/using_samba/samba2_s.gif
+%%SAMBA_BOOK%%share/swat/using_samba/samba2_xs.gif
+%%SAMBA_BOOK%%share/swat/using_samba/toc.html
+%%SAMBA_BOOK%%@dirrm share/swat/using_samba/figs
+%%SAMBA_BOOK%%@dirrm share/swat/using_samba
@dirrm share/swat/js
@dirrm share/swat/include
@dirrm share/swat/images
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/net/samba3/pkg-plist,v
retrieving revision 1.4
retrieving revision 1.5
diff -L net/samba3/pkg-plist -L net/samba3/pkg-plist -u -r1.4 -r1.5
--- net/samba3/pkg-plist
+++ net/samba3/pkg-plist
@@ -21,7 +21,6 @@
bin/tdbdump
bin/tdbtool
bin/testparm
-%%SMBSH%%bin/smbsh
%%SMBTORTURE%%bin/smbtorture
%%WINBIND%%bin/wbinfo
sbin/smbd
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/net/samba3/Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -L net/samba3/Makefile -L net/samba3/Makefile -u -r1.9 -r1.10
--- net/samba3/Makefile
+++ net/samba3/Makefile
@@ -7,7 +7,7 @@
#
PORTNAME= samba
-PORTVERSION?= 3.0.28a
+PORTVERSION?= 3.0.32
PORTREVISION?= 0
PORTEPOCH?= 1
CATEGORIES?= net
@@ -23,7 +23,7 @@
USE_ICONV= yes
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= autoconf:261 autoheader:261
+USE_AUTOTOOLS= autoconf:262 autoheader:262
AUTOHEADER_ARGS= -I${WRKSRC} -I${WRKSRC}/lib/replace
AUTOCONF_ARGS= -I${WRKSRC} -I${WRKSRC}/lib/replace
@@ -352,6 +352,9 @@
MAN8+= vfs_commit.8
.endif
+# Off by now
+PLIST_SUB+= SAMBA_BOOK="@comment "
+
PLIST_SUB+= SAMBA_LOGDIR="${SAMBA_LOGDIR}" \
SAMBA_LOCKDIR="${SAMBA_LOCKDIR}" \
SAMBA_CONFDIR="${SAMBA_CONFDIR}" \
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/net/samba3/distinfo,v
retrieving revision 1.3
retrieving revision 1.4
diff -L net/samba3/distinfo -L net/samba3/distinfo -u -r1.3 -r1.4
--- net/samba3/distinfo
+++ net/samba3/distinfo
@@ -1,3 +1,3 @@
-MD5 (samba-3.0.28a.tar.gz) = 59754cb0c19da6e65c42d0a163c5885a
-SHA256 (samba-3.0.28a.tar.gz) = 9dc9ecb26017b1831cb1e0b212e1eb8c0b6176df6513fc737b585f453181d9de
-SIZE (samba-3.0.28a.tar.gz) = 18172643
+MD5 (samba-3.0.32.tar.gz) = be13b8dbe2785212dba49e7ced352f30
+SHA256 (samba-3.0.32.tar.gz) = 8a7f50e0e85eb0c5c5a9bee7d464367afe09366e66a162cdbb4f13860c0fecd6
+SIZE (samba-3.0.32.tar.gz) = 21679285
--- net/samba3/files/patch-CVE-2008-1105
+++ /dev/null
@@ -1,187 +0,0 @@
-commit 7e191387d64de2c965fc2c999bc7d1ccf4aae010
-Author: Gerald W. Carter <jerry at samba.org>
-Date: Wed May 28 07:30:19 2008 -0500
-
- Security: Patche for CVE-2008-1105.
-
- -- Summary --
- Specifically crafted SMB responses can result
- in a heap overflow in the Samba client code.
- Because the server process, smbd, can itself
- act as a client during operations such as
- printer notification and domain authentication,
- this issue affects both Samba client and server
- installations.
-
- Ensure that we specify the buffer size used to store incoming SMB
- packets. This bug was originally introduced in Samba 2.2.4. Patch from
- Jeremy Allison.
-
-diff --git client/client.c client/client.c
-index 3f96f63..e87623a 100644
---- client/client.c
-+++ client/client.c
-@@ -3626,7 +3626,7 @@ static void readline_callback(void)
- session keepalives and then drop them here.
- */
- if (FD_ISSET(cli->fd,&fds)) {
-- if (!receive_smb(cli->fd,cli->inbuf,0)) {
-+ if (!receive_smb(cli->fd,cli->inbuf,cli->bufsize,0)) {
- DEBUG(0, ("Read from server failed, maybe it closed the "
- "connection\n"));
- return;
-diff --git client/smbctool.c client/smbctool.c
-index 2063418..a18505b 100644
---- client/smbctool.c
-+++ client/smbctool.c
-@@ -3304,7 +3304,7 @@ static void readline_callback(void)
- session keepalives and then drop them here.
- */
- if (FD_ISSET(cli->fd,&fds)) {
-- receive_smb(cli->fd,cli->inbuf,0);
-+ receive_smb(cli->fd,cli->inbuf,cli->bufsize,0);
- goto again;
- }
-
-diff --git lib/util_sock.c lib/util_sock.c
-index 94c5e82..4715ca7 100644
---- lib/util_sock.c
-+++ lib/util_sock.c
-@@ -654,14 +654,13 @@ ssize_t read_smb_length(int fd, char *inbuf, unsigned int timeout)
- }
-
- /****************************************************************************
-- Read an smb from a fd. Note that the buffer *MUST* be of size
-- BUFFER_SIZE+SAFETY_MARGIN.
-+ Read an smb from a fd.
- The timeout is in milliseconds.
- This function will return on receipt of a session keepalive packet.
- Doesn't check the MAC on signed packets.
- ****************************************************************************/
-
--BOOL receive_smb_raw(int fd, char *buffer, unsigned int timeout)
-+BOOL receive_smb_raw(int fd, char *buffer, size_t buflen, unsigned int timeout)
- {
- ssize_t len,ret;
-
-@@ -682,25 +681,18 @@ BOOL receive_smb_raw(int fd, char *buffer, unsigned int timeout)
- return False;
- }
-
-- /*
-- * A WRITEX with CAP_LARGE_WRITEX can be 64k worth of data plus 65 bytes
-- * of header. Don't print the error if this fits.... JRA.
-- */
--
-- if (len > (BUFFER_SIZE + LARGE_WRITEX_HDR_SIZE)) {
-+ if (len > buflen) {
- DEBUG(0,("Invalid packet length! (%lu bytes).\n",(unsigned long)len));
-- if (len > BUFFER_SIZE + (SAFETY_MARGIN/2)) {
-
-- /*
-- * Correct fix. smb_read_error may have already been
-- * set. Only set it here if not already set. Global
-- * variables still suck :-). JRA.
-- */
-+ /*
-+ * smb_read_error may have already been
-+ * set. Only set it here if not already set. Global
-+ * variables still suck :-). JRA.
-+ */
-
-- if (smb_read_error == 0)
-- smb_read_error = READ_ERROR;
-- return False;
-- }
-+ if (smb_read_error == 0)
-+ smb_read_error = READ_ERROR;
-+ return False;
- }
-
- if(len > 0) {
-@@ -730,9 +722,9 @@ BOOL receive_smb_raw(int fd, char *buffer, unsigned int timeout)
- Checks the MAC on signed packets.
- ****************************************************************************/
-
--BOOL receive_smb(int fd, char *buffer, unsigned int timeout)
-+BOOL receive_smb(int fd, char *buffer, size_t buflen, unsigned int timeout)
- {
-- if (!receive_smb_raw(fd, buffer, timeout)) {
-+ if (!receive_smb_raw(fd, buffer, buflen, timeout)) {
- return False;
- }
-
-diff --git libsmb/clientgen.c libsmb/clientgen.c
-index c6cef08..7d7ab9e 100644
---- libsmb/clientgen.c
-+++ libsmb/clientgen.c
-@@ -44,8 +44,7 @@ int cli_set_port(struct cli_state *cli, int port)
- }
-
- /****************************************************************************
-- Read an smb from a fd ignoring all keepalive packets. Note that the buffer
-- *MUST* be of size BUFFER_SIZE+SAFETY_MARGIN.
-+ Read an smb from a fd ignoring all keepalive packets.
- The timeout is in milliseconds
-
- This is exactly the same as receive_smb except that it never returns
-@@ -54,12 +53,12 @@ int cli_set_port(struct cli_state *cli, int port)
- should never go into a blocking read.
- ****************************************************************************/
-
--static BOOL client_receive_smb(int fd,char *buffer, unsigned int timeout)
-+static BOOL client_receive_smb(int fd,char *buffer, size_t bufsize, unsigned int timeout)
- {
- BOOL ret;
-
- for(;;) {
-- ret = receive_smb_raw(fd, buffer, timeout);
-+ ret = receive_smb_raw(fd, buffer, bufsize, timeout);
-
- if (!ret) {
- DEBUG(10,("client_receive_smb failed\n"));
-@@ -88,7 +87,7 @@ BOOL cli_receive_smb(struct cli_state *cli)
- return False;
-
- again:
-- ret = client_receive_smb(cli->fd,cli->inbuf,cli->timeout);
-+ ret = client_receive_smb(cli->fd,cli->inbuf, cli->bufsize, cli->timeout);
-
- if (ret) {
- /* it might be an oplock break request */
-diff --git smbd/process.c smbd/process.c
-index 8dec719..3d31c29 100644
---- smbd/process.c
-+++ smbd/process.c
-@@ -521,7 +521,8 @@ static BOOL receive_message_or_smb(char *buffer, int buffer_len, int timeout)
- goto again;
- }
-
-- return receive_smb(smbd_server_fd(), buffer, 0);
-+ return receive_smb(smbd_server_fd(), buffer,
-+ BUFFER_SIZE + LARGE_WRITEX_HDR_SIZE, 0);
- }
-
- /*
-diff --git utils/smbfilter.c utils/smbfilter.c
-index 97d2223..2152e53 100644
---- utils/smbfilter.c
-+++ utils/smbfilter.c
-@@ -140,7 +140,7 @@ static void filter_child(int c, struct in_addr dest_ip)
- if (num <= 0) continue;
-
- if (c != -1 && FD_ISSET(c, &fds)) {
-- if (!receive_smb(c, packet, 0)) {
-+ if (!receive_smb(c, packet, BUFFER_SIZE, 0)) {
- d_printf("client closed connection\n");
- exit(0);
- }
-@@ -151,7 +151,7 @@ static void filter_child(int c, struct in_addr dest_ip)
- }
- }
- if (s != -1 && FD_ISSET(s, &fds)) {
-- if (!receive_smb(s, packet, 0)) {
-+ if (!receive_smb(s, packet, BUFFER_SIZE, 0)) {
- d_printf("server closed connection\n");
- exit(0);
- }
Index: pkg-message.in
===================================================================
RCS file: /home/cvs/mports/net/samba3/files/pkg-message.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -L net/samba3/files/pkg-message.in -L net/samba3/files/pkg-message.in -u -r1.2 -r1.3
--- net/samba3/files/pkg-message.in
+++ net/samba3/files/pkg-message.in
@@ -1,5 +1,11 @@
+===============================================================================
+NOTICE: This version of port has changed location of Samba password
+NOTICE: (smbpasswd) directory. Files in '%%SAMBA_PRIVATE%%'
+NOTICE: have moved to '%%SAMBA_PRIVATEDIR%%'.
+===============================================================================
Samba3 *package* now doesn't include ADS support due the portability problems
with Kerberos5 libraries on different installations. You need to compile port
yourself to get this functionality.
For additional hints and directions, please, look into the README.FreeBSD file.
+===============================================================================
--- net/samba3/files/patch-utils_ntlm_auth.c
+++ /dev/null
@@ -1,295 +0,0 @@
---- utils/ntlm_auth.c.orig Sun Jun 3 04:28:29 2007
-+++ utils/ntlm_auth.c Sun Jun 3 04:47:26 2007
-@@ -689,8 +689,8 @@
- NTSTATUS nt_status;
-
- if (strlen(buf) < 2) {
-- DEBUG(1, ("NTLMSSP query [%s] invalid", buf));
-- x_fprintf(x_stdout, "BH\n");
-+ DEBUG(1, ("NTLMSSP query [%s] invalid\n", buf));
-+ x_fprintf(x_stdout, "BH NTLMSSP query [%s] invalid\n", buf);
- return;
- }
-
-@@ -714,7 +714,7 @@
-
- if (opt_password == NULL) {
- DEBUG(1, ("Out of memory\n"));
-- x_fprintf(x_stdout, "BH\n");
-+ x_fprintf(x_stdout, "BH Out of memory\n");
- data_blob_free(&request);
- return;
- }
-@@ -741,14 +741,14 @@
- x_fprintf(x_stdout, "GK %s\n", key64?key64:"<NULL>");
- SAFE_FREE(key64);
- } else {
-- x_fprintf(x_stdout, "BH\n");
-+ x_fprintf(x_stdout, "BH missing NTLMSSP session key\n");
- }
-
- data_blob_free(&request);
- return;
- } else {
-- DEBUG(1, ("NTLMSSP query [%s] invalid", buf));
-- x_fprintf(x_stdout, "BH\n");
-+ DEBUG(1, ("NTLMSSP query [%s] invalid\n", buf));
-+ x_fprintf(x_stdout, "BH NTLMSSP query [%s] invalid\n", buf);
- return;
- }
-
-@@ -817,8 +817,8 @@
- }
-
- if (strlen(buf) < 2) {
-- DEBUG(1, ("NTLMSSP query [%s] invalid", buf));
-- x_fprintf(x_stdout, "BH\n");
-+ DEBUG(1, ("NTLMSSP query [%s] invalid\n", buf));
-+ x_fprintf(x_stdout, "BH NTLMSSP query [%s] invalid\n", buf);
- return;
- }
-
-@@ -842,7 +842,7 @@
-
- if (opt_password == NULL) {
- DEBUG(1, ("Out of memory\n"));
-- x_fprintf(x_stdout, "BH\n");
-+ x_fprintf(x_stdout, "BH Out of memory\n");
- data_blob_free(&request);
- return;
- }
-@@ -892,14 +892,14 @@
- SAFE_FREE(key64);
- }
- else {
-- x_fprintf(x_stdout, "BH\n");
-+ x_fprintf(x_stdout, "BH missing session key\n");
- }
-
- data_blob_free(&request);
- return;
- } else {
-- DEBUG(1, ("NTLMSSP query [%s] invalid", buf));
-- x_fprintf(x_stdout, "BH\n");
-+ DEBUG(1, ("NTLMSSP query [%s] invalid\n", buf));
-+ x_fprintf(x_stdout, "BH NTLMSSP query [%s] invalid\n", buf);
- return;
- }
-
-@@ -1027,7 +1027,7 @@
-
- if (len == -1) {
- DEBUG(1, ("Could not write SPNEGO data blob\n"));
-- x_fprintf(x_stdout, "BH\n");
-+ x_fprintf(x_stdout, "BH Could not write SPNEGO data blob\n");
- return;
- }
-
-@@ -1057,8 +1057,8 @@
- pstring reply_argument;
-
- if (strlen(buf) < 2) {
-- DEBUG(1, ("SPENGO query [%s] invalid", buf));
-- x_fprintf(x_stdout, "BH\n");
-+ DEBUG(1, ("SPNEGO query [%s] invalid\n", buf));
-+ x_fprintf(x_stdout, "BH SPNEGO query [%s] invalid\n", buf);
- return;
- }
-
-@@ -1068,8 +1068,8 @@
- } else if (strncmp(buf, "KK", 2) == 0) {
-
- } else {
-- DEBUG(1, ("SPENGO query [%s] invalid", buf));
-- x_fprintf(x_stdout, "BH\n");
-+ DEBUG(1, ("SPNEGO query [%s] invalid\n", buf));
-+ x_fprintf(x_stdout, "BH SPNEGO query [%s] invalid\n", buf);
- return;
- }
-
-@@ -1086,7 +1086,7 @@
-
- if (strlen(buf) <= 3) {
- DEBUG(1, ("GSS-SPNEGO query [%s] invalid\n", buf));
-- x_fprintf(x_stdout, "BH\n");
-+ x_fprintf(x_stdout, "BH GSS-SPENEGO query [%s] invalid\n", buf);
- return;
- }
-
-@@ -1096,7 +1096,7 @@
-
- if (len == -1) {
- DEBUG(1, ("GSS-SPNEGO query [%s] invalid", buf));
-- x_fprintf(x_stdout, "BH\n");
-+ x_fprintf(x_stdout, "BH GSS-SPNEGO query [%s] invalid", buf);
- return;
- }
-
-@@ -1107,8 +1107,8 @@
-
- if ( (request.negTokenInit.mechTypes == NULL) ||
- (request.negTokenInit.mechTypes[0] == NULL) ) {
-- DEBUG(1, ("Client did not offer any mechanism"));
-- x_fprintf(x_stdout, "BH\n");
-+ DEBUG(1, ("Client did not offer any mechanism\n"));
-+ x_fprintf(x_stdout, "BH Client did not offer any mechanism\n");
- return;
- }
-
-@@ -1116,15 +1116,15 @@
- if (strcmp(request.negTokenInit.mechTypes[0], OID_NTLMSSP) == 0) {
-
- if ( request.negTokenInit.mechToken.data == NULL ) {
-- DEBUG(1, ("Client did not provide NTLMSSP data\n"));
-- x_fprintf(x_stdout, "BH\n");
-+ DEBUG(1, ("Client did not provide NTLMSSP data\n"));
-+ x_fprintf(x_stdout, "BH Client did not provide NTLMSSP data\n");
- return;
- }
-
- if ( ntlmssp_state != NULL ) {
- DEBUG(1, ("Client wants a new NTLMSSP challenge, but "
- "already got one\n"));
-- x_fprintf(x_stdout, "BH\n");
-+ x_fprintf(x_stdout, "BH Client wants a new NTLMSSP challenge, but already got one\n");
- ntlmssp_end(&ntlmssp_state);
- return;
- }
-@@ -1157,7 +1157,7 @@
-
- if ( request.negTokenInit.mechToken.data == NULL ) {
- DEBUG(1, ("Client did not provide Kerberos data\n"));
-- x_fprintf(x_stdout, "BH\n");
-+ x_fprintf(x_stdout, "BH Client did not provide Kerberos data\n");
- return;
- }
-
-@@ -1183,7 +1183,7 @@
- if (domain == NULL) {
- DEBUG(1, ("Did not get a valid principal "
- "from ads_verify_ticket\n"));
-- x_fprintf(x_stdout, "BH\n");
-+ x_fprintf(x_stdout, "BH Did not get a valid principal from ads_verify_ticket\n");
- return;
- }
-
-@@ -1206,13 +1206,14 @@
- is the only one we support that sends this stuff */
- DEBUG(1, ("Got a negTokenTarg for something non-NTLMSSP: %s\n",
- request.negTokenTarg.supportedMech));
-- x_fprintf(x_stdout, "BH\n");
-+ x_fprintf(x_stdout, "BH Got a negTokenTarg for something non-NTLMSSP: %s\n",
-+ request.negTokenTarg.supportedMech);
- return;
- }
-
- if (request.negTokenTarg.responseToken.data == NULL) {
- DEBUG(1, ("Got a negTokenTarg without a responseToken!\n"));
-- x_fprintf(x_stdout, "BH\n");
-+ x_fprintf(x_stdout, "BH Got a negTokenTarg without a responseToken!\n");
- return;
- }
-
-@@ -1256,7 +1257,7 @@
-
- if (len == -1) {
- DEBUG(1, ("Could not write SPNEGO data blob\n"));
-- x_fprintf(x_stdout, "BH\n");
-+ x_fprintf(x_stdout, "BH Could not write SPNEGO data blob\n");
- return;
- }
-
-@@ -1346,7 +1347,7 @@
-
- if (client_ntlmssp_state == NULL) {
- DEBUG(1, ("Got NTLMSSP tArg without a client state\n"));
-- x_fprintf(x_stdout, "BH\n");
-+ x_fprintf(x_stdout, "BH Got NTLMSSP tArg without a client state\n");
- return;
- }
-
-@@ -1370,7 +1371,9 @@
- DEBUG(1, ("Expected MORE_PROCESSING_REQUIRED from "
- "ntlmssp_client_update, got: %s\n",
- nt_errstr(status)));
-- x_fprintf(x_stdout, "BH\n");
-+ x_fprintf(x_stdout, "BH Expected MORE_PROCESSING_REQUIRED from "
-+ "ntlmssp_client_update, got: %s\n",
-+ nt_errstr(status));
- data_blob_free(&request);
- ntlmssp_end(&client_ntlmssp_state);
- return;
-@@ -1486,7 +1489,7 @@
- switch (spnego.negTokenTarg.negResult) {
- case SPNEGO_ACCEPT_INCOMPLETE:
- DEBUG(1, ("Got a Kerberos negTokenTarg with ACCEPT_INCOMPLETE\n"));
-- x_fprintf(x_stdout, "BH\n");
-+ x_fprintf(x_stdout, "BH Got a Kerberos negTokenTarg with ACCEPT_INCOMPLETE\n");
- break;
- case SPNEGO_ACCEPT_COMPLETED:
- DEBUG(10, ("Accept completed\n"));
-@@ -1518,7 +1521,7 @@
-
- if (strlen(buf) <= 3) {
- DEBUG(1, ("SPNEGO query [%s] too short\n", buf));
-- x_fprintf(x_stdout, "BH\n");
-+ x_fprintf(x_stdout, "BH SPNEGO query [%s] too short\n", buf);
- return;
- }
-
-@@ -1532,7 +1535,7 @@
-
- if (opt_password == NULL) {
- DEBUG(1, ("Out of memory\n"));
-- x_fprintf(x_stdout, "BH\n");
-+ x_fprintf(x_stdout, "BH Out of memory\n");
- data_blob_free(&request);
- return;
- }
-@@ -1546,7 +1549,7 @@
- (strncmp(buf, "AF ", 3) != 0) &&
- (strncmp(buf, "NA ", 3) != 0) ) {
- DEBUG(1, ("SPNEGO request [%s] invalid\n", buf));
-- x_fprintf(x_stdout, "BH\n");
-+ x_fprintf(x_stdout, "BH SPNEGO request [%s] invalid\n", buf);
- data_blob_free(&request);
- return;
- }
-@@ -1559,7 +1562,7 @@
-
- if (len == -1) {
- DEBUG(1, ("Could not read SPNEGO data for [%s]\n", buf));
-- x_fprintf(x_stdout, "BH\n");
-+ x_fprintf(x_stdout, "BH Could not read SPNEGO data for [%s]\n", buf);
- return;
- }
-
-@@ -1588,7 +1591,7 @@
- }
-
- DEBUG(1, ("Server offered no compatible mechanism\n"));
-- x_fprintf(x_stdout, "BH\n");
-+ x_fprintf(x_stdout, "BH Server offered no compatible mechanism\n");
- return;
- }
-
-@@ -1610,7 +1613,9 @@
- DEBUG(1, ("Got a negTokenTarg with no mech and an "
- "unknown negResult: %d\n",
- spnego.negTokenTarg.negResult));
-- x_fprintf(x_stdout, "BH\n");
-+ x_fprintf(x_stdout, "BH Got a negTokenTarg with no mech and an "
-+ "unknown negResult: %d\n",
-+ spnego.negTokenTarg.negResult);
- }
-
- ntlmssp_end(&client_ntlmssp_state);
-@@ -1634,7 +1639,7 @@
- }
-
- DEBUG(1, ("Got an SPNEGO token I could not handle [%s]!\n", buf));
-- x_fprintf(x_stdout, "BH\n");
-+ x_fprintf(x_stdout, "BH Got an SPNEGO token I could not handle [%s]!\n", buf);
- return;
-
- out:
--- /dev/null
+++ net/samba3/files/patch-smbd_quotas.c
@@ -0,0 +1,20 @@
+--- smbd/quotas.c.orig 2008-07-15 05:19:02.000000000 +0200
++++ smbd/quotas.c 2008-07-15 05:21:24.000000000 +0200
+@@ -546,7 +546,7 @@
+ *bsize = gqr.getquota_rslt_u.gqr_rquota.rq_bsize;
+ *dsize = D.dqb_bsoftlimit;
+
+- if (D.dqb_curblocks == D.dqb_curblocks == 1)
++ if (D.dqb_curblocks == 1)
+ *bsize = 512;
+
+ if (D.dqb_curblocks > D.dqb_bsoftlimit) {
+@@ -1091,7 +1091,7 @@
+ *bsize = gqr.getquota_rslt_u.gqr_rquota.rq_bsize;
+ *dsize = D.dqb_bsoftlimit;
+
+- if (D.dqb_curblocks == D.dqb_curblocks == 1)
++ if (D.dqb_curblocks == 1)
+ *bsize = DEV_BSIZE;
+
+ if (D.dqb_curblocks > D.dqb_bsoftlimit) {
--- /dev/null
+++ net/samba3/files/patch-lib_replace_autoconf-2.60.m4
@@ -0,0 +1,15 @@
+--- lib/replace/autoconf-2.60.m4.orig 2007-11-15 03:15:03.000000000 +0000
++++ lib/replace/autoconf-2.60.m4 2008-06-12 17:56:42.000000000 +0000
+@@ -179,6 +179,7 @@
+ # ------------------------
+ # Enable extensions on systems that normally disable them,
+ # typically due to standards-conformance issues.
++m4_ifndef([AC_USE_SYSTEM_EXTENSIONS],[
+ AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS],
+ [
+ AC_BEFORE([$0], [AC_COMPILE_IFELSE])
+@@ -208,3 +209,4 @@
+ AC_DEFINE([__EXTENSIONS__])
+ AC_DEFINE([_POSIX_PTHREAD_SEMANTICS])
+ ])
++])
Index: patch-Makefile.in
===================================================================
RCS file: /home/cvs/mports/net/samba3/files/patch-Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -L net/samba3/files/patch-Makefile.in -L net/samba3/files/patch-Makefile.in -u -r1.2 -r1.3
--- net/samba3/files/patch-Makefile.in
+++ net/samba3/files/patch-Makefile.in
@@ -1,5 +1,14 @@
---- Makefile.in.orig Tue Jun 19 19:11:39 2007
-+++ Makefile.in Mon Oct 15 03:26:15 2007
+--- Makefile.in.orig 2008-07-10 21:17:14.000000000 +0200
++++ Makefile.in 2008-08-05 02:06:03.000000000 +0200
+@@ -91,7 +91,7 @@
+ # These can be overridden by command line switches (see smbd(8))
+ # or in smb.conf (see smb.conf(5))
+ LOGFILEBASE = @logfilebase@
+-CONFIGFILE = $(CONFIGDIR)/smb.conf
++CONFIGFILE = $(CONFIGDIR)/%%SAMBA_CONFIG%%
+ LMHOSTSFILE = $(CONFIGDIR)/lmhosts
+
+ # This is where smbpasswd et al go
@@ -424,6 +424,7 @@
VFS_HPUXACL_OBJ = modules/vfs_hpuxacl.o
VFS_IRIXACL_OBJ = modules/vfs_irixacl.o
--- /dev/null
+++ net/samba3/files/patch-lib__replace__libreplace.m4
@@ -0,0 +1,10 @@
+--- ./lib/replace/libreplace.m4.orig 2008-09-05 16:58:51.000000000 +0200
++++ ./lib/replace/libreplace.m4 2008-09-05 16:59:05.000000000 +0200
+@@ -332,7 +332,6 @@
+ m4_include(strptime.m4)
+ m4_include(win32.m4)
+ m4_include(timegm.m4)
+-m4_include(repdir.m4)
+
+ AC_CHECK_FUNCS([syslog memset memcpy],,[AC_MSG_ERROR([Required function not found])])
+
More information about the Midnightbsd-cvs
mailing list