New 4.0.3 revision of the net/samba4 port. Now we have our own AD!

46 files changed, 3992 insertions, 263 deletions

diff --git a/net/Makefile b/net/Makefile
index e3271a2c1bd9..0395519369bd 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -1048,6 +1048,7 @@
     SUBDIR += samba-smbclient
     SUBDIR += samba34
     SUBDIR += samba36
+    SUBDIR += samba4
     SUBDIR += samba4-devel
     SUBDIR += samba4wins
     SUBDIR += samplicator
diff --git a/net/samba4/Makefile b/net/samba4/Makefile
index bbcbd38704fc..13d4a90ddb2b 100644
--- a/net/samba4/Makefile
+++ b/net/samba4/Makefile
@@ -3,190 +3,520 @@
 
 PORTNAME?=		${SAMBA4_PORTNAME}
 PORTVERSION?=		${SAMBA4_VERSION}
-PORTREVISION?=		5
+PORTREVISION?=		0
 CATEGORIES?=		net
 MASTER_SITES=		${MASTER_SITE_SAMBA}
-MASTER_SITE_SUBDIR=	samba/samba4
-PKGNAMESUFFIX?=		-devel
-DISTNAME=		${SAMBA_DISTNAME}
+MASTER_SITE_SUBDIR=	samba/stable samba/rc
+DISTNAME=		${SAMBA4_DISTNAME}
 
 MAINTAINER?=		timur@FreeBSD.org
-COMMENT?=		A free SMB and CIFS client and server for UNIX
+COMMENT?=		A free SMB/CIFS and AD/DC server and client for UNIX
 
-CONFLICTS?=		ldb-1.*
+LICENSE=		GPLv3
 
-SAMBA4_PORTNAME=	samba4
-SAMBA4_VERSION=		4.0.0.a11
-SAMBA_DISTNAME=		${SAMBA4_PORTNAME:S|4$||}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|}
-OPTIONSFILE=		${PORT_DBDIR}/${SAMBA4_PORTNAME}/options
+CONFLICTS?=		*samba3[2-6]-3.*
 
-LATEST_LINK?=		${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
-EXAMPLESDIR=		${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
-PATCH_WRKSRC=		${WRKDIR}/${DISTNAME}
-WRKSRC?=		${WRKDIR}/${DISTNAME}/source4
-IPATHS=			-I${WRKDIR}/${DISTNAME}/lib/replace -I${WRKDIR}/${DISTNAME}/source4
-AUTOHEADER_ARGS=	${IPATHS}
-AUTOCONF_ARGS=		${IPATHS}
+MAKE_JOBS_SAFE=		yes
+
+SAMBA4_BASENAME=	samba
+SAMBA4_PORTNAME=	${SAMBA4_BASENAME}4
+SAMBA4_VERSION=		4.0.3
+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)
-USE_PERL5=		yes
-USE_PYTHON=		yes
-USE_GMAKE=		yes
-USE_ICONV=		yes
-GNU_CONFIGURE=		yes
-USE_PKGCONFIG=		build
-USE_LDCONFIG=		${SAMBA_LIBDIR}
-USE_AUTOTOOLS=		autoconf autoheader
-# Flags
-CPPFLAGS+=		-I${LOCALBASE}/include
-LDFLAGS+=		-L${LOCALBASE}/lib
 # Directories
-VARDIR=			/var
-SAMBA_LOGDIR=		${VARDIR}/log/${PORTNAME}
-SAMBA_RUNDIR=		${VARDIR}/run/${PORTNAME}
-SAMBA_LOCKDIR=		${VARDIR}/db/${PORTNAME}
-SAMBA_PRIVATEDIR?=	${SAMBA_LOCKDIR}/private
-SAMBA_CONFDIR?=		${PREFIX}/etc
-SAMBA_LIBDIR=		${PREFIX}/lib/${PORTNAME}
-SAMBA_INCLUDEDIR=	${PREFIX}/include/${PORTNAME}
-RC_DIR=			${PREFIX}/etc/rc.d
-SAMBA_CONFIG=		smb4.conf
-
-CONFIGURE_ARGS+=	--exec-prefix="${PREFIX}" \
-			--sysconfdir="${SAMBA_CONFDIR}" \
-			--includedir="${SAMBA_INCLUDEDIR}" \
+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+=	--prefix="${PREFIX}" \
+			--exec-prefix="${PREFIX}" \
+			--mandir="${MANPREFIX}/man" \
+			--sysconfdir="${SAMBA4_CONFDIR}" \
+			--includedir="${SAMBA4_INCLUDEDIR}" \
 			--datadir="${DATADIR}" \
-			--libdir="${SAMBA_LIBDIR}" \
-			--with-modulesdir="${SAMBA_LIBDIR}/modules" \
+			--libdir="${SAMBA4_LIBDIR}" \
+			--with-pammodulesdir="${SAMBA4_LIBDIR}" \
+			--with-privatelibdir="${SAMBA4_LIBDIR}/samba" \
+			--with-modulesdir="${SAMBA4_MODULEDIR}" \
+			--with-pkgconfigdir="${PKGCONFIGDIR}" \
 			--localstatedir="${VARDIR}" \
-			--with-piddir="${SAMBA_RUNDIR}" \
-			--with-ncalrpcdir="${SAMBA_RUNDIR}/ncalrpc" \
-			--with-winbindd-socket-dir="${SAMBA_RUNDIR}/winbindd" \
-			--with-winbindd-privileged-socket-dir="${SAMBA_RUNDIR}/winbindd_privileged" \
-			--with-ntp-signd-socket-dir="${SAMBA_RUNDIR}/ntp_signd" \
-			--with-lockdir="${SAMBA_LOCKDIR}" \
-			--with-privatedir="${SAMBA_PRIVATEDIR}" \
-			--with-logfilebase="${SAMBA_LOGDIR}"
-# Default options
-CONFIGURE_ARGS+=	\
-			--disable-external-heimdal \
-			--with-setproctitle \
-			--with-readline=/usr \
-			--with-libiconv=${LOCALBASE}
+			--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}"
+
+WAF_TOOL=		buildtools/bin/waf
+HAS_CONFIGURE=		yes
+CONFIGURE_SCRIPT=	${WAF_TOOL} configure
+CONFIGURE_LOG=		bin/config.log
+# Flags
+CONFIGURE_ENV+=		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+			PTHREAD_LDFLAGS="${PTHREAD_LIBS}"
+
+USE_PYTHON_BUILD=	-2.7
+USE_PERL5_BUILD=	yes
+
+USE_PYTHON=		yes
+USE_ICONV=		yes
+USE_GETTEXT=		yes
+USE_PKGCONFIG=		build
+USE_LDCONFIG=		${SAMBA4_LIBDIR}
+
+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+=		popt:${PORTSDIR}/devel/popt
+# XXX: We should try to switch to libunwind, libexecinfo is gcc specific(?)
 # backtrace
-LIB_DEPENDS+=		execinfo.1:${PORTSDIR}/devel/libexecinfo
-# BLKID
-LIB_DEPENDS+=		blkid.1:${PORTSDIR}/misc/e2fsprogs-libblkid
+LIB_DEPENDS+=		execinfo:${PORTSDIR}/devel/libexecinfo
+# inotify
+LIB_DEPENDS+=		inotify:${PORTSDIR}/devel/libinotify
 # SASL
-LIB_DEPENDS=		sasl2:${PORTSDIR}/security/cyrus-sasl2
-# tdb
-LIB_DEPENDS+=		tdb.1:${PORTSDIR}/databases/tdb
-CONFIGURE_ARGS+=	--enable-external-libtdb
+LIB_DEPENDS+=		sasl2:${PORTSDIR}/security/cyrus-sasl2
+# GNUTLS
+LIB_DEPENDS+=		gcrypt:${PORTSDIR}/security/libgcrypt
+LIB_DEPENDS+=		gnutls:${PORTSDIR}/security/gnutls
+# NFS4 ACL glue
+LIB_DEPENDS+=		sunacl:${PORTSDIR}/sysutils/libsunacl
+# External Samba dependencies
+# IDL compiler
+BUILD_DEPENDS+=		p5-Parse-Pidl>=${SAMBA4_VERSION}:${PORTSDIR}/devel/p5-Parse-Pidl
 # talloc
-LIB_DEPENDS+=		talloc.2:${PORTSDIR}/devel/talloc
-CONFIGURE_ARGS+=	--enable-external-libtalloc
+BUILD_DEPENDS+=		talloc>=2.0.8:${PORTSDIR}/devel/talloc
+RUN_DEPENDS+=		talloc>=2.0.8:${PORTSDIR}/devel/talloc
+SAMBA4_BUNDLED_LIBS+=	!talloc
 # tevent
-#LIB_DEPENDS+=		tevent.0:${PORTSDIR}/devel/tevent
-#CONFIGURE_ARGS+=	--enable-external-libtevent
-# tevent - use internal libtevent since FreeBSD's port is at
-# 0.9.15 and samba4.alpha11 claims to want exactly 0.9.8
-
-OPTIONS=	\
-		DEBUG		"With debug info" off \
-		UTILS		"Build userland utils(conflicts with Samba3)" off \
-		THREADS		"With pthreads" on \
-		GNUTLS 		"With SSL (via GnuTLS) for SWAT support" off \
-		POPT		"With system-wide POPT library" on \
-		PCH		"With precompiled headers" off
+BUILD_DEPENDS+=		tevent>=0.9.17:${PORTSDIR}/devel/tevent
+RUN_DEPENDS+=		tevent>=0.9.17:${PORTSDIR}/devel/tevent
+SAMBA4_BUNDLED_LIBS+=	!tevent
+# tdb
+BUILD_DEPENDS+=		tdb>=1.2.11:${PORTSDIR}/databases/tdb
+RUN_DEPENDS+=		tdb>=1.2.11:${PORTSDIR}/databases/tdb
+SAMBA4_BUNDLED_LIBS+=	!tdb
+# ldb
+BUILD_DEPENDS+=		ldb>=1.1.15:${PORTSDIR}/databases/ldb
+RUN_DEPENDS+=		ldb>=1.1.15:${PORTSDIR}/databases/ldb
+SAMBA4_BUNDLED_LIBS+=	!ldb
+##############################################################################
+# Options
+OPTIONS_DEFINE=		ACL_SUPPORT ADS AIO_SUPPORT AVAHI CUPS DEBUG \
+			DNSUPDATE FAM_SUPPORT LDAP PAM_SMBPASS \
+			PTHREADPOOL QUOTAS SWAT SYSLOG UTMP WINBIND
+
+OPTIONS_DEFAULT:=	${OPTIONS_DEFINE}
+
+ACL_SUPPORT_DESC=	File system ACL support
+ADS_DESC=		Active Directory support
+AIO_SUPPORT_DESC=	Asyncronous IO support
+DNSUPDATE_DESC=		Dynamic DNS update(require ADS)
+EXP_MODULES_DESC=	Experimental modules
+FAM_SUPPORT_DESC=	File Alteration Monitor support
+DEBUG_DESC=		With debug information in the binaries
+PAM_SMBPASS_DESC=	PAM authentication via passdb backends
+PTHREADPOOL_DESC=	Pthread pool
+QUOTAS_DESC=		Disk quota support
+SWAT_DESC=		SWAT WebGUI
+UTMP_DESC=		UTMP accounting support
+WINBIND_DESC=		WinBIND support
+##############################################################################
+OPTIONS_DEFINE+=	DEVELOPER MANPAGES EXP_MODULES
+
+DEVELOPER_DESC=		With development support
+
+OPTIONS_SINGLE=		DNS
+OPTIONS_SINGLE_DNS=	NSUPDATE BIND98 BIND99
+
+BIND98_DESC=		Use bind98 as a DNS server frontend
+BIND99_DESC=		Use bind99 as a DNS server frontend
+NSUPDATE_DESC=		Use internal DNS with NSUPDATE utility
+
+OPTIONS_DEFAULT+=	NSUPDATE
 
 .include <bsd.port.options.mk>
 
-INSTALL_TARGET=		showlayout everything installsbin installdat \
-			installmisc installlib installheader installpc \
-			installplugins installpython
+# !SAMBA4_SUBPORT
+.endif
+
+.include <bsd.port.pre.mk>
+
+.if !defined(SAMBA4_SUBPORT)
+
+CONFIGURE_ARGS+=	\
+			--with-pam \
+			--with-iconv \
+			--with-sendfile-support \
+			--builtin-libraries=smbclient \
+			--with-libiconv="${LOCALBASE}" \
+			--with-gettext="${LOCALBASE}"
 
-.if defined(WITH_DSO)
-CONFIGURE_ARGS+=	--enable-dso
+# 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:MBIND98}
+RUN_DEPENDS+=		bind98>=9.8.0.0:${PORTSDIR}/dns/bind98
+SUB_LIST+=		NSUPDATE="@comment "
+.elif ${PORT_OPTIONS:MBIND99}
+RUN_DEPENDS+=		bind99>=9.9.0.0:${PORTSDIR}/dns/bind99
+SUB_LIST+=		NSUPDATE="@comment "
 .else
-CONFIGURE_ARGS+=	--disable-dso
+RUN_DEPENDS+=		samba-nsupdate:${PORTSDIR}/dns/samba-nsupdate
+SUB_LIST+=		NSUPDATE=""
+.endif
+
+.if ${PORT_OPTIONS:MDEBUG}
+CONFIGURE_ARGS+=	--verbose
+_MAKE_JOBS+=		--verbose
+CONFIGURE_ARGS+=	--enable-debug
 .endif
 
-.if !defined(WITHOUT_UTILS)
-INSTALL_TARGET+=	installbin
-PLIST_SUB+=		UTILS=""
-CONFLICTS+=		ja-samba-[23].* samba-[2-9].*
+# https://bugzilla.samba.org/show_bug.cgi?id=8969
+.if ${PORT_OPTIONS:MDEVELOPER}
+GDB_CMD=		gdb751
+BUILD_DEPENDS+=		${GDB_CMD}:${PORTSDIR}/devel/gdb
+RUN_DEPENDS+=		${GDB_CMD}:${PORTSDIR}/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-socket-wrapper --enable-nss-wrapper --enable-selftest
+PLIST_SUB+=		DEVELOPER=""
 .else
-PLIST_SUB+=		UTILS="@comment "
+GDB_CMD=		/usr/bin/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 !defined(WITHOUT_DEBUG)
-CONFIGURE_ARGS+=	--enable-debug --enable-developer \
-			--enable-socket-wrapper --enable-nss-wrapper
+.if ${PORT_OPTIONS:MEXP_MODULES}
+.	if !defined(WANT_EXP_MODULES) || empty(WANT_EXP_MODULES)
+WANT_EXP_MODULES=	idmap_ad vfs_cacheprime gpext_scripts gpext_security gpext_registry
+.	endif
+.endif
+
+.if ${PORT_OPTIONS:MACL_SUPPORT}
+.	if ${OSVERSION} > 800000
+LIB_DEPENDS+=		sunacl:${PORTSDIR}/sysutils/libsunacl
+WANT_EXP_MODULES+=	vfs_zfsacl
+SAMBA4_MODULES+=	vfs_zfsacl
+.	endif
+CONFIGURE_ARGS+=	--with-acl-support
 .else
-CONFIGURE_ARGS+=	--disable-debug --disable-developer \
-			--disable-socket-wrapper --disable-nss-wrapper
+CONFIGURE_ARGS+=	--without-acl-support
 .endif
 
-.if !defined(WITHOUT_THREADS)
-CPPFLAGS+=		${PTHREAD_CFLAGS}
-LDFLAGS+=		${PTHREAD_LIBS}
-CONFIGURE_ENV+=		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-			PTHREAD_LIBS="${PTHREAD_LIBS}"
-CONFIGURE_ARGS+=	--with-pthreads
+.if ${PORT_OPTIONS:MADS}
+SAMBA4_WANT_ADS=	yes
+SAMBA4_WANT_LDAP=	yes
+.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+=		avahi-client:${PORTSDIR}/net/avahi-app
+CONFIGURE_ARGS+=	--enable-avahi
+.else
+CONFIGURE_ARGS+=	--disable-avahi
+.endif
+
+.if ${PORT_OPTIONS:MCUPS}
+LIB_DEPENDS+=		cups:${PORTSDIR}/print/cups-client
+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
+
+.if 0
+.if ${PORT_OPTIONS:MFAM_SUPPORT}
+USE_FAM=		yes
+CONFIGURE_ARGS+=	--enable-fam
+WANT_EXP_MODULES+=	vfs_notify_fam
+SAMBA4_MODULES+=	vfs_notify_fam
+.else
+CONFIGURE_ARGS+=	--disable-fam
+.endif
+.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:MSWAT}
+CONFIGURE_ARGS+=	--with-swat
+PLIST_SUB+=		SWAT=""
+.else
+CONFIGURE_ARGS+=	--without-swat
+PLIST_SUB+=		SWAT="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MUTMP}
+CONFIGURE_ARGS+=	--with-utmp
 .else
-CONFIGURE_ARGS+=	--without-pthreads
+CONFIGURE_ARGS+=	--without-utmp
 .endif
 
-.if defined(WITH_GNUTLS)
-LIB_DEPENDS+=		gnutls.26:${PORTSDIR}/security/gnutls
-CONFIGURE_ARGS+=	--enable-gnutls
+.if ${PORT_OPTIONS:MWINBIND}
+CONFIGURE_ARGS+=	--with-winbind
+PLIST_SUB+=		WINBIND=""
 .else
-CONFIGURE_ARGS+=	--disable-gnutls
+CONFIGURE_ARGS+=	--without-winbind
+PLIST_SUB+=		WINBIND="@comment "
 .endif
 
-.if !defined(WITHOUT_POPT)
-LIB_DEPENDS+=		popt.0:${PORTSDIR}/devel/popt
-CONFIGURE_ARGS+=	--without-included-popt
+.if defined(SAMBA4_WANT_ADS)
+CONFIGURE_ARGS+=	--with-ads
 .else
-CONFIGURE_ARGS+=	--with-included-popt
+CONFIGURE_ARGS+=	--without-ads
 .endif
 
-.if defined(WITH_SQLITE3)
-USE_SQLITE=		3
-CONFIGURE_ARGS+=	--with-sqlite3
+.if defined(SAMBA4_WANT_LDAP)
+USE_OPENLDAP=		yes
+CONFIGURE_ARGS+=	--with-ldap
+PLIST_SUB+=		LDAP=""
 .else
-CONFIGURE_ARGS+=	--without-sqlite3
+CONFIGURE_ARGS+=	--without-ldap
+PLIST_SUB+=		LDAP="@comment "
 .endif
 
-.if defined(SAMBA_DISABLE_EXT) && !empty(SAMBA_DISABLE_EXT)
-CONFIGURE_ARGS+=	--with-disable-ext-lib="${SAMBA_DISABLE_EXT:Q:C/(\\\\ )+/,/g}"
+.if defined(WANT_EXP_MODULES) && !empty(WANT_EXP_MODULES)
+SAMBA4_MODULES+=	${WANT_EXP_MODULES}
+CONFIGURE_ARGS+=	--with-shared-modules="${WANT_EXP_MODULES:Q:C/(\\\\ )+/,/g}"
 .endif
 
-SAMBA_SUB=		SAMBA_LOGDIR="${SAMBA_LOGDIR}" \
-			SAMBA_LOCKDIR="${SAMBA_LOCKDIR}" \
-			SAMBA_CONFDIR="${SAMBA_CONFDIR}" \
-			SAMBA_CONFIG="${SAMBA_CONFIG}" \
-			SAMBA_RUNDIR="${SAMBA_RUNDIR}" \
-			SAMBA_PRIVATEDIR="${SAMBA_PRIVATEDIR}"
+.if defined(SAMBA4_BUNDLED_LIBS) && !empty(SAMBA4_BUNDLED_LIBS)
+CONFIGURE_ARGS+=	--bundled-libraries="${SAMBA4_BUNDLED_LIBS:Q:C/(\\\\ )+/,/g}"
+.endif
+
+# XXX
+.for m in ${SAMBA4_MODULES}
+PLIST_REINPLACE+=	${m}
+PLIST_REINPLACE_${m:U}=	s|^@comment ${m} ||g
+.endfor
+##############################################################################
+.if ! ${PORT_OPTIONS:MMANPAGES}
+CONFIGURE_ENV+=		XSLTPROC="/usr/bin/true"
+.else
+BUILD_DEPENDS+=		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \
+			xsltproc:${PORTSDIR}/textproc/libxslt
+.endif
+
+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=		${SAMBA4_PORTNAME}
+SUB_FILES=		pkg-install pkg-message README.FreeBSD
+
+CONFIGURE_ENV+=		NOCOLOR=yes
+MAKE_ENV+=		NOCOLOR=yes
+
+.if !defined(DISABLE_MAKE_JOBS) && !defined(MAKE_JOBS_UNSAFE)
+.if defined(MAKE_JOBS_SAFE) || defined(FORCE_MAKE_JOBS)
+CONFIGURE_ARGS+=	--jobs=${MAKE_JOBS_NUMBER}
+_MAKE_JOBS+=		--jobs=${MAKE_JOBS_NUMBER}
+.endif
+.endif
+
+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
+
+MAN5+=			lmhosts.5 smbgetrc.5 smbpasswd.5 pam_winbind.conf.5 \
+			smb.conf.5
 
-PLIST_SUB+=		${SAMBA_SUB}
-SUB_LIST+=		${SAMBA_SUB}
+MAN7+=			samba.7 winbind_krb5_locator.7
+
+MAN8+=			eventlogadm.8 idmap_ad.8 idmap_autorid.8 idmap_hash.8 \
+			idmap_ldap.8 idmap_nss.8 idmap_rid.8 idmap_tdb.8 \
+			idmap_tdb2.8 net.8 nmbd.8 pam_winbind.8 pdbedit.8 \
+			samba-tool.8 samba.8 smbd.8 smbpasswd.8 smbspool.8 \
+			smbta-util.8 swat.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_commit.8 vfs_crossrename.8 vfs_default_quota.8 \
+			vfs_dirsort.8 vfs_extd_audit.8 vfs_fake_perms.8 vfs_fileid.8 \
+			vfs_full_audit.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_smb_traffic_analyzer.8 \
+			vfs_streams_depot.8 vfs_streams_xattr.8 vfs_time_audit.8 \
+			vfs_tsmsm.8 vfs_xattr_tdb.8 winbindd.8
+
+MLINKS=			smb.conf.5 smb4.conf.5 samba.8 samba4.8
+
+PORTDOCS=		README.FreeBSD
+
+ALL_TARGET=		build
+INSTALL_TARGET=		install
+
+IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support
+
+post-extract:
+			@${RM} -rf ${WRKSRC}/pidl
+
+# 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
 
 post-patch:
-			@${REINPLACE_CMD} -i '' -e 's|%%SAMBA_CONFIG%%|${SAMBA_CONFIG}|' \
-				${WRKSRC}/dynconfig/config.mk
+			@${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 \
+				${PATCH_WRKSRC}/dynconfig/config.m4
+# Make sure that the right version of Python is used by the tools
+# https://bugzilla.samba.org/show_bug.cgi?id=7305
+			@for f in ${PATCH_WRKSRC}/source4/scripting/bin/*; do \
+				${REINPLACE_CMD} -e '1,1 s|.*python.*|#!${PYTHON_CMD}|' $${f}; \
+			done
 
-.if defined(WITH_PCH)
 pre-build:
-	(cd ${BUILD_WRKSRC} && ${GMAKE} pch)
+.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 ${MAN1} ${MAN5} ${MAN7} ${MAN8}
+			-@${INSTALL_MAN} ${BUILD_WRKSRC}/docs/manpages/${man} ${BUILD_WRKSRC}/bin/default/docs-xml/manpages
+.	endfor
 .endif
 
-USE_RC_SUBR=		${SAMBA_PORTNAME}
-SUB_FILES=		pkg-message
+do-build:
+			@(cd ${BUILD_WRKSRC}; \
+			if ! ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${BUILD_WRKSRC}/${WAF_TOOL} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET}; then \
+				if [ x != x${BUILD_FAIL_MESSAGE} ] ; then \
+					${ECHO_MSG} "===> Compilation failed unexpectedly."; \
+					(${ECHO_CMD} ${BUILD_FAIL_MESSAGE}) | ${FMT} 75 79 ; \
+				fi; \
+			${FALSE}; \
+			fi)
+
+do-install:
+			@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${INSTALL_WRKSRC}/${WAF_TOOL} ${MAKE_ARGS} ${INSTALL_TARGET})
 
 post-install:
+.if ${PORT_OPTIONS:MDOCS}
+			@${MKDIR} ${DOCSDIR}
+.	for doc in ${PORTDOCS}
+			@${INSTALL_DATA} ${WRKDIR}/${doc} ${DOCSDIR}
+.	endfor
+.endif
+			@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 			@${CAT} ${PKGMESSAGE}
+
+.if ${PORT_OPTIONS:MDEVELOPER}
+test: build
+			@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${INSTALL_WRKSRC}/${WAF_TOOL} ${MAKE_ARGS} $@)
+.endif
+
 # !SAMBA4_SUBPORT
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net/samba4/distinfo b/net/samba4/distinfo
index ac00c45832b1..c4293dfb8430 100644
--- a/net/samba4/distinfo
+++ b/net/samba4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (samba-4.0.0alpha11.tar.gz) = ec9f4a9153b9e2c233420642ee98a8b944322e8b39a9b6912430fb24e88b81b9
-SIZE (samba-4.0.0alpha11.tar.gz) = 13917363
+SHA256 (samba-4.0.3.tar.gz) = ab5d3618632f8869c838c0b2994b3f169da6824885710aad1146738172e44a4b
+SIZE (samba-4.0.3.tar.gz) = 22051995
diff --git a/net/samba4/files/README.FreeBSD.in b/net/samba4/files/README.FreeBSD.in
new file mode 100644
index 000000000000..b97ed8e37fd6
--- /dev/null
+++ b/net/samba4/files/README.FreeBSD.in
@@ -0,0 +1,99 @@
+
+              !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+              !!! Please read before runing any tools !!!
+              !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+Documentation
+=============
+
+    o https://wiki.samba.org/index.php/Samba4/HOWTO
+
+    o https://wiki.samba.org/index.php/Samba_AD_DC_HOWTO
+
+    o https://wiki.samba.org/index.php/Samba4/samba-tool/domain/classicupgrade/HOWTO
+
+FreeBSD specific information
+============================
+
+* Your configuration is in: %%SAMBA4_CONFDIR%%/%%SAMBA4_CONFIG%%
+
+* All the logs are under: %%SAMBA4_LOGDIR%%
+
+* All the relevant databases are under: %%SAMBA4_LOCKDIR%%
+
+* Provisioning script is: %%PREFIX%%/bin/samba-tool
+
+Samba4 provisioning requires file system(s) with POSIX ACLs support. At
+the moment that is UFS2 only. You have to add 'acls' option to the mount
+flags to get things working.
+
+It is known that ZFS-only installations don't work out of the box with
+Samba4. In partucular, s3fs service requires POSIX ACLs during provi-
+sioning. It is possible to work around that requirement by specifying:
+
+    # samba-tool domain provision --interactive --use-xattrs=no --use-ntvfs
+
+And removing later in '%%SAMBA4_CONFIG%%' options like:
+
+    'server services', 'dcerpc endpoint servers', 'posix:eadb'
+
+and adding 'vfs objects = zfsacl' as well. Still this isn't supported
+and tested configuration, so use it at your own risk.
+
+You may find this tutorial useful, if you happen to run Samba4 on
+ZFS-root:
+
+    o http://glsan.com/community/samba4
+
+To run this port you need to perform the following steps:
+---------------------------------------------------------
+
+0. If you had Samba3 port installed before, please, *take backups* of
+all the relevant files. That includes 'smb.conf' file and all the
+content of the '/var/db/samba/' directory.
+
+If you had Samba4-devel installation before to my knowledge the best
+option would be to start from scratch.
+
+1a. Create new '%%SAMBA4_CONFDIR%%/%%SAMBA4_CONFIG%%' file by running:
+
+    # samba-tool domain provision
+
+1b. Or upgrade from the Samba3 'smb.conf' file by running:
+
+    # samba-tool domain classicupgrade
+
+%%NSUPDATE%%1c. You will need to specify location of the 'nsupdate' command in the
+%%NSUPDATE%%'%%SAMBA4_CONFIG%%' file:
+%%NSUPDATE%%
+%%NSUPDATE%%      nsupdate command = %%PREFIX%%/bin/samba-nsupdate -g
+%%NSUPDATE%%
+2. Put string 'samba4_enable="YES"' into your /etc/rc.conf.
+
+3. Make sure that your server doesn't run Samba3, OpenLDAP and named.
+Stop them, if necessary.
+
+4. Run '%%PREFIX%%/etc/rc.d/samba4 start' or reboot.
+
+WARNING! This port is still experimental and if you need any asistance,
+please, check archives of samba@lists.samba.org and ask there for help.
+
+    https://lists.samba.org/archive/samba/
+
+In case you found a bug which is clearly not related to the port build
+process itself, plese file a bug report at:
+
+    https://bugzilla.samba.org/
+
+And add me to CC list.
+
+You may find those tools helpful:
+---------------------------------
+
+Microsoft Remote Server Administration Tools (RSAT) for:
+
+* Vista: http://www.microsoft.com/en-us/download/details.aspx?id=21090
+* Windows 7: http://www.microsoft.com/en-us/download/details.aspx?id=7887
+
+
+FreeBSD Samba4 port maintainer: Timur I. Bakeyev <timur@FreeBSD.org>
diff --git a/net/samba4/files/man/gentest.1 b/net/samba4/files/man/gentest.1
new file mode 100644
index 000000000000..2804db8c9816
--- /dev/null
+++ b/net/samba4/files/man/gentest.1
@@ -0,0 +1,133 @@
+'\" t
+.\"     Title: gentest
+.\"    Author: [see the "AUTHOR" section]
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 02/03/2013
+.\"    Manual: Test Suite
+.\"    Source: Samba 4.0
+.\"  Language: English
+.\"
+.TH "GENTEST" "1" "02/03/2013" "Samba 4\&.0" "Test Suite"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "NAME"
+gentest \- Run random generic SMB operations against two SMB servers and show the differences in behavior
+.SH "SYNOPSIS"
+.HP \w'\fBgentest\fR\ 'u
+\fBgentest\fR {//server1/share1} {//server2/share2} {\-U\ user%pass} {\-U\ user%pass} [\-s\ seed] [\-o\ numops] [\-a] [\-A] [\-i\ FILE] [\-O] [\-S\ FILE] [\-L] [\-F] [\-C] [\-X]
+.SH "DESCRIPTION"
+.PP
+gentest
+is a utility for detecting differences in behaviour between SMB servers\&. It will run a random set of generic operations against
+\fI//server1/share1\fR
+and then the same random set against
+\fI//server2/share2\fR
+and display the differences in the responses it gets\&.
+.PP
+This utility is used by the Samba team to find differences in behaviour between Samba and Windows servers\&.
+.SH "OPTIONS"
+.PP
+\-U user%pass
+.RS 4
+Specify the user and password to use when logging on on the shares\&. This parameter is mandatory and has to be specified twice\&.
+.RE
+.PP
+\-s seed
+.RS 4
+Seed the random number generator with the specified value\&.
+.RE
+.PP
+\-o numops
+.RS 4
+Set the number of operations to perform\&.
+.RE
+.PP
+\-a
+.RS 4
+Print the operations that are performed\&.
+.RE
+.PP
+\-A
+.RS 4
+Backtrack to find minimal number of operations required to make the response to a certain call differ\&.
+.RE
+.PP
+\-i FILE
+.RS 4
+Specify a file containing the names of fields that have to be ignored (such as time fields)\&. See below for a description of the file format\&.
+.RE
+.PP
+\-O
+.RS 4
+Enable oplocks\&.
+.RE
+.PP
+\-S FILE
+.RS 4
+Set preset seeds file\&. The default is
+gentest_seeds\&.dat\&.
+.RE
+.PP
+\-L
+.RS 4
+Use preset seeds
+.RE
+.PP
+\-F
+.RS 4
+Fast reconnect (just close files)
+.RE
+.PP
+\-C
+.RS 4
+Continuous analysis mode
+.RE
+.PP
+\-X
+.RS 4
+Analyse even when the test succeeded\&.
+.RE
+.SH "VERSION"
+.PP
+This man page is correct for version 4\&.0 of the Samba suite\&.
+.SH "SEE ALSO"
+.PP
+Samba
+.SH "AUTHOR"
+.PP
+This utility is part of the
+\m[blue]\fBSamba\fR\m[]\&\s-2\u[1]\d\s+2
+suite, which is developed by the global
+\m[blue]\fBSamba Team\fR\m[]\&\s-2\u[2]\d\s+2\&.
+.PP
+gentest was written by Andrew Tridgell\&.
+.PP
+This manpage was written by Jelmer Vernooij\&.
+.SH "NOTES"
+.IP " 1." 4
+Samba
+.RS 4
+\%http://www.samba.org/
+.RE
+.IP " 2." 4
+Samba Team
+.RS 4
+\%http://www.samba.org/samba/team/
+.RE
diff --git a/net/samba4/files/man/locktest.1 b/net/samba4/files/man/locktest.1
new file mode 100644
index 000000000000..20c6da1abec7
--- /dev/null
+++ b/net/samba4/files/man/locktest.1
@@ -0,0 +1,137 @@
+'\" t
+.\"     Title: locktest
+.\"    Author: [see the "AUTHOR" section]
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 02/03/2013
+.\"    Manual: Test Suite
+.\"    Source: Samba 4.0
+.\"  Language: English
+.\"
+.TH "LOCKTEST" "1" "02/03/2013" "Samba 4\&.0" "Test Suite"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "NAME"
+locktest \- Find differences in locking between two SMB servers
+.SH "SYNOPSIS"
+.HP \w'\fBlocktest\fR\ 'u
+\fBlocktest\fR {//server1/share1} {//server2/share2} [\-U\ user%pass] [\-U\ user%pass] [\-s\ seed] [\-o\ numops] [\-a] [\-O] [\-E] [\-Z] [\-R\ range] [\-B\ base] [\-M\ min]
+.SH "DESCRIPTION"
+.PP
+locktest
+is a utility for detecting differences in behaviour in locking between SMB servers\&. It will run a random set of locking operations against
+\fI//server1/share1\fR
+and then the same random set against
+\fI//server2/share2\fR
+and display the differences in the responses it gets\&.
+.PP
+This utility is used by the Samba team to find differences in behaviour between Samba and Windows servers\&.
+.SH "OPTIONS"
+.PP
+\-U user%pass
+.RS 4
+Specify the user and password to use when logging on on the shares\&. This parameter can be specified twice (once for the first server, once for the second)\&.
+.RE
+.PP
+\-s seed
+.RS 4
+Seed the random number generator with the specified value\&.
+.RE
+.PP
+\-o numops
+.RS 4
+Set the number of operations to perform\&.
+.RE
+.PP
+\-a
+.RS 4
+Print the operations that are performed\&.
+.RE
+.PP
+\-A
+.RS 4
+Backtrack to find minimal number of operations required to make the response to a certain call differ\&.
+.RE
+.PP
+\-O
+.RS 4
+Enable oplocks\&.
+.RE
+.PP
+\-u
+.RS 4
+Hide unlock fails\&.
+.RE
+.PP
+\-E
+.RS 4
+enable exact error code checking
+.RE
+.PP
+\-Z
+.RS 4
+enable the zero/zero lock
+.RE
+.PP
+\-R range
+.RS 4
+set lock range
+.RE
+.PP
+\-B base
+.RS 4
+set lock base
+.RE
+.PP
+\-M min
+.RS 4
+set min lock length
+.RE
+.PP
+\-k
+.RS 4
+Use kerberos
+.RE
+.SH "VERSION"
+.PP
+This man page is correct for version 4\&.0 of the Samba suite\&.
+.SH "SEE ALSO"
+.PP
+Samba
+.SH "AUTHOR"
+.PP
+This utility is part of the
+\m[blue]\fBSamba\fR\m[]\&\s-2\u[1]\d\s+2
+suite, which is developed by the global
+\m[blue]\fBSamba Team\fR\m[]\&\s-2\u[2]\d\s+2\&.
+.PP
+locktest was written by Andrew Tridgell\&.
+.PP
+This manpage was written by Jelmer Vernooij\&.
+.SH "NOTES"
+.IP " 1." 4
+Samba
+.RS 4
+\%http://www.samba.org/
+.RE
+.IP " 2." 4
+Samba Team
+.RS 4
+\%http://www.samba.org/samba/team/
+.RE
diff --git a/net/samba4/files/man/masktest.1 b/net/samba4/files/man/masktest.1
new file mode 100644
index 000000000000..9451edd188ed
--- /dev/null
+++ b/net/samba4/files/man/masktest.1
@@ -0,0 +1,113 @@
+'\" t
+.\"     Title: masktest
+.\"    Author: [see the "AUTHOR" section]
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 02/03/2013
+.\"    Manual: Test Suite
+.\"    Source: Samba 4.0
+.\"  Language: English
+.\"
+.TH "MASKTEST" "1" "02/03/2013" "Samba 4\&.0" "Test Suite"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "NAME"
+masktest \- Find differences in wildcard matching between Samba\*(Aqs implementation and that of a remote server\&.
+.SH "SYNOPSIS"
+.HP \w'\fBmasktest\fR\ 'u
+\fBmasktest\fR {//server/share} [\-U\ user%pass] [\-d\ debuglevel] [\-W\ workgroup] [\-n\ numloops] [\-s\ seed] [\-a] [\-E] [\-M\ max\ protocol] [\-f\ filechars] [\-m\ maskchars] [\-v]
+.SH "DESCRIPTION"
+.PP
+masktest
+is a utility for detecting differences in behaviour between Samba\*(Aqs own implementation and that of a remote server\&. It will run generate random filenames/masks and check if these match the same files they do on the remote file as they do on the local server\&. It will display any differences it finds\&.
+.PP
+This utility is used by the Samba team to find differences in behaviour between Samba and Windows servers\&.
+.SH "OPTIONS"
+.PP
+\-U user%pass
+.RS 4
+Specify the user and password to use when logging on on the shares\&. This parameter can be specified twice (once for the first server, once for the second)\&.
+.RE
+.PP
+\-s seed
+.RS 4
+Seed the random number generator with the specified value\&.
+.RE
+.PP
+\-n numops
+.RS 4
+Set the number of operations to perform\&.
+.RE
+.PP
+\-a
+.RS 4
+Print the operations that are performed\&.
+.RE
+.PP
+\-M max_protocol
+.RS 4
+Maximum protocol to use\&.
+.RE
+.PP
+\-f
+.RS 4
+Specify characters that can be used when generating file names\&. Default: abcdefghijklm\&.
+.RE
+.PP
+\-E
+.RS 4
+Abort when difference in behaviour is found\&.
+.RE
+.PP
+\-m maskchars
+.RS 4
+Specify characters used for wildcards\&.
+.RE
+.PP
+\-v
+.RS 4
+Be verbose
+.RE
+.SH "VERSION"
+.PP
+This man page is correct for version 4\&.0 of the Samba suite\&.
+.SH "SEE ALSO"
+.PP
+Samba
+.SH "AUTHOR"
+.PP
+This utility is part of the
+\m[blue]\fBSamba\fR\m[]\&\s-2\u[1]\d\s+2
+suite, which is developed by the global
+\m[blue]\fBSamba Team\fR\m[]\&\s-2\u[2]\d\s+2\&.
+.PP
+masktest was written by Andrew Tridgell\&.
+.PP
+This manpage was written by Jelmer Vernooij\&.
+.SH "NOTES"
+.IP " 1." 4
+Samba
+.RS 4
+\%http://www.samba.org/
+.RE
+.IP " 2." 4
+Samba Team
+.RS 4
+\%http://www.samba.org/samba/team/
+.RE
diff --git a/net/samba4/files/man/ndrdump.1 b/net/samba4/files/man/ndrdump.1
new file mode 100644
index 000000000000..c0515bfee05c
--- /dev/null
+++ b/net/samba4/files/man/ndrdump.1
@@ -0,0 +1,83 @@
+'\" t
+.\"     Title: ndrdump
+.\"    Author: [see the "AUTHOR" section]
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 02/03/2013
+.\"    Manual: System Administration tools
+.\"    Source: Samba 4.0
+.\"  Language: English
+.\"
+.TH "NDRDUMP" "1" "02/03/2013" "Samba 4\&.0" "System Administration tools"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "NAME"
+ndrdump \- DCE/RPC Packet Parser and Dumper
+.SH "SYNOPSIS"
+.HP \w'\fBndrdump\fR\ 'u
+\fBndrdump\fR [\-c\ context] {pipe} {function} {in|out} {filename}
+.HP \w'\fBndrdump\fR\ 'u
+\fBndrdump\fR [pipe]
+.HP \w'\fBndrdump\fR\ 'u
+\fBndrdump\fR
+.SH "DESCRIPTION"
+.PP
+ndrdump tries to parse the specified
+\fIfilename\fR
+using Samba\*(Aqs parser for the specified pipe and function\&. The third argument should be either
+\fIin\fR
+or
+\fIout\fR, depending on whether the data should be parsed as a request or a reply\&.
+.PP
+Running ndrdump without arguments will list the pipes for which parsers are available\&.
+.PP
+Running ndrdump with one argument will list the functions that Samba can parse for the specified pipe\&.
+.PP
+The primary function of ndrdump is debugging Samba\*(Aqs internal DCE/RPC parsing functions\&. The file being parsed is usually one exported by wiresharks
+\(lqExport selected packet bytes\(rq
+function\&.
+.PP
+The context argument can be used to load context data from the request packet when parsing reply packets (such as array lengths)\&.
+.SH "VERSION"
+.PP
+This man page is correct for version 4\&.0 of the Samba suite\&.
+.SH "SEE ALSO"
+.PP
+wireshark, pidl
+.SH "AUTHOR"
+.PP
+This utility is part of the
+\m[blue]\fBSamba\fR\m[]\&\s-2\u[1]\d\s+2
+suite, which is developed by the global
+\m[blue]\fBSamba Team\fR\m[]\&\s-2\u[2]\d\s+2\&.
+.PP
+ndrdump was written by Andrew Tridgell\&.
+.PP
+This manpage was written by Jelmer Vernooij\&.
+.SH "NOTES"
+.IP " 1." 4
+Samba
+.RS 4
+\%http://www.samba.org/
+.RE
+.IP " 2." 4
+Samba Team
+.RS 4
+\%http://www.samba.org/samba/team/
+.RE
diff --git a/net/samba4/files/man/nmblookup4.1 b/net/samba4/files/man/nmblookup4.1
new file mode 100644
index 000000000000..e10d2ea724e2
--- /dev/null
+++ b/net/samba4/files/man/nmblookup4.1
@@ -0,0 +1,157 @@
+'\" t
+.\"     Title: nmblookup4
+.\"    Author: [see the "AUTHOR" section]
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 02/03/2013
+.\"    Manual: User Commands
+.\"    Source: Samba 3.2
+.\"  Language: English
+.\"
+.TH "NMBLOOKUP4" "1" "02/03/2013" "Samba 3\&.2" "User Commands"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "NAME"
+nmblookup4 \- NetBIOS over TCP/IP client used to lookup NetBIOS names
+.SH "SYNOPSIS"
+.HP \w'\fBnmblookup4\fR\ 'u
+\fBnmblookup4\fR [\-M] [\-R] [\-S] [\-r] [\-A] [\-h] [\-B\ <broadcast\ address>] [\-U\ <unicast\ address>] [\-d\ <debug\ level>] [\-s\ <smb\ config\ file>] [\-i\ <NetBIOS\ scope>] [\-T] [\-f] {name}
+.SH "DESCRIPTION"
+.PP
+This tool is part of the
+\fBsamba\fR(7)
+suite\&.
+.PP
+\fBnmblookup4\fR
+is used to query NetBIOS names and map them to IP addresses in a network using NetBIOS over TCP/IP queries\&. The options allow the name queries to be directed at a particular IP broadcast area or to a particular machine\&. All queries are done over UDP\&.
+.SH "OPTIONS"
+.PP
+\-M
+.RS 4
+Searches for a master browser by looking up the NetBIOS name
+\fIname\fR
+with a type of
+\fB0x1d\fR\&. If
+\fI name\fR
+is "\-" then it does a lookup on the special name
+\fB__MSBROWSE__\fR\&. Please note that in order to use the name "\-", you need to make sure "\-" isn\*(Aqt parsed as an argument, e\&.g\&. use :
+\fBnmblookup4 \-M \-\- \-\fR\&.
+.RE
+.PP
+\-R
+.RS 4
+Set the recursion desired bit in the packet to do a recursive lookup\&. This is used when sending a name query to a machine running a WINS server and the user wishes to query the names in the WINS server\&. If this bit is unset the normal (broadcast responding) NetBIOS processing code on a machine is used instead\&. See RFC1001, RFC1002 for details\&.
+.RE
+.PP
+\-S
+.RS 4
+Once the name query has returned an IP address then do a node status query as well\&. A node status query returns the NetBIOS names registered by a host\&.
+.RE
+.PP
+\-r
+.RS 4
+Try and bind to UDP port 137 to send and receive UDP datagrams\&. The reason for this option is a bug in Windows 95 where it ignores the source port of the requesting packet and only replies to UDP port 137\&. Unfortunately, on most UNIX systems root privilege is needed to bind to this port, and in addition, if the
+\fBnmbd\fR(8)
+daemon is running on this machine it also binds to this port\&.
+.RE
+.PP
+\-A
+.RS 4
+Interpret
+\fIname\fR
+as an IP Address and do a node status query on this address\&.
+.RE
+.PP
+\-B <broadcast address>
+.RS 4
+Send the query to the given broadcast address\&. Without this option the default behavior of nmblookup4 is to send the query to the broadcast address of the network interfaces as either auto\-detected or defined in the
+\m[blue]\fB\fIinterfaces\fR\fR\m[]\&\s-2\u[1]\d\s+2
+parameter of the
+\fBsmb.conf\fR(5)
+file\&.
+.RE
+.PP
+\-U <unicast address>
+.RS 4
+Do a unicast query to the specified address or host
+\fIunicast address\fR\&. This option (along with the
+\fI\-R\fR
+option) is needed to query a WINS server\&.
+.RE
+.PP
+\-T
+.RS 4
+This causes any IP addresses found in the lookup to be looked up via a reverse DNS lookup into a DNS name, and printed out before each
+.sp
+\fIIP address \&.\&.\&.\&. NetBIOS name\fR
+.sp
+pair that is the normal output\&.
+.RE
+.PP
+\-f
+.RS 4
+Show which flags apply to the name that has been looked up\&. Possible answers are zero or more of: Response, Authoritative, Truncated, Recursion_Desired, Recursion_Available, Broadcast\&.
+.RE
+.PP
+name
+.RS 4
+This is the NetBIOS name being queried\&. Depending upon the previous options this may be a NetBIOS name or IP address\&. If a NetBIOS name then the different name types may be specified by appending \*(Aq#<type>\*(Aq to the name\&. This name may also be \*(Aq*\*(Aq, which will return all registered names within a broadcast area\&.
+.RE
+.SH "EXAMPLES"
+.PP
+\fBnmblookup4\fR
+can be used to query a WINS server (in the same way
+\fBnslookup\fR
+is used to query DNS servers)\&. To query a WINS server,
+\fBnmblookup4\fR
+must be called like this:
+.PP
+\fBnmblookup4 \-U server \-R \*(Aqname\*(Aq\fR
+.PP
+For example, running :
+.PP
+\fBnmblookup4 \-U samba\&.org \-R \*(AqIRIX#1B\*(Aq\fR
+.PP
+would query the WINS server samba\&.org for the domain master browser (1B name type) for the IRIX workgroup\&.
+.SH "VERSION"
+.PP
+This man page is correct for version 3 of the Samba suite\&.
+.SH "SEE ALSO"
+.PP
+\fBnmbd\fR(8),
+\fBsamba\fR(7), and
+\fBsmb.conf\fR(5)\&.
+.SH "AUTHOR"
+.PP
+The original Samba software and related utilities were created by Andrew Tridgell\&. Samba is now developed by the Samba Team as an Open Source project similar to the way the Linux kernel is developed\&.
+.PP
+The original Samba man pages were written by Karl Auer\&. The man page sources were converted to YODL format (another excellent piece of Open Source software, available at
+\m[blue]\fBftp://ftp\&.icce\&.rug\&.nl/pub/unix/\fR\m[]\&\s-2\u[2]\d\s+2) and updated for the Samba 2\&.0 release by Jeremy Allison\&. The conversion to DocBook for Samba 2\&.2 was done by Gerald Carter\&. The conversion to DocBook XML 4\&.2 for Samba 3\&.0 was done by Alexander Bokovoy\&.
+.SH "NOTES"
+.IP " 1." 4
+\fIinterfaces\fR
+		
+.RS 4
+\%[set $man.base.url.for.relative.links]/smb.conf.5.html#INTERFACES
+.RE
+.IP " 2." 4
+ftp://ftp.icce.rug.nl/pub/unix/
+.RS 4
+\%ftp://ftp.icce.rug.nl/pub/unix/
+.RE
diff --git a/net/samba4/files/man/ntlm_auth4.1 b/net/samba4/files/man/ntlm_auth4.1
new file mode 100644
index 000000000000..0b2500ad2fc6
--- /dev/null
+++ b/net/samba4/files/man/ntlm_auth4.1
@@ -0,0 +1,378 @@
+'\" t
+.\"     Title: ntlm_auth
+.\"    Author: [see the "AUTHOR" section]
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 02/04/2013
+.\"    Manual: User Commands
+.\"    Source: Samba 4.0
+.\"  Language: English
+.\"
+.TH "NTLM_AUTH" "1" "02/04/2013" "Samba 4\&.0" "User Commands"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "NAME"
+ntlm_auth \- tool to allow external access to Winbind\*(Aqs NTLM authentication function
+.SH "SYNOPSIS"
+.HP \w'\ 'u
+ntlm_auth [\-d\ debuglevel] [\-l\ logdir] [\-s\ <smb\ config\ file>]
+.SH "DESCRIPTION"
+.PP
+This tool is part of the
+\fBsamba\fR(7)
+suite\&.
+.PP
+ntlm_auth
+is a helper utility that authenticates users using NT/LM authentication\&. It returns 0 if the users is authenticated successfully and 1 if access was denied\&. ntlm_auth uses winbind to access the user and authentication data for a domain\&. This utility is only intended to be used by other programs (currently
+Squid
+and
+mod_ntlm_winbind)
+.SH "OPERATIONAL REQUIREMENTS"
+.PP
+The
+\fBwinbindd\fR(8)
+daemon must be operational for many of these commands to function\&.
+.PP
+Some of these commands also require access to the directory
+winbindd_privileged
+in
+$LOCKDIR\&. This should be done either by running this command as root or providing group access to the
+winbindd_privileged
+directory\&. For security reasons, this directory should not be world\-accessable\&.
+.SH "OPTIONS"
+.PP
+\-\-helper\-protocol=PROTO
+.RS 4
+Operate as a stdio\-based helper\&. Valid helper protocols are:
+.PP
+squid\-2\&.4\-basic
+.RS 4
+Server\-side helper for use with Squid 2\&.4\*(Aqs basic (plaintext) authentication\&.
+.RE
+.PP
+squid\-2\&.5\-basic
+.RS 4
+Server\-side helper for use with Squid 2\&.5\*(Aqs basic (plaintext) authentication\&.
+.RE
+.PP
+squid\-2\&.5\-ntlmssp
+.RS 4
+Server\-side helper for use with Squid 2\&.5\*(Aqs NTLMSSP authentication\&.
+.sp
+Requires access to the directory
+winbindd_privileged
+in
+$LOCKDIR\&. The protocol used is described here:
+http://devel\&.squid\-cache\&.org/ntlm/squid_helper_protocol\&.html\&. This protocol has been extended to allow the NTLMSSP Negotiate packet to be included as an argument to the
+YR
+command\&. (Thus avoiding loss of information in the protocol exchange)\&.
+.RE
+.PP
+ntlmssp\-client\-1
+.RS 4
+Client\-side helper for use with arbitrary external programs that may wish to use Samba\*(Aqs NTLMSSP authentication knowledge\&.
+.sp
+This helper is a client, and as such may be run by any user\&. The protocol used is effectively the reverse of the previous protocol\&. A
+YR
+command (without any arguments) starts the authentication exchange\&.
+.RE
+.PP
+gss\-spnego
+.RS 4
+Server\-side helper that implements GSS\-SPNEGO\&. This uses a protocol that is almost the same as
+squid\-2\&.5\-ntlmssp, but has some subtle differences that are undocumented outside the source at this stage\&.
+.sp
+Requires access to the directory
+winbindd_privileged
+in
+$LOCKDIR\&.
+.RE
+.PP
+gss\-spnego\-client
+.RS 4
+Client\-side helper that implements GSS\-SPNEGO\&. This also uses a protocol similar to the above helpers, but is currently undocumented\&.
+.RE
+.PP
+ntlm\-server\-1
+.RS 4
+Server\-side helper protocol, intended for use by a RADIUS server or the \*(Aqwinbind\*(Aq plugin for pppd, for the provision of MSCHAP and MSCHAPv2 authentication\&.
+.sp
+This protocol consists of lines in the form:
+Parameter: value
+and
+Parameter:: Base64\-encode value\&. The presence of a single period
+\&.
+indicates that one side has finished supplying data to the other\&. (Which in turn could cause the helper to authenticate the user)\&.
+.sp
+Currently implemented parameters from the external program to the helper are:
+.PP
+Username
+.RS 4
+The username, expected to be in Samba\*(Aqs
+\m[blue]\fBunix charset\fR\m[]\&.
+.PP \fBExample\ \&1.\ \&\fR Username: bob
+.PP \fBExample\ \&2.\ \&\fR Username:: Ym9i
+.RE
+.PP
+NT\-Domain
+.RS 4
+The user\*(Aqs domain, expected to be in Samba\*(Aqs
+\m[blue]\fBunix charset\fR\m[]\&.
+.PP \fBExample\ \&3.\ \&\fR NT\-Domain: WORKGROUP
+.PP \fBExample\ \&4.\ \&\fR NT\-Domain:: V09SS0dST1VQ
+.RE
+.PP
+Full\-Username
+.RS 4
+The fully qualified username, expected to be in Samba\*(Aqs
+\m[blue]\fBunix charset\fR\m[]
+and qualified with the
+\m[blue]\fBwinbind separator\fR\m[]\&.
+.PP \fBExample\ \&5.\ \&\fR Full\-Username: WORKGROUP\ebob
+.PP \fBExample\ \&6.\ \&\fR Full\-Username:: V09SS0dST1VQYm9i
+.RE
+.PP
+LANMAN\-Challenge
+.RS 4
+The 8 byte
+LANMAN Challenge
+value, generated randomly by the server, or (in cases such as MSCHAPv2) generated in some way by both the server and the client\&.
+.PP \fBExample\ \&7.\ \&\fR LANMAN\-Challenge: 0102030405060708
+.RE
+.PP
+LANMAN\-Response
+.RS 4
+The 24 byte
+LANMAN Response
+value, calculated from the user\*(Aqs password and the supplied
+LANMAN Challenge\&. Typically, this is provided over the network by a client wishing to authenticate\&.
+.PP \fBExample\ \&8.\ \&\fR LANMAN\-Response: 0102030405060708090A0B0C0D0E0F101112131415161718
+.RE
+.PP
+NT\-Response
+.RS 4
+The >= 24 byte
+NT Response
+calculated from the user\*(Aqs password and the supplied
+LANMAN Challenge\&. Typically, this is provided over the network by a client wishing to authenticate\&.
+.PP \fBExample\ \&9.\ \&\fR NT\-Response: 0102030405060708090A0B0C0D0E0F101112131415161718
+.RE
+.PP
+Password
+.RS 4
+The user\*(Aqs password\&. This would be provided by a network client, if the helper is being used in a legacy situation that exposes plaintext passwords in this way\&.
+.PP \fBExample\ \&10.\ \&\fR Password: samba2
+.PP \fBExample\ \&11.\ \&\fR Password:: c2FtYmEy
+.RE
+.PP
+Request\-User\-Session\-Key
+.RS 4
+Upon successful authenticaiton, return the user session key associated with the login\&.
+.PP \fBExample\ \&12.\ \&\fR Request\-User\-Session\-Key: Yes
+.RE
+.PP
+Request\-LanMan\-Session\-Key
+.RS 4
+Upon successful authenticaiton, return the LANMAN session key associated with the login\&.
+.PP \fBExample\ \&13.\ \&\fR Request\-LanMan\-Session\-Key: Yes
+.RE
+.if n \{\
+.sp
+.\}
+.RS 4
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.ps +1
+\fBWarning\fR
+.ps -1
+.br
+Implementers should take care to base64 encode
+		any data (such as usernames/passwords) that may contain malicous user data, such as
+		a newline\&.  They may also need to decode strings from
+		the helper, which likewise may have been base64 encoded\&..sp .5v
+.RE
+.RE
+.RE
+.PP
+\-\-username=USERNAME
+.RS 4
+Specify username of user to authenticate
+.RE
+.PP
+\-\-domain=DOMAIN
+.RS 4
+Specify domain of user to authenticate
+.RE
+.PP
+\-\-workstation=WORKSTATION
+.RS 4
+Specify the workstation the user authenticated from
+.RE
+.PP
+\-\-challenge=STRING
+.RS 4
+NTLM challenge (in HEXADECIMAL)
+.RE
+.PP
+\-\-lm\-response=RESPONSE
+.RS 4
+LM Response to the challenge (in HEXADECIMAL)
+.RE
+.PP
+\-\-nt\-response=RESPONSE
+.RS 4
+NT or NTLMv2 Response to the challenge (in HEXADECIMAL)
+.RE
+.PP
+\-\-password=PASSWORD
+.RS 4
+User\*(Aqs plaintext password
+.sp
+If not specified on the command line, this is prompted for when required\&.
+.sp
+For the NTLMSSP based server roles, this parameter specifies the expected password, allowing testing without winbindd operational\&.
+.RE
+.PP
+\-\-request\-lm\-key
+.RS 4
+Retrieve LM session key
+.RE
+.PP
+\-\-request\-nt\-key
+.RS 4
+Request NT key
+.RE
+.PP
+\-\-diagnostics
+.RS 4
+Perform Diagnostics on the authentication chain\&. Uses the password from
+\-\-password
+or prompts for one\&.
+.RE
+.PP
+\-\-require\-membership\-of={SID|Name}
+.RS 4
+Require that a user be a member of specified group (either name or SID) for authentication to succeed\&.
+.RE
+.PP
+\-d|\-\-debuglevel=level
+.RS 4
+\fIlevel\fR
+is an integer from 0 to 10\&. The default value if this parameter is not specified is 0\&.
+.sp
+The higher this value, the more detail will be logged to the log files about the activities of the server\&. At level 0, only critical errors and serious warnings will be logged\&. Level 1 is a reasonable level for day\-to\-day running \- it generates a small amount of information about operations carried out\&.
+.sp
+Levels above 1 will generate considerable amounts of log data, and should only be used when investigating a problem\&. Levels above 3 are designed for use only by developers and generate HUGE amounts of log data, most of which is extremely cryptic\&.
+.sp
+Note that specifying this parameter here will override the
+\m[blue]\fBlog level\fR\m[]
+parameter in the
+smb\&.conf
+file\&.
+.RE
+.PP
+\-V|\-\-version
+.RS 4
+Prints the program version number\&.
+.RE
+.PP
+\-s|\-\-configfile <configuration file>
+.RS 4
+The file specified contains the configuration details required by the server\&. The information in this file includes server\-specific information such as what printcap file to use, as well as descriptions of all the services that the server is to provide\&. See
+smb\&.conf
+for more information\&. The default configuration file name is determined at compile time\&.
+.RE
+.PP
+\-l|\-\-log\-basename=logdirectory
+.RS 4
+Base directory name for log/debug files\&. The extension
+\fB"\&.progname"\fR
+will be appended (e\&.g\&. log\&.smbclient, log\&.smbd, etc\&.\&.\&.)\&. The log file is never removed by the client\&.
+.RE
+.PP
+\-?|\-\-help
+.RS 4
+Print a summary of command line options\&.
+.RE
+.SH "EXAMPLE SETUP"
+.PP
+To setup ntlm_auth for use by squid 2\&.5, with both basic and NTLMSSP authentication, the following should be placed in the
+squid\&.conf
+file\&.
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+auth_param ntlm program ntlm_auth \-\-helper\-protocol=squid\-2\&.5\-ntlmssp
+auth_param basic program ntlm_auth \-\-helper\-protocol=squid\-2\&.5\-basic
+auth_param basic children 5
+auth_param basic realm Squid proxy\-caching web server
+auth_param basic credentialsttl 2 hours
+.fi
+.if n \{\
+.RE
+.\}
+.if n \{\
+.sp
+.\}
+.RS 4
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.ps +1
+\fBNote\fR
+.ps -1
+.br
+.PP
+This example assumes that ntlm_auth has been installed into your path, and that the group permissions on
+winbindd_privileged
+are as described above\&.
+.sp .5v
+.RE
+.PP
+To setup ntlm_auth for use by squid 2\&.5 with group limitation in addition to the above example, the following should be added to the
+squid\&.conf
+file\&.
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+auth_param ntlm program ntlm_auth \-\-helper\-protocol=squid\-2\&.5\-ntlmssp \-\-require\-membership\-of=\*(AqWORKGROUP\eDomain Users\*(Aq
+auth_param basic program ntlm_auth \-\-helper\-protocol=squid\-2\&.5\-basic \-\-require\-membership\-of=\*(AqWORKGROUP\eDomain Users\*(Aq
+.fi
+.if n \{\
+.RE
+.\}
+.SH "TROUBLESHOOTING"
+.PP
+If you\*(Aqre experiencing problems with authenticating Internet Explorer running under MS Windows 9X or Millennium Edition against ntlm_auth\*(Aqs NTLMSSP authentication helper (\-\-helper\-protocol=squid\-2\&.5\-ntlmssp), then please read
+the Microsoft Knowledge Base article #239869 and follow instructions described there\&.
+.SH "VERSION"
+.PP
+This man page is correct for version 3 of the Samba suite\&.
+.SH "AUTHOR"
+.PP
+The original Samba software and related utilities were created by Andrew Tridgell\&. Samba is now developed by the Samba Team as an Open Source project similar to the way the Linux kernel is developed\&.
+.PP
+The ntlm_auth manpage was written by Jelmer Vernooij and Andrew Bartlett\&.
diff --git a/net/samba4/files/man/oLschema2ldif.1 b/net/samba4/files/man/oLschema2ldif.1
new file mode 100644
index 000000000000..cc026d1b7736
--- /dev/null
+++ b/net/samba4/files/man/oLschema2ldif.1
@@ -0,0 +1,74 @@
+'\" t
+.\"     Title: oLschema2ldif
+.\"    Author: [see the "AUTHOR" section]
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 02/03/2013
+.\"    Manual: System Administration tools
+.\"    Source: Samba 4.0
+.\"  Language: English
+.\"
+.TH "OLSCHEMA2LDIF" "1" "02/03/2013" "Samba 4\&.0" "System Administration tools"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "NAME"
+oLschema2ldif \- Converts LDAP schema\*(Aqs to LDB\-compatible LDIF
+.SH "SYNOPSIS"
+.HP \w'\fBoLschema2ldif\fR\ 'u
+\fBoLschema2ldif\fR [\-I\ INPUT\-FILE] [\-O\ OUTPUT\-FILE]
+.SH "DESCRIPTION"
+.PP
+oLschema2ldif is a simple tool that converts standard OpenLDAP schema files to a LDIF format that is understood by LDB\&.
+.SH "OPTIONS"
+.PP
+\-I input\-file
+.RS 4
+OpenLDAP schema to read\&. If none are specified, the schema file will be read from standard input\&.
+.RE
+.PP
+\-O output\-file
+.RS 4
+File to write ldif version of schema to\&.
+.RE
+.SH "VERSION"
+.PP
+This man page is correct for version 4\&.0 of the Samba suite\&.
+.SH "SEE ALSO"
+.PP
+ldb(7), ldbmodify, ldbdel, ldif(5)
+.SH "AUTHOR"
+.PP
+ldb was written by
+\m[blue]\fBAndrew Tridgell\fR\m[]\&\s-2\u[1]\d\s+2\&. oLschema2ldif was written by
+\m[blue]\fBSimo Sorce\fR\m[]\&\s-2\u[2]\d\s+2\&.
+.PP
+If you wish to report a problem or make a suggestion then please see the
+\m[blue]\fB\%http://ldb.samba.org/\fR\m[]
+web site for current contact and maintainer information\&.
+.SH "NOTES"
+.IP " 1." 4
+Andrew Tridgell
+.RS 4
+\%http://samba.org/~tridge/
+.RE
+.IP " 2." 4
+Simo Sorce
+.RS 4
+\%mailto:idra@samba.org
+.RE
diff --git a/net/samba4/files/man/regdiff.1 b/net/samba4/files/man/regdiff.1
new file mode 100644
index 000000000000..45a774236001
--- /dev/null
+++ b/net/samba4/files/man/regdiff.1
@@ -0,0 +1,87 @@
+'\" t
+.\"     Title: regdiff
+.\"    Author: [see the "AUTHOR" section]
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 02/03/2013
+.\"    Manual: System Administration tools
+.\"    Source: Samba 4.0
+.\"  Language: English
+.\"
+.TH "REGDIFF" "1" "02/03/2013" "Samba 4\&.0" "System Administration tools"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "NAME"
+regdiff \- Diff program for Windows registry files
+.SH "SYNOPSIS"
+.HP \w'\fBregdiff\fR\ 'u
+\fBregdiff\fR [\-\-help] [\-\-backend=BACKEND] [\-\-backend=BACKEND] [\-\-credentials=CREDENTIALS] [\-\-credentials=CREDENTIALS] [location] [location]
+.SH "DESCRIPTION"
+.PP
+regdiff compares two Windows registry files key by key and value by value and generates a text file that contains the differences between the two files\&.
+.PP
+A file generated by regdiff can later be applied to a registry file by the regpatch utility\&.
+.PP
+regdiff and regpatch use the same file format as the regedit32\&.exe utility from Windows\&.
+.SH "OPTIONS"
+.PP
+\-\-help
+.RS 4
+Show list of available options\&.
+.RE
+.PP
+\-\-backend BACKEND
+.RS 4
+Name of backend to load\&. Possible values are: creg, regf, dir and rpc\&. The default is
+\fIdir\fR\&.
+.sp
+This argument can be specified twice: once for the first registry file and once for the second\&.
+.RE
+.PP
+\-\-credentials=CREDENTIALS
+.RS 4
+Credentials to use, if any\&. Password should be separated from user name by a percent sign\&.
+.sp
+This argument can be specified twice: once for the first registry file and once for the second\&.
+.RE
+.SH "VERSION"
+.PP
+This man page is correct for version 4\&.0 of the Samba suite\&.
+.SH "SEE ALSO"
+.PP
+gregedit, regshell, regpatch, regtree, samba, patch, diff
+.SH "AUTHOR"
+.PP
+This utility is part of the
+\m[blue]\fBSamba\fR\m[]\&\s-2\u[1]\d\s+2
+suite, which is developed by the global
+\m[blue]\fBSamba Team\fR\m[]\&\s-2\u[2]\d\s+2\&.
+.PP
+This manpage and regdiff were written by Jelmer Vernooij\&.
+.SH "NOTES"
+.IP " 1." 4
+Samba
+.RS 4
+\%http://www.samba.org/
+.RE
+.IP " 2." 4
+Samba Team
+.RS 4
+\%http://www.samba.org/samba/team/
+.RE
diff --git a/net/samba4/files/man/regpatch.1 b/net/samba4/files/man/regpatch.1
new file mode 100644
index 000000000000..68c371a3b60c
--- /dev/null
+++ b/net/samba4/files/man/regpatch.1
@@ -0,0 +1,81 @@
+'\" t
+.\"     Title: regpatch
+.\"    Author: [see the "AUTHOR" section]
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 02/03/2013
+.\"    Manual: System Administration tools
+.\"    Source: Samba 4.0
+.\"  Language: English
+.\"
+.TH "REGPATCH" "1" "02/03/2013" "Samba 4\&.0" "System Administration tools"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "NAME"
+regpatch \- Applies registry patches to registry files
+.SH "SYNOPSIS"
+.HP \w'\fBregpatch\fR\ 'u
+\fBregpatch\fR [\-\-help] [\-\-backend=BACKEND] [\-\-credentials=CREDENTIALS] [location] [patch\-file]
+.SH "DESCRIPTION"
+.PP
+The regpatch utility applies registry patches to Windows registry files\&. The patch files should have the same format as is being used by the regdiff utility and regedit32\&.exe from Windows\&.
+.PP
+If no patch file is specified on the command line, regpatch attempts to read it from standard input\&.
+.SH "OPTIONS"
+.PP
+\-\-help
+.RS 4
+Show list of available options\&.
+.RE
+.PP
+\-\-backend BACKEND
+.RS 4
+Name of backend to load\&. Possible values are: creg, regf, dir and rpc\&. The default is
+\fIdir\fR\&.
+.RE
+.PP
+\-\-credentials=CREDENTIALS
+.RS 4
+Credentials to use, if any\&. Password should be separated from user name by a percent sign\&.
+.RE
+.SH "VERSION"
+.PP
+This man page is correct for version 4\&.0 of the Samba suite\&.
+.SH "SEE ALSO"
+.PP
+regdiff, regtree, regshell, gregedit, samba, diff, patch
+.SH "AUTHOR"
+.PP
+This utility is part of the
+\m[blue]\fBSamba\fR\m[]\&\s-2\u[1]\d\s+2
+suite, which is developed by the global
+\m[blue]\fBSamba Team\fR\m[]\&\s-2\u[2]\d\s+2\&.
+.PP
+This manpage and regpatch were written by Jelmer Vernooij\&.
+.SH "NOTES"
+.IP " 1." 4
+Samba
+.RS 4
+\%http://www.samba.org/
+.RE
+.IP " 2." 4
+Samba Team
+.RS 4
+\%http://www.samba.org/samba/team/
+.RE
diff --git a/net/samba4/files/man/regshell.1 b/net/samba4/files/man/regshell.1
new file mode 100644
index 000000000000..f7f11ee11040
--- /dev/null
+++ b/net/samba4/files/man/regshell.1
@@ -0,0 +1,177 @@
+'\" t
+.\"     Title: regshell
+.\"    Author: [see the "AUTHOR" section]
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 02/03/2013
+.\"    Manual: System Administration tools
+.\"    Source: Samba 4.0
+.\"  Language: English
+.\"
+.TH "REGSHELL" "1" "02/03/2013" "Samba 4\&.0" "System Administration tools"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "NAME"
+regshell \- Windows registry file browser using readline
+.SH "SYNOPSIS"
+.HP \w'\fBregshell\fR\ 'u
+\fBregshell\fR [\-\-help] [\-\-backend=BACKEND] [\-\-credentials=CREDENTIALS] [location]
+.SH "DESCRIPTION"
+.PP
+regshell is a utility that lets you browse thru a Windows registry file as if you were using a regular unix shell to browse thru a file system\&.
+.SH "OPTIONS"
+.PP
+\-\-help
+.RS 4
+Show list of available options\&.
+.RE
+.PP
+\-\-backend BACKEND
+.RS 4
+Name of backend to load\&. Possible values are: creg, regf, dir and rpc\&. The default is
+\fIdir\fR\&.
+.RE
+.PP
+\-\-credentials=CREDENTIALS
+.RS 4
+Credentials to use, if any\&. Password should be separated from user name by a percent sign\&.
+.RE
+.SH "COMMANDS"
+.PP
+ck|cd <keyname>
+.RS 4
+Go to the specified subkey\&.
+.RE
+.PP
+ch|predef [predefined\-key\-name]
+.RS 4
+Go to the specified predefined key\&.
+.RE
+.PP
+list|ls
+.RS 4
+List subkeys and values of the current key\&.
+.RE
+.PP
+mkkey|mkdir <keyname>
+.RS 4
+Create a key with the specified
+\fIkeyname\fR
+as a subkey of the current key\&.
+.RE
+.PP
+rmval|rm <valname>
+.RS 4
+Delete the specified value\&.
+.RE
+.PP
+rmkey|rmdir <keyname>
+.RS 4
+Delete the specified subkey recursively\&.
+.RE
+.PP
+pwd|pwk
+.RS 4
+Print the full name of the current key\&.
+.RE
+.PP
+set|update
+.RS 4
+Update the value of a key value\&. Not implemented at the moment\&.
+.RE
+.PP
+help|?
+.RS 4
+Print a list of available commands\&.
+.RE
+.PP
+exit|quit
+.RS 4
+Leave regshell\&.
+.RE
+.SH "EXAMPLES"
+.PP
+Browsing thru a nt4 registry file
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+\fBregshell \-b nt4 NTUSER\&.DAT\fR
+$$$PROTO\&.HIV> \fBls\fR
+K AppEvents
+K Console
+K Control Panel
+K Environment
+K Identities
+K Keyboard Layout
+K Network
+K Printers
+K Software
+K UNICODE Program Groups
+K Windows 3\&.1 Migration Status
+$$$PROTO\&.HIV> \fBexit\fR
+.fi
+.if n \{\
+.RE
+.\}
+.PP
+Listing the subkeys of HKEY_CURRENT_USER\eAppEvents on a remote computer:
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+\fBregshell \-\-remote=ncacn_np:aurelia \-c "jelmer%secret"\fR
+HKEY_CURRENT_MACHINE> \fBpredef HKEY_CURRENT_USER\fR
+HKEY_CURRENT_USER> \fBcd AppEvents\fR
+Current path is: HKEY_CURRENT_USER\eAppEvents
+HKEY_CURRENT_USER\eAppEvents> \fBls\fR
+K EventLabels
+K Schemes
+HKEY_CURRENT_USER\eAppEvents> \fBexit\fR
+.fi
+.if n \{\
+.RE
+.\}
+.SH "VERSION"
+.PP
+This man page is correct for version 4\&.0 of the Samba suite\&.
+.SH "SEE ALSO"
+.PP
+regtree, regdiff, regpatch, gregedit, samba
+.SH "AUTHOR"
+.PP
+This utility is part of the
+\m[blue]\fBSamba\fR\m[]\&\s-2\u[1]\d\s+2
+suite, which is developed by the global
+\m[blue]\fBSamba Team\fR\m[]\&\s-2\u[2]\d\s+2\&.
+.PP
+This manpage and regshell were written by Jelmer Vernooij\&.
+.SH "NOTES"
+.IP " 1." 4
+Samba
+.RS 4
+\%http://www.samba.org/
+.RE
+.IP " 2." 4
+Samba Team
+.RS 4
+\%http://www.samba.org/samba/team/
+.RE
diff --git a/net/samba4/files/man/regtree.1 b/net/samba4/files/man/regtree.1
new file mode 100644
index 000000000000..ab02f5f0a968
--- /dev/null
+++ b/net/samba4/files/man/regtree.1
@@ -0,0 +1,89 @@
+'\" t
+.\"     Title: regtree
+.\"    Author: [see the "AUTHOR" section]
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 02/03/2013
+.\"    Manual: System Administration tools
+.\"    Source: Samba 4.0
+.\"  Language: English
+.\"
+.TH "REGTREE" "1" "02/03/2013" "Samba 4\&.0" "System Administration tools"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "NAME"
+regtree \- Text\-mode registry viewer
+.SH "SYNOPSIS"
+.HP \w'\fBregtree\fR\ 'u
+\fBregtree\fR [\-\-help] [\-\-backend=BACKEND] [\-\-fullpath] [\-\-no\-values] [\-\-credentials=CREDENTIALS] [location]
+.SH "DESCRIPTION"
+.PP
+The regtree utility prints out all the contents of a Windows registry file\&. Subkeys are printed with one level more indentation than their parents\&.
+.SH "OPTIONS"
+.PP
+\-\-help
+.RS 4
+Show list of available options\&.
+.RE
+.PP
+\-\-backend BACKEND
+.RS 4
+Name of backend to load\&. Possible values are: creg, regf, dir and rpc\&. The default is
+\fIdir\fR\&.
+.RE
+.PP
+\-\-credentials=CREDENTIALS
+.RS 4
+Credentials to use, if any\&. Password should be separated from user name by a percent sign\&.
+.RE
+.PP
+\-\-fullpath
+.RS 4
+Print the full path to each key instead of only its name\&.
+.RE
+.PP
+\-\-no\-values
+.RS 4
+Don\*(Aqt print values, just keys\&.
+.RE
+.SH "VERSION"
+.PP
+This man page is correct for version 4\&.0 of the Samba suite\&.
+.SH "SEE ALSO"
+.PP
+gregedit, regshell, regdiff, regpatch, samba
+.SH "AUTHOR"
+.PP
+This utility is part of the
+\m[blue]\fBSamba\fR\m[]\&\s-2\u[1]\d\s+2
+suite, which is developed by the global
+\m[blue]\fBSamba Team\fR\m[]\&\s-2\u[2]\d\s+2\&.
+.PP
+This manpage and regtree were written by Jelmer Vernooij\&.
+.SH "NOTES"
+.IP " 1." 4
+Samba
+.RS 4
+\%http://www.samba.org/
+.RE
+.IP " 2." 4
+Samba Team
+.RS 4
+\%http://www.samba.org/samba/team/
+.RE
diff --git a/net/samba4/files/man/smbtorture.1 b/net/samba4/files/man/smbtorture.1
new file mode 100644
index 000000000000..b71f2d01293f
--- /dev/null
+++ b/net/samba4/files/man/smbtorture.1
@@ -0,0 +1,369 @@
+'\" t
+.\"     Title: smbtorture
+.\"    Author: [see the "AUTHOR" section]
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 02/03/2013
+.\"    Manual: Test Suite
+.\"    Source: Samba 4.0
+.\"  Language: English
+.\"
+.TH "SMBTORTURE" "1" "02/03/2013" "Samba 4\&.0" "Test Suite"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "NAME"
+smbtorture \- Run a series of tests against a SMB server
+.SH "SYNOPSIS"
+.HP \w'\fBsmbtorture\fR\ 'u
+\fBsmbtorture\fR
+.HP \w'\fBsmbtorture\fR\ 'u
+\fBsmbtorture\fR {//server/share} [\-d\ debuglevel] [\-U\ user%pass] [\-k] [\-N\ numprocs] [\-n\ netbios_name] [\-W\ workgroup] [\-o\ num_operations] [\-e\ num\ files(entries)] [\-O\ socket_options] [\-m\ maximum_protocol] [\-L] [\-c\ CLIENT\&.TXT] [\-t\ timelimit] [\-C\ filename] [\-A] [\-p\ port] [\-s\ seed] [\-f\ max_failures] [\-X] {BINDING\-STRING|UNC} {TEST1} [TEST2] [\&.\&.\&.]
+.SH "DESCRIPTION"
+.PP
+smbtorture is a testsuite that runs several tests against a SMB server\&. All tests are known to succeed against a Windows 2003 server (?)\&. Smbtorture\*(Aqs primary goal is finding differences in implementations of the SMB protocol and testing SMB servers\&.
+.PP
+Any number of tests can be specified on the command\-line\&. If no tests are specified, all tests are run\&.
+.PP
+If no arguments are specified at all, all available options and tests are listed\&.
+.SS "Binding string format"
+.PP
+The binding string format is:
+.PP
+TRANSPORT:host[flags]
+.PP
+Where TRANSPORT is either ncacn_np for SMB, ncacn_ip_tcp for RPC/TCP or ncalrpc for local connections\&.
+.PP
+\*(Aqhost\*(Aq is an IP or hostname or netbios name\&. If the binding string identifies the server side of an endpoint, \*(Aqhost\*(Aq may be an empty string\&.
+.PP
+\*(Aqflags\*(Aq can include a SMB pipe name if using the ncacn_np transport or a TCP port number if using the ncacn_ip_tcp transport, otherwise they will be auto\-determined\&.
+.PP
+other recognised flags are:
+.PP
+sign
+.RS 4
+enable ntlmssp signing
+.RE
+.PP
+seal
+.RS 4
+enable ntlmssp sealing
+.RE
+.PP
+connect
+.RS 4
+enable rpc connect level auth (auth, but no sign or seal)
+.RE
+.PP
+validate
+.RS 4
+enable the NDR validator
+.RE
+.PP
+print
+.RS 4
+enable debugging of the packets
+.RE
+.PP
+bigendian
+.RS 4
+use bigendian RPC
+.RE
+.PP
+padcheck
+.RS 4
+check reply data for non\-zero pad bytes
+.RE
+.PP
+For example, these all connect to the samr pipe:
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+ncacn_np:myserver
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+ncacn_np:myserver[samr]
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+ncacn_np:myserver[\e\epipe\e\esamr]
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+ncacn_np:myserver[/pipe/samr]
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+ncacn_np:myserver[samr,sign,print]
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+ncacn_np:myserver[\e\epipe\e\esamr,sign,seal,bigendian]
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+ncacn_np:myserver[/pipe/samr,seal,validate]
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+ncacn_np:
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+ncacn_np:[/pipe/samr]
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+ncacn_ip_tcp:myserver
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+ncacn_ip_tcp:myserver[1024]
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+ncacn_ip_tcp:myserver[1024,sign,seal]
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+ncalrpc:
+.RE
+.SS "UNC Format"
+.PP
+The UNC format is:
+.PP
+//server/share
+.SH "OPTIONS"
+.PP
+\-d debuglevel
+.RS 4
+Use the specified Samba debug level\&. A higher debug level means more output\&.
+.RE
+.PP
+\-U user%pass
+.RS 4
+Use the specified username/password combination when logging in to a remote server\&.
+.RE
+.PP
+\-k
+.RS 4
+Use kerberos when authenticating\&.
+.RE
+.PP
+\-W workgroup
+.RS 4
+Use specified name as our workgroup name\&.
+.RE
+.PP
+\-n netbios_name
+.RS 4
+Use specified name as our NetBIOS name\&.
+.RE
+.PP
+\-O socket_options
+.RS 4
+Use specified socket options, equivalent of the smb\&.conf option
+\(lqsocket options\(rq\&. See the smb\&.conf(5) manpage for details\&.
+.RE
+.PP
+\-m max_protocol
+.RS 4
+Specify the maximum SMB dialect that should be used\&. Possible values are: CORE, COREPLUS, LANMAN1, LANMAN2, NT1
+.RE
+.PP
+\-s seed
+.RS 4
+Initialize the randomizer using
+\fIseed\fR
+as seed\&.
+.RE
+.PP
+\-L
+.RS 4
+Use oplocks\&.
+.RE
+.PP
+\-X
+.RS 4
+Enable dangerous tests\&. Use with care! This might crash your server\&.\&.\&.
+.RE
+.PP
+\-t timelimit
+.RS 4
+Specify the NBENCH time limit in seconds\&. Defaults to 600\&.
+.RE
+.PP
+\-p ports
+.RS 4
+Specify ports to connect to\&.
+.RE
+.PP
+\-c file
+.RS 4
+Read NBENCH commands from
+\fIfile\fR
+instead of from CLIENT\&.TXT\&.
+.RE
+.PP
+\-A
+.RS 4
+Show not just OK or FAILED but more detailed output\&. Used only by DENY test at the moment\&.
+.RE
+.PP
+\-C filename
+.RS 4
+Load a list of UNC names from the specified filename\&. Smbtorture instances will connect to a random host from this list\&.
+.RE
+.PP
+\-N numprocs
+.RS 4
+Specify number of smbtorture processes to launch\&.
+.RE
+.PP
+\-o num_operations
+.RS 4
+Number of times some operations should be tried before assuming they\*(Aqre output is consistent (default:100)\&.
+.RE
+.PP
+\-e num_files
+.RS 4
+Number of entries to use in certain tests (such as creating X files) (default: 1000)\&.
+.RE
+.PP
+\-f max_failures
+.RS 4
+Number of failures before aborting a test (default: 1)\&.
+.RE
+.SH "VERSION"
+.PP
+This man page is correct for version 4\&.0 of the Samba suite\&.
+.SH "SEE ALSO"
+.PP
+Samba
+.SH "AUTHOR"
+.PP
+This utility is part of the
+\m[blue]\fBSamba\fR\m[]\&\s-2\u[1]\d\s+2
+suite, which is developed by the global
+\m[blue]\fBSamba Team\fR\m[]\&\s-2\u[2]\d\s+2\&.
+.PP
+smbtorture was written by Andrew Tridgell\&.
+.PP
+This manpage was written by Jelmer Vernooij\&.
+.SH "NOTES"
+.IP " 1." 4
+Samba
+.RS 4
+\%http://www.samba.org/
+.RE
+.IP " 2." 4
+Samba Team
+.RS 4
+\%http://www.samba.org/samba/team/
+.RE
diff --git a/net/samba4/files/patch-buildtools__scripts__abi_gen.sh b/net/samba4/files/patch-buildtools__scripts__abi_gen.sh
new file mode 100644
index 000000000000..b8ffd04d5822
--- /dev/null
+++ b/net/samba4/files/patch-buildtools__scripts__abi_gen.sh
@@ -0,0 +1,17 @@
+--- ./buildtools/scripts/abi_gen.sh.orig	2013-02-10 00:47:43.199878737 +0000
++++ ./buildtools/scripts/abi_gen.sh	2013-02-10 00:47:55.789877693 +0000
+@@ -9,6 +9,7 @@
+ cat <<EOF
+ set height 0
+ set width 0
++set print sevenbit-strings on
+ EOF
+ nm "$SHAREDLIB" | cut -d' ' -f2- | egrep '^[BDGTRVWS]' | grep -v @ | egrep -v ' (__bss_start|_edata|_init|_fini|_end)' | cut -c3- | sort | while read s; do
+     echo "echo $s: "
+@@ -17,5 +17,5 @@
+ ) > $GDBSCRIPT
+ 
+ # forcing the terminal avoids a problem on Fedora12
+-TERM=none gdb -batch -x $GDBSCRIPT "$SHAREDLIB" < /dev/null
++TERM=none %%GDB_CMD%% -batch -x $GDBSCRIPT "$SHAREDLIB" < /dev/null
+ rm -f $GDBSCRIPT
diff --git a/net/samba4/files/patch-buildtools__wafsamba__samba_install.py b/net/samba4/files/patch-buildtools__wafsamba__samba_install.py
new file mode 100644
index 000000000000..061202fe4868
--- /dev/null
+++ b/net/samba4/files/patch-buildtools__wafsamba__samba_install.py
@@ -0,0 +1,11 @@
+--- ./buildtools/wafsamba/samba_install.py.orig	2012-11-13 08:03:38.000000000 +0000
++++ ./buildtools/wafsamba/samba_install.py	2013-01-27 01:44:15.919866417 +0000
+@@ -111,7 +111,7 @@
+             inst_name    = bld.make_libname(t.target)
+     elif self.vnum:
+         vnum_base    = self.vnum.split('.')[0]
+-        install_name = bld.make_libname(target_name, version=self.vnum)
++        install_name = bld.make_libname(target_name, version=vnum_base)
+         install_link = bld.make_libname(target_name, version=vnum_base)
+         inst_name    = bld.make_libname(t.target)
+         if not self.private_library:
diff --git a/net/samba4/files/patch-buildtools__wafsamba__samba_pidl.py b/net/samba4/files/patch-buildtools__wafsamba__samba_pidl.py
new file mode 100644
index 000000000000..019fd57ad5b6
--- /dev/null
+++ b/net/samba4/files/patch-buildtools__wafsamba__samba_pidl.py
@@ -0,0 +1,11 @@
+--- ./buildtools/wafsamba/samba_pidl.py.orig	2013-01-27 23:15:21.739874063 +0000
++++ ./buildtools/wafsamba/samba_pidl.py	2013-01-27 23:15:50.549893124 +0000
+@@ -88,7 +88,7 @@
+     # prime the list of nodes we are dependent on with the cached pidl sources
+     t.allnodes = pidl_src_nodes
+ 
+-    t.env.PIDL = os.path.join(bld.srcnode.abspath(), 'pidl/pidl')
++    t.env.PIDL = os.path.join('%%LOCALBASE%%', 'bin/pidl')
+     t.env.OPTIONS = TO_LIST(options)
+     t.env.OUTPUTDIR = bld.bldnode.name + '/' + bld.path.find_dir(output_dir).bldpath(t.env)
+ 
diff --git a/net/samba4/files/patch-buildtools__wafsamba__wafsamba.py b/net/samba4/files/patch-buildtools__wafsamba__wafsamba.py
new file mode 100644
index 000000000000..73ab8df1ab9e
--- /dev/null
+++ b/net/samba4/files/patch-buildtools__wafsamba__wafsamba.py
@@ -0,0 +1,11 @@
+--- ./buildtools/wafsamba/wafsamba.py.orig	2013-02-05 12:25:25.000000000 +0000
++++ ./buildtools/wafsamba/wafsamba.py	2013-02-06 02:15:45.969880485 +0000
+@@ -790,7 +790,7 @@
+     '''build and install manual pages'''
+     bld.env.SAMBA_EXPAND_XSL = bld.srcnode.abspath() + '/docs-xml/xslt/expand-sambadoc.xsl'
+     bld.env.SAMBA_MAN_XSL = bld.srcnode.abspath() + '/docs-xml/xslt/man.xsl'
+-    bld.env.SAMBA_CATALOGS = 'file:///etc/xml/catalog file:///usr/local/share/xml/catalog file://' + bld.srcnode.abspath() + '/bin/default/docs-xml/build/catalog.xml'
++    bld.env.SAMBA_CATALOGS = 'file://%%LOCALBASE%%/share/xml/catalog file://' + bld.srcnode.abspath() + '/bin/default/docs-xml/build/catalog.xml'
+ 
+     for m in manpages.split():
+         source = m + '.xml'
diff --git a/net/samba4/files/patch-docs-xml__wscript_build b/net/samba4/files/patch-docs-xml__wscript_build
new file mode 100644
index 000000000000..5f68097926d2
--- /dev/null
+++ b/net/samba4/files/patch-docs-xml__wscript_build
@@ -0,0 +1,10 @@
+--- ./docs-xml/wscript_build.orig	2013-02-05 02:34:14.929894486 +0000
++++ ./docs-xml/wscript_build	2013-02-05 02:34:33.030266035 +0000
+@@ -3,7 +3,6 @@
+ manpages='''
+          manpages/eventlogadm.8
+          manpages/findsmb.1
+-         manpages/libsmbclient.7
+          manpages/lmhosts.5
+          manpages/log2pcap.1
+          manpages/idmap_ad.8
diff --git a/net/samba4/files/patch-dynconfig__config.m4 b/net/samba4/files/patch-dynconfig__config.m4
new file mode 100644
index 000000000000..9f0b9d5b1372
--- /dev/null
+++ b/net/samba4/files/patch-dynconfig__config.m4
@@ -0,0 +1,34 @@
+--- ./dynconfig/config.m4.orig	2012-10-02 08:38:44.000000000 +0000
++++ ./dynconfig/config.m4	2013-01-27 07:13:46.156404375 +0000
+@@ -60,6 +60,22 @@
+ 	PRIVILEGED_SOCKET_DIR="\${localstatedir}/lib/samba"
+ fi
+ 
++AC_ARG_WITH(pkgconfigdir,
++[AS_HELP_STRING([--with-pkgconfigdir=DIR],
++ [Which directory to use for .pc files ($libdir/pkgconfig)])],
++[ case "$withval" in
++  yes|no)
++  #
++  # Just in case anybody calls it without argument
++  #
++    AC_MSG_WARN([--with-pkgconfigdir called without argument - will use default])
++  ;;
++  * )
++    PKGCONFIGDIR="$withval"
++  ;;
++  esac])
++
++
+ AC_ARG_WITH(modulesdir,
+ [AS_HELP_STRING([--with-modulesdir=DIR],
+  [Which directory to use for modules ($exec_prefix/modules)])],
+@@ -261,7 +277,7 @@
+ NMBDSOCKETDIR="${SOCKET_DIR}/nmbd"
+ NTP_SIGND_SOCKET_DIR="${SOCKET_DIR}/ntp_signd"
+ NCALRPCDIR="${SOCKET_DIR}/ncalrpc"
+-CONFIGFILE="${CONFIGDIR}/smb.conf"
++CONFIGFILE="${CONFIGDIR}/%%SAMBA4_CONFIG%%"
+ LMHOSTSFILE="${CONFIGDIR}/lmhosts"
+ SMB_PASSWD_FILE="${PRIVATE_DIR}/smbpasswd"
+ 
diff --git a/net/samba4/files/patch-dynconfig__wscript b/net/samba4/files/patch-dynconfig__wscript
new file mode 100644
index 000000000000..713065911f55
--- /dev/null
+++ b/net/samba4/files/patch-dynconfig__wscript
@@ -0,0 +1,32 @@
+--- ./dynconfig/wscript.orig	2012-11-13 08:03:38.000000000 +0000
++++ ./dynconfig/wscript	2013-01-29 19:43:57.489880918 +0000
+@@ -127,6 +127,8 @@
+     'PKGCONFIGDIR' : {
+          'STD-PATH':  '${LIBDIR}/pkgconfig',
+          'FHS-PATH':  '${LIBDIR}/pkgconfig',
++         'OPTION':    '--with-pkgconfigdir',
++         'HELPTEXT':  'Where to put .pc files',
+     },
+     'SWATDIR' : {
+          'STD-PATH':  '${DATADIR}/swat',
+@@ -236,8 +238,8 @@
+          'DELAY':     True,
+     },
+     'CONFIGFILE' : {
+-         'STD-PATH':  '${CONFIGDIR}/smb.conf',
+-         'FHS-PATH':  '${CONFIGDIR}/smb.conf',
++         'STD-PATH':  '${CONFIGDIR}/%%SAMBA4_CONFIG%%',
++         'FHS-PATH':  '${CONFIGDIR}/%%SAMBA4_CONFIG%%',
+          'DELAY':     True,
+     },
+     'LMHOSTSFILE' : {
+@@ -294,9 +296,6 @@
+         flavor = 'FHS-PATH'
+     else:
+         flavor = 'STD-PATH'
+-        if conf.env.PREFIX == '/usr' or conf.env.PREFIX == '/usr/local':
+-           Logs.error("Don't install directly under /usr or /usr/local without using the FHS option (--enable-fhs)")
+-           raise Utils.WafError("ERROR: invalid --prefix=%s value" % (conf.env.PREFIX))
+ 
+     explicit_set ={}
+ 
diff --git a/net/samba4/files/patch-lib__replace__wscript b/net/samba4/files/patch-lib__replace__wscript
new file mode 100644
index 000000000000..0b4f057f719c
--- /dev/null
+++ b/net/samba4/files/patch-lib__replace__wscript
@@ -0,0 +1,10 @@
+--- ./lib/replace/wscript.orig	2013-02-05 12:25:25.000000000 +0000
++++ ./lib/replace/wscript	2013-02-15 06:29:28.649888344 +0000
+@@ -344,7 +344,6 @@
+             conf.CHECK_FUNCS_IN('gettext', 'intl', checklibc=True, headers='libintl.h')
+ 
+     conf.CHECK_FUNCS_IN('dgettext gettext', 'intl', headers='libintl.h')
+-    conf.CHECK_FUNCS_IN('pthread_create', 'pthread', checklibc=True, headers='pthread.h')
+ 
+     conf.CHECK_FUNCS_IN('crypt', 'crypt', checklibc=True)
+ 
diff --git a/net/samba4/files/patch-lib__socket__interfaces.c b/net/samba4/files/patch-lib__socket__interfaces.c
new file mode 100644
index 000000000000..14ad00e5b693
--- /dev/null
+++ b/net/samba4/files/patch-lib__socket__interfaces.c
@@ -0,0 +1,50 @@
+https://bugzilla.samba.org/show_bug.cgi?id=9666
+
+--- ./lib/socket/interfaces.c.orig	2012-10-02 08:24:40.000000000 +0000
++++ ./lib/socket/interfaces.c	2013-02-18 06:52:41.529874139 +0000
+@@ -185,7 +185,22 @@
+ 
+ 		memcpy(&ifaces[total].ip, ifptr->ifa_addr, copy_size);
+ 		memcpy(&ifaces[total].netmask, ifptr->ifa_netmask, copy_size);
++		/* calculate broadcast address */
++#if defined(HAVE_IPV6)
++		if (ifptr->ifa_addr->sa_family == AF_INET6) {
++			struct sockaddr_in6 *sin6 =
++				(struct sockaddr_in6 *)ifptr->ifa_addr;
++			struct in6_addr *in6 =
++				(struct in6_addr *)&sin6->sin6_addr;
+ 
++			if (IN6_IS_ADDR_LINKLOCAL(in6) || IN6_IS_ADDR_V4COMPAT(in6)) {
++				sin6->sin6_scope_id = if_nametoindex(ifptr->ifa_name);
++				continue;
++			}
++			/* IPv6 does not have broadcast it uses multicast. */
++			memset(&ifaces[total].bcast, '\0', copy_size);
++		} else
++#endif
+ 		if (ifaces[total].flags & (IFF_BROADCAST|IFF_LOOPBACK)) {
+ 			make_bcast(&ifaces[total].bcast,
+ 				&ifaces[total].ip,
+@@ -195,20 +210,8 @@
+ 			memcpy(&ifaces[total].bcast,
+ 				ifptr->ifa_dstaddr,
+ 				copy_size);
+-#if defined(HAVE_IPV6)
+-		} else if (ifptr->ifa_addr->sa_family == AF_INET6) {
+-			const struct sockaddr_in6 *sin6 =
+-				(const struct sockaddr_in6 *)ifptr->ifa_addr;
+-			const struct in6_addr *in6 =
+-				(const struct in6_addr *)&sin6->sin6_addr;
+-
+-			if (IN6_IS_ADDR_LINKLOCAL(in6) || IN6_IS_ADDR_V4COMPAT(in6)) {
+-				continue;
+-			}
+-			/* IPv6 does not have broadcast it uses multicast. */
+-			memset(&ifaces[total].bcast, '\0', copy_size);
+-#endif
+-		} else {
++		}
++		else {
+ 			continue;
+ 		}
+ 
diff --git a/net/samba4/files/patch-nsswitch__wins_freebsd.c b/net/samba4/files/patch-nsswitch__wins_freebsd.c
new file mode 100644
index 000000000000..b526acc53730
--- /dev/null
+++ b/net/samba4/files/patch-nsswitch__wins_freebsd.c
@@ -0,0 +1,82 @@
+--- ./nsswitch/wins_freebsd.c.orig	2010-04-23 01:08:35.000000000 +0200
++++ ./nsswitch/wins_freebsd.c	2010-04-23 01:08:35.000000000 +0200
+@@ -0,0 +1,79 @@
++/* 
++   Unix SMB/CIFS implementation.
++
++   Copyright (C) Timur I. Bakeyev 2007
++   
++   This library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Library General Public
++   License as published by the Free Software Foundation; either
++   version 2 of the License, or (at your option) any later version.
++   
++   This library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Library General Public License for more details.
++   
++   You should have received a copy of the GNU Library General Public
++   License along with this library; if not, write to the
++   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
++   Boston, MA  02111-1307, USA.   
++*/
++
++#include "winbind_client.h"
++
++NSS_STATUS _nss_wins_gethostbyname2_r(const char *name, int af, struct hostent *he,
++			   char *buffer, size_t buflen, int *h_errnop);
++
++NSS_METHOD_PROTOTYPE(__nss_wins_freebsd_gethostbyname2_r);
++
++static ns_mtab methods[] =
++{
++	{ NSDB_HOSTS, "getaddrinfo",	  NULL, NULL },
++	{ NSDB_HOSTS, "ghbyname",	  NULL, NULL },
++	{ NSDB_HOSTS, "ghbyaddr",	  NULL, NULL },
++	{ NSDB_HOSTS, "gethostbyaddr_r",  NULL, NULL },
++	{ NSDB_HOSTS, "gethostbyname2_r", __nss_wins_freebsd_gethostbyname2_r, _nss_wins_gethostbyname2_r },
++	{ NSDB_HOSTS, "getnetbyname_r",	  NULL, NULL },
++	{ NSDB_HOSTS, "getnetbyaddr_r",	  NULL, NULL },
++	{ NSDB_HOSTS, "gethostbyname",	  NULL, NULL },
++	{ NSDB_HOSTS, "gethostbyaddr",	  NULL, NULL },
++	{ NSDB_HOSTS, "getnetbyname",	  NULL, NULL },
++	{ NSDB_HOSTS, "getnetbyaddr",	  NULL, NULL }
++};
++
++int
++__nss_wins_freebsd_gethostbyname2_r(void *retval, void *mdata, va_list ap)
++{
++	int (*fn)(const char *, int, struct hostent *, char *, size_t, int *);
++	const char	*hostname;
++	int		af;
++	struct hostent	*he;
++	char		*buffer;
++	size_t		buflen;
++	int		*h_errnop;
++	enum nss_status	status;
++	
++	fn = mdata;
++	hostname = va_arg(ap, const char *);
++	af = va_arg(ap, int);
++	he = va_arg(ap, struct hostent *);
++	buffer = va_arg(ap, char *);
++	buflen = va_arg(ap, size_t);
++	h_errnop = va_arg(ap, int *);
++
++	status = fn(hostname, af, he, buffer, buflen, h_errnop);
++	status = __nss_compat_result(status, *h_errnop);
++	if (status == NS_SUCCESS)
++		*(struct hostent **)retval = he;
++	
++	return (status);
++}
++
++ns_mtab *
++nss_module_register(const char *source __unused, unsigned int *mtabsize,
++    nss_module_unregister_fn *unreg)
++{
++	*mtabsize = sizeof(methods) / sizeof(methods[0]);
++	*unreg = NULL;
++	return (methods);
++}
diff --git a/net/samba4/files/patch-nsswitch__wscript_build b/net/samba4/files/patch-nsswitch__wscript_build
new file mode 100644
index 000000000000..b37a6547bd22
--- /dev/null
+++ b/net/samba4/files/patch-nsswitch__wscript_build
@@ -0,0 +1,11 @@
+--- ./nsswitch/wscript_build.orig	2012-12-04 10:07:44.000000000 +0000
++++ ./nsswitch/wscript_build	2013-02-02 17:36:40.409893341 +0000
+@@ -42,7 +42,7 @@
+ 	bld.SAMBA_LIBRARY('nss_winbind',
+ 			  source='winbind_nss_linux.c winbind_nss_freebsd.c',
+ 			  deps='winbind-client',
+-			  realname='libnss_winbind.so.1',
++			  realname='nss_winbind.so.1',
+ 			  vnum='1')
+ 
+ elif (host_os.rfind('netbsd') > -1):
diff --git a/net/samba4/files/patch-source3__modules__vfs_zfsacl.c b/net/samba4/files/patch-source3__modules__vfs_zfsacl.c
new file mode 100644
index 000000000000..8021ca73b295
--- /dev/null
+++ b/net/samba4/files/patch-source3__modules__vfs_zfsacl.c
@@ -0,0 +1,19 @@
+--- ./source3/modules/vfs_zfsacl.c.orig	2013-02-05 12:25:25.000000000 +0000
++++ ./source3/modules/vfs_zfsacl.c	2013-02-06 02:16:53.149872040 +0000
+@@ -269,13 +269,14 @@
+ 
+ static SMB_ACL_T zfsacl_fail__sys_acl_get_file(vfs_handle_struct *handle,
+ 					       const char *path_p,
+-					       SMB_ACL_TYPE_T type)
++					       SMB_ACL_TYPE_T type,
++					       TALLOC_CTX *mem_ctx)
+ {
+ 	return (SMB_ACL_T)NULL;
+ }
+ 
+ static SMB_ACL_T zfsacl_fail__sys_acl_get_fd(vfs_handle_struct *handle,
+-					     files_struct *fsp)
++					     files_struct *fsp, TALLOC_CTX *mem_ctx)
+ {
+ 	return (SMB_ACL_T)NULL;
+ }
diff --git a/net/samba4/files/patch-source3__smbd__quotas.c b/net/samba4/files/patch-source3__smbd__quotas.c
new file mode 100644
index 000000000000..be4d6b9a9fe9
--- /dev/null
+++ b/net/samba4/files/patch-source3__smbd__quotas.c
@@ -0,0 +1,19 @@
+--- ./source3/smbd/quotas.c.orig	2010-04-01 15:26:22.000000000 +0200
++++ ./source3/smbd/quotas.c	2010-04-23 01:08:35.000000000 +0200
+@@ -1235,6 +1235,7 @@
+ 	if (!cutstr)
+ 		return False;
+ 
++	memset(&D, '\0', sizeof(D));
+ 	memset(cutstr, '\0', len+1);
+ 	host = strncat(cutstr,mnttype, sizeof(char) * len );
+ 	DEBUG(5,("nfs_quotas: looking for mount on \"%s\"\n", cutstr));
+@@ -1243,7 +1244,7 @@
+ 	args.gqa_pathp = testpath+1;
+ 	args.gqa_uid = uid;
+ 
+-	DEBUG(5,("nfs_quotas: Asking for host \"%s\" rpcprog \"%i\" rpcvers \"%i\" network \"%s\"\n", host, RQUOTAPROG, RQUOTAVERS, "udp"));
++	DEBUG(5,("nfs_quotas: Asking for host \"%s\" rpcprog \"%lu\" rpcvers \"%lu\" network \"%s\"\n", host, RQUOTAPROG, RQUOTAVERS, "udp"));
+ 
+ 	if ((clnt = clnt_create(host, RQUOTAPROG, RQUOTAVERS, "udp")) == NULL) {
+ 		ret = False;
diff --git a/net/samba4/files/patch-source3__utils__net.c b/net/samba4/files/patch-source3__utils__net.c
new file mode 100644
index 000000000000..aa4853a7624e
--- /dev/null
+++ b/net/samba4/files/patch-source3__utils__net.c
@@ -0,0 +1,18 @@
+--- ./source3/utils/net.c.orig	2013-01-29 08:49:31.000000000 +0000
++++ ./source3/utils/net.c	2013-01-31 15:04:24.069877314 +0000
+@@ -898,8 +898,13 @@
+ 		set_global_myname(c->opt_requester_name);
+ 	}
+ 
+-	if (!c->opt_user_name && getenv("LOGNAME")) {
+-		c->opt_user_name = getenv("LOGNAME");
++	if (!c->opt_user_name) {
++		if(getenv("LOGNAME"))
++			c->opt_user_name = getenv("LOGNAME");
++		else
++			d_fprintf(stderr,
++				_("Environment LOGNAME is not defined."
++			          " Trying anonymous access.\n"));
+ 	}
+ 
+ 	if (!c->opt_workgroup) {
diff --git a/net/samba4/files/patch-source3__utils__net_time.c b/net/samba4/files/patch-source3__utils__net_time.c
new file mode 100644
index 000000000000..6c6ce7614652
--- /dev/null
+++ b/net/samba4/files/patch-source3__utils__net_time.c
@@ -0,0 +1,19 @@
+--- ./source3/utils/net_time.c.orig	2010-04-01 15:26:22.000000000 +0200
++++ ./source3/utils/net_time.c	2010-04-23 01:08:35.000000000 +0200
+@@ -87,10 +87,15 @@
+ 	if (!tm) {
+ 		return "unknown";
+ 	}
+-
++#if defined(FREEBSD)
++	return talloc_asprintf(talloc_tos(), "%02d%02d%02d%02d%02d.%02d",
++				tm->tm_year + 1900, tm->tm_mon+1, tm->tm_mday,
++				tm->tm_hour, tm->tm_min, tm->tm_sec);
++#else
+ 	return talloc_asprintf(talloc_tos(), "%02d%02d%02d%02d%04d.%02d",
+ 			       tm->tm_mon+1, tm->tm_mday, tm->tm_hour,
+ 			       tm->tm_min, tm->tm_year + 1900, tm->tm_sec);
++#endif
+ }
+ 
+ int net_time_usage(struct net_context *c, int argc, const char **argv)
diff --git a/net/samba4/files/patch-source3__winbindd__wscript_build b/net/samba4/files/patch-source3__winbindd__wscript_build
new file mode 100644
index 000000000000..5e1fc538a7fc
--- /dev/null
+++ b/net/samba4/files/patch-source3__winbindd__wscript_build
@@ -0,0 +1,55 @@
+--- ./source3/winbindd/wscript_build.orig	2013-02-05 12:25:26.000000000 +0000
++++ ./source3/winbindd/wscript_build	2013-02-08 11:47:42.280566856 +0000
+@@ -18,9 +18,9 @@
+ 
+ bld.SAMBA3_LIBRARY('idmap',
+                    source=IDMAP_SRC,
+-                   deps='samba-util',
+-                   vars=locals(),
++                   deps='samba-util pdb',
+                    allow_undefined_symbols=True,
++                   vars=locals(),
+                    private_library=True)
+ 
+ bld.SAMBA3_SUBSYSTEM('IDMAP_HASH',
+@@ -36,9 +36,9 @@
+ 
+ bld.SAMBA3_MODULE('idmap_ad',
+                  subsystem='idmap',
+-                 allow_undefined_symbols=True,
+                  source='',
+                  deps='IDMAP_AD',
++                 allow_undefined_symbols=True,
+                  init_function='',
+                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_ad'),
+                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_ad') and bld.CONFIG_SET("HAVE_LDAP"))
+@@ -80,6 +80,7 @@
+                  subsystem='idmap',
+                  source=IDMAP_TDB_SRC,
+                  deps='samba-util tdb',
++                 allow_undefined_symbols=True,
+                  init_function='',
+                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_tdb'),
+                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_tdb'))
+@@ -87,7 +88,7 @@
+ bld.SAMBA3_MODULE('idmap_tdb2',
+                  subsystem='idmap',
+                  source=IDMAP_TDB2_SRC,
+-                 deps='samba-util tdb',
++                 deps='samba-util tdb param',
+                  init_function='',
+                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_tdb2'),
+                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_tdb2'))
+@@ -105,10 +106,10 @@
+                  subsystem='idmap',
+                  source=IDMAP_AUTORID_SRC,
+                  deps='samba-util tdb',
++                 allow_undefined_symbols=True,
+                  init_function='',
+                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_autorid'),
+-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_autorid'),
+-                  allow_undefined_symbols=True)
++                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_autorid'))
+ 
+ 
+ NSS_INFO_TEMPLATE_SRC = 'nss_info_template.c'
diff --git a/net/samba4/files/patch-source3__wscript b/net/samba4/files/patch-source3__wscript
new file mode 100644
index 000000000000..dc2f912ffe2b
--- /dev/null
+++ b/net/samba4/files/patch-source3__wscript
@@ -0,0 +1,68 @@
+--- ./source3/wscript.orig	2013-02-05 12:25:26.000000000 +0000
++++ ./source3/wscript	2013-02-15 17:54:40.099886239 +0000
+@@ -475,7 +475,7 @@
+             conf.CHECK_CODE('struct aiocb a; return aio_return(&a);', 'HAVE_AIO_RETURN', msg='Checking for aio_return', headers='aio.h', lib='aio rt')
+             conf.CHECK_CODE('struct aiocb a; return aio_error(&a);', 'HAVE_AIO_ERROR', msg='Checking for aio_error', headers='aio.h', lib='aio rt')
+             conf.CHECK_CODE('struct aiocb a; return aio_cancel(1, &a);', 'HAVE_AIO_CANCEL', msg='Checking for aio_cancel', headers='aio.h', lib='aio rt')
+-            conf.CHECK_CODE('struct aiocb a; struct timespec t; return aio_suspend(&a, 1, &t);', 'HAVE_AIO_SUSPEND', msg='Checking for aio_suspend', headers='aio.h', lib='aio rt')
++            conf.CHECK_CODE('const struct aiocb * const a[1]; struct timespec t; return aio_suspend(a, 1, &t);', 'HAVE_AIO_SUSPEND', msg='Checking for aio_suspend', headers='aio.h', lib='aio rt')
+         if not conf.CONFIG_SET('HAVE_AIO'):
+             conf.DEFINE('HAVE_NO_AIO', '1')
+     else:
+@@ -1644,26 +1644,8 @@
+ 
+     if PTHREAD_LDFLAGS == 'error':
+         if conf.CHECK_FUNCS_IN('pthread_attr_init', 'pthread'):
+-            PTHREAD_CFLAGS='-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS'
+-            PTHREAD_LDFLAGS='-lpthread'
+-    if PTHREAD_LDFLAGS == 'error':
+-        if conf.CHECK_FUNCS_IN('pthread_attr_init', 'pthreads'):
+-            PTHREAD_CFLAGS='-D_THREAD_SAFE'
+-            PTHREAD_LDFLAGS='-lpthreads'
+-    if PTHREAD_LDFLAGS == 'error':
+-        if conf.CHECK_FUNCS_IN('pthread_attr_init', 'c_r'):
+-            PTHREAD_CFLAGS='-D_THREAD_SAFE -pthread'
++            PTHREAD_CFLAGS='-pthread'
+             PTHREAD_LDFLAGS='-pthread'
+-    if PTHREAD_LDFLAGS == 'error':
+-        if conf.CHECK_FUNCS('pthread_attr_init'):
+-            PTHREAD_CFLAGS='-D_REENTRANT'
+-            PTHREAD_LDFLAGS='-lpthread'
+-    # especially for HP-UX, where the CHECK_FUNC macro fails to test for
+-    # pthread_attr_init. On pthread_mutex_lock it works there...
+-    if PTHREAD_LDFLAGS == 'error':
+-        if conf.CHECK_FUNCS_IN('pthread_mutex_lock', 'pthread'):
+-            PTHREAD_CFLAGS='-D_REENTRANT'
+-            PTHREAD_LDFLAGS='-lpthread'
+ 
+     if PTHREAD_CFLAGS != 'error' and PTHREAD_LDFLAGS != 'error':
+         conf.ADD_CFLAGS(PTHREAD_CFLAGS)
+@@ -1693,8 +1675,8 @@
+                                       auth_script vfs_readahead vfs_xattr_tdb vfs_posix_eadb
+                                       vfs_streams_xattr vfs_streams_depot vfs_acl_xattr vfs_acl_tdb
+                                       vfs_smb_traffic_analyzer vfs_preopen vfs_catia vfs_scannedonly
+-				      vfs_media_harmony
+-				      vfs_commit
++                                      vfs_media_harmony
++                                      vfs_commit
+                                       vfs_crossrename vfs_linux_xfs_sgid
+                                       vfs_time_audit idmap_autorid idmap_tdb2
+                                       idmap_rid idmap_hash'''))
+@@ -1707,7 +1689,7 @@
+ 
+     if Options.options.enable_selftest or Options.options.developer:
+         default_shared_modules.extend(TO_LIST('vfs_fake_acls'))
+-        
++
+ 
+     if conf.CONFIG_SET('AD_DC_BUILD_IS_ENABLED'):
+         default_static_modules.extend(TO_LIST('pdb_samba_dsdb auth_samba4 vfs_dfs_samba4'))
+@@ -1740,7 +1722,7 @@
+         default_static_modules.extend(TO_LIST('charset_macosxfs'))
+ 
+     if conf.CONFIG_SET('HAVE_GPFS'):
+-	default_shared_modules.extend(TO_LIST('vfs_gpfs'))
++        default_shared_modules.extend(TO_LIST('vfs_gpfs'))
+ 
+     explicit_shared_modules = TO_LIST(Options.options.shared_modules, delimiter=',')
+     explicit_static_modules = TO_LIST(Options.options.static_modules, delimiter=',')
diff --git a/net/samba4/files/patch-source3__wscript_build b/net/samba4/files/patch-source3__wscript_build
new file mode 100644
index 000000000000..037b5e9fd9ce
--- /dev/null
+++ b/net/samba4/files/patch-source3__wscript_build
@@ -0,0 +1,52 @@
+--- ./source3/wscript_build.orig	2012-12-11 17:10:13.000000000 +0000
++++ ./source3/wscript_build	2013-02-05 04:25:57.199878484 +0000
+@@ -1,7 +1,8 @@
+ #!/usr/bin/env python
+ 
+ from samba_utils import *
+-import samba_version, samba3
++import samba_version, samba3, sys
++host_os = sys.platform
+ 
+ TDB_LIB_SRC = '''
+ 	  lib/dbwrap/dbwrap_open.c
+@@ -651,7 +652,16 @@
+                     vnum='0',
+                     vars=locals())
+ 
+-bld.SAMBA3_LIBRARY('nss_wins',
++if (host_os.rfind('freebsd') > -1):
++        # FreeBSD winbind client is implemented as a wrapper around
++        # the Linux version.
++        bld.SAMBA3_LIBRARY('nss_wins',
++                  source=' '.join([WINBIND_WINS_NSS_SRC, '../nsswitch/wins_freebsd.c']),
++                  deps='''param libsmb LIBTSOCKET''',
++                  realname='nss_wins.so.1',
++                  vnum='1')
++else:
++        bld.SAMBA3_LIBRARY('nss_wins',
+                   source=WINBIND_WINS_NSS_SRC,
+                   deps='''param libsmb LIBTSOCKET''',
+                   realname='libnss_wins.so.2',
+@@ -972,10 +982,11 @@
+                     LIBAFS_SETTOKEN
+                     RPC_SERVER
+                     NDR_SMBXSRV
+-		    LIBASYS
++                    LIBASYS
+                     ccan-hash
+                     NDR_SMB_ACL
+                     netapi
++                    inotify
+                     ''' + bld.env['dmapi_lib'],
+                     private_library=True,
+                     vars=locals())
+@@ -1629,7 +1640,7 @@
+ 
+ bld.SAMBA3_PYTHON('pylibsmb',
+                   source='libsmb/pylibsmb.c',
+-                  deps='smbclient samba-credentials',
++                  deps='smbclient samba-credentials libsmb errors',
+                   realname='samba/samba3/libsmb_samba_internal.so'
+                   )
+ 
diff --git a/net/samba4/files/patch-source4__dns_server__dns_crypto.c b/net/samba4/files/patch-source4__dns_server__dns_crypto.c
new file mode 100644
index 000000000000..07dfc4bcc407
--- /dev/null
+++ b/net/samba4/files/patch-source4__dns_server__dns_crypto.c
@@ -0,0 +1,79 @@
+From 27b732f6bfcdcd96fd76e89c624f5f18ca944531 Mon Sep 17 00:00:00 2001
+From: Guenter Kukkukk <kukks@samba.org>
+Date: Sat, 16 Feb 2013 16:53:16 +0100
+Subject: [PATCH] Fix internal DNS dyn. update, seen as: ; TSIG error with server: tsig verify failure
+
+The dns update signed response must be handled differently than the TKEY response
+
+Signed-off-by: Guenter Kukkukk <kukks@samba.org>
+---
+ source4/dns_server/dns_crypto.c |   44 ++++++++++++++++++++++++++++++++------
+ 1 files changed, 37 insertions(+), 7 deletions(-)
+
+diff --git a/source4/dns_server/dns_crypto.c b/source4/dns_server/dns_crypto.c
+index 7604a05..71adf68 100644
+--- ./source4/dns_server/dns_crypto.c
++++ ./source4/dns_server/dns_crypto.c
+@@ -244,6 +244,8 @@ WERROR dns_sign_tsig(struct dns_server *dns,
+ 	DATA_BLOB packet_blob, tsig_blob, sig;
+ 	uint8_t *buffer = NULL;
+ 	size_t buffer_len = 0;
++	size_t miclen_bytes = 0;
++	size_t mic_size = 0;
+ 	struct dns_server_tkey * tkey = NULL;
+ 	struct dns_res_rec *tsig = talloc_zero(mem_ctx, struct dns_res_rec);
+ 
+@@ -298,16 +300,44 @@ WERROR dns_sign_tsig(struct dns_server *dns,
+ 		return DNS_ERR(SERVER_FAILURE);
+ 	}
+ 
+-	buffer_len = packet_blob.length + tsig_blob.length;
+-	buffer = talloc_zero_array(mem_ctx, uint8_t, buffer_len);
+-	if (buffer == NULL) {
+-		return WERR_NOMEM;
+-	}
++	/* DNS update must be handled differently than the TKEY case */ 
++	if ((packet->operation & DNS_OPCODE) == DNS_OPCODE_UPDATE) {
++		/* Here the request MIC must be placed in front of the buffer.
++		   Calculate the length of the buffer used for the request MIC:
++		   2 bytes (sizeof uint16_t) for the length itself
++		   length bytes of the MIC (here 16 + 12 = 28 bytes) */
++		miclen_bytes = sizeof(state->tsig->rdata.tsig_record.mac_size);
++		mic_size     = miclen_bytes + state->tsig->rdata.tsig_record.mac_size;
++
++		buffer_len = mic_size + packet_blob.length + tsig_blob.length;
++		buffer = talloc_zero_array(mem_ctx, uint8_t, buffer_len);
++		if (buffer == NULL) {
++			return WERR_NOMEM;
++		}
+ 
+-	memcpy(buffer, packet_blob.data, packet_blob.length);
+-	memcpy(buffer+packet_blob.length, tsig_blob.data, tsig_blob.length);
++		/* copy the 2 length bytes of request MIC in big-endian order */
++		RSSVAL(buffer,0,state->tsig->rdata.tsig_record.mac_size);
+ 
++		/* copy the request MIC itself */
++		memcpy(buffer + miclen_bytes, state->tsig->rdata.tsig_record.mac,
++			  state->tsig->rdata.tsig_record.mac_size);
++
++		/* copy the remaining data */
++		memcpy(buffer + mic_size, packet_blob.data, packet_blob.length);
++		memcpy(buffer + mic_size + packet_blob.length, tsig_blob.data, tsig_blob.length);
++	} else {
++		buffer_len = packet_blob.length + tsig_blob.length;
++		buffer = talloc_zero_array(mem_ctx, uint8_t, buffer_len);
++		if (buffer == NULL) {
++			return WERR_NOMEM;
++		}
++
++		memcpy(buffer, packet_blob.data, packet_blob.length);
++		memcpy(buffer+packet_blob.length, tsig_blob.data, tsig_blob.length);
++	}
+ 
++	/* FIXME: as in the verify case, some padding is wrong */
++	buffer_len -=2;
+ 	status = gensec_sign_packet(tkey->gensec, mem_ctx, buffer, buffer_len,
+ 				    buffer, buffer_len, &sig);
+ 	if (!NT_STATUS_IS_OK(status)) {
+-- 
+1.7.3.4
diff --git a/net/samba4/files/patch-source4__lib__cmdline__wscript_build b/net/samba4/files/patch-source4__lib__cmdline__wscript_build
new file mode 100644
index 000000000000..fe6e01345cf2
--- /dev/null
+++ b/net/samba4/files/patch-source4__lib__cmdline__wscript_build
@@ -0,0 +1,12 @@
+https://bugzilla.samba.org/show_bug.cgi?id=9664
+
+--- ./source4/lib/cmdline/wscript_build.orig	2013-02-02 21:15:00.669868288 +0000
++++ ./source4/lib/cmdline/wscript_build	2013-02-02 21:16:06.379875983 +0000
+@@ -4,6 +4,7 @@
+                   source='credentials.c',
+                   autoproto='credentials.h',
+                   public_deps='samba-credentials popt',
++                  deps='replace',
+                   private_library=True)
+ 
+ bld.SAMBA_SUBSYSTEM('POPT_SAMBA',
diff --git a/net/samba4/files/patch-source4__libcli__resolve__dns_ex.c b/net/samba4/files/patch-source4__libcli__resolve__dns_ex.c
new file mode 100644
index 000000000000..04f0d5a8745b
--- /dev/null
+++ b/net/samba4/files/patch-source4__libcli__resolve__dns_ex.c
@@ -0,0 +1,39 @@
+https://bugzilla.samba.org/show_bug.cgi?id=9656
+
+From 30d391abd0909b4838b87ddedf4d5fe037c514cf Mon Sep 17 00:00:00 2001
+From: Landon Fuller <landonf@bikemonkey.org>
+Date: Sat, 16 Feb 2013 22:57:40 -0500
+Subject: [PATCH] Fallback to the internal resolver on EAI_FAIL.
+
+On Linux, non-RFC 1034-complaint names (such as gc._msdsc.example.org)
+will result in the resolver returning the non-POSIX EAI_NODATA. In that
+case, the case statement here would fall back on the internal resolver,
+allowing resolution to complete successfully.
+
+On FreeBSD, the libc resolver uses the same validation code, but
+the POSIX result of EAI_FAIL is returned instead of EAI_NODATA. Since
+there was no case for this error code, no fallback to the internal
+resolver would occur. This led to replication failing on FreeBSD.
+---
+ source4/libcli/resolve/dns_ex.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/source4/libcli/resolve/dns_ex.c b/source4/libcli/resolve/dns_ex.c
+index bc64e8d..3f47898 100644
+--- ./source4/libcli/resolve/dns_ex.c
++++ ./source4/libcli/resolve/dns_ex.c
+@@ -400,8 +400,10 @@ static void run_child_getaddrinfo(struct dns_ex_state *state, int fd)
+ #ifdef EAI_NODATA
+ 		case EAI_NODATA:
+ #endif
++		case EAI_FAIL:
++			/* Linux returns EAI_NODATA on non-RFC1034-compliant names. FreeBSD returns EAI_FAIL */
+ 		case EAI_NONAME:
+-			/* getaddrinfo() doesn't handle CNAME records */
++			/* getaddrinfo() doesn't handle CNAME or non-RFC1034 compatible records */
+ 			run_child_dns_lookup(state, fd);
+ 			return;
+ 		default:
+-- 
+1.8.1.3
+
diff --git a/net/samba4/files/patch-source4__ntvfs__sysdep__wscript_build b/net/samba4/files/patch-source4__ntvfs__sysdep__wscript_build
new file mode 100644
index 000000000000..a147d65fb580
--- /dev/null
+++ b/net/samba4/files/patch-source4__ntvfs__sysdep__wscript_build
@@ -0,0 +1,11 @@
+--- ./source4/ntvfs/sysdep/wscript_build.orig	2012-10-02 08:24:48.000000000 +0000
++++ ./source4/ntvfs/sysdep/wscript_build	2013-02-05 04:12:51.899867297 +0000
+@@ -4,7 +4,7 @@
+                  source='inotify.c',
+                  subsystem='sys_notify',
+                  init_function='sys_notify_inotify_init',
+-                 deps='events',
++                 deps='events inotify',
+                  enabled = bld.CONFIG_SET('HAVE_LINUX_INOTIFY')
+                  )
+ 
diff --git a/net/samba4/files/patch-source4__ntvfs__sysdep__wscript_configure b/net/samba4/files/patch-source4__ntvfs__sysdep__wscript_configure
new file mode 100644
index 000000000000..bdd6c628cc49
--- /dev/null
+++ b/net/samba4/files/patch-source4__ntvfs__sysdep__wscript_configure
@@ -0,0 +1,11 @@
+--- ./source4/ntvfs/sysdep/wscript_configure.orig	2012-10-02 08:24:48.000000000 +0000
++++ ./source4/ntvfs/sysdep/wscript_configure	2013-02-05 04:12:51.909866322 +0000
+@@ -5,5 +5,8 @@
+ conf.CHECK_DECLS('F_SETLEASE', headers='linux/fcntl.h', reverse=True)
+ conf.CHECK_DECLS('SA_SIGINFO', headers='signal.h', reverse=True)
+ 
++conf.SET_TARGET_TYPE('inotify', 'EMPTY')
++conf.CHECK_FUNCS_IN('inotify_init', 'inotify', checklibc=True, headers='sys/inotify.h')
++
+ if (conf.CONFIG_SET('HAVE_SYS_INOTIFY_H')):
+     conf.DEFINE('HAVE_LINUX_INOTIFY', 1)
diff --git a/net/samba4/files/patch-source4__smbd__wscript_build b/net/samba4/files/patch-source4__smbd__wscript_build
new file mode 100644
index 000000000000..4b7da154c7bd
--- /dev/null
+++ b/net/samba4/files/patch-source4__smbd__wscript_build
@@ -0,0 +1,11 @@
+--- ./source4/smbd/wscript_build.orig	2012-12-04 10:07:44.000000000 +0000
++++ ./source4/smbd/wscript_build	2013-01-27 01:44:15.919866417 +0000
+@@ -17,7 +17,7 @@
+                   enabled=bld.AD_DC_BUILD_IS_ENABLED()
+                   )
+ 
+-bld.SAMBA_BINARY('samba',
++bld.SAMBA_BINARY('samba4',
+ 	source='server.c',
+ 	subsystem_name='service',
+ 	deps='''events process_model service samba-hostconfig samba-util POPT_SAMBA
diff --git a/net/samba4/files/patch-wscript b/net/samba4/files/patch-wscript
new file mode 100644
index 000000000000..7feb2c4c4f1e
--- /dev/null
+++ b/net/samba4/files/patch-wscript
@@ -0,0 +1,18 @@
+--- ./wscript.orig	2013-01-27 22:58:07.759866676 +0000
++++ ./wscript	2013-01-27 22:58:27.961081298 +0000
+@@ -43,7 +43,6 @@
+     opt.RECURSE('lib/nss_wrapper')
+     opt.RECURSE('lib/socket_wrapper')
+     opt.RECURSE('lib/uid_wrapper')
+-    opt.RECURSE('pidl')
+     opt.RECURSE('source3')
+     opt.RECURSE('lib/util')
+ 
+@@ -140,7 +139,6 @@
+     conf.RECURSE('lib/subunit/c')
+     conf.RECURSE('libcli/smbreadline')
+     conf.RECURSE('lib/crypto')
+-    conf.RECURSE('pidl')
+     conf.RECURSE('selftest')
+     conf.RECURSE('source3')
+ 
diff --git a/net/samba4/files/patch-wscript_build b/net/samba4/files/patch-wscript_build
new file mode 100644
index 000000000000..f5f90fd05ff6
--- /dev/null
+++ b/net/samba4/files/patch-wscript_build
@@ -0,0 +1,10 @@
+--- ./wscript_build.orig	2013-01-27 22:58:14.032166250 +0000
++++ ./wscript_build	2013-01-27 23:03:34.089892588 +0000
+@@ -130,7 +130,6 @@
+ if bld.AD_DC_BUILD_IS_ENABLED():
+     bld.RECURSE('source4/setup')
+ bld.RECURSE('source4/scripting')
+-bld.RECURSE('pidl')
+ bld.RECURSE('lib')
+ bld.RECURSE('libds/common')
+ bld.RECURSE('source3')
diff --git a/net/samba4/files/pkg-install.in b/net/samba4/files/pkg-install.in
new file mode 100644
index 000000000000..f4fac0b56cca
--- /dev/null
+++ b/net/samba4/files/pkg-install.in
@@ -0,0 +1,36 @@
+#! /bin/sh
+#
+PATH=/bin:/usr/sbin:/usr/bin:/usr/sbin
+
+SAMBA4_LOGDIR="%%SAMBA4_LOGDIR%%"
+SAMBA4_RUNDIR="%%SAMBA4_RUNDIR%%"
+SAMBA4_LOCKDIR="%%SAMBA4_LOCKDIR%%"
+SAMBA4_MODULEDIR="%%SAMBA4_MODULEDIR%%"
+SAMBA4_PRIVATEDIR="%%SAMBA4_PRIVATEDIR%%"
+SAMBA4_OWNER=root
+SAMBA4_GROUP=wheel
+INSTALL_DATA="install -c -m 0444"
+INSTALL_DIR="install -d -m 0755"
+CHMOD="chmod"
+
+post-install() {
+	if [ $(id -u) -eq 0 ]; then
+		INSTALL_DATA="${INSTALL_DATA} -o ${SAMBA4_OWNER} -g ${SAMBA4_GROUP}"
+		INSTALL_DIR="${INSTALL_DIR} -o ${SAMBA4_OWNER} -g ${SAMBA4_GROUP}"
+	fi
+	${INSTALL_DIR} ${SAMBA4_LOGDIR}
+	${INSTALL_DIR} ${SAMBA4_RUNDIR}
+	${INSTALL_DIR} ${SAMBA4_LOCKDIR}
+	${INSTALL_DIR} ${SAMBA4_MODULEDIR}
+	${INSTALL_DIR} ${SAMBA4_PRIVATEDIR}
+	for dir in auth bind9 gensec gpext idmap ldb nss_info pdb perfcount \
+		    process_model service vfs; do
+		${INSTALL_DIR} "${SAMBA4_MODULEDIR}/${dir}"
+	done
+}
+
+case $2 in
+	POST-INSTALL)
+		post-install
+		;;
+esac
diff --git a/net/samba4/files/pkg-message.in b/net/samba4/files/pkg-message.in
index ab8352e14c75..19d1d66110b0 100644
--- a/net/samba4/files/pkg-message.in
+++ b/net/samba4/files/pkg-message.in
@@ -1,17 +1,24 @@
 ===============================================================================
 
-This port is *HIGHLY* experimental, lacks documentation and, in general,
-unsupported. Its solely purpose is to give you a grasp of upcoming Samba4
-and try it.
-
-This *IS NOT* production ready code. Use at your own risk.
+This port is *STILL* experimental, use it at your own risk.
 
 How to start: http://wiki.samba.org/index.php/Samba4/HOWTO
 
-Provisioning script: %%PREFIX%%/sbin/provision
+* Your configuration is: %%SAMBA4_CONFDIR%%/%%SAMBA4_CONFIG%%
+
+* All the relevant databases are under: %%SAMBA4_LOCKDIR%%
+
+* All the logs are under: %%SAMBA4_LOGDIR%%
+
+* Provisioning script is: %%PREFIX%%/bin/samba-tool
 
+%%NSUPDATE%%You will need to specify location of the 'nsupdate' command in the
+%%NSUPDATE%%%%SAMBA4_CONFIG%% file:
+%%NSUPDATE%%
+%%NSUPDATE%%      nsupdate command = %%PREFIX%%/bin/samba-nsupdate -g
+%%NSUPDATE%%
 For additional documentation check: http://wiki.samba.org/index.php/Samba4
 
-Bug reports should go to: https://bugzilla.samba.org/
+Bug reports should go to the: https://bugzilla.samba.org/
 
 ===============================================================================
diff --git a/net/samba4/files/samba4.in b/net/samba4/files/samba4.in
index 33a67a55a508..76f26d3fd37c 100644
--- a/net/samba4/files/samba4.in
+++ b/net/samba4/files/samba4.in
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: samba4
-# REQUIRE: NETWORKING SERVERS DAEMON ldconfig resolv
+# REQUIRE: NETWORKING SERVERS DAEMON ldconfig resolv ntpd
 # BEFORE: LOGIN
 # KEYWORD: shutdown
 #
@@ -14,26 +14,28 @@
 #samba4_enable="YES"
 #
 # Configuration file can be set with:
-#samba4_config="%%SAMBA_CONFDIR%%/%%SAMBA_CONFIG%%"
+#samba4_config="%%SAMBA4_CONFDIR%%/%%SAMBA4_CONFIG%%"
 #
 
 . /etc/rc.subr
 
 name="samba4"
-rcvar=samba4_enable
+rcvar=$(set_rcvar)
 
 load_rc_config "${name}"
 
 # Defaults
 samba4_enable=${samba4_enable:=NO}
 samba4_flags=${samba4_flags=--daemon}
-samba4_config_default="%%SAMBA_CONFDIR%%/%%SAMBA_CONFIG%%"
+samba4_config_default="%%SAMBA4_CONFDIR%%/%%SAMBA4_CONFIG%%"
 samba4_config=${samba4_config=${samba4_config_default}}
 samba4_configfile_arg=${samba4_config:+--configfile="${samba4_config}"}			#"
 testparm_command="%%PREFIX%%/bin/testparm --suppress-prompt --verbose ${samba4_configfile_arg}"
 # Fetch parameters from configuration file
 samba4_lockdir=$(${testparm_command} --parameter-name='lock directory' 2>/dev/null)
+
 # Runtime options
+start_precmd="samba4_prestart"
 restart_precmd="samba4_checkconfig"
 command="%%PREFIX%%/sbin/${name}"
 command_args=${samba4_configfile_arg}
@@ -51,4 +53,15 @@ samba4_checkconfig() {
     fi
 }
 
+samba4_prestart() {
+    # Make sure we have our RUNDIR, even if it's on a tmpfs
+    if [ ! -d "%%SAMBA4_RUNDIR%%" -a ! -e "%%SAMBA4_RUNDIR%%" ]; then
+	install -m 0755 -d "%%SAMBA4_RUNDIR%%"
+    fi
+    # Remove smbd.pid before starting up samba(needed for s3fs)
+    if [ -e "%%SAMBA4_RUNDIR%%/smbd.pid" ] ; then
+	rm -f "%%SAMBA4_RUNDIR%%/smbd.pid"
+    fi
+}
+
 run_rc_command "$1"
diff --git a/net/samba4/pkg-plist b/net/samba4/pkg-plist
index d1c9cb027c4c..c95c667dca37 100644
--- a/net/samba4/pkg-plist
+++ b/net/samba4/pkg-plist
@@ -1,31 +1,48 @@
-%%UTILS%%bin/cifsdd
-%%UTILS%%bin/gentest
-%%UTILS%%bin/getntacl
-%%UTILS%%bin/ldbadd
-%%UTILS%%bin/ldbdel
-%%UTILS%%bin/ldbedit
-%%UTILS%%bin/ldbmodify
-%%UTILS%%bin/ldbrename
-%%UTILS%%bin/ldbsearch
-%%UTILS%%bin/locktest
-%%UTILS%%bin/masktest
-%%UTILS%%bin/ndrdump
-%%UTILS%%bin/net
-%%UTILS%%bin/nmblookup
-%%UTILS%%bin/ntlm_auth
-%%UTILS%%bin/oLschema2ldif
-%%UTILS%%bin/regdiff
-%%UTILS%%bin/regpatch
-%%UTILS%%bin/regshell
-%%UTILS%%bin/regtree
-%%UTILS%%bin/setnttoken
-%%UTILS%%bin/smbclient
-%%UTILS%%bin/smbtorture
-%%UTILS%%bin/testparm
-%%UTILS%%bin/wbinfo
-sbin/provision
+bin/cifsdd
+bin/dbwrap_tool
+bin/eventlogadm
+bin/gentest
+bin/locktest
+bin/masktest
+bin/ndrdump
+bin/net
+bin/nmblookup
+bin/nmblookup4
+bin/ntlm_auth
+bin/oLschema2ldif
+bin/pdbedit
+bin/profiles
+bin/regdiff
+bin/regpatch
+bin/regshell
+bin/regtree
+bin/rpcclient
+bin/samba-tool
+bin/sharesec
+bin/smbcacls
+bin/smbclient
+bin/smbclient4
+bin/smbcontrol
+bin/smbcquotas
+bin/smbget
+bin/smbpasswd
+bin/smbspool
+bin/smbstatus
+bin/smbta-util
+bin/smbtorture
+bin/smbtree
+bin/testparm
+bin/wbinfo
+sbin/nmbd
 sbin/samba4
-sbin/upgradeprovision
+sbin/samba_dnsupdate
+sbin/samba_kcc
+sbin/samba_spnupdate
+sbin/samba_upgradedns
+sbin/samba_upgradeprovision
+sbin/smbd
+%%SWAT%%sbin/swat
+%%WINBIND%%sbin/winbindd
 include/samba4/charset.h
 include/samba4/core/doserr.h
 include/samba4/core/error.h
@@ -34,12 +51,15 @@ include/samba4/core/werror.h
 include/samba4/credentials.h
 include/samba4/dcerpc.h
 include/samba4/dcerpc_server.h
-include/samba4/dcerpc_server/common.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
@@ -47,11 +67,15 @@ 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
@@ -66,63 +90,583 @@ include/samba4/ldap-util.h
 include/samba4/ldap_errors.h
 include/samba4/ldap_message.h
 include/samba4/ldap_ndr.h
-include/samba4/ldb.h
-include/samba4/ldb_errors.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_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/samba/popt.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/smbtorture.h
-include/samba4/tdb_wrap.h
+include/samba4/smb2.h
+include/samba4/smb2_constants.h
+include/samba4/smb2_create_blob.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
+%%LDAP%%include/samba4/smb_ldap.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_share_modes.h
+include/samba4/smb_signing.h
+include/samba4/smb_unix_ext.h
+include/samba4/smb_util.h
+include/samba4/smbconf.h
+%%LDAP%%include/samba4/smbldap.h
 include/samba4/tdr.h
 include/samba4/torture.h
 include/samba4/tsocket.h
 include/samba4/tsocket_internal.h
-include/samba4/util.h
 include/samba4/util/attr.h
 include/samba4/util/byteorder.h
 include/samba4/util/data_blob.h
 include/samba4/util/debug.h
 include/samba4/util/memory.h
-include/samba4/util/mutex.h
 include/samba4/util/safe_string.h
+include/samba4/util/string_wrappers.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
-%%PYTHON_SITELIBDIR%%/ldb.so
+include/samba4/wbclient.h
+@dirrm include/samba4/util
+@dirrm include/samba4/samba
+@dirrm include/samba4/ndr
+@dirrm include/samba4/gen_ndr
+@dirrm include/samba4/core
+@dirrm 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
+lib/libdcerpc-server.so
+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/libpdb.so
+lib/libpdb.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-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/libsmbsharemodes.so
+lib/libsmbsharemodes.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.so
+lib/samba/libHDB_SAMBA4.so
+lib/samba/libLIBWBCLIENT_OLD.so
+lib/samba/libMESSAGING.so
+lib/samba/libaddns.so
+lib/samba/libads.so
+lib/samba/libasn1-samba4.so.8
+lib/samba/libasn1util.so
+lib/samba/libauth.so
+lib/samba/libauth4.so
+lib/samba/libauth_sam_reply.so
+lib/samba/libauth_unix_token.so
+lib/samba/libauthkrb5.so
+lib/samba/libccan.so
+lib/samba/libcli-ldap-common.so
+lib/samba/libcli-ldap.so
+lib/samba/libcli-nbt.so
+lib/samba/libcli_cldap.so
+lib/samba/libcli_smb_common.so
+lib/samba/libcli_spoolss.so
+lib/samba/libcliauth.so
+lib/samba/libcluster.so
+lib/samba/libcmdline-credentials.so
+lib/samba/libcom_err-samba4.so.0
+lib/samba/libdb-glue.so
+lib/samba/libdbwrap.so
+lib/samba/libdcerpc-samba.so
+lib/samba/libdcerpc-samba4.so
+lib/samba/libdfs_server_ad.so
+lib/samba/libdlz_bind9_for_torture.so
+lib/samba/libdsdb-module.so
+lib/samba/liberrors.so
+lib/samba/libevents.so
+lib/samba/libflag_mapping.so
+lib/samba/libgpo.so
+lib/samba/libgse.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/libhx509-samba4.so.5
+lib/samba/libidmap.so
+lib/samba/libiniparser.so
+lib/samba/libinterfaces.so
+lib/samba/libkdc-samba4.so.2
+lib/samba/libkrb5-samba4.so.26
+lib/samba/libkrb5samba.so
+lib/samba/libldb-cmdline.so
+lib/samba/libldbsamba.so
+lib/samba/liblibcli_lsa3.so
+lib/samba/liblibcli_netlogon3.so
+lib/samba/liblibsmb.so
+lib/samba/libmsrpc3.so
+lib/samba/libndr-samba.so
+lib/samba/libndr-samba4.so
+lib/samba/libnet_keytab.so
+lib/samba/libnetif.so
+lib/samba/libnpa_tstream.so
+lib/samba/libnss_info.so
+lib/samba/libntvfs.so
+lib/samba/libpac.so
+lib/samba/libpopt_samba3.so
+lib/samba/libposix_eadb.so
+lib/samba/libprinting_migrate.so
+lib/samba/libprocess_model.so
+lib/samba/libreplace.so
+lib/samba/libroken-samba4.so.19
+lib/samba/libsamba-modules.so
+lib/samba/libsamba-net.so
+lib/samba/libsamba-security.so
+lib/samba/libsamba-sockets.so
+lib/samba/libsamba3-util.so
+lib/samba/libsamba_python.so
+lib/samba/libsamdb-common.so
+lib/samba/libsecrets3.so
+lib/samba/libserver-role.so
+lib/samba/libservice.so
+lib/samba/libshares.so
+lib/samba/libsmb_transport.so
+lib/samba/libsmbd_base.so
+lib/samba/libsmbd_conn.so
+lib/samba/libsmbd_shim.so
+lib/samba/libsmbpasswdparser.so
+lib/samba/libsmbregistry.so
+lib/samba/libsubunit.so
+lib/samba/libtdb-wrap.so
+lib/samba/libtdb_compat.so
+lib/samba/libtrusts_util.so
+lib/samba/libutil_cmdline.so
+lib/samba/libutil_reg.so
+lib/samba/libutil_setid.so
+lib/samba/libutil_tdb.so
+lib/samba/libwinbind-client.so
+lib/samba/libwind-samba4.so.0
+lib/samba/libxattr_tdb.so
+%%LDAP%%lib/samba/libsmbldaphelper.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
+@comment auth_skel lib/shared-modules/auth/skel.so
+lib/shared-modules/bind9/dlz_bind9.so
+lib/shared-modules/bind9/dlz_bind9_9.so
+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
+lib/shared-modules/ldb/acl.so
+lib/shared-modules/ldb/aclread.so
+lib/shared-modules/ldb/anr.so
+lib/shared-modules/ldb/descriptor.so
+lib/shared-modules/ldb/dirsync.so
+lib/shared-modules/ldb/extended_dn_in.so
+lib/shared-modules/ldb/extended_dn_out.so
+lib/shared-modules/ldb/extended_dn_store.so
+lib/shared-modules/ldb/ildap.so
+lib/shared-modules/ldb/instancetype.so
+lib/shared-modules/ldb/lazy_commit.so
+lib/shared-modules/ldb/ldbsamba_extensions.so
+lib/shared-modules/ldb/linked_attributes.so
+lib/shared-modules/ldb/local_password.so
+lib/shared-modules/ldb/new_partition.so
+lib/shared-modules/ldb/objectclass.so
+lib/shared-modules/ldb/objectclass_attrs.so
+lib/shared-modules/ldb/objectguid.so
+lib/shared-modules/ldb/operational.so
+lib/shared-modules/ldb/partition.so
+lib/shared-modules/ldb/password_hash.so
+lib/shared-modules/ldb/ranged_results.so
+lib/shared-modules/ldb/repl_meta_data.so
+lib/shared-modules/ldb/resolve_oids.so
+lib/shared-modules/ldb/rootdse.so
+lib/shared-modules/ldb/samba3sam.so
+lib/shared-modules/ldb/samba3sid.so
+lib/shared-modules/ldb/samba_dsdb.so
+lib/shared-modules/ldb/samba_secrets.so
+lib/shared-modules/ldb/samldb.so
+lib/shared-modules/ldb/schema_data.so
+lib/shared-modules/ldb/schema_load.so
+lib/shared-modules/ldb/secrets_tdb_sync.so
+lib/shared-modules/ldb/show_deleted.so
+lib/shared-modules/ldb/simple_dn.so
+lib/shared-modules/ldb/simple_ldap_map.so
+lib/shared-modules/ldb/subtree_delete.so
+lib/shared-modules/ldb/subtree_rename.so
+lib/shared-modules/ldb/update_keytab.so
+lib/shared-modules/ldb/wins_ldb.so
+lib/shared-modules/nss_info/hash.so
+@comment perfcount_test lib/shared-modules/perfcount/test.so
+@comment pdb_test lib/shared-modules/pdb/test.so
+lib/shared-modules/process_model/onefork.so
+lib/shared-modules/process_model/prefork.so
+lib/shared-modules/process_model/standard.so
+lib/shared-modules/service/cldap.so
+lib/shared-modules/service/dcerpc.so
+lib/shared-modules/service/dns.so
+lib/shared-modules/service/dns_update.so
+lib/shared-modules/service/drepl.so
+lib/shared-modules/service/kcc.so
+lib/shared-modules/service/kdc.so
+lib/shared-modules/service/ldap.so
+lib/shared-modules/service/nbtd.so
+lib/shared-modules/service/ntp_signd.so
+lib/shared-modules/service/s3fs.so
+lib/shared-modules/service/smb.so
+lib/shared-modules/service/web.so
+lib/shared-modules/service/winbind.so
+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
+@comment vfs_aio_posix lib/shared-modules/vfs/aio_posix.so
+@comment 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/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/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/xattr_tdb.so
+lib/shared-modules/vfs/zfsacl.so
+@comment auth_samba4 lib/shared-modules/auth/samba4.so
+@comment auth_unix lib/shared-modules/auth/unix.so
+@comment auth_wbc lib/shared-modules/auth/wbc.so
+@comment gpext_registry lib/shared-modules/gpext/registry.so
+@comment gpext_scripts lib/shared-modules/gpext/scripts.so
+@comment gpext_security lib/shared-modules/gpext/security.so
+@comment idmap_ad lib/shared-modules/idmap/ad.so
+@comment idmap_ad lib/shared-modules/nss_info/rfc2307.so
+@comment idmap_ad lib/shared-modules/nss_info/sfu.so
+@comment idmap_ad lib/shared-modules/nss_info/sfu20.so
+@comment idmap_ldap lib/shared-modules/idmap/ldap.so
+@comment idmap_nss lib/shared-modules/idmap/nss.so
+@comment idmap_passdb lib/shared-modules/idmap/passdb.so
+@comment idmap_tdb lib/shared-modules/idmap/tdb.so
+@comment nss_info_template lib/shared-modules/nss_info/template.so
+@comment pdb_ldap lib/shared-modules/pdb/ldap.so
+@comment pdb_samba_dsdb lib/shared-modules/pdb/samba_dsdb.so
+@comment pdb_smbpasswd lib/shared-modules/pdb/smbpasswd.so
+@comment pdb_tdbsam lib/shared-modules/pdb/tdbsam.so
+@comment pdb_wbc_sam lib/shared-modules/pdb/wbc_sam.so
+@comment vfs_cacheprime lib/shared-modules/vfs/cacheprime.so
+@comment vfs_dfs_samba4 lib/shared-modules/vfs/dfs_samba4.so
+@comment vfs_fake_acls lib/shared-modules/vfs/fake_acls.so
+@comment vfs_shadow_copy_test lib/shared-modules/vfs/shadow_copy_test.so
+@comment vfs_skel_opaque lib/shared-modules/vfs/skel_opaque.so
+@comment vfs_skel_transparent lib/shared-modules/vfs/skel_transparent.so
+@dirrmtry lib/shared-modules/vfs
+@dirrmtry lib/shared-modules/service
+@dirrmtry lib/shared-modules/process_model
+@dirrmtry lib/shared-modules/perfcount
+@dirrmtry lib/shared-modules/pdb
+@dirrmtry lib/shared-modules/nss_info
+@dirrmtry lib/shared-modules/ldb
+@dirrmtry lib/shared-modules/idmap
+@dirrmtry lib/shared-modules/gpext
+@dirrmtry lib/shared-modules/gensec
+@dirrmtry lib/shared-modules/bind9
+@dirrmtry lib/shared-modules/auth
+@dirrmtry lib/shared-modules
+@dirrmtry lib/samba
+libdata/pkgconfig/dcerpc.pc
+libdata/pkgconfig/dcerpc_atsvc.pc
+libdata/pkgconfig/dcerpc_samr.pc
+libdata/pkgconfig/dcerpc_server.pc
+libdata/pkgconfig/gensec.pc
+libdata/pkgconfig/ndr.pc
+libdata/pkgconfig/ndr_krb5pac.pc
+libdata/pkgconfig/ndr_nbt.pc
+libdata/pkgconfig/ndr_standard.pc
+libdata/pkgconfig/netapi.pc
+libdata/pkgconfig/registry.pc
+libdata/pkgconfig/samba-credentials.pc
+libdata/pkgconfig/samba-hostconfig.pc
+libdata/pkgconfig/samba-policy.pc
+libdata/pkgconfig/samba-util.pc
+libdata/pkgconfig/samdb.pc
+libdata/pkgconfig/smbclient-raw.pc
+libdata/pkgconfig/smbsharemodes.pc
+libdata/pkgconfig/torture.pc
+libdata/pkgconfig/wbclient.pc
 %%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/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/dckeytab.so
+%%PYTHON_SITELIBDIR%%/samba/drs_utils.py
+%%PYTHON_SITELIBDIR%%/samba/dsdb.so
+%%PYTHON_SITELIBDIR%%/samba/external/__init__.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/__init__.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/dnssec.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/e164.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/edns.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/entropy.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/exception.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/flags.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/hash.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/inet.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/ipv4.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/ipv6.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/message.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/name.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/namedict.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/node.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/opcode.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/query.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/rcode.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/rdata.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/rdataclass.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/rdataset.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/rdatatype.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/AFSDB.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/CERT.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/CNAME.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/DLV.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/DNAME.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/DNSKEY.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/DS.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/GPOS.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/HINFO.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/HIP.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/ISDN.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/LOC.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/MX.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/NS.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/NSEC.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/NSEC3.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/NSEC3PARAM.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/PTR.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/RP.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/RRSIG.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/RT.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/SOA.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/SPF.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/SSHFP.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/TXT.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/X25.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/__init__.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/A.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/AAAA.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/APL.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/DHCID.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/IPSECKEY.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/KX.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/NAPTR.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/NSAP.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/NSAP_PTR.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/PX.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/SRV.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/WKS.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/__init__.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/__init__.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/dsbase.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/mxbase.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/nsbase.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/txtbase.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/renderer.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/resolver.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/reversename.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/rrset.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/set.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/tokenizer.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/tsig.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/tsigkeyring.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/ttl.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/update.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/version.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/wiredata.py
+%%PYTHON_SITELIBDIR%%/samba/external/dns/zone.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/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.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/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/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_matchers.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_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/glue.so
 %%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
@@ -130,79 +674,143 @@ include/samba4/util_ldb.h
 %%PYTHON_SITELIBDIR%%/samba/net.so
 %%PYTHON_SITELIBDIR%%/samba/netbios.so
 %%PYTHON_SITELIBDIR%%/samba/netcmd/__init__.py
-%%PYTHON_SITELIBDIR%%/samba/netcmd/domainlevel.py
-%%PYTHON_SITELIBDIR%%/samba/netcmd/enableaccount.py
-%%PYTHON_SITELIBDIR%%/samba/netcmd/newuser.py
-%%PYTHON_SITELIBDIR%%/samba/netcmd/pwsettings.py
-%%PYTHON_SITELIBDIR%%/samba/netcmd/setexpiry.py
-%%PYTHON_SITELIBDIR%%/samba/netcmd/setpassword.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/provision.py
-%%PYTHON_SITELIBDIR%%/samba/provisionbackend.py
-%%PYTHON_SITELIBDIR%%/samba/provisionexceptions.py
+%%PYTHON_SITELIBDIR%%/samba/policy.so
+%%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/descriptor.py
+%%PYTHON_SITELIBDIR%%/samba/provision/sambadns.py
 %%PYTHON_SITELIBDIR%%/samba/registry.so
-%%PYTHON_SITELIBDIR%%/samba/samba3.py
+%%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/shares.py
+%%PYTHON_SITELIBDIR%%/samba/sd_utils.py
+%%PYTHON_SITELIBDIR%%/samba/security.so
+%%PYTHON_SITELIBDIR%%/samba/sites.py
+%%PYTHON_SITELIBDIR%%/samba/smb.so
+%%DEVELOPER%%%%PYTHON_SITELIBDIR%%/samba/socket_wrapper.so
 %%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/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/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/shares.py
+%%PYTHON_SITELIBDIR%%/samba/tests/security.py
+%%PYTHON_SITELIBDIR%%/samba/tests/source.py
+%%PYTHON_SITELIBDIR%%/samba/tests/strings.py
+%%PYTHON_SITELIBDIR%%/samba/tests/unicodenames.py
 %%PYTHON_SITELIBDIR%%/samba/tests/upgrade.py
-%%PYTHON_SITELIBDIR%%/samba/torture/spoolss.py
-%%PYTHON_SITELIBDIR%%/samba/torture/torture_samr.py
-%%PYTHON_SITELIBDIR%%/samba/torture/torture_tdb.py
-%%PYTHON_SITELIBDIR%%/samba/torture/winreg.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%%/subunit/__init__.py
-%%PYTHON_SITELIBDIR%%/subunit/tests/TestUtil.py
-%%PYTHON_SITELIBDIR%%/subunit/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/subunit/tests/sample-script.py
-%%PYTHON_SITELIBDIR%%/subunit/tests/sample-two-script.py
-%%PYTHON_SITELIBDIR%%/subunit/tests/test_test_protocol.py
-%%PYTHON_SITELIBDIR%%/uuid.so
-lib/samba4/libdcerpc.so
-lib/samba4/libdcerpc.so.0
-lib/samba4/libdcerpc_atsvc.so
-lib/samba4/libdcerpc_atsvc.so.0
-lib/samba4/libdcerpc_samr.so
-lib/samba4/libdcerpc_samr.so.0
-lib/samba4/libgensec.so
-lib/samba4/libgensec.so.0
-lib/samba4/libldb.so
-lib/samba4/libldb.so.0
-lib/samba4/libndr.so
-lib/samba4/libndr.so.0
-lib/samba4/libndr_standard.so
-lib/samba4/libndr_standard.so.0
-lib/samba4/libregistry.so
-lib/samba4/libregistry.so.0
-lib/samba4/libsamba-hostconfig.so
-lib/samba4/libsamba-hostconfig.so.0
-lib/samba4/libsamba-util.so
-lib/samba4/libsamba-util.so.0
-lib/samba4/libtorture.so
-lib/samba4/libtorture.so.0
-libdata/pkgconfig/dcerpc.pc
-libdata/pkgconfig/dcerpc_atsvc.pc
-libdata/pkgconfig/dcerpc_samr.pc
-libdata/pkgconfig/gensec.pc
-libdata/pkgconfig/ldb.pc
-libdata/pkgconfig/ndr.pc
-libdata/pkgconfig/ndr_standard.pc
-libdata/pkgconfig/registry.pc
-libdata/pkgconfig/samba-hostconfig.pc
-libdata/pkgconfig/torture.pc
+%%PYTHON_SITELIBDIR%%/samba/upgradehelpers.py
+%%PYTHON_SITELIBDIR%%/samba/web_server/__init__.py
+%%PYTHON_SITELIBDIR%%/samba/xattr.py
+%%PYTHON_SITELIBDIR%%/samba/xattr_native.so
+%%PYTHON_SITELIBDIR%%/samba/xattr_tdb.so
+@unexec find %D/%%PYTHON_SITELIBDIR%%/samba -name '*.py[co]' -delete >/dev/null 2>&1
+@dirrm %%PYTHON_SITELIBDIR%%/samba/web_server
+@dirrm %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool
+@dirrm %%PYTHON_SITELIBDIR%%/samba/tests/dcerpc
+@dirrm %%PYTHON_SITELIBDIR%%/samba/tests/blackbox
+@dirrm %%PYTHON_SITELIBDIR%%/samba/tests
+@dirrm %%PYTHON_SITELIBDIR%%/samba/samba3
+@dirrm %%PYTHON_SITELIBDIR%%/samba/provision
+@dirrm %%PYTHON_SITELIBDIR%%/samba/netcmd
+@dirrm %%PYTHON_SITELIBDIR%%/samba/external/testtools/tests
+@dirrm %%PYTHON_SITELIBDIR%%/samba/external/testtools/testresult
+@dirrm %%PYTHON_SITELIBDIR%%/samba/external/testtools
+@dirrm %%PYTHON_SITELIBDIR%%/samba/external/subunit/tests
+@dirrm %%PYTHON_SITELIBDIR%%/samba/external/subunit
+@dirrm %%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN
+@dirrm %%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY
+@dirrm %%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes
+@dirrm %%PYTHON_SITELIBDIR%%/samba/external/dns
+@dirrm %%PYTHON_SITELIBDIR%%/samba/external
+@dirrm %%PYTHON_SITELIBDIR%%/samba/dcerpc
+@dirrm %%PYTHON_SITELIBDIR%%/samba
+@dirrmtry %%PYTHON_SITELIBDIR%%
+%%DATADIR%%/codepages/de.msg
+%%DATADIR%%/codepages/en.msg
+%%DATADIR%%/codepages/fi.msg
+%%DATADIR%%/codepages/fr.msg
+%%DATADIR%%/codepages/it.msg
+%%DATADIR%%/codepages/ja.msg
+%%DATADIR%%/codepages/lowcase.dat
+%%DATADIR%%/codepages/nl.msg
+%%DATADIR%%/codepages/pl.msg
+%%DATADIR%%/codepages/ru.msg
+%%DATADIR%%/codepages/tr.msg
+%%DATADIR%%/codepages/upcase.dat
+%%DATADIR%%/codepages/valid.dat
 %%DATADIR%%/setup/DB_CONFIG
 %%DATADIR%%/setup/ad-schema/MS-AD_Schema_2K8_Attributes.txt
 %%DATADIR%%/setup/ad-schema/MS-AD_Schema_2K8_Classes.txt
@@ -218,6 +826,7 @@ libdata/pkgconfig/torture.pc
 %%DATADIR%%/setup/display-specifiers/DisplaySpecifiers-Win2k3R2.txt
 %%DATADIR%%/setup/display-specifiers/DisplaySpecifiers-Win2k8.txt
 %%DATADIR%%/setup/display-specifiers/DisplaySpecifiers-Win2k8R2.txt
+%%DATADIR%%/setup/dns_update_list
 %%DATADIR%%/setup/fedora-ds-init.ldif
 %%DATADIR%%/setup/fedorads-dna.ldif
 %%DATADIR%%/setup/fedorads-index.ldif
@@ -236,28 +845,33 @@ libdata/pkgconfig/torture.pc
 %%DATADIR%%/setup/mmr_syncrepl.conf
 %%DATADIR%%/setup/modules.conf
 %%DATADIR%%/setup/named.conf
+%%DATADIR%%/setup/named.conf.dlz
+%%DATADIR%%/setup/named.conf.update
 %%DATADIR%%/setup/named.txt
 %%DATADIR%%/setup/olc_mmr.conf
 %%DATADIR%%/setup/olc_seed.ldif
 %%DATADIR%%/setup/olc_serverid.conf
 %%DATADIR%%/setup/olc_syncrepl.conf
 %%DATADIR%%/setup/olc_syncrepl_seed.conf
-%%DATADIR%%/setup/phpldapadmin-config.php
 %%DATADIR%%/setup/prefixMap.txt
 %%DATADIR%%/setup/provision.ldif
 %%DATADIR%%/setup/provision.reg
-%%DATADIR%%/setup/provision.smb.conf.dc
-%%DATADIR%%/setup/provision.smb.conf.member
-%%DATADIR%%/setup/provision.smb.conf.standalone
 %%DATADIR%%/setup/provision.zone
 %%DATADIR%%/setup/provision_basedn.ldif
 %%DATADIR%%/setup/provision_basedn_modify.ldif
+%%DATADIR%%/setup/provision_basedn_options.ldif
 %%DATADIR%%/setup/provision_basedn_references.ldif
 %%DATADIR%%/setup/provision_computers_add.ldif
 %%DATADIR%%/setup/provision_computers_modify.ldif
 %%DATADIR%%/setup/provision_configuration.ldif
 %%DATADIR%%/setup/provision_configuration_basedn.ldif
+%%DATADIR%%/setup/provision_configuration_modify.ldif
 %%DATADIR%%/setup/provision_configuration_references.ldif
+%%DATADIR%%/setup/provision_dns_accounts_add.ldif
+%%DATADIR%%/setup/provision_dns_add_samba.ldif
+%%DATADIR%%/setup/provision_dnszones_add.ldif
+%%DATADIR%%/setup/provision_dnszones_modify.ldif
+%%DATADIR%%/setup/provision_dnszones_partitions.ldif
 %%DATADIR%%/setup/provision_group_policy.ldif
 %%DATADIR%%/setup/provision_init.ldif
 %%DATADIR%%/setup/provision_partitions.ldif
@@ -267,10 +881,13 @@ libdata/pkgconfig/torture.pc
 %%DATADIR%%/setup/provision_schema_basedn.ldif
 %%DATADIR%%/setup/provision_schema_basedn_modify.ldif
 %%DATADIR%%/setup/provision_self_join.ldif
+%%DATADIR%%/setup/provision_self_join_config.ldif
 %%DATADIR%%/setup/provision_self_join_modify.ldif
+%%DATADIR%%/setup/provision_self_join_modify_config.ldif
 %%DATADIR%%/setup/provision_users.ldif
 %%DATADIR%%/setup/provision_users_add.ldif
 %%DATADIR%%/setup/provision_users_modify.ldif
+%%DATADIR%%/setup/provision_well_known_sec_princ.ldif
 %%DATADIR%%/setup/refint.conf
 %%DATADIR%%/setup/schema-map-fedora-ds-1.0
 %%DATADIR%%/setup/schema-map-openldap-2.3
@@ -279,33 +896,61 @@ libdata/pkgconfig/torture.pc
 %%DATADIR%%/setup/secrets_dns.ldif
 %%DATADIR%%/setup/secrets_init.ldif
 %%DATADIR%%/setup/secrets_sasl_ldap.ldif
-%%DATADIR%%/setup/secrets_self_join.ldif
 %%DATADIR%%/setup/secrets_simple_ldap.ldif
 %%DATADIR%%/setup/share.ldif
 %%DATADIR%%/setup/slapd.conf
-%%DATADIR%%/lowcase.dat
-%%DATADIR%%/upcase.dat
-%%DATADIR%%/valid.dat
+%%DATADIR%%/setup/spn_update_list
+%%DATADIR%%/setup/ypServ30.ldif
+%%DATADIR%%/swat/help/welcome-no-samba-doc.html
+%%DATADIR%%/swat/help/welcome.html
+%%DATADIR%%/swat/images/globals.gif
+%%DATADIR%%/swat/images/home.gif
+%%DATADIR%%/swat/images/passwd.gif
+%%DATADIR%%/swat/images/printers.gif
+%%DATADIR%%/swat/images/samba.gif
+%%DATADIR%%/swat/images/shares.gif
+%%DATADIR%%/swat/images/status.gif
+%%DATADIR%%/swat/images/viewconfig.gif
+%%DATADIR%%/swat/images/wizard.gif
+%%DATADIR%%/swat/include/footer.html
+%%DATADIR%%/swat/include/header.html
+%%DATADIR%%/swat/lang/ja/help/welcome.html
+%%DATADIR%%/swat/lang/ru/help/welcome-no-samba-doc.html
+%%DATADIR%%/swat/lang/ru/help/welcome.html
+%%DATADIR%%/swat/lang/ru/images/globals.gif
+%%DATADIR%%/swat/lang/ru/images/home.gif
+%%DATADIR%%/swat/lang/ru/images/passwd.gif
+%%DATADIR%%/swat/lang/ru/images/printers.gif
+%%DATADIR%%/swat/lang/ru/images/shares.gif
+%%DATADIR%%/swat/lang/ru/images/status.gif
+%%DATADIR%%/swat/lang/ru/images/viewconfig.gif
+%%DATADIR%%/swat/lang/ru/images/wizard.gif
+%%DATADIR%%/swat/lang/ru/include/header.html
+%%DATADIR%%/swat/lang/tr/help/welcome.html
+%%DATADIR%%/swat/lang/tr/images/globals.gif
+%%DATADIR%%/swat/lang/tr/images/home.gif
+%%DATADIR%%/swat/lang/tr/images/passwd.gif
+%%DATADIR%%/swat/lang/tr/images/printers.gif
+%%DATADIR%%/swat/lang/tr/images/samba.gif
+%%DATADIR%%/swat/lang/tr/images/shares.gif
+%%DATADIR%%/swat/lang/tr/images/status.gif
+%%DATADIR%%/swat/lang/tr/images/viewconfig.gif
+@dirrm %%DATADIR%%/swat/lang/tr/images
+@dirrm %%DATADIR%%/swat/lang/tr/help
+@dirrm %%DATADIR%%/swat/lang/tr
+@dirrm %%DATADIR%%/swat/lang/ru/include
+@dirrm %%DATADIR%%/swat/lang/ru/images
+@dirrm %%DATADIR%%/swat/lang/ru/help
+@dirrm %%DATADIR%%/swat/lang/ru
+@dirrm %%DATADIR%%/swat/lang/ja/help
+@dirrm %%DATADIR%%/swat/lang/ja
+@dirrm %%DATADIR%%/swat/lang
+@dirrm %%DATADIR%%/swat/include
+@dirrm %%DATADIR%%/swat/images
+@dirrm %%DATADIR%%/swat/help
+@dirrm %%DATADIR%%/swat
 @dirrm %%DATADIR%%/setup/display-specifiers
 @dirrm %%DATADIR%%/setup/ad-schema
 @dirrm %%DATADIR%%/setup
+@dirrm %%DATADIR%%/codepages
 @dirrm %%DATADIR%%
-@dirrm lib/samba4/modules/ldb
-@dirrm lib/samba4/modules
-@dirrm lib/samba4
-@unexec find %D/%%PYTHON_SITELIBDIR%%/subunit %D/%%PYTHON_SITELIBDIR%%/samba -name '*.py[oc]' -print0 | xargs -0 rm -f
-@dirrm %%PYTHON_SITELIBDIR%%/subunit/tests
-@dirrm %%PYTHON_SITELIBDIR%%/subunit
-@dirrm %%PYTHON_SITELIBDIR%%/samba/torture
-@dirrm %%PYTHON_SITELIBDIR%%/samba/tests/dcerpc
-@dirrm %%PYTHON_SITELIBDIR%%/samba/tests
-@dirrm %%PYTHON_SITELIBDIR%%/samba/netcmd
-@dirrm %%PYTHON_SITELIBDIR%%/samba/dcerpc
-@dirrm %%PYTHON_SITELIBDIR%%/samba
-@dirrmtry %%PYTHON_SITELIBDIR%%
-@dirrm include/samba4/util
-@dirrm include/samba4/samba
-@dirrm include/samba4/gen_ndr
-@dirrm include/samba4/dcerpc_server
-@dirrm include/samba4/core
-@dirrm include/samba4