Index: head/net/samba42/Makefile
===================================================================
--- head/net/samba42/Makefile	(revision 413162)
+++ head/net/samba42/Makefile	(revision 413163)
@@ -1,534 +1,534 @@
 # Created by: timur@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME?=		${SAMBA4_BASENAME}42
 PORTVERSION?=		${SAMBA4_VERSION}
-PORTREVISION?=		2
+PORTREVISION?=		0
 CATEGORIES?=		net
 MASTER_SITES=		SAMBA/samba/stable SAMBA/samba/rc
 DISTNAME=		${SAMBA4_DISTNAME}
 
 MAINTAINER?=		timur@FreeBSD.org
 COMMENT?=		Free SMB/CIFS and AD/DC server and client for Unix
 
 LICENSE=		GPLv3
 
 CONFLICTS?=		*samba3[2-6]-3.* samba4-4.0.* samba41-4.1.* samba43-4.3.*
 
-EXTRA_PATCHES=		${PATCHDIR}/extra-patch-security:-p1
+#EXTRA_PATCHES=		${PATCHDIR}/extra-patch-security:-p1
 
 SAMBA4_BASENAME=	samba
 SAMBA4_PORTNAME=	${SAMBA4_BASENAME}4
-SAMBA4_VERSION=		4.2.7
+SAMBA4_VERSION=		4.2.11
 SAMBA4_DISTNAME=	${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|}
 
 WRKSRC?=		${WRKDIR}/${DISTNAME}
 
 .if !defined(SAMBA4_SUBPORT)
 CPE_VENDOR=		samba
 CPE_PRODUCT=		samba
 # Directories
 VARDIR=			${DESTDIR}/var
 SAMBA4_RUNDIR=		${VARDIR}/run/${SAMBA4_PORTNAME}
 SAMBA4_LOGDIR=		${VARDIR}/log/${SAMBA4_PORTNAME}
 SAMBA4_LOCKDIR=		${VARDIR}/db/${SAMBA4_PORTNAME}
 SAMBA4_PRIVATEDIR=	${SAMBA4_LOCKDIR}/private
 SAMBA4_LIBDIR=		${PREFIX}/lib
 SAMBA4_MODULEDIR=	${SAMBA4_LIBDIR}/shared-modules
 SAMBA4_INCLUDEDIR=	${PREFIX}/include/${SAMBA4_PORTNAME}
 SAMBA4_CONFDIR=		${PREFIX}/etc
 SAMBA4_CONFIG=		smb4.conf
 
 CONFIGURE_ARGS+=	--mandir="${MANPREFIX}/man" \
 			--sysconfdir="${SAMBA4_CONFDIR}" \
 			--includedir="${SAMBA4_INCLUDEDIR}" \
 			--datadir="${DATADIR}" \
 			--libdir="${SAMBA4_LIBDIR}" \
 			--with-pammodulesdir="${SAMBA4_LIBDIR}" \
 			--with-privatelibdir="${SAMBA4_LIBDIR}/samba" \
 			--with-modulesdir="${SAMBA4_MODULEDIR}" \
 			--with-pkgconfigdir="${PKGCONFIGDIR}" \
 			--localstatedir="${VARDIR}" \
 			--with-piddir="${SAMBA4_RUNDIR}" \
 			--with-sockets-dir="${SAMBA4_RUNDIR}" \
 			--with-privileged-socket-dir="${SAMBA4_RUNDIR}" \
 			--with-lockdir="${SAMBA4_LOCKDIR}" \
 			--with-statedir="${SAMBA4_LOCKDIR}" \
 			--with-cachedir="${SAMBA4_LOCKDIR}" \
 			--with-privatedir="${SAMBA4_PRIVATEDIR}" \
 			--with-logfilebase="${SAMBA4_LOGDIR}"
 # Flags
 CONFIGURE_ENV+=		PTHREAD_LDFLAGS="-lpthread"
 
 USES=			cpe compiler waf pkgconfig perl5 python:2 \
 			execinfo readline iconv shebangfix
 USE_PERL5=		build
 USE_LDCONFIG=		${SAMBA4_LIBDIR}
 WAF_CMD=		buildtools/bin/waf
 CONFIGURE_LOG=		bin/config.log
 
 PKGCONFIGDIR?=		${PREFIX}/libdata/pkgconfig
 PLIST_SUB+=		PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;}
 # XXX: Unconditional dependencies which can't be switched off(if present
 # in the system)
 # popt
 LIB_DEPENDS+=		libpopt.so:devel/popt
 # inotify
 LIB_DEPENDS+=		libinotify.so:devel/libinotify
 # SASL
 LIB_DEPENDS+=		libsasl2.so:security/cyrus-sasl2
 # GNUTLS
 LIB_DEPENDS+=		libgcrypt.so:security/libgcrypt
 LIB_DEPENDS+=		libgnutls.so:security/gnutls
 # NFS4 ACL glue
 LIB_DEPENDS+=		libsunacl.so:sysutils/libsunacl
 # Libarchive
 BUILD_DEPENDS+=		libarchive>=3.1.2:archivers/libarchive
 RUN_DEPENDS+=		libarchive>=3.1.2:archivers/libarchive
 # External Samba dependencies
 # IDL compiler
 BUILD_DEPENDS+=		p5-Parse-Pidl>=4.0.0:devel/p5-Parse-Pidl
 #
 BUILD_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython
 RUN_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython
 PLIST_SUB+=		PY_DNSPYTHON="@comment "
 # talloc
 BUILD_DEPENDS+=		talloc>=2.1.5:devel/talloc
 RUN_DEPENDS+=		talloc>=2.1.5:devel/talloc
 SAMBA4_BUNDLED_LIBS+=	!talloc
 # tevent
 BUILD_DEPENDS+=		tevent>=0.9.25:devel/tevent
 RUN_DEPENDS+=		tevent>=0.9.25:devel/tevent
 SAMBA4_BUNDLED_LIBS+=	!tevent
 # tdb
 BUILD_DEPENDS+=		tdb>=1.3.8:databases/tdb
 RUN_DEPENDS+=		tdb>=1.3.8:databases/tdb
 SAMBA4_BUNDLED_LIBS+=	!tdb
 # ntdb
 BUILD_DEPENDS+=		ntdb>=1.0:databases/ntdb
 RUN_DEPENDS+=		ntdb>=1.0:databases/ntdb
 SAMBA4_BUNDLED_LIBS+=	!ntdb
 # ldb
 BUILD_DEPENDS+=		ldb>=1.1.24:databases/ldb
 RUN_DEPENDS+=		ldb>=1.1.24:databases/ldb
 SAMBA4_BUNDLED_LIBS+=	!ldb
 # Don't use external libcom_err
 SAMBA4_BUNDLED_LIBS+=	com_err
 ##############################################################################
 # Options
 OPTIONS_DEFINE=		ACL_SUPPORT AD_DC ADS AIO_SUPPORT CUPS DEBUG \
 			DNSUPDATE DOCS FAM LDAP PAM_SMBPASS \
 			PTHREADPOOL QUOTAS SYSLOG UTMP
 
 OPTIONS_DEFAULT:=	ACL_SUPPORT AD_DC ADS AIO_SUPPORT DEBUG \
 			DNSUPDATE DOCS FAM LDAP \
 			PTHREADPOOL QUOTAS SYSLOG UTMP
 
 ACL_SUPPORT_DESC=	File system ACL support
 AD_DC_DESC=		Active Directory Domain Controller support
 ADS_DESC=		Active Directory client support
 AIO_SUPPORT_DESC=	Asyncronous IO support
 DNSUPDATE_DESC=		Dynamic DNS update (require ADS)
 EXP_MODULES_DESC=	Experimental modules
 FAM_DESC=		File Alteration Monitor support
 DEBUG_DESC=		With debug information in the binaries
 LDAP_DESC=		LDAP client support
 PAM_SMBPASS_DESC=	PAM authentication via passdb backends
 PTHREADPOOL_DESC=	Pthread pool
 QUOTAS_DESC=		Disk quota support
 UTMP_DESC=		UTMP accounting support
 ##############################################################################
 OPTIONS_DEFINE+=	DEVELOPER MANPAGES EXP_MODULES
 
 DEVELOPER_DESC=		With development support
 MANPAGES_DESC=		Build manpages from DOCBOOK templates
 
 OPTIONS_RADIO=		DNS ZEROCONF
 OPTIONS_RADIO_DNS=	NSUPDATE BIND99 BIND910
 OPTIONS_RADIO_ZEROCONF=	AVAHI MDNSRESPONDER
 
 BIND99_DESC=		Use bind99 as AD DC DNS server frontend
 BIND910_DESC=		Use bind910 as AD DC DNS server frontend
 NSUPDATE_DESC=		Use samba NSUPDATE utility for AD DC
 
 .include <bsd.port.options.mk>
 
 CONFIGURE_ARGS+=	\
 			--with-pam \
 			--with-iconv \
 			--with-winbind \
 			--without-gettext \
 			--with-sendfile-support \
 			--builtin-libraries=smbclient \
 			${ICONV_CONFIGURE_BASE}
 
 # for libexecinfo: (so that __builtin_frame_address() finds the top of the stack)
 .if ${ARCH} == "amd64"
 CFLAGS+=		-fno-omit-frame-pointer
 .endif
 
 .if ${PORT_OPTIONS:MBIND99}
 RUN_DEPENDS+=		bind99>=9.9.0.0:dns/bind99
 SUB_LIST+=		NSUPDATE="@comment "
 .elif ${PORT_OPTIONS:MBIND910}
 RUN_DEPENDS+=		bind910>=9.10.0.0:dns/bind910
 SUB_LIST+=		NSUPDATE="@comment "
 .elif ${PORT_OPTIONS:MNSUPDATE}
 RUN_DEPENDS+=		samba-nsupdate:dns/samba-nsupdate
 SUB_LIST+=		NSUPDATE=""
 .else
 SUB_LIST+=		NSUPDATE="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MDEBUG}
 WITH_DEBUG=		yes
 CONFIGURE_ARGS+=	--verbose
 MAKE_ARGS+=		--verbose
 CONFIGURE_ARGS+=	--enable-debug
 .endif
 
 # https://bugzilla.samba.org/show_bug.cgi?id=8969
 .if ${PORT_OPTIONS:MDEVELOPER}
 #GDB_CMD?=		gdb79
 # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=194046
 # XXX: Still may break, if the link isn't installed - blame devel/gdb maintainer then.
 GDB_CMD?=		${LOCALBASE}/bin/gdb
 BUILD_DEPENDS+=		${GDB_CMD}:devel/gdb
 RUN_DEPENDS+=		${GDB_CMD}:devel/gdb
 SAMBA4_MODULES+=	auth_skel perfcount_test pdb_test vfs_shadow_copy_test vfs_skel_opaque vfs_skel_transparent vfs_fake_acls
 CONFIGURE_ARGS+=	--enable-developer --enable-selftest
 PLIST_SUB+=		DEVELOPER=""
 .else
 GDB_CMD=		true
 PLIST_SUB+=		DEVELOPER="@comment "
 .endif
 ##############################################################################
 # XXX: That will blow up your installation
 # https://bugzilla.samba.org/show_bug.cgi?id=9302
 .if defined(CRAZY)
 WANT_EXP_MODULES=	auth_samba4 auth_script auth_skel auth_unix auth_wbc \
 			gpext_registry gpext_scripts gpext_security idmap_ad \
 			idmap_autorid idmap_hash idmap_ldap idmap_passdb \
 			idmap_rid idmap_tdb idmap_tdb2 idmap_nss nss_info_template \
 			pdb_ldap pdb_samba_dsdb pdb_smbpasswd pdb_tdbsam \
 			pdb_test pdb_wbc_sam perfcount_test vfs_acl_tdb \
 			vfs_acl_xattr vfs_aio_fork vfs_aio_posix \
 			vfs_aio_pthread vfs_audit vfs_cacheprime vfs_cap \
 			vfs_catia vfs_commit vfs_crossrename vfs_default_quota \
 			vfs_dfs_samba4 vfs_dirsort vfs_expand_msdfs vfs_extd_audit \
 			vfs_fake_acls vfs_fake_perms vfs_full_audit vfs_media_harmony \
 			vfs_netatalk vfs_posix_eadb vfs_preopen vfs_readahead \
 			vfs_readonly vfs_recycle vfs_scannedonly vfs_shadow_copy \
 			vfs_shadow_copy2 vfs_shadow_copy_test vfs_skel_opaque \
 			vfs_skel_transparent vfs_smb_traffic_analyzer vfs_streams_depot \
 			vfs_streams_xattr vfs_syncops vfs_time_audit \
 			vfs_xattr_tdb vfs_zfsacl
 .endif
 
 .if ${PORT_OPTIONS:MEXP_MODULES}
 .	if !defined(WANT_EXP_MODULES) || empty(WANT_EXP_MODULES)
 WANT_EXP_MODULES=	vfs_cacheprime gpext_scripts gpext_security gpext_registry
 .	endif
 .endif
 
 .if ${PORT_OPTIONS:MACL_SUPPORT}
 LIB_DEPENDS+=		libsunacl.so:sysutils/libsunacl
 WANT_EXP_MODULES+=	vfs_zfsacl
 SAMBA4_MODULES+=	vfs_zfsacl
 CONFIGURE_ARGS+=	--with-acl-support
 .else
 CONFIGURE_ARGS+=	--without-acl-support
 .endif
 
 .if ! ${PORT_OPTIONS:MAD_DC}
 CONFIGURE_ARGS+=	--without-ad-dc
 PLIST_SUB+=		AD_DC="@comment "
 SUB_LIST+=		AD_DC="@comment "
 .else
 PLIST_SUB+=		AD_DC=""
 SUB_LIST+=		AD_DC=""
 .endif
 
 .if ${PORT_OPTIONS:MADS}
 SAMBA4_WANT_ADS=	yes
 SAMBA4_WANT_LDAP=	yes
 # List of extra modules taken from RHEL build
 # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=197320
 SAMBA4_MODULES+=	idmap_rid idmap_ad idmap_hash idmap_adex idmap_tdb2
 .endif
 
 .if ${PORT_OPTIONS:MAIO_SUPPORT}
 CONFIGURE_ARGS+=	--with-aio-support
 SAMBA4_MODULES+=	vfs_aio_posix
 .else
 CONFIGURE_ARGS+=	--without-aio-support
 .endif
 
 .if ${PORT_OPTIONS:MAVAHI}
 LIB_DEPENDS+=		libavahi-client.so:net/avahi-app
 CONFIGURE_ARGS+=	--enable-avahi
 .else
 CONFIGURE_ARGS+=	--disable-avahi
 .endif
 
 .if ${PORT_OPTIONS:MMDNSRESPONDER}
 LIB_DEPENDS+=		libdns_sd.so:net/mDNSResponder
 CONFIGURE_ARGS+=	--enable-dnssd
 .else
 CONFIGURE_ARGS+=	--disable-dnssd
 .endif
 
 .if ${PORT_OPTIONS:MCUPS}
 LIB_DEPENDS+=		libcups.so:print/cups
 CONFIGURE_ARGS+=	--enable-cups --enable-iprint
 .else
 CONFIGURE_ARGS+=	--disable-cups --disable-iprint
 .endif
 
 .if ${PORT_OPTIONS:MDNSUPDATE}
 SAMBA_WANT_ADS=		yes
 CONFIGURE_ARGS+=	--with-dnsupdate
 .else
 CONFIGURE_ARGS+=	--without-dnsupdate
 .endif
 
 # https://bugzilla.samba.org/show_bug.cgi?id=9545
 .if ${PORT_OPTIONS:MFAM}
 USES+=			fam
 CONFIGURE_ARGS+=	--with-fam
 WANT_EXP_MODULES+=	vfs_notify_fam
 SAMBA4_MODULES+=	vfs_notify_fam
 .else
 CONFIGURE_ARGS+=	--without-fam
 .endif
 
 .if ${PORT_OPTIONS:MLDAP}
 SAMBA4_WANT_LDAP=	yes
 .endif
 
 .if ${PORT_OPTIONS:MPAM_SMBPASS}
 CONFIGURE_ARGS+=	--with-pam_smbpass
 PLIST_SUB+=		SMBPASS=""
 .else
 CONFIGURE_ARGS+=	--without-pam_smbpass
 PLIST_SUB+=		SMBPASS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPTHREADPOOL}
 CONFIGURE_ARGS+=	--enable-pthreadpool
 SAMBA4_MODULES+=	vfs_aio_pthread
 .else
 CONFIGURE_ARGS+=	--disable-pthreadpool
 .endif
 
 .if ${PORT_OPTIONS:MQUOTAS}
 CONFIGURE_ARGS+=	--with-quotas
 .else
 CONFIGURE_ARGS+=	--without-quotas
 .endif
 
 .if ${PORT_OPTIONS:MSYSLOG}
 CONFIGURE_ARGS+=	--with-syslog
 .else
 CONFIGURE_ARGS+=	--without-syslog
 .endif
 
 .if ${PORT_OPTIONS:MUTMP}
 CONFIGURE_ARGS+=	--with-utmp
 .else
 CONFIGURE_ARGS+=	--without-utmp
 .endif
 
 .if defined(SAMBA4_WANT_ADS)
 CONFIGURE_ARGS+=	--with-ads
 .else
 CONFIGURE_ARGS+=	--without-ads
 .endif
 
 .if defined(SAMBA4_WANT_LDAP)
 USE_OPENLDAP=		yes
 #WANT_OPENLDAP_SASL=	yes
 CONFIGURE_ARGS+=	--with-ldap
 PLIST_SUB+=		LDAP=""
 .else
 CONFIGURE_ARGS+=	--without-ldap
 PLIST_SUB+=		LDAP="@comment "
 .endif
 
 .if ! ${PORT_OPTIONS:MMANPAGES}
 CONFIGURE_ENV+=		XSLTPROC="true"
 .else
 BUILD_DEPENDS+=		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \
 			xsltproc:textproc/libxslt
 .endif
 
 .if defined(SAMBA4_BUNDLED_LIBS) && !empty(SAMBA4_BUNDLED_LIBS)
 CONFIGURE_ARGS+=	--bundled-libraries="${SAMBA4_BUNDLED_LIBS:Q:C|(\\\\ )+|,|g:S|\\||g}"
 .endif
 
 .if defined(WANT_EXP_MODULES) && !empty(WANT_EXP_MODULES)
 SAMBA4_MODULES+=	${WANT_EXP_MODULES}
 .endif
 
 .if defined(SAMBA4_MODULES) && !empty(SAMBA4_MODULES)
 CONFIGURE_ARGS+=	--with-shared-modules="${SAMBA4_MODULES:Q:C|(\\\\ )+|,|g:S|\\||g}"
 .endif
 # XXX: Dirty
 .for module in	auth_samba4 auth_skel auth_unix auth_wbc gpext_registry gpext_scripts \
 		gpext_security idmap_ad idmap_ldap idmap_nss idmap_passdb idmap_tdb \
 		nss_info_template pdb_ldap pdb_samba_dsdb pdb_smbpasswd pdb_tdbsam \
 		pdb_test pdb_wbc_sam perfcount_test vfs_aio_posix vfs_aio_pthread \
 		vfs_cacheprime vfs_dfs_samba4 vfs_fake_acls vfs_notify_fam \
 		vfs_shadow_copy_test vfs_skel_opaque vfs_skel_transparent
 .	if !empty(SAMBA4_MODULES) && ${SAMBA4_MODULES:M${module}}
 PLIST_SUB+=		MODULE_${module:tu}=""
 .	else
 PLIST_SUB+=		MODULE_${module:tu}="@comment "
 .	endif
 .endfor
 ##############################################################################
 # !SAMBA4_SUBPORT
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if !defined(SAMBA4_SUBPORT)
 
 SAMBA4_SUB=		SAMBA4_LOGDIR="${SAMBA4_LOGDIR}" \
 			SAMBA4_RUNDIR="${SAMBA4_RUNDIR}" \
 			SAMBA4_LOCKDIR="${SAMBA4_LOCKDIR}" \
 			SAMBA4_MODULEDIR="${SAMBA4_MODULEDIR}" \
 			SAMBA4_PRIVATEDIR="${SAMBA4_PRIVATEDIR}" \
 			SAMBA4_CONFDIR="${SAMBA4_CONFDIR}" \
 			SAMBA4_CONFIG="${SAMBA4_CONFIG}"
 
 PLIST_SUB+=		${SAMBA4_SUB}
 SUB_LIST+=		${SAMBA4_SUB}
 
 USE_RC_SUBR=		samba_server
 SUB_FILES=		pkg-message README.FreeBSD
 # Make sure that the right version of Python is used by the tools
 # https://bugzilla.samba.org/show_bug.cgi?id=7305
 SHEBANG_FILES=		${PATCH_WRKSRC}/source4/scripting/bin/*
 # No fancy color error messages
 .if ${COMPILER_TYPE} == "clang"
 CFLAGS+=		-fno-color-diagnostics
 .endif
 CONFIGURE_ENV+=		NOCOLOR=yes WAF_LOG_FORMAT='%(c1)s%(zone)s%(c2)s %(message)s'
 MAKE_ENV+=		NOCOLOR=yes WAF_LOG_FORMAT='%(c1)s%(zone)s%(c2)s %(message)s'
 
 SAMBA_MAN1+=		dbwrap_tool.1 findsmb.1 gentest.1 locktest.1 \
 			log2pcap.1 masktest.1 ndrdump.1 nmblookup.1 \
 			nmblookup4.1 ntlm_auth.1 oLschema2ldif.1 \
 			profiles.1 regdiff.1 regpatch.1 regshell.1 \
 			regtree.1 rpcclient.1 sharesec.1 smbcacls.1 \
 			smbclient.1 smbcontrol.1 smbcquotas.1 smbget.1 \
 			smbstatus.1 smbtar.1 smbtorture.1 smbtree.1 \
 			testparm.1 vfstest.1 wbinfo.1
 
 SAMBA_MAN5+=		lmhosts.5 smbgetrc.5 smbpasswd.5 pam_winbind.conf.5 \
 			smb.conf.5
 
 SAMBA_MAN7+=		samba.7 winbind_krb5_locator.7
 
 SAMBA_MAN8+=		eventlogadm.8 idmap_ad.8 idmap_autorid.8 idmap_hash.8 \
 			idmap_ldap.8 idmap_nss.8 idmap_rfc2307.8 idmap_rid.8 \
 			idmap_tdb.8 idmap_tdb2.8 net.8 nmbd.8 pam_winbind.8 pdbedit.8 \
 			samba-regedit.8 samba-tool.8 samba.8 smbd.8 smbpasswd.8 \
 			smbspool.8 smbta-util.8 vfs_acl_tdb.8 vfs_acl_xattr.8 \
 			vfs_aio_fork.8 vfs_aio_linux.8 vfs_aio_pthread.8 \
 			vfs_audit.8 vfs_cacheprime.8 vfs_cap.8 vfs_catia.8 vfs_ceph.8 \
 			vfs_commit.8 vfs_crossrename.8 vfs_default_quota.8 \
 			vfs_dirsort.8 vfs_extd_audit.8 vfs_fake_perms.8 vfs_fileid.8 \
 			vfs_fruit.8 vfs_full_audit.8 vfs_glusterfs.8 vfs_gpfs.8 vfs_media_harmony.8 \
 			vfs_netatalk.8 vfs_notify_fam.8 vfs_prealloc.8 \
 			vfs_preopen.8 vfs_readahead.8 vfs_readonly.8 \
 			vfs_recycle.8 vfs_scannedonly.8 vfs_shadow_copy.8 \
 			vfs_shadow_copy2.8 vfs_snapper.8 vfs_smb_traffic_analyzer.8 \
 			vfs_streams_depot.8 vfs_streams_xattr.8 vfs_syncops.8 vfs_time_audit.8 \
 			vfs_tsmsm.8 vfs_worm.8 vfs_xattr_tdb.8 winbindd.8 \
 			vfs_linux_xfs_sgid.8 vfs_btrfs.8
 
 PORTDOCS=		README.FreeBSD
 
 IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support
 
 post-extract:
 			@${RM} -rf ${WRKSRC}/pidl
 
 post-patch:
 			@${REINPLACE_CMD} -e 's|$${PKGCONFIGDIR}|${PKGCONFIGDIR}|g' \
 				${PATCH_WRKSRC}/buildtools/wafsamba/pkgconfig.py
 			@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 				${PATCH_WRKSRC}/buildtools/wafsamba/samba_pidl.py \
 				${PATCH_WRKSRC}/buildtools/wafsamba/wafsamba.py
 			@${REINPLACE_CMD} -e 's|%%GDB_CMD%%|${GDB_CMD}|g' \
 				${PATCH_WRKSRC}/buildtools/scripts/abi_gen.sh
 			@${REINPLACE_CMD} -e 's|%%SAMBA4_CONFIG%%|${SAMBA4_CONFIG}|g' \
 				${PATCH_WRKSRC}/dynconfig/wscript
 
 # Use threading (or multiprocessing) but not thread (renamed in python 3+).
 pre-configure:
 			@if ! ${PYTHON_CMD} -c "import multiprocessing;" 2>/dev/null; then \
 				${ECHO_CMD}; \
 				${ECHO_MSG} "===>  ${PKGNAME} "${IGNORE_NONTHREAD_PYTHON:Q}.; \
 				${ECHO_CMD}; \
 				${FALSE}; \
 			fi
 
 # XXX: Gross hack to allow build newer Samba while old one is installed.
 # This implies that LINKFLAGS_PYEMBED contains flags which are already
 # used in other parts of LINKFLAGS, namely -L$(LOCALBASE)/lib and -pthread
 post-configure:
 	-${REINPLACE_CMD} -e 's|LINKFLAGS_PYEMBED.*|LINKFLAGS_PYEMBED = []|' \
 		${CONFIGURE_WRKSRC}/bin/c4che/default.cache.py
 
 pre-build:
 .if ! ${PORT_OPTIONS:MMANPAGES}
 .	for man in	libcli/nbt/man/nmblookup4.1 \
 			librpc/tools/ndrdump.1 \
 			source4/lib/registry/man/regdiff.1 \
 			source4/lib/registry/man/regpatch.1 \
 			source4/lib/registry/man/regshell.1 \
 			source4/lib/registry/man/regtree.1 \
 			source4/torture/man/gentest.1 \
 			source4/torture/man/locktest.1 \
 			source4/torture/man/masktest.1 \
 			source4/torture/man/smbtorture.1 \
 			source4/utils/man/ntlm_auth4.1 \
 			source4/utils/man/oLschema2ldif.1
 			-@${MKDIR} `dirname ${BUILD_WRKSRC}/bin/default/${man}`
 			@${INSTALL_MAN} ${FILESDIR}/man/`basename ${man}` ${BUILD_WRKSRC}/bin/default/${man}
 .	endfor
 			-@${MKDIR} ${BUILD_WRKSRC}/bin/default/docs-xml/manpages
 .	for man in ${SAMBA_MAN1} ${SAMBA_MAN5} ${SAMBA_MAN7} ${SAMBA_MAN8}
 			-@${INSTALL_MAN} ${BUILD_WRKSRC}/docs/manpages/${man} ${BUILD_WRKSRC}/bin/default/docs-xml/manpages
 .	endfor
 .endif
 
 post-install:
 			@${LN} -sf smb.conf.5.gz ${STAGEDIR}${PREFIX}/man/man5/smb4.conf.5.gz
 .if ${PORT_OPTIONS:MDOCS}
 			@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .	for doc in ${PORTDOCS}
 			@${INSTALL_DATA} ${WRKDIR}/${doc} ${STAGEDIR}${DOCSDIR}
 .	endfor
 .endif
 # Run post-install script
 .for dir in ${SAMBA4_LOGDIR} ${SAMBA4_RUNDIR} ${SAMBA4_LOCKDIR} ${SAMBA4_MODULEDIR}
 			@${INSTALL} -d -m 0755 "${STAGEDIR}${dir}"
 .endfor
 			@${INSTALL} -d -m 0700 "${STAGEDIR}${SAMBA4_PRIVATEDIR}"
 .for dir in auth bind9 gensec gpext idmap ldb nss_info pdb perfcount process_model service vfs
 			@${MKDIR} "${STAGEDIR}${SAMBA4_MODULEDIR}/${dir}"
 .endfor
 
 .if ${PORT_OPTIONS:MDEVELOPER}
 test: build
 			@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${INSTALL_WRKSRC}/${WAF_CMD} ${MAKE_ARGS} $@)
 .endif
 
 # !SAMBA4_SUBPORT
 .endif
 
 .include <bsd.port.post.mk>
Index: head/net/samba42/distinfo
===================================================================
--- head/net/samba42/distinfo	(revision 413162)
+++ head/net/samba42/distinfo	(revision 413163)
@@ -1,2 +1,2 @@
-SHA256 (samba-4.2.7.tar.gz) = f586ab3166ce4c663360f15b1de24ef083816a5471856e3ad49bc26b35f0104a
-SIZE (samba-4.2.7.tar.gz) = 20741971
+SHA256 (samba-4.2.11.tar.gz) = 75bce53c922e51352933c9846f2c4b1e251fabb80927adb426a773a321ee01f8
+SIZE (samba-4.2.11.tar.gz) = 20875348
Index: head/net/samba42/files/extra-patch-security
===================================================================
--- head/net/samba42/files/extra-patch-security	(revision 413162)
+++ head/net/samba42/files/extra-patch-security	(nonexistent)
@@ -1,647 +0,0 @@
-From 6a25f2a8c651523a272c0019895e1d2b1e83b022 Mon Sep 17 00:00:00 2001
-From: Volker Lendecke <vl@samba.org>
-Date: Sat, 18 Jul 2015 21:50:55 +0200
-Subject: [PATCH 1/5] dbwrap_rbt: Make "key" and "value" aligned to 16 byte
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Reported by Uri Simchoni <urisimchoni@gmail.com>. Thanks!
-
-Signed-off-by: Volker Lendecke <vl@samba.org>
-Reviewed-by: Ralph Boehme <slow@samba.org>
-
-Autobuild-User(master): Ralph Böhme <slow@samba.org>
-Autobuild-Date(master): Mon Jul 20 23:18:23 CEST 2015 on sn-devel-104
-
-(cherry picked from commit 64a88f74ca5309dce1d3ec0755ceba4af5144dbd)
----
- lib/dbwrap/dbwrap_rbt.c | 51 +++++++++++++++++++++++++++++++++++++------------
- 1 file changed, 39 insertions(+), 12 deletions(-)
-
-diff --git a/lib/dbwrap/dbwrap_rbt.c b/lib/dbwrap/dbwrap_rbt.c
-index 3f97086..03f2f57 100644
---- a/lib/dbwrap/dbwrap_rbt.c
-+++ b/lib/dbwrap/dbwrap_rbt.c
-@@ -38,13 +38,6 @@ struct db_rbt_rec {
- struct db_rbt_node {
- 	struct rb_node rb_node;
- 	size_t keysize, valuesize;
--
--	/*
--	 * key and value are appended implicitly, "data" is only here as a
--	 * target for offsetof()
--	 */
--
--	char data[1];
- };
- 
- /*
-@@ -83,12 +76,43 @@ static int db_rbt_compare(TDB_DATA a, TDB_DATA b)
- static void db_rbt_parse_node(struct db_rbt_node *node,
- 			      TDB_DATA *key, TDB_DATA *value)
- {
--	key->dptr = ((uint8_t *)node) + offsetof(struct db_rbt_node, data);
-+	size_t key_offset, value_offset;
-+
-+	key_offset = DBWRAP_RBT_ALIGN(sizeof(struct db_rbt_node));
-+	key->dptr = ((uint8_t *)node) + key_offset;
- 	key->dsize = node->keysize;
--	value->dptr = key->dptr + node->keysize;
-+
-+	value_offset = DBWRAP_RBT_ALIGN(node->keysize);
-+	value->dptr = key->dptr + value_offset;
- 	value->dsize = node->valuesize;
- }
- 
-+static ssize_t db_rbt_reclen(size_t keylen, size_t valuelen)
-+{
-+	size_t len, tmp;
-+
-+	len = DBWRAP_RBT_ALIGN(sizeof(struct db_rbt_node));
-+
-+	tmp = DBWRAP_RBT_ALIGN(keylen);
-+	if (tmp < keylen) {
-+		goto overflow;
-+	}
-+
-+	len += tmp;
-+	if (len < tmp) {
-+		goto overflow;
-+	}
-+
-+	len += valuelen;
-+	if (len < valuelen) {
-+		goto overflow;
-+	}
-+
-+	return len;
-+overflow:
-+	return -1;
-+}
-+
- static NTSTATUS db_rbt_store(struct db_record *rec, TDB_DATA data, int flag)
- {
- 	struct db_rbt_ctx *db_ctx = talloc_get_type_abort(
-@@ -99,6 +123,7 @@ static NTSTATUS db_rbt_store(struct db_record *rec, TDB_DATA data, int flag)
- 	struct rb_node ** p;
- 	struct rb_node * parent;
- 
-+	ssize_t reclen;
- 	TDB_DATA this_key, this_val;
- 
- 	if (rec_priv->node != NULL) {
-@@ -123,10 +148,12 @@ static NTSTATUS db_rbt_store(struct db_record *rec, TDB_DATA data, int flag)
- 		}
- 	}
- 
--	node = (struct db_rbt_node *)talloc_size(db_ctx,
--		offsetof(struct db_rbt_node, data) + rec->key.dsize
--		+ data.dsize);
-+	reclen = db_rbt_reclen(rec->key.dsize, data.dsize);
-+	if (reclen == -1) {
-+		return NT_STATUS_INSUFFICIENT_RESOURCES;
-+	}
- 
-+	node = talloc_size(db_ctx, reclen);
- 	if (node == NULL) {
- 		return NT_STATUS_NO_MEMORY;
- 	}
--- 
-1.9.1
-
-
-From b4d52184a113851954b1b901f478db200e9fd7a8 Mon Sep 17 00:00:00 2001
-From: Stefan Metzmacher <metze@samba.org>
-Date: Wed, 25 Nov 2015 10:17:34 +0100
-Subject: [PATCH 2/5] dbwrap_rbt: use talloc_zero_size() instead of a partial
- ZERO_STRUCT()
-
-BUG: https://bugzilla.samba.org/show_bug.cgi?id=11375
-BUG: https://bugzilla.samba.org/show_bug.cgi?id=11394
-
-Signed-off-by: Stefan Metzmacher <metze@samba.org>
-Reviewed-by: Volker Lendecke <vl@samba.org>
-(cherry picked from commit f3d1fc1d06822a951a2a3eeb5aa53748b9b5b299)
----
- lib/dbwrap/dbwrap_rbt.c | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/lib/dbwrap/dbwrap_rbt.c b/lib/dbwrap/dbwrap_rbt.c
-index 03f2f57..2d65647 100644
---- a/lib/dbwrap/dbwrap_rbt.c
-+++ b/lib/dbwrap/dbwrap_rbt.c
-@@ -153,7 +153,7 @@ static NTSTATUS db_rbt_store(struct db_record *rec, TDB_DATA data, int flag)
- 		return NT_STATUS_INSUFFICIENT_RESOURCES;
- 	}
- 
--	node = talloc_size(db_ctx, reclen);
-+	node = talloc_zero_size(db_ctx, reclen);
- 	if (node == NULL) {
- 		return NT_STATUS_NO_MEMORY;
- 	}
-@@ -172,8 +172,6 @@ static NTSTATUS db_rbt_store(struct db_record *rec, TDB_DATA data, int flag)
- 		 */
- 	}
- 
--	ZERO_STRUCT(node->rb_node);
--
- 	node->keysize = rec->key.dsize;
- 	node->valuesize = data.dsize;
- 
--- 
-1.9.1
-
-
-From 10abdaf5c7f99eca742c84a7d55b7bb9c324aeab Mon Sep 17 00:00:00 2001
-From: Stefan Metzmacher <metze@samba.org>
-Date: Wed, 25 Nov 2015 09:22:08 +0100
-Subject: [PATCH 3/5] dbwrap_rbt: add nested traverse protection
-
-Multiple dbwrap_traverse_read() calls are possible.
-
-store() and delete() on a fetch locked record
-are rejected during dbwrap_traverse_read().
-
-A dbwrap_traverse() within a dbwrap_traverse_read()
-behaves like a dbwrap_traverse_read().
-
-Nested dbwrap_traverse() calls are not possible.
-
-BUG: https://bugzilla.samba.org/show_bug.cgi?id=11375
-BUG: https://bugzilla.samba.org/show_bug.cgi?id=11394
-
-Signed-off-by: Stefan Metzmacher <metze@samba.org>
-Reviewed-by: Volker Lendecke <vl@samba.org>
-(cherry picked from commit 590507951fc514a679f44b8bfdd03c721189c3fa)
----
- lib/dbwrap/dbwrap_rbt.c | 71 ++++++++++++++++++++++++++++---------------------
- 1 file changed, 40 insertions(+), 31 deletions(-)
-
-diff --git a/lib/dbwrap/dbwrap_rbt.c b/lib/dbwrap/dbwrap_rbt.c
-index 2d65647..d4cb40d 100644
---- a/lib/dbwrap/dbwrap_rbt.c
-+++ b/lib/dbwrap/dbwrap_rbt.c
-@@ -27,6 +27,8 @@
- 
- struct db_rbt_ctx {
- 	struct rb_root tree;
-+	size_t traverse_read;
-+	bool traverse_write;
- };
- 
- struct db_rbt_rec {
-@@ -126,6 +128,10 @@ static NTSTATUS db_rbt_store(struct db_record *rec, TDB_DATA data, int flag)
- 	ssize_t reclen;
- 	TDB_DATA this_key, this_val;
- 
-+	if (db_ctx->traverse_read > 0) {
-+		return NT_STATUS_MEDIA_WRITE_PROTECTED;
-+	}
-+
- 	if (rec_priv->node != NULL) {
- 
- 		/*
-@@ -222,6 +228,10 @@ static NTSTATUS db_rbt_delete(struct db_record *rec)
- 		rec->db->private_data, struct db_rbt_ctx);
- 	struct db_rbt_rec *rec_priv = (struct db_rbt_rec *)rec->private_data;
- 
-+	if (db_ctx->traverse_read > 0) {
-+		return NT_STATUS_MEDIA_WRITE_PROTECTED;
-+	}
-+
- 	if (rec_priv->node == NULL) {
- 		return NT_STATUS_OK;
- 	}
-@@ -232,16 +242,6 @@ static NTSTATUS db_rbt_delete(struct db_record *rec)
- 	return NT_STATUS_OK;
- }
- 
--static NTSTATUS db_rbt_store_deny(struct db_record *rec, TDB_DATA data, int flag)
--{
--	return NT_STATUS_MEDIA_WRITE_PROTECTED;
--}
--
--static NTSTATUS db_rbt_delete_deny(struct db_record *rec)
--{
--	return NT_STATUS_MEDIA_WRITE_PROTECTED;
--}
--
- struct db_rbt_search_result {
- 	TDB_DATA key;
- 	TDB_DATA val;
-@@ -414,13 +414,8 @@ static int db_rbt_traverse_internal(struct db_context *db,
- 	ZERO_STRUCT(rec);
- 	rec.db = db;
- 	rec.private_data = &rec_priv;
--	if (rw) {
--		rec.store = db_rbt_store;
--		rec.delete_rec = db_rbt_delete;
--	} else {
--		rec.store = db_rbt_store_deny;
--		rec.delete_rec = db_rbt_delete_deny;
--	}
-+	rec.store = db_rbt_store;
-+	rec.delete_rec = db_rbt_delete;
- 	db_rbt_parse_node(rec_priv.node, &rec.key, &rec.value);
- 
- 	ret = f(&rec, private_data);
-@@ -440,18 +435,21 @@ static int db_rbt_traverse_internal(struct db_context *db,
- 	return db_rbt_traverse_internal(db, rb_right, f, private_data, count, rw);
- }
- 
--static int db_rbt_traverse(struct db_context *db,
--			   int (*f)(struct db_record *db,
--				    void *private_data),
--			   void *private_data)
-+static int db_rbt_traverse_read(struct db_context *db,
-+				int (*f)(struct db_record *db,
-+					 void *private_data),
-+				void *private_data)
- {
- 	struct db_rbt_ctx *ctx = talloc_get_type_abort(
- 		db->private_data, struct db_rbt_ctx);
- 	uint32_t count = 0;
-+	int ret;
- 
--	int ret = db_rbt_traverse_internal(db, ctx->tree.rb_node,
--					   f, private_data, &count,
--					   true /* rw */);
-+	ctx->traverse_read++;
-+	ret = db_rbt_traverse_internal(db, ctx->tree.rb_node,
-+				       f, private_data, &count,
-+				       false /* rw */);
-+	ctx->traverse_read--;
- 	if (ret != 0) {
- 		return -1;
- 	}
-@@ -461,18 +459,29 @@ static int db_rbt_traverse(struct db_context *db,
- 	return count;
- }
- 
--static int db_rbt_traverse_read(struct db_context *db,
--				int (*f)(struct db_record *db,
--					 void *private_data),
--				void *private_data)
-+static int db_rbt_traverse(struct db_context *db,
-+			   int (*f)(struct db_record *db,
-+				    void *private_data),
-+			   void *private_data)
- {
- 	struct db_rbt_ctx *ctx = talloc_get_type_abort(
- 		db->private_data, struct db_rbt_ctx);
- 	uint32_t count = 0;
-+	int ret;
-+
-+	if (ctx->traverse_write) {
-+		return -1;
-+	};
-+
-+	if (ctx->traverse_read > 0) {
-+		return db_rbt_traverse_read(db, f, private_data);
-+	}
- 
--	int ret = db_rbt_traverse_internal(db, ctx->tree.rb_node,
--					   f, private_data, &count,
--					   false /* rw */);
-+	ctx->traverse_write = true;
-+	ret = db_rbt_traverse_internal(db, ctx->tree.rb_node,
-+				       f, private_data, &count,
-+				       true /* rw */);
-+	ctx->traverse_write = false;
- 	if (ret != 0) {
- 		return -1;
- 	}
--- 
-1.9.1
-
-
-From fd6bcd4cb3752554dd1041f0a41fd7e9edac602d Mon Sep 17 00:00:00 2001
-From: Stefan Metzmacher <metze@samba.org>
-Date: Wed, 25 Nov 2015 09:22:08 +0100
-Subject: [PATCH 4/5] dbwrap_rbt: fix modifying the db during traverse
-
-We delete and add of records rebalace the tree, but our
-traverse code doesn't handle that and skips records
-randomly.
-
-We maintain records in a linked list for now
-in addition to the rbtree and use that list during
-traverse.
-
-This add a bit overhead, but at least it works reliable.
-If someone finds a way to do reliable traverse with the
-rebalanced tree, we can replace this commit.
-
-BUG: https://bugzilla.samba.org/show_bug.cgi?id=11375
-BUG: https://bugzilla.samba.org/show_bug.cgi?id=11394
-
-Signed-off-by: Stefan Metzmacher <metze@samba.org>
-Reviewed-by: Volker Lendecke <vl@samba.org>
-(cherry picked from commit 0f46da08e160e6712e5282af14e1ec4012614fc7)
----
- lib/dbwrap/dbwrap_rbt.c | 104 ++++++++++++++++++++++++++----------------------
- 1 file changed, 57 insertions(+), 47 deletions(-)
-
-diff --git a/lib/dbwrap/dbwrap_rbt.c b/lib/dbwrap/dbwrap_rbt.c
-index d4cb40d..a9cc641 100644
---- a/lib/dbwrap/dbwrap_rbt.c
-+++ b/lib/dbwrap/dbwrap_rbt.c
-@@ -22,13 +22,15 @@
- #include "dbwrap/dbwrap_private.h"
- #include "dbwrap/dbwrap_rbt.h"
- #include "../lib/util/rbtree.h"
-+#include "../lib/util/dlinklist.h"
- 
- #define DBWRAP_RBT_ALIGN(_size_) (((_size_)+15)&~15)
- 
- struct db_rbt_ctx {
- 	struct rb_root tree;
-+	struct db_rbt_node *nodes;
- 	size_t traverse_read;
--	bool traverse_write;
-+	struct db_rbt_node **traverse_nextp;
- };
- 
- struct db_rbt_rec {
-@@ -40,6 +42,7 @@ struct db_rbt_rec {
- struct db_rbt_node {
- 	struct rb_node rb_node;
- 	size_t keysize, valuesize;
-+	struct db_rbt_node *prev, *next;
- };
- 
- /*
-@@ -123,7 +126,8 @@ static NTSTATUS db_rbt_store(struct db_record *rec, TDB_DATA data, int flag)
- 	struct db_rbt_node *node;
- 
- 	struct rb_node ** p;
--	struct rb_node * parent;
-+	struct rb_node *parent = NULL;
-+	struct db_rbt_node *parent_node = NULL;
- 
- 	ssize_t reclen;
- 	TDB_DATA this_key, this_val;
-@@ -165,12 +169,19 @@ static NTSTATUS db_rbt_store(struct db_record *rec, TDB_DATA data, int flag)
- 	}
- 
- 	if (rec_priv->node != NULL) {
-+		if (db_ctx->traverse_nextp != NULL) {
-+			if (*db_ctx->traverse_nextp == rec_priv->node) {
-+				*db_ctx->traverse_nextp = node;
-+			}
-+		}
-+
- 		/*
- 		 * We need to delete the key from the tree and start fresh,
- 		 * there's not enough space in the existing record
- 		 */
- 
- 		rb_erase(&rec_priv->node->rb_node, &db_ctx->tree);
-+		DLIST_REMOVE(db_ctx->nodes, rec_priv->node);
- 
- 		/*
- 		 * Keep the existing node around for a while: If the record
-@@ -197,10 +208,11 @@ static NTSTATUS db_rbt_store(struct db_record *rec, TDB_DATA data, int flag)
- 		TDB_DATA search_key, search_val;
- 		int res;
- 
--		parent = (*p);
--
- 		r = db_rbt2node(*p);
- 
-+		parent = (*p);
-+		parent_node = r;
-+
- 		db_rbt_parse_node(r, &search_key, &search_val);
- 
- 		res = db_rbt_compare(this_key, search_key);
-@@ -217,6 +229,7 @@ static NTSTATUS db_rbt_store(struct db_record *rec, TDB_DATA data, int flag)
- 	}
- 
- 	rb_link_node(&node->rb_node, parent, p);
-+	DLIST_ADD_AFTER(db_ctx->nodes, node, parent_node);
- 	rb_insert_color(&node->rb_node, &db_ctx->tree);
- 
- 	return NT_STATUS_OK;
-@@ -236,7 +249,14 @@ static NTSTATUS db_rbt_delete(struct db_record *rec)
- 		return NT_STATUS_OK;
- 	}
- 
-+	if (db_ctx->traverse_nextp != NULL) {
-+		if (*db_ctx->traverse_nextp == rec_priv->node) {
-+			*db_ctx->traverse_nextp = rec_priv->node->next;
-+		}
-+	}
-+
- 	rb_erase(&rec_priv->node->rb_node, &db_ctx->tree);
-+	DLIST_REMOVE(db_ctx->nodes, rec_priv->node);
- 	TALLOC_FREE(rec_priv->node);
- 
- 	return NT_STATUS_OK;
-@@ -383,56 +403,48 @@ static NTSTATUS db_rbt_parse_record(struct db_context *db, TDB_DATA key,
- }
- 
- static int db_rbt_traverse_internal(struct db_context *db,
--				    struct rb_node *n,
- 				    int (*f)(struct db_record *db,
- 					     void *private_data),
- 				    void *private_data, uint32_t* count,
- 				    bool rw)
- {
--	struct rb_node *rb_right;
--	struct rb_node *rb_left;
--	struct db_record rec;
--	struct db_rbt_rec rec_priv;
-+	struct db_rbt_ctx *ctx = talloc_get_type_abort(
-+		db->private_data, struct db_rbt_ctx);
-+	struct db_rbt_node *cur = NULL;
-+	struct db_rbt_node *next = NULL;
- 	int ret;
- 
--	if (n == NULL) {
--		return 0;
--	}
--
--	rb_left = n->rb_left;
--	rb_right = n->rb_right;
-+	for (cur = ctx->nodes; cur != NULL; cur = next) {
-+		struct db_record rec;
-+		struct db_rbt_rec rec_priv;
- 
--	ret = db_rbt_traverse_internal(db, rb_left, f, private_data, count, rw);
--	if (ret != 0) {
--		return ret;
--	}
-+		rec_priv.node = cur;
-+		next = rec_priv.node->next;
- 
--	rec_priv.node = db_rbt2node(n);
--	/* n might be altered by the callback function */
--	n = NULL;
-+		ZERO_STRUCT(rec);
-+		rec.db = db;
-+		rec.private_data = &rec_priv;
-+		rec.store = db_rbt_store;
-+		rec.delete_rec = db_rbt_delete;
-+		db_rbt_parse_node(rec_priv.node, &rec.key, &rec.value);
- 
--	ZERO_STRUCT(rec);
--	rec.db = db;
--	rec.private_data = &rec_priv;
--	rec.store = db_rbt_store;
--	rec.delete_rec = db_rbt_delete;
--	db_rbt_parse_node(rec_priv.node, &rec.key, &rec.value);
--
--	ret = f(&rec, private_data);
--	(*count) ++;
--	if (ret != 0) {
--		return ret;
--	}
--
--	if (rec_priv.node != NULL) {
--		/*
--		 * If the current record is still there
--		 * we should take the current rb_right.
--		 */
--		rb_right = rec_priv.node->rb_node.rb_right;
-+		if (rw) {
-+			ctx->traverse_nextp = &next;
-+		}
-+		ret = f(&rec, private_data);
-+		(*count) ++;
-+		if (rw) {
-+			ctx->traverse_nextp = NULL;
-+		}
-+		if (ret != 0) {
-+			return ret;
-+		}
-+		if (rec_priv.node != NULL) {
-+			next = rec_priv.node->next;
-+		}
- 	}
- 
--	return db_rbt_traverse_internal(db, rb_right, f, private_data, count, rw);
-+	return 0;
- }
- 
- static int db_rbt_traverse_read(struct db_context *db,
-@@ -446,7 +458,7 @@ static int db_rbt_traverse_read(struct db_context *db,
- 	int ret;
- 
- 	ctx->traverse_read++;
--	ret = db_rbt_traverse_internal(db, ctx->tree.rb_node,
-+	ret = db_rbt_traverse_internal(db,
- 				       f, private_data, &count,
- 				       false /* rw */);
- 	ctx->traverse_read--;
-@@ -469,7 +481,7 @@ static int db_rbt_traverse(struct db_context *db,
- 	uint32_t count = 0;
- 	int ret;
- 
--	if (ctx->traverse_write) {
-+	if (ctx->traverse_nextp != NULL) {
- 		return -1;
- 	};
- 
-@@ -477,11 +489,9 @@ static int db_rbt_traverse(struct db_context *db,
- 		return db_rbt_traverse_read(db, f, private_data);
- 	}
- 
--	ctx->traverse_write = true;
--	ret = db_rbt_traverse_internal(db, ctx->tree.rb_node,
-+	ret = db_rbt_traverse_internal(db,
- 				       f, private_data, &count,
- 				       true /* rw */);
--	ctx->traverse_write = false;
- 	if (ret != 0) {
- 		return -1;
- 	}
--- 
-1.9.1
-
-
-From 5b555ac802ce714c26411b48a375d1cc6699b22c Mon Sep 17 00:00:00 2001
-From: Stefan Metzmacher <metze@samba.org>
-Date: Wed, 25 Nov 2015 00:13:17 +0100
-Subject: [PATCH 5/5] s3:torture: add traverse testing to LOCAL-RBTREE
-
-BUG: https://bugzilla.samba.org/show_bug.cgi?id=11375
-BUG: https://bugzilla.samba.org/show_bug.cgi?id=11394
-
-Signed-off-by: Stefan Metzmacher <metze@samba.org>
-Reviewed-by: Volker Lendecke <vl@samba.org>
-
-Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
-Autobuild-Date(master): Fri Nov 27 13:16:59 CET 2015 on sn-devel-104
-
-(cherry picked from commit bb9f13ab4165f150e01a88ddcc51605a7c176f5d)
----
- source3/torture/torture.c | 39 +++++++++++++++++++++++++++++++++++++++
- 1 file changed, 39 insertions(+)
-
-diff --git a/source3/torture/torture.c b/source3/torture/torture.c
-index 594d28f..0b37e5c 100644
---- a/source3/torture/torture.c
-+++ b/source3/torture/torture.c
-@@ -8352,11 +8352,29 @@ static bool rbt_testval(struct db_context *db, const char *key,
- 	return ret;
- }
- 
-+static int local_rbtree_traverse_read(struct db_record *rec, void *private_data)
-+{
-+	int *count2 = (int *)private_data;
-+	(*count2)++;
-+	return 0;
-+}
-+
-+static int local_rbtree_traverse_delete(struct db_record *rec, void *private_data)
-+{
-+	int *count2 = (int *)private_data;
-+	(*count2)++;
-+	dbwrap_record_delete(rec);
-+	return 0;
-+}
-+
- static bool run_local_rbtree(int dummy)
- {
- 	struct db_context *db;
- 	bool ret = false;
- 	int i;
-+	NTSTATUS status;
-+	int count = 0;
-+	int count2 = 0;
- 
- 	db = db_open_rbt(NULL);
- 
-@@ -8399,6 +8417,27 @@ static bool run_local_rbtree(int dummy)
- 	}
- 
- 	ret = true;
-+	count = 0; count2 = 0;
-+	status = dbwrap_traverse_read(db, local_rbtree_traverse_read,
-+				      &count2, &count);
-+	printf("%s: read1: %d %d, %s\n", __func__, count, count2, nt_errstr(status));
-+	if ((count != count2) || (count != 1000)) {
-+		ret = false;
-+	}
-+	count = 0; count2 = 0;
-+	status = dbwrap_traverse(db, local_rbtree_traverse_delete,
-+				 &count2, &count);
-+	printf("%s: delete: %d %d, %s\n", __func__, count, count2, nt_errstr(status));
-+	if ((count != count2) || (count != 1000)) {
-+		ret = false;
-+	}
-+	count = 0; count2 = 0;
-+	status = dbwrap_traverse_read(db, local_rbtree_traverse_read,
-+				      &count2, &count);
-+	printf("%s: read2: %d %d, %s\n", __func__, count, count2, nt_errstr(status));
-+	if ((count != count2) || (count != 0)) {
-+		ret = false;
-+	}
- 
-  done:
- 	TALLOC_FREE(db);
--- 
-1.9.1
-

Property changes on: head/net/samba42/files/extra-patch-security
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/net/samba42/pkg-plist
===================================================================
--- head/net/samba42/pkg-plist	(revision 413162)
+++ head/net/samba42/pkg-plist	(revision 413163)
@@ -1,923 +1,923 @@
-bin/async_connect_send_test
 bin/cifsdd
 bin/dbwrap_tool
 bin/eventlogadm
 bin/gentest
 bin/locktest
 bin/masktest
 bin/ndrdump
 bin/net
 bin/nmblookup
 bin/ntlm_auth
 bin/oLschema2ldif
 bin/pdbedit
 bin/profiles
 bin/regdiff
 bin/regpatch
 bin/regshell
 bin/regtree
 bin/rpcclient
 bin/samba-regedit
 %%AD_DC%%bin/samba-tool
 bin/sharesec
 bin/smbcacls
 bin/smbclient
 bin/smbcontrol
 bin/smbcquotas
 bin/smbget
 bin/smbpasswd
 bin/smbspool
 bin/smbstatus
 bin/smbta-util
 bin/smbtar
 bin/smbtorture
 bin/smbtree
 bin/testparm
 bin/wbinfo
 sbin/nmbd
 %%AD_DC%%sbin/samba
 %%AD_DC%%sbin/samba_dnsupdate
 %%AD_DC%%sbin/samba_kcc
 %%AD_DC%%sbin/samba_spnupdate
 %%AD_DC%%sbin/samba_upgradedns
 sbin/smbd
 sbin/winbindd
 include/samba4/charset.h
 include/samba4/core/doserr.h
 include/samba4/core/error.h
 include/samba4/core/ntstatus.h
 include/samba4/core/werror.h
 include/samba4/credentials.h
 include/samba4/dcerpc.h
 %%AD_DC%%include/samba4/dcerpc_server.h
 %%LDAP%%include/samba4/smb_ldap.h
 %%LDAP%%include/samba4/smbldap.h
 include/samba4/core/hresult.h
 include/samba4/dlinklist.h
 include/samba4/domain_credentials.h
 include/samba4/gen_ndr/atsvc.h
 include/samba4/gen_ndr/auth.h
 include/samba4/gen_ndr/dcerpc.h
 include/samba4/gen_ndr/drsblobs.h
 include/samba4/gen_ndr/drsuapi.h
 include/samba4/gen_ndr/epmapper.h
 include/samba4/gen_ndr/krb5pac.h
 include/samba4/gen_ndr/lsa.h
 include/samba4/gen_ndr/mgmt.h
 include/samba4/gen_ndr/misc.h
 include/samba4/gen_ndr/nbt.h
 include/samba4/gen_ndr/ndr_atsvc.h
 include/samba4/gen_ndr/ndr_atsvc_c.h
 include/samba4/gen_ndr/ndr_dcerpc.h
 include/samba4/gen_ndr/ndr_drsblobs.h
 include/samba4/gen_ndr/ndr_drsuapi.h
 include/samba4/gen_ndr/ndr_epmapper.h
 include/samba4/gen_ndr/ndr_epmapper_c.h
 include/samba4/gen_ndr/ndr_krb5pac.h
 include/samba4/gen_ndr/ndr_mgmt.h
 include/samba4/gen_ndr/ndr_mgmt_c.h
 include/samba4/gen_ndr/ndr_misc.h
 include/samba4/gen_ndr/ndr_nbt.h
 include/samba4/gen_ndr/ndr_samr.h
 include/samba4/gen_ndr/ndr_samr_c.h
 include/samba4/gen_ndr/ndr_svcctl.h
 include/samba4/gen_ndr/ndr_svcctl_c.h
 include/samba4/gen_ndr/netlogon.h
 include/samba4/gen_ndr/samr.h
 include/samba4/gen_ndr/security.h
 include/samba4/gen_ndr/server_id.h
 include/samba4/gen_ndr/svcctl.h
 include/samba4/gensec.h
 include/samba4/ldap-util.h
 include/samba4/ldap_errors.h
 include/samba4/ldap_message.h
 include/samba4/ldap_ndr.h
 include/samba4/ldb_wrap.h
 include/samba4/libsmbclient.h
 include/samba4/lookup_sid.h
 include/samba4/machine_sid.h
 include/samba4/ndr.h
 include/samba4/ndr/ndr_dcerpc.h
 include/samba4/ndr/ndr_drsblobs.h
 include/samba4/ndr/ndr_drsuapi.h
 include/samba4/ndr/ndr_nbt.h
 include/samba4/ndr/ndr_svcctl.h
 include/samba4/netapi.h
 include/samba4/param.h
 include/samba4/passdb.h
 include/samba4/policy.h
 include/samba4/read_smb.h
 include/samba4/registry.h
 include/samba4/roles.h
 include/samba4/rpc_common.h
 include/samba4/samba/session.h
 include/samba4/samba/version.h
 include/samba4/samba_util.h
 include/samba4/share.h
 include/samba4/smb2.h
 include/samba4/smb2_constants.h
 include/samba4/smb2_create_blob.h
 include/samba4/smb2_lease.h
 include/samba4/smb2_lease_struct.h
 include/samba4/smb2_signing.h
 include/samba4/smb_cli.h
 include/samba4/smb_cliraw.h
 include/samba4/smb_common.h
 include/samba4/smb_composite.h
 include/samba4/smb_constants.h
 include/samba4/smb_raw.h
 include/samba4/smb_raw_interfaces.h
 include/samba4/smb_raw_signing.h
 include/samba4/smb_raw_trans2.h
 include/samba4/smb_request.h
 include/samba4/smb_seal.h
 include/samba4/smb_signing.h
 include/samba4/smb_unix_ext.h
 include/samba4/smb_util.h
 include/samba4/smbconf.h
 include/samba4/tdr.h
 include/samba4/torture.h
 include/samba4/tsocket.h
 include/samba4/tsocket_internal.h
 include/samba4/tstream_smbXcli_np.h
 include/samba4/util/attr.h
 include/samba4/util/blocking.h
 include/samba4/util/byteorder.h
 include/samba4/util/data_blob.h
 include/samba4/util/debug.h
 include/samba4/util/fault.h
 include/samba4/util/idtree.h
 include/samba4/util/idtree_random.h
 include/samba4/util/memory.h
 include/samba4/util/safe_string.h
 include/samba4/util/signal.h
 include/samba4/util/string_wrappers.h
 include/samba4/util/substitute.h
 include/samba4/util/talloc_stack.h
 include/samba4/util/tevent_ntstatus.h
 include/samba4/util/tevent_unix.h
 include/samba4/util/tevent_werror.h
 include/samba4/util/time.h
 include/samba4/util/xfile.h
 include/samba4/util_ldb.h
 include/samba4/wbclient.h
 lib/libdcerpc-atsvc.so
 lib/libdcerpc-atsvc.so.0
 lib/libdcerpc-binding.so
 lib/libdcerpc-binding.so.0
 lib/libdcerpc-samr.so
 lib/libdcerpc-samr.so.0
 %%AD_DC%%lib/libdcerpc-server.so
 %%AD_DC%%lib/libdcerpc-server.so.0
 lib/libdcerpc.so
 lib/libdcerpc.so.0
 lib/libgensec.so
 lib/libgensec.so.0
 lib/libndr-krb5pac.so
 lib/libndr-krb5pac.so.0
 lib/libndr-nbt.so
 lib/libndr-nbt.so.0
 lib/libndr-standard.so
 lib/libndr-standard.so.0
 lib/libndr.so
 lib/libndr.so.0
 lib/libnetapi.so
 lib/libnetapi.so.0
 lib/libregistry.so
 lib/libregistry.so.0
 lib/libsamba-credentials.so
 lib/libsamba-credentials.so.0
 lib/libsamba-hostconfig.so
 lib/libsamba-hostconfig.so.0
 lib/libsamba-passdb.so
 lib/libsamba-passdb.so.0
 lib/libsamba-policy.so
 lib/libsamba-policy.so.0
 lib/libsamba-util.so
 lib/libsamba-util.so.0
 lib/libsamdb.so
 lib/libsamdb.so.0
 lib/libsmbclient-raw.so
 lib/libsmbclient-raw.so.0
 lib/libsmbconf.so
 lib/libsmbconf.so.0
 %%LDAP%%lib/libsmbldap.so
 %%LDAP%%lib/libsmbldap.so.0
 lib/libtevent-util.so
 lib/libtevent-util.so.0
 lib/libtorture.so
 lib/libtorture.so.0
 lib/libwbclient.so
 lib/libwbclient.so.0
 lib/mit_samba.so
 lib/nss_winbind.so.1
 lib/nss_wins.so.1
 %%SMBPASS%%lib/pam_smbpass.so
 lib/pam_winbind.so
 lib/winbind_krb5_locator.so
 lib/samba/libCHARSET3-samba4.so
 lib/samba/libHDB-SAMBA4-samba4.so
 lib/samba/libLIBWBCLIENT-OLD-samba4.so
 lib/samba/libMESSAGING-samba4.so
 lib/samba/libaddns-samba4.so
 lib/samba/libads-samba4.so
 lib/samba/libasn1-samba4.so.8
 lib/samba/libasn1util-samba4.so
 lib/samba/libauth-sam-reply-samba4.so
 lib/samba/libauth-samba4.so
 lib/samba/libauth-unix-token-samba4.so
 lib/samba/libauth4-samba4.so
 lib/samba/libauthkrb5-samba4.so
 lib/samba/libccan-samba4.so
 lib/samba/libcli-cldap-samba4.so
 lib/samba/libcli-ldap-common-samba4.so
 lib/samba/libcli-ldap-samba4.so
 lib/samba/libcli-nbt-samba4.so
 lib/samba/libcli-smb-common-samba4.so
 lib/samba/libcli-spoolss-samba4.so
 lib/samba/libcliauth-samba4.so
 lib/samba/libcluster-samba4.so
 lib/samba/libcmdline-credentials-samba4.so
 lib/samba/libcom_err-samba4.so.0
 lib/samba/libdb-glue-samba4.so
 lib/samba/libdbwrap-samba4.so
 lib/samba/libdcerpc-samba-samba4.so
 lib/samba/libdcerpc-samba4.so
 lib/samba/libdfs-server-ad-samba4.so
 %%AD_DC%%lib/samba/libdlz-bind9-for-torture-samba4.so
 lib/samba/libdnsserver-common-samba4.so
 lib/samba/libdsdb-module-samba4.so
 lib/samba/liberrors-samba4.so
 lib/samba/libevents-samba4.so
 lib/samba/libflag-mapping-samba4.so
 lib/samba/libgpo-samba4.so
 lib/samba/libgse-samba4.so
 lib/samba/libgssapi-samba4.so.2
 lib/samba/libhcrypto-samba4.so.5
 lib/samba/libhdb-samba4.so.11
 lib/samba/libheimbase-samba4.so.1
 lib/samba/libheimntlm-samba4.so.1
 lib/samba/libhttp-samba4.so
 lib/samba/libhx509-samba4.so.5
 lib/samba/libidmap-samba4.so
 lib/samba/libinterfaces-samba4.so
 lib/samba/libkdc-samba4.so.2
 lib/samba/libkrb5-samba4.so.26
 lib/samba/libkrb5samba-samba4.so
 lib/samba/libldbsamba-samba4.so
 lib/samba/liblibcli-lsa3-samba4.so
 lib/samba/liblibcli-netlogon3-samba4.so
 lib/samba/liblibsmb-samba4.so
 lib/samba/libmsrpc3-samba4.so
 lib/samba/libndr-samba-samba4.so
 lib/samba/libndr-samba4.so
 lib/samba/libnet-keytab-samba4.so
 lib/samba/libnetif-samba4.so
 lib/samba/libnon-posix-acls-samba4.so
 lib/samba/libnpa-tstream-samba4.so
 lib/samba/libnss-info-samba4.so
 %%AD_DC%%lib/samba/libntvfs-samba4.so
 lib/samba/libpac-samba4.so
 lib/samba/libpopt-samba3-samba4.so
 %%AD_DC%%lib/samba/libposix-eadb-samba4.so
 lib/samba/libprinting-migrate-samba4.so
 %%AD_DC%%lib/samba/libprocess-model-samba4.so
 lib/samba/libreplace-samba4.so
 lib/samba/libroken-samba4.so.19
 lib/samba/libsamba-cluster-support-samba4.so
 lib/samba/libsamba-debug-samba4.so
 lib/samba/libsamba-modules-samba4.so
 lib/samba/libsamba-net-samba4.so
 lib/samba/libsamba-python-samba4.so
 lib/samba/libsamba-security-samba4.so
 lib/samba/libsamba-sockets-samba4.so
 lib/samba/libsamba3-util-samba4.so
 lib/samba/libsamdb-common-samba4.so
 lib/samba/libsecrets3-samba4.so
 lib/samba/libserver-role-samba4.so
 %%AD_DC%%lib/samba/libservice-samba4.so
 lib/samba/libshares-samba4.so
 lib/samba/libsmb-transport-samba4.so
 lib/samba/libsmbd-base-samba4.so
 lib/samba/libsmbd-conn-samba4.so
 lib/samba/libsmbd-shim-samba4.so
 %%LDAP%%lib/samba/libsmbldaphelper-samba4.so
 lib/samba/libsmbpasswdparser-samba4.so
 lib/samba/libsmbregistry-samba4.so
 lib/samba/libsocket-blocking-samba4.so
 lib/samba/libsubunit-samba4.so
 lib/samba/libtdb-compat-samba4.so
 lib/samba/libtdb-wrap-samba4.so
 lib/samba/libtrusts-util-samba4.so
 lib/samba/libutil-cmdline-samba4.so
 lib/samba/libutil-ntdb-samba4.so
 lib/samba/libutil-reg-samba4.so
 lib/samba/libutil-setid-samba4.so
 lib/samba/libutil-tdb-samba4.so
 lib/samba/libwinbind-client-samba4.so
 lib/samba/libwind-samba4.so.0
 lib/samba/libxattr-tdb-samba4.so
 %%DEVELOPER%%lib/samba/libnss_wrapper.so
 %%DEVELOPER%%lib/samba/libuid_wrapper.so
 %%DEVELOPER%%lib/samba/libsocket_wrapper.so
 lib/shared-modules/auth/script.so
 %%MODULE_AUTH_SKEL%%lib/shared-modules/auth/skel.so
 %%AD_DC%%lib/shared-modules/bind9/dlz_bind9.so
 %%AD_DC%%lib/shared-modules/bind9/dlz_bind9_9.so
 %%AD_DC%%lib/shared-modules/bind9/dlz_bind9_10.so
 %%AD_DC%%lib/shared-modules/gensec/krb5.so
 lib/shared-modules/idmap/autorid.so
 lib/shared-modules/idmap/hash.so
 lib/shared-modules/idmap/rid.so
 lib/shared-modules/idmap/tdb2.so
 %%AD_DC%%lib/shared-modules/ldb/acl.so
 %%AD_DC%%lib/shared-modules/ldb/aclread.so
 %%AD_DC%%lib/shared-modules/ldb/anr.so
 %%AD_DC%%lib/shared-modules/ldb/descriptor.so
 %%AD_DC%%lib/shared-modules/ldb/dirsync.so
 %%AD_DC%%lib/shared-modules/ldb/extended_dn_in.so
 %%AD_DC%%lib/shared-modules/ldb/extended_dn_out.so
 %%AD_DC%%lib/shared-modules/ldb/extended_dn_store.so
 lib/shared-modules/ldb/ildap.so
 %%AD_DC%%lib/shared-modules/ldb/instancetype.so
 %%AD_DC%%lib/shared-modules/ldb/lazy_commit.so
 lib/shared-modules/ldb/ldbsamba_extensions.so
 %%AD_DC%%lib/shared-modules/ldb/linked_attributes.so
 %%AD_DC%%lib/shared-modules/ldb/local_password.so
 %%AD_DC%%lib/shared-modules/ldb/new_partition.so
 %%AD_DC%%lib/shared-modules/ldb/objectclass.so
 %%AD_DC%%lib/shared-modules/ldb/objectclass_attrs.so
 %%AD_DC%%lib/shared-modules/ldb/objectguid.so
 %%AD_DC%%lib/shared-modules/ldb/operational.so
 %%AD_DC%%lib/shared-modules/ldb/partition.so
 %%AD_DC%%lib/shared-modules/ldb/password_hash.so
 %%AD_DC%%lib/shared-modules/ldb/ranged_results.so
 %%AD_DC%%lib/shared-modules/ldb/repl_meta_data.so
 %%AD_DC%%lib/shared-modules/ldb/resolve_oids.so
 %%AD_DC%%lib/shared-modules/ldb/rootdse.so
 %%AD_DC%%lib/shared-modules/ldb/samba3sam.so
 %%AD_DC%%lib/shared-modules/ldb/samba3sid.so
 %%AD_DC%%lib/shared-modules/ldb/samba_dsdb.so
 %%AD_DC%%lib/shared-modules/ldb/samba_secrets.so
 %%AD_DC%%lib/shared-modules/ldb/samldb.so
 %%AD_DC%%lib/shared-modules/ldb/schema_data.so
 %%AD_DC%%lib/shared-modules/ldb/schema_load.so
 %%AD_DC%%lib/shared-modules/ldb/secrets_tdb_sync.so
 %%AD_DC%%lib/shared-modules/ldb/show_deleted.so
 %%AD_DC%%lib/shared-modules/ldb/simple_dn.so
 %%AD_DC%%lib/shared-modules/ldb/simple_ldap_map.so
 %%AD_DC%%lib/shared-modules/ldb/subtree_delete.so
 %%AD_DC%%lib/shared-modules/ldb/subtree_rename.so
 %%AD_DC%%lib/shared-modules/ldb/update_keytab.so
 %%AD_DC%%lib/shared-modules/ldb/wins_ldb.so
 lib/shared-modules/nss_info/hash.so
 %%MODULE_PERFCOUNT_TEST%%lib/shared-modules/perfcount/test.so
 %%MODULE_PDB_TEST%%lib/shared-modules/pdb/test.so
 %%AD_DC%%lib/shared-modules/process_model/onefork.so
 %%AD_DC%%lib/shared-modules/process_model/prefork.so
 %%AD_DC%%lib/shared-modules/process_model/standard.so
 %%AD_DC%%lib/shared-modules/service/cldap.so
 %%AD_DC%%lib/shared-modules/service/dcerpc.so
 %%AD_DC%%lib/shared-modules/service/dns.so
 %%AD_DC%%lib/shared-modules/service/dns_update.so
 %%AD_DC%%lib/shared-modules/service/drepl.so
 %%AD_DC%%lib/shared-modules/service/kcc.so
 %%AD_DC%%lib/shared-modules/service/kdc.so
 %%AD_DC%%lib/shared-modules/service/ldap.so
 %%AD_DC%%lib/shared-modules/service/nbtd.so
 %%AD_DC%%lib/shared-modules/service/ntp_signd.so
 %%AD_DC%%lib/shared-modules/service/s3fs.so
 %%AD_DC%%lib/shared-modules/service/smb.so
 %%AD_DC%%lib/shared-modules/service/web.so
 %%AD_DC%%lib/shared-modules/service/winbind.so
 %%AD_DC%%lib/shared-modules/service/winbindd.so
 %%AD_DC%%lib/shared-modules/service/wrepl.so
 lib/shared-modules/vfs/acl_tdb.so
 lib/shared-modules/vfs/acl_xattr.so
 lib/shared-modules/vfs/aio_fork.so
 %%MODULE_VFS_AIO_POSIX%%lib/shared-modules/vfs/aio_posix.so
 %%MODULE_VFS_AIO_PTHREAD%%lib/shared-modules/vfs/aio_pthread.so
 lib/shared-modules/vfs/audit.so
 lib/shared-modules/vfs/cap.so
 lib/shared-modules/vfs/catia.so
 lib/shared-modules/vfs/commit.so
 lib/shared-modules/vfs/crossrename.so
 lib/shared-modules/vfs/default_quota.so
 lib/shared-modules/vfs/dirsort.so
 lib/shared-modules/vfs/expand_msdfs.so
 lib/shared-modules/vfs/extd_audit.so
 lib/shared-modules/vfs/fake_perms.so
 lib/shared-modules/vfs/fruit.so
 lib/shared-modules/vfs/full_audit.so
 lib/shared-modules/vfs/linux_xfs_sgid.so
 lib/shared-modules/vfs/media_harmony.so
 lib/shared-modules/vfs/netatalk.so
 %%MODULE_VFS_NOTIFY_FAM%%lib/shared-modules/vfs/notify_fam.so
 %%AD_DC%%lib/shared-modules/vfs/posix_eadb.so
 lib/shared-modules/vfs/preopen.so
 lib/shared-modules/vfs/readahead.so
 lib/shared-modules/vfs/readonly.so
 lib/shared-modules/vfs/recycle.so
 lib/shared-modules/vfs/scannedonly.so
 lib/shared-modules/vfs/shadow_copy.so
 lib/shared-modules/vfs/shadow_copy2.so
 lib/shared-modules/vfs/smb_traffic_analyzer.so
 lib/shared-modules/vfs/streams_depot.so
 lib/shared-modules/vfs/streams_xattr.so
 lib/shared-modules/vfs/syncops.so
 lib/shared-modules/vfs/time_audit.so
 lib/shared-modules/vfs/worm.so
 lib/shared-modules/vfs/xattr_tdb.so
 %%DEVELOPER%%lib/shared-modules/vfs/nfs4acl_xattr.so
 lib/shared-modules/vfs/zfsacl.so
 %%LDAP%%lib/shared-modules/idmap/rfc2307.so
 %%MODULE_AUTH_SAMBA4%%lib/shared-modules/auth/samba4.so
 %%MODULE_AUTH_UNIX%%lib/shared-modules/auth/unix.so
 %%MODULE_AUTH_WBC%%lib/shared-modules/auth/wbc.so
 %%MODULE_GPEXT_REGISTRY%%lib/shared-modules/gpext/registry.so
 %%MODULE_GPEXT_SCRIPTS%%lib/shared-modules/gpext/scripts.so
 %%MODULE_GPEXT_SECURITY%%lib/shared-modules/gpext/security.so
 %%MODULE_IDMAP_AD%%lib/shared-modules/idmap/ad.so
 %%MODULE_IDMAP_AD%%lib/shared-modules/nss_info/rfc2307.so
 %%MODULE_IDMAP_AD%%lib/shared-modules/nss_info/sfu.so
 %%MODULE_IDMAP_AD%%lib/shared-modules/nss_info/sfu20.so
 %%MODULE_IDMAP_LDAP%%lib/shared-modules/idmap/ldap.so
 %%MODULE_IDMAP_NSS%%lib/shared-modules/idmap/nss.so
 %%MODULE_IDMAP_PASSDB%%lib/shared-modules/idmap/passdb.so
 %%MODULE_IDMAP_TDB%%lib/shared-modules/idmap/tdb.so
 %%MODULE_NSS_INFO_TEMPLATE%%lib/shared-modules/nss_info/template.so
 %%MODULE_PDB_LDAP%%lib/shared-modules/pdb/ldap.so
 %%MODULE_PDB_SAMBA_DSDB%%lib/shared-modules/pdb/samba_dsdb.so
 %%MODULE_PDB_SMBPASSWD%%lib/shared-modules/pdb/smbpasswd.so
 %%MODULE_PDB_TDBSAM%%lib/shared-modules/pdb/tdbsam.so
 %%MODULE_PDB_WBC_SAM%%lib/shared-modules/pdb/wbc_sam.so
 %%MODULE_VFS_CACHEPRIME%%lib/shared-modules/vfs/cacheprime.so
 %%MODULE_VFS_DFS_SAMBA4%%lib/shared-modules/vfs/dfs_samba4.so
 %%MODULE_VFS_FAKE_ACLS%%lib/shared-modules/vfs/fake_acls.so
 %%MODULE_VFS_SHADOW_COPY_TEST%%lib/shared-modules/vfs/shadow_copy_test.so
 %%MODULE_VFS_SKEL_OPAQUE%%lib/shared-modules/vfs/skel_opaque.so
 %%MODULE_VFS_SKEL_TRANSPARENT%%lib/shared-modules/vfs/skel_transparent.so
 %%PKGCONFIGDIR%%/dcerpc.pc
 %%PKGCONFIGDIR%%/dcerpc_atsvc.pc
 %%PKGCONFIGDIR%%/dcerpc_samr.pc
 %%AD_DC%%%%PKGCONFIGDIR%%/dcerpc_server.pc
 %%PKGCONFIGDIR%%/gensec.pc
 %%PKGCONFIGDIR%%/ndr.pc
 %%PKGCONFIGDIR%%/ndr_krb5pac.pc
 %%PKGCONFIGDIR%%/ndr_nbt.pc
 %%PKGCONFIGDIR%%/ndr_standard.pc
 %%PKGCONFIGDIR%%/netapi.pc
 %%PKGCONFIGDIR%%/registry.pc
 %%PKGCONFIGDIR%%/samba-credentials.pc
 %%PKGCONFIGDIR%%/samba-hostconfig.pc
 %%PKGCONFIGDIR%%/samba-policy.pc
 %%PKGCONFIGDIR%%/samba-util.pc
 %%PKGCONFIGDIR%%/samdb.pc
 %%PKGCONFIGDIR%%/smbclient-raw.pc
 %%PKGCONFIGDIR%%/torture.pc
 %%PKGCONFIGDIR%%/wbclient.pc
 %%DEVELOPER%%%%PYTHON_SITELIBDIR%%/samba/socket_wrapper.so
 %%PYTHON_SITELIBDIR%%/samba/__init__.py
 %%PYTHON_SITELIBDIR%%/samba/_glue.so
 %%PYTHON_SITELIBDIR%%/samba/_ldb.so
 %%PYTHON_SITELIBDIR%%/samba/auth.so
 %%PYTHON_SITELIBDIR%%/samba/com.so
 %%PYTHON_SITELIBDIR%%/samba/common.py
 %%PYTHON_SITELIBDIR%%/samba/credentials.so
 %%PYTHON_SITELIBDIR%%/samba/dbchecker.py
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/__init__.py
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/atsvc.so
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/auth.so
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/base.so
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/dcerpc.so
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/dfs.so
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/dns.so
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/dnsp.so
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/dnsserver.so
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/drsblobs.so
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/drsuapi.so
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/echo.so
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/epmapper.so
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/idmap.so
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/initshutdown.so
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/irpc.so
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/krb5pac.so
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/lsa.so
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/mgmt.so
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/misc.so
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/nbt.so
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/netlogon.so
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/samr.so
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/security.so
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/server_id.so
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/smb_acl.so
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/srvsvc.so
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/svcctl.so
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/unixinfo.so
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/winbind.so
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/winreg.so
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/wkssvc.so
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/xattr.so
 %%AD_DC%%%%PYTHON_SITELIBDIR%%/samba/dckeytab.so
 %%PYTHON_SITELIBDIR%%/samba/descriptor.py
 %%PYTHON_SITELIBDIR%%/samba/drs_utils.py
 %%PYTHON_SITELIBDIR%%/samba/dsdb.so
 %%PYTHON_SITELIBDIR%%/samba/external/__init__.py
 %%PYTHON_SITELIBDIR%%/samba/external/extras/__init__.py
 %%PYTHON_SITELIBDIR%%/samba/external/extras/tests/__init__.py
 %%PYTHON_SITELIBDIR%%/samba/external/extras/tests/test_extras.py
 %%PYTHON_SITELIBDIR%%/samba/external/subunit/__init__.py
 %%PYTHON_SITELIBDIR%%/samba/external/subunit/chunked.py
 %%PYTHON_SITELIBDIR%%/samba/external/subunit/details.py
 %%PYTHON_SITELIBDIR%%/samba/external/subunit/filters.py
 %%PYTHON_SITELIBDIR%%/samba/external/subunit/iso8601.py
 %%PYTHON_SITELIBDIR%%/samba/external/subunit/progress_model.py
 %%PYTHON_SITELIBDIR%%/samba/external/subunit/run.py
 %%PYTHON_SITELIBDIR%%/samba/external/subunit/test_results.py
 %%PYTHON_SITELIBDIR%%/samba/external/subunit/tests/TestUtil.py
 %%PYTHON_SITELIBDIR%%/samba/external/subunit/tests/__init__.py
 %%PYTHON_SITELIBDIR%%/samba/external/subunit/tests/sample-script.py
 %%PYTHON_SITELIBDIR%%/samba/external/subunit/tests/sample-two-script.py
 %%PYTHON_SITELIBDIR%%/samba/external/subunit/tests/test_chunked.py
 %%PYTHON_SITELIBDIR%%/samba/external/subunit/tests/test_details.py
 %%PYTHON_SITELIBDIR%%/samba/external/subunit/tests/test_progress_model.py
 %%PYTHON_SITELIBDIR%%/samba/external/subunit/tests/test_run.py
 %%PYTHON_SITELIBDIR%%/samba/external/subunit/tests/test_subunit_filter.py
 %%PYTHON_SITELIBDIR%%/samba/external/subunit/tests/test_subunit_stats.py
 %%PYTHON_SITELIBDIR%%/samba/external/subunit/tests/test_subunit_tags.py
 %%PYTHON_SITELIBDIR%%/samba/external/subunit/tests/test_tap2subunit.py
 %%PYTHON_SITELIBDIR%%/samba/external/subunit/tests/test_test_protocol.py
 %%PYTHON_SITELIBDIR%%/samba/external/subunit/tests/test_test_results.py
 %%PYTHON_SITELIBDIR%%/samba/external/testtools/__init__.py
 %%PYTHON_SITELIBDIR%%/samba/external/testtools/_compat2x.py
 %%PYTHON_SITELIBDIR%%/samba/external/testtools/_compat3x.py
 %%PYTHON_SITELIBDIR%%/samba/external/testtools/_spinner.py
 %%PYTHON_SITELIBDIR%%/samba/external/testtools/compat.py
 %%PYTHON_SITELIBDIR%%/samba/external/testtools/content.py
 %%PYTHON_SITELIBDIR%%/samba/external/testtools/content_type.py
 %%PYTHON_SITELIBDIR%%/samba/external/testtools/deferredruntest.py
 %%PYTHON_SITELIBDIR%%/samba/external/testtools/distutilscmd.py
 %%PYTHON_SITELIBDIR%%/samba/external/testtools/helpers.py
 %%PYTHON_SITELIBDIR%%/samba/external/testtools/matchers/__init__.py
 %%PYTHON_SITELIBDIR%%/samba/external/testtools/matchers/_basic.py
 %%PYTHON_SITELIBDIR%%/samba/external/testtools/matchers/_datastructures.py
 %%PYTHON_SITELIBDIR%%/samba/external/testtools/matchers/_dict.py
 %%PYTHON_SITELIBDIR%%/samba/external/testtools/matchers/_doctest.py
 %%PYTHON_SITELIBDIR%%/samba/external/testtools/matchers/_exception.py
 %%PYTHON_SITELIBDIR%%/samba/external/testtools/matchers/_filesystem.py
 %%PYTHON_SITELIBDIR%%/samba/external/testtools/matchers/_higherorder.py
 %%PYTHON_SITELIBDIR%%/samba/external/testtools/matchers/_impl.py
 %%PYTHON_SITELIBDIR%%/samba/external/testtools/monkey.py
 %%PYTHON_SITELIBDIR%%/samba/external/testtools/run.py
 %%PYTHON_SITELIBDIR%%/samba/external/testtools/runtest.py
 %%PYTHON_SITELIBDIR%%/samba/external/testtools/tags.py
 %%PYTHON_SITELIBDIR%%/samba/external/testtools/testcase.py
 %%PYTHON_SITELIBDIR%%/samba/external/testtools/testresult/__init__.py
 %%PYTHON_SITELIBDIR%%/samba/external/testtools/testresult/doubles.py
 %%PYTHON_SITELIBDIR%%/samba/external/testtools/testresult/real.py
 %%PYTHON_SITELIBDIR%%/samba/external/testtools/tests/__init__.py
 %%PYTHON_SITELIBDIR%%/samba/external/testtools/tests/helpers.py
 %%PYTHON_SITELIBDIR%%/samba/external/testtools/tests/matchers/__init__.py
 %%PYTHON_SITELIBDIR%%/samba/external/testtools/tests/matchers/helpers.py
 %%PYTHON_SITELIBDIR%%/samba/external/testtools/tests/matchers/test_basic.py
 %%PYTHON_SITELIBDIR%%/samba/external/testtools/tests/matchers/test_datastructures.py
 %%PYTHON_SITELIBDIR%%/samba/external/testtools/tests/matchers/test_dict.py
 %%PYTHON_SITELIBDIR%%/samba/external/testtools/tests/matchers/test_doctest.py
 %%PYTHON_SITELIBDIR%%/samba/external/testtools/tests/matchers/test_exception.py
 %%PYTHON_SITELIBDIR%%/samba/external/testtools/tests/matchers/test_filesystem.py
 %%PYTHON_SITELIBDIR%%/samba/external/testtools/tests/matchers/test_higherorder.py
 %%PYTHON_SITELIBDIR%%/samba/external/testtools/tests/matchers/test_impl.py
 %%PYTHON_SITELIBDIR%%/samba/external/testtools/tests/test_compat.py
 %%PYTHON_SITELIBDIR%%/samba/external/testtools/tests/test_content.py
 %%PYTHON_SITELIBDIR%%/samba/external/testtools/tests/test_content_type.py
 %%PYTHON_SITELIBDIR%%/samba/external/testtools/tests/test_deferredruntest.py
 %%PYTHON_SITELIBDIR%%/samba/external/testtools/tests/test_distutilscmd.py
 %%PYTHON_SITELIBDIR%%/samba/external/testtools/tests/test_fixturesupport.py
 %%PYTHON_SITELIBDIR%%/samba/external/testtools/tests/test_helpers.py
 %%PYTHON_SITELIBDIR%%/samba/external/testtools/tests/test_monkey.py
 %%PYTHON_SITELIBDIR%%/samba/external/testtools/tests/test_run.py
 %%PYTHON_SITELIBDIR%%/samba/external/testtools/tests/test_runtest.py
 %%PYTHON_SITELIBDIR%%/samba/external/testtools/tests/test_spinner.py
 %%PYTHON_SITELIBDIR%%/samba/external/testtools/tests/test_tags.py
 %%PYTHON_SITELIBDIR%%/samba/external/testtools/tests/test_testcase.py
 %%PYTHON_SITELIBDIR%%/samba/external/testtools/tests/test_testresult.py
 %%PYTHON_SITELIBDIR%%/samba/external/testtools/tests/test_testsuite.py
 %%PYTHON_SITELIBDIR%%/samba/external/testtools/tests/test_with_with.py
 %%PYTHON_SITELIBDIR%%/samba/external/testtools/testsuite.py
 %%PYTHON_SITELIBDIR%%/samba/external/testtools/utils.py
 %%PYTHON_SITELIBDIR%%/samba/gensec.so
 %%PYTHON_SITELIBDIR%%/samba/getopt.py
 %%PYTHON_SITELIBDIR%%/samba/hostconfig.py
 %%PYTHON_SITELIBDIR%%/samba/idmap.py
 %%PYTHON_SITELIBDIR%%/samba/join.py
 %%PYTHON_SITELIBDIR%%/samba/kcc_utils.py
 %%PYTHON_SITELIBDIR%%/samba/messaging.so
 %%PYTHON_SITELIBDIR%%/samba/ms_display_specifiers.py
 %%PYTHON_SITELIBDIR%%/samba/ms_schema.py
 %%PYTHON_SITELIBDIR%%/samba/ndr.py
 %%PYTHON_SITELIBDIR%%/samba/net.so
 %%PYTHON_SITELIBDIR%%/samba/netbios.so
 %%PYTHON_SITELIBDIR%%/samba/netcmd/__init__.py
 %%PYTHON_SITELIBDIR%%/samba/netcmd/common.py
 %%PYTHON_SITELIBDIR%%/samba/netcmd/dbcheck.py
 %%PYTHON_SITELIBDIR%%/samba/netcmd/delegation.py
 %%PYTHON_SITELIBDIR%%/samba/netcmd/dns.py
 %%PYTHON_SITELIBDIR%%/samba/netcmd/domain.py
 %%PYTHON_SITELIBDIR%%/samba/netcmd/drs.py
 %%PYTHON_SITELIBDIR%%/samba/netcmd/dsacl.py
 %%PYTHON_SITELIBDIR%%/samba/netcmd/fsmo.py
 %%PYTHON_SITELIBDIR%%/samba/netcmd/gpo.py
 %%PYTHON_SITELIBDIR%%/samba/netcmd/group.py
 %%PYTHON_SITELIBDIR%%/samba/netcmd/ldapcmp.py
 %%PYTHON_SITELIBDIR%%/samba/netcmd/main.py
 %%PYTHON_SITELIBDIR%%/samba/netcmd/ntacl.py
 %%PYTHON_SITELIBDIR%%/samba/netcmd/processes.py
 %%PYTHON_SITELIBDIR%%/samba/netcmd/rodc.py
 %%PYTHON_SITELIBDIR%%/samba/netcmd/sites.py
 %%PYTHON_SITELIBDIR%%/samba/netcmd/spn.py
 %%PYTHON_SITELIBDIR%%/samba/netcmd/testparm.py
 %%PYTHON_SITELIBDIR%%/samba/netcmd/time.py
 %%PYTHON_SITELIBDIR%%/samba/netcmd/user.py
 %%PYTHON_SITELIBDIR%%/samba/netcmd/vampire.py
 %%PYTHON_SITELIBDIR%%/samba/ntacls.py
 %%PYTHON_SITELIBDIR%%/samba/param.so
 %%PYTHON_SITELIBDIR%%/samba/policy.so
 %%AD_DC%%%%PYTHON_SITELIBDIR%%/samba/posix_eadb.so
 %%PYTHON_SITELIBDIR%%/samba/provision/__init__.py
 %%PYTHON_SITELIBDIR%%/samba/provision/backend.py
 %%PYTHON_SITELIBDIR%%/samba/provision/common.py
 %%PYTHON_SITELIBDIR%%/samba/provision/sambadns.py
 %%PYTHON_SITELIBDIR%%/samba/registry.so
 %%PYTHON_SITELIBDIR%%/samba/samba3/__init__.py
 %%PYTHON_SITELIBDIR%%/samba/samba3/libsmb_samba_internal.so
 %%PYTHON_SITELIBDIR%%/samba/samba3/param.so
 %%PYTHON_SITELIBDIR%%/samba/samba3/passdb.so
 %%PYTHON_SITELIBDIR%%/samba/samba3/smbd.so
 %%PYTHON_SITELIBDIR%%/samba/samdb.py
 %%PYTHON_SITELIBDIR%%/samba/schema.py
 %%PYTHON_SITELIBDIR%%/samba/sd_utils.py
 %%PYTHON_SITELIBDIR%%/samba/security.so
 %%PYTHON_SITELIBDIR%%/samba/sites.py
 %%PYTHON_SITELIBDIR%%/samba/smb.so
 %%PYTHON_SITELIBDIR%%/samba/tdb_util.py
 %%PYTHON_SITELIBDIR%%/samba/tests/__init__.py
 %%PYTHON_SITELIBDIR%%/samba/tests/auth.py
 %%PYTHON_SITELIBDIR%%/samba/tests/blackbox/__init__.py
 %%PYTHON_SITELIBDIR%%/samba/tests/blackbox/ndrdump.py
 %%PYTHON_SITELIBDIR%%/samba/tests/blackbox/samba_tool_drs.py
 %%PYTHON_SITELIBDIR%%/samba/tests/common.py
 %%PYTHON_SITELIBDIR%%/samba/tests/core.py
 %%PYTHON_SITELIBDIR%%/samba/tests/credentials.py
 %%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/__init__.py
 %%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/bare.py
 %%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/dnsserver.py
 %%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/misc.py
+%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/raw_protocol.py
 %%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/registry.py
 %%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/rpc_talloc.py
 %%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/rpcecho.py
 %%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/sam.py
 %%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/srvsvc.py
 %%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/testrpc.py
 %%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/unix.py
 %%PYTHON_SITELIBDIR%%/samba/tests/dns.py
 %%PYTHON_SITELIBDIR%%/samba/tests/docs.py
 %%PYTHON_SITELIBDIR%%/samba/tests/dsdb.py
 %%PYTHON_SITELIBDIR%%/samba/tests/gensec.py
-%%PYTHON_SITELIBDIR%%/samba/tests/getopt.py
+%%PYTHON_SITELIBDIR%%/samba/tests/get_opt.py
 %%PYTHON_SITELIBDIR%%/samba/tests/hostconfig.py
 %%PYTHON_SITELIBDIR%%/samba/tests/libsmb_samba_internal.py
 %%PYTHON_SITELIBDIR%%/samba/tests/messaging.py
 %%PYTHON_SITELIBDIR%%/samba/tests/netcmd.py
 %%PYTHON_SITELIBDIR%%/samba/tests/ntacls.py
 %%PYTHON_SITELIBDIR%%/samba/tests/param.py
 %%PYTHON_SITELIBDIR%%/samba/tests/policy.py
 %%PYTHON_SITELIBDIR%%/samba/tests/posixacl.py
 %%PYTHON_SITELIBDIR%%/samba/tests/provision.py
 %%PYTHON_SITELIBDIR%%/samba/tests/registry.py
 %%PYTHON_SITELIBDIR%%/samba/tests/samba3.py
 %%PYTHON_SITELIBDIR%%/samba/tests/samba3sam.py
 %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/__init__.py
 %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/base.py
 %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/gpo.py
 %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/group.py
 %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/ntacl.py
 %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/processes.py
 %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/timecmd.py
 %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/user.py
 %%PYTHON_SITELIBDIR%%/samba/tests/samdb.py
 %%PYTHON_SITELIBDIR%%/samba/tests/security.py
 %%PYTHON_SITELIBDIR%%/samba/tests/source.py
 %%PYTHON_SITELIBDIR%%/samba/tests/strings.py
 %%PYTHON_SITELIBDIR%%/samba/tests/subunitrun.py
 %%PYTHON_SITELIBDIR%%/samba/tests/unicodenames.py
 %%PYTHON_SITELIBDIR%%/samba/tests/upgrade.py
 %%PYTHON_SITELIBDIR%%/samba/tests/upgradeprovision.py
 %%PYTHON_SITELIBDIR%%/samba/tests/upgradeprovisionneeddc.py
 %%PYTHON_SITELIBDIR%%/samba/tests/xattr.py
 %%PYTHON_SITELIBDIR%%/samba/upgrade.py
 %%PYTHON_SITELIBDIR%%/samba/upgradehelpers.py
 %%PYTHON_SITELIBDIR%%/samba/web_server/__init__.py
 %%PYTHON_SITELIBDIR%%/samba/xattr.py
 %%AD_DC%%%%PYTHON_SITELIBDIR%%/samba/xattr_native.so
 %%AD_DC%%%%PYTHON_SITELIBDIR%%/samba/xattr_tdb.so
 @unexec find %D/%%PYTHON_SITELIBDIR%%/samba -name '*.py[co]' -delete >/dev/null 2>&1
 %%DATADIR%%/codepages/lowcase.dat
 %%DATADIR%%/codepages/upcase.dat
 %%DATADIR%%/codepages/valid.dat
 %%AD_DC%%%%DATADIR%%/setup/DB_CONFIG
 %%AD_DC%%%%DATADIR%%/setup/ad-schema/MS-AD_Schema_2K8_Attributes.txt
 %%AD_DC%%%%DATADIR%%/setup/ad-schema/MS-AD_Schema_2K8_Classes.txt
 %%AD_DC%%%%DATADIR%%/setup/ad-schema/MS-AD_Schema_2K8_R2_Attributes.txt
 %%AD_DC%%%%DATADIR%%/setup/ad-schema/MS-AD_Schema_2K8_R2_Classes.txt
 %%AD_DC%%%%DATADIR%%/setup/ad-schema/licence.txt
 %%AD_DC%%%%DATADIR%%/setup/aggregate_schema.ldif
 %%AD_DC%%%%DATADIR%%/setup/cn=samba.ldif
 %%AD_DC%%%%DATADIR%%/setup/display-specifiers/DisplaySpecifiers-Win2k0.txt
 %%AD_DC%%%%DATADIR%%/setup/display-specifiers/DisplaySpecifiers-Win2k3.txt
 %%AD_DC%%%%DATADIR%%/setup/display-specifiers/DisplaySpecifiers-Win2k3R2.txt
 %%AD_DC%%%%DATADIR%%/setup/display-specifiers/DisplaySpecifiers-Win2k8.txt
 %%AD_DC%%%%DATADIR%%/setup/display-specifiers/DisplaySpecifiers-Win2k8R2.txt
 %%AD_DC%%%%DATADIR%%/setup/dns_update_list
 %%AD_DC%%%%DATADIR%%/setup/fedora-ds-init.ldif
 %%AD_DC%%%%DATADIR%%/setup/fedorads-dna.ldif
 %%AD_DC%%%%DATADIR%%/setup/fedorads-index.ldif
 %%AD_DC%%%%DATADIR%%/setup/fedorads-linked-attributes.ldif
 %%AD_DC%%%%DATADIR%%/setup/fedorads-pam.ldif
 %%AD_DC%%%%DATADIR%%/setup/fedorads-partitions.ldif
 %%AD_DC%%%%DATADIR%%/setup/fedorads-refint-add.ldif
 %%AD_DC%%%%DATADIR%%/setup/fedorads-refint-delete.ldif
 %%AD_DC%%%%DATADIR%%/setup/fedorads-samba.ldif
 %%AD_DC%%%%DATADIR%%/setup/fedorads-sasl.ldif
 %%AD_DC%%%%DATADIR%%/setup/fedorads.inf
 %%AD_DC%%%%DATADIR%%/setup/idmap_init.ldif
 %%AD_DC%%%%DATADIR%%/setup/krb5.conf
 %%AD_DC%%%%DATADIR%%/setup/memberof.conf
 %%AD_DC%%%%DATADIR%%/setup/mmr_serverids.conf
 %%AD_DC%%%%DATADIR%%/setup/mmr_syncrepl.conf
 %%AD_DC%%%%DATADIR%%/setup/modules.conf
 %%AD_DC%%%%DATADIR%%/setup/named.conf
 %%AD_DC%%%%DATADIR%%/setup/named.conf.dlz
 %%AD_DC%%%%DATADIR%%/setup/named.conf.update
 %%AD_DC%%%%DATADIR%%/setup/named.txt
 %%AD_DC%%%%DATADIR%%/setup/olc_mmr.conf
 %%AD_DC%%%%DATADIR%%/setup/olc_seed.ldif
 %%AD_DC%%%%DATADIR%%/setup/olc_serverid.conf
 %%AD_DC%%%%DATADIR%%/setup/olc_syncrepl.conf
 %%AD_DC%%%%DATADIR%%/setup/olc_syncrepl_seed.conf
 %%AD_DC%%%%DATADIR%%/setup/prefixMap.txt
 %%AD_DC%%%%DATADIR%%/setup/provision.ldif
 %%AD_DC%%%%DATADIR%%/setup/provision.reg
 %%AD_DC%%%%DATADIR%%/setup/provision.zone
 %%AD_DC%%%%DATADIR%%/setup/provision_basedn.ldif
 %%AD_DC%%%%DATADIR%%/setup/provision_basedn_modify.ldif
 %%AD_DC%%%%DATADIR%%/setup/provision_basedn_options.ldif
 %%AD_DC%%%%DATADIR%%/setup/provision_basedn_references.ldif
 %%AD_DC%%%%DATADIR%%/setup/provision_computers_add.ldif
 %%AD_DC%%%%DATADIR%%/setup/provision_computers_modify.ldif
 %%AD_DC%%%%DATADIR%%/setup/provision_configuration.ldif
 %%AD_DC%%%%DATADIR%%/setup/provision_configuration_basedn.ldif
 %%AD_DC%%%%DATADIR%%/setup/provision_configuration_modify.ldif
 %%AD_DC%%%%DATADIR%%/setup/provision_configuration_references.ldif
 %%AD_DC%%%%DATADIR%%/setup/provision_dns_accounts_add.ldif
 %%AD_DC%%%%DATADIR%%/setup/provision_dns_add_samba.ldif
 %%AD_DC%%%%DATADIR%%/setup/provision_dnszones_add.ldif
 %%AD_DC%%%%DATADIR%%/setup/provision_dnszones_modify.ldif
 %%AD_DC%%%%DATADIR%%/setup/provision_dnszones_partitions.ldif
 %%AD_DC%%%%DATADIR%%/setup/provision_group_policy.ldif
 %%AD_DC%%%%DATADIR%%/setup/provision_init.ldif
 %%AD_DC%%%%DATADIR%%/setup/provision_partitions.ldif
 %%AD_DC%%%%DATADIR%%/setup/provision_privilege.ldif
 %%AD_DC%%%%DATADIR%%/setup/provision_rootdse_add.ldif
 %%AD_DC%%%%DATADIR%%/setup/provision_rootdse_modify.ldif
 %%AD_DC%%%%DATADIR%%/setup/provision_schema_basedn.ldif
 %%AD_DC%%%%DATADIR%%/setup/provision_schema_basedn_modify.ldif
 %%AD_DC%%%%DATADIR%%/setup/provision_self_join.ldif
 %%AD_DC%%%%DATADIR%%/setup/provision_self_join_config.ldif
 %%AD_DC%%%%DATADIR%%/setup/provision_self_join_modify.ldif
 %%AD_DC%%%%DATADIR%%/setup/provision_self_join_modify_config.ldif
 %%AD_DC%%%%DATADIR%%/setup/provision_users.ldif
 %%AD_DC%%%%DATADIR%%/setup/provision_users_add.ldif
 %%AD_DC%%%%DATADIR%%/setup/provision_users_modify.ldif
 %%AD_DC%%%%DATADIR%%/setup/provision_well_known_sec_princ.ldif
 %%AD_DC%%%%DATADIR%%/setup/refint.conf
 %%AD_DC%%%%DATADIR%%/setup/schema-map-fedora-ds-1.0
 %%AD_DC%%%%DATADIR%%/setup/schema-map-openldap-2.3
 %%AD_DC%%%%DATADIR%%/setup/schema_samba4.ldif
 %%AD_DC%%%%DATADIR%%/setup/secrets.ldif
 %%AD_DC%%%%DATADIR%%/setup/secrets_dns.ldif
 %%AD_DC%%%%DATADIR%%/setup/secrets_init.ldif
 %%AD_DC%%%%DATADIR%%/setup/secrets_sasl_ldap.ldif
 %%AD_DC%%%%DATADIR%%/setup/secrets_simple_ldap.ldif
 %%AD_DC%%%%DATADIR%%/setup/share.ldif
 %%AD_DC%%%%DATADIR%%/setup/slapd.conf
 %%AD_DC%%%%DATADIR%%/setup/spn_update_list
 %%AD_DC%%%%DATADIR%%/setup/ypServ30.ldif
 man/man1/dbwrap_tool.1.gz
 man/man1/findsmb.1.gz
 man/man1/gentest.1.gz
 man/man1/locktest.1.gz
 man/man1/log2pcap.1.gz
 man/man1/masktest.1.gz
 man/man1/ndrdump.1.gz
 man/man1/nmblookup.1.gz
 man/man1/ntlm_auth.1.gz
 man/man1/oLschema2ldif.1.gz
 man/man1/profiles.1.gz
 man/man1/regdiff.1.gz
 man/man1/regpatch.1.gz
 man/man1/regshell.1.gz
 man/man1/regtree.1.gz
 man/man1/rpcclient.1.gz
 man/man1/sharesec.1.gz
 man/man1/smbcacls.1.gz
 man/man1/smbclient.1.gz
 man/man1/smbcontrol.1.gz
 man/man1/smbcquotas.1.gz
 man/man1/smbget.1.gz
 man/man1/smbstatus.1.gz
 man/man1/smbtar.1.gz
 man/man1/smbtorture.1.gz
 man/man1/smbtree.1.gz
 man/man1/testparm.1.gz
 man/man1/vfstest.1.gz
 man/man1/wbinfo.1.gz
 man/man5/lmhosts.5.gz
 man/man5/pam_winbind.conf.5.gz
 man/man5/smb.conf.5.gz
 man/man5/smb4.conf.5.gz
 man/man5/smbgetrc.5.gz
 man/man5/smbpasswd.5.gz
 man/man7/samba.7.gz
 man/man7/winbind_krb5_locator.7.gz
 man/man8/eventlogadm.8.gz
 man/man8/idmap_ad.8.gz
 man/man8/idmap_autorid.8.gz
 man/man8/idmap_hash.8.gz
 man/man8/idmap_ldap.8.gz
 man/man8/idmap_nss.8.gz
 man/man8/idmap_rfc2307.8.gz
 man/man8/idmap_rid.8.gz
 man/man8/idmap_tdb.8.gz
 man/man8/idmap_tdb2.8.gz
 man/man8/net.8.gz
 man/man8/nmbd.8.gz
 man/man8/pam_winbind.8.gz
 man/man8/pdbedit.8.gz
 man/man8/samba-regedit.8.gz
 man/man8/samba-tool.8.gz
 man/man8/samba.8.gz
 man/man8/smbd.8.gz
 man/man8/smbpasswd.8.gz
 man/man8/smbspool.8.gz
 man/man8/smbta-util.8.gz
 man/man8/vfs_acl_tdb.8.gz
 man/man8/vfs_acl_xattr.8.gz
 man/man8/vfs_aio_fork.8.gz
 man/man8/vfs_aio_linux.8.gz
 man/man8/vfs_aio_pthread.8.gz
 man/man8/vfs_audit.8.gz
 man/man8/vfs_btrfs.8.gz
 man/man8/vfs_cacheprime.8.gz
 man/man8/vfs_cap.8.gz
 man/man8/vfs_catia.8.gz
 man/man8/vfs_ceph.8.gz
 man/man8/vfs_commit.8.gz
 man/man8/vfs_crossrename.8.gz
 man/man8/vfs_default_quota.8.gz
 man/man8/vfs_dirsort.8.gz
 man/man8/vfs_extd_audit.8.gz
 man/man8/vfs_fake_perms.8.gz
 man/man8/vfs_fileid.8.gz
 man/man8/vfs_fruit.8.gz
 man/man8/vfs_full_audit.8.gz
 man/man8/vfs_glusterfs.8.gz
 man/man8/vfs_gpfs.8.gz
 man/man8/vfs_linux_xfs_sgid.8.gz
 man/man8/vfs_media_harmony.8.gz
 man/man8/vfs_netatalk.8.gz
 man/man8/vfs_notify_fam.8.gz
 man/man8/vfs_prealloc.8.gz
 man/man8/vfs_preopen.8.gz
 man/man8/vfs_readahead.8.gz
 man/man8/vfs_readonly.8.gz
 man/man8/vfs_recycle.8.gz
 man/man8/vfs_scannedonly.8.gz
 man/man8/vfs_shadow_copy.8.gz
 man/man8/vfs_shadow_copy2.8.gz
 man/man8/vfs_smb_traffic_analyzer.8.gz
 man/man8/vfs_snapper.8.gz
 man/man8/vfs_streams_depot.8.gz
 man/man8/vfs_streams_xattr.8.gz
 man/man8/vfs_syncops.8.gz
 man/man8/vfs_time_audit.8.gz
 man/man8/vfs_tsmsm.8.gz
 man/man8/vfs_worm.8.gz
 man/man8/vfs_xattr_tdb.8.gz
 man/man8/winbindd.8.gz
 @dir lib/shared-modules/perfcount
 @dir lib/shared-modules/pdb
 @dir lib/shared-modules/gpext
 @dir /var/run/samba4
 @dir /var/log/samba4
 @dir /var/db/samba4/private
 @dir /var/db/samba4
Index: head/net/samba43/Makefile
===================================================================
--- head/net/samba43/Makefile	(revision 413162)
+++ head/net/samba43/Makefile	(revision 413163)
@@ -1,530 +1,530 @@
 # Created by: timur@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME?=		${SAMBA4_BASENAME}43
 PORTVERSION?=		${SAMBA4_VERSION}
-PORTREVISION?=		2
+PORTREVISION?=		0
 CATEGORIES?=		net
 MASTER_SITES=		SAMBA/samba/stable SAMBA/samba/rc
 DISTNAME=		${SAMBA4_DISTNAME}
 
 MAINTAINER?=		timur@FreeBSD.org
 COMMENT?=		Free SMB/CIFS and AD/DC server and client for Unix
 
 LICENSE=		GPLv3
 
 CONFLICTS?=		*samba3[2-6]-3.* samba4-4.0.* samba41-4.1.* samba42-4.2.*
 
-EXTRA_PATCHES=		${PATCHDIR}/extra-patch-security:-p1
+EXTRA_PATCHES=		${PATCHDIR}/extra-patch-progress:-p1
 
 SAMBA4_BASENAME=	samba
 SAMBA4_PORTNAME=	${SAMBA4_BASENAME}4
-SAMBA4_VERSION=		4.3.3
+SAMBA4_VERSION=		4.3.8
 SAMBA4_DISTNAME=	${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|}
 
 WRKSRC?=		${WRKDIR}/${DISTNAME}
 
 .if !defined(SAMBA4_SUBPORT)
 CPE_VENDOR=		samba
 CPE_PRODUCT=		samba
 # Directories
 VARDIR=			${DESTDIR}/var
 SAMBA4_RUNDIR=		${VARDIR}/run/${SAMBA4_PORTNAME}
 SAMBA4_LOGDIR=		${VARDIR}/log/${SAMBA4_PORTNAME}
 SAMBA4_LOCKDIR=		${VARDIR}/db/${SAMBA4_PORTNAME}
 SAMBA4_PRIVATEDIR=	${SAMBA4_LOCKDIR}/private
 SAMBA4_LIBDIR=		${PREFIX}/lib
 SAMBA4_MODULEDIR=	${SAMBA4_LIBDIR}/shared-modules
 SAMBA4_INCLUDEDIR=	${PREFIX}/include/${SAMBA4_PORTNAME}
 SAMBA4_CONFDIR=		${PREFIX}/etc
 SAMBA4_CONFIG=		smb4.conf
 
 CONFIGURE_ARGS+=	--mandir="${MANPREFIX}/man" \
 			--sysconfdir="${SAMBA4_CONFDIR}" \
 			--includedir="${SAMBA4_INCLUDEDIR}" \
 			--datadir="${DATADIR}" \
 			--libdir="${SAMBA4_LIBDIR}" \
 			--with-pammodulesdir="${SAMBA4_LIBDIR}" \
 			--with-privatelibdir="${SAMBA4_LIBDIR}/samba" \
 			--with-modulesdir="${SAMBA4_MODULEDIR}" \
 			--with-pkgconfigdir="${PKGCONFIGDIR}" \
 			--localstatedir="${VARDIR}" \
 			--with-piddir="${SAMBA4_RUNDIR}" \
 			--with-sockets-dir="${SAMBA4_RUNDIR}" \
 			--with-privileged-socket-dir="${SAMBA4_RUNDIR}" \
 			--with-lockdir="${SAMBA4_LOCKDIR}" \
 			--with-statedir="${SAMBA4_LOCKDIR}" \
 			--with-cachedir="${SAMBA4_LOCKDIR}" \
 			--with-privatedir="${SAMBA4_PRIVATEDIR}" \
 			--with-logfilebase="${SAMBA4_LOGDIR}"
 # Flags
 CONFIGURE_ENV+=		PTHREAD_LDFLAGS="-lpthread"
 
 USES=			cpe compiler waf pkgconfig perl5 python:2 \
 			execinfo readline iconv shebangfix
 USE_PERL5=		build
 USE_LDCONFIG=		${SAMBA4_LIBDIR}
 WAF_CMD=		buildtools/bin/waf
 CONFIGURE_LOG=		bin/config.log
 
 PKGCONFIGDIR?=		${PREFIX}/libdata/pkgconfig
 PLIST_SUB+=		PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;}
 # XXX: Unconditional dependencies which can't be switched off(if present
 # in the system)
 # popt
 LIB_DEPENDS+=		libpopt.so:devel/popt
 # inotify
 LIB_DEPENDS+=		libinotify.so:devel/libinotify
 # SASL
 LIB_DEPENDS+=		libsasl2.so:security/cyrus-sasl2
 # GNUTLS
 LIB_DEPENDS+=		libgcrypt.so:security/libgcrypt
 LIB_DEPENDS+=		libgnutls.so:security/gnutls
 # NFS4 ACL glue
 LIB_DEPENDS+=		libsunacl.so:sysutils/libsunacl
 # Libarchive
 BUILD_DEPENDS+=		libarchive>=3.1.2:archivers/libarchive
 RUN_DEPENDS+=		libarchive>=3.1.2:archivers/libarchive
 # External Samba dependencies
 # IDL compiler
 BUILD_DEPENDS+=		p5-Parse-Pidl>=4.3.1:devel/p5-Parse-Pidl
 #
 BUILD_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython
 RUN_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython
 PLIST_SUB+=		PY_DNSPYTHON="@comment "
 # talloc
 BUILD_DEPENDS+=		talloc>=2.1.5:devel/talloc
 RUN_DEPENDS+=		talloc>=2.1.5:devel/talloc
 SAMBA4_BUNDLED_LIBS+=	!talloc
 # tevent
 BUILD_DEPENDS+=		tevent>=0.9.25:devel/tevent
 RUN_DEPENDS+=		tevent>=0.9.25:devel/tevent
 SAMBA4_BUNDLED_LIBS+=	!tevent
 # tdb
 BUILD_DEPENDS+=		tdb>=1.3.8:databases/tdb
 RUN_DEPENDS+=		tdb>=1.3.8:databases/tdb
 SAMBA4_BUNDLED_LIBS+=	!tdb
 # ldb
 BUILD_DEPENDS+=		ldb>=1.1.24:databases/ldb
 RUN_DEPENDS+=		ldb>=1.1.24:databases/ldb
 SAMBA4_BUNDLED_LIBS+=	!ldb
 # Don't use external libcom_err
 SAMBA4_BUNDLED_LIBS+=	com_err
 ##############################################################################
 # Options
 OPTIONS_DEFINE=		ACL_SUPPORT AD_DC ADS AIO_SUPPORT CUPS DEBUG \
 			DNSUPDATE DOCS FAM LDAP PAM_SMBPASS \
 			PTHREADPOOL QUOTAS SYSLOG UTMP
 
 OPTIONS_DEFAULT:=	ACL_SUPPORT AD_DC ADS AIO_SUPPORT DEBUG \
 			DNSUPDATE DOCS FAM LDAP \
 			PTHREADPOOL QUOTAS SYSLOG UTMP
 
 ACL_SUPPORT_DESC=	File system ACL support
 AD_DC_DESC=		Active Directory Domain Controller support
 ADS_DESC=		Active Directory client support
 AIO_SUPPORT_DESC=	Asyncronous IO support
 DNSUPDATE_DESC=		Dynamic DNS update (require ADS)
 EXP_MODULES_DESC=	Experimental modules
 FAM_DESC=		File Alteration Monitor support
 DEBUG_DESC=		With debug information in the binaries
 LDAP_DESC=		LDAP client support
 PAM_SMBPASS_DESC=	PAM authentication via passdb backends
 PTHREADPOOL_DESC=	Pthread pool
 QUOTAS_DESC=		Disk quota support
 UTMP_DESC=		UTMP accounting support
 ##############################################################################
 OPTIONS_DEFINE+=	DEVELOPER MANPAGES EXP_MODULES
 
 DEVELOPER_DESC=		With development support
 MANPAGES_DESC=		Build manpages from DOCBOOK templates
 
 OPTIONS_RADIO=		DNS ZEROCONF
 OPTIONS_RADIO_DNS=	NSUPDATE BIND99 BIND910
 OPTIONS_RADIO_ZEROCONF=	AVAHI MDNSRESPONDER
 
 BIND99_DESC=		Use bind99 as AD DC DNS server frontend
 BIND910_DESC=		Use bind910 as AD DC DNS server frontend
 NSUPDATE_DESC=		Use samba NSUPDATE utility for AD DC
 
 .include <bsd.port.options.mk>
 
 CONFIGURE_ARGS+=	\
 			--with-pam \
 			--with-iconv \
 			--with-winbind \
 			--without-gettext \
 			--with-sendfile-support \
 			--builtin-libraries=smbclient \
 			${ICONV_CONFIGURE_BASE}
 
 # for libexecinfo: (so that __builtin_frame_address() finds the top of the stack)
 .if ${ARCH} == "amd64"
 CFLAGS+=		-fno-omit-frame-pointer
 .endif
 
 .if ${PORT_OPTIONS:MBIND99}
 RUN_DEPENDS+=		bind99>=9.9.0.0:dns/bind99
 SUB_LIST+=		NSUPDATE="@comment "
 .elif ${PORT_OPTIONS:MBIND910}
 RUN_DEPENDS+=		bind910>=9.10.0.0:dns/bind910
 SUB_LIST+=		NSUPDATE="@comment "
 .elif ${PORT_OPTIONS:MNSUPDATE}
 RUN_DEPENDS+=		samba-nsupdate:dns/samba-nsupdate
 SUB_LIST+=		NSUPDATE=""
 .else
 SUB_LIST+=		NSUPDATE="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MDEBUG}
 WITH_DEBUG=		yes
 CONFIGURE_ARGS+=	--verbose
 MAKE_ARGS+=		--verbose
 CONFIGURE_ARGS+=	--enable-debug
 .endif
 
 # https://bugzilla.samba.org/show_bug.cgi?id=8969
 .if ${PORT_OPTIONS:MDEVELOPER}
 #GDB_CMD?=		gdb79
 # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=194046
 # XXX: Still may break, if the link isn't installed - blame devel/gdb maintainer then.
 GDB_CMD?=		${LOCALBASE}/bin/gdb
 BUILD_DEPENDS+=		${GDB_CMD}:devel/gdb
 RUN_DEPENDS+=		${GDB_CMD}:devel/gdb
 SAMBA4_MODULES+=	auth_skel perfcount_test pdb_test vfs_shadow_copy_test vfs_skel_opaque vfs_skel_transparent vfs_fake_acls
 CONFIGURE_ARGS+=	--enable-developer --enable-selftest
 PLIST_SUB+=		DEVELOPER=""
 .else
 GDB_CMD=		true
 PLIST_SUB+=		DEVELOPER="@comment "
 .endif
 ##############################################################################
 # XXX: That will blow up your installation
 # https://bugzilla.samba.org/show_bug.cgi?id=9302
 .if defined(CRAZY)
 WANT_EXP_MODULES=	auth_samba4 auth_script auth_skel auth_unix auth_wbc \
 			gpext_registry gpext_scripts gpext_security idmap_ad \
 			idmap_autorid idmap_hash idmap_ldap idmap_passdb \
 			idmap_rid idmap_tdb idmap_tdb2 idmap_nss nss_info_template \
 			pdb_ldap pdb_samba_dsdb pdb_smbpasswd pdb_tdbsam \
 			pdb_test pdb_wbc_sam perfcount_test vfs_acl_tdb \
 			vfs_acl_xattr vfs_aio_fork vfs_aio_posix \
 			vfs_aio_pthread vfs_audit vfs_cacheprime vfs_cap \
 			vfs_catia vfs_commit vfs_crossrename vfs_default_quota \
 			vfs_dfs_samba4 vfs_dirsort vfs_expand_msdfs vfs_extd_audit \
 			vfs_fake_acls vfs_fake_perms vfs_full_audit vfs_media_harmony \
 			vfs_netatalk vfs_posix_eadb vfs_preopen vfs_readahead \
 			vfs_readonly vfs_recycle vfs_scannedonly vfs_shadow_copy \
 			vfs_shadow_copy2 vfs_shadow_copy_test vfs_skel_opaque \
 			vfs_skel_transparent vfs_smb_traffic_analyzer vfs_streams_depot \
 			vfs_streams_xattr vfs_syncops vfs_time_audit \
 			vfs_xattr_tdb vfs_zfsacl
 .endif
 
 .if ${PORT_OPTIONS:MEXP_MODULES}
 .	if !defined(WANT_EXP_MODULES) || empty(WANT_EXP_MODULES)
 WANT_EXP_MODULES=	vfs_cacheprime gpext_scripts gpext_security gpext_registry
 .	endif
 .endif
 
 .if ${PORT_OPTIONS:MACL_SUPPORT}
 LIB_DEPENDS+=		libsunacl.so:sysutils/libsunacl
 WANT_EXP_MODULES+=	vfs_zfsacl
 SAMBA4_MODULES+=	vfs_zfsacl
 CONFIGURE_ARGS+=	--with-acl-support
 .else
 CONFIGURE_ARGS+=	--without-acl-support
 .endif
 
 .if ! ${PORT_OPTIONS:MAD_DC}
 CONFIGURE_ARGS+=	--without-ad-dc
 PLIST_SUB+=		AD_DC="@comment "
 SUB_LIST+=		AD_DC="@comment "
 .else
 PLIST_SUB+=		AD_DC=""
 SUB_LIST+=		AD_DC=""
 .endif
 
 .if ${PORT_OPTIONS:MADS}
 SAMBA4_WANT_ADS=	yes
 SAMBA4_WANT_LDAP=	yes
 # List of extra modules taken from RHEL build
 # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=197320
 SAMBA4_MODULES+=	idmap_rid idmap_ad idmap_hash idmap_adex idmap_tdb2
 .endif
 
 .if ${PORT_OPTIONS:MAIO_SUPPORT}
 CONFIGURE_ARGS+=	--with-aio-support
 SAMBA4_MODULES+=	vfs_aio_posix
 .else
 CONFIGURE_ARGS+=	--without-aio-support
 .endif
 
 .if ${PORT_OPTIONS:MAVAHI}
 LIB_DEPENDS+=		libavahi-client.so:net/avahi-app
 CONFIGURE_ARGS+=	--enable-avahi
 .else
 CONFIGURE_ARGS+=	--disable-avahi
 .endif
 
 .if ${PORT_OPTIONS:MMDNSRESPONDER}
 LIB_DEPENDS+=		libdns_sd.so:net/mDNSResponder
 CONFIGURE_ARGS+=	--enable-dnssd
 .else
 CONFIGURE_ARGS+=	--disable-dnssd
 .endif
 
 .if ${PORT_OPTIONS:MCUPS}
 LIB_DEPENDS+=		libcups.so:print/cups
 CONFIGURE_ARGS+=	--enable-cups --enable-iprint
 .else
 CONFIGURE_ARGS+=	--disable-cups --disable-iprint
 .endif
 
 .if ${PORT_OPTIONS:MDNSUPDATE}
 SAMBA_WANT_ADS=		yes
 CONFIGURE_ARGS+=	--with-dnsupdate
 PLIST_SUB+=		DNSUPDATE=""
 .else
 CONFIGURE_ARGS+=	--without-dnsupdate
 PLIST_SUB+=		DNSUPDATE="@comment "
 .endif
 
 # https://bugzilla.samba.org/show_bug.cgi?id=9545
 .if ${PORT_OPTIONS:MFAM}
 USES+=			fam
 CONFIGURE_ARGS+=	--with-fam
 .else
 CONFIGURE_ARGS+=	--without-fam
 .endif
 
 .if ${PORT_OPTIONS:MLDAP}
 SAMBA4_WANT_LDAP=	yes
 .endif
 
 .if ${PORT_OPTIONS:MPAM_SMBPASS}
 CONFIGURE_ARGS+=	--with-pam_smbpass
 PLIST_SUB+=		SMBPASS=""
 .else
 CONFIGURE_ARGS+=	--without-pam_smbpass
 PLIST_SUB+=		SMBPASS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPTHREADPOOL}
 CONFIGURE_ARGS+=	--enable-pthreadpool
 SAMBA4_MODULES+=	vfs_aio_pthread
 .else
 CONFIGURE_ARGS+=	--disable-pthreadpool
 .endif
 
 .if ${PORT_OPTIONS:MQUOTAS}
 CONFIGURE_ARGS+=	--with-quotas
 .else
 CONFIGURE_ARGS+=	--without-quotas
 .endif
 
 .if ${PORT_OPTIONS:MSYSLOG}
 CONFIGURE_ARGS+=	--with-syslog
 .else
 CONFIGURE_ARGS+=	--without-syslog
 .endif
 
 .if ${PORT_OPTIONS:MUTMP}
 CONFIGURE_ARGS+=	--with-utmp
 .else
 CONFIGURE_ARGS+=	--without-utmp
 .endif
 
 .if defined(SAMBA4_WANT_ADS)
 CONFIGURE_ARGS+=	--with-ads
 .else
 CONFIGURE_ARGS+=	--without-ads
 .endif
 
 .if defined(SAMBA4_WANT_LDAP)
 USE_OPENLDAP=		yes
 #WANT_OPENLDAP_SASL=	yes
 CONFIGURE_ARGS+=	--with-ldap
 PLIST_SUB+=		LDAP=""
 .else
 CONFIGURE_ARGS+=	--without-ldap
 PLIST_SUB+=		LDAP="@comment "
 .endif
 
 .if ! ${PORT_OPTIONS:MMANPAGES}
 CONFIGURE_ENV+=		XSLTPROC="true"
 .else
 BUILD_DEPENDS+=		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \
 			xsltproc:textproc/libxslt
 .endif
 
 .if defined(SAMBA4_BUNDLED_LIBS) && !empty(SAMBA4_BUNDLED_LIBS)
 CONFIGURE_ARGS+=	--bundled-libraries="${SAMBA4_BUNDLED_LIBS:Q:C|(\\\\ )+|,|g:S|\\||g}"
 .endif
 
 .if defined(WANT_EXP_MODULES) && !empty(WANT_EXP_MODULES)
 SAMBA4_MODULES+=	${WANT_EXP_MODULES}
 .endif
 
 .if defined(SAMBA4_MODULES) && !empty(SAMBA4_MODULES)
 CONFIGURE_ARGS+=	--with-shared-modules="${SAMBA4_MODULES:Q:C|(\\\\ )+|,|g:S|\\||g}"
 .endif
 # XXX: Dirty
 .for module in	auth_samba4 auth_skel auth_unix auth_wbc gpext_registry gpext_scripts \
 		gpext_security idmap_ad idmap_ldap idmap_nss idmap_passdb idmap_tdb \
 		nss_info_template pdb_ldap pdb_samba_dsdb pdb_smbpasswd pdb_tdbsam \
 		pdb_test pdb_wbc_sam perfcount_test vfs_aio_posix vfs_aio_pthread \
 		vfs_cacheprime vfs_dfs_samba4 vfs_fake_acls \
 		vfs_shadow_copy_test vfs_skel_opaque vfs_skel_transparent
 .	if !empty(SAMBA4_MODULES) && ${SAMBA4_MODULES:M${module}}
 PLIST_SUB+=		MODULE_${module:tu}=""
 .	else
 PLIST_SUB+=		MODULE_${module:tu}="@comment "
 .	endif
 .endfor
 ##############################################################################
 # !SAMBA4_SUBPORT
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if !defined(SAMBA4_SUBPORT)
 
 SAMBA4_SUB=		SAMBA4_LOGDIR="${SAMBA4_LOGDIR}" \
 			SAMBA4_RUNDIR="${SAMBA4_RUNDIR}" \
 			SAMBA4_LOCKDIR="${SAMBA4_LOCKDIR}" \
 			SAMBA4_MODULEDIR="${SAMBA4_MODULEDIR}" \
 			SAMBA4_PRIVATEDIR="${SAMBA4_PRIVATEDIR}" \
 			SAMBA4_CONFDIR="${SAMBA4_CONFDIR}" \
 			SAMBA4_CONFIG="${SAMBA4_CONFIG}"
 
 PLIST_SUB+=		${SAMBA4_SUB}
 SUB_LIST+=		${SAMBA4_SUB}
 
 USE_RC_SUBR=		samba_server
 SUB_FILES=		pkg-message README.FreeBSD
 # Make sure that the right version of Python is used by the tools
 # https://bugzilla.samba.org/show_bug.cgi?id=7305
 SHEBANG_FILES=		${PATCH_WRKSRC}/source4/scripting/bin/*
 # No fancy color error messages
 .if ${COMPILER_TYPE} == "clang"
 CFLAGS+=		-fno-color-diagnostics
 .endif
 CONFIGURE_ENV+=		NOCOLOR=yes WAF_LOG_FORMAT='%(c1)s%(zone)s%(c2)s %(message)s'
 MAKE_ENV+=		NOCOLOR=yes WAF_LOG_FORMAT='%(c1)s%(zone)s%(c2)s %(message)s'
 
 SAMBA_MAN1+=		dbwrap_tool.1 findsmb.1 gentest.1 locktest.1 \
 			log2pcap.1 masktest.1 ndrdump.1 nmblookup.1 \
 			nmblookup4.1 ntlm_auth.1 oLschema2ldif.1 \
 			profiles.1 regdiff.1 regpatch.1 regshell.1 \
 			regtree.1 rpcclient.1 sharesec.1 smbcacls.1 \
 			smbclient.1 smbcontrol.1 smbcquotas.1 smbget.1 \
 			smbstatus.1 smbtar.1 smbtorture.1 smbtree.1 \
 			testparm.1 vfstest.1 wbinfo.1
 
 SAMBA_MAN5+=		lmhosts.5 smbgetrc.5 smbpasswd.5 pam_winbind.conf.5 \
 			smb.conf.5
 
 SAMBA_MAN7+=		samba.7 winbind_krb5_locator.7
 
 SAMBA_MAN8+=		eventlogadm.8 idmap_ad.8 idmap_autorid.8 idmap_hash.8 \
 			idmap_ldap.8 idmap_nss.8 idmap_rfc2307.8 idmap_rid.8 \
 			idmap_tdb.8 idmap_tdb2.8 net.8 nmbd.8 pam_winbind.8 pdbedit.8 \
-			samba-regedit.8 samba-tool.8 samba.8 smbd.8 smbpasswd.8 \
+			samba-regedit.8 samba-tool.8 samba.8 smbd.8 smbpasswd.8 smbspool_krb5_wrapper.8 \
 			smbspool.8 smbta-util.8 vfs_acl_tdb.8 vfs_acl_xattr.8 \
 			vfs_aio_fork.8 vfs_aio_linux.8 vfs_aio_pthread.8 \
 			vfs_audit.8 vfs_cacheprime.8 vfs_cap.8 vfs_catia.8 vfs_ceph.8 \
 			vfs_commit.8 vfs_crossrename.8 vfs_default_quota.8 \
 			vfs_dirsort.8 vfs_extd_audit.8 vfs_fake_perms.8 vfs_fileid.8 \
 			vfs_fruit.8 vfs_full_audit.8 vfs_glusterfs.8 vfs_gpfs.8 vfs_media_harmony.8 \
 			vfs_netatalk.8 vfs_prealloc.8 \
 			vfs_preopen.8 vfs_readahead.8 vfs_readonly.8 \
 			vfs_recycle.8 vfs_scannedonly.8 vfs_shadow_copy.8 \
 			vfs_shadow_copy2.8 vfs_snapper.8 vfs_smb_traffic_analyzer.8 \
 			vfs_streams_depot.8 vfs_streams_xattr.8 vfs_syncops.8 vfs_time_audit.8 \
 			vfs_tsmsm.8 vfs_worm.8 vfs_xattr_tdb.8 winbindd.8 \
 			vfs_linux_xfs_sgid.8 vfs_btrfs.8 vfs_shell_snap.8 vfs_unityed_media.8
 
 PORTDOCS=		README.FreeBSD
 
 IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support
 
 post-extract:
 			@${RM} -rf ${WRKSRC}/pidl
 
 post-patch:
 			@${REINPLACE_CMD} -e 's|$${PKGCONFIGDIR}|${PKGCONFIGDIR}|g' \
 				${PATCH_WRKSRC}/buildtools/wafsamba/pkgconfig.py
 			@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 				${PATCH_WRKSRC}/buildtools/wafsamba/samba_pidl.py \
 				${PATCH_WRKSRC}/buildtools/wafsamba/wafsamba.py
 			@${REINPLACE_CMD} -e 's|%%GDB_CMD%%|${GDB_CMD}|g' \
 				${PATCH_WRKSRC}/buildtools/scripts/abi_gen.sh
 			@${REINPLACE_CMD} -e 's|%%SAMBA4_CONFIG%%|${SAMBA4_CONFIG}|g' \
 				${PATCH_WRKSRC}/dynconfig/wscript
 
 # Use threading (or multiprocessing) but not thread (renamed in python 3+).
 pre-configure:
 			@if ! ${PYTHON_CMD} -c "import multiprocessing;" 2>/dev/null; then \
 				${ECHO_CMD}; \
 				${ECHO_MSG} "===>  ${PKGNAME} "${IGNORE_NONTHREAD_PYTHON:Q}.; \
 				${ECHO_CMD}; \
 				${FALSE}; \
 			fi
 
 # XXX: Gross hack to allow build newer Samba while old one is installed.
 # This implies that LINKFLAGS_PYEMBED contains flags which are already
 # used in other parts of LINKFLAGS, namely -L$(LOCALBASE)/lib and -pthread
 post-configure:
 	-${REINPLACE_CMD} -e 's|LINKFLAGS_PYEMBED.*|LINKFLAGS_PYEMBED = []|' \
 		${CONFIGURE_WRKSRC}/bin/c4che/default.cache.py
 
 pre-build:
 .if ! ${PORT_OPTIONS:MMANPAGES}
 .	for man in	libcli/nbt/man/nmblookup4.1 \
 			librpc/tools/ndrdump.1 \
 			source4/lib/registry/man/regdiff.1 \
 			source4/lib/registry/man/regpatch.1 \
 			source4/lib/registry/man/regshell.1 \
 			source4/lib/registry/man/regtree.1 \
 			source4/torture/man/gentest.1 \
 			source4/torture/man/locktest.1 \
 			source4/torture/man/masktest.1 \
 			source4/torture/man/smbtorture.1 \
 			source4/utils/man/ntlm_auth4.1 \
 			source4/utils/man/oLschema2ldif.1
 			-@${MKDIR} `dirname ${BUILD_WRKSRC}/bin/default/${man}`
 			${INSTALL_MAN} ${FILESDIR}/man/`basename ${man}` ${BUILD_WRKSRC}/bin/default/${man}
 .	endfor
 			-@${MKDIR} ${BUILD_WRKSRC}/bin/default/docs-xml/manpages
 .	for man in ${SAMBA_MAN1} ${SAMBA_MAN5} ${SAMBA_MAN7} ${SAMBA_MAN8}
 			-${INSTALL_MAN} ${BUILD_WRKSRC}/docs/manpages/${man} ${BUILD_WRKSRC}/bin/default/docs-xml/manpages
 .	endfor
 .endif
 
 post-install:
 			@${LN} -sf smb.conf.5.gz ${STAGEDIR}${PREFIX}/man/man5/smb4.conf.5.gz
 .if ${PORT_OPTIONS:MDOCS}
 			@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .	for doc in ${PORTDOCS}
 			${INSTALL_DATA} ${WRKDIR}/${doc} ${STAGEDIR}${DOCSDIR}
 .	endfor
 .endif
 # Run post-install script
 .for dir in ${SAMBA4_LOGDIR} ${SAMBA4_RUNDIR} ${SAMBA4_LOCKDIR} ${SAMBA4_MODULEDIR}
 			@${INSTALL} -d -m 0755 "${STAGEDIR}${dir}"
 .endfor
 			@${INSTALL} -d -m 0700 "${STAGEDIR}${SAMBA4_PRIVATEDIR}"
 .for dir in auth bind9 gensec gpext idmap ldb nss_info pdb perfcount process_model service vfs
 			@${MKDIR} "${STAGEDIR}${SAMBA4_MODULEDIR}/${dir}"
 .endfor
 
 .if ${PORT_OPTIONS:MDEVELOPER}
 test: build
 			@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${INSTALL_WRKSRC}/${WAF_CMD} ${MAKE_ARGS} $@)
 .endif
 
 # !SAMBA4_SUBPORT
 .endif
 
 .include <bsd.port.post.mk>
Index: head/net/samba43/distinfo
===================================================================
--- head/net/samba43/distinfo	(revision 413162)
+++ head/net/samba43/distinfo	(revision 413163)
@@ -1,2 +1,2 @@
-SHA256 (samba-4.3.3.tar.gz) = e62d21313acbb29e24b0b80aaf2b63fdd1ccce4cfb741f333deca95a1a3a70df
-SIZE (samba-4.3.3.tar.gz) = 20427281
+SHA256 (samba-4.3.8.tar.gz) = 379dc66c3a0a483bf5bed37be6e5d182934db7c4102b21929a6c4602b32b2b10
+SIZE (samba-4.3.8.tar.gz) = 20568773
Index: head/net/samba43/files/extra-patch-security
===================================================================
--- head/net/samba43/files/extra-patch-security	(revision 413162)
+++ head/net/samba43/files/extra-patch-security	(nonexistent)
@@ -1,534 +0,0 @@
-From a4e75bba5d2b799c11aac9eb1c345b8e58563089 Mon Sep 17 00:00:00 2001
-From: Stefan Metzmacher <metze@samba.org>
-Date: Wed, 25 Nov 2015 10:17:34 +0100
-Subject: [PATCH 1/4] dbwrap_rbt: use talloc_zero_size() instead of a partial
- ZERO_STRUCT()
-
-BUG: https://bugzilla.samba.org/show_bug.cgi?id=11375
-BUG: https://bugzilla.samba.org/show_bug.cgi?id=11394
-
-Signed-off-by: Stefan Metzmacher <metze@samba.org>
-Reviewed-by: Volker Lendecke <vl@samba.org>
-(cherry picked from commit f3d1fc1d06822a951a2a3eeb5aa53748b9b5b299)
----
- lib/dbwrap/dbwrap_rbt.c | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/lib/dbwrap/dbwrap_rbt.c b/lib/dbwrap/dbwrap_rbt.c
-index 03f2f57..2d65647 100644
---- a/lib/dbwrap/dbwrap_rbt.c
-+++ b/lib/dbwrap/dbwrap_rbt.c
-@@ -153,7 +153,7 @@ static NTSTATUS db_rbt_store(struct db_record *rec, TDB_DATA data, int flag)
- 		return NT_STATUS_INSUFFICIENT_RESOURCES;
- 	}
- 
--	node = talloc_size(db_ctx, reclen);
-+	node = talloc_zero_size(db_ctx, reclen);
- 	if (node == NULL) {
- 		return NT_STATUS_NO_MEMORY;
- 	}
-@@ -172,8 +172,6 @@ static NTSTATUS db_rbt_store(struct db_record *rec, TDB_DATA data, int flag)
- 		 */
- 	}
- 
--	ZERO_STRUCT(node->rb_node);
--
- 	node->keysize = rec->key.dsize;
- 	node->valuesize = data.dsize;
- 
--- 
-1.9.1
-
-
-From 3f448c47a8567b0e4794e787399202f050002819 Mon Sep 17 00:00:00 2001
-From: Stefan Metzmacher <metze@samba.org>
-Date: Wed, 25 Nov 2015 09:22:08 +0100
-Subject: [PATCH 2/4] dbwrap_rbt: add nested traverse protection
-
-Multiple dbwrap_traverse_read() calls are possible.
-
-store() and delete() on a fetch locked record
-are rejected during dbwrap_traverse_read().
-
-A dbwrap_traverse() within a dbwrap_traverse_read()
-behaves like a dbwrap_traverse_read().
-
-Nested dbwrap_traverse() calls are not possible.
-
-BUG: https://bugzilla.samba.org/show_bug.cgi?id=11375
-BUG: https://bugzilla.samba.org/show_bug.cgi?id=11394
-
-Signed-off-by: Stefan Metzmacher <metze@samba.org>
-Reviewed-by: Volker Lendecke <vl@samba.org>
-(cherry picked from commit 590507951fc514a679f44b8bfdd03c721189c3fa)
----
- lib/dbwrap/dbwrap_rbt.c | 71 ++++++++++++++++++++++++++++---------------------
- 1 file changed, 40 insertions(+), 31 deletions(-)
-
-diff --git a/lib/dbwrap/dbwrap_rbt.c b/lib/dbwrap/dbwrap_rbt.c
-index 2d65647..d4cb40d 100644
---- a/lib/dbwrap/dbwrap_rbt.c
-+++ b/lib/dbwrap/dbwrap_rbt.c
-@@ -27,6 +27,8 @@
- 
- struct db_rbt_ctx {
- 	struct rb_root tree;
-+	size_t traverse_read;
-+	bool traverse_write;
- };
- 
- struct db_rbt_rec {
-@@ -126,6 +128,10 @@ static NTSTATUS db_rbt_store(struct db_record *rec, TDB_DATA data, int flag)
- 	ssize_t reclen;
- 	TDB_DATA this_key, this_val;
- 
-+	if (db_ctx->traverse_read > 0) {
-+		return NT_STATUS_MEDIA_WRITE_PROTECTED;
-+	}
-+
- 	if (rec_priv->node != NULL) {
- 
- 		/*
-@@ -222,6 +228,10 @@ static NTSTATUS db_rbt_delete(struct db_record *rec)
- 		rec->db->private_data, struct db_rbt_ctx);
- 	struct db_rbt_rec *rec_priv = (struct db_rbt_rec *)rec->private_data;
- 
-+	if (db_ctx->traverse_read > 0) {
-+		return NT_STATUS_MEDIA_WRITE_PROTECTED;
-+	}
-+
- 	if (rec_priv->node == NULL) {
- 		return NT_STATUS_OK;
- 	}
-@@ -232,16 +242,6 @@ static NTSTATUS db_rbt_delete(struct db_record *rec)
- 	return NT_STATUS_OK;
- }
- 
--static NTSTATUS db_rbt_store_deny(struct db_record *rec, TDB_DATA data, int flag)
--{
--	return NT_STATUS_MEDIA_WRITE_PROTECTED;
--}
--
--static NTSTATUS db_rbt_delete_deny(struct db_record *rec)
--{
--	return NT_STATUS_MEDIA_WRITE_PROTECTED;
--}
--
- struct db_rbt_search_result {
- 	TDB_DATA key;
- 	TDB_DATA val;
-@@ -414,13 +414,8 @@ static int db_rbt_traverse_internal(struct db_context *db,
- 	ZERO_STRUCT(rec);
- 	rec.db = db;
- 	rec.private_data = &rec_priv;
--	if (rw) {
--		rec.store = db_rbt_store;
--		rec.delete_rec = db_rbt_delete;
--	} else {
--		rec.store = db_rbt_store_deny;
--		rec.delete_rec = db_rbt_delete_deny;
--	}
-+	rec.store = db_rbt_store;
-+	rec.delete_rec = db_rbt_delete;
- 	db_rbt_parse_node(rec_priv.node, &rec.key, &rec.value);
- 
- 	ret = f(&rec, private_data);
-@@ -440,18 +435,21 @@ static int db_rbt_traverse_internal(struct db_context *db,
- 	return db_rbt_traverse_internal(db, rb_right, f, private_data, count, rw);
- }
- 
--static int db_rbt_traverse(struct db_context *db,
--			   int (*f)(struct db_record *db,
--				    void *private_data),
--			   void *private_data)
-+static int db_rbt_traverse_read(struct db_context *db,
-+				int (*f)(struct db_record *db,
-+					 void *private_data),
-+				void *private_data)
- {
- 	struct db_rbt_ctx *ctx = talloc_get_type_abort(
- 		db->private_data, struct db_rbt_ctx);
- 	uint32_t count = 0;
-+	int ret;
- 
--	int ret = db_rbt_traverse_internal(db, ctx->tree.rb_node,
--					   f, private_data, &count,
--					   true /* rw */);
-+	ctx->traverse_read++;
-+	ret = db_rbt_traverse_internal(db, ctx->tree.rb_node,
-+				       f, private_data, &count,
-+				       false /* rw */);
-+	ctx->traverse_read--;
- 	if (ret != 0) {
- 		return -1;
- 	}
-@@ -461,18 +459,29 @@ static int db_rbt_traverse(struct db_context *db,
- 	return count;
- }
- 
--static int db_rbt_traverse_read(struct db_context *db,
--				int (*f)(struct db_record *db,
--					 void *private_data),
--				void *private_data)
-+static int db_rbt_traverse(struct db_context *db,
-+			   int (*f)(struct db_record *db,
-+				    void *private_data),
-+			   void *private_data)
- {
- 	struct db_rbt_ctx *ctx = talloc_get_type_abort(
- 		db->private_data, struct db_rbt_ctx);
- 	uint32_t count = 0;
-+	int ret;
-+
-+	if (ctx->traverse_write) {
-+		return -1;
-+	};
-+
-+	if (ctx->traverse_read > 0) {
-+		return db_rbt_traverse_read(db, f, private_data);
-+	}
- 
--	int ret = db_rbt_traverse_internal(db, ctx->tree.rb_node,
--					   f, private_data, &count,
--					   false /* rw */);
-+	ctx->traverse_write = true;
-+	ret = db_rbt_traverse_internal(db, ctx->tree.rb_node,
-+				       f, private_data, &count,
-+				       true /* rw */);
-+	ctx->traverse_write = false;
- 	if (ret != 0) {
- 		return -1;
- 	}
--- 
-1.9.1
-
-
-From a2e7deb101d4aee633015fdd22df6255ee03c00e Mon Sep 17 00:00:00 2001
-From: Stefan Metzmacher <metze@samba.org>
-Date: Wed, 25 Nov 2015 09:22:08 +0100
-Subject: [PATCH 3/4] dbwrap_rbt: fix modifying the db during traverse
-
-We delete and add of records rebalace the tree, but our
-traverse code doesn't handle that and skips records
-randomly.
-
-We maintain records in a linked list for now
-in addition to the rbtree and use that list during
-traverse.
-
-This add a bit overhead, but at least it works reliable.
-If someone finds a way to do reliable traverse with the
-rebalanced tree, we can replace this commit.
-
-BUG: https://bugzilla.samba.org/show_bug.cgi?id=11375
-BUG: https://bugzilla.samba.org/show_bug.cgi?id=11394
-
-Signed-off-by: Stefan Metzmacher <metze@samba.org>
-Reviewed-by: Volker Lendecke <vl@samba.org>
-(cherry picked from commit 0f46da08e160e6712e5282af14e1ec4012614fc7)
----
- lib/dbwrap/dbwrap_rbt.c | 104 ++++++++++++++++++++++++++----------------------
- 1 file changed, 57 insertions(+), 47 deletions(-)
-
-diff --git a/lib/dbwrap/dbwrap_rbt.c b/lib/dbwrap/dbwrap_rbt.c
-index d4cb40d..a9cc641 100644
---- a/lib/dbwrap/dbwrap_rbt.c
-+++ b/lib/dbwrap/dbwrap_rbt.c
-@@ -22,13 +22,15 @@
- #include "dbwrap/dbwrap_private.h"
- #include "dbwrap/dbwrap_rbt.h"
- #include "../lib/util/rbtree.h"
-+#include "../lib/util/dlinklist.h"
- 
- #define DBWRAP_RBT_ALIGN(_size_) (((_size_)+15)&~15)
- 
- struct db_rbt_ctx {
- 	struct rb_root tree;
-+	struct db_rbt_node *nodes;
- 	size_t traverse_read;
--	bool traverse_write;
-+	struct db_rbt_node **traverse_nextp;
- };
- 
- struct db_rbt_rec {
-@@ -40,6 +42,7 @@ struct db_rbt_rec {
- struct db_rbt_node {
- 	struct rb_node rb_node;
- 	size_t keysize, valuesize;
-+	struct db_rbt_node *prev, *next;
- };
- 
- /*
-@@ -123,7 +126,8 @@ static NTSTATUS db_rbt_store(struct db_record *rec, TDB_DATA data, int flag)
- 	struct db_rbt_node *node;
- 
- 	struct rb_node ** p;
--	struct rb_node * parent;
-+	struct rb_node *parent = NULL;
-+	struct db_rbt_node *parent_node = NULL;
- 
- 	ssize_t reclen;
- 	TDB_DATA this_key, this_val;
-@@ -165,12 +169,19 @@ static NTSTATUS db_rbt_store(struct db_record *rec, TDB_DATA data, int flag)
- 	}
- 
- 	if (rec_priv->node != NULL) {
-+		if (db_ctx->traverse_nextp != NULL) {
-+			if (*db_ctx->traverse_nextp == rec_priv->node) {
-+				*db_ctx->traverse_nextp = node;
-+			}
-+		}
-+
- 		/*
- 		 * We need to delete the key from the tree and start fresh,
- 		 * there's not enough space in the existing record
- 		 */
- 
- 		rb_erase(&rec_priv->node->rb_node, &db_ctx->tree);
-+		DLIST_REMOVE(db_ctx->nodes, rec_priv->node);
- 
- 		/*
- 		 * Keep the existing node around for a while: If the record
-@@ -197,10 +208,11 @@ static NTSTATUS db_rbt_store(struct db_record *rec, TDB_DATA data, int flag)
- 		TDB_DATA search_key, search_val;
- 		int res;
- 
--		parent = (*p);
--
- 		r = db_rbt2node(*p);
- 
-+		parent = (*p);
-+		parent_node = r;
-+
- 		db_rbt_parse_node(r, &search_key, &search_val);
- 
- 		res = db_rbt_compare(this_key, search_key);
-@@ -217,6 +229,7 @@ static NTSTATUS db_rbt_store(struct db_record *rec, TDB_DATA data, int flag)
- 	}
- 
- 	rb_link_node(&node->rb_node, parent, p);
-+	DLIST_ADD_AFTER(db_ctx->nodes, node, parent_node);
- 	rb_insert_color(&node->rb_node, &db_ctx->tree);
- 
- 	return NT_STATUS_OK;
-@@ -236,7 +249,14 @@ static NTSTATUS db_rbt_delete(struct db_record *rec)
- 		return NT_STATUS_OK;
- 	}
- 
-+	if (db_ctx->traverse_nextp != NULL) {
-+		if (*db_ctx->traverse_nextp == rec_priv->node) {
-+			*db_ctx->traverse_nextp = rec_priv->node->next;
-+		}
-+	}
-+
- 	rb_erase(&rec_priv->node->rb_node, &db_ctx->tree);
-+	DLIST_REMOVE(db_ctx->nodes, rec_priv->node);
- 	TALLOC_FREE(rec_priv->node);
- 
- 	return NT_STATUS_OK;
-@@ -383,56 +403,48 @@ static NTSTATUS db_rbt_parse_record(struct db_context *db, TDB_DATA key,
- }
- 
- static int db_rbt_traverse_internal(struct db_context *db,
--				    struct rb_node *n,
- 				    int (*f)(struct db_record *db,
- 					     void *private_data),
- 				    void *private_data, uint32_t* count,
- 				    bool rw)
- {
--	struct rb_node *rb_right;
--	struct rb_node *rb_left;
--	struct db_record rec;
--	struct db_rbt_rec rec_priv;
-+	struct db_rbt_ctx *ctx = talloc_get_type_abort(
-+		db->private_data, struct db_rbt_ctx);
-+	struct db_rbt_node *cur = NULL;
-+	struct db_rbt_node *next = NULL;
- 	int ret;
- 
--	if (n == NULL) {
--		return 0;
--	}
--
--	rb_left = n->rb_left;
--	rb_right = n->rb_right;
-+	for (cur = ctx->nodes; cur != NULL; cur = next) {
-+		struct db_record rec;
-+		struct db_rbt_rec rec_priv;
- 
--	ret = db_rbt_traverse_internal(db, rb_left, f, private_data, count, rw);
--	if (ret != 0) {
--		return ret;
--	}
-+		rec_priv.node = cur;
-+		next = rec_priv.node->next;
- 
--	rec_priv.node = db_rbt2node(n);
--	/* n might be altered by the callback function */
--	n = NULL;
-+		ZERO_STRUCT(rec);
-+		rec.db = db;
-+		rec.private_data = &rec_priv;
-+		rec.store = db_rbt_store;
-+		rec.delete_rec = db_rbt_delete;
-+		db_rbt_parse_node(rec_priv.node, &rec.key, &rec.value);
- 
--	ZERO_STRUCT(rec);
--	rec.db = db;
--	rec.private_data = &rec_priv;
--	rec.store = db_rbt_store;
--	rec.delete_rec = db_rbt_delete;
--	db_rbt_parse_node(rec_priv.node, &rec.key, &rec.value);
--
--	ret = f(&rec, private_data);
--	(*count) ++;
--	if (ret != 0) {
--		return ret;
--	}
--
--	if (rec_priv.node != NULL) {
--		/*
--		 * If the current record is still there
--		 * we should take the current rb_right.
--		 */
--		rb_right = rec_priv.node->rb_node.rb_right;
-+		if (rw) {
-+			ctx->traverse_nextp = &next;
-+		}
-+		ret = f(&rec, private_data);
-+		(*count) ++;
-+		if (rw) {
-+			ctx->traverse_nextp = NULL;
-+		}
-+		if (ret != 0) {
-+			return ret;
-+		}
-+		if (rec_priv.node != NULL) {
-+			next = rec_priv.node->next;
-+		}
- 	}
- 
--	return db_rbt_traverse_internal(db, rb_right, f, private_data, count, rw);
-+	return 0;
- }
- 
- static int db_rbt_traverse_read(struct db_context *db,
-@@ -446,7 +458,7 @@ static int db_rbt_traverse_read(struct db_context *db,
- 	int ret;
- 
- 	ctx->traverse_read++;
--	ret = db_rbt_traverse_internal(db, ctx->tree.rb_node,
-+	ret = db_rbt_traverse_internal(db,
- 				       f, private_data, &count,
- 				       false /* rw */);
- 	ctx->traverse_read--;
-@@ -469,7 +481,7 @@ static int db_rbt_traverse(struct db_context *db,
- 	uint32_t count = 0;
- 	int ret;
- 
--	if (ctx->traverse_write) {
-+	if (ctx->traverse_nextp != NULL) {
- 		return -1;
- 	};
- 
-@@ -477,11 +489,9 @@ static int db_rbt_traverse(struct db_context *db,
- 		return db_rbt_traverse_read(db, f, private_data);
- 	}
- 
--	ctx->traverse_write = true;
--	ret = db_rbt_traverse_internal(db, ctx->tree.rb_node,
-+	ret = db_rbt_traverse_internal(db,
- 				       f, private_data, &count,
- 				       true /* rw */);
--	ctx->traverse_write = false;
- 	if (ret != 0) {
- 		return -1;
- 	}
--- 
-1.9.1
-
-
-From 88752f5f769bae1edf6f395303b9daf9d13131f1 Mon Sep 17 00:00:00 2001
-From: Stefan Metzmacher <metze@samba.org>
-Date: Wed, 25 Nov 2015 00:13:17 +0100
-Subject: [PATCH 4/4] s3:torture: add traverse testing to LOCAL-RBTREE
-
-BUG: https://bugzilla.samba.org/show_bug.cgi?id=11375
-BUG: https://bugzilla.samba.org/show_bug.cgi?id=11394
-
-Signed-off-by: Stefan Metzmacher <metze@samba.org>
-Reviewed-by: Volker Lendecke <vl@samba.org>
-
-Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
-Autobuild-Date(master): Fri Nov 27 13:16:59 CET 2015 on sn-devel-104
-
-(cherry picked from commit bb9f13ab4165f150e01a88ddcc51605a7c176f5d)
----
- source3/torture/torture.c | 39 +++++++++++++++++++++++++++++++++++++++
- 1 file changed, 39 insertions(+)
-
-diff --git a/source3/torture/torture.c b/source3/torture/torture.c
-index 7bb776f..505920f 100644
---- a/source3/torture/torture.c
-+++ b/source3/torture/torture.c
-@@ -8348,11 +8348,29 @@ static bool rbt_testval(struct db_context *db, const char *key,
- 	return ret;
- }
- 
-+static int local_rbtree_traverse_read(struct db_record *rec, void *private_data)
-+{
-+	int *count2 = (int *)private_data;
-+	(*count2)++;
-+	return 0;
-+}
-+
-+static int local_rbtree_traverse_delete(struct db_record *rec, void *private_data)
-+{
-+	int *count2 = (int *)private_data;
-+	(*count2)++;
-+	dbwrap_record_delete(rec);
-+	return 0;
-+}
-+
- static bool run_local_rbtree(int dummy)
- {
- 	struct db_context *db;
- 	bool ret = false;
- 	int i;
-+	NTSTATUS status;
-+	int count = 0;
-+	int count2 = 0;
- 
- 	db = db_open_rbt(NULL);
- 
-@@ -8395,6 +8413,27 @@ static bool run_local_rbtree(int dummy)
- 	}
- 
- 	ret = true;
-+	count = 0; count2 = 0;
-+	status = dbwrap_traverse_read(db, local_rbtree_traverse_read,
-+				      &count2, &count);
-+	printf("%s: read1: %d %d, %s\n", __func__, count, count2, nt_errstr(status));
-+	if ((count != count2) || (count != 1000)) {
-+		ret = false;
-+	}
-+	count = 0; count2 = 0;
-+	status = dbwrap_traverse(db, local_rbtree_traverse_delete,
-+				 &count2, &count);
-+	printf("%s: delete: %d %d, %s\n", __func__, count, count2, nt_errstr(status));
-+	if ((count != count2) || (count != 1000)) {
-+		ret = false;
-+	}
-+	count = 0; count2 = 0;
-+	status = dbwrap_traverse_read(db, local_rbtree_traverse_read,
-+				      &count2, &count);
-+	printf("%s: read2: %d %d, %s\n", __func__, count, count2, nt_errstr(status));
-+	if ((count != count2) || (count != 0)) {
-+		ret = false;
-+	}
- 
-  done:
- 	TALLOC_FREE(db);
--- 
-1.9.1
-

Property changes on: head/net/samba43/files/extra-patch-security
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/net/samba43/files/extra-patch-progress
===================================================================
--- head/net/samba43/files/extra-patch-progress	(nonexistent)
+++ head/net/samba43/files/extra-patch-progress	(revision 413163)
@@ -0,0 +1,31 @@
+diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
+index c65fb08..13713fc 100644
+--- a/source3/passdb/pdb_ldap.c
++++ b/source3/passdb/pdb_ldap.c
+@@ -1005,7 +1005,7 @@ static bool init_sam_from_ldap(struct ldapsam_privates *ldap_state,
+ 				entry,
+ 				"gecos",
+ 				ctx);
+-		if (unix_pw.pw_gecos) {
++		if (unix_pw.pw_gecos==NULL) {
+ 			unix_pw.pw_gecos = fullname;
+ 		}
+ 		unix_pw.pw_dir = smbldap_talloc_single_attribute(
+@@ -1013,7 +1013,7 @@ static bool init_sam_from_ldap(struct ldapsam_privates *ldap_state,
+ 				entry,
+ 				"homeDirectory",
+ 				ctx);
+-		if (unix_pw.pw_dir) {
++		if (unix_pw.pw_dir==NULL) {
+ 			unix_pw.pw_dir = discard_const_p(char, "");
+ 		}
+ 		unix_pw.pw_shell = smbldap_talloc_single_attribute(
+@@ -1021,7 +1021,7 @@ static bool init_sam_from_ldap(struct ldapsam_privates *ldap_state,
+ 				entry,
+ 				"loginShell",
+ 				ctx);
+-		if (unix_pw.pw_shell) {
++		if (unix_pw.pw_shell==NULL) {
+ 			unix_pw.pw_shell = discard_const_p(char, "");
+ 		}
+ 

Property changes on: head/net/samba43/files/extra-patch-progress
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/net/samba43/pkg-plist
===================================================================
--- head/net/samba43/pkg-plist	(revision 413162)
+++ head/net/samba43/pkg-plist	(revision 413163)
@@ -1,892 +1,893 @@
-bin/async_connect_send_test
 bin/cifsdd
 bin/dbwrap_tool
 bin/eventlogadm
 bin/gentest
 bin/locktest
 bin/masktest
 bin/ndrdump
 bin/net
 bin/nmblookup
 bin/ntlm_auth
 bin/oLschema2ldif
 bin/pdbedit
 bin/profiles
 bin/regdiff
 bin/regpatch
 bin/regshell
 bin/regtree
 bin/rpcclient
 bin/samba-regedit
 %%AD_DC%%bin/samba-tool
 bin/sharesec
 bin/smbcacls
 bin/smbclient
 bin/smbcontrol
 bin/smbcquotas
 bin/smbget
 bin/smbpasswd
 bin/smbspool
 bin/smbstatus
 bin/smbta-util
 bin/smbtar
 bin/smbtorture
 bin/smbtree
 bin/testparm
 bin/wbinfo
 sbin/nmbd
 %%AD_DC%%sbin/samba
 %%AD_DC%%sbin/samba_dnsupdate
 %%AD_DC%%sbin/samba_kcc
 %%AD_DC%%sbin/samba_spnupdate
 %%AD_DC%%sbin/samba_upgradedns
 sbin/smbd
 sbin/winbindd
 include/samba4/charset.h
 include/samba4/core/doserr.h
 include/samba4/core/error.h
 include/samba4/core/ntstatus.h
 include/samba4/core/werror.h
 include/samba4/credentials.h
 include/samba4/dcerpc.h
 %%AD_DC%%include/samba4/dcerpc_server.h
 %%LDAP%%include/samba4/smb_ldap.h
 %%LDAP%%include/samba4/smbldap.h
 include/samba4/core/hresult.h
 include/samba4/dlinklist.h
 include/samba4/domain_credentials.h
 include/samba4/gen_ndr/atsvc.h
 include/samba4/gen_ndr/auth.h
 include/samba4/gen_ndr/dcerpc.h
 include/samba4/gen_ndr/drsblobs.h
 include/samba4/gen_ndr/drsuapi.h
 include/samba4/gen_ndr/epmapper.h
 include/samba4/gen_ndr/krb5pac.h
 include/samba4/gen_ndr/lsa.h
 include/samba4/gen_ndr/mgmt.h
 include/samba4/gen_ndr/misc.h
 include/samba4/gen_ndr/nbt.h
 include/samba4/gen_ndr/ndr_atsvc.h
 include/samba4/gen_ndr/ndr_atsvc_c.h
 include/samba4/gen_ndr/ndr_dcerpc.h
 include/samba4/gen_ndr/ndr_drsblobs.h
 include/samba4/gen_ndr/ndr_drsuapi.h
 include/samba4/gen_ndr/ndr_epmapper.h
 include/samba4/gen_ndr/ndr_epmapper_c.h
 include/samba4/gen_ndr/ndr_krb5pac.h
 include/samba4/gen_ndr/ndr_mgmt.h
 include/samba4/gen_ndr/ndr_mgmt_c.h
 include/samba4/gen_ndr/ndr_misc.h
 include/samba4/gen_ndr/ndr_nbt.h
 include/samba4/gen_ndr/ndr_samr.h
 include/samba4/gen_ndr/ndr_samr_c.h
 include/samba4/gen_ndr/ndr_svcctl.h
 include/samba4/gen_ndr/ndr_svcctl_c.h
 include/samba4/gen_ndr/netlogon.h
 include/samba4/gen_ndr/samr.h
 include/samba4/gen_ndr/security.h
 include/samba4/gen_ndr/server_id.h
 include/samba4/gen_ndr/svcctl.h
 include/samba4/gensec.h
 include/samba4/ldap-util.h
 include/samba4/ldap_errors.h
 include/samba4/ldap_message.h
 include/samba4/ldap_ndr.h
 include/samba4/ldb_wrap.h
 include/samba4/libsmbclient.h
 include/samba4/lookup_sid.h
 include/samba4/machine_sid.h
 include/samba4/ndr.h
 include/samba4/ndr/ndr_dcerpc.h
 include/samba4/ndr/ndr_drsblobs.h
 include/samba4/ndr/ndr_drsuapi.h
 include/samba4/ndr/ndr_nbt.h
 include/samba4/ndr/ndr_svcctl.h
 include/samba4/netapi.h
 include/samba4/param.h
 include/samba4/passdb.h
 include/samba4/policy.h
 include/samba4/read_smb.h
 include/samba4/registry.h
 include/samba4/roles.h
 include/samba4/rpc_common.h
 include/samba4/samba/session.h
 include/samba4/samba/version.h
 include/samba4/samba_util.h
 include/samba4/share.h
 include/samba4/smb2.h
 include/samba4/smb2_constants.h
 include/samba4/smb2_create_blob.h
 include/samba4/smb2_lease.h
 include/samba4/smb2_lease_struct.h
 include/samba4/smb2_signing.h
 include/samba4/smb_cli.h
 include/samba4/smb_cliraw.h
 include/samba4/smb_common.h
 include/samba4/smb_composite.h
 include/samba4/smb_constants.h
 include/samba4/smb_raw.h
 include/samba4/smb_raw_interfaces.h
 include/samba4/smb_raw_signing.h
 include/samba4/smb_raw_trans2.h
 include/samba4/smb_request.h
 include/samba4/smb_seal.h
 include/samba4/smb_signing.h
 include/samba4/smb_unix_ext.h
 include/samba4/smb_util.h
 include/samba4/smbconf.h
 include/samba4/tdr.h
 include/samba4/torture.h
 include/samba4/tsocket.h
 include/samba4/tsocket_internal.h
 include/samba4/tstream_smbXcli_np.h
 include/samba4/util/attr.h
 include/samba4/util/blocking.h
 include/samba4/util/byteorder.h
 include/samba4/util/data_blob.h
 include/samba4/util/debug.h
 include/samba4/util/fault.h
 include/samba4/util/genrand.h
 include/samba4/util/idtree.h
 include/samba4/util/idtree_random.h
 include/samba4/util/memory.h
 include/samba4/util/safe_string.h
 include/samba4/util/signal.h
 include/samba4/util/string_wrappers.h
 include/samba4/util/substitute.h
 include/samba4/util/talloc_stack.h
 include/samba4/util/tevent_ntstatus.h
 include/samba4/util/tevent_unix.h
 include/samba4/util/tevent_werror.h
 include/samba4/util/time.h
 include/samba4/util/xfile.h
 include/samba4/util_ldb.h
 include/samba4/wbclient.h
 @dir include/samba4/util
 @dir include/samba4/samba
 @dir include/samba4/ndr
 @dir include/samba4/gen_ndr
 @dir include/samba4/core
 @dir include/samba4
 lib/libdcerpc-atsvc.so
 lib/libdcerpc-atsvc.so.0
 lib/libdcerpc-binding.so
 lib/libdcerpc-binding.so.0
 lib/libdcerpc-samr.so
 lib/libdcerpc-samr.so.0
 %%AD_DC%%lib/libdcerpc-server.so
 %%AD_DC%%lib/libdcerpc-server.so.0
 lib/libdcerpc.so
 lib/libdcerpc.so.0
 lib/libgensec.so
 lib/libgensec.so.0
 lib/libndr-krb5pac.so
 lib/libndr-krb5pac.so.0
 lib/libndr-nbt.so
 lib/libndr-nbt.so.0
 lib/libndr-standard.so
 lib/libndr-standard.so.0
 lib/libndr.so
 lib/libndr.so.0
 lib/libnetapi.so
 lib/libnetapi.so.0
 lib/libregistry.so
 lib/libregistry.so.0
 lib/libsamba-credentials.so
 lib/libsamba-credentials.so.0
 lib/libsamba-hostconfig.so
 lib/libsamba-hostconfig.so.0
 lib/libsamba-passdb.so
 lib/libsamba-passdb.so.0
 lib/libsamba-policy.so
 lib/libsamba-policy.so.0
 lib/libsamba-util.so
 lib/libsamba-util.so.0
 lib/libsamdb.so
 lib/libsamdb.so.0
 lib/libsmbclient-raw.so
 lib/libsmbclient-raw.so.0
 lib/libsmbconf.so
 lib/libsmbconf.so.0
 %%LDAP%%lib/libsmbldap.so
 %%LDAP%%lib/libsmbldap.so.0
 lib/libtevent-util.so
 lib/libtevent-util.so.0
 lib/libtorture.so
 lib/libtorture.so.0
 lib/libwbclient.so
 lib/libwbclient.so.0
 lib/nss_winbind.so.1
 lib/nss_wins.so.1
 %%SMBPASS%%lib/pam_smbpass.so
 lib/pam_winbind.so
 lib/winbind_krb5_locator.so
 %%AD_DC%%lib/samba/libdlz-bind9-for-torture-samba4.so
 %%AD_DC%%lib/samba/libntvfs-samba4.so
 %%AD_DC%%lib/samba/libposix-eadb-samba4.so
 %%AD_DC%%lib/samba/libprocess-model-samba4.so
 %%AD_DC%%lib/samba/libservice-samba4.so
 lib/samba/libCHARSET3-samba4.so
 lib/samba/libHDB-SAMBA4-samba4.so
 lib/samba/libLIBWBCLIENT-OLD-samba4.so
 lib/samba/libMESSAGING-samba4.so
 lib/samba/libaddns-samba4.so
 lib/samba/libads-samba4.so
 lib/samba/libasn1-samba4.so.8
 lib/samba/libasn1util-samba4.so
 lib/samba/libauth-sam-reply-samba4.so
 lib/samba/libauth-samba4.so
 lib/samba/libauth-unix-token-samba4.so
 lib/samba/libauth4-samba4.so
 lib/samba/libauthkrb5-samba4.so
 lib/samba/libcli-cldap-samba4.so
 lib/samba/libcli-ldap-common-samba4.so
 lib/samba/libcli-ldap-samba4.so
 lib/samba/libcli-nbt-samba4.so
 lib/samba/libcli-smb-common-samba4.so
 lib/samba/libcli-spoolss-samba4.so
 lib/samba/libcliauth-samba4.so
 lib/samba/libcluster-samba4.so
 lib/samba/libcmdline-credentials-samba4.so
 lib/samba/libcom_err-samba4.so.0
 lib/samba/libdb-glue-samba4.so
 lib/samba/libdbwrap-samba4.so
 lib/samba/libdcerpc-samba-samba4.so
 lib/samba/libdcerpc-samba4.so
 %%AD_DC%%lib/samba/libdfs-server-ad-samba4.so
 %%AD_DC%%lib/samba/libdnsserver-common-samba4.so
 lib/samba/libdsdb-module-samba4.so
 lib/samba/liberrors-samba4.so
 lib/samba/libevents-samba4.so
 lib/samba/libflag-mapping-samba4.so
 lib/samba/libgenrand-samba4.so
 lib/samba/libgpo-samba4.so
 lib/samba/libgse-samba4.so
 lib/samba/libgssapi-samba4.so.2
 lib/samba/libhcrypto-samba4.so.5
 lib/samba/libhdb-samba4.so.11
 lib/samba/libheimbase-samba4.so.1
 lib/samba/libheimntlm-samba4.so.1
 lib/samba/libhttp-samba4.so
 lib/samba/libhx509-samba4.so.5
 lib/samba/libidmap-samba4.so
 lib/samba/libinterfaces-samba4.so
 lib/samba/libiov-buf-samba4.so
 lib/samba/libkdc-samba4.so.2
 lib/samba/libkrb5-samba4.so.26
 lib/samba/libkrb5samba-samba4.so
 lib/samba/libldbsamba-samba4.so
 lib/samba/liblibcli-lsa3-samba4.so
 lib/samba/liblibcli-netlogon3-samba4.so
 lib/samba/liblibsmb-samba4.so
 lib/samba/libmessages-dgm-samba4.so
 lib/samba/libmessages-util-samba4.so
 lib/samba/libmsghdr-samba4.so
 lib/samba/libmsrpc3-samba4.so
 lib/samba/libndr-samba-samba4.so
 lib/samba/libndr-samba4.so
 lib/samba/libnet-keytab-samba4.so
 lib/samba/libnetif-samba4.so
 lib/samba/libnon-posix-acls-samba4.so
 lib/samba/libnpa-tstream-samba4.so
 lib/samba/libnss-info-samba4.so
 lib/samba/libpac-samba4.so
 lib/samba/libpopt-samba3-samba4.so
 lib/samba/libprinting-migrate-samba4.so
 lib/samba/libreplace-samba4.so
 lib/samba/libroken-samba4.so.19
 lib/samba/libsamba-cluster-support-samba4.so
 lib/samba/libsamba-debug-samba4.so
 lib/samba/libsamba-modules-samba4.so
 lib/samba/libsamba-net-samba4.so
 lib/samba/libsamba-python-samba4.so
 lib/samba/libsamba-security-samba4.so
 lib/samba/libsamba-sockets-samba4.so
 lib/samba/libsamba3-util-samba4.so
 lib/samba/libsamdb-common-samba4.so
 lib/samba/libsecrets3-samba4.so
 lib/samba/libserver-id-db-samba4.so
 lib/samba/libserver-role-samba4.so
 lib/samba/libshares-samba4.so
 lib/samba/libsmb-transport-samba4.so
 lib/samba/libsmbd-base-samba4.so
 lib/samba/libsmbd-conn-samba4.so
 lib/samba/libsmbd-shim-samba4.so
 %%LDAP%%lib/samba/libsmbldaphelper-samba4.so
 lib/samba/libsmbpasswdparser-samba4.so
 lib/samba/libsmbregistry-samba4.so
 lib/samba/libsocket-blocking-samba4.so
 lib/samba/libsys-rw-samba4.so
 lib/samba/libtalloc-report-samba4.so
 lib/samba/libtdb-wrap-samba4.so
 lib/samba/libtime-basic-samba4.so
 lib/samba/libtrusts-util-samba4.so
 lib/samba/libutil-cmdline-samba4.so
 lib/samba/libutil-reg-samba4.so
 lib/samba/libutil-setid-samba4.so
 lib/samba/libutil-tdb-samba4.so
 lib/samba/libwinbind-client-samba4.so
 lib/samba/libwind-samba4.so.0
 lib/samba/libxattr-tdb-samba4.so
 %%DEVELOPER%%lib/samba/libnss_wrapper.so
 %%DEVELOPER%%lib/samba/libuid_wrapper.so
 %%DEVELOPER%%lib/samba/libsocket_wrapper.so
 %%AD_DC%%lib/shared-modules/bind9/dlz_bind9.so
 %%AD_DC%%lib/shared-modules/bind9/dlz_bind9_10.so
 %%AD_DC%%lib/shared-modules/bind9/dlz_bind9_9.so
 %%AD_DC%%lib/shared-modules/gensec/krb5.so
 %%AD_DC%%lib/shared-modules/ldb/acl.so
 %%AD_DC%%lib/shared-modules/ldb/aclread.so
 %%AD_DC%%lib/shared-modules/ldb/anr.so
 %%AD_DC%%lib/shared-modules/ldb/descriptor.so
 %%AD_DC%%lib/shared-modules/ldb/dirsync.so
 %%AD_DC%%lib/shared-modules/ldb/extended_dn_in.so
 %%AD_DC%%lib/shared-modules/ldb/extended_dn_out.so
 %%AD_DC%%lib/shared-modules/ldb/extended_dn_store.so
 %%AD_DC%%lib/shared-modules/ldb/instancetype.so
 %%AD_DC%%lib/shared-modules/ldb/lazy_commit.so
 %%AD_DC%%lib/shared-modules/ldb/linked_attributes.so
 %%AD_DC%%lib/shared-modules/ldb/local_password.so
 %%AD_DC%%lib/shared-modules/ldb/new_partition.so
 %%AD_DC%%lib/shared-modules/ldb/objectclass.so
 %%AD_DC%%lib/shared-modules/ldb/objectclass_attrs.so
 %%AD_DC%%lib/shared-modules/ldb/objectguid.so
 %%AD_DC%%lib/shared-modules/ldb/operational.so
 %%AD_DC%%lib/shared-modules/ldb/partition.so
 %%AD_DC%%lib/shared-modules/ldb/password_hash.so
 %%AD_DC%%lib/shared-modules/ldb/ranged_results.so
 %%AD_DC%%lib/shared-modules/ldb/repl_meta_data.so
 %%AD_DC%%lib/shared-modules/ldb/resolve_oids.so
 %%AD_DC%%lib/shared-modules/ldb/rootdse.so
 %%AD_DC%%lib/shared-modules/ldb/samba3sam.so
 %%AD_DC%%lib/shared-modules/ldb/samba3sid.so
 %%AD_DC%%lib/shared-modules/ldb/samba_dsdb.so
 %%AD_DC%%lib/shared-modules/ldb/samba_secrets.so
 %%AD_DC%%lib/shared-modules/ldb/samldb.so
 %%AD_DC%%lib/shared-modules/ldb/schema_data.so
 %%AD_DC%%lib/shared-modules/ldb/schema_load.so
 %%AD_DC%%lib/shared-modules/ldb/secrets_tdb_sync.so
 %%AD_DC%%lib/shared-modules/ldb/show_deleted.so
 %%AD_DC%%lib/shared-modules/ldb/simple_dn.so
 %%AD_DC%%lib/shared-modules/ldb/simple_ldap_map.so
 %%AD_DC%%lib/shared-modules/ldb/subtree_delete.so
 %%AD_DC%%lib/shared-modules/ldb/subtree_rename.so
 %%AD_DC%%lib/shared-modules/ldb/update_keytab.so
 %%AD_DC%%lib/shared-modules/ldb/wins_ldb.so
 %%AD_DC%%lib/shared-modules/process_model/standard.so
 %%AD_DC%%lib/shared-modules/service/cldap.so
 %%AD_DC%%lib/shared-modules/service/dcerpc.so
 %%AD_DC%%lib/shared-modules/service/dns.so
 %%AD_DC%%lib/shared-modules/service/dns_update.so
 %%AD_DC%%lib/shared-modules/service/drepl.so
 %%AD_DC%%lib/shared-modules/service/kcc.so
 %%AD_DC%%lib/shared-modules/service/kdc.so
 %%AD_DC%%lib/shared-modules/service/ldap.so
 %%AD_DC%%lib/shared-modules/service/nbtd.so
 %%AD_DC%%lib/shared-modules/service/ntp_signd.so
 %%AD_DC%%lib/shared-modules/service/s3fs.so
 %%AD_DC%%lib/shared-modules/service/smb.so
 %%AD_DC%%lib/shared-modules/service/web.so
 %%AD_DC%%lib/shared-modules/service/winbindd.so
 %%AD_DC%%lib/shared-modules/service/wrepl.so
 %%AD_DC%%lib/shared-modules/vfs/posix_eadb.so
 %%DEVELOPER%%lib/shared-modules/vfs/nfs4acl_xattr.so
 %%LDAP%%lib/shared-modules/idmap/rfc2307.so
 %%MODULE_AUTH_SAMBA4%%lib/shared-modules/auth/samba4.so
 %%MODULE_AUTH_SKEL%%lib/shared-modules/auth/skel.so
 %%MODULE_AUTH_UNIX%%lib/shared-modules/auth/unix.so
 %%MODULE_AUTH_WBC%%lib/shared-modules/auth/wbc.so
 %%MODULE_GPEXT_REGISTRY%%lib/shared-modules/gpext/registry.so
 %%MODULE_GPEXT_SCRIPTS%%lib/shared-modules/gpext/scripts.so
 %%MODULE_GPEXT_SECURITY%%lib/shared-modules/gpext/security.so
 %%MODULE_IDMAP_AD%%lib/shared-modules/idmap/ad.so
 %%MODULE_IDMAP_AD%%lib/shared-modules/nss_info/rfc2307.so
 %%MODULE_IDMAP_AD%%lib/shared-modules/nss_info/sfu.so
 %%MODULE_IDMAP_AD%%lib/shared-modules/nss_info/sfu20.so
 %%MODULE_IDMAP_LDAP%%lib/shared-modules/idmap/ldap.so
 %%MODULE_IDMAP_NSS%%lib/shared-modules/idmap/nss.so
 %%MODULE_IDMAP_PASSDB%%lib/shared-modules/idmap/passdb.so
 %%MODULE_IDMAP_TDB%%lib/shared-modules/idmap/tdb.so
 %%MODULE_NSS_INFO_TEMPLATE%%lib/shared-modules/nss_info/template.so
 %%MODULE_PDB_LDAP%%lib/shared-modules/pdb/ldap.so
 %%MODULE_PDB_SAMBA_DSDB%%lib/shared-modules/pdb/samba_dsdb.so
 %%MODULE_PDB_SMBPASSWD%%lib/shared-modules/pdb/smbpasswd.so
 %%MODULE_PDB_TDBSAM%%lib/shared-modules/pdb/tdbsam.so
 %%MODULE_PDB_TEST%%lib/shared-modules/pdb/test.so
 %%MODULE_PDB_WBC_SAM%%lib/shared-modules/pdb/wbc_sam.so
 %%MODULE_PERFCOUNT_TEST%%lib/shared-modules/perfcount/test.so
 %%MODULE_VFS_AIO_POSIX%%lib/shared-modules/vfs/aio_posix.so
 %%MODULE_VFS_AIO_PTHREAD%%lib/shared-modules/vfs/aio_pthread.so
 %%MODULE_VFS_CACHEPRIME%%lib/shared-modules/vfs/cacheprime.so
 %%MODULE_VFS_DFS_SAMBA4%%lib/shared-modules/vfs/dfs_samba4.so
 %%MODULE_VFS_FAKE_ACLS%%lib/shared-modules/vfs/fake_acls.so
 %%MODULE_VFS_SHADOW_COPY_TEST%%lib/shared-modules/vfs/shadow_copy_test.so
 %%MODULE_VFS_SKEL_OPAQUE%%lib/shared-modules/vfs/skel_opaque.so
 %%MODULE_VFS_SKEL_TRANSPARENT%%lib/shared-modules/vfs/skel_transparent.so
 lib/shared-modules/auth/script.so
 lib/shared-modules/idmap/autorid.so
 lib/shared-modules/idmap/hash.so
 lib/shared-modules/idmap/rid.so
 lib/shared-modules/idmap/script.so
 lib/shared-modules/idmap/tdb2.so
 %%AD_DC%%lib/shared-modules/ldb/dns_notify.so
 lib/shared-modules/ldb/ildap.so
 lib/shared-modules/ldb/ldbsamba_extensions.so
 %%AD_DC%%lib/shared-modules/ldb/tombstone_reanimate.so
 lib/shared-modules/nss_info/hash.so
 lib/shared-modules/vfs/acl_tdb.so
 lib/shared-modules/vfs/acl_xattr.so
 lib/shared-modules/vfs/aio_fork.so
 lib/shared-modules/vfs/audit.so
 lib/shared-modules/vfs/cap.so
 lib/shared-modules/vfs/catia.so
 lib/shared-modules/vfs/commit.so
 lib/shared-modules/vfs/crossrename.so
 lib/shared-modules/vfs/default_quota.so
 lib/shared-modules/vfs/dirsort.so
 lib/shared-modules/vfs/expand_msdfs.so
 lib/shared-modules/vfs/extd_audit.so
 lib/shared-modules/vfs/fake_perms.so
 lib/shared-modules/vfs/fruit.so
 lib/shared-modules/vfs/full_audit.so
 lib/shared-modules/vfs/linux_xfs_sgid.so
 lib/shared-modules/vfs/media_harmony.so
 lib/shared-modules/vfs/netatalk.so
 lib/shared-modules/vfs/preopen.so
 lib/shared-modules/vfs/readahead.so
 lib/shared-modules/vfs/readonly.so
 lib/shared-modules/vfs/recycle.so
 lib/shared-modules/vfs/scannedonly.so
 lib/shared-modules/vfs/shadow_copy.so
 lib/shared-modules/vfs/shadow_copy2.so
 lib/shared-modules/vfs/shell_snap.so
 lib/shared-modules/vfs/smb_traffic_analyzer.so
 lib/shared-modules/vfs/streams_depot.so
 lib/shared-modules/vfs/streams_xattr.so
 lib/shared-modules/vfs/syncops.so
 lib/shared-modules/vfs/time_audit.so
 lib/shared-modules/vfs/unityed_media.so
 lib/shared-modules/vfs/worm.so
 lib/shared-modules/vfs/xattr_tdb.so
 lib/shared-modules/vfs/zfsacl.so
 @dir lib/shared-modules/vfs
 %%AD_DC%%@dir lib/shared-modules/service
 %%AD_DC%%@dir lib/shared-modules/process_model
 @dir lib/shared-modules/perfcount
 @dir lib/shared-modules/pdb
 @dir lib/shared-modules/nss_info
 @dir lib/shared-modules/ldb
 @dir lib/shared-modules/idmap
 @dir lib/shared-modules/gpext
 @dir lib/shared-modules/gensec
 @dir lib/shared-modules/bind9
 @dir lib/shared-modules/auth
 @dir lib/shared-modules
 @dir lib/samba
 %%PKGCONFIGDIR%%/dcerpc.pc
 %%PKGCONFIGDIR%%/dcerpc_atsvc.pc
 %%PKGCONFIGDIR%%/dcerpc_samr.pc
 %%AD_DC%%%%PKGCONFIGDIR%%/dcerpc_server.pc
 %%PKGCONFIGDIR%%/gensec.pc
 %%PKGCONFIGDIR%%/ndr.pc
 %%PKGCONFIGDIR%%/ndr_krb5pac.pc
 %%PKGCONFIGDIR%%/ndr_nbt.pc
 %%PKGCONFIGDIR%%/ndr_standard.pc
 %%PKGCONFIGDIR%%/netapi.pc
 %%PKGCONFIGDIR%%/registry.pc
 %%PKGCONFIGDIR%%/samba-credentials.pc
 %%PKGCONFIGDIR%%/samba-hostconfig.pc
 %%PKGCONFIGDIR%%/samba-policy.pc
 %%PKGCONFIGDIR%%/samba-util.pc
 %%PKGCONFIGDIR%%/samdb.pc
 %%PKGCONFIGDIR%%/smbclient-raw.pc
 %%PKGCONFIGDIR%%/torture.pc
 %%PKGCONFIGDIR%%/wbclient.pc
 %%DEVELOPER%%%%PYTHON_SITELIBDIR%%/samba/socket_wrapper.so
 %%AD_DC%%%%PYTHON_SITELIBDIR%%/samba/dckeytab.so
 %%AD_DC%%%%PYTHON_SITELIBDIR%%/samba/posix_eadb.so
 %%AD_DC%%%%PYTHON_SITELIBDIR%%/samba/xattr_native.so
 %%AD_DC%%%%PYTHON_SITELIBDIR%%/samba/xattr_tdb.so
 %%PYTHON_SITELIBDIR%%/samba/__init__.py
 %%PYTHON_SITELIBDIR%%/samba/_glue.so
 %%PYTHON_SITELIBDIR%%/samba/_ldb.so
 %%PYTHON_SITELIBDIR%%/samba/auth.so
 %%PYTHON_SITELIBDIR%%/samba/com.so
 %%PYTHON_SITELIBDIR%%/samba/common.py
 %%PYTHON_SITELIBDIR%%/samba/credentials.so
 %%PYTHON_SITELIBDIR%%/samba/dbchecker.py
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/__init__.py
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/atsvc.so
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/auth.so
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/base.so
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/dcerpc.so
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/dfs.so
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/dns.so
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/dnsp.so
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/dnsserver.so
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/drsblobs.so
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/drsuapi.so
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/echo.so
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/epmapper.so
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/idmap.so
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/initshutdown.so
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/irpc.so
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/krb5pac.so
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/lsa.so
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/mgmt.so
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/misc.so
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/nbt.so
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/netlogon.so
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/samr.so
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/security.so
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/server_id.so
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/smb_acl.so
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/srvsvc.so
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/svcctl.so
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/unixinfo.so
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/winbind.so
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/winreg.so
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/wkssvc.so
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/xattr.so
 %%PYTHON_SITELIBDIR%%/samba/descriptor.py
 %%PYTHON_SITELIBDIR%%/samba/drs_utils.py
 %%PYTHON_SITELIBDIR%%/samba/dsdb.so
 %%PYTHON_SITELIBDIR%%/samba/gensec.so
 %%PYTHON_SITELIBDIR%%/samba/getopt.py
 %%PYTHON_SITELIBDIR%%/samba/hostconfig.py
 %%PYTHON_SITELIBDIR%%/samba/idmap.py
 %%PYTHON_SITELIBDIR%%/samba/join.py
 %%PYTHON_SITELIBDIR%%/samba/kcc/__init__.py
 %%PYTHON_SITELIBDIR%%/samba/kcc/debug.py
 %%PYTHON_SITELIBDIR%%/samba/kcc/graph.py
 %%PYTHON_SITELIBDIR%%/samba/kcc/graph_utils.py
 %%PYTHON_SITELIBDIR%%/samba/kcc/kcc_utils.py
 %%PYTHON_SITELIBDIR%%/samba/kcc/ldif_import_export.py
 %%PYTHON_SITELIBDIR%%/samba/messaging.so
 %%PYTHON_SITELIBDIR%%/samba/ms_display_specifiers.py
 %%PYTHON_SITELIBDIR%%/samba/ms_schema.py
 %%PYTHON_SITELIBDIR%%/samba/ndr.py
 %%PYTHON_SITELIBDIR%%/samba/net.so
 %%PYTHON_SITELIBDIR%%/samba/netbios.so
 %%PYTHON_SITELIBDIR%%/samba/netcmd/__init__.py
 %%PYTHON_SITELIBDIR%%/samba/netcmd/common.py
 %%PYTHON_SITELIBDIR%%/samba/netcmd/dbcheck.py
 %%PYTHON_SITELIBDIR%%/samba/netcmd/delegation.py
 %%PYTHON_SITELIBDIR%%/samba/netcmd/dns.py
 %%PYTHON_SITELIBDIR%%/samba/netcmd/domain.py
 %%PYTHON_SITELIBDIR%%/samba/netcmd/drs.py
 %%PYTHON_SITELIBDIR%%/samba/netcmd/dsacl.py
 %%PYTHON_SITELIBDIR%%/samba/netcmd/fsmo.py
 %%PYTHON_SITELIBDIR%%/samba/netcmd/gpo.py
 %%PYTHON_SITELIBDIR%%/samba/netcmd/group.py
 %%PYTHON_SITELIBDIR%%/samba/netcmd/ldapcmp.py
 %%PYTHON_SITELIBDIR%%/samba/netcmd/main.py
 %%PYTHON_SITELIBDIR%%/samba/netcmd/ntacl.py
 %%PYTHON_SITELIBDIR%%/samba/netcmd/processes.py
 %%PYTHON_SITELIBDIR%%/samba/netcmd/rodc.py
 %%PYTHON_SITELIBDIR%%/samba/netcmd/sites.py
 %%PYTHON_SITELIBDIR%%/samba/netcmd/spn.py
 %%PYTHON_SITELIBDIR%%/samba/netcmd/testparm.py
 %%PYTHON_SITELIBDIR%%/samba/netcmd/time.py
 %%PYTHON_SITELIBDIR%%/samba/netcmd/user.py
 %%PYTHON_SITELIBDIR%%/samba/netcmd/vampire.py
 %%PYTHON_SITELIBDIR%%/samba/ntacls.py
 %%PYTHON_SITELIBDIR%%/samba/param.so
 %%PYTHON_SITELIBDIR%%/samba/policy.so
 %%PYTHON_SITELIBDIR%%/samba/provision/__init__.py
 %%PYTHON_SITELIBDIR%%/samba/provision/backend.py
 %%PYTHON_SITELIBDIR%%/samba/provision/common.py
 %%PYTHON_SITELIBDIR%%/samba/provision/sambadns.py
 %%PYTHON_SITELIBDIR%%/samba/registry.so
 %%PYTHON_SITELIBDIR%%/samba/samba3/__init__.py
 %%PYTHON_SITELIBDIR%%/samba/samba3/libsmb_samba_internal.so
 %%PYTHON_SITELIBDIR%%/samba/samba3/param.so
 %%PYTHON_SITELIBDIR%%/samba/samba3/passdb.so
 %%PYTHON_SITELIBDIR%%/samba/samba3/smbd.so
 %%PYTHON_SITELIBDIR%%/samba/samdb.py
 %%PYTHON_SITELIBDIR%%/samba/schema.py
 %%PYTHON_SITELIBDIR%%/samba/sd_utils.py
 %%PYTHON_SITELIBDIR%%/samba/security.so
 %%PYTHON_SITELIBDIR%%/samba/sites.py
 %%PYTHON_SITELIBDIR%%/samba/smb.so
 %%PYTHON_SITELIBDIR%%/samba/subunit/__init__.py
 %%PYTHON_SITELIBDIR%%/samba/subunit/run.py
 %%PYTHON_SITELIBDIR%%/samba/tdb_util.py
 %%PYTHON_SITELIBDIR%%/samba/tests/__init__.py
 %%PYTHON_SITELIBDIR%%/samba/tests/auth.py
 %%PYTHON_SITELIBDIR%%/samba/tests/blackbox/__init__.py
 %%PYTHON_SITELIBDIR%%/samba/tests/blackbox/ndrdump.py
 %%PYTHON_SITELIBDIR%%/samba/tests/blackbox/samba_tool_drs.py
 %%PYTHON_SITELIBDIR%%/samba/tests/common.py
 %%PYTHON_SITELIBDIR%%/samba/tests/core.py
 %%PYTHON_SITELIBDIR%%/samba/tests/credentials.py
 %%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/__init__.py
 %%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/bare.py
 %%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/dnsserver.py
 %%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/integer.py
 %%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/misc.py
+%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/raw_protocol.py
 %%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/registry.py
 %%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/rpc_talloc.py
 %%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/rpcecho.py
 %%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/sam.py
 %%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/srvsvc.py
 %%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/testrpc.py
 %%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/unix.py
 %%PYTHON_SITELIBDIR%%/samba/tests/dns.py
 %%PYTHON_SITELIBDIR%%/samba/tests/docs.py
 %%PYTHON_SITELIBDIR%%/samba/tests/dsdb.py
 %%PYTHON_SITELIBDIR%%/samba/tests/gensec.py
-%%PYTHON_SITELIBDIR%%/samba/tests/getopt.py
+%%PYTHON_SITELIBDIR%%/samba/tests/get_opt.py
 %%PYTHON_SITELIBDIR%%/samba/tests/hostconfig.py
 %%PYTHON_SITELIBDIR%%/samba/tests/kcc/__init__.py
 %%PYTHON_SITELIBDIR%%/samba/tests/kcc/graph.py
 %%PYTHON_SITELIBDIR%%/samba/tests/kcc/graph_utils.py
 %%PYTHON_SITELIBDIR%%/samba/tests/kcc/kcc_utils.py
 %%PYTHON_SITELIBDIR%%/samba/tests/kcc/ldif_import_export.py
 %%PYTHON_SITELIBDIR%%/samba/tests/libsmb_samba_internal.py
 %%PYTHON_SITELIBDIR%%/samba/tests/messaging.py
 %%PYTHON_SITELIBDIR%%/samba/tests/netcmd.py
 %%PYTHON_SITELIBDIR%%/samba/tests/ntacls.py
 %%PYTHON_SITELIBDIR%%/samba/tests/param.py
 %%PYTHON_SITELIBDIR%%/samba/tests/policy.py
 %%PYTHON_SITELIBDIR%%/samba/tests/posixacl.py
 %%PYTHON_SITELIBDIR%%/samba/tests/provision.py
 %%PYTHON_SITELIBDIR%%/samba/tests/registry.py
 %%PYTHON_SITELIBDIR%%/samba/tests/samba3.py
 %%PYTHON_SITELIBDIR%%/samba/tests/samba3sam.py
 %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/__init__.py
 %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/base.py
 %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/gpo.py
 %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/group.py
 %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/ntacl.py
 %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/processes.py
 %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/timecmd.py
 %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/user.py
 %%PYTHON_SITELIBDIR%%/samba/tests/samdb.py
 %%PYTHON_SITELIBDIR%%/samba/tests/security.py
 %%PYTHON_SITELIBDIR%%/samba/tests/source.py
 %%PYTHON_SITELIBDIR%%/samba/tests/strings.py
 %%PYTHON_SITELIBDIR%%/samba/tests/subunitrun.py
 %%PYTHON_SITELIBDIR%%/samba/tests/unicodenames.py
 %%PYTHON_SITELIBDIR%%/samba/tests/upgrade.py
 %%PYTHON_SITELIBDIR%%/samba/tests/upgradeprovision.py
 %%PYTHON_SITELIBDIR%%/samba/tests/upgradeprovisionneeddc.py
 %%PYTHON_SITELIBDIR%%/samba/tests/xattr.py
 %%PYTHON_SITELIBDIR%%/samba/third_party/__init__.py
 %%PYTHON_SITELIBDIR%%/samba/third_party/iso8601/__init__.py
 %%PYTHON_SITELIBDIR%%/samba/third_party/iso8601/iso8601.py
 %%PYTHON_SITELIBDIR%%/samba/third_party/iso8601/test_iso8601.py
 %%PYTHON_SITELIBDIR%%/samba/upgrade.py
 %%PYTHON_SITELIBDIR%%/samba/upgradehelpers.py
 %%PYTHON_SITELIBDIR%%/samba/web_server/__init__.py
 %%PYTHON_SITELIBDIR%%/samba/xattr.py
 @unexec find %D/%%PYTHON_SITELIBDIR%%/samba -name '*.py[co]' -delete >/dev/null 2>&1
 @dir %%PYTHON_SITELIBDIR%%/samba/web_server
 @dir %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool
 @dir %%PYTHON_SITELIBDIR%%/samba/tests/dcerpc
 @dir %%PYTHON_SITELIBDIR%%/samba/tests/blackbox
 @dir %%PYTHON_SITELIBDIR%%/samba/tests
 @dir %%PYTHON_SITELIBDIR%%/samba/samba3
 @dir %%PYTHON_SITELIBDIR%%/samba/provision
 @dir %%PYTHON_SITELIBDIR%%/samba/netcmd
 @dir %%PYTHON_SITELIBDIR%%/samba/dcerpc
 @dir %%PYTHON_SITELIBDIR%%/samba
 %%AD_DC%%%%DATADIR%%/setup/DB_CONFIG
 %%AD_DC%%%%DATADIR%%/setup/ad-schema/MS-AD_Schema_2K8_Attributes.txt
 %%AD_DC%%%%DATADIR%%/setup/ad-schema/MS-AD_Schema_2K8_Classes.txt
 %%AD_DC%%%%DATADIR%%/setup/ad-schema/MS-AD_Schema_2K8_R2_Attributes.txt
 %%AD_DC%%%%DATADIR%%/setup/ad-schema/MS-AD_Schema_2K8_R2_Classes.txt
 %%AD_DC%%%%DATADIR%%/setup/ad-schema/licence.txt
 %%AD_DC%%%%DATADIR%%/setup/aggregate_schema.ldif
 %%AD_DC%%%%DATADIR%%/setup/cn=samba.ldif
 %%AD_DC%%%%DATADIR%%/setup/display-specifiers/DisplaySpecifiers-Win2k0.txt
 %%AD_DC%%%%DATADIR%%/setup/display-specifiers/DisplaySpecifiers-Win2k3.txt
 %%AD_DC%%%%DATADIR%%/setup/display-specifiers/DisplaySpecifiers-Win2k3R2.txt
 %%AD_DC%%%%DATADIR%%/setup/display-specifiers/DisplaySpecifiers-Win2k8.txt
 %%AD_DC%%%%DATADIR%%/setup/display-specifiers/DisplaySpecifiers-Win2k8R2.txt
 %%AD_DC%%%%DATADIR%%/setup/dns_update_list
 %%AD_DC%%%%DATADIR%%/setup/fedora-ds-init.ldif
 %%AD_DC%%%%DATADIR%%/setup/fedorads-dna.ldif
 %%AD_DC%%%%DATADIR%%/setup/fedorads-index.ldif
 %%AD_DC%%%%DATADIR%%/setup/fedorads-linked-attributes.ldif
 %%AD_DC%%%%DATADIR%%/setup/fedorads-pam.ldif
 %%AD_DC%%%%DATADIR%%/setup/fedorads-partitions.ldif
 %%AD_DC%%%%DATADIR%%/setup/fedorads-refint-add.ldif
 %%AD_DC%%%%DATADIR%%/setup/fedorads-refint-delete.ldif
 %%AD_DC%%%%DATADIR%%/setup/fedorads-samba.ldif
 %%AD_DC%%%%DATADIR%%/setup/fedorads-sasl.ldif
 %%AD_DC%%%%DATADIR%%/setup/fedorads.inf
 %%AD_DC%%%%DATADIR%%/setup/idmap_init.ldif
 %%AD_DC%%%%DATADIR%%/setup/krb5.conf
 %%AD_DC%%%%DATADIR%%/setup/memberof.conf
 %%AD_DC%%%%DATADIR%%/setup/mmr_serverids.conf
 %%AD_DC%%%%DATADIR%%/setup/mmr_syncrepl.conf
 %%AD_DC%%%%DATADIR%%/setup/modules.conf
 %%AD_DC%%%%DATADIR%%/setup/named.conf
 %%AD_DC%%%%DATADIR%%/setup/named.conf.dlz
 %%AD_DC%%%%DATADIR%%/setup/named.conf.update
 %%AD_DC%%%%DATADIR%%/setup/named.txt
 %%AD_DC%%%%DATADIR%%/setup/olc_mmr.conf
 %%AD_DC%%%%DATADIR%%/setup/olc_seed.ldif
 %%AD_DC%%%%DATADIR%%/setup/olc_serverid.conf
 %%AD_DC%%%%DATADIR%%/setup/olc_syncrepl.conf
 %%AD_DC%%%%DATADIR%%/setup/olc_syncrepl_seed.conf
 %%AD_DC%%%%DATADIR%%/setup/prefixMap.txt
 %%AD_DC%%%%DATADIR%%/setup/provision.ldif
 %%AD_DC%%%%DATADIR%%/setup/provision.reg
 %%AD_DC%%%%DATADIR%%/setup/provision.zone
 %%AD_DC%%%%DATADIR%%/setup/provision_basedn.ldif
 %%AD_DC%%%%DATADIR%%/setup/provision_basedn_modify.ldif
 %%AD_DC%%%%DATADIR%%/setup/provision_basedn_options.ldif
 %%AD_DC%%%%DATADIR%%/setup/provision_basedn_references.ldif
 %%AD_DC%%%%DATADIR%%/setup/provision_computers_add.ldif
 %%AD_DC%%%%DATADIR%%/setup/provision_computers_modify.ldif
 %%AD_DC%%%%DATADIR%%/setup/provision_configuration.ldif
 %%AD_DC%%%%DATADIR%%/setup/provision_configuration_basedn.ldif
 %%AD_DC%%%%DATADIR%%/setup/provision_configuration_modify.ldif
 %%AD_DC%%%%DATADIR%%/setup/provision_configuration_references.ldif
 %%AD_DC%%%%DATADIR%%/setup/provision_dns_accounts_add.ldif
 %%AD_DC%%%%DATADIR%%/setup/provision_dns_add_samba.ldif
 %%AD_DC%%%%DATADIR%%/setup/provision_dnszones_add.ldif
 %%AD_DC%%%%DATADIR%%/setup/provision_dnszones_modify.ldif
 %%AD_DC%%%%DATADIR%%/setup/provision_dnszones_partitions.ldif
 %%AD_DC%%%%DATADIR%%/setup/provision_group_policy.ldif
 %%AD_DC%%%%DATADIR%%/setup/provision_init.ldif
 %%AD_DC%%%%DATADIR%%/setup/provision_partitions.ldif
 %%AD_DC%%%%DATADIR%%/setup/provision_privilege.ldif
 %%AD_DC%%%%DATADIR%%/setup/provision_rootdse_add.ldif
 %%AD_DC%%%%DATADIR%%/setup/provision_rootdse_modify.ldif
 %%AD_DC%%%%DATADIR%%/setup/provision_schema_basedn.ldif
 %%AD_DC%%%%DATADIR%%/setup/provision_schema_basedn_modify.ldif
 %%AD_DC%%%%DATADIR%%/setup/provision_self_join.ldif
 %%AD_DC%%%%DATADIR%%/setup/provision_self_join_config.ldif
 %%AD_DC%%%%DATADIR%%/setup/provision_self_join_modify.ldif
 %%AD_DC%%%%DATADIR%%/setup/provision_self_join_modify_config.ldif
 %%AD_DC%%%%DATADIR%%/setup/provision_users.ldif
 %%AD_DC%%%%DATADIR%%/setup/provision_users_add.ldif
 %%AD_DC%%%%DATADIR%%/setup/provision_users_modify.ldif
 %%AD_DC%%%%DATADIR%%/setup/provision_well_known_sec_princ.ldif
 %%AD_DC%%%%DATADIR%%/setup/refint.conf
 %%AD_DC%%%%DATADIR%%/setup/schema-map-fedora-ds-1.0
 %%AD_DC%%%%DATADIR%%/setup/schema-map-openldap-2.3
 %%AD_DC%%%%DATADIR%%/setup/schema_samba4.ldif
 %%AD_DC%%%%DATADIR%%/setup/secrets.ldif
 %%AD_DC%%%%DATADIR%%/setup/secrets_dns.ldif
 %%AD_DC%%%%DATADIR%%/setup/secrets_init.ldif
 %%AD_DC%%%%DATADIR%%/setup/secrets_sasl_ldap.ldif
 %%AD_DC%%%%DATADIR%%/setup/secrets_simple_ldap.ldif
 %%AD_DC%%%%DATADIR%%/setup/share.ldif
 %%AD_DC%%%%DATADIR%%/setup/slapd.conf
 %%AD_DC%%%%DATADIR%%/setup/spn_update_list
 %%AD_DC%%%%DATADIR%%/setup/ypServ30.ldif
 %%AD_DC%%@dir %%DATADIR%%/setup/display-specifiers
 %%AD_DC%%@dir %%DATADIR%%/setup/ad-schema
 %%AD_DC%%@dir %%DATADIR%%/setup
 %%AD_DC%%@dir %%DATADIR%%
 man/man1/dbwrap_tool.1.gz
 man/man1/findsmb.1.gz
 man/man1/gentest.1.gz
 man/man1/locktest.1.gz
 man/man1/log2pcap.1.gz
 man/man1/masktest.1.gz
 man/man1/ndrdump.1.gz
 man/man1/nmblookup.1.gz
 man/man1/ntlm_auth.1.gz
 man/man1/oLschema2ldif.1.gz
 man/man1/profiles.1.gz
 man/man1/regdiff.1.gz
 man/man1/regpatch.1.gz
 man/man1/regshell.1.gz
 man/man1/regtree.1.gz
 man/man1/rpcclient.1.gz
 man/man1/sharesec.1.gz
 man/man1/smbcacls.1.gz
 man/man1/smbclient.1.gz
 man/man1/smbcontrol.1.gz
 man/man1/smbcquotas.1.gz
 man/man1/smbget.1.gz
 man/man1/smbstatus.1.gz
 man/man1/smbtar.1.gz
 man/man1/smbtorture.1.gz
 man/man1/smbtree.1.gz
 man/man1/testparm.1.gz
 man/man1/vfstest.1.gz
 man/man1/wbinfo.1.gz
 man/man5/lmhosts.5.gz
 man/man5/pam_winbind.conf.5.gz
 man/man5/smb.conf.5.gz
 man/man5/smb4.conf.5.gz
 man/man5/smbgetrc.5.gz
 man/man5/smbpasswd.5.gz
 man/man7/samba.7.gz
 man/man7/winbind_krb5_locator.7.gz
 man/man8/eventlogadm.8.gz
 man/man8/idmap_ad.8.gz
 man/man8/idmap_autorid.8.gz
 man/man8/idmap_hash.8.gz
 man/man8/idmap_ldap.8.gz
 man/man8/idmap_nss.8.gz
 man/man8/idmap_rfc2307.8.gz
 man/man8/idmap_rid.8.gz
 man/man8/idmap_tdb.8.gz
 man/man8/idmap_tdb2.8.gz
 man/man8/net.8.gz
 man/man8/nmbd.8.gz
 man/man8/pam_winbind.8.gz
 man/man8/pdbedit.8.gz
 man/man8/samba-regedit.8.gz
 man/man8/samba-tool.8.gz
 man/man8/samba.8.gz
 man/man8/smbd.8.gz
 man/man8/smbpasswd.8.gz
-man/man8/smbspool.8.gz
 man/man8/smbta-util.8.gz
+man/man8/smbspool_krb5_wrapper.8.gz
+man/man8/smbspool.8.gz
 man/man8/vfs_acl_tdb.8.gz
 man/man8/vfs_acl_xattr.8.gz
 man/man8/vfs_aio_fork.8.gz
 man/man8/vfs_aio_linux.8.gz
 man/man8/vfs_aio_pthread.8.gz
 man/man8/vfs_audit.8.gz
 man/man8/vfs_btrfs.8.gz
 man/man8/vfs_cacheprime.8.gz
 man/man8/vfs_cap.8.gz
 man/man8/vfs_catia.8.gz
 man/man8/vfs_ceph.8.gz
 man/man8/vfs_commit.8.gz
 man/man8/vfs_crossrename.8.gz
 man/man8/vfs_default_quota.8.gz
 man/man8/vfs_dirsort.8.gz
 man/man8/vfs_extd_audit.8.gz
 man/man8/vfs_fake_perms.8.gz
 man/man8/vfs_fileid.8.gz
 man/man8/vfs_fruit.8.gz
 man/man8/vfs_full_audit.8.gz
 man/man8/vfs_glusterfs.8.gz
 man/man8/vfs_gpfs.8.gz
 man/man8/vfs_linux_xfs_sgid.8.gz
 man/man8/vfs_media_harmony.8.gz
 man/man8/vfs_netatalk.8.gz
 man/man8/vfs_prealloc.8.gz
 man/man8/vfs_preopen.8.gz
 man/man8/vfs_readahead.8.gz
 man/man8/vfs_readonly.8.gz
 man/man8/vfs_recycle.8.gz
 man/man8/vfs_scannedonly.8.gz
 man/man8/vfs_shadow_copy.8.gz
 man/man8/vfs_shadow_copy2.8.gz
 man/man8/vfs_shell_snap.8.gz
 man/man8/vfs_smb_traffic_analyzer.8.gz
 man/man8/vfs_snapper.8.gz
 man/man8/vfs_streams_depot.8.gz
 man/man8/vfs_streams_xattr.8.gz
 man/man8/vfs_syncops.8.gz
 man/man8/vfs_time_audit.8.gz
 man/man8/vfs_tsmsm.8.gz
 man/man8/vfs_unityed_media.8.gz
 man/man8/vfs_worm.8.gz
 man/man8/vfs_xattr_tdb.8.gz
 man/man8/winbindd.8.gz
 @dir /var/run/samba4
 @dir /var/log/samba4
 @dir /var/db/samba4/private
 @dir /var/db/samba4