maj samba3#3.5.2-1

3 files changed, 26 insertions, 273 deletions

diff --git a/extra/samba3/.footprint b/extra/samba3/.footprint
index aee1a539c..4ff5fc71a 100755
--- a/extra/samba3/.footprint
+++ b/extra/samba3/.footprint
@@ -8,6 +8,9 @@ drwxr-xr-x	root/root	lib/
 lrwxrwxrwx	root/root	lib/libnss_winbind.so.2 -> libnss_winbind.so
 -rwxr-xr-x	root/root	lib/libnss_wins.so
 lrwxrwxrwx	root/root	lib/libnss_wins.so.2 -> libnss_wins.so
+drwxr-xr-x	root/root	lib/security/
+-rwxr-xr-x	root/root	lib/security/pam_smbpass.so
+-rwxr-xr-x	root/root	lib/security/pam_winbind.so
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/eventlogadm
@@ -46,6 +49,7 @@ drwxr-xr-x	root/root	usr/include/
 -rw-r--r--	root/root	usr/include/smb_share_modes.h
 -rw-r--r--	root/root	usr/include/talloc.h
 -rw-r--r--	root/root	usr/include/tdb.h
+-rw-r--r--	root/root	usr/include/wbc_async.h
 -rw-r--r--	root/root	usr/include/wbclient.h
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/cups/
@@ -57,8 +61,8 @@ lrwxrwxrwx	root/root	usr/lib/libsmbclient.so -> libsmbclient.so.0
 -rwxr-xr-x	root/root	usr/lib/libsmbclient.so.0
 lrwxrwxrwx	root/root	usr/lib/libsmbsharemodes.so -> libsmbsharemodes.so.0
 -rwxr-xr-x	root/root	usr/lib/libsmbsharemodes.so.0
-lrwxrwxrwx	root/root	usr/lib/libtalloc.so -> libtalloc.so.1
--rwxr-xr-x	root/root	usr/lib/libtalloc.so.1
+lrwxrwxrwx	root/root	usr/lib/libtalloc.so -> libtalloc.so.2
+-rwxr-xr-x	root/root	usr/lib/libtalloc.so.2
 lrwxrwxrwx	root/root	usr/lib/libtdb.so -> libtdb.so.1
 -rwxr-xr-x	root/root	usr/lib/libtdb.so.1
 lrwxrwxrwx	root/root	usr/lib/libwbclient.so -> libwbclient.so.0
@@ -81,8 +85,10 @@ drwxr-xr-x	root/root	usr/lib/samba/idmap/
 -rw-r--r--	root/root	usr/lib/samba/nl.msg
 drwxr-xr-x	root/root	usr/lib/samba/nss_info/
 drwxr-xr-x	root/root	usr/lib/samba/pdb/
+drwxr-xr-x	root/root	usr/lib/samba/perfcount/
 -rw-r--r--	root/root	usr/lib/samba/pl.msg
 drwxr-xr-x	root/root	usr/lib/samba/rpc/
+-rw-r--r--	root/root	usr/lib/samba/ru.msg
 -rw-r--r--	root/root	usr/lib/samba/tr.msg
 -rw-r--r--	root/root	usr/lib/samba/upcase.dat
 -rw-r--r--	root/root	usr/lib/samba/valid.dat
@@ -91,6 +97,7 @@ drwxr-xr-x	root/root	usr/lib/samba/vfs/
 -rwxr-xr-x	root/root	usr/lib/samba/vfs/acl_xattr.so
 -rwxr-xr-x	root/root	usr/lib/samba/vfs/audit.so
 -rwxr-xr-x	root/root	usr/lib/samba/vfs/cap.so
+-rwxr-xr-x	root/root	usr/lib/samba/vfs/catia.so
 -rwxr-xr-x	root/root	usr/lib/samba/vfs/default_quota.so
 -rwxr-xr-x	root/root	usr/lib/samba/vfs/dirsort.so
 -rwxr-xr-x	root/root	usr/lib/samba/vfs/expand_msdfs.so
@@ -104,6 +111,7 @@ drwxr-xr-x	root/root	usr/lib/samba/vfs/
 -rwxr-xr-x	root/root	usr/lib/samba/vfs/readahead.so
 -rwxr-xr-x	root/root	usr/lib/samba/vfs/readonly.so
 -rwxr-xr-x	root/root	usr/lib/samba/vfs/recycle.so
+-rwxr-xr-x	root/root	usr/lib/samba/vfs/scannedonly.so
 -rwxr-xr-x	root/root	usr/lib/samba/vfs/shadow_copy.so
 -rwxr-xr-x	root/root	usr/lib/samba/vfs/shadow_copy2.so
 -rwxr-xr-x	root/root	usr/lib/samba/vfs/smb_traffic_analyzer.so
@@ -120,6 +128,9 @@ drwxr-xr-x	root/root	usr/sbin/
 -rwxr-xr-x	root/root	usr/sbin/winbindd
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/locale/
+drwxr-xr-x	root/root	usr/share/locale/fr/
+drwxr-xr-x	root/root	usr/share/locale/fr/LC_MESSAGES/
+-rw-r--r--	root/root	usr/share/locale/fr/LC_MESSAGES/pam_winbind.mo
 drwxr-xr-x	root/root	usr/share/man/
 drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/findsmb.1.gz
@@ -148,6 +159,7 @@ drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/wbinfo.1.gz
 drwxr-xr-x	root/root	usr/share/man/man5/
 -rw-r--r--	root/root	usr/share/man/man5/lmhosts.5.gz
+-rw-r--r--	root/root	usr/share/man/man5/pam_winbind.conf.5.gz
 -rw-r--r--	root/root	usr/share/man/man5/smb.conf.5.gz
 -rw-r--r--	root/root	usr/share/man/man5/smbgetrc.5.gz
 -rw-r--r--	root/root	usr/share/man/man5/smbpasswd.5.gz
@@ -199,6 +211,7 @@ drwxr-xr-x	root/root	usr/share/man/man8/
 -rw-r--r--	root/root	usr/share/man/man8/vfs_readahead.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/vfs_readonly.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/vfs_recycle.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/vfs_scannedonly.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/vfs_shadow_copy.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/vfs_shadow_copy2.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/vfs_smb_traffic_analyzer.8.gz
@@ -210,7 +223,6 @@ drwxr-xr-x	root/root	usr/share/samba/
 drwxr-xr-x	root/root	usr/share/samba/swat/
 drwxr-xr-x	root/root	usr/share/samba/swat/help/
 drwxr-xr-x	root/root	usr/share/samba/swat/help/Samba3-ByExample/
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-ByExample/2000users.html
 -rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-ByExample/Big500users.html
 -rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-ByExample/DMSMig.html
 -rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-ByExample/DomApps.html
@@ -222,49 +234,10 @@ drwxr-xr-x	root/root	usr/share/samba/swat/help/Samba3-ByExample/
 -rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-ByExample/ch14.html
 -rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-ByExample/go01.html
 -rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-ByExample/happy.html
-drwxr-xr-x	root/root	usr/share/samba/swat/help/Samba3-ByExample/images/
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-ByExample/images/AccountingNetwork.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-ByExample/images/Charity-Network.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-ByExample/images/HostAnnouncment.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-ByExample/images/NullConnect.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-ByExample/images/UNIX-Samba-and-LDAP.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-ByExample/images/UserConnect.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-ByExample/images/UserMgrNT4.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-ByExample/images/WINREPRESSME-Capture.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-ByExample/images/WINREPRESSME-Capture2.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-ByExample/images/WindowsXP-NullConnection.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-ByExample/images/WindowsXP-UserConnection.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-ByExample/images/XP-screen001.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-ByExample/images/acct2net.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-ByExample/images/ch7-dual-additive-LDAP-Ok.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-ByExample/images/ch7-dual-additive-LDAP.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-ByExample/images/ch7-fail-overLDAP.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-ByExample/images/ch7-singleLDAP.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-ByExample/images/ch8-migration.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-ByExample/images/chap4-net.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-ByExample/images/chap5-net.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-ByExample/images/chap6-net.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-ByExample/images/chap7-idresol.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-ByExample/images/chap7-net-Ar.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-ByExample/images/chap7-net2-Br.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-ByExample/images/chap9-ADSDC.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-ByExample/images/chap9-SambaDC.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-ByExample/images/imc-usermanager2.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-ByExample/images/lam-config.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-ByExample/images/lam-group-members.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-ByExample/images/lam-groups.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-ByExample/images/lam-hosts.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-ByExample/images/lam-login.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-ByExample/images/lam-users.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-ByExample/images/openmag.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-ByExample/images/wxpp001.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-ByExample/images/wxpp004.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-ByExample/images/wxpp006.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-ByExample/images/wxpp007.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-ByExample/images/wxpp008.png
 -rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-ByExample/index.html
 -rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-ByExample/ix01.html
 -rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-ByExample/kerberos.html
+-rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-ByExample/net2000users.html
 -rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-ByExample/ntmigration.html
 -rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-ByExample/nw4migration.html
 -rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-ByExample/pr01.html
@@ -338,61 +311,6 @@ drwxr-xr-x	root/root	usr/share/samba/swat/help/Samba3-HOWTO/
 -rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-HOWTO/go01.html
 -rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-HOWTO/groupmapping.html
 -rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-HOWTO/idmapper.html
-drwxr-xr-x	root/root	usr/share/samba/swat/help/Samba3-HOWTO/images/
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-HOWTO/images/10small.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-HOWTO/images/11small.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-HOWTO/images/12small.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-HOWTO/images/13small.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-HOWTO/images/14small.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-HOWTO/images/1small.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-HOWTO/images/2small.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-HOWTO/images/3small.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-HOWTO/images/4small.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-HOWTO/images/5small.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-HOWTO/images/6small.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-HOWTO/images/7small.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-HOWTO/images/8small.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-HOWTO/images/9small.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-HOWTO/images/WME001.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-HOWTO/images/WME002.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-HOWTO/images/WME003.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-HOWTO/images/WME005.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-HOWTO/images/WME009.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-HOWTO/images/WME010.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-HOWTO/images/WME013.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-HOWTO/images/WME014.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-HOWTO/images/WXPP002.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-HOWTO/images/WXPP003.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-HOWTO/images/WXPP005.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-HOWTO/images/WXPP009.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-HOWTO/images/WXPP014.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-HOWTO/images/a_small.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-HOWTO/images/access1.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-HOWTO/images/browsing1.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-HOWTO/images/cups1.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-HOWTO/images/cups2.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-HOWTO/images/domain.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-HOWTO/images/ethereal1.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-HOWTO/images/ethereal2.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-HOWTO/images/idmap-gid2sid.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-HOWTO/images/idmap-sid2gid.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-HOWTO/images/idmap-sid2uid.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-HOWTO/images/idmap-store-gid2sid.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-HOWTO/images/idmap-uid2sid.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-HOWTO/images/idmap_winbind_no_loop.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-HOWTO/images/pdftoepsonusb.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-HOWTO/images/pdftosocket.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-HOWTO/images/trusts1.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-HOWTO/images/w2kp001.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-HOWTO/images/w2kp002.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-HOWTO/images/w2kp003.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-HOWTO/images/w2kp004.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-HOWTO/images/w2kp005.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-HOWTO/images/wxpp001.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-HOWTO/images/wxpp004.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-HOWTO/images/wxpp006.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-HOWTO/images/wxpp007.png
--rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-HOWTO/images/wxpp008.png
 -rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-HOWTO/index.html
 -rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-HOWTO/install.html
 -rw-r--r--	root/root	usr/share/samba/swat/help/Samba3-HOWTO/integrate-ms-networks.html
@@ -449,6 +367,7 @@ drwxr-xr-x	root/root	usr/share/samba/swat/help/manpages/
 -rw-r--r--	root/root	usr/share/samba/swat/help/manpages/nmblookup.1.html
 -rw-r--r--	root/root	usr/share/samba/swat/help/manpages/ntlm_auth.1.html
 -rw-r--r--	root/root	usr/share/samba/swat/help/manpages/pam_winbind.8.html
+-rw-r--r--	root/root	usr/share/samba/swat/help/manpages/pam_winbind.conf.5.html
 -rw-r--r--	root/root	usr/share/samba/swat/help/manpages/pdbedit.8.html
 -rw-r--r--	root/root	usr/share/samba/swat/help/manpages/profiles.1.html
 -rw-r--r--	root/root	usr/share/samba/swat/help/manpages/rpcclient.1.html
@@ -495,6 +414,7 @@ drwxr-xr-x	root/root	usr/share/samba/swat/help/manpages/
 -rw-r--r--	root/root	usr/share/samba/swat/help/manpages/vfs_readahead.8.html
 -rw-r--r--	root/root	usr/share/samba/swat/help/manpages/vfs_readonly.8.html
 -rw-r--r--	root/root	usr/share/samba/swat/help/manpages/vfs_recycle.8.html
+-rw-r--r--	root/root	usr/share/samba/swat/help/manpages/vfs_scannedonly.8.html
 -rw-r--r--	root/root	usr/share/samba/swat/help/manpages/vfs_shadow_copy.8.html
 -rw-r--r--	root/root	usr/share/samba/swat/help/manpages/vfs_shadow_copy2.8.html
 -rw-r--r--	root/root	usr/share/samba/swat/help/manpages/vfs_smb_traffic_analyzer.8.html
@@ -542,171 +462,6 @@ drwxr-xr-x	root/root	usr/share/samba/swat/lang/tr/images/
 -rw-r--r--	root/root	usr/share/samba/swat/lang/tr/images/viewconfig.gif
 drwxr-xr-x	root/root	usr/share/samba/swat/lang/tr/include/
 drwxr-xr-x	root/root	usr/share/samba/swat/lang/tr/js/
-drwxr-xr-x	root/root	usr/share/samba/swat/using_samba/
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/appa.html
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/appb.html
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/appc.html
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/appd.html
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/appe.html
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/appf.html
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/appg.html
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/ch00.html
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/ch01.html
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/ch02.html
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/ch03.html
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/ch04.html
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/ch05.html
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/ch06.html
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/ch07.html
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/ch08.html
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/ch09.html
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/ch10.html
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/ch11.html
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/ch12.html
-drwxr-xr-x	root/root	usr/share/samba/swat/using_samba/figs/
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0101.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0102.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0103.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0104.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0105.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0106.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0107.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0108.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0109.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0110.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0111.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0112.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0113.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0114.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0201.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0202.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0203.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0204.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0301.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0302.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0303.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0304.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0305.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0306.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0307.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0308.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0309.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0310.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0311.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0312.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0313.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0314.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0315.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0316.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0317.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0318.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0319.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0320.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0321.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0322.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0323.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0324.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0325.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0326.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0327.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0328.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0329.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0330.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0331.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0332.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0333.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0334.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0335.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0336.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0337.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0338.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0339.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0340.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0341.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0342.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0343.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0344.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0345.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0346.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0347.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0348.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0349.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0350.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0351.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0352.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0353.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0354.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0355.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0356.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0357.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0358.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0359.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0360.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0361.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0401.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0402.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0403.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0404.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0405.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0406.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0407.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0408.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0409.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0410.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0411.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0412.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0413.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0414.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0415.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0416.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0417.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0501.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0502.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0503.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0504.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0505.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0506.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0507.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0508.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0601.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0602.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0603.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0604.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0605.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0701.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0801.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0802.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0803.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0804.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0805.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0806.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0807.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0808.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0809.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0810.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0811.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0901.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0902.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_0903.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_1001.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_1002.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_1003.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_1004.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_1005.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_1006.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_1101.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_1102.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_af01.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_af02.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_af03.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_af04.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_af05.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_af06.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/figs/sam2_af07.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/inx.html
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/samba2_s.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/samba2_xs.gif
--rw-r--r--	root/root	usr/share/samba/swat/using_samba/toc.html
 drwxr-xr-x	root/root	var/
 drwxr-xr-x	root/root	var/lib/
 drwxr-xr-x	root/root	var/lib/samba/
diff --git a/extra/samba3/.md5sum b/extra/samba3/.md5sum
index 683029a7d..9d66839cc 100755
--- a/extra/samba3/.md5sum
+++ b/extra/samba3/.md5sum
@@ -1,2 +1,2 @@
-bc7228cc686986353df67ff42b1b2b1e  samba-3.3.7.tar.gz
+6f8cf649207ccd8c2c17e28c335f4e9d  samba-3.5.2.tar.gz
 f6561501d6c68959e80e9804384cb028  smb.conf
diff --git a/extra/samba3/Pkgfile b/extra/samba3/Pkgfile
index ec0bf3fae..688bb3369 100755
--- a/extra/samba3/Pkgfile
+++ b/extra/samba3/Pkgfile
@@ -5,23 +5,22 @@
 # Depends on: libcups, gamin
 
 name=samba3
-version=3.3.7
-release=2
+version=3.5.2
+release=1
 localname=samba
 source=( http://us6.samba.org/samba/ftp/stable/$localname-$version.tar.gz\
        smb.conf)
 
 
 build() {
-	cd $localname-$version/source
+	cd $localname-$version/source3
 	./configure --prefix=/usr \
 		--localstatedir=/var \
 		--sysconfdir=/etc \
                 --with-piddir=/var/run \
                 --with-pammodulesdir=/lib/security \
-		--with-fhs \
-                --with-cups \
-                --with-smbmount
+		--with-fhs --with-cups --with-syslog \
+                --with-cifsumount --with-cifsmount
 	make -j3
 	make DESTDIR=$PKG install
         
@@ -29,13 +28,12 @@ build() {
 
         chmod -v 644 $PKG/usr/include/libsmbclient.h
         install -d $PKG/lib
-	install -v -m755 nsswitch/libnss_win{s,bind}.so $PKG/lib
+	install -v -m755 $SRC/$localname-$version/nsswitch/libnss_win{s,bind}.so $PKG/lib
         ln -v -sf libnss_winbind.so $PKG/lib/libnss_winbind.so.2
         ln -v -sf libnss_wins.so $PKG/lib/libnss_wins.so.2
         
 	install -v -m644 ../examples/smb.conf.default $PKG/etc/samba/smb.conf.default
-        chmod -v 4755  \
-              $PKG/usr/sbin/{,u}mount.cifs
+        chmod -v 4755  $PKG/usr/sbin/{,u}mount.cifs
         cp $SRC/smb.conf $PKG/etc/samba/
 	#  cups 
         cd $PKG/usr/lib/