samba4: updated to 4.15.6

Changes since 4.15.5
--------------------
* BUG 14169: Renaming file on DFS root fails with
  NT_STATUS_OBJECT_PATH_NOT_FOUND.
* BUG 14737: Samba does not response STATUS_INVALID_PARAMETER when opening 2
  objects with same lease key.
* BUG 14938: NT error code is not set when overwriting a file during rename
  in libsmbclient.
* BUG 14996: Fix ldap simple bind with TLS auditing.
* BUG 14674: net ads info shows LDAP Server: 0.0.0.0 depending on contacted
  server.
* BUG 14979: Problem when winbind renews Kerberos.
* BUG 8691: pam_winbind will not allow gdm login if password about to expire.
* BUG 14971: virusfilter_vfs_openat: Not scanned: Directory or special file.
* BUG 13631: DFS fix for AIX broken.
* BUG 14974: Solaris and AIX acl modules: wrong function arguments.
* BUG 7239: Function aixacl_sys_acl_get_file not declared / coredump.
* BUG 14900: Regression: Samba 4.15.2 on macOS segfaults intermittently
  during strcpy in tdbsam_getsampwnam.
* BUG 14989: Fix a use-after-free in SMB1 server.
* BUG 14968: smb2_signing_decrypt_pdu() may not decrypt with
  gnutls_aead_cipher_decrypt() from gnutls before 3.5.2.
* BUG 14984: changing the machine password against an RODC likely destroys
  the domain join.
* BUG 14993: authsam_make_user_info_dc() steals memory from its struct
  ldb_message *msg argument.
* BUG 14995: Use Heimdal 8.0 (pre) rather than an earlier snapshot.
* BUG 14967: Samba autorid fails to map AD users if id rangesize fits in the
  id range only once.

3 files changed, 132 insertions, 139 deletions

diff --git a/net/samba4/Makefile b/net/samba4/Makefile
index ffaf7591e1a..3f8deac5602 100644
--- a/net/samba4/Makefile
+++ b/net/samba4/Makefile
@@ -1,13 +1,6 @@
-# $NetBSD: Makefile,v 1.140 2022/03/09 16:36:54 nia Exp $
-
-# WARNING: DO NOT UPDATE WITHOUT RESOLVING THIS ISSUE:
-#
-# Samba 4.14 is incompatible with procfs in NetBSD 9.2 and other
-# BSDs!
-#
-# Please do not update without testing on NetBSD 9.2!
-#
-DISTNAME=	samba-4.15.5
+# $NetBSD: Makefile,v 1.141 2022/03/20 21:53:53 adam Exp $
+
+DISTNAME=	samba-4.15.6
 CATEGORIES=	net
 MASTER_SITES=	https://download.samba.org/pub/samba/stable/
 
diff --git a/net/samba4/PLIST b/net/samba4/PLIST
index 7915f910b21..154cc820298 100644
--- a/net/samba4/PLIST
+++ b/net/samba4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.42 2022/03/07 21:40:37 thor Exp $
+@comment $NetBSD: PLIST,v 1.43 2022/03/20 21:53:53 adam Exp $
 bin/cifsdd
 bin/dbwrap_tool
 bin/dumpmscat
@@ -34,6 +34,8 @@ bin/smbtorture
 bin/smbtree
 bin/testparm
 bin/wbinfo
+@pkgdir bind-dns
+@pkgdir etc/samba
 include/charset.h
 include/core/doserr.h
 include/core/error.h
@@ -594,72 +596,72 @@ ${PYSITELIB}/samba/werror.so
 ${PYSITELIB}/samba/xattr.py
 ${PYSITELIB}/samba/xattr_native.so
 ${PYSITELIB}/samba/xattr_tdb.so
-${PLIST.ads}lib/samba/bind9/dlz_bind9_10.so
-${PLIST.ads}lib/samba/bind9/dlz_bind9_11.so
-${PLIST.ads}lib/samba/bind9/dlz_bind9_12.so
-${PLIST.ads}lib/samba/bind9/dlz_bind9_14.so
-${PLIST.ads}lib/samba/bind9/dlz_bind9_16.so
-${PLIST.ads}lib/samba/gensec/krb5.so
-${PLIST.ads}lib/samba/idmap/ad.so
-lib/samba/idmap/autorid.so
-lib/samba/idmap/hash.so
-${PLIST.ads}lib/samba/idmap/rfc2307.so
-lib/samba/idmap/rid.so
-lib/samba/idmap/script.so
-lib/samba/idmap/tdb2.so
-lib/samba/krb5/async_dns_krb5_locator.so
-lib/samba/krb5/winbind_krb5_locator.so
-${PLIST.ads}lib/samba/ldb/acl.so
-${PLIST.ads}lib/samba/ldb/aclread.so
-${PLIST.ads}lib/samba/ldb/anr.so
-${PLIST.ads}lib/samba/ldb/audit_log.so
-${PLIST.ads}lib/samba/ldb/count_attrs.so
-${PLIST.ads}lib/samba/ldb/descriptor.so
-${PLIST.ads}lib/samba/ldb/dirsync.so
-${PLIST.ads}lib/samba/ldb/dns_notify.so
-${PLIST.ads}lib/samba/ldb/dsdb_notification.so
-${PLIST.ads}lib/samba/ldb/encrypted_secrets.so
-${PLIST.ads}lib/samba/ldb/extended_dn_in.so
-${PLIST.ads}lib/samba/ldb/extended_dn_out.so
-${PLIST.ads}lib/samba/ldb/extended_dn_store.so
-${PLIST.ads}lib/samba/ldb/group_audit_log.so
-lib/samba/ldb/ildap.so
-${PLIST.ads}lib/samba/ldb/instancetype.so
-${PLIST.ads}lib/samba/ldb/lazy_commit.so
-lib/samba/ldb/ldbsamba_extensions.so
-${PLIST.ads}lib/samba/ldb/linked_attributes.so
-${PLIST.ads}lib/samba/ldb/new_partition.so
-${PLIST.ads}lib/samba/ldb/objectclass.so
-${PLIST.ads}lib/samba/ldb/objectclass_attrs.so
-${PLIST.ads}lib/samba/ldb/objectguid.so
-${PLIST.ads}lib/samba/ldb/operational.so
-${PLIST.ads}lib/samba/ldb/paged_results.so
-${PLIST.ads}lib/samba/ldb/partition.so
-${PLIST.ads}lib/samba/ldb/password_hash.so
-${PLIST.ads}lib/samba/ldb/ranged_results.so
-${PLIST.ads}lib/samba/ldb/repl_meta_data.so
-${PLIST.ads}lib/samba/ldb/resolve_oids.so
-${PLIST.ads}lib/samba/ldb/rootdse.so
-${PLIST.ads}lib/samba/ldb/samba3sam.so
-${PLIST.ads}lib/samba/ldb/samba3sid.so
-${PLIST.ads}lib/samba/ldb/samba_dsdb.so
-${PLIST.ads}lib/samba/ldb/samba_secrets.so
-${PLIST.ads}lib/samba/ldb/samldb.so
-${PLIST.ads}lib/samba/ldb/schema_data.so
-${PLIST.ads}lib/samba/ldb/schema_load.so
-${PLIST.ads}lib/samba/ldb/secrets_tdb_sync.so
-${PLIST.ads}lib/samba/ldb/show_deleted.so
-${PLIST.ads}lib/samba/ldb/subtree_delete.so
-${PLIST.ads}lib/samba/ldb/subtree_rename.so
-${PLIST.ads}lib/samba/ldb/tombstone_reanimate.so
-${PLIST.ads}lib/samba/ldb/unique_object_sids.so
-${PLIST.ads}lib/samba/ldb/update_keytab.so
-${PLIST.ads}lib/samba/ldb/vlv.so
-${PLIST.ads}lib/samba/ldb/wins_ldb.so
-lib/samba/nss_info/hash.so
-${PLIST.ads}lib/samba/nss_info/rfc2307.so
-${PLIST.ads}lib/samba/nss_info/sfu.so
-${PLIST.ads}lib/samba/nss_info/sfu20.so
+${PLIST.ads}lib/samba/bind9/dlz_bind9_10.${SOEXT}
+${PLIST.ads}lib/samba/bind9/dlz_bind9_11.${SOEXT}
+${PLIST.ads}lib/samba/bind9/dlz_bind9_12.${SOEXT}
+${PLIST.ads}lib/samba/bind9/dlz_bind9_14.${SOEXT}
+${PLIST.ads}lib/samba/bind9/dlz_bind9_16.${SOEXT}
+${PLIST.ads}lib/samba/gensec/krb5.${SOEXT}
+${PLIST.ads}lib/samba/idmap/ad.${SOEXT}
+lib/samba/idmap/autorid.${SOEXT}
+lib/samba/idmap/hash.${SOEXT}
+${PLIST.ads}lib/samba/idmap/rfc2307.${SOEXT}
+lib/samba/idmap/rid.${SOEXT}
+lib/samba/idmap/script.${SOEXT}
+lib/samba/idmap/tdb2.${SOEXT}
+lib/samba/krb5/async_dns_krb5_locator.${SOEXT}
+lib/samba/krb5/winbind_krb5_locator.${SOEXT}
+${PLIST.ads}lib/samba/ldb/acl.${SOEXT}
+${PLIST.ads}lib/samba/ldb/aclread.${SOEXT}
+${PLIST.ads}lib/samba/ldb/anr.${SOEXT}
+${PLIST.ads}lib/samba/ldb/audit_log.${SOEXT}
+${PLIST.ads}lib/samba/ldb/count_attrs.${SOEXT}
+${PLIST.ads}lib/samba/ldb/descriptor.${SOEXT}
+${PLIST.ads}lib/samba/ldb/dirsync.${SOEXT}
+${PLIST.ads}lib/samba/ldb/dns_notify.${SOEXT}
+${PLIST.ads}lib/samba/ldb/dsdb_notification.${SOEXT}
+${PLIST.ads}lib/samba/ldb/encrypted_secrets.${SOEXT}
+${PLIST.ads}lib/samba/ldb/extended_dn_in.${SOEXT}
+${PLIST.ads}lib/samba/ldb/extended_dn_out.${SOEXT}
+${PLIST.ads}lib/samba/ldb/extended_dn_store.${SOEXT}
+${PLIST.ads}lib/samba/ldb/group_audit_log.${SOEXT}
+lib/samba/ldb/ildap.${SOEXT}
+${PLIST.ads}lib/samba/ldb/instancetype.${SOEXT}
+${PLIST.ads}lib/samba/ldb/lazy_commit.${SOEXT}
+lib/samba/ldb/ldbsamba_extensions.${SOEXT}
+${PLIST.ads}lib/samba/ldb/linked_attributes.${SOEXT}
+${PLIST.ads}lib/samba/ldb/new_partition.${SOEXT}
+${PLIST.ads}lib/samba/ldb/objectclass.${SOEXT}
+${PLIST.ads}lib/samba/ldb/objectclass_attrs.${SOEXT}
+${PLIST.ads}lib/samba/ldb/objectguid.${SOEXT}
+${PLIST.ads}lib/samba/ldb/operational.${SOEXT}
+${PLIST.ads}lib/samba/ldb/paged_results.${SOEXT}
+${PLIST.ads}lib/samba/ldb/partition.${SOEXT}
+${PLIST.ads}lib/samba/ldb/password_hash.${SOEXT}
+${PLIST.ads}lib/samba/ldb/ranged_results.${SOEXT}
+${PLIST.ads}lib/samba/ldb/repl_meta_data.${SOEXT}
+${PLIST.ads}lib/samba/ldb/resolve_oids.${SOEXT}
+${PLIST.ads}lib/samba/ldb/rootdse.${SOEXT}
+${PLIST.ads}lib/samba/ldb/samba3sam.${SOEXT}
+${PLIST.ads}lib/samba/ldb/samba3sid.${SOEXT}
+${PLIST.ads}lib/samba/ldb/samba_dsdb.${SOEXT}
+${PLIST.ads}lib/samba/ldb/samba_secrets.${SOEXT}
+${PLIST.ads}lib/samba/ldb/samldb.${SOEXT}
+${PLIST.ads}lib/samba/ldb/schema_data.${SOEXT}
+${PLIST.ads}lib/samba/ldb/schema_load.${SOEXT}
+${PLIST.ads}lib/samba/ldb/secrets_tdb_sync.${SOEXT}
+${PLIST.ads}lib/samba/ldb/show_deleted.${SOEXT}
+${PLIST.ads}lib/samba/ldb/subtree_delete.${SOEXT}
+${PLIST.ads}lib/samba/ldb/subtree_rename.${SOEXT}
+${PLIST.ads}lib/samba/ldb/tombstone_reanimate.${SOEXT}
+${PLIST.ads}lib/samba/ldb/unique_object_sids.${SOEXT}
+${PLIST.ads}lib/samba/ldb/update_keytab.${SOEXT}
+${PLIST.ads}lib/samba/ldb/vlv.${SOEXT}
+${PLIST.ads}lib/samba/ldb/wins_ldb.${SOEXT}
+lib/samba/nss_info/hash.${SOEXT}
+${PLIST.ads}lib/samba/nss_info/rfc2307.${SOEXT}
+${PLIST.ads}lib/samba/nss_info/sfu.${SOEXT}
+${PLIST.ads}lib/samba/nss_info/sfu20.${SOEXT}
 lib/samba/private/libCHARSET3-samba4.so
 ${PLIST.ads}lib/samba/private/libHDB-SAMBA4-samba4.so
 lib/samba/private/libLIBWBCLIENT-OLD-samba4.so
@@ -786,59 +788,59 @@ lib/samba/private/libwinbind-client-samba4.so
 lib/samba/private/libwind-samba4.so.0
 lib/samba/private/libwind-samba4.so.0.0.0
 lib/samba/private/libxattr-tdb-samba4.so
-${PLIST.ads}lib/samba/process_model/prefork.so
-${PLIST.ads}lib/samba/process_model/standard.so
-${PLIST.pam}lib/samba/security/pam_winbind.so
-${PLIST.ads}lib/samba/service/cldap.so
-${PLIST.ads}lib/samba/service/dcerpc.so
-${PLIST.ads}lib/samba/service/dns.so
-${PLIST.ads}lib/samba/service/dns_update.so
-${PLIST.ads}lib/samba/service/drepl.so
-${PLIST.ads}lib/samba/service/kcc.so
-${PLIST.ads}lib/samba/service/kdc.so
-${PLIST.ads}lib/samba/service/ldap.so
-${PLIST.ads}lib/samba/service/nbtd.so
-${PLIST.ads}lib/samba/service/ntp_signd.so
-${PLIST.ads}lib/samba/service/s3fs.so
-${PLIST.ads}lib/samba/service/winbindd.so
-${PLIST.ads}lib/samba/service/wrepl.so
-lib/samba/vfs/acl_tdb.so
-lib/samba/vfs/acl_xattr.so
-lib/samba/vfs/aio_fork.so
-lib/samba/vfs/aio_pthread.so
-lib/samba/vfs/audit.so
-lib/samba/vfs/cap.so
-lib/samba/vfs/catia.so
-lib/samba/vfs/commit.so
-lib/samba/vfs/crossrename.so
-lib/samba/vfs/default_quota.so
-lib/samba/vfs/dirsort.so
-lib/samba/vfs/expand_msdfs.so
-lib/samba/vfs/extd_audit.so
-lib/samba/vfs/fake_perms.so
-lib/samba/vfs/fruit.so
-lib/samba/vfs/full_audit.so
-lib/samba/vfs/linux_xfs_sgid.so
-lib/samba/vfs/media_harmony.so
-lib/samba/vfs/offline.so
-${PLIST.ads}lib/samba/vfs/posix_eadb.so
-lib/samba/vfs/preopen.so
-lib/samba/vfs/readahead.so
-lib/samba/vfs/readonly.so
-lib/samba/vfs/recycle.so
-lib/samba/vfs/shadow_copy.so
-lib/samba/vfs/shadow_copy2.so
-lib/samba/vfs/shell_snap.so
-${PLIST.snapper}lib/samba/vfs/snapper.so
-lib/samba/vfs/streams_depot.so
-lib/samba/vfs/streams_xattr.so
-lib/samba/vfs/syncops.so
-lib/samba/vfs/time_audit.so
-lib/samba/vfs/unityed_media.so
-lib/samba/vfs/virusfilter.so
-lib/samba/vfs/widelinks.so
-lib/samba/vfs/worm.so
-lib/samba/vfs/xattr_tdb.so
+${PLIST.ads}lib/samba/process_model/prefork.${SOEXT}
+${PLIST.ads}lib/samba/process_model/standard.${SOEXT}
+${PLIST.pam}lib/samba/security/pam_winbind.${SOEXT}
+${PLIST.ads}lib/samba/service/cldap.${SOEXT}
+${PLIST.ads}lib/samba/service/dcerpc.${SOEXT}
+${PLIST.ads}lib/samba/service/dns.${SOEXT}
+${PLIST.ads}lib/samba/service/dns_update.${SOEXT}
+${PLIST.ads}lib/samba/service/drepl.${SOEXT}
+${PLIST.ads}lib/samba/service/kcc.${SOEXT}
+${PLIST.ads}lib/samba/service/kdc.${SOEXT}
+${PLIST.ads}lib/samba/service/ldap.${SOEXT}
+${PLIST.ads}lib/samba/service/nbtd.${SOEXT}
+${PLIST.ads}lib/samba/service/ntp_signd.${SOEXT}
+${PLIST.ads}lib/samba/service/s3fs.${SOEXT}
+${PLIST.ads}lib/samba/service/winbindd.${SOEXT}
+${PLIST.ads}lib/samba/service/wrepl.${SOEXT}
+lib/samba/vfs/acl_tdb.${SOEXT}
+lib/samba/vfs/acl_xattr.${SOEXT}
+lib/samba/vfs/aio_fork.${SOEXT}
+lib/samba/vfs/aio_pthread.${SOEXT}
+lib/samba/vfs/audit.${SOEXT}
+lib/samba/vfs/cap.${SOEXT}
+lib/samba/vfs/catia.${SOEXT}
+lib/samba/vfs/commit.${SOEXT}
+lib/samba/vfs/crossrename.${SOEXT}
+lib/samba/vfs/default_quota.${SOEXT}
+lib/samba/vfs/dirsort.${SOEXT}
+lib/samba/vfs/expand_msdfs.${SOEXT}
+lib/samba/vfs/extd_audit.${SOEXT}
+lib/samba/vfs/fake_perms.${SOEXT}
+lib/samba/vfs/fruit.${SOEXT}
+lib/samba/vfs/full_audit.${SOEXT}
+lib/samba/vfs/linux_xfs_sgid.${SOEXT}
+lib/samba/vfs/media_harmony.${SOEXT}
+lib/samba/vfs/offline.${SOEXT}
+${PLIST.ads}lib/samba/vfs/posix_eadb.${SOEXT}
+lib/samba/vfs/preopen.${SOEXT}
+lib/samba/vfs/readahead.${SOEXT}
+lib/samba/vfs/readonly.${SOEXT}
+lib/samba/vfs/recycle.${SOEXT}
+lib/samba/vfs/shadow_copy.${SOEXT}
+lib/samba/vfs/shadow_copy2.${SOEXT}
+lib/samba/vfs/shell_snap.${SOEXT}
+${PLIST.snapper}lib/samba/vfs/snapper.${SOEXT}
+lib/samba/vfs/streams_depot.${SOEXT}
+lib/samba/vfs/streams_xattr.${SOEXT}
+lib/samba/vfs/syncops.${SOEXT}
+lib/samba/vfs/time_audit.${SOEXT}
+lib/samba/vfs/unityed_media.${SOEXT}
+lib/samba/vfs/virusfilter.${SOEXT}
+lib/samba/vfs/widelinks.${SOEXT}
+lib/samba/vfs/worm.${SOEXT}
+lib/samba/vfs/xattr_tdb.${SOEXT}
 libexec/samba/samba-bgqd
 ${PLIST.cups}libexec/samba/smbspool_krb5_wrapper
 man/man1/dbwrap_tool.1
@@ -969,6 +971,7 @@ share/doc/samba/WinXP_PlainPassword.reg
 share/doc/samba/WindowsTerminalServer.reg
 share/examples/samba/adduser.sh
 share/examples/samba/deluser.sh
+@pkgdir share/examples/samba/pam_smbpass
 share/examples/samba/samba.schema
 share/examples/samba/smb.conf.default
 ${PLIST.ads}share/samba/samba/admx/en-US/samba.adml
@@ -1051,9 +1054,6 @@ ${PLIST.ads}share/samba/setup/secrets_init.ldif
 ${PLIST.ads}share/samba/setup/share.ldif
 ${PLIST.ads}share/samba/setup/spn_update_list
 ${PLIST.ads}share/samba/setup/ypServ30.ldif
-@pkgdir var/run
-@pkgdir var/log
 @pkgdir var/db/samba4/private
-@pkgdir share/examples/samba/pam_smbpass
-@pkgdir etc/samba
-@pkgdir bind-dns
+@pkgdir var/log
+@pkgdir var/run
diff --git a/net/samba4/distinfo b/net/samba4/distinfo
index 1b4dbac8de8..31fffdef37d 100644
--- a/net/samba4/distinfo
+++ b/net/samba4/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.74 2022/03/07 22:45:49 thor Exp $
+$NetBSD: distinfo,v 1.75 2022/03/20 21:53:53 adam Exp $
 
-BLAKE2s (samba-4.15.5.tar.gz) = 0193cc5a426c605baeb261ed881cd6127749fe9d85f1be9ccce52ca23c266077
-SHA512 (samba-4.15.5.tar.gz) = 808e0f15931bab18a1e36298528a01a1250efaef9f99508dd620d6936dd4a2fc3ccc64ab9dcc94bd73460697d16d6ca0652ccbcdbe1644ffedce0137d796d3ca
-Size (samba-4.15.5.tar.gz) = 19279071 bytes
+BLAKE2s (samba-4.15.6.tar.gz) = b11fd56c12dfbb3e0dc3e7b5e25b73f964b3b26afcc504293f2050c9bb9b0cfd
+SHA512 (samba-4.15.6.tar.gz) = cd193d74173831449abc24f1769f0af2dabd5dd8a65507af7b09fde6dd5780d30336d59600add939b044cfa5781f357ec9192c7fed1a1e7278812b6c07b824e2
+Size (samba-4.15.6.tar.gz) = 19290189 bytes
 SHA1 (patch-buildtools_wafsamba_samba__conftests.py) = d927db17124d2bb5b382885e70a41f84c3929926
 SHA1 (patch-buildtools_wafsamba_samba__install.py) = d801340617da325e3bb70a90350e45cc8e383c2d
 SHA1 (patch-buildtools_wafsamba_samba__pidl.py) = e4c0ed3dacfcf5613a5b397b3c6cf88509497da7