--- a/components/samba/samba/samba.p5m	Thu Apr 05 08:48:42 2012 -0700
+++ b/components/samba/samba/samba.p5m	Fri Apr 06 05:53:13 2012 -0700
@@ -164,12 +164,6 @@
      restart_fmri=svc:/system/manifest-import:default
 file path=usr/bin/eventlogadm
 file path=usr/bin/findsmb
-file path=usr/bin/ldbadd
-file path=usr/bin/ldbdel
-file path=usr/bin/ldbedit
-file path=usr/bin/ldbmodify
-file path=usr/bin/ldbrename
-file path=usr/bin/ldbsearch
 file path=usr/bin/net
 file path=usr/bin/nmblookup
 file path=usr/bin/ntlm_auth
@@ -185,10 +179,12 @@
 file usr/bin/profiles path=usr/bin/smbprofiles
 file path=usr/bin/smbspool
 file path=usr/bin/smbstatus
+file path=usr/bin/smbta-util
 file path=usr/bin/smbtar
 file path=usr/bin/smbtree
 file path=usr/bin/tdbbackup
 file path=usr/bin/tdbdump
+file path=usr/bin/tdbrestore
 file path=usr/bin/tdbtool
 file path=usr/bin/testparm
 file path=usr/bin/wbinfo
@@ -198,7 +194,6 @@
 file usr/include/smb_share_modes.h path=usr/include/samba/smb_share_modes.h
 file usr/include/talloc.h path=usr/include/samba/talloc.h
 file usr/include/tdb.h path=usr/include/samba/tdb.h
-file usr/include/wbc_async.h path=usr/include/samba/wbc_async.h
 file usr/include/wbclient.h path=usr/include/samba/wbclient.h
 # nsswitch modules
 file build/$(MACH32)/nsswitch/libnss_winbind.so path=usr/lib/nss_winbind.so.1
@@ -215,6 +210,7 @@
 file path=usr/lib/samba/charset/CP850.so
 file path=usr/lib/samba/idmap/ad.so
 file path=usr/lib/samba/idmap/adex.so
+file path=usr/lib/samba/idmap/autorid.so
 file path=usr/lib/samba/idmap/hash.so
 file path=usr/lib/samba/idmap/ldap.so
 file path=usr/lib/samba/idmap/rid.so
@@ -224,9 +220,9 @@
 file path=usr/lib/samba/libnetapi.so.0
 file path=usr/lib/samba/libsmbclient.so.0
 file path=usr/lib/samba/libsmbsharemodes.so.0
-file path=usr/lib/samba/libtalloc.so.2
-file build/$(MACH64)/source3/bin/libtalloc.so.2 path=usr/lib/samba/$(MACH64)/libtalloc.so.1
-file path=usr/lib/samba/libtdb.so.1
+file path=usr/lib/samba/libtalloc.so.2.0.5
+file build/$(MACH64)/source3/bin/libtalloc.so.2 path=usr/lib/samba/$(MACH64)/libtalloc.so.2
+file path=usr/lib/samba/libtdb.so.1.2.9
 file build/$(MACH64)/source3/bin/libtdb.so.1 path=usr/lib/samba/$(MACH64)/libtdb.so.1
 file path=usr/lib/samba/libwbclient.so.0
 file build/$(MACH64)/source3/bin/libwbclient.so.0 path=usr/lib/samba/$(MACH64)/libwbclient.so.0
@@ -234,8 +230,7 @@
 file path=usr/lib/samba/nl.msg
 file path=usr/lib/samba/pl.msg
 file path=usr/lib/samba/ru.msg
-file build/$(MACH32)/source3/bin/smbtorture path=usr/lib/samba/smbtorture \
-    mode=0555
+file build/$(MACH32)/source3/bin/smbtorture path=usr/lib/samba/smbtorture mode=0555
 file path=usr/lib/samba/tr.msg
 file path=usr/lib/samba/upcase.dat
 file path=usr/lib/samba/valid.dat
@@ -246,6 +241,7 @@
 file path=usr/lib/samba/vfs/cap.so
 file path=usr/lib/samba/vfs/catia.so
 file path=usr/lib/samba/vfs/commit.so
+file path=usr/lib/samba/vfs/crossrename.so
 file path=usr/lib/samba/vfs/default_quota.so
 file path=usr/lib/samba/vfs/dirsort.so
 file path=usr/lib/samba/vfs/expand_msdfs.so
@@ -267,6 +263,7 @@
 file path=usr/lib/samba/vfs/streams_depot.so
 file path=usr/lib/samba/vfs/streams_xattr.so
 file path=usr/lib/samba/vfs/syncops.so
+file path=usr/lib/samba/vfs/time_audit.so
 file path=usr/lib/samba/vfs/xattr_tdb.so
 file path=usr/lib/samba/vfs/zfsacl.so
 # PAM modules
@@ -302,12 +299,6 @@
 file path=usr/share/locale/zh_CN/LC_MESSAGES/pam_winbind.mo
 file path=usr/share/locale/zh_TW/LC_MESSAGES/pam_winbind.mo
 file path=usr/share/man/man1/findsmb.1
-file path=usr/share/man/man1/ldbadd.1
-file path=usr/share/man/man1/ldbdel.1
-file path=usr/share/man/man1/ldbedit.1
-file path=usr/share/man/man1/ldbmodify.1
-file path=usr/share/man/man1/ldbrename.1
-file path=usr/share/man/man1/ldbsearch.1
 file path=usr/share/man/man1/log2pcap.1
 file path=usr/share/man/man1/nmblookup.1
 file path=usr/share/man/man1/ntlm_auth.1
@@ -336,13 +327,13 @@
 file path=usr/share/man/man8/eventlogadm.8
 file path=usr/share/man/man8/idmap_ad.8
 file path=usr/share/man/man8/idmap_adex.8
+file path=usr/share/man/man8/idmap_autorid.8
 file path=usr/share/man/man8/idmap_hash.8
 file path=usr/share/man/man8/idmap_ldap.8
 file path=usr/share/man/man8/idmap_nss.8
 file path=usr/share/man/man8/idmap_rid.8
 file path=usr/share/man/man8/idmap_tdb.8
 file path=usr/share/man/man8/idmap_tdb2.8
-file path=usr/share/man/man8/mount.cifs.8
 file path=usr/share/man/man8/net.8
 file path=usr/share/man/man8/nmbd.8
 file path=usr/share/man/man8/pam_winbind.8
@@ -350,11 +341,11 @@
 file path=usr/share/man/man8/smbd.8
 file path=usr/share/man/man8/smbpasswd.8
 file path=usr/share/man/man8/smbspool.8
+file path=usr/share/man/man8/smbta-util.8
 file path=usr/share/man/man8/swat.8
 file path=usr/share/man/man8/tdbbackup.8
 file path=usr/share/man/man8/tdbdump.8
 file path=usr/share/man/man8/tdbtool.8
-file path=usr/share/man/man8/umount.cifs.8
 file path=usr/share/man/man8/vfs_acl_tdb.8
 file path=usr/share/man/man8/vfs_acl_xattr.8
 file path=usr/share/man/man8/vfs_audit.8
@@ -362,6 +353,7 @@
 file path=usr/share/man/man8/vfs_cap.8
 file path=usr/share/man/man8/vfs_catia.8
 file path=usr/share/man/man8/vfs_commit.8
+file path=usr/share/man/man8/vfs_crossrename.8
 file path=usr/share/man/man8/vfs_default_quota.8
 file path=usr/share/man/man8/vfs_dirsort.8
 file path=usr/share/man/man8/vfs_extd_audit.8
@@ -382,6 +374,7 @@
 file path=usr/share/man/man8/vfs_smb_traffic_analyzer.8
 file path=usr/share/man/man8/vfs_streams_depot.8
 file path=usr/share/man/man8/vfs_streams_xattr.8
+file path=usr/share/man/man8/vfs_time_audit.8
 file path=usr/share/man/man8/vfs_xattr_tdb.8
 file path=usr/share/man/man8/winbindd.8
 file path=usr/share/samba/swat/help/Samba3-ByExample/Big500users.html
@@ -497,11 +490,11 @@
 file path=usr/share/samba/swat/help/Samba3-HOWTO/unicode.html
 file path=usr/share/samba/swat/help/Samba3-HOWTO/upgrading-to-3.0.html
 file path=usr/share/samba/swat/help/Samba3-HOWTO/winbind.html
-file path=usr/share/samba/swat/help/manpages/cifs.upcall.8.html
 file path=usr/share/samba/swat/help/manpages/eventlogadm.8.html
 file path=usr/share/samba/swat/help/manpages/findsmb.1.html
 file path=usr/share/samba/swat/help/manpages/idmap_ad.8.html
 file path=usr/share/samba/swat/help/manpages/idmap_adex.8.html
+file path=usr/share/samba/swat/help/manpages/idmap_autorid.8.html
 file path=usr/share/samba/swat/help/manpages/idmap_hash.8.html
 file path=usr/share/samba/swat/help/manpages/idmap_ldap.8.html
 file path=usr/share/samba/swat/help/manpages/idmap_nss.8.html
@@ -509,17 +502,9 @@
 file path=usr/share/samba/swat/help/manpages/idmap_tdb.8.html
 file path=usr/share/samba/swat/help/manpages/idmap_tdb2.8.html
 file path=usr/share/samba/swat/help/manpages/index.html
-file path=usr/share/samba/swat/help/manpages/ldb.3.html
-file path=usr/share/samba/swat/help/manpages/ldbadd.1.html
-file path=usr/share/samba/swat/help/manpages/ldbdel.1.html
-file path=usr/share/samba/swat/help/manpages/ldbedit.1.html
-file path=usr/share/samba/swat/help/manpages/ldbmodify.1.html
-file path=usr/share/samba/swat/help/manpages/ldbrename.1.html
-file path=usr/share/samba/swat/help/manpages/ldbsearch.1.html
 file path=usr/share/samba/swat/help/manpages/libsmbclient.7.html
 file path=usr/share/samba/swat/help/manpages/lmhosts.5.html
 file path=usr/share/samba/swat/help/manpages/log2pcap.1.html
-file path=usr/share/samba/swat/help/manpages/mount.cifs.8.html
 file path=usr/share/samba/swat/help/manpages/net.8.html
 file path=usr/share/samba/swat/help/manpages/nmbd.8.html
 file path=usr/share/samba/swat/help/manpages/nmblookup.1.html
@@ -543,6 +528,7 @@
 file path=usr/share/samba/swat/help/manpages/smbpasswd.8.html
 file path=usr/share/samba/swat/help/manpages/smbspool.8.html
 file path=usr/share/samba/swat/help/manpages/smbstatus.1.html
+file path=usr/share/samba/swat/help/manpages/smbta-util.8.html
 file path=usr/share/samba/swat/help/manpages/smbtar.1.html
 file path=usr/share/samba/swat/help/manpages/smbtree.1.html
 file path=usr/share/samba/swat/help/manpages/swat.8.html
@@ -550,14 +536,15 @@
 file path=usr/share/samba/swat/help/manpages/tdbdump.8.html
 file path=usr/share/samba/swat/help/manpages/tdbtool.8.html
 file path=usr/share/samba/swat/help/manpages/testparm.1.html
-file path=usr/share/samba/swat/help/manpages/umount.cifs.8.html
 file path=usr/share/samba/swat/help/manpages/vfs_acl_tdb.8.html
 file path=usr/share/samba/swat/help/manpages/vfs_acl_xattr.8.html
+file path=usr/share/samba/swat/help/manpages/vfs_aio_fork.8.html
 file path=usr/share/samba/swat/help/manpages/vfs_audit.8.html
 file path=usr/share/samba/swat/help/manpages/vfs_cacheprime.8.html
 file path=usr/share/samba/swat/help/manpages/vfs_cap.8.html
 file path=usr/share/samba/swat/help/manpages/vfs_catia.8.html
 file path=usr/share/samba/swat/help/manpages/vfs_commit.8.html
+file path=usr/share/samba/swat/help/manpages/vfs_crossrename.8.html
 file path=usr/share/samba/swat/help/manpages/vfs_default_quota.8.html
 file path=usr/share/samba/swat/help/manpages/vfs_dirsort.8.html
 file path=usr/share/samba/swat/help/manpages/vfs_extd_audit.8.html
@@ -578,6 +565,7 @@
 file path=usr/share/samba/swat/help/manpages/vfs_smb_traffic_analyzer.8.html
 file path=usr/share/samba/swat/help/manpages/vfs_streams_depot.8.html
 file path=usr/share/samba/swat/help/manpages/vfs_streams_xattr.8.html
+file path=usr/share/samba/swat/help/manpages/vfs_time_audit.8.html
 file path=usr/share/samba/swat/help/manpages/vfs_xattr_tdb.8.html
 file path=usr/share/samba/swat/help/manpages/vfstest.1.html
 file path=usr/share/samba/swat/help/manpages/wbinfo.1.html
@@ -616,10 +604,13 @@
 link path=usr/lib/samba/libnetapi.so target=libnetapi.so.0
 link path=usr/lib/samba/libsmbclient.so target=libsmbclient.so.0
 link path=usr/lib/samba/libsmbsharemodes.so target=libsmbsharemodes.so.0
+link path=usr/lib/samba/libtalloc.so.2 target=libtalloc.so.2.0.5
 link path=usr/lib/samba/libtalloc.so target=libtalloc.so.2
+link path=usr/lib/samba/libtdb.so.1 target=libtdb.so.1.2.9
 link path=usr/lib/samba/libtdb.so target=libtdb.so.1
 link path=usr/lib/samba/libwbclient.so target=libwbclient.so.0
-link path=usr/lib/samba/$(MACH64)/libtalloc.so target=libtalloc.so.1
+link path=usr/lib/samba/$(MACH64)/libtalloc.so.1 target=libtalloc.so.2
+link path=usr/lib/samba/$(MACH64)/libtalloc.so target=libtalloc.so.2
 link path=usr/lib/samba/$(MACH64)/libtdb.so target=libtdb.so.1
 link path=usr/lib/samba/$(MACH64)/libwbclient.so target=libwbclient.so.0
 link path=usr/lib/samba/nss_info/adex.so target=../idmap/adex.so