[pkgsrc/trunk]: pkgsrc/net/samba4 samba4: updated to 4.16.3

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3823ebd294cc
branches:  trunk
changeset: 382122:3823ebd294cc
user:      adam <adam%pkgsrc.org@localhost>
date:      Thu Jul 21 09:35:19 2022 +0000

description:
samba4: updated to 4.16.3

Changes since 4.16.2
--------------------
* BUG 15099: Using vfs_streams_xattr and deleting a file causes a panic.
* BUG 14986: Add support for bind 9.18.
* BUG 15076: logging dsdb audit to specific files does not work.
* BUG 14979: Problem when winbind renews Kerberos.
* BUG 15095: Samba with new lorikeet-heimdal fails to build on gcc 12.1 in
  developer mode.
* BUG 15105: Crash in streams_xattr because fsp->base_fsp->fsp_name is NULL.
* BUG 15118: Crash in rpcd_classic - NULL pointer deference in
  mangle_is_mangled().
* BUG 15100: smbclient commands del & deltree fail with
  NT_STATUS_OBJECT_PATH_NOT_FOUND with DFS.
* BUG 15120: Fix check for chown when processing NFSv4 ACL.
* BUG 15082: The pcap background queue process should not be stopped.
* BUG 15097: testparm: Fix typo in idmap rangesize check.
* BUG 15106: net ads info returns LDAP server and LDAP server name as null.
* BUG 15108: ldconfig: /lib64/libsmbconf.so.0 is not a symbolic link.
* BUG 15090: CTDB child process logging does not work as expected.

Changes since 4.16.1
--------------------
* BUG 15042: Use pathref fd instead of io fd in vfs_default_durable_cookie.
* BUG 15069: vfs_gpfs with vfs_shadowcopy2 fail to restore file if original
  file had been deleted.
* BUG 15087: netgroups support removed.
* BUG 14674: net ads info shows LDAP Server: 0.0.0.0 depending on contacted
  server.
* BUG 15062: Update from 4.15  to 4.16 breaks discovery of [homes] on
  standalone server from Win and IOS.
* BUG 15071: waf produces incorrect names for python extensions with Python
  3.11.
* BUG 15075: smbclient -E doesn't work as advertised.
* BUG 15071: waf produces incorrect names for python extensions with Python
  3.11.
* BUG 15081: The samba background daemon doesn't refresh the printcap cache
  on startup.
* BUG 14443: Out-by-4 error in smbd read reply max_send clamp..

Changes since 4.16.0
--------------------
* BUG 14831: Share and server swapped in smbget password prompt.
* BUG 15022: Durable handles won't reconnect if the leased file is written
  to.
* BUG 15023: rmdir silently fails if directory contains unreadable files and
  hide unreadable is yes.
* BUG 15038: SMB2_CLOSE_FLAGS_FULL_INFORMATION fails to return information on
  renamed file handle.
* BUG 8731: Need to describe --builtin-libraries= better (compare with
 --bundled-libraries).
* BUG 14957: vfs_shadow_copy2 breaks "smbd async dosmode" sync fallback.
* BUG 15035: shadow_copy2 fails listing snapshotted dirs with
  shadow:fixinodes.
* BUG 15046: PAM Kerberos authentication incorrectly fails with a clock skew
  error.
* BUG 15041: Username map - samba erroneously applies unix group memberships
  to user account entries.
* BUG 14951: KVNO off by 100000.
* BUG 15027: Uninitialized litemask in variable in vfs_gpfs module.
* BUG 15055: vfs_gpfs recalls=no option prevents listing files.
* BUG 15054: smbd doesn't handle UPNs for looking up names.

diffstat:

 net/samba4/Makefile                                                   |   8 +-
 net/samba4/PLIST                                                      |  64 +++++----
 net/samba4/distinfo                                                   |  17 +-
 net/samba4/patches/patch-nsswitch_wscript__build                      |  12 +-
 net/samba4/patches/patch-source3_modules_vfs__solarisacl.c            |  11 +-
 net/samba4/patches/patch-source4_heimdal__build_roken.h               |  15 --
 net/samba4/patches/patch-source4_heimdal_include_heim__threads.h      |  16 --
 net/samba4/patches/patch-third__party_heimdal__build_roken.h          |  15 ++
 net/samba4/patches/patch-third__party_heimdal_include_heim__threads.h |  16 ++
 9 files changed, 88 insertions(+), 86 deletions(-)

diffs (truncated from 382 to 300 lines):

diff -r 19494566ffc5 -r 3823ebd294cc net/samba4/Makefile
--- a/net/samba4/Makefile       Thu Jul 21 09:10:12 2022 +0000
+++ b/net/samba4/Makefile       Thu Jul 21 09:35:19 2022 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.144 2022/06/30 11:18:43 nia Exp $
+# $NetBSD: Makefile,v 1.145 2022/07/21 09:35:19 adam Exp $
 
-DISTNAME=      samba-4.15.6
-PKGREVISION=   3
+DISTNAME=      samba-4.16.3
 CATEGORIES=    net
 MASTER_SITES=  https://download.samba.org/pub/samba/stable/
 
@@ -18,6 +17,7 @@
 BUILD_DEPENDS+=        libxslt-[0-9]*:../../textproc/libxslt
 BUILD_DEPENDS+=        docbook-xml-[0-9]*:../../textproc/docbook-xml
 BUILD_DEPENDS+=        docbook-xsl>=1.79.2:../../textproc/docbook-xsl
+DEPENDS+=      p5-JSON>=4.05:../../converters/p5-JSON
 DEPENDS+=      p5-Parse-Yapp>=1.05:../../devel/p5-Parse-Yapp
 DEPENDS+=      ${PYPKGPREFIX}-dns-[0-9]*:../../net/py-dns
 DEPENDS+=      ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
@@ -160,7 +160,7 @@
 SUBST_CLASSES+=                paths
 SUBST_MESSAGE.paths=   Fixing paths.
 SUBST_FILES.paths=     ${WRKDIR}/adduser.sh ${WRKDIR}/deluser.sh
-SUBST_FILES.paths+=    source4/heimdal_build/roken.h
+SUBST_FILES.paths+=    third_party/heimdal_build/roken.h
 SUBST_STAGE.paths=     pre-configure
 SUBST_SED.paths+=      -e 's,@PERL@,${PERL5},g'
 SUBST_VARS.paths=      AWK CAT MKTEMP RM PWD_MKDB SH PERL PKG_SYSCONFBASE
diff -r 19494566ffc5 -r 3823ebd294cc net/samba4/PLIST
--- a/net/samba4/PLIST  Thu Jul 21 09:10:12 2022 +0000
+++ b/net/samba4/PLIST  Thu Jul 21 09:35:19 2022 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.43 2022/03/20 21:53:53 adam Exp $
+@comment $NetBSD: PLIST,v 1.44 2022/07/21 09:35:19 adam Exp $
 bin/cifsdd
 bin/dbwrap_tool
 bin/dumpmscat
@@ -174,6 +174,7 @@
 lib/libsmbclient.so.0.7.0
 lib/libsmbconf.so
 lib/libsmbconf.so.0
+lib/libsmbconf.so.0.0.1
 ${PLIST.ldap}lib/libsmbldap.so
 ${PLIST.ldap}lib/libsmbldap.so.2
 ${PLIST.ldap}lib/libsmbldap.so.2.1.0
@@ -264,7 +265,11 @@
 ${PYSITELIB}/samba/forest_update.py
 ${PYSITELIB}/samba/gensec.so
 ${PYSITELIB}/samba/getopt.py
+${PYSITELIB}/samba/gp_cert_auto_enroll_ext.py
+${PYSITELIB}/samba/gp_chromium_ext.py
 ${PYSITELIB}/samba/gp_ext_loader.py
+${PYSITELIB}/samba/gp_firefox_ext.py
+${PYSITELIB}/samba/gp_firewalld_ext.py
 ${PYSITELIB}/samba/gp_gnome_settings_ext.py
 ${PYSITELIB}/samba/gp_msgs_ext.py
 ${PYSITELIB}/samba/gp_parse/__init__.py
@@ -462,6 +467,7 @@
 ${PYSITELIB}/samba/tests/krb5/kdc_tests.py
 ${PYSITELIB}/samba/tests/krb5/kdc_tgs_tests.py
 ${PYSITELIB}/samba/tests/krb5/ms_kile_client_principal_lookup_tests.py
+${PYSITELIB}/samba/tests/krb5/pac_align_tests.py
 ${PYSITELIB}/samba/tests/krb5/raw_testcase.py
 ${PYSITELIB}/samba/tests/krb5/rfc4120_constants.py
 ${PYSITELIB}/samba/tests/krb5/rfc4120_pyasn1.py
@@ -540,6 +546,7 @@
 ${PYSITELIB}/samba/tests/samba_tool/help.py
 ${PYSITELIB}/samba/tests/samba_tool/join.py
 ${PYSITELIB}/samba/tests/samba_tool/join_lmdb_size.py
+${PYSITELIB}/samba/tests/samba_tool/join_member.py
 ${PYSITELIB}/samba/tests/samba_tool/ntacl.py
 ${PYSITELIB}/samba/tests/samba_tool/ou.py
 ${PYSITELIB}/samba/tests/samba_tool/passwordsettings.py
@@ -572,6 +579,7 @@
 ${PYSITELIB}/samba/tests/smbd_base.py
 ${PYSITELIB}/samba/tests/smbd_fuzztest.py
 ${PYSITELIB}/samba/tests/source.py
+${PYSITELIB}/samba/tests/source_chars.py
 ${PYSITELIB}/samba/tests/strings.py
 ${PYSITELIB}/samba/tests/subunitrun.py
 ${PYSITELIB}/samba/tests/tdb_util.py
@@ -601,6 +609,7 @@
 ${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/bind9/dlz_bind9_18.${SOEXT}
 ${PLIST.ads}lib/samba/gensec/krb5.${SOEXT}
 ${PLIST.ads}lib/samba/idmap/ad.${SOEXT}
 lib/samba/idmap/autorid.${SOEXT}
@@ -667,10 +676,12 @@
 lib/samba/private/libLIBWBCLIENT-OLD-samba4.so
 lib/samba/private/libMESSAGING-SEND-samba4.so
 lib/samba/private/libMESSAGING-samba4.so
+lib/samba/private/libREG-FULL-samba4.so
+lib/samba/private/libRPC-SERVER-LOOP-samba4.so
+lib/samba/private/libRPC-WORKER-samba4.so
 lib/samba/private/libaddns-samba4.so
 lib/samba/private/libads-samba4.so
-lib/samba/private/libasn1-samba4.so.8
-lib/samba/private/libasn1-samba4.so.8.0.0
+lib/samba/private/libasn1-samba4.so
 lib/samba/private/libasn1util-samba4.so
 lib/samba/private/libauth-samba4.so
 lib/samba/private/libauth-unix-token-samba4.so
@@ -687,8 +698,7 @@
 lib/samba/private/libcluster-samba4.so
 lib/samba/private/libcmdline-contexts-samba4.so
 lib/samba/private/libcmdline-samba4.so
-lib/samba/private/libcom_err-samba4.so.0
-lib/samba/private/libcom_err-samba4.so.0.25
+lib/samba/private/libcom-err-samba4.so
 lib/samba/private/libcommon-auth-samba4.so
 ${PLIST.ads}lib/samba/private/libdb-glue-samba4.so
 lib/samba/private/libdbwrap-samba4.so
@@ -707,26 +717,19 @@
 lib/samba/private/libgpext-samba4.so
 lib/samba/private/libgpo-samba4.so
 lib/samba/private/libgse-samba4.so
-lib/samba/private/libgssapi-samba4.so.2
-lib/samba/private/libgssapi-samba4.so.2.0.0
-lib/samba/private/libhcrypto-samba4.so.5
-lib/samba/private/libhcrypto-samba4.so.5.0.1
-lib/samba/private/libhdb-samba4.so.11
-lib/samba/private/libhdb-samba4.so.11.0.2
-lib/samba/private/libheimbase-samba4.so.1
-lib/samba/private/libheimbase-samba4.so.1.0.0
-lib/samba/private/libheimntlm-samba4.so.1
-lib/samba/private/libheimntlm-samba4.so.1.0.1
+lib/samba/private/libgss-preauth-samba4.so
+lib/samba/private/libgssapi-samba4.so
+lib/samba/private/libhcrypto-samba4.so
+lib/samba/private/libhdb-samba4.so
+lib/samba/private/libheimbase-samba4.so
+lib/samba/private/libheimntlm-samba4.so
 lib/samba/private/libhttp-samba4.so
-lib/samba/private/libhx509-samba4.so.5
-lib/samba/private/libhx509-samba4.so.5.0.0
+lib/samba/private/libhx509-samba4.so
 lib/samba/private/libidmap-samba4.so
 lib/samba/private/libinterfaces-samba4.so
 lib/samba/private/libiov-buf-samba4.so
-lib/samba/private/libkdc-samba4.so.2
-lib/samba/private/libkdc-samba4.so.2.0.0
-lib/samba/private/libkrb5-samba4.so.26
-lib/samba/private/libkrb5-samba4.so.26.0.0
+lib/samba/private/libkdc-samba4.so
+lib/samba/private/libkrb5-samba4.so
 lib/samba/private/libkrb5samba-samba4.so
 lib/samba/private/libldbsamba-samba4.so
 lib/samba/private/liblibcli-lsa3-samba4.so
@@ -750,8 +753,7 @@
 ${PLIST.ads}lib/samba/private/libprocess-model-samba4.so
 lib/samba/private/libregistry-samba4.so
 lib/samba/private/libreplace-samba4.so
-lib/samba/private/libroken-samba4.so.19
-lib/samba/private/libroken-samba4.so.19.0.1
+lib/samba/private/libroken-samba4.so
 lib/samba/private/libsamba-cluster-support-samba4.so
 lib/samba/private/libsamba-debug-samba4.so
 lib/samba/private/libsamba-modules-samba4.so
@@ -784,9 +786,7 @@
 lib/samba/private/libutil-reg-samba4.so
 lib/samba/private/libutil-setid-samba4.so
 lib/samba/private/libutil-tdb-samba4.so
-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/libwind-samba4.so
 lib/samba/private/libxattr-tdb-samba4.so
 ${PLIST.ads}lib/samba/process_model/prefork.${SOEXT}
 ${PLIST.ads}lib/samba/process_model/standard.${SOEXT}
@@ -841,7 +841,16 @@
 lib/samba/vfs/widelinks.${SOEXT}
 lib/samba/vfs/worm.${SOEXT}
 lib/samba/vfs/xattr_tdb.${SOEXT}
+libexec/samba/rpcd_classic
+libexec/samba/rpcd_epmapper
+libexec/samba/rpcd_fsrvp
+libexec/samba/rpcd_lsad
+libexec/samba/rpcd_mdssvc
+libexec/samba/rpcd_rpcecho
+libexec/samba/rpcd_spoolss
+libexec/samba/rpcd_winreg
 libexec/samba/samba-bgqd
+libexec/samba/samba-dcerpcd
 ${PLIST.cups}libexec/samba/smbspool_krb5_wrapper
 man/man1/dbwrap_tool.1
 man/man1/gentest.1
@@ -871,7 +880,6 @@
 man/man1/smbtorture.1
 man/man1/smbtree.1
 man/man1/testparm.1
-man/man1/vfstest.1
 man/man1/wbinfo.1
 man/man5/lmhosts.5
 ${PLIST.pam}man/man5/pam_winbind.conf.5
@@ -899,6 +907,7 @@
 ${PLIST.pam}man/man8/pam_winbind.8
 man/man8/pdbedit.8
 man/man8/samba-bgqd.8
+man/man8/samba-dcerpcd.8
 man/man8/samba-gpupdate.8
 man/man8/samba-regedit.8
 man/man8/samba-tool.8
@@ -919,6 +928,7 @@
 man/man8/vfs_crossrename.8
 man/man8/vfs_default_quota.8
 man/man8/vfs_dirsort.8
+man/man8/vfs_expand_msdfs.8
 man/man8/vfs_extd_audit.8
 man/man8/vfs_fake_perms.8
 man/man8/vfs_fruit.8
diff -r 19494566ffc5 -r 3823ebd294cc net/samba4/distinfo
--- a/net/samba4/distinfo       Thu Jul 21 09:10:12 2022 +0000
+++ b/net/samba4/distinfo       Thu Jul 21 09:35:19 2022 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.77 2022/04/25 16:25:02 jperkin Exp $
+$NetBSD: distinfo,v 1.78 2022/07/21 09:35:19 adam Exp $
 
-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
+BLAKE2s (samba-4.16.3.tar.gz) = 465d98b2aaec2d305d81e38d6d61de0b1f5061802aeba284a9df52e83f0ee05c
+SHA512 (samba-4.16.3.tar.gz) = 8f082654251e6a3284ba8f411c55b854dc00a9c6b07c486ca01f53af2b6ec09d34c21d66a2a1afc7a8c62a9f715c643c1a22fc7688699d23f8fcafe6995b5ebd
+Size (samba-4.16.3.tar.gz) = 30593657 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
@@ -20,19 +20,20 @@
 SHA1 (patch-lib_util_charset_charset__macosxfs.c) = 9772fc52fff48aec2a7e279223f73bb791217c26
 SHA1 (patch-lib_util_smb__threads.h) = 817591a2b69f31ac29497a2006fe21f0b4b0aaea
 SHA1 (patch-lib_util_tfork.c) = a9acb5561c5bba76450c48904a22019c8b14cbec
+SHA1 (patch-lib_util_time.h) = 56e3d418d492a029eda03c82397f47c7f0cda6ba
 SHA1 (patch-libcli_dns_wscript__build) = 4103a144aa1bb4662fd7a62270941f1a3d01fe89
 SHA1 (patch-nsswitch_stress-nss-libwbclient.c) = c546f00184b0d22b6c150e210962cdfc6fc12df2
 SHA1 (patch-nsswitch_winbind__nss__netbsd.c) = 2773ec9269d1fe0d7ce7ed220f6a7122d187fabe
-SHA1 (patch-nsswitch_wscript__build) = e8a6251e031ffa13d6347fade8891f7afd65d3eb
+SHA1 (patch-nsswitch_wscript__build) = 5be3e07f8a34ae3e2f68126eb6f05f8b65f5be2f
 SHA1 (patch-source3_libsmb_pylibsmb.c) = 962bb35b140ec11c0035ffa7fb83c9143fa5615f
-SHA1 (patch-source3_modules_vfs__solarisacl.c) = 087db5db78bce27a71caee5c78eb4f9aba81b428
+SHA1 (patch-source3_modules_vfs__solarisacl.c) = 1a56006393d08d9977c60e75fddfcf501e2233f7
 SHA1 (patch-source3_modules_vfs__solarisacl.h) = 11f8664641a14fd83d78b1a7e10056a77b7b634f
 SHA1 (patch-source3_printing_samba-bgqd.c) = e9b83c35fbb24c702650d745b82fe6c9efbcdf76
 SHA1 (patch-source3_smbd_open.c) = 002f26f77dad54617bf9c0fe4fa12f093ef3b66c
 SHA1 (patch-source3_smbd_process.c) = 3a6f9682aca6473e364d0be0f601774df4fd1296
 SHA1 (patch-source3_utils_net__offlinejoin.c) = 773a4686d5e2a7eaebf9430529708e8318d45c77
 SHA1 (patch-source4_dsdb_samdb_ldb__modules_wscript__build__server) = 47f55ec16b667a0a4d38de5ac89a117f2ac8f898
-SHA1 (patch-source4_heimdal__build_roken.h) = c9fbcb1cf505022ae1483774ed429d74ac091253
-SHA1 (patch-source4_heimdal_include_heim__threads.h) = 1108fe804f235c72a93bcda0ec14454828ed030f
 SHA1 (patch-source4_scripting_wsript_build) = 816d44f48b6cbc6d999995e00eaea1d2dc477159
 SHA1 (patch-source4_utils_oLschema2ldif_wscript__build) = cbba15c2c0e1eee9d07424510a96b596f46992b4
+SHA1 (patch-third__party_heimdal__build_roken.h) = 59d5523676fe8c0315e969247f26b4ea2f900402
+SHA1 (patch-third__party_heimdal_include_heim__threads.h) = 5ad13530cf9688e46f9ad487bb0fddab668c8276
diff -r 19494566ffc5 -r 3823ebd294cc net/samba4/patches/patch-nsswitch_wscript__build
--- a/net/samba4/patches/patch-nsswitch_wscript__build  Thu Jul 21 09:10:12 2022 +0000
+++ b/net/samba4/patches/patch-nsswitch_wscript__build  Thu Jul 21 09:35:19 2022 +0000
@@ -1,16 +1,16 @@
-$NetBSD: patch-nsswitch_wscript__build,v 1.1 2015/05/26 15:11:26 jperkin Exp $
+$NetBSD: patch-nsswitch_wscript__build,v 1.2 2022/07/21 09:35:19 adam Exp $
 
 Use common library name on SunOS.
 
---- nsswitch/wscript_build.orig        2015-02-24 18:59:51.000000000 +0000
+--- nsswitch/wscript_build.orig        2022-01-24 10:26:59.000000000 +0000
 +++ nsswitch/wscript_build
-@@ -77,8 +77,7 @@ elif Utils.unversioned_sys_platform() ==
-       bld.SAMBA_LIBRARY('nss_winbind',
+@@ -76,8 +76,7 @@ elif Utils.unversioned_sys_platform() ==
+       bld.SAMBA_PLUGIN('nss_winbind',
                          source='winbind_nss_solaris.c winbind_nss_linux.c',
-                         deps='winbind-client',
+                         deps='wbclient',
 -                        realname='nss_winbind.so.1',
 -                        vnum='1')
 +                        realname='libnss_winbind.so')
  elif (host_os.rfind('hpux') > -1):
-       bld.SAMBA_LIBRARY('nss_winbind',
+       bld.SAMBA_PLUGIN('nss_winbind',
                          source='winbind_nss_linux.c',
diff -r 19494566ffc5 -r 3823ebd294cc net/samba4/patches/patch-source3_modules_vfs__solarisacl.c
--- a/net/samba4/patches/patch-source3_modules_vfs__solarisacl.c        Thu Jul 21 09:10:12 2022 +0000
+++ b/net/samba4/patches/patch-source3_modules_vfs__solarisacl.c        Thu Jul 21 09:35:19 2022 +0000
@@ -1,18 +1,9 @@
-$NetBSD: patch-source3_modules_vfs__solarisacl.c,v 1.1 2022/04/25 16:25:02 jperkin Exp $
+$NetBSD: patch-source3_modules_vfs__solarisacl.c,v 1.2 2022/07/21 09:35:19 adam Exp $
 
 https://bugzilla.samba.org/attachment.cgi?id=16710
 
 --- source3/modules/vfs_solarisacl.c.orig      2021-08-09 13:38:36.435381200 +0000
 +++ source3/modules/vfs_solarisacl.c
-@@ -204,7 +204,7 @@ int solarisacl_sys_acl_set_fd(vfs_handle
-       DEBUG(10, ("solarisacl_sys_acl_set_fd %s.\n",
-                  ((ret == 0) ? "succeeded" : "failed" )));
-       SAFE_FREE(solaris_acl);
--      SAFE_FREE(default_acl);
-+      SAFE_FREE(other_acl);
-       return ret;
- }