Index: head/net/samba410/Makefile =================================================================== --- head/net/samba410/Makefile (revision 505445) +++ head/net/samba410/Makefile (revision 505446) @@ -1,629 +1,608 @@ # Created by: timur@FreeBSD.org # $FreeBSD$ -PORTNAME= ${SAMBA4_BASENAME}48 +PORTNAME= ${SAMBA4_BASENAME}410 PORTVERSION= ${SAMBA4_VERSION} -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES?= net MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc DISTNAME= ${SAMBA4_DISTNAME} MAINTAINER= timur@FreeBSD.org COMMENT= Free SMB/CIFS and AD/DC server and client for Unix LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING IGNORE_NONTHREAD_PYTHON= needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support -CONFLICTS_INSTALL?= samba4-4.0.* samba4[1-79]-4.* p5-Parse-Pidl-4.* +CONFLICTS_INSTALL?= samba4-4.0.* samba4[1-9]-4.* p5-Parse-Pidl-4.* EXTRA_PATCHES+= ${PATCHDIR}/0001-Zfs-provision-1.patch:-p1 -EXTRA_PATCHES+= ${PATCHDIR}/0001-Freenas-master-mdns-fixes-22.patch:-p1 -EXTRA_PATCHES+= ${PATCHDIR}/0001-audit.patch:-p1 -EXTRA_PATCHES+= ${PATCHDIR}/0001-bug-228462.patch:-p1 SAMBA4_BASENAME= samba SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4 -SAMBA4_VERSION= 4.8.12 +SAMBA4_VERSION= 4.10.5 SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|} WRKSRC?= ${WRKDIR}/${DISTNAME} .if !defined(SAMBA4_SUBPORT) CPE_VENDOR= samba CPE_PRODUCT= samba # Directories VARDIR= ${DESTDIR}/var SAMBA4_RUNDIR= ${VARDIR}/run/${SAMBA4_PORTNAME} SAMBA4_LOGDIR= ${VARDIR}/log/${SAMBA4_PORTNAME} SAMBA4_LOCKDIR= ${VARDIR}/db/${SAMBA4_PORTNAME} SAMBA4_BINDDNSDIR= ${SAMBA4_LOCKDIR}/bind-dns SAMBA4_PRIVATEDIR= ${SAMBA4_LOCKDIR}/private SAMBA4_PAMDIR= ${PREFIX}/lib SAMBA4_LIBDIR= ${PREFIX}/lib/${SAMBA4_PORTNAME} -SAMBA4_MODULEDIR= ${PREFIX}/lib/shared-modules SAMBA4_INCLUDEDIR= ${PREFIX}/include/${SAMBA4_PORTNAME} SAMBA4_CONFDIR= ${PREFIX}/etc SAMBA4_CONFIG= smb4.conf CONFIGURE_ARGS+= --mandir="${MANPREFIX}/man" \ --sysconfdir="${SAMBA4_CONFDIR}" \ --includedir="${SAMBA4_INCLUDEDIR}" \ --datadir="${DATADIR}" \ --libdir="${SAMBA4_LIBDIR}" \ --with-privatelibdir="${SAMBA4_LIBDIR}/private" \ --with-pammodulesdir="${SAMBA4_PAMDIR}" \ --with-modulesdir="${SAMBA4_MODULEDIR}" \ --with-pkgconfigdir="${PKGCONFIGDIR}" \ --localstatedir="${VARDIR}" \ --with-piddir="${SAMBA4_RUNDIR}" \ --with-sockets-dir="${SAMBA4_RUNDIR}" \ --with-privileged-socket-dir="${SAMBA4_RUNDIR}" \ --with-lockdir="${SAMBA4_LOCKDIR}" \ --with-statedir="${SAMBA4_LOCKDIR}" \ --with-cachedir="${SAMBA4_LOCKDIR}" \ --with-bind-dns-dir=${SAMBA4_BINDDNSDIR} \ --with-privatedir="${SAMBA4_PRIVATEDIR}" \ --with-logfilebase="${SAMBA4_LOGDIR}" # XXX: Flags CONFIGURE_ENV+= PTHREAD_LDFLAGS="-lpthread" USES= compiler:c++11-lang cpe iconv gettext-runtime \ localbase:ldflags perl5 pkgconfig shebangfix \ ssl waf USE_PERL5= build USE_LDCONFIG= ${SAMBA4_LIBDIR} +LLD_UNSAFE= yes WAF_CMD= buildtools/bin/waf CONFIGURE_LOG= bin/config.log PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig PKGCONFIGDIR_REL?= ${PKGCONFIGDIR:S,^${PREFIX}/,,} PLIST_SUB+= PKGCONFIGDIR=${PKGCONFIGDIR_REL} SUB_LIST+= PKGCONFIGDIR=${PKGCONFIGDIR_REL} ############################################################################## # Options OPTIONS_SUB= yes OPTIONS_DEFINE= AD_DC ADS DEBUG DOCS FAM LDAP \ QUOTAS SYSLOG UTMP PROFILE # Make those default options OPTIONS_DEFAULT:= ${OPTIONS_DEFINE} GSSAPI_BUILTIN # This shouldn't be default in the release OPTIONS_DEFINE+= DEVELOPER MANDOC OPTIONS_DEFINE_amd64= AESNI OPTIONS_DEFAULT_amd64= AESNI OPTIONS_DEFINE+= CLUSTER CUPS GLUSTERFS GPGME NTVFS SPOTLIGHT #OPTIONS_DEFINE+= MEMORY_DEBUG OPTIONS_SINGLE= GSSAPI # GSSAPI_HEIMDAL OPTIONS_SINGLE_GSSAPI= GSSAPI_BUILTIN GSSAPI_MIT OPTIONS_RADIO= DNS ZEROCONF OPTIONS_RADIO_DNS= NSUPDATE BIND911 BIND913 BIND914 OPTIONS_RADIO_ZEROCONF= MDNSRESPONDER AVAHI ############################################################################## AD_DC_DESC= Active Directory Domain Controller ADS_DESC= Active Directory client(implies LDAP) AESNI_DESC= Accelerated AES crypto functions(amd64 only) CLUSTER_DESC= Clustering DEVELOPER_DESC= With developer framework(implies NTVFS) FAM_DESC= File Alteration Monitor GPGME_DESC= GpgME GLUSTERFS_DESC= GlusterFS LDAP_DESC= LDAP client LIBZFS_DESC= LibZFS SPOTLIGHT_DESC= Spotlight MANDOC_DESC= Build manpages from DOCBOOK templates MEMORY_DEBUG_DESC= Debug memory allocation NTVFS_DESC= Build *DEPRECATED* NTVFS file server PICKY_DEVELOPER_DESC= Treat compiler warnings as errors(implies DEVELOPER) PROFILE_DESC= Profiling data QUOTAS_DESC= Disk quota UTMP_DESC= UTMP accounting GSSAPI_BUILTIN_DESC= GSSAPI support via bundled Heimdal BIND911_DESC= Use Bind 9.11 as AD DC DNS server frontend BIND913_DESC= Use Bind 9.13 as AD DC DNS server frontend BIND914_DESC= Use Bind 9.14 as AD DC DNS server frontend NSUPDATE_DESC= Use samba NSUPDATE utility for AD DC ############################################################################## # XXX: Unconditional dependencies which can't be switched off(if present in # the system) # Readline(sponsored by Python) # XXX: USES=readline pollutes CPPFLAGS, so we explicitly put dependency -LIB_DEPENDS+= libreadline.so.8:devel/readline +LIB_DEPENDS+= libreadline.so:devel/readline # popt LIB_DEPENDS+= libpopt.so:devel/popt # inotify LIB_DEPENDS+= libinotify.so:devel/libinotify # GNUTLS LIB_DEPENDS+= libgnutls.so:security/gnutls # NFS4 ACL glue LIB_DEPENDS+= libsunacl.so:sysutils/libsunacl # Jansson BUILD_DEPENDS+= jansson>=2.10:devel/jansson RUN_DEPENDS+= jansson>=2.10:devel/jansson +# tasn1 +LIB_DEPENDS+= libtasn1.so:security/libtasn1 # External Samba dependencies # Needed for IDL compiler BUILD_DEPENDS+= p5-Parse-Yapp>=0:devel/p5-Parse-Yapp # Libarchive SAMBA4_BUNDLED_LIBS+= !libarchive BUILD_DEPENDS+= libarchive>=3.1.2:archivers/libarchive RUN_DEPENDS+= libarchive>=3.1.2:archivers/libarchive ### Bundled libraries SAMBA4_BUNDLED_CMOCKA?= no SAMBA4_BUNDLED_TALLOC?= no SAMBA4_BUNDLED_TEVENT?= no SAMBA4_BUNDLED_TDB?= no SAMBA4_BUNDLED_LDB?= yes -SAMBA4_LDB= 13 +SAMBA4_LDB= 15 # cmocka .if defined(SAMBA4_BUNDLED_CMOCKA) && ${SAMBA4_BUNDLED_CMOCKA} == yes SAMBA4_BUNDLED_LIBS+= cmocka CONFLICTS+= cmocka-1.* PLIST_SUB+= SAMBA4_BUNDLED_CMOCKA="" SUB_LIST+= SAMBA4_BUNDLED_CMOCKA="" .else SAMBA4_BUNDLED_LIBS+= !cmocka -BUILD_DEPENDS+= cmocka>=1.1.1:sysutils/cmocka -RUN_DEPENDS+= cmocka>=1.1.1:sysutils/cmocka +BUILD_DEPENDS+= cmocka>=1.1.3:sysutils/cmocka +RUN_DEPENDS+= cmocka>=1.1.3:sysutils/cmocka PLIST_SUB+= SAMBA4_BUNDLED_CMOCKA="@comment " SUB_LIST+= SAMBA4_BUNDLED_CMOCKA="@comment " .endif # talloc .if defined(SAMBA4_BUNDLED_TALLOC) && ${SAMBA4_BUNDLED_TALLOC} == yes SAMBA4_BUNDLED_LIBS+= talloc -CONFLICTS+= talloc1-2.* +CONFLICTS+= talloc-* talloc1-* PLIST_SUB+= SAMBA4_BUNDLED_TALLOC="" SUB_LIST+= SAMBA4_BUNDLED_TALLOC="" .else SAMBA4_BUNDLED_LIBS+= !talloc -BUILD_DEPENDS+= talloc1>=2.1.14:devel/talloc1 -RUN_DEPENDS+= talloc1>=2.1.14:devel/talloc1 +BUILD_DEPENDS+= talloc>=2.2.0:devel/talloc +RUN_DEPENDS+= talloc>=2.2.0:devel/talloc PLIST_SUB+= SAMBA4_BUNDLED_TALLOC="@comment " SUB_LIST+= SAMBA4_BUNDLED_TALLOC="@comment " .endif # tevent .if defined(SAMBA4_BUNDLED_TEVENT) && ${SAMBA4_BUNDLED_TEVENT} == yes SAMBA4_BUNDLED_LIBS+= tevent -CONFLICTS+= tevent1-0.* +CONFLICTS+= tevent-* tevent1-* PLIST_SUB+= SAMBA4_BUNDLED_TEVENT="" SUB_LIST+= SAMBA4_BUNDLED_TEVENT="" .else SAMBA4_BUNDLED_LIBS+= !tevent -BUILD_DEPENDS+= tevent1>=0.9.37:devel/tevent1 -RUN_DEPENDS+= tevent1>=0.9.37:devel/tevent1 +BUILD_DEPENDS+= tevent>=0.10.0:devel/tevent +RUN_DEPENDS+= tevent>=0.10.0:devel/tevent PLIST_SUB+= SAMBA4_BUNDLED_TEVENT="@comment " SUB_LIST+= SAMBA4_BUNDLED_TEVENT="@comment " .endif # tdb .if defined(SAMBA4_BUNDLED_TDB) && ${SAMBA4_BUNDLED_TDB} == yes SAMBA4_BUNDLED_LIBS+= tdb -CONFLICTS+= tdb1-1.* +CONFLICTS+= tdb-* tdb1-* PLIST_SUB+= SAMBA4_BUNDLED_TDB="" SUB_LIST+= SAMBA4_BUNDLED_TDB="" .else SAMBA4_BUNDLED_LIBS+= !tdb -BUILD_DEPENDS+= tdb1>=1.3.15:databases/tdb1 -RUN_DEPENDS+= tdb1>=1.3.15:databases/tdb1 +BUILD_DEPENDS+= tdb>=1.4.0:databases/tdb +RUN_DEPENDS+= tdb>=1.4.0:databases/tdb PLIST_SUB+= SAMBA4_BUNDLED_TDB="@comment " SUB_LIST+= SAMBA4_BUNDLED_TDB="@comment " .endif # ldb .if (defined(SAMBA4_BUNDLED_LDB) && ${SAMBA4_BUNDLED_LDB} == yes) || !defined(SAMBA4_LDB) SAMBA4_BUNDLED_LDB= yes SAMBA4_BUNDLED_LIBS+= ldb -CONFLICTS+= ldb-1.* ldb1[23]-1.* PLIST_SUB+= SAMBA4_BUNDLED_LDB="" SUB_LIST+= SAMBA4_BUNDLED_LDB="" +SAMBA4_MODULEDIR= ${SAMBA4_LIBDIR}/modules .else -. if ${SAMBA4_LDB} == 13 -BUILD_DEPENDS+= ldb13>=1.3.6:databases/ldb13 -RUN_DEPENDS+= ldb13>=1.3.6:databases/ldb13 -. elif ${SAMBA4_LDB} == 12 -BUILD_DEPENDS+= ldb12>=1.2.3:databases/ldb12 -RUN_DEPENDS+= ldb12>=1.2.3:databases/ldb12 -. elif ${SAMBA4_LDB} == 11 -BUILD_DEPENDS+= ldb>=1.1.29:databases/ldb -RUN_DEPENDS+= ldb>=1.1.29:databases/ldb -. endif SAMBA4_BUNDLED_LIBS+= !ldb +BUILD_DEPENDS+= ldb14>=1.5.4:databases/ldb15 +RUN_DEPENDS+= ldb14>=1.5.4:databases/ldb15 PLIST_SUB+= SAMBA4_BUNDLED_LDB="@comment " SUB_LIST+= SAMBA4_BUNDLED_LDB="@comment " +SAMBA4_MODULEDIR= ${PREFIX}/lib/shared-modules .endif -.if (defined(SAMBA4_BUNDLED_TALLOC) && ${SAMBA4_BUNDLED_TEVENT} == yes) \ +.if (defined(SAMBA4_BUNDLED_TALLOC) && ${SAMBA4_BUNDLED_TEVENT} == yes) \ || (defined(SAMBA4_BUNDLED_TDB) && ${SAMBA4_BUNDLED_TDB} == yes) \ || (defined(SAMBA4_BUNDLED_TEVENT) && ${SAMBA4_BUNDLED_TEVENT} == yes) SAMBA4_BUNDLED_LIBS+= replace .endif # Don't use external libcom_err SAMBA4_BUNDLED_LIBS+= com_err # Set the test environment variables TEST_USES= python TEST_ENV+= PYTHON="${PYTHON_CMD}" \ SHA1SUM=/sbin/sha1 \ SHA256SUM=/sbin/sha256 \ MD5SUM=/sbin/md5 TEST_DEPENDS+= bash:shells/bash \ tshark:net/tshark ############################################################################## CONFIGURE_ARGS+= \ --with-pam \ --with-iconv \ --with-winbind \ --with-regedit \ --disable-rpath \ --without-lttng \ --without-gettext \ --enable-pthreadpool \ --without-fake-kaserver \ --without-systemd \ --enable-gnutls \ --with-libarchive \ --with-acl-support \ --with-sendfile-support \ --disable-ctdb-tests \ ${ICONV_CONFIGURE_BASE} ############################################################################## BIND911_RUN_DEPENDS= bind911>=9.11.0.0:dns/bind911 +BIND912_RUN_DEPENDS= bind912>=9.12.0.0:dns/bind912 BIND913_RUN_DEPENDS= bind913>=9.13.0.0:dns/bind913 BIND914_RUN_DEPENDS= bind914>=9.14.0.0:dns/bind914 NSUPDATE_RUN_DEPENDS= samba-nsupdate:dns/samba-nsupdate AVAHI_CONFIGURE_ENABLE= avahi AVAHI_LIB_DEPENDS= libavahi-client.so:net/avahi-app AVAHI_VARS= SAMBA4_SERVICES+=avahi_daemon MDNSRESPONDER_CONFIGURE_ENABLE= dnssd MDNSRESPONDER_LIB_DEPENDS= libdns_sd.so:net/mDNSResponder MDNSRESPONDER_VARS= SAMBA4_SERVICES+=mdnsd ############################################################################## DEBUG_CONFIGURE_ON= --verbose --enable-debug DEBUG_MAKE_ARGS= --verbose DEBUG_FLAGS= -g -ggdb3 -O0 MEMORY_DEBUG_IMPLIES= DEBUG MEMORY_DEBUG_CONFIGURE_ENV= ADDITIONAL_CFLAGS="-DENABLE_JEMALLOC `pkg-config --cflags jemalloc`" ADDITIONAL_LDFLAGS="`pkg-config --libs jemalloc`" MEMORY_DEBUG_LIB_DEPENDS= libjemalloc.so.2:devel/jemalloc # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=194046 GDB_CMD?= ${LOCALBASE}/bin/gdb # https://bugzilla.samba.org/show_bug.cgi?id=8969 PICKY_DEVELOPER_IMPLIES= DEVELOPER PICKY_DEVELOPER_CONFIGURE_ON= --picky-developer DEVELOPER_IMPLIES= NTVFS DEVELOPER_CONFIGURE_ON= --enable-developer --enable-selftest --abi-check-disable -DEVELOPER_BUILD_DEPENDS= ${GDB_CMD}:devel/gdb +DEVELOPER_RUN_DEPENDS= ${SAMBA4_LMDB_DEPENDS} +DEVELOPER_BUILD_DEPENDS= ${GDB_CMD}:devel/gdb \ + ${SAMBA4_LMDB_DEPENDS} DEVELOPER_TEST_DEPENDS= ${GDB_CMD}:devel/gdb DEVELOPER_VARS_OFF= GDB_CMD=true # XXX: Mostly used in conjuction with the DEVELOPER option, don't enable it # if you don't know what you are doing +NTVS_IMPLIES= AD_DC NTVFS_CONFIGURE_WITH= ntvfs-fileserver -NTVFS_PLIST_FILES= lib/shared-modules/service/smb.so \ +NTVFS_PLIST_FILES= ${SAMBA4_MODULEDIR}/service/smb.so \ lib/samba4/private/libntvfs-samba4.so ############################################################################## CLUSTER_CONFIGURE_WITH= cluster-support CUPS_CONFIGURE_ENABLE= cups iprint CUPS_LIB_DEPENDS= libcups.so:print/cups # https://bugzilla.samba.org/show_bug.cgi?id=9545 FAM_USES= fam FAM_CONFIGURE_WITH= fam GLUSTERFS_CONFIGURE_ENABLE= glusterfs GLUSTERFS_LIB_DEPENDS= libglusterfs.so:net/glusterfs GLUSTERFS_VARS= SAMBA4_MODULES+=vfs_glusterfs +GLUSTERFS_PLIST_FILES+= man/man8/vfs_glusterfs.8.gz GPGME_CONFIGURE_WITH= gpgme GPGME_LIB_DEPENDS= libgpgme.so:security/gpgme PROFILE_CONFIGURE_WITH= profiling-data QUOTAS_CONFIGURE_WITH= quotas SPOTLIGHT_CONFIGURE_ENABLE= spotlight SPOTLIGHT_BUILD_DEPENDS= tracker>=1.4.1:sysutils/tracker SPOTLIGHT_RUN_DEPENDS= tracker>=1.4.1:sysutils/tracker SPOTLIGHT_USES= bison SPOTLIGHT_USE= gnome=glib20 SYSLOG_CONFIGURE_WITH= syslog UTMP_CONFIGURE_WITH= utmp AD_DC_CONFIGURE_OFF= --without-ad-dc +AD_DC_BUILD_DEPENDS= ${SAMBA4_LMDB_DEPENDS} +AD_DC_RUN_DEPENDS= ${SAMBA4_LMDB_DEPENDS} ADS_IMPLIES= LDAP ADS_CONFIGURE_WITH= ads dnsupdate LDAP_CONFIGURE_WITH= ldap LDAP_CONFIGURE_ON= --with-openldap=${LOCALBASE} LDAP_USE= OPENLDAP=yes LDAP_VARS= SAMBA4_MODULES+=idmap_ldap GSSAPI_MIT_CONFIGURE_ON= --with-system-mitkrb5 ${GSSAPIBASEDIR} \ --with-system-mitkdc=${GSSAPIBASEDIR}/sbin/krb5kdc \ --with-experimental-mit-ad-dc GSSAPI_MIT_USES= gssapi:mit LIBZFS_CONFIGURE_WITH= libzfs LIBZFS_VARS= SAMBA4_MODULES+=vfs_zfs_space MANDOC_BUILD_DEPENDS= ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \ xsltproc:textproc/libxslt MANDOC_CONFIGURE_ENV_OFF= XSLTPROC="true" # !SAMBA4_SUBPORT .endif ############################################################################## .include ############################################################################## .if !defined(SAMBA4_SUBPORT) .if !defined(WANT_EXP_MODULES) || empty(WANT_EXP_MODULES) WANT_EXP_MODULES= vfs_cacheprime .endif .if ${WANT_EXP_MODULES:Mvfs_snapper} # snapper needs dbus LIB_DEPENDS+= libdbus-1.so:devel/dbus LIB_DEPENDS+= libdbus-glib-1.so:devel/dbus-glib .endif SAMBA4_MODULES+= vfs_freebsd SAMBA4_MODULES+= idmap_nss idmap_autorid idmap_rid idmap_hash idmap_tdb idmap_tdb2 idmap_script nss-info_hash # List of extra modules taken from RHEL build # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=197320 .if ${PORT_OPTIONS:MADS} SAMBA4_MODULES+= idmap_ad idmap_rfc2307 nss-info_template nss-info_rfc2307 nss-info_sfu nss-info_sfu20 .endif .if ${PORT_OPTIONS:MDEVELOPER} SAMBA4_MODULES+= auth_skel pdb_test gpext_security gpext_registry gpext_scripts perfcount_test \ vfs_fake_dfq vfs_skel_opaque vfs_skel_transparent vfs_shadow_copy_test vfs_fake_acls \ vfs_nfs4acl_xattr vfs_error_inject vfs_delay_inject .endif .if defined(WANT_EXP_MODULES) && !empty(WANT_EXP_MODULES) SAMBA4_MODULES+= ${WANT_EXP_MODULES} .endif .if defined(SAMBA4_BUNDLED_LIBS) && !empty(SAMBA4_BUNDLED_LIBS) CONFIGURE_ARGS+= --bundled-libraries="${SAMBA4_BUNDLED_LIBS:Q:C|(\\\\ )+|,|g:S|\\||g}" .endif .if defined(SAMBA4_MODULES) && !empty(SAMBA4_MODULES) CONFIGURE_ARGS+= --with-shared-modules="${SAMBA4_MODULES:C|-|_|:Q:C|(\\\\ )+|,|g:S|\\||g}" .endif # XXX: Hack for nss-info_* -> nss_info/* modules # Add selected modules to the plist .for module in ${SAMBA4_MODULES} -PLIST_FILES+= lib/shared-modules/${module:C|_|/|:C|-|_|}.so +PLIST_FILES+= ${SAMBA4_MODULEDIR}/${module:C|_|/|:C|-|_|}.so .endfor # Python bindings .if defined(NO_PYTHON) -USES+= python:2.7,build,test +USES+= python:2.7+,build,test CONFIGURE_ARGS+= --disable-python -PLIST_SUB+= SAMBA4_PYTHON2="@comment " SAMBA4_PYTHON3="@comment " -SUB_LIST+= SAMBA4_PYTHON2="@comment " SAMBA4_PYTHON3="@comment " +PLIST_SUB+= SAMBA4_PYTHON="@comment " +SUB_LIST+= SAMBA4_PYTHON="@comment " .else -USES+= python:2.7 -PLIST_SUB+= SAMBA4_PYTHON2="" -SUB_LIST+= SAMBA4_PYTHON2="" +USES+= python:3.4+ +PLIST_SUB+= SAMBA4_PYTHON="" +SUB_LIST+= SAMBA4_PYTHON="" .if !defined(SAMBA4_BUNDLED_TALLOC) SAMBA4_BUNDLED_LIBS+= !pytalloc-util .endif .if !defined(SAMBA4_BUNDLED_TEVENT) SAMBA4_BUNDLED_LIBS+= !pytevent .endif .if !defined(SAMBA4_BUNDLED_TDB) SAMBA4_BUNDLED_LIBS+= !pytdb .endif .if !defined(SAMBA4_BUNDLED_LDB) SAMBA4_BUNDLED_LIBS+= !pyldb,!pyldb-util .endif # External Python modules BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.15.0:dns/py-dnspython@${PY_FLAVOR} RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.15.0:dns/py-dnspython@${PY_FLAVOR} BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR} RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR} -# XXX: This is a gross hack to make port use both Python 2.7+ and 3.3+ -# This is not officially supported, use at your own risk -.if defined(WITH_SAMBA4_PYTHON3) && ${WITH_SAMBA4_PYTHON3:M3\.[0-9]} -SAMBA4_PYTHON3_VERSION= ${WITH_SAMBA4_PYTHON3} -SAMBA4_PYTHON3= python${SAMBA4_PYTHON3_VERSION} -SAMBA4_PYTHON3_VER= ${SAMBA4_PYTHON3_VERSION:C/\.//} -.if !exists(${PORTSDIR}/lang/python${SAMBA4_PYTHON3_VER}) -.error unsupported or unknown Python version ${SAMBA4_PYTHON3_VERSION} .endif -BUILD_DEPENDS+= ${SAMBA4_PYTHON3}:lang/python${SAMBA4_PYTHON3_VER} -RUN_DEPENDS+= ${SAMBA4_PYTHON3}:lang/python${SAMBA4_PYTHON3_VER} -# External Python modules -BUILD_DEPENDS+= py${SAMBA4_PYTHON3_VER}-dnspython>=1.15.0:dns/py-dnspython@py${SAMBA4_PYTHON3_VER} -RUN_DEPENDS+= py${SAMBA4_PYTHON3_VER}-dnspython>=1.15.0:dns/py-dnspython@py${SAMBA4_PYTHON3_VER} - -BUILD_DEPENDS+= py${SAMBA4_PYTHON3_VER}-iso8601>=0.1.11:devel/py-iso8601@py${SAMBA4_PYTHON3_VER} -RUN_DEPENDS+= py${SAMBA4_PYTHON3_VER}-iso8601>=0.1.11:devel/py-iso8601@py${SAMBA4_PYTHON3_VER} -# cpython-36m -SAMBA4_PYTHON3_SO_ABI!= [ ! -f "${LOCALBASE}/bin/${SAMBA4_PYTHON3}" ] || ${LOCALBASE}/bin/${SAMBA4_PYTHON3} -c 'import sysconfig; print(sysconfig.get_config_var("SOABI") or "")' 2>/dev/null -SAMBA4_PYTHON3_SITELIBDIR= lib/python${SAMBA4_PYTHON3_VERSION}/site-packages - -CONFIGURE_ENV+= PYTHON3_SO_ABI_FLAG=.${SAMBA4_PYTHON3_SO_ABI} -CONFIGURE_ARGS+= --extra-python=${LOCALBASE}/bin/${SAMBA4_PYTHON3} - -PLIST_SUB+= SAMBA4_PYTHON3="" SAMBA4_PYTHON3_SITELIBDIR="${SAMBA4_PYTHON3_SITELIBDIR}" -SUB_LIST+= SAMBA4_PYTHON3="" SAMBA4_PYTHON3_SITELIBDIR="${SAMBA4_PYTHON3_SITELIBDIR}" -.else -PLIST_SUB+= SAMBA4_PYTHON3="@comment " -SUB_LIST+= SAMBA4_PYTHON3="@comment " -.endif -.endif # !SAMBA4_SUBPORT .endif ############################################################################## .include ############################################################################## .if !defined(SAMBA4_SUBPORT) # Require llvm 4.0 and AMD64 .if ${PORT_OPTIONS:MAESNI} && ${ARCH} == "amd64" CONFIGURE_ARGS+= --accel-aes=intelaesni PLIST_FILES+= lib/samba4/private/libaesni-intel-samba4.so .else CONFIGURE_ARGS+= --accel-aes=none .endif +# Only for 64-bit architectures +.if ${ARCH} != armv6 && ${ARCH} != armv7 && ${ARCH} != i386 && ${ARCH} != mips && ${ARCH} != powerpc && ${ARCH} != powerpcspe +. if defined(SAMBA4_BUNDLED_LDB) && ${SAMBA4_BUNDLED_LDB} == yes && ${PORT_OPTIONS:MAD_DC} +# LMDB +SAMBA4_LMDB_DEPENDS= lmdb>=0.9.16:databases/lmdb +PLIST_FILES+= lib/samba4/private/libldb-mdb-int-samba4.so +. endif +.endif + .if ${PORT_OPTIONS:MGSSAPI_MIT} -PLIST_FILES+= lib/shared-modules/krb5/winbind_krb5_localauth.so \ +PLIST_FILES+= ${SAMBA4_MODULEDIR}/krb5/winbind_krb5_localauth.so \ man/man8/winbind_krb5_localauth.8.gz -. if ${PORT_OPTIONS:MAD_DC} +. if ${PORT_OPTIONS:MAD_DC} PLIST_FILES+= lib/samba4/krb5/plugins/kdb/samba.so -. endif +. endif .endif # for libexecinfo: (so that __builtin_frame_address() finds the top of the stack) CFLAGS_amd64+= -fno-omit-frame-pointer # No fancy color error messages CONFIGURE_ENV+= NOCOLOR=yes WAF_LOG_FORMAT='%(c1)s%(zone)s%(c2)s %(message)s' MAKE_ENV+= NOCOLOR=yes WAF_LOG_FORMAT='%(c1)s%(zone)s%(c2)s %(message)s' .if ${CHOSEN_COMPILER_TYPE} == clang CFLAGS+= -fno-color-diagnostics .endif -# Allow rpcgen ti find proper CPP +# Allow rpcgen to find proper CPP MAKE_ENV+= RPCGEN_CPP="${CPP}" #.if ${readline_ARGS} == port #CFLAGS+= -D_FUNCTION_DEF #.endif # Make sure that the right version of Python is used by the tools # https://bugzilla.samba.org/show_bug.cgi?id=7305 SHEBANG_FILES= ${PATCH_WRKSRC}/source4/scripting/bin/* ${PATCH_WRKSRC}/selftest/* SAMBA4_SUB= SAMBA4_LOGDIR="${SAMBA4_LOGDIR}" \ SAMBA4_RUNDIR="${SAMBA4_RUNDIR}" \ SAMBA4_LOCKDIR="${SAMBA4_LOCKDIR}" \ SAMBA4_MODULEDIR="${SAMBA4_MODULEDIR}" \ SAMBA4_BINDDNSDIR="${SAMBA4_BINDDNSDIR}" \ SAMBA4_PRIVATEDIR="${SAMBA4_PRIVATEDIR}" \ SAMBA4_CONFDIR="${SAMBA4_CONFDIR}" \ SAMBA4_CONFIG="${SAMBA4_CONFIG}" \ SAMBA4_SERVICES="${SAMBA4_SERVICES}" PLIST_SUB+= ${SAMBA4_SUB} SUB_LIST+= ${SAMBA4_SUB} USE_RC_SUBR= samba_server SUB_FILES= pkg-message README.FreeBSD PORTDOCS= README.FreeBSD post-extract: @${RM} -r ${WRKSRC}/pidl/lib/Parse/Yapp post-patch: @${REINPLACE_CMD} -e 's|$${PKGCONFIGDIR}|${PKGCONFIGDIR}|g' \ ${PATCH_WRKSRC}/buildtools/wafsamba/pkgconfig.py @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${PATCH_WRKSRC}/buildtools/wafsamba/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 @${REINPLACE_CMD} -e '1s|/bin/bash|/bin/sh|' \ ${PATCH_WRKSRC}/ctdb/tools/onnode # Use threading (or multiprocessing) but not thread (renamed in python 3+). pre-configure: .if ! ${PORT_OPTIONS:MAD_DC} && ${PORT_OPTIONS:MNTVFS} @${ECHO_CMD}; \ ${ECHO_MSG} "===> NTVFS option requires AD_DC to be set"; \ ${ECHO_CMD}; \ ${FALSE} .endif @if ! ${PYTHON_CMD} -c "import multiprocessing;" 2>/dev/null; then \ ${ECHO_CMD}; \ ${ECHO_MSG} "===> ${PKGNAME} "${IGNORE_NONTHREAD_PYTHON:Q}.; \ ${ECHO_CMD}; \ ${FALSE}; \ fi pre-build-MANDOC-off: ${MKDIR} ${BUILD_WRKSRC}/bin/default/docs-xml/ ${CP} -rp ${BUILD_WRKSRC}/docs/manpages ${BUILD_WRKSRC}/bin/default/docs-xml/ .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/scripting/man/samba_gpoupdate.8 \ + source4/scripting/man/samba-gpupdate.8 \ 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 \ lib/tdb/man/tdbdump.8 \ lib/tdb/man/tdbbackup.8 \ lib/tdb/man/tdbtool.8 \ lib/talloc/man/talloc.3 \ lib/tdb/man/tdbrestore.8 \ lib/ldb/man/ldb.3 \ lib/ldb/man/ldbadd.1 \ lib/ldb/man/ldbsearch.1 \ lib/ldb/man/ldbmodify.1 \ lib/ldb/man/ldbrename.1 \ lib/ldb/man/ldbdel.1 \ - lib/ldb/man/ldbedit.1 + lib/ldb/man/ldbedit.1 \ + docs-xml/manpages/vfs_freebsd.8 ${MKDIR} `dirname ${BUILD_WRKSRC}/bin/default/${man}` ${INSTALL_MAN} ${FILESDIR}/man/`basename ${man}` ${BUILD_WRKSRC}/bin/default/${man} .endfor .if ${PORT_OPTIONS:MCLUSTER} ${MKDIR} ${BUILD_WRKSRC}/bin/default/ctdb/ -. for man in ctdb_diagnostics.1 ctdb.1 ctdbd_wrapper.1 ctdbd.1 \ - ltdbtool.1 onnode.1 ping_pong.1 ctdbd.conf.5 \ +. for man in ctdb_diagnostics.1 ctdb.1 ctdbd_wrapper.1 ctdbd.1 ltdbtool.1 onnode.1 ping_pong.1 \ + ctdb.conf.5 ctdb.sysconfig.5 ctdb-script.options.5 \ ctdb.7 ctdb-statistics.7 ctdb-tunables.7 ${INSTALL_MAN} ${FILESDIR}/man/${man} ${BUILD_WRKSRC}/bin/default/ctdb/ . endfor .endif post-install-rm-junk: .for f in vfs_aio_linux.8 vfs_btrfs.8 vfs_ceph.8 vfs_gpfs.8 ${RM} ${STAGEDIR}${PREFIX}/man/man8/${f} .endfor .if defined(NO_PYTHON) ${RM} -r ${STAGEDIR}${PYTHON_SITELIBDIR}/samba/third_party/dns \ ${STAGEDIR}${PYTHON_SITELIBDIR}/samba/third_party/iso8601 .endif post-install: post-install-rm-junk ${LN} -sf smb.conf.5.gz ${STAGEDIR}${PREFIX}/man/man5/smb4.conf.5.gz # Run post-install script .for dir in ${SAMBA4_LOGDIR} ${SAMBA4_RUNDIR} ${SAMBA4_LOCKDIR} ${SAMBA4_MODULEDIR} ${INSTALL} -d -m 0755 "${STAGEDIR}${dir}" .endfor ${INSTALL} -d -m 0750 "${STAGEDIR}${SAMBA4_BINDDNSDIR}" ${INSTALL} -d -m 0750 "${STAGEDIR}${SAMBA4_PRIVATEDIR}" .for dir in auth bind9 gensec gpext idmap ldb nss_info pdb perfcount process_model service vfs ${INSTALL} -d -m 0755 "${STAGEDIR}${SAMBA4_MODULEDIR}/${dir}" .endfor post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} .for doc in ${PORTDOCS} ${INSTALL_DATA} ${WRKDIR}/${doc} ${STAGEDIR}${DOCSDIR} .endfor # !SAMBA4_SUBPORT .endif .include Index: head/net/samba410/distinfo =================================================================== --- head/net/samba410/distinfo (revision 505445) +++ head/net/samba410/distinfo (revision 505446) @@ -1,3 +1,3 @@ -TIMESTAMP = 1557879791 -SHA256 (samba-4.8.12.tar.gz) = c162d519101e15d1a1d76df063bfefe8d1656f57fb74e1ef19fe05d341a65d8f -SIZE (samba-4.8.12.tar.gz) = 17764832 +TIMESTAMP = 1560986236 +SHA256 (samba-4.10.5.tar.gz) = 6c10266d5e8c44ce1ea17dc993ace67a83607b4d9a830959c75e3188c6af6375 +SIZE (samba-4.10.5.tar.gz) = 18290612 Index: head/net/samba410/files/patch-source4__heimdal__lib__roken__rand.c =================================================================== --- head/net/samba410/files/patch-source4__heimdal__lib__roken__rand.c (revision 505445) +++ head/net/samba410/files/patch-source4__heimdal__lib__roken__rand.c (nonexistent) @@ -1,10 +0,0 @@ ---- source4/heimdal/lib/roken/rand.c.orig 2018-01-14 04:41:58 UTC -+++ source4/heimdal/lib/roken/rand.c -@@ -37,7 +37,6 @@ - rk_random_init(void) - { - #if defined(HAVE_ARC4RANDOM) -- arc4random_stir(); - #elif defined(HAVE_SRANDOMDEV) - srandomdev(); - #elif defined(HAVE_RANDOM) Property changes on: head/net/samba410/files/patch-source4__heimdal__lib__roken__rand.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/samba410/files/0001-audit.patch =================================================================== --- head/net/samba410/files/0001-audit.patch (revision 505445) +++ head/net/samba410/files/0001-audit.patch (nonexistent) @@ -1,247 +0,0 @@ -From 7d1bcfc99c393367093c903f95a5e365881b7989 Mon Sep 17 00:00:00 2001 -From: "Timur I. Bakeyev" -Date: Fri, 22 Jun 2018 12:15:30 +0800 -Subject: [PATCH 1/3] Make sure that vfs*audit modules recognize and accept all - the syslog facilities. - ---- - source3/modules/vfs_audit.c | 34 +++++++++++++++++++++++----------- - source3/modules/vfs_extd_audit.c | 34 +++++++++++++++++++++++----------- - source3/modules/vfs_full_audit.c | 34 +++++++++++++++++++++++----------- - 3 files changed, 69 insertions(+), 33 deletions(-) - -diff --git a/source3/modules/vfs_audit.c b/source3/modules/vfs_audit.c -index 12477d5b01f..4f9d16c452e 100644 ---- a/source3/modules/vfs_audit.c -+++ b/source3/modules/vfs_audit.c -@@ -33,16 +33,28 @@ - static int audit_syslog_facility(vfs_handle_struct *handle) - { - static const struct enum_list enum_log_facilities[] = { -- { LOG_USER, "USER" }, -- { LOG_LOCAL0, "LOCAL0" }, -- { LOG_LOCAL1, "LOCAL1" }, -- { LOG_LOCAL2, "LOCAL2" }, -- { LOG_LOCAL3, "LOCAL3" }, -- { LOG_LOCAL4, "LOCAL4" }, -- { LOG_LOCAL5, "LOCAL5" }, -- { LOG_LOCAL6, "LOCAL6" }, -- { LOG_LOCAL7, "LOCAL7" }, -- { -1, NULL} -+ { LOG_AUTH, "AUTH" }, -+ { LOG_CRON, "CRON" }, -+ { LOG_DAEMON, "DAEMON" }, -+ { LOG_FTP, "FTP" }, -+ { LOG_KERN, "KERN" }, -+ { LOG_LPR, "LPR" }, -+ { LOG_MAIL, "MAIL" }, -+ { LOG_NEWS, "NEWS" }, -+ { LOG_NTP, "NTP" }, -+ { LOG_SECURITY, "SECURITY" }, -+ { LOG_SYSLOG, "SYSLOG" }, -+ { LOG_USER, "USER" }, -+ { LOG_UUCP, "UUCP" }, -+ { LOG_LOCAL0, "LOCAL0" }, -+ { LOG_LOCAL1, "LOCAL1" }, -+ { LOG_LOCAL2, "LOCAL2" }, -+ { LOG_LOCAL3, "LOCAL3" }, -+ { LOG_LOCAL4, "LOCAL4" }, -+ { LOG_LOCAL5, "LOCAL5" }, -+ { LOG_LOCAL6, "LOCAL6" }, -+ { LOG_LOCAL7, "LOCAL7" }, -+ { -1, NULL } - }; - - int facility; -@@ -64,7 +76,7 @@ static int audit_syslog_priority(vfs_handle_struct *handle) - { LOG_NOTICE, "NOTICE" }, - { LOG_INFO, "INFO" }, - { LOG_DEBUG, "DEBUG" }, -- { -1, NULL} -+ { -1, NULL } - }; - - int priority; -diff --git a/source3/modules/vfs_extd_audit.c b/source3/modules/vfs_extd_audit.c -index 7d1fe273978..5307569a010 100644 ---- a/source3/modules/vfs_extd_audit.c -+++ b/source3/modules/vfs_extd_audit.c -@@ -36,16 +36,28 @@ static int vfs_extd_audit_debug_level = DBGC_VFS; - static int audit_syslog_facility(vfs_handle_struct *handle) - { - static const struct enum_list enum_log_facilities[] = { -- { LOG_USER, "USER" }, -- { LOG_LOCAL0, "LOCAL0" }, -- { LOG_LOCAL1, "LOCAL1" }, -- { LOG_LOCAL2, "LOCAL2" }, -- { LOG_LOCAL3, "LOCAL3" }, -- { LOG_LOCAL4, "LOCAL4" }, -- { LOG_LOCAL5, "LOCAL5" }, -- { LOG_LOCAL6, "LOCAL6" }, -- { LOG_LOCAL7, "LOCAL7" }, -- { -1, NULL} -+ { LOG_AUTH, "AUTH" }, -+ { LOG_CRON, "CRON" }, -+ { LOG_DAEMON, "DAEMON" }, -+ { LOG_FTP, "FTP" }, -+ { LOG_KERN, "KERN" }, -+ { LOG_LPR, "LPR" }, -+ { LOG_MAIL, "MAIL" }, -+ { LOG_NEWS, "NEWS" }, -+ { LOG_NTP, "NTP" }, -+ { LOG_SECURITY, "SECURITY" }, -+ { LOG_SYSLOG, "SYSLOG" }, -+ { LOG_USER, "USER" }, -+ { LOG_UUCP, "UUCP" }, -+ { LOG_LOCAL0, "LOCAL0" }, -+ { LOG_LOCAL1, "LOCAL1" }, -+ { LOG_LOCAL2, "LOCAL2" }, -+ { LOG_LOCAL3, "LOCAL3" }, -+ { LOG_LOCAL4, "LOCAL4" }, -+ { LOG_LOCAL5, "LOCAL5" }, -+ { LOG_LOCAL6, "LOCAL6" }, -+ { LOG_LOCAL7, "LOCAL7" }, -+ { -1, NULL } - }; - - int facility; -@@ -67,7 +79,7 @@ static int audit_syslog_priority(vfs_handle_struct *handle) - { LOG_NOTICE, "NOTICE" }, - { LOG_INFO, "INFO" }, - { LOG_DEBUG, "DEBUG" }, -- { -1, NULL} -+ { -1, NULL } - }; - - int priority; -diff --git a/source3/modules/vfs_full_audit.c b/source3/modules/vfs_full_audit.c -index a205007f46f..a52af4b5740 100644 ---- a/source3/modules/vfs_full_audit.c -+++ b/source3/modules/vfs_full_audit.c -@@ -357,16 +357,28 @@ static struct { - static int audit_syslog_facility(vfs_handle_struct *handle) - { - static const struct enum_list enum_log_facilities[] = { -- { LOG_USER, "USER" }, -- { LOG_LOCAL0, "LOCAL0" }, -- { LOG_LOCAL1, "LOCAL1" }, -- { LOG_LOCAL2, "LOCAL2" }, -- { LOG_LOCAL3, "LOCAL3" }, -- { LOG_LOCAL4, "LOCAL4" }, -- { LOG_LOCAL5, "LOCAL5" }, -- { LOG_LOCAL6, "LOCAL6" }, -- { LOG_LOCAL7, "LOCAL7" }, -- { -1, NULL} -+ { LOG_AUTH, "AUTH" }, -+ { LOG_CRON, "CRON" }, -+ { LOG_DAEMON, "DAEMON" }, -+ { LOG_FTP, "FTP" }, -+ { LOG_KERN, "KERN" }, -+ { LOG_LPR, "LPR" }, -+ { LOG_MAIL, "MAIL" }, -+ { LOG_NEWS, "NEWS" }, -+ { LOG_NTP, "NTP" }, -+ { LOG_SECURITY, "SECURITY" }, -+ { LOG_SYSLOG, "SYSLOG" }, -+ { LOG_USER, "USER" }, -+ { LOG_UUCP, "UUCP" }, -+ { LOG_LOCAL0, "LOCAL0" }, -+ { LOG_LOCAL1, "LOCAL1" }, -+ { LOG_LOCAL2, "LOCAL2" }, -+ { LOG_LOCAL3, "LOCAL3" }, -+ { LOG_LOCAL4, "LOCAL4" }, -+ { LOG_LOCAL5, "LOCAL5" }, -+ { LOG_LOCAL6, "LOCAL6" }, -+ { LOG_LOCAL7, "LOCAL7" }, -+ { -1, NULL } - }; - - int facility; -@@ -387,7 +399,7 @@ static int audit_syslog_priority(vfs_handle_struct *handle) - { LOG_NOTICE, "NOTICE" }, - { LOG_INFO, "INFO" }, - { LOG_DEBUG, "DEBUG" }, -- { -1, NULL} -+ { -1, NULL } - }; - - int priority; --- -2.16.3 - - -From b98fc517251ad25b695ef64453ffe3eaaffed5d8 Mon Sep 17 00:00:00 2001 -From: "Timur I. Bakeyev" -Date: Fri, 22 Jun 2018 12:19:42 +0800 -Subject: [PATCH 2/3] Make "none" is the default setting for the successful and - failed operations in the vfs_full_audit, so you don't blow up your server by - just adding this module to the configuration. - ---- - source3/modules/vfs_full_audit.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/source3/modules/vfs_full_audit.c b/source3/modules/vfs_full_audit.c -index a52af4b5740..bc40c8137dc 100644 ---- a/source3/modules/vfs_full_audit.c -+++ b/source3/modules/vfs_full_audit.c -@@ -624,6 +624,7 @@ static int smb_full_audit_connect(vfs_handle_struct *handle, - const char *svc, const char *user) - { - int result; -+ const char *none[] = { "none" }; - struct vfs_full_audit_private_data *pd = NULL; - - result = SMB_VFS_NEXT_CONNECT(handle, svc, user); -@@ -663,10 +664,10 @@ static int smb_full_audit_connect(vfs_handle_struct *handle, - - pd->success_ops = init_bitmap( - pd, lp_parm_string_list(SNUM(handle->conn), "full_audit", -- "success", NULL)); -+ "success", none)); - pd->failure_ops = init_bitmap( - pd, lp_parm_string_list(SNUM(handle->conn), "full_audit", -- "failure", NULL)); -+ "failure", none)); - - /* Store the private data. */ - SMB_VFS_HANDLE_SET_DATA(handle, pd, NULL, --- -2.16.3 - - -From e25f3a6cfc284737d8df941686f6629568763103 Mon Sep 17 00:00:00 2001 -From: "Timur I. Bakeyev" -Date: Fri, 22 Jun 2018 12:36:07 +0800 -Subject: [PATCH 3/3] Document that vfs_full_audit defaults are "none" for the - successful and failed operations. - ---- - docs-xml/manpages/vfs_full_audit.8.xml | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/docs-xml/manpages/vfs_full_audit.8.xml b/docs-xml/manpages/vfs_full_audit.8.xml -index cefe66d8b6f..ac8473f9990 100644 ---- a/docs-xml/manpages/vfs_full_audit.8.xml -+++ b/docs-xml/manpages/vfs_full_audit.8.xml -@@ -164,7 +164,7 @@ - LIST is a list of VFS operations that should be - recorded if they succeed. Operations are specified using - the names listed above. Operations can be unset by prefixing -- the names with "!". The default is all operations. -+ the names with "!". The default is none operations. - - - -@@ -176,7 +176,7 @@ - LIST is a list of VFS operations that should be - recorded if they failed. Operations are specified using - the names listed above. Operations can be unset by prefixing -- the names with "!". The default is all operations. -+ the names with "!". The default is none operations. - - - --- -2.16.3 - Property changes on: head/net/samba410/files/0001-audit.patch ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/samba410/files/patch-dynconfig__wscript =================================================================== --- head/net/samba410/files/patch-dynconfig__wscript (revision 505445) +++ head/net/samba410/files/patch-dynconfig__wscript (nonexistent) @@ -1,32 +0,0 @@ ---- dynconfig/wscript.orig 2017-07-04 10:05:25 UTC -+++ dynconfig/wscript -@@ -137,6 +137,8 @@ dynconfig = { - 'PKGCONFIGDIR' : { - 'STD-PATH': '${LIBDIR}/pkgconfig', - 'FHS-PATH': '${LIBDIR}/pkgconfig', -+ 'OPTION': '--with-pkgconfigdir', -+ 'HELPTEXT': 'Where to put .pc files', - }, - 'CODEPAGEDIR' : { - 'STD-PATH': '${DATADIR}/codepages', -@@ -237,8 +239,8 @@ dynconfig = { - 'DELAY': True, - }, - 'CONFIGFILE' : { -- 'STD-PATH': '${CONFIGDIR}/smb.conf', -- 'FHS-PATH': '${CONFIGDIR}/smb.conf', -+ 'STD-PATH': '${CONFIGDIR}/smb4.conf', -+ 'FHS-PATH': '${CONFIGDIR}/smb4.conf', - 'DELAY': True, - }, - 'LMHOSTSFILE' : { -@@ -297,9 +299,6 @@ def configure(conf): - 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 ={} - Property changes on: head/net/samba410/files/patch-dynconfig__wscript ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/samba410/files/patch-source3__utils__net_time.c =================================================================== --- head/net/samba410/files/patch-source3__utils__net_time.c (revision 505445) +++ head/net/samba410/files/patch-source3__utils__net_time.c (nonexistent) @@ -1,19 +0,0 @@ ---- source3/utils/net_time.c.orig 2017-07-04 10:05:26 UTC -+++ source3/utils/net_time.c -@@ -75,10 +75,15 @@ static const char *systime(time_t t) - 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) Property changes on: head/net/samba410/files/patch-source3__utils__net_time.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/samba410/files/0001-ctdb.patch =================================================================== --- head/net/samba410/files/0001-ctdb.patch (revision 505445) +++ head/net/samba410/files/0001-ctdb.patch (nonexistent) @@ -1,308 +0,0 @@ -From 8304a62ea7847ba6934d44c1b5b7acef9667750d Mon Sep 17 00:00:00 2001 -From: Martin Schwenke -Date: Fri, 8 Jun 2018 19:57:20 +1000 -Subject: [PATCH 1/2] ctdb-common: New include file common/system_network.h - -Contains declarations for functions that need ctdb_sock_addr. - -Signed-off-by: Martin Schwenke ---- - ctdb/common/system.h | 16 ------------ - ctdb/common/system_aix.c | 1 + - ctdb/common/system_common.c | 2 +- - ctdb/common/system_freebsd.c | 1 + - ctdb/common/system_gnu.c | 1 + - ctdb/common/system_kfreebsd.c | 1 + - ctdb/common/system_linux.c | 1 + - ctdb/common/system_network.h | 46 ++++++++++++++++++++++++++++++++++ - ctdb/server/ctdb_daemon.c | 1 + - ctdb/server/ctdb_recoverd.c | 2 +- - ctdb/server/ctdb_takeover.c | 1 + - ctdb/tests/src/porting_tests.c | 1 + - ctdb/tools/ctdb.c | 1 + - ctdb/tools/ctdb_killtcp.c | 2 +- - 14 files changed, 58 insertions(+), 19 deletions(-) - create mode 100644 ctdb/common/system_network.h - -diff --git a/ctdb/common/system.h b/ctdb/common/system.h -index e6f65b5e621..38ae67d2ab1 100644 ---- a/ctdb/common/system.h -+++ b/ctdb/common/system.h -@@ -22,24 +22,8 @@ - - #include - --/* From system_common.c */ -- --uint32_t uint16_checksum(uint16_t *data, size_t n); --bool ctdb_sys_have_ip(ctdb_sock_addr *_addr); --char *ctdb_sys_find_ifname(ctdb_sock_addr *addr); -- - /* From system_.c */ - --int ctdb_sys_send_arp(const ctdb_sock_addr *addr, const char *iface); --int ctdb_sys_send_tcp(const ctdb_sock_addr *dest, -- const ctdb_sock_addr *src, -- uint32_t seq, uint32_t ack, int rst); --int ctdb_sys_open_capture_socket(const char *iface, void **private_data); --int ctdb_sys_close_capture_socket(void *private_data); --int ctdb_sys_read_tcp_packet(int s, void *private_data, -- ctdb_sock_addr *src, ctdb_sock_addr *dst, -- uint32_t *ack_seq, uint32_t *seq, -- int *rst, uint16_t *window); - bool ctdb_sys_check_iface_exists(const char *iface); - int ctdb_get_peer_pid(const int fd, pid_t *peer_pid); - -diff --git a/ctdb/common/system_aix.c b/ctdb/common/system_aix.c -index f0a0a62efc0..7be54c7a46b 100644 ---- a/ctdb/common/system_aix.c -+++ b/ctdb/common/system_aix.c -@@ -38,6 +38,7 @@ - - #include "common/logging.h" - #include "common/system.h" -+#include "common/system_network.h" - - - #if 0 -diff --git a/ctdb/common/system_common.c b/ctdb/common/system_common.c -index a80189cd6c8..2618bf88c7f 100644 ---- a/ctdb/common/system_common.c -+++ b/ctdb/common/system_common.c -@@ -26,7 +26,7 @@ - #include "protocol/protocol.h" - - #include "common/logging.h" --#include "common/system.h" -+#include "common/system_network.h" - - /* - uint16 checksum for n bytes -diff --git a/ctdb/common/system_freebsd.c b/ctdb/common/system_freebsd.c -index b709a5c75c1..e5a6522c08f 100644 ---- a/ctdb/common/system_freebsd.c -+++ b/ctdb/common/system_freebsd.c -@@ -41,6 +41,7 @@ - - #include "common/logging.h" - #include "common/system.h" -+#include "common/system_network.h" - - #ifndef ETHERTYPE_IP6 - #define ETHERTYPE_IP6 0x86dd -diff --git a/ctdb/common/system_gnu.c b/ctdb/common/system_gnu.c -index 38ccd13988b..683843a6b76 100644 ---- a/ctdb/common/system_gnu.c -+++ b/ctdb/common/system_gnu.c -@@ -40,6 +40,7 @@ - - #include "common/logging.h" - #include "common/system.h" -+#include "common/system_network.h" - - #ifndef ETHERTYPE_IP6 - #define ETHERTYPE_IP6 0x86dd -diff --git a/ctdb/common/system_kfreebsd.c b/ctdb/common/system_kfreebsd.c -index d02f28659cb..cdf13572b2b 100644 ---- a/ctdb/common/system_kfreebsd.c -+++ b/ctdb/common/system_kfreebsd.c -@@ -40,6 +40,7 @@ - - #include "common/logging.h" - #include "common/system.h" -+#include "common/system_network.h" - - #ifndef ETHERTYPE_IP6 - #define ETHERTYPE_IP6 0x86dd -diff --git a/ctdb/common/system_linux.c b/ctdb/common/system_linux.c -index fa77a45460f..beacbf34138 100644 ---- a/ctdb/common/system_linux.c -+++ b/ctdb/common/system_linux.c -@@ -37,6 +37,7 @@ - - #include "common/logging.h" - #include "common/system.h" -+#include "common/system_network.h" - - #ifndef ETHERTYPE_IP6 - #define ETHERTYPE_IP6 0x86dd -diff --git a/ctdb/common/system_network.h b/ctdb/common/system_network.h -new file mode 100644 -index 00000000000..b6761d29c76 ---- /dev/null -+++ b/ctdb/common/system_network.h -@@ -0,0 +1,46 @@ -+/* -+ System specific network code -+ -+ Copyright (C) Amitay Isaacs 2015 -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 3 of the License, or -+ (at your option) any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, see . -+*/ -+ -+#ifndef __CTDB_SYSTEM_NETWORK_H__ -+#define __CTDB_SYSTEM_NETWORK_H__ -+ -+#include -+ -+#include "protocol/protocol.h" -+ -+/* From system_common.c */ -+ -+uint32_t uint16_checksum(uint16_t *data, size_t n); -+bool ctdb_sys_have_ip(ctdb_sock_addr *_addr); -+char *ctdb_sys_find_ifname(ctdb_sock_addr *addr); -+ -+/* From system_.c */ -+ -+int ctdb_sys_send_arp(const ctdb_sock_addr *addr, const char *iface); -+int ctdb_sys_send_tcp(const ctdb_sock_addr *dest, -+ const ctdb_sock_addr *src, -+ uint32_t seq, uint32_t ack, int rst); -+int ctdb_sys_open_capture_socket(const char *iface, void **private_data); -+int ctdb_sys_close_capture_socket(void *private_data); -+int ctdb_sys_read_tcp_packet(int s, void *private_data, -+ ctdb_sock_addr *src, ctdb_sock_addr *dst, -+ uint32_t *ack_seq, uint32_t *seq, -+ int *rst, uint16_t *window); -+ -+#endif /* __CTDB_SYSTEM_H__ */ -diff --git a/ctdb/server/ctdb_daemon.c b/ctdb/server/ctdb_daemon.c -index 35c1ab639b5..37a93ec6de1 100644 ---- a/ctdb/server/ctdb_daemon.c -+++ b/ctdb/server/ctdb_daemon.c -@@ -43,6 +43,7 @@ - #include "common/rb_tree.h" - #include "common/reqid.h" - #include "common/system.h" -+#include "common/system_network.h" - #include "common/common.h" - #include "common/logging.h" - #include "common/pidfile.h" -diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c -index 2b94fed7478..73451711845 100644 ---- a/ctdb/server/ctdb_recoverd.c -+++ b/ctdb/server/ctdb_recoverd.c -@@ -38,7 +38,7 @@ - #include "ctdb_private.h" - #include "ctdb_client.h" - --#include "common/system.h" -+#include "common/system_network.h" - #include "common/common.h" - #include "common/logging.h" - -diff --git a/ctdb/server/ctdb_takeover.c b/ctdb/server/ctdb_takeover.c -index cd240875ba2..a97ce2b6de6 100644 ---- a/ctdb/server/ctdb_takeover.c -+++ b/ctdb/server/ctdb_takeover.c -@@ -39,6 +39,7 @@ - #include "common/rb_tree.h" - #include "common/reqid.h" - #include "common/system.h" -+#include "common/system_network.h" - #include "common/common.h" - #include "common/logging.h" - -diff --git a/ctdb/tests/src/porting_tests.c b/ctdb/tests/src/porting_tests.c -index 74dbf0781b4..b7ad5256fdc 100644 ---- a/ctdb/tests/src/porting_tests.c -+++ b/ctdb/tests/src/porting_tests.c -@@ -32,6 +32,7 @@ - - #include "protocol/protocol.h" - #include "common/system.h" -+#include "common/system_network.h" - #include "common/logging.h" - - -diff --git a/ctdb/tools/ctdb.c b/ctdb/tools/ctdb.c -index 2cb46b057f0..8cbe706ab54 100644 ---- a/ctdb/tools/ctdb.c -+++ b/ctdb/tools/ctdb.c -@@ -41,6 +41,7 @@ - #include "protocol/protocol_api.h" - #include "protocol/protocol_util.h" - #include "common/system.h" -+#include "common/system_network.h" - #include "client/client.h" - #include "client/client_sync.h" - -diff --git a/ctdb/tools/ctdb_killtcp.c b/ctdb/tools/ctdb_killtcp.c -index 71b5999b10e..408a7b4e121 100644 ---- a/ctdb/tools/ctdb_killtcp.c -+++ b/ctdb/tools/ctdb_killtcp.c -@@ -30,7 +30,7 @@ - #include "protocol/protocol_util.h" - - #include "common/db_hash.h" --#include "common/system.h" -+#include "common/system_network.h" - #include "common/logging.h" - - --- -2.17.1 - - -From fb350f80cc072d4b699759a432217211986926be Mon Sep 17 00:00:00 2001 -From: Martin Schwenke -Date: Fri, 8 Jun 2018 22:31:48 +1000 -Subject: [PATCH 2/2] ctdb-tests: Switch fake_ctdbd to use ctdb_get_peer_pid() - -This potentially improves portability. - -Signed-off-by: Martin Schwenke ---- - ctdb/tests/src/fake_ctdbd.c | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - -diff --git a/ctdb/tests/src/fake_ctdbd.c b/ctdb/tests/src/fake_ctdbd.c -index 2f4e87f6f6c..0e33f8c02e0 100644 ---- a/ctdb/tests/src/fake_ctdbd.c -+++ b/ctdb/tests/src/fake_ctdbd.c -@@ -40,6 +40,7 @@ - #include "common/logging.h" - #include "common/tunable.h" - #include "common/srvid.h" -+#include "common/system.h" - - #include "ipalloc_read_known_ips.h" - -@@ -3050,8 +3051,6 @@ static struct tevent_req *client_send(TALLOC_CTX *mem_ctx, - { - struct tevent_req *req; - struct client_state *state; -- struct ucred cr; -- socklen_t crl = sizeof(struct ucred); - int ret; - - req = tevent_req_create(mem_ctx, &state, struct client_state); -@@ -3064,12 +3063,11 @@ static struct tevent_req *client_send(TALLOC_CTX *mem_ctx, - state->ctdb = ctdb; - state->pnn = pnn; - -- ret = getsockopt(fd, SOL_SOCKET, SO_PEERCRED, &cr, &crl); -+ ret = ctdb_get_peer_pid(fd, &state->pid); - if (ret != 0) { - tevent_req_error(req, ret); - return tevent_req_post(req, ev); - } -- state->pid = cr.pid; - - ret = comm_setup(state, ev, fd, client_read_handler, req, - client_dead_handler, req, &state->comm); --- -2.17.1 - Property changes on: head/net/samba410/files/0001-ctdb.patch ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/samba410/files/patch-bind13 =================================================================== --- head/net/samba410/files/patch-bind13 (revision 505445) +++ head/net/samba410/files/patch-bind13 (nonexistent) @@ -1,104 +0,0 @@ ---- source4/dns_server/wscript_build.orig 2018-01-14 20:41:58 UTC -+++ source4/dns_server/wscript_build -@@ -58,6 +58,36 @@ - deps='samba-hostconfig samdb-common gensec popt dnsserver_common', - enabled=bld.AD_DC_BUILD_IS_ENABLED()) - -+bld.SAMBA_LIBRARY('dlz_bind9_12', -+ source='dlz_bind9.c', -+ cflags='-DBIND_VERSION_9_12', -+ private_library=True, -+ link_name='modules/bind9/dlz_bind9_12.so', -+ realname='dlz_bind9_12.so', -+ install_path='${MODULESDIR}/bind9', -+ deps='samba-hostconfig samdb-common gensec popt dnsserver_common', -+ enabled=bld.AD_DC_BUILD_IS_ENABLED()) -+ -+bld.SAMBA_LIBRARY('dlz_bind9_13', -+ source='dlz_bind9.c', -+ cflags='-DBIND_VERSION_9_13', -+ private_library=True, -+ link_name='modules/bind9/dlz_bind9_13.so', -+ realname='dlz_bind9_13.so', -+ install_path='${MODULESDIR}/bind9', -+ deps='samba-hostconfig samdb-common gensec popt dnsserver_common', -+ enabled=bld.AD_DC_BUILD_IS_ENABLED()) -+ -+bld.SAMBA_LIBRARY('dlz_bind9_14', -+ source='dlz_bind9.c', -+ cflags='-DBIND_VERSION_9_14', -+ private_library=True, -+ link_name='modules/bind9/dlz_bind9_14.so', -+ realname='dlz_bind9_14.so', -+ install_path='${MODULESDIR}/bind9', -+ deps='samba-hostconfig samdb-common gensec popt dnsserver_common', -+ enabled=bld.AD_DC_BUILD_IS_ENABLED()) -+ - bld.SAMBA_LIBRARY('dlz_bind9_for_torture', - source='dlz_bind9.c', - cflags='-DBIND_VERSION_9_8', ---- source4/dns_server/dlz_minimal.h.orig 2018-01-14 20:41:58 UTC -+++ source4/dns_server/dlz_minimal.h -@@ -31,7 +31,7 @@ - #elif defined (BIND_VERSION_9_10) - # define DLZ_DLOPEN_VERSION 3 - # define DNS_CLIENTINFO_VERSION 1 --#elif defined (BIND_VERSION_9_11) -+#elif defined (BIND_VERSION_9_11) || defined (BIND_VERSION_9_12) || defined (BIND_VERSION_9_13) || defined (BIND_VERSION_9_14) - # define DLZ_DLOPEN_VERSION 3 - # define DNS_CLIENTINFO_VERSION 2 - #else ---- source4/setup/named.conf.dlz.orig 2018-01-14 22:41:59 UTC -+++ source4/setup/named.conf.dlz -@@ -21,5 +21,14 @@ dlz "AD DNS Zone" { - - # For BIND 9.11.x - ${BIND9_11} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_11.so"; -+ -+ # For BIND 9.12.x -+ ${BIND9_12} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_12.so"; -+ -+ # For BIND 9.13.x -+ ${BIND9_13} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_13.so"; -+ -+ # For BIND 9.14.x -+ ${BIND9_14} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_14.so"; - }; - ---- python/samba/provision/sambadns.py.orig 2018-01-17 09:08:39 UTC -+++ python/samba/provision/sambadns.py -@@ -937,6 +937,9 @@ def create_named_conf(paths, realm, dnsd - bind9_9 = '#' - bind9_10 = '#' - bind9_11 = '#' -+ bind9_12 = '#' -+ bind9_13 = '#' -+ bind9_14 = '#' - if bind_info.upper().find('BIND 9.8') != -1: - bind9_8 = '' - elif bind_info.upper().find('BIND 9.9') != -1: -@@ -945,6 +947,12 @@ def create_named_conf(paths, realm, dnsd - bind9_10 = '' - elif bind_info.upper().find('BIND 9.11') != -1: - bind9_11 = '' -+ elif bind_info.upper().find('BIND 9.12') != -1: -+ bind9_12 = '' -+ elif bind_info.upper().find('BIND 9.13') != -1: -+ bind9_13 = '' -+ elif bind_info.upper().find('BIND 9.14') != -1: -+ bind9_14 = '' - elif bind_info.upper().find('BIND 9.7') != -1: - raise ProvisioningError("DLZ option incompatible with BIND 9.7.") - else: -@@ -955,7 +961,10 @@ def create_named_conf(paths, realm, dnsd - "BIND9_8" : bind9_8, - "BIND9_9" : bind9_9, - "BIND9_10" : bind9_10, -- "BIND9_11" : bind9_11 -+ "BIND9_11" : bind9_11, -+ "BIND9_12" : bind9_12, -+ "BIND9_13" : bind9_13, -+ "BIND9_14" : bind9_14 - }) - - Property changes on: head/net/samba410/files/patch-bind13 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/samba410/files/patch-buildtools__wafsamba__samba_install.py =================================================================== --- head/net/samba410/files/patch-buildtools__wafsamba__samba_install.py (revision 505445) +++ head/net/samba410/files/patch-buildtools__wafsamba__samba_install.py (nonexistent) @@ -1,11 +0,0 @@ ---- buildtools/wafsamba/samba_install.py.orig 2017-07-04 10:05:25 UTC -+++ buildtools/wafsamba/samba_install.py -@@ -118,7 +118,7 @@ def install_library(self): - 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: Property changes on: head/net/samba410/files/patch-buildtools__wafsamba__samba_install.py ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/samba410/files/patch-source3__wscript_build =================================================================== --- head/net/samba410/files/patch-source3__wscript_build (revision 505445) +++ head/net/samba410/files/patch-source3__wscript_build (nonexistent) @@ -1,58 +0,0 @@ ---- source3/wscript_build.orig 2017-07-25 13:09:58 UTC -+++ source3/wscript_build -@@ -124,7 +124,6 @@ ldapsam_pdb_match = ['!priv2ld', '!smbldap_search_doma - '!get_attr_list'] - private_pdb_match.append('!pdb_nds_*') - private_pdb_match.append('!pdb_ldapsam_init*') --private_pdb_match.append('!pdb_*_init') - private_pdb_match = private_pdb_match + ldapsam_pdb_match - - bld.SAMBA3_LIBRARY('samba-passdb', -@@ -221,11 +221,9 @@ bld.SAMBA3_SUBSYSTEM('SMBREGISTRY', - talloc - replace - util_reg -- samba-util -- samba-security - errors3 - dbwrap -- samba3-util -+ samba3util - ''') - - # Do not link against this use 'smbconf' -@@ -488,7 +486,7 @@ bld.SAMBA3_LIBRARY('secrets3', - - bld.SAMBA3_LIBRARY('smbldap', - source='lib/smbldap.c', -- deps='ldap lber samba-util smbconf', -+ deps='ldap lber samba3util smbd_shim samba-debug smbconf', - enabled=bld.CONFIG_SET("HAVE_LDAP"), - private_library=False, - abi_directory='lib/ABI', -@@ -713,6 +711,7 @@ bld.SAMBA3_LIBRARY('smbd_base', - smbd_conn - param_service - AVAHI -+ dns_sd - PRINTBASE - PROFILE - LOCKING -@@ -1089,6 +1088,7 @@ bld.SAMBA3_BINARY('client/smbclient', - msrpc3 - RPC_NDR_SRVSVC - cli_smb_common -+ dns_sd - archive - ''') - -@@ -1254,8 +1254,7 @@ bld.SAMBA3_BINARY('vfstest', - popt_samba3 - smbconf - SMBREADLINE -- ''', -- install=False) -+ ''') - - bld.SAMBA3_BINARY('versiontest', - source='lib/version_test.c', Property changes on: head/net/samba410/files/patch-source3__wscript_build ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/samba410/files/patch-librpc__idl__xattr.idl =================================================================== --- head/net/samba410/files/patch-librpc__idl__xattr.idl (revision 505445) +++ head/net/samba410/files/patch-librpc__idl__xattr.idl (nonexistent) @@ -1,13 +0,0 @@ -Signed-off-by: Alexander Zagrebin - ---- librpc/idl/xattr.idl.orig 2017-12-17 05:40:37 UTC -+++ librpc/idl/xattr.idl 2017-12-17 -@@ -168,7 +168,7 @@ interface xattr - can discard if this doesn't match the underlying ACL hash. - */ - -- const char *XATTR_NTACL_NAME = "security.NTACL"; -+ const char *XATTR_NTACL_NAME = "user.NTACL"; - - const int XATTR_SD_HASH_SIZE = 64; - const int XATTR_SD_HASH_TYPE_NONE = 0x0; Property changes on: head/net/samba410/files/patch-librpc__idl__xattr.idl ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/samba410/files/patch-ctdb__wscript =================================================================== --- head/net/samba410/files/patch-ctdb__wscript (revision 505445) +++ head/net/samba410/files/patch-ctdb__wscript (nonexistent) @@ -1,62 +0,0 @@ ---- ctdb/wscript.orig 2018-08-24 11:58:20 UTC -+++ ctdb/wscript -@@ -90,6 +90,9 @@ def set_options(opt): - opt.add_option('--enable-ceph-reclock', - help=("Enable Ceph CTDB recovery lock helper (default=no)"), - action="store_true", dest='ctdb_ceph_reclock', default=False) -+ opt.add_option('--disable-ctdb-tests', -+ help=("Disable CTDB tests (default=no)"), -+ action="store_true", dest='ctdb_no_tests', default=False) - - opt.add_option('--with-logdir', - help=("Path to log directory"), -@@ -231,7 +234,7 @@ def configure(conf): - conf.env['LIBPATH_CEPH-COMMON'] = conf.env['LIBPATH_RADOS'] + '/ceph' - - if (conf.CHECK_HEADERS('rados/librados.h', False, False, 'rados') and -- conf.CHECK_LIB('rados', shlib=True)): -+ conf.CHECK_LIB('rados', shlib=True)): - conf.CHECK_LIB('ceph-common', shlib=True) - Logs.info('Building with Ceph librados recovery lock support') - conf.define('HAVE_LIBRADOS', 1) -@@ -268,9 +271,15 @@ def configure(conf): - conf.env.CTDB_VARDIR, - conf.env.CTDB_RUNDIR)) - -- conf.env.CTDB_TEST_DATADIR = os.path.join(conf.env.EXEC_PREFIX, -+ if Options.options.ctdb_no_tests: -+ conf.env.ctdb_tests = False -+ else: -+ conf.env.ctdb_tests = True -+ -+ if conf.env.ctdb_tests: -+ conf.env.CTDB_TEST_DATADIR = os.path.join(conf.env.EXEC_PREFIX, - 'share/ctdb/tests') -- conf.env.CTDB_TEST_LIBEXECDIR = os.path.join(conf.env.LIBEXECDIR, 'ctdb/tests') -+ conf.env.CTDB_TEST_LIBEXECDIR = os.path.join(conf.env.LIBEXECDIR, 'ctdb/tests') - - # Allow unified compilation and separate compilation of utilities - # to find includes -@@ -605,9 +614,9 @@ def build(bld): - if bld.env.HAVE_LIBRADOS: - bld.SAMBA_BINARY('ctdb_mutex_ceph_rados_helper', - source='utils/ceph/ctdb_mutex_ceph_rados_helper.c', -- deps='talloc tevent rados ceph-common', -- includes='include', -- install_path='${CTDB_HELPER_BINDIR}') -+ deps='talloc tevent rados ceph-common', -+ includes='include', -+ install_path='${CTDB_HELPER_BINDIR}') - - sed_expr1 = 's|/usr/local/var/lib/ctdb|%s|g' % (bld.env.CTDB_VARDIR) - sed_expr2 = 's|/usr/local/etc/ctdb|%s|g' % (bld.env.CTDB_ETCDIR) -@@ -750,6 +759,9 @@ def build(bld): - bld.install_dir(bld.env.CTDB_RUNDIR) - bld.install_dir(bld.env.CTDB_VARDIR) - -+ if not bld.env.ctdb_tests: -+ return -+ - # Unit tests - ctdb_unit_tests = [ - 'db_hash_test', Property changes on: head/net/samba410/files/patch-ctdb__wscript ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/samba410/files/patch-lib__talloc__wscript =================================================================== --- head/net/samba410/files/patch-lib__talloc__wscript (revision 505445) +++ head/net/samba410/files/patch-lib__talloc__wscript (nonexistent) @@ -1,18 +0,0 @@ ---- lib/talloc/wscript.orig 2018-01-17 09:08:39 UTC -+++ lib/talloc/wscript -@@ -46,13 +46,14 @@ def configure(conf): - conf.env.TALLOC_COMPAT1 = False - if conf.env.standalone_talloc: - conf.env.TALLOC_COMPAT1 = Options.options.TALLOC_COMPAT1 -- conf.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig' -+ conf.env.PKGCONFIGDIR = '%%PKGCONFIGDIR%%' - conf.env.TALLOC_VERSION = VERSION - - conf.CHECK_XSLTPROC_MANPAGES() - - conf.CHECK_HEADERS('sys/auxv.h') - conf.CHECK_FUNCS('getauxval') -+ conf.CHECK_FUNCS('arc4random') - - conf.SAMBA_CONFIG_H() - Property changes on: head/net/samba410/files/patch-lib__talloc__wscript ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/samba410/files/0001-bug-228462.patch =================================================================== --- head/net/samba410/files/0001-bug-228462.patch (revision 505445) +++ head/net/samba410/files/0001-bug-228462.patch (nonexistent) @@ -1,76 +0,0 @@ -From d9b748869a8f4018ebee302aae8246bf29f60309 Mon Sep 17 00:00:00 2001 -From: "Timur I. Bakeyev" -Date: Fri, 1 Jun 2018 01:35:08 +0800 -Subject: [PATCH 1/2] vfs_fruit: allow broken AFP_Signature where the first - byte is 0 - -FreeBSD bug ... caused the first byte of the AFP_AfpInfo xattr to be 0 -instead of 'A'. This hack allows such broken AFP_AfpInfo blobs to be -parsed by afpinfo_unpack(). - -FreeBSD Bug: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=228462 - -Signed-off-by: Ralph Boehme ---- - source3/modules/vfs_fruit.c | 32 ++++++++++++++++++++++++-------- - 1 file changed, 27 insertions(+), 4 deletions(-) - -diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c -index df3cd0c899e..d84e6991036 100644 ---- a/source3/modules/vfs_fruit.c -+++ b/source3/modules/vfs_fruit.c -@@ -2350,6 +2350,8 @@ static ssize_t afpinfo_pack(const AfpInf - return AFP_INFO_SIZE; - } - -+#define BROKEN_FREEBSD_AFP_Signature 0x00465000 -+ - /** - * Unpack a buffer into a AfpInfo structure - * -@@ -2369,10 +2371,20 @@ static AfpInfo *afpinfo_unpack(TALLOC_CT - memcpy(ai->afpi_FinderInfo, (const char *)data + 16, - sizeof(ai->afpi_FinderInfo)); - -- if (ai->afpi_Signature != AFP_Signature -- || ai->afpi_Version != AFP_Version) { -- DEBUG(1, ("Bad AfpInfo signature or version\n")); -+ if (ai->afpi_Signature != AFP_Signature) { -+ DBG_WARNING("Bad AFP signature [%x]\n", ai->afpi_Signature); -+ -+ if (ai->afpi_Signature != BROKEN_FREEBSD_AFP_Signature) { -+ DBG_ERR("Bad AfpInfo signature\n"); -+ TALLOC_FREE(ai); -+ return NULL; -+ } -+ } -+ -+ if (ai->afpi_Version != AFP_Version) { -+ DBG_ERR("Bad AfpInfo version\n"); - TALLOC_FREE(ai); -+ return NULL; - } - - return ai; -@@ -4171,9 +4183,20 @@ static ssize_t fruit_pread_meta_stream(v - { - ssize_t nread; - int ret; -+ char *p = (char *)data; - - nread = SMB_VFS_NEXT_PREAD(handle, fsp, data, n, offset); -- if (nread == -1 || nread == n) { -+ -+ if (nread == -1) { -+ return -1; -+ } -+ -+ if (nread == n) { -+ if (offset == 0 && nread > 3 && p[0] == 0 && p[1] == 'F' && p[2] == 'P') { -+ DBG_NOTICE("Fixing AFP_Info of [%s]\n", -+ fsp_str_dbg(fsp)); -+ p[0] = 'A'; -+ } - return nread; - } - Property changes on: head/net/samba410/files/0001-bug-228462.patch ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/samba410/files/patch-buildtools__wafsamba__wafsamba.py =================================================================== --- head/net/samba410/files/patch-buildtools__wafsamba__wafsamba.py (revision 505445) +++ head/net/samba410/files/patch-buildtools__wafsamba__wafsamba.py (nonexistent) @@ -1,11 +0,0 @@ ---- ./buildtools/wafsamba/wafsamba.py.orig 2015-07-21 09:47:48 UTC -+++ ./buildtools/wafsamba/wafsamba.py -@@ -892,7 +892,7 @@ - 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_CATALOG = bld.srcnode.abspath() + '/bin/default/docs-xml/build/catalog.xml' -- bld.env.SAMBA_CATALOGS = 'file:///etc/xml/catalog file:///usr/local/share/xml/catalog file://' + bld.env.SAMBA_CATALOG -+ bld.env.SAMBA_CATALOGS = 'file:///etc/xml/catalog file://%%LOCALBASE%%/share/xml/catalog file://' + bld.env.SAMBA_CATALOG - - for m in manpages.split(): - source = m + '.xml' Property changes on: head/net/samba410/files/patch-buildtools__wafsamba__wafsamba.py ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/samba410/files/patch-source3__librpc__crypto__gse.c =================================================================== --- head/net/samba410/files/patch-source3__librpc__crypto__gse.c (revision 505445) +++ head/net/samba410/files/patch-source3__librpc__crypto__gse.c (nonexistent) @@ -1,16 +0,0 @@ ---- source3/librpc/crypto/gse.c.orig 2017-07-04 10:05:25 UTC -+++ source3/librpc/crypto/gse.c -@@ -610,11 +610,12 @@ static NTSTATUS gse_get_server_auth_toke - struct gse_context *gse_ctx = - talloc_get_type_abort(gensec_security->private_data, - struct gse_context); -- OM_uint32 gss_maj, gss_min; -+ OM_uint32 gss_min; - gss_buffer_desc in_data; - gss_buffer_desc out_data; - DATA_BLOB blob = data_blob_null; - NTSTATUS status; -+ OM_uint32 gss_maj = -1; - OM_uint32 time_rec = 0; - struct timeval tv; - Property changes on: head/net/samba410/files/patch-source3__librpc__crypto__gse.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/samba410/files/patch-source3__smbd__quotas.c =================================================================== --- head/net/samba410/files/patch-source3__smbd__quotas.c (revision 505445) +++ head/net/samba410/files/patch-source3__smbd__quotas.c (nonexistent) @@ -1,19 +0,0 @@ ---- source3/smbd/quotas.c.orig 2017-07-04 10:05:26 UTC -+++ source3/smbd/quotas.c -@@ -125,6 +125,7 @@ static bool nfs_quotas(char *nfspath, ui - 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)); -@@ -133,7 +134,7 @@ static bool nfs_quotas(char *nfspath, ui - 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; Property changes on: head/net/samba410/files/patch-source3__smbd__quotas.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/samba410/files/patch-vfs_virusfilter =================================================================== --- head/net/samba410/files/patch-vfs_virusfilter (revision 505445) +++ head/net/samba410/files/patch-vfs_virusfilter (nonexistent) @@ -1,36 +0,0 @@ ---- source3/modules/vfs_virusfilter_utils.c.orig 2018-02-21 03:34:19 UTC -+++ source3/modules/vfs_virusfilter_utils.c -@@ -391,6 +391,10 @@ bool virusfilter_io_writel( - - bool virusfilter_io_writefl( - struct virusfilter_io_handle *io_h, -+ const char *data_fmt, ...) PRINTF_ATTRIBUTE(2, 3); -+ -+bool virusfilter_io_writefl( -+ struct virusfilter_io_handle *io_h, - const char *data_fmt, ...) - { - va_list ap; -@@ -414,6 +418,10 @@ bool virusfilter_io_writefl( - - bool virusfilter_io_vwritefl( - struct virusfilter_io_handle *io_h, -+ const char *data_fmt, va_list ap) PRINTF_ATTRIBUTE(2, 0); -+ -+bool virusfilter_io_vwritefl( -+ struct virusfilter_io_handle *io_h, - const char *data_fmt, va_list ap) - { - char data[VIRUSFILTER_IO_BUFFER_SIZE + VIRUSFILTER_IO_EOL_SIZE]; -@@ -665,6 +673,11 @@ bool virusfilter_io_readl(TALLOC_CTX *ct - bool virusfilter_io_writefl_readl( - struct virusfilter_io_handle *io_h, - char **read_line, -+ const char *fmt, ...) PRINTF_ATTRIBUTE(3, 4); -+ -+bool virusfilter_io_writefl_readl( -+ struct virusfilter_io_handle *io_h, -+ char **read_line, - const char *fmt, ...) - { - bool ok; Property changes on: head/net/samba410/files/patch-vfs_virusfilter ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/samba410/files/patch-buildtools__scripts__abi_gen.sh =================================================================== --- head/net/samba410/files/patch-buildtools__scripts__abi_gen.sh (revision 505445) +++ head/net/samba410/files/patch-buildtools__scripts__abi_gen.sh (nonexistent) @@ -1,21 +0,0 @@ ---- buildtools/scripts/abi_gen.sh.orig 2017-07-04 14:05:25 UTC -+++ buildtools/scripts/abi_gen.sh -@@ -9,13 +9,14 @@ GDBSCRIPT="gdb_syms.$$" - cat < $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 | sed -e 's/:type =/:/g' - rm -f $GDBSCRIPT Property changes on: head/net/samba410/files/patch-buildtools__scripts__abi_gen.sh ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/samba410/files/patch-includes.h =================================================================== --- head/net/samba410/files/patch-includes.h (revision 505445) +++ head/net/samba410/files/patch-includes.h (nonexistent) @@ -1,11 +0,0 @@ ---- source3/include/includes.h.orig 2018-04-03 05:23:35 UTC -+++ source3/include/includes.h -@@ -323,6 +323,8 @@ typedef char fstring[FSTRING_LEN]; - * the *bottom* of include files so as not to conflict. */ - #ifdef ENABLE_DMALLOC - # include -+#elif ENABLE_JEMALLOC -+# include - #endif - - Property changes on: head/net/samba410/files/patch-includes.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/samba410/files/patch-lib__util__debug.c =================================================================== --- head/net/samba410/files/patch-lib__util__debug.c (revision 505445) +++ head/net/samba410/files/patch-lib__util__debug.c (nonexistent) @@ -1,78 +0,0 @@ ---- lib/util/debug.c.orig 2017-09-17 19:15:34 UTC -+++ lib/util/debug.c -@@ -653,7 +653,8 @@ static int debug_lookup_classname_int(co - { - size_t i; - -- if (!classname) return -1; -+ if (!classname) -+ return -1; - - for (i=0; i < debug_num_classes; i++) { - if (strcmp(classname, classname_table[i])==0) -@@ -752,12 +753,21 @@ static void debug_dump_status(int level) - } - } - -+static void debug_set_all_levels(int level) -+{ -+ size_t i; -+ /* Array is debug_num_classes long */ -+ for (i = DBGC_ALL; i < debug_num_classes; i++) { -+ DEBUGLEVEL_CLASS[i] = level; -+ } -+} -+ - static bool debug_parse_param(char *param) - { - char *class_name; - char *class_level; - char *saveptr = NULL; -- int ndx; -+ int ndx, level; - - class_name = strtok_r(param, ":", &saveptr); - if (class_name == NULL) { -@@ -774,7 +784,13 @@ static bool debug_parse_param(char *para - return false; - } - -- DEBUGLEVEL_CLASS[ndx] = atoi(class_level); -+ level = atoi(class_level); -+ -+ if(ndx == DBGC_ALL) { -+ debug_set_all_levels(level); -+ } else { -+ DEBUGLEVEL_CLASS[ndx] = level; -+ } - - return true; - } -@@ -790,7 +806,7 @@ bool debug_parse_levels(const char *para - size_t str_len = strlen(params_str); - char str[str_len+1]; - char *tok, *saveptr; -- size_t i; -+ int level = 0; - - /* Just in case */ - debug_init(); -@@ -806,16 +822,11 @@ bool debug_parse_levels(const char *para - * v.s. "all:10", this is the traditional way to set DEBUGLEVEL - */ - if (isdigit(tok[0])) { -- DEBUGLEVEL_CLASS[DBGC_ALL] = atoi(tok); -+ level = atoi(tok); - tok = strtok_r(NULL, LIST_SEP, &saveptr); -- } else { -- DEBUGLEVEL_CLASS[DBGC_ALL] = 0; - } - -- /* Array is debug_num_classes long */ -- for (i = DBGC_ALL+1; i < debug_num_classes; i++) { -- DEBUGLEVEL_CLASS[i] = DEBUGLEVEL_CLASS[DBGC_ALL]; -- } -+ debug_set_all_levels(level); - - while (tok != NULL) { - bool ok; Property changes on: head/net/samba410/files/patch-lib__util__debug.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/samba410/files/patch-buildtools__wafsamba__samba_autoconf.py =================================================================== --- head/net/samba410/files/patch-buildtools__wafsamba__samba_autoconf.py (revision 505445) +++ head/net/samba410/files/patch-buildtools__wafsamba__samba_autoconf.py (nonexistent) @@ -1,52 +0,0 @@ ---- buildtools/wafsamba/samba_autoconf.py.orig 2016-10-07 04:45:35 UTC -+++ buildtools/wafsamba/samba_autoconf.py -@@ -548,7 +548,7 @@ def library_flags(self, libs): - - - @conf --def CHECK_LIB(conf, libs, mandatory=False, empty_decl=True, set_target=True, shlib=False): -+def CHECK_LIB(conf, libs, mandatory=False, empty_decl=True, set_target=True, shlib=False, msg=None): - '''check if a set of libraries exist as system libraries - - returns the sublist of libs that do exist as a syslib or [] -@@ -568,11 +568,29 @@ int foo() - ret.append(lib) - continue - -+ if msg is None: -+ msg = 'Checking for library %s' % lib -+ - (ccflags, ldflags, cpppath) = library_flags(conf, lib) -+ - if shlib: -- res = conf.check(features='c cshlib', fragment=fragment, lib=lib, uselib_store=lib, ccflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False) -+ res = conf.check(features='c cshlib', -+ fragment=fragment, -+ lib=lib, -+ uselib_store=lib, -+ ccflags=ccflags, -+ ldflags=ldflags, -+ uselib=lib.upper(), -+ mandatory=False, -+ msg=msg) - else: -- res = conf.check(lib=lib, uselib_store=lib, ccflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False) -+ res = conf.check(lib=lib, -+ uselib_store=lib, -+ ccflags=ccflags, -+ ldflags=ldflags, -+ uselib=lib.upper(), -+ mandatory=False, -+ msg=msg) - - if not res: - if mandatory: -@@ -873,7 +891,7 @@ def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(c - conf.env.undefined_ldflags = conf.ADD_LDFLAGS('-Wl,-no-undefined', testflags=True) - - if not sys.platform.startswith("openbsd") and conf.env.undefined_ignore_ldflags == []: -- if conf.CHECK_LDFLAGS(['-undefined', 'dynamic_lookup']): -+ if conf.CHECK_LDFLAGS(['-undefined', 'dynamic_lookup'] + conf.env.WERROR_CFLAGS): - conf.env.undefined_ignore_ldflags = ['-undefined', 'dynamic_lookup'] - - @conf Property changes on: head/net/samba410/files/patch-buildtools__wafsamba__samba_autoconf.py ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/samba410/files/patch-source3__wscript =================================================================== --- head/net/samba410/files/patch-source3__wscript (revision 505445) +++ head/net/samba410/files/patch-source3__wscript (nonexistent) @@ -1,100 +0,0 @@ ---- source3/wscript.orig 2018-06-26 18:42:46 UTC -+++ source3/wscript -@@ -47,6 +47,7 @@ def set_options(opt): - opt.SAMBA3_ADD_OPTION('sendfile-support') - opt.SAMBA3_ADD_OPTION('utmp') - opt.SAMBA3_ADD_OPTION('avahi', with_name="enable", without_name="disable") -+ opt.SAMBA3_ADD_OPTION('dnssd', with_name="enable", without_name="disable") - opt.SAMBA3_ADD_OPTION('iconv') - opt.SAMBA3_ADD_OPTION('acl-support') - opt.SAMBA3_ADD_OPTION('dnsupdate') -@@ -802,32 +803,38 @@ msg.msg_accrightslen = sizeof(fd); - - if Options.options.with_utmp: - conf.env.with_utmp = True -- if not conf.CHECK_HEADERS('utmp.h'): conf.env.with_utmp = False -- conf.CHECK_FUNCS('pututline pututxline updwtmp updwtmpx getutmpx getutxent') -- conf.CHECK_STRUCTURE_MEMBER('struct utmp', 'ut_name', headers='utmp.h', -+ if not conf.CHECK_HEADERS('utmpx.h') and not conf.CHECK_HEADERS('utmp.h'): -+ conf.env.with_utmp = False -+ if conf.CONFIG_SET('HAVE_UTMPX_H'): -+ conf.DEFINE('STRUCT_UTMP', 'struct utmpx') -+ elif conf.CONFIG_SET('HAVE_UTMP_H'): -+ conf.DEFINE('STRUCT_UTMP', 'struct utmp') -+ conf.CHECK_FUNCS('pututxline getutxid getutxline updwtmpx getutmpx setutxent endutxent') -+ conf.CHECK_FUNCS('pututline getutid getutline updwtmp getutmp setutent endutent') -+ conf.CHECK_STRUCTURE_MEMBER('STRUCT_UTMP', 'ut_name', headers='utmpx.h utmp.h', - define='HAVE_UT_UT_NAME') -- conf.CHECK_STRUCTURE_MEMBER('struct utmp', 'ut_user', headers='utmp.h', -+ conf.CHECK_STRUCTURE_MEMBER('STRUCT_UTMP', 'ut_user', headers='utmpx.h utmp.h', - define='HAVE_UT_UT_USER') -- conf.CHECK_STRUCTURE_MEMBER('struct utmp', 'ut_id', headers='utmp.h', -+ conf.CHECK_STRUCTURE_MEMBER('STRUCT_UTMP', 'ut_id', headers='utmpx.h utmp.h', - define='HAVE_UT_UT_ID') -- conf.CHECK_STRUCTURE_MEMBER('struct utmp', 'ut_host', headers='utmp.h', -+ conf.CHECK_STRUCTURE_MEMBER('STRUCT_UTMP', 'ut_host', headers='utmpx.h utmp.h', - define='HAVE_UT_UT_HOST') -- conf.CHECK_STRUCTURE_MEMBER('struct utmp', 'ut_time', headers='utmp.h', -+ conf.CHECK_STRUCTURE_MEMBER('STRUCT_UTMP', 'ut_time', headers='utmpx.h utmp.h', - define='HAVE_UT_UT_TIME') -- conf.CHECK_STRUCTURE_MEMBER('struct utmp', 'ut_tv', headers='utmp.h', -+ conf.CHECK_STRUCTURE_MEMBER('STRUCT_UTMP', 'ut_tv', headers='utmpx.h utmp.h', - define='HAVE_UT_UT_TV') -- conf.CHECK_STRUCTURE_MEMBER('struct utmp', 'ut_type', headers='utmp.h', -+ conf.CHECK_STRUCTURE_MEMBER('STRUCT_UTMP', 'ut_type', headers='utmpx.h utmp.h', - define='HAVE_UT_UT_TYPE') -- conf.CHECK_STRUCTURE_MEMBER('struct utmp', 'ut_pid', headers='utmp.h', -+ conf.CHECK_STRUCTURE_MEMBER('STRUCT_UTMP', 'ut_pid', headers='utmpx.h utmp.h', - define='HAVE_UT_UT_PID') -- conf.CHECK_STRUCTURE_MEMBER('struct utmp', 'ut_exit.e_exit', headers='utmp.h', -+ conf.CHECK_STRUCTURE_MEMBER('STRUCT_UTMP', 'ut_exit.e_exit', headers='utmpx.h utmp.h', - define='HAVE_UT_UT_EXIT') -- conf.CHECK_STRUCTURE_MEMBER('struct utmpx', 'ut_syslen', headers='utmpx.h', -- define='HAVE_UX_UT_SYSLEN') -+ conf.CHECK_STRUCTURE_MEMBER('STRUCT_UTMP', 'ut_syslen', headers='utmpx.h utmp.h', -+ define='HAVE_UT_UT_SYSLEN') - conf.CHECK_CODE('struct utmp utarg; struct utmp *utreturn; utreturn = pututline(&utarg);', - 'PUTUTLINE_RETURNS_UTMP', headers='utmp.h', - msg="Checking whether pututline returns pointer") -- conf.CHECK_SIZEOF(['((struct utmp *)NULL)->ut_line'], headers='utmp.h', -+ conf.CHECK_SIZEOF(['((STRUCT_UTMP *)NULL)->ut_line'], headers='utmpx.h utmp.h', - define='SIZEOF_UTMP_UT_LINE', critical=False) - if not conf.CONFIG_SET('SIZEOF_UTMP_UT_LINE'): - conf.env.with_utmp = False -@@ -849,6 +856,17 @@ msg.msg_accrightslen = sizeof(fd); - conf.SET_TARGET_TYPE('avahi-common', 'EMPTY') - conf.SET_TARGET_TYPE('avahi-client', 'EMPTY') - -+ if Options.options.with_dnssd: -+ conf.env.with_dnssd = True -+ if not conf.CHECK_HEADERS('dns_sd.h'): -+ conf.env.with_dnssd = False -+ if not conf.CHECK_FUNCS_IN('DNSServiceRegister', 'dns_sd'): -+ conf.env.with_dnssd = False -+ if conf.env.with_dnssd: -+ conf.DEFINE('WITH_DNSSD_SUPPORT', 1) -+ else: -+ conf.SET_TARGET_TYPE('dns_sd', 'EMPTY') -+ - if Options.options.with_iconv: - conf.env.with_iconv = True - if not conf.CHECK_FUNCS_IN('iconv_open', 'iconv', headers='iconv.h'): -@@ -1637,7 +1655,7 @@ main() { - if not conf.env['FLEX']: - conf.fatal("Spotlight support requested but flex missing") - conf.CHECK_COMMAND('%s --version' % conf.env['FLEX'], msg='Using flex version', define=None, on_target=False) -- versions = ['1.0', '0.16', '0.14'] -+ versions = ['2.0', '1.0', '0.16', '0.14'] - for version in versions: - testlib = 'tracker-sparql-' + version - if conf.CHECK_CFG(package=testlib, -@@ -1729,9 +1747,6 @@ main() { - - if conf.CONFIG_SET('HAVE_VXFS'): - default_shared_modules.extend(TO_LIST('vfs_vxfs')) -- -- if conf.CONFIG_SET('HAVE_DBUS'): -- default_shared_modules.extend(TO_LIST('vfs_snapper')) - - explicit_shared_modules = TO_LIST(Options.options.shared_modules, delimiter=',') - explicit_static_modules = TO_LIST(Options.options.static_modules, delimiter=',') Property changes on: head/net/samba410/files/patch-source3__wscript ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/samba410/files/patch-source3__lib__sysquotas_4B.c =================================================================== --- head/net/samba410/files/patch-source3__lib__sysquotas_4B.c (revision 505445) +++ head/net/samba410/files/patch-source3__lib__sysquotas_4B.c (nonexistent) @@ -1,18 +0,0 @@ ---- source3/lib/sysquotas_4B.c.orig 2019-01-28 03:56:23 UTC -+++ source3/lib/sysquotas_4B.c -@@ -141,7 +141,14 @@ static int sys_quotactl_4B(const char * - /* ENOTSUP means quota support is not compiled in. EINVAL - * means that quotas are not configured (commonly). - */ -- if (errno != ENOTSUP && errno != EINVAL) { -+ if (errno != ENOTSUP && errno != EINVAL -+/* -+ * FreeBSD 12 between r336017 and r342928 wrongfuly return ENOENT for the not enabled qoutas on ZFS. -+ */ -+#if defined(__FreeBSD__) && ((__FreeBSD_version >= 1102503 && __FreeBSD_version <= 1102506) || (__FreeBSD_version >= 1200072 && __FreeBSD_version <= 1200503) || (__FreeBSD_version >= 1300000 && __FreeBSD_version <= 1300009)) -+ && errno != ENOENT -+#endif -+ ) { - DEBUG(0, ("failed to %s quota for %s ID %u on %s: %s\n", - (cmd & QCMD(Q_GETQUOTA, 0)) ? "get" : "set", - (cmd & QCMD(0, GRPQUOTA)) ? "group" : "user", Property changes on: head/net/samba410/files/patch-source3__lib__sysquotas_4B.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/samba410/files/patch-source3__lib__util.c =================================================================== --- head/net/samba410/files/patch-source3__lib__util.c (revision 505445) +++ head/net/samba410/files/patch-source3__lib__util.c (nonexistent) @@ -1,16 +0,0 @@ -Signed-off-by: Alexander Zagrebin - ---- source3/lib/util.c.orig 2017-12-17 05:35:49 UTC -+++ source3/lib/util.c 2017-12-17 -@@ -2036,7 +2036,10 @@ bool any_nt_status_not_ok(NTSTATUS err1, - - int timeval_to_msec(struct timeval t) - { -- return t.tv_sec * 1000 + (t.tv_usec+999) / 1000; -+ unsigned long result; -+ -+ result = t.tv_sec * 1000 + (t.tv_usec+999) / 1000; -+ return result > INT_MAX ? INT_MAX : result; - } - - /******************************************************************* Property changes on: head/net/samba410/files/patch-source3__lib__util.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/samba410/files/patch-third_party__waf__wafadmin__Logs.py =================================================================== --- head/net/samba410/files/patch-third_party__waf__wafadmin__Logs.py (revision 505445) +++ head/net/samba410/files/patch-third_party__waf__wafadmin__Logs.py (nonexistent) @@ -1,21 +0,0 @@ ---- third_party/waf/wafadmin/Logs.py.orig 2017-07-04 10:05:26 UTC -+++ third_party/waf/wafadmin/Logs.py -@@ -23,6 +23,9 @@ colors_lst = { - 'cursor_off' :'\x1b[?25l', - } - -+WAF_LOG_FORMAT = os.environ.get('WAF_LOG_FORMAT', LOG_FORMAT) -+WAF_HOUR_FORMAT = os.environ.get('WAF_HOUR_FORMAT', HOUR_FORMAT) -+ - got_tty = False - term = os.environ.get('TERM', 'dumb') - if not term in ['dumb', 'emacs']: -@@ -84,7 +87,7 @@ class log_filter(logging.Filter): - - class formatter(logging.Formatter): - def __init__(self): -- logging.Formatter.__init__(self, LOG_FORMAT, HOUR_FORMAT) -+ logging.Formatter.__init__(self, WAF_LOG_FORMAT, WAF_HOUR_FORMAT) - - def format(self, rec): - if rec.levelno >= logging.WARNING or rec.levelno == logging.INFO: Property changes on: head/net/samba410/files/patch-third_party__waf__wafadmin__Logs.py ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/samba410/files/patch-nsswitch__wscript_build =================================================================== --- head/net/samba410/files/patch-nsswitch__wscript_build (revision 505445) +++ head/net/samba410/files/patch-nsswitch__wscript_build (nonexistent) @@ -1,17 +0,0 @@ ---- nsswitch/wscript_build.orig 2017-07-04 10:05:25 UTC -+++ nsswitch/wscript_build -@@ -54,12 +54,14 @@ elif (host_os.rfind('freebsd') > -1): - source='winbind_nss_linux.c winbind_nss_freebsd.c', - deps='winbind-client', - realname='nss_winbind.so.1', -+ install_path='${PAMMODULESDIR}', - vnum='1') - - bld.SAMBA3_LIBRARY('nss_wins', - source='wins.c wins_freebsd.c', - deps='''wbclient''', - realname='nss_wins.so.1', -+ install_path='${PAMMODULESDIR}', - vnum='1') - - elif (host_os.rfind('netbsd') > -1): Property changes on: head/net/samba410/files/patch-nsswitch__wscript_build ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/samba410/files/patch-buildtools__wafsamba__samba_python.py =================================================================== --- head/net/samba410/files/patch-buildtools__wafsamba__samba_python.py (revision 505445) +++ head/net/samba410/files/patch-buildtools__wafsamba__samba_python.py (nonexistent) @@ -1,40 +0,0 @@ ---- buildtools/wafsamba/samba_python.py.orig 2018-01-13 09:07:51 UTC -+++ buildtools/wafsamba/samba_python.py -@@ -76,17 +76,35 @@ def SAMBA_CHECK_PYTHON_HEADERS(conf, man - - def _check_python_headers(conf, mandatory): - try: -+ from python import _get_python_variables - Configure.ConfigurationError - conf.check_python_headers(mandatory=mandatory) -+ conf.env['PYTHON_SO_ABI'] = _get_python_variables( -+ conf.env['PYTHON'], -+ ["get_config_var('SOABI') or ''"], -+ ['from distutils.sysconfig import get_config_var'] -+ )[0] - except Configure.ConfigurationError: - if mandatory: - raise - - if conf.env['PYTHON_VERSION'] > '3': -- abi_pattern = os.path.splitext(conf.env['pyext_PATTERN'])[0] -- conf.env['PYTHON_SO_ABI_FLAG'] = abi_pattern % '' -+ '''Be caucious here - conf parameter is PYTHON_SO_ABI_FLAG, -+ while environment variable is PYTHON3_SO_ABI_FLAG''' -+ override_PYTHON_SO_ABI_FLAG = os.getenv('PYTHON3_SO_ABI_FLAG', None) -+ if override_PYTHON_SO_ABI_FLAG is not None: -+ conf.env['PYTHON_SO_ABI_FLAG'] = override_PYTHON_SO_ABI_FLAG -+ conf.env['pyext_PATTERN'] = '%%s%s.%s' % (conf.env['PYTHON_SO_ABI_FLAG'], conf.env['SHLIBEXT']) -+ if not conf.env['PYTHON_SO_ABI_FLAG']: -+ if conf.env['PYTHON_SO_ABI']: -+ conf.env['PYTHON_SO_ABI_FLAG'] = '.'+conf.env['PYTHON_SO_ABI'] -+ conf.env['pyext_PATTERN'] = '%%s%s.%s' % (conf.env['PYTHON_SO_ABI_FLAG'], conf.env['SHLIBEXT']) -+ else: -+ abi_pattern = os.path.splitext(conf.env['pyext_PATTERN'])[0] -+ conf.env['PYTHON_SO_ABI_FLAG'] = abi_pattern % '' - else: - conf.env['PYTHON_SO_ABI_FLAG'] = '' -+ - conf.env['PYTHON_LIBNAME_SO_ABI_FLAG'] = ( - conf.env['PYTHON_SO_ABI_FLAG'].replace('_', '-')) - Property changes on: head/net/samba410/files/patch-buildtools__wafsamba__samba_python.py ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/samba410/files/patch-dnssock.c =================================================================== --- head/net/samba410/files/patch-dnssock.c (revision 505445) +++ head/net/samba410/files/patch-dnssock.c (nonexistent) @@ -1,13 +0,0 @@ ---- lib/addns/dnssock.c.orig 2018-06-11 14:38:36 UTC -+++ lib/addns/dnssock.c -@@ -221,9 +221,7 @@ static DNS_ERROR dns_send_udp(struct dns - ssize_t ret; - - do { -- ret = sendto(conn->s, buf->data, buf->offset, 0, -- (struct sockaddr *)&conn->RecvAddr, -- sizeof(conn->RecvAddr)); -+ ret = send(conn->s, buf->data, buf->offset, 0); - } while ((ret == -1) && (errno == EINTR)); - - if (ret != buf->offset) { Property changes on: head/net/samba410/files/patch-dnssock.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/samba410/files/patch-dbwrap =================================================================== --- head/net/samba410/files/patch-dbwrap (revision 505445) +++ head/net/samba410/files/patch-dbwrap (nonexistent) @@ -1,96 +0,0 @@ ---- lib/dbwrap/dbwrap.c.orig 2018-01-17 10:08:39 UTC -+++ lib/dbwrap/dbwrap.c -@@ -28,6 +28,9 @@ - #include "lib/util/util_tdb.h" - #include "lib/util/tevent_ntstatus.h" - -+#undef DBGC_CLASS -+#define DBGC_CLASS DBGC_LOCKING -+ - /* - * Fall back using fetch if no genuine exists operation is provided - */ ---- lib/dbwrap/dbwrap_local_open.c.orig 2018-01-14 21:41:58.000000000 +0100 -+++ lib/dbwrap/dbwrap_local_open.c 2018-03-29 23:49:51.888588000 +0200 -@@ -24,6 +24,9 @@ - #include "tdb.h" - #include "lib/param/param.h" - -+#undef DBGC_CLASS -+#define DBGC_CLASS DBGC_LOCKING -+ - struct db_context *dbwrap_local_open(TALLOC_CTX *mem_ctx, - struct loadparm_context *lp_ctx, - const char *name, ---- lib/dbwrap/dbwrap_rbt.c.orig 2018-01-17 09:08:39.000000000 +0100 -+++ lib/dbwrap/dbwrap_rbt.c 2018-03-29 23:50:13.427755000 +0200 -@@ -24,6 +24,9 @@ - #include "../lib/util/rbtree.h" - #include "../lib/util/dlinklist.h" - -+#undef DBGC_CLASS -+#define DBGC_CLASS DBGC_LOCKING -+ - #define DBWRAP_RBT_ALIGN(_size_) (((_size_)+15)&~15) - - struct db_rbt_ctx { ---- lib/dbwrap/dbwrap_tdb.c.orig 2018-01-17 09:08:39.000000000 +0100 -+++ lib/dbwrap/dbwrap_tdb.c 2018-03-29 23:50:40.789642000 +0200 -@@ -27,6 +27,9 @@ - #include "lib/param/param.h" - #include "libcli/util/error.h" - -+#undef DBGC_CLASS -+#define DBGC_CLASS DBGC_LOCKING -+ - struct db_tdb_ctx { - struct tdb_wrap *wtdb; - ---- lib/dbwrap/dbwrap_util.c.orig 2018-01-17 09:08:39.000000000 +0100 -+++ lib/dbwrap/dbwrap_util.c 2018-03-29 23:51:35.907061000 +0200 -@@ -26,6 +26,9 @@ - #include "dbwrap.h" - #include "lib/util/util_tdb.h" - -+#undef DBGC_CLASS -+#define DBGC_CLASS DBGC_LOCKING -+ - struct dbwrap_fetch_int32_state { - NTSTATUS status; - int32_t result; ---- source3/lib/dbwrap/dbwrap_ctdb.c.orig 2018-01-17 09:08:39.000000000 +0100 -+++ source3/lib/dbwrap/dbwrap_ctdb.c 2018-03-29 23:57:41.784931000 +0200 -@@ -38,6 +38,9 @@ - #include "lib/cluster_support.h" - #include "lib/util/tevent_ntstatus.h" - -+#undef DBGC_CLASS -+#define DBGC_CLASS DBGC_LOCKING -+ - struct db_ctdb_transaction_handle { - struct db_ctdb_ctx *ctx; - /* ---- source3/lib/dbwrap/dbwrap_open.c.orig 2018-01-17 09:08:39.000000000 +0100 -+++ source3/lib/dbwrap/dbwrap_open.c 2018-03-29 23:57:54.680614000 +0200 -@@ -31,6 +31,9 @@ - #include "ctdbd_conn.h" - #include "messages.h" - -+#undef DBGC_CLASS -+#define DBGC_CLASS DBGC_LOCKING -+ - bool db_is_local(const char *name) - { - const char *sockname = lp_ctdbd_socket(); ---- source3/lib/dbwrap/dbwrap_watch.c.orig 2018-01-17 09:08:39.000000000 +0100 -+++ source3/lib/dbwrap/dbwrap_watch.c 2018-03-29 23:58:09.746298000 +0200 -@@ -28,6 +28,9 @@ - #include "server_id_watch.h" - #include "lib/dbwrap/dbwrap_private.h" - -+#undef DBGC_CLASS -+#define DBGC_CLASS DBGC_LOCKING -+ - static ssize_t dbwrap_record_watchers_key(struct db_context *db, - struct db_record *rec, - uint8_t *wkey, size_t wkey_len) Property changes on: head/net/samba410/files/patch-dbwrap ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/samba410/files/patch-source3__smbd__utmp.c =================================================================== --- head/net/samba410/files/patch-source3__smbd__utmp.c (revision 505445) +++ head/net/samba410/files/patch-source3__smbd__utmp.c (nonexistent) @@ -1,261 +0,0 @@ ---- source3/smbd/utmp.c.orig 2018-01-15 12:41:58 UTC -+++ source3/smbd/utmp.c -@@ -257,7 +257,7 @@ static char *uw_pathname(TALLOC_CTX *ctx - Update utmp file directly. No subroutine interface: probably a BSD system. - ****************************************************************************/ - --static void pututline_my(const char *uname, struct utmp *u, bool claim) -+static void pututline_my(const char *uname, STRUCT_UTMP *u, bool claim) - { - DEBUG(1,("pututline_my: not yet implemented\n")); - /* BSD implementor: may want to consider (or not) adjusting "lastlog" */ -@@ -271,7 +271,7 @@ static void pututline_my(const char *una - Credit: Michail Vidiassov - ****************************************************************************/ - --static void updwtmp_my(const char *wname, struct utmp *u, bool claim) -+static void updwtmp_my(const char *wname, STRUCT_UTMP *u, bool claim) - { - int fd; - struct stat buf; -@@ -303,7 +303,7 @@ static void updwtmp_my(const char *wname - if ((fd = open(wname, O_WRONLY|O_APPEND, 0)) < 0) - return; - if (fstat(fd, &buf) == 0) { -- if (write(fd, (char *)u, sizeof(struct utmp)) != sizeof(struct utmp)) -+ if (write(fd, (char *)u, sizeof(STRUCT_UTMP)) != sizeof(STRUCT_UTMP)) - (void) ftruncate(fd, buf.st_size); - } - (void) close(fd); -@@ -314,12 +314,12 @@ static void updwtmp_my(const char *wname - Update via utmp/wtmp (not utmpx/wtmpx). - ****************************************************************************/ - --static void utmp_nox_update(struct utmp *u, bool claim) -+static void utmp_nox_update(STRUCT_UTMP *u, bool claim) - { - char *uname = NULL; - char *wname = NULL; - #if defined(PUTUTLINE_RETURNS_UTMP) -- struct utmp *urc; -+ STRUCT_UTMP *urc; - #endif /* PUTUTLINE_RETURNS_UTMP */ - - uname = uw_pathname(talloc_tos(), "utmp", ut_pathname); -@@ -376,127 +376,52 @@ static void utmp_nox_update(struct utmp - } - } - --/**************************************************************************** -- Copy a string in the utmp structure. --****************************************************************************/ - --static void utmp_strcpy(char *dest, const char *src, size_t n) --{ -- size_t len = 0; - -- memset(dest, '\0', n); -- if (src) -- len = strlen(src); -- if (len >= n) { -- memcpy(dest, src, n); -- } else { -- if (len) -- memcpy(dest, src, len); -- } --} -+ - - /**************************************************************************** - Update via utmpx/wtmpx (preferred) or via utmp/wtmp. - ****************************************************************************/ - --static void sys_utmp_update(struct utmp *u, const char *hostname, bool claim) -+static void sys_utmp_update(STRUCT_UTMP *u, const char *hostname, bool claim) - { --#if !defined(HAVE_UTMPX_H) -- /* No utmpx stuff. Drop to non-x stuff */ -- utmp_nox_update(u, claim); --#elif !defined(HAVE_PUTUTXLINE) -- /* Odd. Have utmpx.h but no "pututxline()". Drop to non-x stuff */ -- DEBUG(1,("utmp_update: have utmpx.h but no pututxline() function\n")); -- utmp_nox_update(u, claim); --#elif !defined(HAVE_GETUTMPX) -- /* Odd. Have utmpx.h but no "getutmpx()". Drop to non-x stuff */ -- DEBUG(1,("utmp_update: have utmpx.h but no getutmpx() function\n")); -- utmp_nox_update(u, claim); --#elif !defined(HAVE_UPDWTMPX) -- /* Have utmpx.h but no "updwtmpx()". Drop to non-x stuff */ -- DEBUG(1,("utmp_update: have utmpx.h but no updwtmpx() function\n")); -- utmp_nox_update(u, claim); --#else -- char *uname = NULL; -- char *wname = NULL; -- struct utmpx ux, *uxrc; -- -- getutmpx(u, &ux); -- --#if defined(HAVE_UX_UT_SYSLEN) -- if (hostname) -- ux.ut_syslen = strlen(hostname) + 1; /* include end NULL */ -- else -- ux.ut_syslen = 0; --#endif --#if defined(HAVE_UT_UT_HOST) -- utmp_strcpy(ux.ut_host, hostname, sizeof(ux.ut_host)); --#endif -- -- uname = uw_pathname(talloc_tos(), "utmpx", ux_pathname); -- wname = uw_pathname(talloc_tos(), "wtmpx", wx_pathname); -- if (uname && wname) { -- DEBUG(2,("utmp_update: uname:%s wname:%s\n", uname, wname)); -- } -+ STRUCT_UTMP *urc; - -- /* -- * Check for either uname or wname being empty. -- * Some systems, such as Redhat 6, have a "utmpx.h" which doesn't -- * define default filenames. -- * Also, our local installation has not provided an override. -- * Drop to non-x method. (E.g. RH6 has good defaults in "utmp.h".) -- */ -- if (!uname || !wname || (strlen(uname) == 0) || (strlen(wname) == 0)) { -- utmp_nox_update(u, claim); -- } else { -- utmpxname(uname); -- setutxent(); -- uxrc = pututxline(&ux); -- endutxent(); -- if (uxrc == NULL) { -- DEBUG(2,("utmp_update: pututxline() failed\n")); -- return; -- } -- updwtmpx(wname, &ux); -+ setutxent(); -+ urc = pututxline(u); -+ endutxent(); -+ if (urc == NULL) { -+ DEBUG(2,("utmp_update: pututxline() failed\n")); -+ return; - } --#endif /* HAVE_UTMPX_H */ - } - - #if defined(HAVE_UT_UT_ID) - /**************************************************************************** - Encode the unique connection number into "ut_id". - ****************************************************************************/ -- --static int ut_id_encode(int i, char *fourbyte) -+static void ut_id_encode(char *buf, int id, size_t buf_size) - { -- int nbase; -- const char *ut_id_encstr = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"; -- --/* -- * 'ut_id_encstr' is the character set on which modulo arithmetic is done. -- * Example: digits would produce the base-10 numbers from '001'. -- */ -- nbase = strlen(ut_id_encstr); -+ const char ut_id_encstr[] = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"; - -- fourbyte[0] = ut_id_encstr[i % nbase]; -- i /= nbase; -- fourbyte[1] = ut_id_encstr[i % nbase]; -- i /= nbase; -- fourbyte[3] = ut_id_encstr[i % nbase]; -- i /= nbase; -- fourbyte[2] = ut_id_encstr[i % nbase]; -- i /= nbase; -+ int nbase = sizeof(ut_id_encstr) - 1; -+ /* -+ * 'ut_id_encstr' is the character set on which modulo arithmetic is done. -+ * Example: digits would produce the base-10 numbers from '001'. -+ */ - -- /* we do not care about overflows as i is a random number */ -- return 0; -+ for(int i = 0; i < buf_size; i++) { -+ buf[i] = ut_id_encstr[id % nbase]; -+ id /= nbase; -+ } - } - #endif /* defined(HAVE_UT_UT_ID) */ - -- - /* - fill a system utmp structure given all the info we can gather - */ --static bool sys_utmp_fill(struct utmp *u, -+static bool sys_utmp_fill(STRUCT_UTMP *u, - const char *username, const char *hostname, - const char *id_str, int id_num) - { -@@ -509,16 +434,16 @@ static bool sys_utmp_fill(struct utmp *u - * rather than to try to detect and optimise. - */ - #if defined(HAVE_UT_UT_USER) -- utmp_strcpy(u->ut_user, username, sizeof(u->ut_user)); -+ strncpy(u->ut_user, username, sizeof(u->ut_user)); - #elif defined(HAVE_UT_UT_NAME) -- utmp_strcpy(u->ut_name, username, sizeof(u->ut_name)); -+ strncpy(u->ut_name, username, sizeof(u->ut_name)); - #endif - - /* - * ut_line: - * If size limit proves troublesome, then perhaps use "ut_id_encode()". - */ -- utmp_strcpy(u->ut_line, id_str, sizeof(u->ut_line)); -+ strncpy(u->ut_line, id_str, sizeof(u->ut_line)); - - #if defined(HAVE_UT_UT_PID) - u->ut_pid = getpid(); -@@ -535,20 +460,23 @@ static bool sys_utmp_fill(struct utmp *u - u->ut_time = timeval.tv_sec; - #elif defined(HAVE_UT_UT_TV) - GetTimeOfDay(&timeval); -- u->ut_tv = timeval; -+ u->ut_tv.tv_sec = timeval.tv_sec; -+ u->ut_tv.tv_usec = timeval.tv_usec; - #else - #error "with-utmp must have UT_TIME or UT_TV" - #endif - - #if defined(HAVE_UT_UT_HOST) -- utmp_strcpy(u->ut_host, hostname, sizeof(u->ut_host)); -+ if(hostname != NULL) { -+ strncpy(u->ut_host, hostname, sizeof(u->ut_host)); -+#if defined(HAVE_UT_UT_SYSLEN) -+ u->ut_syslen = strlen(hostname) + 1; /* include trailing NULL */ -+#endif -+ } - #endif - - #if defined(HAVE_UT_UT_ID) -- if (ut_id_encode(id_num, u->ut_id) != 0) { -- DEBUG(1,("utmp_fill: cannot encode id %d\n", id_num)); -- return False; -- } -+ ut_id_encode(u->ut_id, id_num, sizeof(u->ut_id)); - #endif - - return True; -@@ -561,7 +489,7 @@ static bool sys_utmp_fill(struct utmp *u - void sys_utmp_yield(const char *username, const char *hostname, - const char *id_str, int id_num) - { -- struct utmp u; -+ STRUCT_UTMP u; - - ZERO_STRUCT(u); - -@@ -587,7 +515,7 @@ void sys_utmp_yield(const char *username - void sys_utmp_claim(const char *username, const char *hostname, - const char *id_str, int id_num) - { -- struct utmp u; -+ STRUCT_UTMP u; - - ZERO_STRUCT(u); - Property changes on: head/net/samba410/files/patch-source3__smbd__utmp.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/samba410/files/patch-source4__lib__http__http.c =================================================================== --- head/net/samba410/files/patch-source4__lib__http__http.c (revision 505445) +++ head/net/samba410/files/patch-source4__lib__http__http.c (nonexistent) @@ -1,69 +0,0 @@ ---- source4/lib/http/http.c.orig 2017-07-04 10:05:26 UTC -+++ source4/lib/http/http.c -@@ -112,7 +112,19 @@ static enum http_read_status http_parse_ - return HTTP_ALL_DATA_READ; - } - -+#ifdef FREEBSD -+ int s0, s1, s2, s3; s0 = s1 = s2 = s3 = 0; -+ n = sscanf(line, "%n%*[^:]%n: %n%*[^\r\n]%n\r\n", &s0, &s1, &s2, &s3); -+ -+ if(n >= 0) { -+ key = calloc(sizeof(char), s1-s0+1); -+ value = calloc(sizeof(char), s3-s2+1); -+ -+ n = sscanf(line, "%[^:]: %[^\r\n]\r\n", key, value); -+ } -+#else - n = sscanf(line, "%m[^:]: %m[^\r\n]\r\n", &key, &value); -+#endif - if (n != 2) { - DEBUG(0, ("%s: Error parsing header '%s'\n", __func__, line)); - status = HTTP_DATA_CORRUPTED; -@@ -138,7 +150,7 @@ error: - static bool http_parse_response_line(struct http_read_response_state *state) - { - bool status = true; -- char *protocol; -+ char *protocol = NULL; - char *msg = NULL; - char major; - char minor; -@@ -158,12 +170,22 @@ static bool http_parse_response_line(str - return false; - } - -+#ifdef FREEBSD -+ int s0, s1, s2, s3; s0 = s1 = s2 = s3 = 0; -+ n = sscanf(line, "%n%*[^/]%n/%c.%c %d %n%*[^\r\n]%n\r\n", -+ &s0, &s1, &major, &minor, &code, &s2, &s3); -+ -+ if(n == 3) { -+ protocol = calloc(sizeof(char), s1-s0+1); -+ msg = calloc(sizeof(char), s3-s2+1); -+ -+ n = sscanf(line, "%[^/]/%c.%c %d %[^\r\n]\r\n", -+ protocol, &major, &minor, &code, msg); -+ } -+#else - n = sscanf(line, "%m[^/]/%c.%c %d %m[^\r\n]\r\n", - &protocol, &major, &minor, &code, &msg); -- -- DEBUG(11, ("%s: Header parsed(%i): protocol->%s, major->%c, minor->%c, " -- "code->%d, message->%s\n", __func__, n, protocol, major, minor, -- code, msg)); -+#endif - - if (n != 5) { - DEBUG(0, ("%s: Error parsing header\n", __func__)); -@@ -171,6 +193,10 @@ static bool http_parse_response_line(str - goto error; - } - -+ DEBUG(11, ("%s: Header parsed(%i): protocol->%s, major->%c, minor->%c, " -+ "code->%d, message->%s\n", __func__, n, protocol, major, minor, -+ code, msg)); -+ - if (major != '1') { - DEBUG(0, ("%s: Bad HTTP major number '%c'\n", __func__, major)); - status = false; Property changes on: head/net/samba410/files/patch-source4__lib__http__http.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/samba410/files/patch-lib__talloc__talloc.c =================================================================== --- head/net/samba410/files/patch-lib__talloc__talloc.c (revision 505445) +++ head/net/samba410/files/patch-lib__talloc__talloc.c (nonexistent) @@ -1,20 +0,0 @@ ---- lib/talloc/talloc.c.orig 2018-01-13 09:07:51 UTC -+++ lib/talloc/talloc.c -@@ -387,6 +387,9 @@ void talloc_lib_init(void) __attribute__ - void talloc_lib_init(void) - { - uint32_t random_value; -+#if defined(HAVE_ARC4RANDOM) -+ random_value = arc4random(); -+#else - #if defined(HAVE_GETAUXVAL) && defined(AT_RANDOM) - uint8_t *p; - /* -@@ -420,6 +423,7 @@ void talloc_lib_init(void) - */ - random_value = ((uintptr_t)talloc_lib_init & 0xFFFFFFFF); - } -+#endif /* HAVE_ARC4RANDOM */ - talloc_magic = random_value & ~TALLOC_FLAG_MASK; - } - #else Property changes on: head/net/samba410/files/patch-lib__talloc__talloc.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/samba410/files/patch-lib__util__wscript_build =================================================================== --- head/net/samba410/files/patch-lib__util__wscript_build (revision 505445) +++ head/net/samba410/files/patch-lib__util__wscript_build (nonexistent) @@ -1,11 +0,0 @@ ---- lib/util/wscript_build.orig 2017-07-04 10:05:25 UTC -+++ lib/util/wscript_build -@@ -133,7 +133,7 @@ else: - - bld.SAMBA_LIBRARY('samba-modules', - source='modules.c', -- deps='samba-errors samba-util', -+ deps='samba-errors samba-util samba-debug', - local_include=False, - private_library=True) - Property changes on: head/net/samba410/files/patch-lib__util__wscript_build ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/samba410/files/patch-lib__crypto__wscript_configure =================================================================== --- head/net/samba410/files/patch-lib__crypto__wscript_configure (revision 505445) +++ head/net/samba410/files/patch-lib__crypto__wscript_configure (nonexistent) @@ -1,15 +0,0 @@ ---- lib/crypto/wscript_configure.orig 2017-09-17 19:15:34 UTC -+++ lib/crypto/wscript_configure -@@ -4,10 +4,10 @@ import Utils - - if not conf.CHECK_FUNCS_IN('MD5Init', 'bsd', headers='bsd/md5.h', - checklibc=True): -- conf.CHECK_FUNCS_IN('MD5Init', 'md5', headers='sys/md5.h', -- checklibc=True) - conf.CHECK_FUNCS_IN('MD5Init', 'md', headers='sys/md5.h', - checklibc=True) -+ conf.CHECK_FUNCS_IN('MD5Init', 'md5', headers='sys/md5.h', -+ checklibc=True) - conf.CHECK_FUNCS_IN('CC_MD5_Init', '', headers='CommonCrypto/CommonDigest.h', - checklibc=True) - Property changes on: head/net/samba410/files/patch-lib__crypto__wscript_configure ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/samba410/files/patch-source3_modules_vfs__freebsd.c =================================================================== --- head/net/samba410/files/patch-source3_modules_vfs__freebsd.c (revision 505445) +++ head/net/samba410/files/patch-source3_modules_vfs__freebsd.c (nonexistent) @@ -1,798 +0,0 @@ ---- /dev/null 2018-11-29 02:13:13 UTC -+++ source3/modules/vfs_freebsd.c -@@ -0,0 +1,795 @@ -+/* -+ * This module implements VFS calls specific to FreeBSD -+ * -+ * Copyright (C) Timur I. Bakeyev, 2018 -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 3 of the License, or -+ * (at your option) any later version. -+ * -+ * This program 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 General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, see . -+ */ -+ -+#include "includes.h" -+ -+#include "lib/util/tevent_unix.h" -+#include "lib/util/tevent_ntstatus.h" -+#include "system/filesys.h" -+ -+#include -+ -+static int vfs_freebsd_debug_level = DBGC_VFS; -+ -+#undef DBGC_CLASS -+#define DBGC_CLASS vfs_freebsd_debug_level -+ -+#ifndef EXTATTR_MAXNAMELEN -+#define EXTATTR_MAXNAMELEN UINT8_MAX -+#endif -+ -+#define EXTATTR_NAMESPACE(NS) EXTATTR_NAMESPACE_ ## NS, \ -+ EXTATTR_NAMESPACE_ ## NS ## _STRING ".", \ -+ .data.len = (sizeof(EXTATTR_NAMESPACE_ ## NS ## _STRING ".") - 1) -+ -+#define EXTATTR_EMPTY 0x00 -+#define EXTATTR_USER 0x01 -+#define EXTATTR_SYSTEM 0x02 -+#define EXTATTR_SECURITY 0x03 -+#define EXTATTR_TRUSTED 0x04 -+ -+enum extattr_mode { -+ FREEBSD_EXTATTR_SECURE, -+ FREEBSD_EXTATTR_COMPAT, -+ FREEBSD_EXTATTR_LEGACY -+}; -+ -+typedef struct { -+ int namespace; -+ char name[EXTATTR_MAXNAMELEN+1]; -+ union { -+ uint16_t len; -+ uint16_t flags; -+ } data; -+} extattr_attr; -+ -+typedef struct { -+ enum { -+ EXTATTR_FILE, EXTATTR_LINK, EXTATTR_FDES -+ } method; -+ union { -+ const char *path; -+ int filedes; -+ } param; -+} extattr_arg; -+ -+static const struct enum_list extattr_mode_param[] = { -+ { FREEBSD_EXTATTR_SECURE, "secure" }, /* */ -+ { FREEBSD_EXTATTR_COMPAT, "compat" }, /* */ -+ { FREEBSD_EXTATTR_LEGACY, "legacy" }, /* */ -+ { -1, NULL } -+}; -+ -+ -+/* */ -+struct freebsd_handle_data { -+ enum extattr_mode extattr_mode; -+}; -+ -+ -+/* XXX: This order doesn't match namespace ids order! */ -+static extattr_attr extattr[] = { -+ { EXTATTR_NAMESPACE(EMPTY) }, -+ { EXTATTR_NAMESPACE(SYSTEM) }, -+ { EXTATTR_NAMESPACE(USER) }, -+}; -+ -+ -+static bool freebsd_in_jail(void) { -+ int val = 0; -+ size_t val_len = sizeof(val); -+ -+ if((sysctlbyname("security.jail.jailed", &val, &val_len, NULL, 0) != -1) && val == 1) { -+ return true; -+ } -+ return false; -+} -+ -+static uint16_t freebsd_map_attrname(const char *name) -+{ -+ if(name == NULL || name[0] == '\0') { -+ return EXTATTR_EMPTY; -+ } -+ -+ switch(name[0]) { -+ case 'u': -+ if(strncmp(name, "user.", 5) == 0) -+ return EXTATTR_USER; -+ break; -+ case 't': -+ if(strncmp(name, "trusted.", 8) == 0) -+ return EXTATTR_TRUSTED; -+ break; -+ case 's': -+ /* name[1] could be any character, including '\0' */ -+ switch(name[1]) { -+ case 'e': -+ if(strncmp(name, "security.", 9) == 0) -+ return EXTATTR_SECURITY; -+ break; -+ case 'y': -+ if(strncmp(name, "system.", 7) == 0) -+ return EXTATTR_SYSTEM; -+ break; -+ } -+ break; -+ } -+ return EXTATTR_USER; -+} -+ -+/* security, system, trusted or user */ -+static extattr_attr* freebsd_map_xattr(enum extattr_mode extattr_mode, const char *name, extattr_attr *attr) -+{ -+ int attrnamespace = EXTATTR_NAMESPACE_EMPTY; -+ const char *attrname = name; -+ -+ if(name == NULL || name[0] == '\0') { -+ return NULL; -+ } -+ -+ if(attr == NULL) { -+ return NULL; -+ } -+ -+ uint16_t flags = freebsd_map_attrname(name); -+ -+ switch(flags) { -+ case EXTATTR_USER: -+ attrnamespace = EXTATTR_NAMESPACE_USER; -+ if(extattr_mode == FREEBSD_EXTATTR_LEGACY) -+ attrname = name + 5; -+ break; -+ case EXTATTR_SECURITY: -+ case EXTATTR_TRUSTED: -+ attrnamespace = (extattr_mode == FREEBSD_EXTATTR_SECURE) ? -+ EXTATTR_NAMESPACE_SYSTEM : -+ EXTATTR_NAMESPACE_USER; -+ break; -+ case EXTATTR_SYSTEM: -+ attrnamespace = (extattr_mode == FREEBSD_EXTATTR_SECURE) ? -+ EXTATTR_NAMESPACE_SYSTEM : -+ EXTATTR_NAMESPACE_USER; -+ if (extattr_mode == FREEBSD_EXTATTR_LEGACY) -+ attrname = name + 7; -+ break; -+ default: -+ /* Default to "user" namespace if nothing else was specified */ -+ attrnamespace = EXTATTR_NAMESPACE_USER; -+ flags = EXTATTR_USER; -+ } -+ -+ attr->namespace = attrnamespace; -+ attr->data.flags = flags; -+ strlcpy(attr->name, attrname, EXTATTR_MAXNAMELEN+1); -+ -+ return attr; -+} -+ -+static ssize_t extattr_size(extattr_arg arg, extattr_attr *attr) -+{ -+ ssize_t result; -+ -+ switch(arg.method) { -+#if defined(HAVE_EXTATTR_GET_FILE) -+ case EXTATTR_FILE: -+ result = extattr_get_file(arg.param.path, attr->namespace, attr->name, NULL, 0); -+ break; -+#endif -+#if defined(HAVE_EXTATTR_GET_LINK) -+ case EXTATTR_LINK: -+ result = extattr_get_link(arg.param.path, attr->namespace, attr->name, NULL, 0); -+ break; -+#endif -+#if defined(HAVE_EXTATTR_GET_FD) -+ case EXTATTR_FDES: -+ result = extattr_get_fd(arg.param.filedes, attr->namespace, attr->name, NULL, 0); -+ break; -+#endif -+ default: -+ errno = ENOSYS; -+ return -1; -+ } -+ -+ if(result < 0) { -+ errno = EINVAL; -+ return -1; -+ } -+ -+ return result; -+} -+ -+ -+/* -+ * The list of names is returned as an unordered array of NULL-terminated -+ * character strings (attribute names are separated by NULL characters), -+ * like this: -+ * user.name1\0system.name1\0user.name2\0 -+ * -+ * Filesystems like ext2, ext3 and XFS which implement POSIX ACLs using -+ * extended attributes, might return a list like this: -+ * system.posix_acl_access\0system.posix_acl_default\0 -+ */ -+/* -+ * The extattr_list_file() returns a list of attributes present in the -+ * requested namespace. Each list entry consists of a single byte containing -+ * the length of the attribute name, followed by the attribute name. The -+ * attribute name is not terminated by ASCII 0 (nul). -+*/ -+ -+static ssize_t freebsd_extattr_list(extattr_arg arg, enum extattr_mode extattr_mode, char *list, size_t size) -+{ -+ ssize_t list_size, total_size = 0; -+ char *p, *q, *list_end; -+ int len; -+ /* -+ Ignore all but user namespace when we are not root or in jail -+ See: https://bugzilla.samba.org/show_bug.cgi?id=10247 -+ */ -+ bool as_root = (geteuid() == 0); -+ -+ int ns = (extattr_mode == FREEBSD_EXTATTR_SECURE && as_root) ? 1 : 2; -+ -+ /* Iterate through extattr(2) namespaces */ -+ for(; ns < ARRAY_SIZE(extattr); ns++) { -+ switch(arg.method) { -+#if defined(HAVE_EXTATTR_LIST_FILE) -+ case EXTATTR_FILE: -+ list_size = extattr_list_file(arg.param.path, extattr[ns].namespace, list, size); -+ break; -+#endif -+#if defined(HAVE_EXTATTR_LIST_LINK) -+ case EXTATTR_LINK: -+ list_size = extattr_list_link(arg.param.path, extattr[ns].namespace, list, size); -+ break; -+#endif -+#if defined(HAVE_EXTATTR_LIST_FD) -+ case EXTATTR_FDES: -+ list_size = extattr_list_fd(arg.param.filedes, extattr[ns].namespace, list, size); -+ break; -+#endif -+ default: -+ errno = ENOSYS; -+ return -1; -+ } -+ /* Some error happend. Errno should be set by the previous call */ -+ if(list_size < 0) -+ return -1; -+ /* No attributes in this namespace */ -+ if(list_size == 0) -+ continue; -+ /* -+ Call with an empty buffer may be used to calculate -+ necessary buffer size. -+ */ -+ if(list == NULL) { -+ /* -+ XXX: Unfortunately, we can't say, how many attributes were -+ returned, so here is the potential problem with the emulation. -+ */ -+ if(extattr_mode == FREEBSD_EXTATTR_LEGACY) { -+ /* -+ Take the worse case of one char attribute names - -+ two bytes per name plus one more for sanity. -+ */ -+ total_size += list_size + (list_size/2 + 1)*extattr[ns].data.len; -+ } -+ else { -+ total_size += list_size; -+ } -+ continue; -+ } -+ -+ if(extattr_mode == FREEBSD_EXTATTR_LEGACY) { -+ /* Count necessary offset to fit namespace prefixes */ -+ int extra_len = 0; -+ uint16_t flags; -+ list_end = list + list_size; -+ for(list_size = 0, p = q = list; p < list_end; p += len) { -+ len = p[0] + 1; -+ (void)strlcpy(q, p + 1, len); -+ flags = freebsd_map_attrname(q); -+ /* Skip secure attributes for non-root user */ -+ if(extattr_mode != FREEBSD_EXTATTR_SECURE && !as_root && flags > EXTATTR_USER) { -+ continue; -+ } -+ if(flags <= EXTATTR_USER) { -+ /* Don't count trailing '\0' */ -+ extra_len += extattr[ns].data.len; -+ } -+ list_size += len; -+ q += len; -+ } -+ total_size += list_size + extra_len; -+ /* Buffer is too small to fit the results */ -+ if(total_size > size) { -+ errno = ERANGE; -+ return -1; -+ } -+ /* Shift results backwards, so we can prepend prefixes */ -+ list_end = list + extra_len; -+ p = (char*)memmove(list_end, list, list_size); -+ /* -+ We enter the loop with `p` pointing to the shifted list and -+ `extra_len` having the total margin between `list` and `p` -+ */ -+ for(list_end += list_size; p < list_end; p += len) { -+ len = strlen(p) + 1; -+ flags = freebsd_map_attrname(p); -+ if(flags <= EXTATTR_USER) { -+ /* Add namespace prefix */ -+ (void)strncpy(list, extattr[ns].name, extattr[ns].data.len); -+ list += extattr[ns].data.len; -+ } -+ /* Append attribute name */ -+ (void)strlcpy(list, p, len); -+ list += len; -+ } -+ } -+ else { -+ /* Convert UCSD strings into nul-terminated strings */ -+ for(list_end = list + list_size; list < list_end; list += len) { -+ len = list[0] + 1; -+ (void)strlcpy(list, list + 1, len); -+ } -+ total_size += list_size; -+ } -+ } -+ return total_size; -+} -+ -+/* -+static ssize_t freebsd_getxattr_size(vfs_handle_struct *handle, -+ const struct smb_filename *smb_fname, -+ const char *name) -+{ -+ struct freebsd_handle_data *data; -+ extattr_arg arg = { EXTATTR_FILE, smb_fname->base_name }; -+ extattr_attr attr; -+ -+ -+ SMB_VFS_HANDLE_GET_DATA(handle, data, -+ struct freebsd_handle_data, -+ return -1); -+ -+ if(!freebsd_map_xattr(data->extattr_mode, name, &attr)) { -+ errno = EINVAL; -+ return -1; -+ } -+ -+ if(data->extattr_mode != FREEBSD_EXTATTR_SECURE && geteuid() != 0 && attr.data.flags > EXTATTR_USER) { -+ errno = ENOATTR; -+ return -1; -+ } -+ -+ return extattr_size(arg, &attr); -+} -+*/ -+ -+/* VFS entries */ -+static ssize_t freebsd_getxattr(vfs_handle_struct *handle, -+ const struct smb_filename *smb_fname, -+ const char *name, -+ void *value, -+ size_t size) -+{ -+#if defined(HAVE_EXTATTR_GET_FILE) -+ struct freebsd_handle_data *data; -+ extattr_arg arg = { EXTATTR_FILE, .param.path = smb_fname->base_name }; -+ extattr_attr attr; -+ ssize_t res; -+ -+ SMB_VFS_HANDLE_GET_DATA(handle, data, -+ struct freebsd_handle_data, -+ return -1); -+ -+ if(!freebsd_map_xattr(data->extattr_mode, name, &attr)) { -+ errno = EINVAL; -+ return -1; -+ } -+ -+ /* Filter out 'secure' entries */ -+ if(data->extattr_mode != FREEBSD_EXTATTR_SECURE && geteuid() != 0 && attr.data.flags > EXTATTR_USER) { -+ errno = ENOATTR; -+ return -1; -+ } -+ -+ /* -+ * The BSD implementation has a nasty habit of silently truncating -+ * the returned value to the size of the buffer, so we have to check -+ * that the buffer is large enough to fit the returned value. -+ */ -+ if((res=extattr_size(arg, &attr)) < 0) { -+ return -1; -+ } -+ -+ if (size == 0) { -+ return res; -+ } -+ else if (res > size) { -+ errno = ERANGE; -+ return -1; -+ } -+ -+ if((res=extattr_get_file(smb_fname->base_name, attr.namespace, attr.name, value, size)) >= 0) { -+ return res; -+ } -+ return -1; -+#else -+ errno = ENOSYS; -+ return -1; -+#endif -+} -+ -+ -+static ssize_t freebsd_fgetxattr(vfs_handle_struct *handle, -+ struct files_struct *fsp, const char *name, -+ void *value, size_t size) -+{ -+#if defined(HAVE_EXTATTR_GET_FD) -+ struct freebsd_handle_data *data; -+ extattr_arg arg = { EXTATTR_FDES, .param.filedes = fsp->fh->fd }; -+ extattr_attr attr; -+ ssize_t res; -+ -+ SMB_VFS_HANDLE_GET_DATA(handle, data, -+ struct freebsd_handle_data, -+ return -1); -+ -+ if(!freebsd_map_xattr(data->extattr_mode, name, &attr)) { -+ errno = EINVAL; -+ return -1; -+ } -+ -+ /* Filter out 'secure' entries */ -+ if(data->extattr_mode != FREEBSD_EXTATTR_SECURE && geteuid() != 0 && attr.data.flags > EXTATTR_USER) { -+ errno = ENOATTR; -+ return -1; -+ } -+ -+ /* -+ * The BSD implementation has a nasty habit of silently truncating -+ * the returned value to the size of the buffer, so we have to check -+ * that the buffer is large enough to fit the returned value. -+ */ -+ if((res=extattr_size(arg, &attr)) < 0) { -+ return -1; -+ } -+ -+ if (size == 0) { -+ return res; -+ } -+ else if (res > size) { -+ errno = ERANGE; -+ return -1; -+ } -+ -+ if((res=extattr_get_fd(fsp->fh->fd, attr.namespace, attr.name, value, size)) >= 0) { -+ return res; -+ } -+ return -1; -+#else -+ errno = ENOSYS; -+ return -1; -+#endif -+} -+ -+ -+static ssize_t freebsd_listxattr(vfs_handle_struct *handle, -+ const struct smb_filename *smb_fname, -+ char *list, -+ size_t size) -+{ -+#if defined(HAVE_EXTATTR_LIST_FILE) -+ struct freebsd_handle_data *data; -+ -+ SMB_VFS_HANDLE_GET_DATA(handle, data, -+ struct freebsd_handle_data, -+ return -1); -+ -+ extattr_arg arg = { EXTATTR_FILE, .param.path = smb_fname->base_name }; -+ -+ return freebsd_extattr_list(arg, data->extattr_mode, list, size); -+#else -+ errno = ENOSYS; -+ return -1; -+#endif -+} -+ -+ -+static ssize_t freebsd_flistxattr(vfs_handle_struct *handle, -+ struct files_struct *fsp, char *list, -+ size_t size) -+{ -+#if defined(HAVE_EXTATTR_LIST_FD) -+ struct freebsd_handle_data *data; -+ extattr_arg arg = { EXTATTR_FDES, .param.filedes = fsp->fh->fd }; -+ -+ SMB_VFS_HANDLE_GET_DATA(handle, data, -+ struct freebsd_handle_data, -+ return -1); -+ -+ return freebsd_extattr_list(arg, data->extattr_mode, list, size); -+#else -+ errno = ENOSYS; -+ return -1; -+#endif -+} -+ -+static int freebsd_removexattr(vfs_handle_struct *handle, -+ const struct smb_filename *smb_fname, -+ const char *name) -+{ -+#if defined(HAVE_EXTATTR_DELETE_FILE) -+ struct freebsd_handle_data *data; -+ extattr_attr attr; -+ -+ SMB_VFS_HANDLE_GET_DATA(handle, data, -+ struct freebsd_handle_data, -+ return -1); -+ -+ -+ /* Filter out 'secure' entries */ -+ if(data->extattr_mode != FREEBSD_EXTATTR_SECURE && geteuid() != 0 && attr.data.flags > EXTATTR_USER) { -+ errno = ENOATTR; -+ return -1; -+ } -+ -+ return extattr_delete_file(smb_fname->base_name, attr.namespace, attr.name); -+#else -+ errno = ENOSYS; -+ return -1; -+#endif -+} -+ -+ -+static int freebsd_fremovexattr(vfs_handle_struct *handle, -+ struct files_struct *fsp, const char *name) -+{ -+#if defined(HAVE_EXTATTR_DELETE_FD) -+ struct freebsd_handle_data *data; -+ extattr_attr attr; -+ -+ SMB_VFS_HANDLE_GET_DATA(handle, data, -+ struct freebsd_handle_data, -+ return -1); -+ -+ if(!freebsd_map_xattr(data->extattr_mode, name, &attr)) { -+ errno = EINVAL; -+ return -1; -+ } -+ -+ /* Filter out 'secure' entries */ -+ if(data->extattr_mode != FREEBSD_EXTATTR_SECURE && geteuid() != 0 && attr.data.flags > EXTATTR_USER) { -+ errno = ENOATTR; -+ return -1; -+ } -+ -+ return extattr_delete_fd(fsp->fh->fd, attr.namespace, attr.name); -+#else -+ errno = ENOSYS; -+ return -1; -+#endif -+} -+ -+ -+static int freebsd_setxattr(vfs_handle_struct *handle, -+ const struct smb_filename *smb_fname, -+ const char *name, -+ const void *value, -+ size_t size, -+ int flags) -+{ -+#if defined(HAVE_EXTATTR_SET_FILE) -+ struct freebsd_handle_data *data; -+ extattr_attr attr; -+ ssize_t res; -+ -+ SMB_VFS_HANDLE_GET_DATA(handle, data, -+ struct freebsd_handle_data, -+ return -1); -+ -+ if(!freebsd_map_xattr(data->extattr_mode, name, &attr)) { -+ errno = EINVAL; -+ return -1; -+ } -+ -+ /* Filter out 'secure' entries */ -+ if(data->extattr_mode != FREEBSD_EXTATTR_SECURE && geteuid() != 0 && attr.data.flags > EXTATTR_USER) { -+ errno = ENOATTR; -+ return -1; -+ } -+ -+ if (flags) { -+ extattr_arg arg = { EXTATTR_FILE, .param.path = smb_fname->base_name }; -+ /* Check attribute existence */ -+ res = extattr_size(arg, &attr); -+ if (res < 0) { -+ /* REPLACE attribute, that doesn't exist */ -+ if ((flags & XATTR_REPLACE) && errno == ENOATTR) { -+ errno = ENOATTR; -+ return -1; -+ } -+ /* Ignore other errors */ -+ } -+ else { -+ /* CREATE attribute, that already exists */ -+ if (flags & XATTR_CREATE) { -+ errno = EEXIST; -+ return -1; -+ } -+ } -+ } -+ res = extattr_set_file(smb_fname->base_name, attr.namespace, attr.name, value, size); -+ -+ return (res >= 0) ? 0 : -1; -+#else -+ errno = ENOSYS; -+ return -1; -+#endif -+} -+ -+ -+static int freebsd_fsetxattr(vfs_handle_struct *handle, struct files_struct *fsp, -+ const char *name, const void *value, size_t size, -+ int flags) -+{ -+#if defined(HAVE_EXTATTR_SET_FD) -+ struct freebsd_handle_data *data; -+ extattr_attr attr; -+ ssize_t res; -+ -+ SMB_VFS_HANDLE_GET_DATA(handle, data, -+ struct freebsd_handle_data, -+ return -1); -+ -+ if(!freebsd_map_xattr(data->extattr_mode, name, &attr)) { -+ errno = EINVAL; -+ return -1; -+ } -+ -+ /* Filter out 'secure' entries */ -+ if(data->extattr_mode != FREEBSD_EXTATTR_SECURE && geteuid() != 0 && attr.data.flags > EXTATTR_USER) { -+ errno = ENOATTR; -+ return -1; -+ } -+ -+ if (flags) { -+ extattr_arg arg = { EXTATTR_FDES, .param.filedes = fsp->fh->fd }; -+ /* Check attribute existence */ -+ res = extattr_size(arg, &attr); -+ if (res < 0) { -+ /* REPLACE attribute, that doesn't exist */ -+ if ((flags & XATTR_REPLACE) && errno == ENOATTR) { -+ errno = ENOATTR; -+ return -1; -+ } -+ /* Ignore other errors */ -+ } -+ else { -+ /* CREATE attribute, that already exists */ -+ if (flags & XATTR_CREATE) { -+ errno = EEXIST; -+ return -1; -+ } -+ } -+ } -+ -+ res = extattr_set_fd(fsp->fh->fd, attr.namespace, attr.name, value, size); -+ -+ return (res >= 0) ? 0 : -1; -+#else -+ errno = ENOSYS; -+ return -1; -+#endif -+} -+ -+static int freebsd_connect(vfs_handle_struct *handle, const char *service, -+ const char *user) -+{ -+ struct freebsd_handle_data *data; -+ int enumval, saved_errno; -+ -+ int ret = SMB_VFS_NEXT_CONNECT(handle, service, user); -+ -+ if (ret < 0) { -+ return ret; -+ } -+ -+ data = talloc_zero(handle->conn, struct freebsd_handle_data); -+ if (!data) { -+ saved_errno = errno; -+ SMB_VFS_NEXT_DISCONNECT(handle); -+ DEBUG(0, ("talloc_zero() failed\n")); -+ errno = saved_errno; -+ return -1; -+ } -+ -+ enumval = lp_parm_enum(SNUM(handle->conn), "freebsd", -+ "extattr mode", extattr_mode_param, FREEBSD_EXTATTR_LEGACY); -+ if (enumval == -1) { -+ saved_errno = errno; -+ SMB_VFS_NEXT_DISCONNECT(handle); -+ DBG_DEBUG("value for freebsd: 'extattr mode' is unknown\n"); -+ errno = saved_errno; -+ return -1; -+ } -+ -+ if(freebsd_in_jail()) { -+ enumval = FREEBSD_EXTATTR_COMPAT; -+ DBG_WARNING("running in jail, enforcing 'compat' mode\n"); -+ } -+ -+ data->extattr_mode = (enum extattr_mode)enumval; -+ -+ SMB_VFS_HANDLE_SET_DATA(handle, data, NULL, -+ struct freebsd_handle_data, -+ return -1); -+ -+ DBG_DEBUG("connect to service[%s] with '%s' extattr mode\n", -+ service, extattr_mode_param[data->extattr_mode].name); -+ -+ return 0; -+} -+ -+static void freebsd_disconnect(vfs_handle_struct *handle) -+{ -+ SMB_VFS_NEXT_DISCONNECT(handle); -+} -+ -+/* VFS operations structure */ -+ -+struct vfs_fn_pointers freebsd_fns = { -+ /* Disk operations */ -+ -+ .connect_fn = freebsd_connect, -+ .disconnect_fn = freebsd_disconnect, -+ -+ /* EA operations. */ -+ .getxattr_fn = freebsd_getxattr, -+ .fgetxattr_fn = freebsd_fgetxattr, -+ .listxattr_fn = freebsd_listxattr, -+ .flistxattr_fn = freebsd_flistxattr, -+ .removexattr_fn = freebsd_removexattr, -+ .fremovexattr_fn = freebsd_fremovexattr, -+ .setxattr_fn = freebsd_setxattr, -+ .fsetxattr_fn = freebsd_fsetxattr, -+}; -+ -+static_decl_vfs; -+NTSTATUS vfs_freebsd_init(TALLOC_CTX *ctx) -+{ -+ NTSTATUS ret; -+ -+ ret = smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "freebsd", -+ &freebsd_fns); -+ -+ if (!NT_STATUS_IS_OK(ret)) { -+ return ret; -+ } -+ -+ vfs_freebsd_debug_level = debug_add_class("freebsd"); -+ if (vfs_freebsd_debug_level == -1) { -+ vfs_freebsd_debug_level = DBGC_VFS; -+ DEBUG(0, ("vfs_freebsd: Couldn't register custom debugging class!\n")); -+ } else { -+ DEBUG(10, ("vfs_freebsd: Debug class number of 'fileid': %d\n", vfs_freebsd_debug_level)); -+ } -+ -+ return ret; -+} Property changes on: head/net/samba410/files/patch-source3_modules_vfs__freebsd.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/samba410/files/patch-lib__ldb__ldb_cache.c =================================================================== --- head/net/samba410/files/patch-lib__ldb__ldb_cache.c (revision 505445) +++ head/net/samba410/files/patch-lib__ldb__ldb_cache.c (nonexistent) @@ -1,13 +0,0 @@ ---- lib/ldb/ldb_tdb/ldb_cache.c.orig 2018-03-04 05:41:25 UTC -+++ lib/ldb/ldb_tdb/ldb_cache.c -@@ -91,7 +91,9 @@ static int ldb_schema_attribute_compare( - { - const struct ldb_schema_attribute *sa1 = (const struct ldb_schema_attribute *)p1; - const struct ldb_schema_attribute *sa2 = (const struct ldb_schema_attribute *)p2; -- return ldb_attr_cmp(sa1->name, sa2->name); -+ int res = ldb_attr_cmp(sa1->name, sa2->name); -+ -+ return (res) ? res : (sa1->flags > sa2->flags) ? 1 : (sa1->flags < sa2->flags) ? -1 : 0; - } - - /* Property changes on: head/net/samba410/files/patch-lib__ldb__ldb_cache.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/samba410/files/patch-source4__kdc__kdc-service-mit.c =================================================================== --- head/net/samba410/files/patch-source4__kdc__kdc-service-mit.c (revision 505445) +++ head/net/samba410/files/patch-source4__kdc__kdc-service-mit.c (nonexistent) @@ -1,17 +0,0 @@ ---- source4/kdc/kdc-service-mit.c.orig 2018-01-18 00:08:39 UTC -+++ source4/kdc/kdc-service-mit.c -@@ -36,9 +36,13 @@ - #include "kdc/samba_kdc.h" - #include "kdc/kdc-server.h" - #include "kdc/kpasswd-service.h" --#include - #include - -+#pragma clang diagnostic push -+#pragma clang diagnostic ignored "-Wstrict-prototypes" -+#include -+#pragma clang diagnostic pop -+ - #include "source4/kdc/mit_kdc_irpc.h" - - /* PROTOTYPES */ Property changes on: head/net/samba410/files/patch-source4__kdc__kdc-service-mit.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/samba410/files/patch-third_party__waf__wafadmin__Tools__cc.py =================================================================== --- head/net/samba410/files/patch-third_party__waf__wafadmin__Tools__cc.py (revision 505445) +++ head/net/samba410/files/patch-third_party__waf__wafadmin__Tools__cc.py (nonexistent) @@ -1,11 +0,0 @@ ---- third_party/waf/wafadmin/Tools/cc.py.orig 2017-07-04 10:05:26 UTC -+++ third_party/waf/wafadmin/Tools/cc.py -@@ -88,7 +88,7 @@ def c_hook(self, node): - raise Utils.WafError('Have you forgotten to set the feature "cc" on %s?' % str(self)) - return task - --cc_str = '${CC} ${CCFLAGS} ${CPPFLAGS} ${_CCINCFLAGS} ${_CCDEFFLAGS} ${CC_SRC_F}${SRC} ${CC_TGT_F}${TGT}' -+cc_str = '${CC} ${CCFLAGS} ${_CCINCFLAGS} ${CPPFLAGS} ${_CCDEFFLAGS} ${CC_SRC_F}${SRC} ${CC_TGT_F}${TGT}' - cls = Task.simple_task_type('cc', cc_str, 'GREEN', ext_out='.o', ext_in='.c', shell=False) - cls.scan = ccroot.scan - cls.vars.append('CCDEPS') Property changes on: head/net/samba410/files/patch-third_party__waf__wafadmin__Tools__cc.py ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/samba410/files/patch-source3__modules__wscript_build =================================================================== --- head/net/samba410/files/patch-source3__modules__wscript_build (revision 505445) +++ head/net/samba410/files/patch-source3__modules__wscript_build (nonexistent) @@ -1,17 +0,0 @@ ---- source3/modules/wscript_build.orig 2018-02-25 05:33:23 UTC -+++ source3/modules/wscript_build -@@ -222,6 +222,14 @@ bld.SAMBA3_MODULE('vfs_zfsacl', - internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_zfsacl'), - enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_zfsacl')) - -+bld.SAMBA3_MODULE('vfs_freebsd', -+ subsystem='vfs', -+ source='vfs_freebsd.c', -+ deps='samba-util', -+ init_function='', -+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_freebsd'), -+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_freebsd')) -+ - xdr_buf_hack = 'sed -e "s@^\([ \t]*register int32_t \*buf\);@\\1 = buf;@"' - - bld.SAMBA_GENERATOR('nfs41acl-xdr-c', Property changes on: head/net/samba410/files/patch-source3__modules__wscript_build ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/samba410/files/0001-Freenas-master-mdns-fixes-22.patch =================================================================== --- head/net/samba410/files/0001-Freenas-master-mdns-fixes-22.patch (revision 505445) +++ head/net/samba410/files/0001-Freenas-master-mdns-fixes-22.patch (nonexistent) @@ -1,375 +0,0 @@ -From 923bc7a1afeb0b920e60e14846987ae1d2d7dca4 Mon Sep 17 00:00:00 2001 -From: John Hixson -Date: Thu, 7 Dec 2017 09:36:32 -0500 -Subject: [PATCH] Freenas/master mdns fixes (#22) - -* mDNS fixes for Samba (work in progress). - -* Fix mDNS - Can advertise on individual interfaces - -* Fix mDNS browsing in smbclient - -Signed-off-by: Timur I. Bakeyev ---- - source3/client/dnsbrowse.c | 17 ++-- - source3/smbd/dnsregister.c | 193 +++++++++++++++++++++++++++++---------------- - 2 files changed, 137 insertions(+), 73 deletions(-) - -diff --git a/source3/client/dnsbrowse.c b/source3/client/dnsbrowse.c -index efd57d42d88..83aef966d2a 100644 ---- a/source3/client/dnsbrowse.c -+++ b/source3/client/dnsbrowse.c -@@ -39,6 +39,7 @@ struct mdns_smbsrv_result - struct mdns_browse_state - { - struct mdns_smbsrv_result *listhead; /* Browse result list head */ -+ TALLOC_CTX * ctx; - int browseDone; - - }; -@@ -64,7 +65,7 @@ static void do_smb_resolve(struct mdns_smbsrv_result *browsesrv) - struct timeval tv; - DNSServiceErrorType err; - -- TALLOC_CTX * ctx = talloc_tos(); -+ TALLOC_CTX * ctx = talloc_new(NULL); - - err = DNSServiceResolve(&mdns_conn_sdref, 0 /* flags */, - browsesrv->ifIndex, -@@ -91,7 +91,7 @@ static void do_smb_resolve(struct mdns_s - } - } - -- TALLOC_FREE(fdset); -+ TALLOC_FREE(ctx); - DNSServiceRefDeallocate(mdns_conn_sdref); - } - -@@ -124,18 +125,19 @@ do_smb_browse_reply(DNSServiceRef sdRef, DNSServiceFlags flags, - return; - } - -- bresult = talloc_array(talloc_tos(), struct mdns_smbsrv_result, 1); -+ bresult = talloc_array(bstatep->ctx, struct mdns_smbsrv_result, 1); - if (bresult == NULL) { - return; - } - -+ bresult->nextResult = NULL; - if (bstatep->listhead != NULL) { - bresult->nextResult = bstatep->listhead; - } - -- bresult->serviceName = talloc_strdup(talloc_tos(), serviceName); -- bresult->regType = talloc_strdup(talloc_tos(), regtype); -- bresult->domain = talloc_strdup(talloc_tos(), replyDomain); -+ bresult->serviceName = talloc_strdup(bstatep->ctx, serviceName); -+ bresult->regType = talloc_strdup(bstatep->ctx, regtype); -+ bresult->domain = talloc_strdup(bstatep->ctx, replyDomain); - bresult->ifIndex = interfaceIndex; - bstatep->listhead = bresult; - } -@@ -151,10 +153,13 @@ int do_smb_browse(void) - DNSServiceRef mdns_conn_sdref = NULL; - DNSServiceErrorType err; - -- TALLOC_CTX * ctx = talloc_stackframe(); -+ TALLOC_CTX * ctx = talloc_new(NULL); - - ZERO_STRUCT(bstate); - -+ bstate.ctx = ctx; -+ bstate.listhead = NULL; -+ - err = DNSServiceBrowse(&mdns_conn_sdref, 0, 0, "_smb._tcp", "", - do_smb_browse_reply, &bstate); - -diff --git a/source3/smbd/dnsregister.c b/source3/smbd/dnsregister.c -index df189001a09..f25b60f4611 100644 ---- a/source3/smbd/dnsregister.c -+++ b/source3/smbd/dnsregister.c -@@ -36,85 +36,111 @@ - #include - - struct dns_reg_state { -- struct tevent_context *event_ctx; -- uint16_t port; -- DNSServiceRef srv_ref; -- struct tevent_timer *te; -- int fd; -- struct tevent_fd *fde; -+ int count; -+ struct reg_state { -+ DNSServiceRef srv_ref; -+ TALLOC_CTX *mem_ctx; -+ struct tevent_context *event_ctx; -+ struct tevent_timer *te; -+ struct tevent_fd *fde; -+ uint16_t port; -+ int if_index; -+ int fd; -+ } *drs; - }; - --static int dns_reg_state_destructor(struct dns_reg_state *dns_state) -+static void dns_register_smbd_retry(struct tevent_context *ctx, -+ struct tevent_timer *te, -+ struct timeval now, -+ void *private_data); -+static void dns_register_smbd_fde_handler(struct tevent_context *ev, -+ struct tevent_fd *fde, -+ uint16_t flags, -+ void *private_data); -+ -+ -+static int reg_state_destructor(struct reg_state *state) - { -- if (dns_state->srv_ref != NULL) { -+ if (state == NULL) { -+ return -1; -+ } -+ -+ if (state->srv_ref != NULL) { - /* Close connection to the mDNS daemon */ -- DNSServiceRefDeallocate(dns_state->srv_ref); -- dns_state->srv_ref = NULL; -+ DNSServiceRefDeallocate(state->srv_ref); -+ state->srv_ref = NULL; - } - - /* Clear event handler */ -- TALLOC_FREE(dns_state->te); -- TALLOC_FREE(dns_state->fde); -- dns_state->fd = -1; -+ TALLOC_FREE(state->te); -+ TALLOC_FREE(state->fde); -+ state->fd = -1; - - return 0; - } - --static void dns_register_smbd_retry(struct tevent_context *ctx, -- struct tevent_timer *te, -- struct timeval now, -- void *private_data); --static void dns_register_smbd_fde_handler(struct tevent_context *ev, -- struct tevent_fd *fde, -- uint16_t flags, -- void *private_data); - --static bool dns_register_smbd_schedule(struct dns_reg_state *dns_state, -+static bool dns_register_smbd_schedule(struct reg_state *state, - struct timeval tval) - { -- dns_reg_state_destructor(dns_state); -+ reg_state_destructor(state); - -- dns_state->te = tevent_add_timer(dns_state->event_ctx, -- dns_state, -+ state->te = tevent_add_timer(state->event_ctx, -+ state->mem_ctx, - tval, - dns_register_smbd_retry, -- dns_state); -- if (!dns_state->te) { -+ state); -+ if (!state->te) { - return false; - } - - return true; - } - -+static void dns_register_smbd_callback(DNSServiceRef service, -+ DNSServiceFlags flags, -+ DNSServiceErrorType errorCode, -+ const char *name, -+ const char *type, -+ const char *domain, -+ void *context) -+{ -+ if (errorCode != kDNSServiceErr_NoError) { -+ DEBUG(6, ("error=%d\n", errorCode)); -+ } else { -+ DEBUG(6, ("%-15s %s.%s%s\n", "REGISTER", name, type, domain)); -+ } -+} -+ - static void dns_register_smbd_retry(struct tevent_context *ctx, - struct tevent_timer *te, - struct timeval now, - void *private_data) - { -- struct dns_reg_state *dns_state = talloc_get_type_abort(private_data, -- struct dns_reg_state); -+ struct reg_state *state = (struct reg_state *)private_data; - DNSServiceErrorType err; - -- dns_reg_state_destructor(dns_state); -+ reg_state_destructor(state); - -- DEBUG(6, ("registering _smb._tcp service on port %d\n", -- dns_state->port)); -+ DEBUG(6, ("registering _smb._tcp service on port %d index %d\n", -+ state->port, state->if_index)); - - /* Register service with DNS. Connects with the mDNS - * daemon running on the local system to perform DNS - * service registration. - */ -- err = DNSServiceRegister(&dns_state->srv_ref, 0 /* flags */, -- kDNSServiceInterfaceIndexAny, -- NULL /* service name */, -- "_smb._tcp" /* service type */, -- NULL /* domain */, -- "" /* SRV target host name */, -- htons(dns_state->port), -- 0 /* TXT record len */, -- NULL /* TXT record data */, -- NULL /* callback func */, -- NULL /* callback context */); -+ err = DNSServiceRegister(&state->srv_ref, -+ 0 /* flags */, -+ state->if_index /* interface index */, -+ NULL /* service name */, -+ "_smb._tcp" /* service type */, -+ NULL /* domain */, -+ "" /* SRV target host name */, -+ htons(state->port) /* port */, -+ 0 /* TXT record len */, -+ NULL /* TXT record data */, -+ dns_register_smbd_callback /* callback func */, -+ NULL /* callback context */); - - if (err != kDNSServiceErr_NoError) { - /* Failed to register service. Schedule a re-try attempt. -@@ -123,24 +149,24 @@ static void dns_register_smbd_retry(struct tevent_context *ctx, - goto retry; - } - -- dns_state->fd = DNSServiceRefSockFD(dns_state->srv_ref); -- if (dns_state->fd == -1) { -+ state->fd = DNSServiceRefSockFD(state->srv_ref); -+ if (state->fd == -1) { - goto retry; - } - -- dns_state->fde = tevent_add_fd(dns_state->event_ctx, -- dns_state, -- dns_state->fd, -- TEVENT_FD_READ, -- dns_register_smbd_fde_handler, -- dns_state); -- if (!dns_state->fde) { -+ state->fde = tevent_add_fd(state->event_ctx, -+ state->mem_ctx, -+ state->fd, -+ TEVENT_FD_READ, -+ dns_register_smbd_fde_handler, -+ state); -+ if (!state->fde) { - goto retry; - } - - return; - retry: -- dns_register_smbd_schedule(dns_state, -+ dns_register_smbd_schedule(state, - timeval_current_ofs(DNS_REG_RETRY_INTERVAL, 0)); - } - -@@ -150,44 +176,77 @@ static void dns_register_smbd_fde_handler(struct tevent_context *ev, - uint16_t flags, - void *private_data) - { -- struct dns_reg_state *dns_state = talloc_get_type_abort(private_data, -- struct dns_reg_state); -+ struct reg_state *state = (struct reg_state *)private_data; - DNSServiceErrorType err; - -- err = DNSServiceProcessResult(dns_state->srv_ref); -+ err = DNSServiceProcessResult(state->srv_ref); - if (err != kDNSServiceErr_NoError) { -- DEBUG(3, ("failed to process mDNS result (err %d), re-trying\n", -- err)); -+ DEBUG(3, ("failed to process mDNS result (err %d), re-trying\n", err)); - goto retry; - } - -- talloc_free(dns_state); - return; - - retry: -- dns_register_smbd_schedule(dns_state, -- timeval_current_ofs(DNS_REG_RETRY_INTERVAL, 0)); -+ dns_register_smbd_schedule(state, timeval_zero()); - } - -+static int dns_reg_state_destructor(struct dns_reg_state *state) -+{ -+ if (state != NULL) { -+ talloc_free(state); -+ } -+ return 0; -+} -+ -+ - bool smbd_setup_mdns_registration(struct tevent_context *ev, - TALLOC_CTX *mem_ctx, - uint16_t port) - { - struct dns_reg_state *dns_state; -+ bool bind_all = true; -+ int i; - - dns_state = talloc_zero(mem_ctx, struct dns_reg_state); -- if (dns_state == NULL) { -+ if (dns_state == NULL) -+ return false; -+ -+ if (lp_interfaces() && lp_bind_interfaces_only()) -+ bind_all = false; -+ -+ dns_state->count = iface_count(); -+ if (dns_state->count <= 0 || bind_all == true) -+ dns_state->count = 1; -+ -+ dns_state->drs = talloc_array(mem_ctx, struct reg_state, dns_state->count); -+ if (dns_state->drs == NULL) { -+ talloc_free(dns_state); - return false; - } -- dns_state->event_ctx = ev; -- dns_state->port = port; -- dns_state->fd = -1; - -- talloc_set_destructor(dns_state, dns_reg_state_destructor); -+ for (i = 0; i < dns_state->count; i++) { -+ struct interface *iface = get_interface(i); -+ struct reg_state *state = &dns_state->drs[i]; -+ -+ state->mem_ctx = mem_ctx; -+ state->srv_ref = NULL; -+ state->event_ctx = ev; -+ state->te = NULL; -+ state->fde = NULL; -+ state->port = port; -+ state->fd = -1; -+ -+ state->if_index = bind_all ? kDNSServiceInterfaceIndexAny : iface->if_index; - -- return dns_register_smbd_schedule(dns_state, timeval_zero()); -+ dns_register_smbd_schedule(&dns_state->drs[i], timeval_zero()); -+ } -+ -+ talloc_set_destructor(dns_state, dns_reg_state_destructor); -+ return true; - } - -+ - #else /* WITH_DNSSD_SUPPORT */ - - bool smbd_setup_mdns_registration(struct tevent_context *ev, --- -2.14.2 - Property changes on: head/net/samba410/files/0001-Freenas-master-mdns-fixes-22.patch ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/samba410/files/patch-source3__utils__net.c =================================================================== --- head/net/samba410/files/patch-source3__utils__net.c (revision 505445) +++ head/net/samba410/files/patch-source3__utils__net.c (nonexistent) @@ -1,18 +0,0 @@ ---- source3/utils/net.c.orig 2017-07-04 10:05:26 UTC -+++ source3/utils/net.c -@@ -1087,8 +1087,13 @@ static struct functable net_func[] = { - lp_set_cmdline("netbios name", 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) { Property changes on: head/net/samba410/files/patch-source3__utils__net.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/samba410/files/patch-source3__winbindd__wscript_build =================================================================== --- head/net/samba410/files/patch-source3__winbindd__wscript_build (revision 505445) +++ head/net/samba410/files/patch-source3__winbindd__wscript_build (nonexistent) @@ -1,20 +0,0 @@ ---- source3/winbindd/wscript_build.orig 2017-11-14 04:44:42 UTC -+++ source3/winbindd/wscript_build -@@ -2,7 +2,7 @@ - - bld.SAMBA3_LIBRARY('idmap', - source='idmap.c idmap_util.c', -- deps='samba-util pdb', -+ deps='pdb samba-modules secrets3', - allow_undefined_symbols=True, - private_library=True) - -@@ -116,7 +116,7 @@ bld.SAMBA3_MODULE('idmap_autorid', - - bld.SAMBA3_LIBRARY('nss_info', - source='nss_info.c', -- deps='samba-util smbconf', -+ deps='samba-util samba-modules smbconf', - private_library=True) - - bld.SAMBA3_MODULE('nss_info_template', Property changes on: head/net/samba410/files/patch-source3__winbindd__wscript_build ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/samba410/files/patch-buildtools__wafsamba__wscript =================================================================== --- head/net/samba410/files/patch-buildtools__wafsamba__wscript (revision 505445) +++ head/net/samba410/files/patch-buildtools__wafsamba__wscript (nonexistent) @@ -1,22 +0,0 @@ ---- buildtools/wafsamba/wscript.orig 2017-04-28 11:57:26 UTC -+++ buildtools/wafsamba/wscript -@@ -74,12 +74,17 @@ def set_options(opt): - help=("private library directory [PREFIX/lib/%s]" % Utils.g_module.APPNAME), - action="store", dest='PRIVATELIBDIR', default=None) - -+ opt.add_option('--with-openldap', -+ help='additional directory to search for OpenLDAP libs', -+ action='store', dest='ldap_open', default=None, -+ match = ['Checking for header ldap.h', 'Checking for header lber.h', 'Checking for library lber', 'Checking for library ldap']) -+ - opt.add_option('--with-libiconv', - help='additional directory to search for libiconv', -- action='store', dest='iconv_open', default='/usr/local', -+ action='store', dest='iconv_open', default=None, - match = ['Checking for library iconv', 'Checking for iconv_open', 'Checking for header iconv.h']) - opt.add_option('--without-gettext', -- help=("Disable use of gettext"), -+ help=("disable use of gettext"), - action="store_true", dest='disable_gettext', default=False) - - gr = opt.option_group('developer options') Property changes on: head/net/samba410/files/patch-buildtools__wafsamba__wscript ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/samba410/files/patch-lib__replace__wscript =================================================================== --- head/net/samba410/files/patch-lib__replace__wscript (revision 505445) +++ head/net/samba410/files/patch-lib__replace__wscript (nonexistent) @@ -1,11 +0,0 @@ ---- lib/replace/wscript.orig 2017-08-24 11:27:53 UTC -+++ lib/replace/wscript -@@ -81,7 +81,7 @@ def configure(conf): - conf.CHECK_HEADERS('sys/atomic.h') - conf.CHECK_HEADERS('libgen.h') - -- if conf.CHECK_CFLAGS('-Wno-format-truncation'): -+ if conf.CHECK_CFLAGS(['-Wno-format-truncation'] + conf.env.WERROR_CFLAGS): - conf.define('HAVE_WNO_FORMAT_TRUNCATION', '1') - - # Check for process set name support Property changes on: head/net/samba410/files/patch-lib__replace__wscript ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/samba410/files/patch-examples__pdb__wscript_build =================================================================== --- head/net/samba410/files/patch-examples__pdb__wscript_build (revision 505445) +++ head/net/samba410/files/patch-examples__pdb__wscript_build (nonexistent) @@ -1,11 +0,0 @@ ---- examples/pdb/wscript_build.orig 2017-11-14 06:05:12 UTC -+++ examples/pdb/wscript_build -@@ -3,7 +3,7 @@ - bld.SAMBA3_MODULE('pdb_test', - subsystem='pdb', - source='test.c', -- deps='samba-util', -+ deps='samba-util samba-debug', - init_function='', - internal_module=bld.SAMBA3_IS_STATIC_MODULE('pdb_test'), - enabled=bld.SAMBA3_IS_ENABLED_MODULE('pdb_test')) Property changes on: head/net/samba410/files/patch-examples__pdb__wscript_build ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/samba410/files/patch-source3_rpc__server_mdssvc_mdssvc.c =================================================================== --- head/net/samba410/files/patch-source3_rpc__server_mdssvc_mdssvc.c (revision 505445) +++ head/net/samba410/files/patch-source3_rpc__server_mdssvc_mdssvc.c (nonexistent) @@ -1,15 +0,0 @@ -../source3/rpc_server/mdssvc/mdssvc.c:157:9: error: format specifies type 'unsigned long' but the argument has type 'size_t' (aka 'unsigned int') [-Werror,-Wformat] - dalloc_size(dd)); - ^~~~~~~~~~~~~~~ - ---- source3/rpc_server/mdssvc/mdssvc.c.orig 2019-04-09 01:04:10 UTC -+++ source3/rpc_server/mdssvc/mdssvc.c -@@ -151,7 +151,7 @@ char *mds_dalloc_dump(DALLOC_CTX *dd, in - } - - logstring = talloc_asprintf(dd, -- "%s%s(#%lu): {\n", -+ "%s%s(#%zu): {\n", - tab_string1, - talloc_get_name(dd), - dalloc_size(dd)); Property changes on: head/net/samba410/files/patch-source3_rpc__server_mdssvc_mdssvc.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/samba410/files/patch-third__party_aesni-intel_wscript =================================================================== --- head/net/samba410/files/patch-third__party_aesni-intel_wscript (revision 505445) +++ head/net/samba410/files/patch-third__party_aesni-intel_wscript (nonexistent) @@ -1,33 +0,0 @@ ---- third_party/aesni-intel/wscript.orig 2017-09-17 19:15:34 UTC -+++ third_party/aesni-intel/wscript -@@ -4,14 +4,19 @@ import Utils - - def configure(conf): - if Options.options.accel_aes.lower() == "intelaesni": -- if conf.CHECK_CFLAGS('-Wp,-E,-lang-asm', ''): -- if conf.env['SYSTEM_UNAME_MACHINE'] == 'x86_64': -+ asm_flags = ('-Wp,-E,-lang-asm', '-xassembler-with-cpp') -+ for f in asm_flags: -+ if conf.CHECK_CFLAGS(f, ''): -+ conf.DEFINE('AESNI_INTEL_CFLAGS', f) -+ break -+ if conf.CONFIG_SET('AESNI_INTEL_CFLAGS'): -+ if conf.env['SYSTEM_UNAME_MACHINE'] in ('x86_64', 'amd64'): - print("Compiling with Intel AES instructions") - conf.DEFINE('HAVE_AESNI_INTEL', 1) - else: - raise Utils.WafError('--accel-aes=intelaesni selected and non x86_64 CPU') - else: -- raise Utils.WafError('--accel-aes=intelaesni selected and compiler rejects -Wp,-E,-lang-asm') -+ raise Utils.WafError('--aes-accel=intelaesni selected and compiler rejects ' + str(asm_flags)) - if not conf.CHECK_LDFLAGS('-Wl,-z,noexecstack'): - raise Utils.WafError('--accel-aes=intelaesni selected and linker rejects -z noexecstack') - -@@ -21,6 +26,6 @@ def build(bld): - - bld.SAMBA_LIBRARY('aesni-intel', - source='aesni-intel_asm.c', -- cflags='-Wp,-E,-lang-asm', -+ cflags=bld.CONFIG_GET('AESNI_INTEL_CFLAGS'), - ldflags='-Wl,-z,noexecstack', - private_library=True) Property changes on: head/net/samba410/files/patch-third__party_aesni-intel_wscript ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/samba410/files/patch-glusterfs =================================================================== --- head/net/samba410/files/patch-glusterfs (revision 505445) +++ head/net/samba410/files/patch-glusterfs (nonexistent) @@ -1,31 +0,0 @@ ---- lib/replace/system/filesys.h.orig 2017-12-16 01:37:41 UTC -+++ lib/replace/system/filesys.h -@@ -213,8 +213,10 @@ - this allows us to use a uniform error handling for our xattr - wrappers - */ --#ifndef ENOATTR -+#if !defined(ENOATTR) && defined(ENODATA) - #define ENOATTR ENODATA -+#elif defined(ENOATTR) && !defined(ENODATA) -+#define ENODATA ENOATTR - #endif - - ---- source3/modules/vfs_glusterfs.c.orig 2017-12-23 08:02:15 UTC -+++ source3/modules/vfs_glusterfs.c -@@ -36,12 +36,13 @@ - */ - - #include "includes.h" -+#include "system/filesys.h" -+#include "smbd/globals.h" - #include "smbd/smbd.h" - #include - #include - #include "lib/util/dlinklist.h" - #include "lib/util/tevent_unix.h" --#include "smbd/globals.h" - #include "lib/util/sys_rw.h" - #include "smbprofile.h" - #include "modules/posixacl_xattr.h" Property changes on: head/net/samba410/files/patch-glusterfs ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/samba410/files/0001-Zfs-provision-1.patch =================================================================== --- head/net/samba410/files/0001-Zfs-provision-1.patch (revision 505445) +++ head/net/samba410/files/0001-Zfs-provision-1.patch (revision 505446) @@ -1,321 +1,325 @@ From 2664c997587416a2c8c911a75158485a5c98b70b Mon Sep 17 00:00:00 2001 From: John Hixon Date: Sat, 20 May 2017 04:39:37 +0200 Subject: [PATCH] Zfs provision (#1) Cherry-pick ZFS provisioning code by iXsystems Inc. * Check if sysvol is on filesystem with NFSv4 ACL's (cherry picked from commit ca86f52b78a7b6e7537454a69cf93e7b96210cba) * Only check targetdir if it is defined (I had assumed it was) (cherry picked from commit a29050cb2978ce23e3c04a859340dc2664c77a8a) * Kick samba a little bit into understanding NFSv4 ACL's (cherry picked from commit 1c7542ff4904b729e311e17464ee76582760c219) Signed-off-by: Timur I. Bakeyev --- python/samba/provision/__init__.py | 25 ++++-- source3/lib/sysacls.c | 10 +++ source3/param/loadparm.c | 7 ++ source3/smbd/pysmbd.c | 156 ++++++++++++++++++++++++++++++++++++- 4 files changed, 191 insertions(+), 7 deletions(-) diff --git a/python/samba/provision/__init__.py b/python/samba/provision/__init__.py index 5de986463a5..cd3b91f41b9 100644 --- a/python/samba/provision/__init__.py +++ b/python/samba/provision/__init__.py @@ -1556,19 +1556,24 @@ def setsysvolacl(samdb, netlogon, sysvol, uid, gid, domainsid, dnsdomain, s3conf = s3param.get_context() s3conf.load(lp.configfile) - file = tempfile.NamedTemporaryFile(dir=os.path.abspath(sysvol)) + sysvol_dir = os.path.abspath(sysvol) + + set_simple_acl = smbd.set_simple_acl + if smbd.has_nfsv4_acls(sysvol_dir): + set_simple_acl = smbd.set_simple_nfsv4_acl + + file = tempfile.NamedTemporaryFile(dir=sysvol_dir) try: try: -- smbd.set_simple_acl(file.name, 0755, gid) -+ set_simple_acl(file.name, 0755, gid) +- smbd.set_simple_acl(file.name, 0o755, gid) ++ set_simple_acl(file.name, 0o755, gid) except OSError: - if not smbd.have_posix_acls(): + if not smbd.have_posix_acls() and not smbd.have_nfsv4_acls(): # This clue is only strictly correct for RPM and # Debian-like Linux systems, but hopefully other users # will get enough clue from it. - raise ProvisioningError("Samba was compiled without the posix ACL support that s3fs requires. " + raise ProvisioningError("Samba was compiled without the ACL support that s3fs requires. " "Try installing libacl1-dev or libacl-devel, then re-run configure and make.") - - raise ProvisioningError("Your filesystem or build does not support posix ACLs, which s3fs requires. " + raise ProvisioningError("Your filesystem or build does not support ACLs, which s3fs requires. " "Try the mounting the filesystem with the 'acl' option.") try: smbd.chown(file.name, uid, gid) @@ -1821,6 +1828,9 @@ def provision_fill(samdb, secrets_ldb, logger, names, paths, samdb.transaction_commit() if serverrole == "active directory domain controller": + if targetdir and smbd.have_nfsv4_acls() and smbd.has_nfsv4_acls(targetdir): + smbd.set_nfsv4_defaults() + # Continue setting up sysvol for GPO. This appears to require being # outside a transaction. if not skip_sysvolacl: @@ -2184,6 +2194,9 @@ def provision(logger, session_info, smbconf=None, if not os.path.isdir(paths.netlogon): - os.makedirs(paths.netlogon, 0755) + os.makedirs(paths.netlogon, 0o755) + if smbd.have_nfsv4_acls() and smbd.has_nfsv4_acls(paths.sysvol): + smbd.set_nfsv4_defaults() + if adminpass is None: adminpass = samba.generate_random_password(12, 32) adminpass_generated = True diff --git a/source3/lib/sysacls.c b/source3/lib/sysacls.c index 0bf3c37edfa..786cd39b5bc 100644 --- a/source3/lib/sysacls.c +++ b/source3/lib/sysacls.c @@ -38,6 +38,16 @@ #include "modules/vfs_hpuxacl.h" #endif +/* + * NFSv4 ACL's should be understood and a first class citizen. Work + * needs to be done in librpc/idl/smb_acl.idl for this to occur. + */ +#if defined(HAVE_LIBSUNACL) && defined(FREEBSD) +#if 0 +#include "modules/nfs4_acls.h" +#endif +#endif + #undef DBGC_CLASS #define DBGC_CLASS DBGC_ACLS diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index a2fcc4246c9..4b676897fc1 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -2740,6 +2740,13 @@ static void init_locals(void) } else if (lp_parm_const_string(-1, "posix", "eadb", NULL)) { lp_do_parameter(-1, "vfs objects", "dfs_samba4 acl_xattr posix_eadb"); } else { + /* + * This should only set dfs_samba4 and leave acl_xattr + * to be set later (or zfsacl). The only reason the decision + * can't be made here to load acl_xattr or zfsacl is + * that we don't have access to what the target + * directory is. + */ lp_do_parameter(-1, "vfs objects", "dfs_samba4 acl_xattr"); } } diff --git a/source3/smbd/pysmbd.c b/source3/smbd/pysmbd.c index 63fc5d68c33..f5a536ee186 100644 --- a/source3/smbd/pysmbd.c +++ b/source3/smbd/pysmbd.c -@@ -368,6 +368,20 @@ static SMB_ACL_T make_simple_acl(TALLOC_ +@@ -387,6 +387,20 @@ static SMB_ACL_T make_simple_acl(TALLOC_ return acl; } +static SMB_ACL_T make_simple_nfsv4_acl(TALLOC_CTX *mem_ctx, + gid_t gid, + mode_t chmod_mode) +{ + /* + * This function needs to create an NFSv4 ACL. Currently, the only way + * to do so is to use the operating system interface, or to use the + * functions in source3/modules/nfs4_acls.c. These seems ugly and + * hacky. NFSv4 ACL's should be a first class citizen and + * librpc/idl/smb_acl.idl should be modified accordingly. + */ + return NULL; +} + /* set a simple ACL on a file, as a test */ -@@ -413,6 +427,53 @@ static PyObject *py_smbd_set_simple_acl( +@@ -432,6 +446,57 @@ static PyObject *py_smbd_set_simple_acl( + Py_RETURN_NONE; } - /* ++ ++/* + set a simple NFSv4 ACL on a file, as a test + */ +static PyObject *py_smbd_set_simple_nfsv4_acl(PyObject *self, PyObject *args, PyObject *kwargs) +{ + const char * const kwnames[] = { "fname", "mode", "gid", "service", NULL }; + char *fname, *service = NULL; + int ret; + int mode, gid = -1; + SMB_ACL_T acl; + TALLOC_CTX *frame; + connection_struct *conn; + + if (!PyArg_ParseTupleAndKeywords(args, kwargs, "si|iz", + discard_const_p(char *, kwnames), + &fname, &mode, &gid, &service)) + return NULL; + + frame = talloc_stackframe(); + + acl = make_simple_nfsv4_acl(frame, gid, mode); + if (acl == NULL) { + TALLOC_FREE(frame); + return NULL; + } + -+ conn = get_conn(frame, service); ++ conn = get_conn_tos(service, NULL); + if (!conn) { ++ TALLOC_FREE(frame); + return NULL; + } + + /* + * SMB_ACL_TYPE_ACCESS -> ACL_TYPE_ACCESS -> Not valid for NFSv4 ACL + */ + ret = 0; + ++ /* ret = set_sys_acl_conn(fname, SMB_ACL_TYPE_ACCESS, acl, conn); */ ++ + if (ret != 0) { + TALLOC_FREE(frame); + errno = ret; + return PyErr_SetFromErrno(PyExc_OSError); + } + + TALLOC_FREE(frame); + + Py_RETURN_NONE; +} + -+/* + /* chown a file */ - static PyObject *py_smbd_chown(PyObject *self, PyObject *args, PyObject *kwargs) -@@ -519,7 +580,7 @@ static PyObject *py_smbd_unlink(PyObject +@@ -540,7 +605,7 @@ static PyObject *py_smbd_unlink(PyObject } /* - check if we have ACL support + check if we have POSIX.1e ACL support */ static PyObject *py_smbd_have_posix_acls(PyObject *self) { -@@ -530,6 +591,86 @@ static PyObject *py_smbd_have_posix_acls +@@ -551,6 +616,86 @@ static PyObject *py_smbd_have_posix_acls #endif } +static PyObject *py_smbd_has_posix_acls(PyObject *self, PyObject *args, PyObject *kwargs) +{ + const char * const kwnames[] = { "path", NULL }; + char *path = NULL; + TALLOC_CTX *frame; + struct statfs fs; + int ret = false; + + frame = talloc_stackframe(); + + if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s|z", + discard_const_p(char *, kwnames), &path)) { + TALLOC_FREE(frame); + return NULL; + } + + if (statfs(path, &fs) != 0) { + TALLOC_FREE(frame); + return NULL; + } + + if (fs.f_flags & MNT_ACLS) + ret = true; + + TALLOC_FREE(frame); + return PyBool_FromLong(ret); +} + +/* + check if we have NFSv4 ACL support + */ +static PyObject *py_smbd_have_nfsv4_acls(PyObject *self) +{ +#ifdef HAVE_LIBSUNACL + return PyBool_FromLong(true); +#else + return PyBool_FromLong(false); +#endif +} + +static PyObject *py_smbd_has_nfsv4_acls(PyObject *self, PyObject *args, PyObject *kwargs) +{ + const char * const kwnames[] = { "path", NULL }; + char *path = NULL; + TALLOC_CTX *frame; + struct statfs fs; + int ret = false; + + frame = talloc_stackframe(); + + if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s|z", + discard_const_p(char *, kwnames), &path)) { + TALLOC_FREE(frame); + return NULL; + } + + if (statfs(path, &fs) != 0) { + TALLOC_FREE(frame); + return NULL; + } + + if (fs.f_flags & MNT_NFS4ACLS) + ret = true; + + TALLOC_FREE(frame); + return PyBool_FromLong(ret); +} + + +static PyObject *py_smbd_set_nfsv4_defaults(PyObject *self) +{ + /* + * This should really be done in source3/param/loadparm.c + */ +#if defined(HAVE_LIBSUNACL) && defined(FREEBSD) + lp_do_parameter(-1, "vfs objects", "dfs_samba4 zfsacl"); +#endif + Py_RETURN_NONE; +} + /* set the NT ACL on a file */ -@@ -717,9 +858,24 @@ static PyMethodDef py_smbd_methods[] = { +@@ -843,9 +988,24 @@ static PyMethodDef py_smbd_methods[] = { { "have_posix_acls", (PyCFunction)py_smbd_have_posix_acls, METH_NOARGS, NULL }, + { "has_posix_acls", + (PyCFunction)py_smbd_has_posix_acls, METH_VARARGS|METH_KEYWORDS, + NULL }, + { "have_nfsv4_acls", + (PyCFunction)py_smbd_have_nfsv4_acls, METH_NOARGS, + NULL }, + { "has_nfsv4_acls", + (PyCFunction)py_smbd_has_nfsv4_acls, METH_VARARGS|METH_KEYWORDS, + NULL }, + { "set_nfsv4_defaults", + (PyCFunction)py_smbd_set_nfsv4_defaults, METH_NOARGS, + NULL }, { "set_simple_acl", (PyCFunction)py_smbd_set_simple_acl, METH_VARARGS|METH_KEYWORDS, NULL }, + { "set_simple_nfsv4_acl", + (PyCFunction)py_smbd_set_simple_nfsv4_acl, METH_VARARGS|METH_KEYWORDS, + NULL }, { "set_nt_acl", (PyCFunction)py_smbd_set_nt_acl, METH_VARARGS|METH_KEYWORDS, NULL }, -- 2.14.2 Index: head/net/samba410/files/man/ctdb-etcd.7 =================================================================== --- head/net/samba410/files/man/ctdb-etcd.7 (revision 505445) +++ head/net/samba410/files/man/ctdb-etcd.7 (nonexistent) @@ -1,106 +0,0 @@ -'\" t -.\" Title: ctdb-etcd -.\" Author: -.\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 11/20/2017 -.\" Manual: CTDB - clustered TDB database -.\" Source: ctdb -.\" Language: English -.\" -.TH "CTDB\-ETCD" "7" "11/20/2017" "ctdb" "CTDB \- clustered TDB database" -.\" ----------------------------------------------------------------- -.\" * 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" -ctdb-etcd \- CTDB etcd integration -.SH "SYNOPSIS" -.HP \w'\fBctdb_etcd_lock\fR\ 'u -\fBctdb_etcd_lock\fR -.SH "DESCRIPTION" -.PP -ctdb_etcd_lock is intended to be run as a mutex helper for CTDB\&. It will try to connect to an existing etcd cluster and grab a lock in that cluster to function as CTDB\*(Aqs recovery lock\&. Please see -\fIctdb/doc/cluster_mutex_helper\&.txt\fR -for details on the mutex helper API\&. To use this, include the following line in your CTDB config file: -.sp -.if n \{\ -.RS 4 -.\} -.nf -CTDB_RECOVERY_LOCK="!/usr/local/usr/libexec/ctdb/ctdb_etcd_lock" - -.fi -.if n \{\ -.RE -.\} -.PP -You can also pass "\-v", "\-vv", or "\-vvv" to include verbose output in the CTDB log\&. Additional "v"s indicate increases in verbosity\&. -.PP -This mutex helper expects the system Python interpreter to have access to the etcd Python module\&. It also expects an etcd cluster to be configured and running\&. To integrate with this, there is an optional config file of the following format: -.sp -.if n \{\ -.RS 4 -.\} -.nf -key = value - -.fi -.if n \{\ -.RE -.\} -.PP -The following configuration parameters (and their defaults) are defined for use by ctdb_etcd_lock: -.sp -.if n \{\ -.RS 4 -.\} -.nf -port = 2379 # connecting port for the etcd cluster -lock_ttl = 9 # seconds for TTL -refresh = 2 # seconds between attempts to maintain lock -locks_dir = _ctdb # where to store CTDB locks in etcd - # The final etcd directory for any given lock looks like: - # /_locks/{locks_dir}/{netbios name}/ - -.fi -.if n \{\ -.RE -.\} -.PP -In addition, any keyword parameter that can be used to configure an etcd client may be specified and modified here\&. For more documentation on these parameters, see here: https://github\&.com/jplana/python\-etcd/ -.SH "SEE ALSO" -.PP -\fBctdb\fR(7), -\fBctdbd\fR(1), -\m[blue]\fB\%http://ctdb.samba.org/\fR\m[] -.SH "AUTHOR" -.br -.PP -This documentation was written by Jose A\&. Rivera -.SH "COPYRIGHT" -.br -Copyright \(co 2016 Jose A. Rivera -.br -.PP -This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version\&. -.PP -This program 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 General Public License for more details\&. -.PP -You should have received a copy of the GNU General Public License along with this program; if not, see -\m[blue]\fB\%http://www.gnu.org/licenses\fR\m[]\&. -.sp Property changes on: head/net/samba410/files/man/ctdb-etcd.7 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/samba410/files/man/samba_gpoupdate.8 =================================================================== --- head/net/samba410/files/man/samba_gpoupdate.8 (revision 505445) +++ head/net/samba410/files/man/samba_gpoupdate.8 (nonexistent) @@ -1,113 +0,0 @@ -'\" t -.\" Title: SAMBA_GPOUPDATE -.\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.76.1 -.\" Date: 2017-07-11 -.\" Manual: System Administration tools -.\" Source: Samba 4.8.0 -.\" Language: English -.\" -.TH "SAMBA_GPOUPDATE" "8" "2017\-07\-11" "Samba 4\&.8\&.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" -samba_gpoupdate \- apply group policy -.SH "SYNOPSIS" -.HP \w'\fBsamba_gpoupdate\fR\ 'u -\fBsamba_gpoupdate\fR -.HP \w'\fBsamba_gpoupdate\fR\ 'u -\fBsamba_gpoupdate\fR [\fIoptions\fR] -.SH "DESCRIPTION" -.PP -This tool is part of the -\fBsamba\fR(1) -suite\&. -.PP -\fBsamba_gpoupdate\fR -a script for applying and unapplying Group Policy\&. Group Policy application is experimental\&. Currently this applies password policies (minimum/maximum password age, minimum password length, and password complexity) and kerberos policies (user/service ticket lifetime and renew lifetime)\&. -.SH "OPTIONS" -.PP -\fB\-h\fR, -\fB\-\-help\fR -show this help message and exit -.PP -\fB\-H \fRURL, -\fB\-\-url\fR=\fIURL\fR -URL for the samdb -.PP -\fB\-X\fR, -\fB\-\-unapply\fR -Unapply Group Policy -.PP -Samba Common Options: -.PP -\fB\-s \fRFILE, -\fB\-\-configfile\fR=\fIFILE\fR -Configuration file -.PP -\fB\-d \fRDEBUGLEVEL, -\fB\-\-debuglevel\fR=\fIDEBUGLEVEL\fR -debug level -.PP -\fB\-\-option\fR=\fIOPTION\fR -set smb\&.conf option from command line -.PP -\fB\-\-realm\fR=\fIREALM\fR -set the realm name -.PP -Version Options: -.PP -\fB\-V\fR, -\fB\-\-version\fR -Display version number -.PP -Credentials Options: -.PP -\fB\-\-simple\-bind\-dn\fR=\fIDN\fR -DN to use for a simple bind -.PP -\fB\-\-password\fR=\fIPASSWORD\fR -Password -.PP -\fB\-U \fRUSERNAME, -\fB\-\-username\fR=\fIUSERNAME\fR -Username -.PP -\fB\-W \fRWORKGROUP, -\fB\-\-workgroup\fR=\fIWORKGROUP\fR -Workgroup -.PP -\fB\-N\fR, -\fB\-\-no\-pass\fR -Don\*(Aqt ask for a password -.PP -\fB\-k \fRKERBEROS, -\fB\-\-kerberos\fR=\fIKERBEROS\fR -Use Kerberos -.PP -\fB\-\-ipaddress\fR=\fIIPADDRESS\fR -IP address of server -.PP -\fB\-P\fR, -\fB\-\-machine\-pass\fR -Use stored machine account password -.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\&. Property changes on: head/net/samba410/files/man/samba_gpoupdate.8 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/samba410/files/man/ctdb_mutex_ceph_rados_helper.7 =================================================================== --- head/net/samba410/files/man/ctdb_mutex_ceph_rados_helper.7 (revision 505445) +++ head/net/samba410/files/man/ctdb_mutex_ceph_rados_helper.7 (nonexistent) @@ -1,79 +0,0 @@ -'\" t -.\" Title: Ceph RADOS Mutex -.\" Author: -.\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 11/20/2017 -.\" Manual: CTDB - clustered TDB database -.\" Source: ctdb -.\" Language: English -.\" -.TH "CEPH RADOS MUTEX" "7" "11/20/2017" "ctdb" "CTDB \- clustered TDB database" -.\" ----------------------------------------------------------------- -.\" * 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" -ctdb_mutex_ceph_rados_helper \- Ceph RADOS cluster mutex helper -.SH "DESCRIPTION" -.PP -ctdb_mutex_ceph_rados_helper can be used as a recovery lock provider for CTDB\&. When configured, split brain avoidance during CTDB recovery will be handled using locks against an object located in a Ceph RADOS pool\&. To enable this functionality, include the following line in your CTDB config file: -.sp -.if n \{\ -.RS 4 -.\} -.nf -CTDB_RECOVERY_LOCK="!ctdb_mutex_ceph_rados_helper [Cluster] [User] [Pool] [Object]" - -Cluster: Ceph cluster name (e\&.g\&. ceph) -User: Ceph cluster user name (e\&.g\&. client\&.admin) -Pool: Ceph RADOS pool name -Object: Ceph RADOS object name - -.fi -.if n \{\ -.RE -.\} -.PP -The Ceph cluster -\fICluster\fR -must be up and running, with a configuration, and keyring file for -\fIUser\fR -located in a librados default search path (e\&.g\&. /etc/ceph/)\&. -\fIPool\fR -must already exist\&. -.SH "SEE ALSO" -.PP -\fBctdb\fR(7), -\fBctdbd\fR(1), -\m[blue]\fB\%http://ctdb.samba.org/\fR\m[] -.SH "AUTHOR" -.br -.PP -This documentation was written by David Disseldorp -.SH "COPYRIGHT" -.br -Copyright \(co 2016 David Disseldorp -.br -.PP -This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version\&. -.PP -This program 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 General Public License for more details\&. -.PP -You should have received a copy of the GNU General Public License along with this program; if not, see -\m[blue]\fB\%http://www.gnu.org/licenses\fR\m[]\&. -.sp Property changes on: head/net/samba410/files/man/ctdb_mutex_ceph_rados_helper.7 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/samba410/files/man/ctdbd.conf.5 =================================================================== --- head/net/samba410/files/man/ctdbd.conf.5 (revision 505445) +++ head/net/samba410/files/man/ctdbd.conf.5 (nonexistent) @@ -1,1130 +0,0 @@ -'\" t -.\" Title: ctdbd.conf -.\" Author: -.\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 11/20/2017 -.\" Manual: CTDB - clustered TDB database -.\" Source: ctdb -.\" Language: English -.\" -.TH "CTDBD\&.CONF" "5" "11/20/2017" "ctdb" "CTDB \- clustered TDB database" -.\" ----------------------------------------------------------------- -.\" * 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" -ctdbd.conf \- CTDB daemon configuration file -.SH "DESCRIPTION" -.PP -This file contains CTDB configuration variables that are affect the operation of CTDB\&. The default location of this file is -/usr/local/etc/ctdb/ctdbd\&.conf\&. -.PP -This file is a shell script (see -\fBsh\fR(1)) but is usually limited to simple variable assignments and shell\-style comments\&. -.PP -CTDB configuration variables are grouped into several categories below\&. -.PP -Variables defined in this document can also be set in a distribution\-specific configuration file such as -/etc/sysconfig/ctdb -(Red Hat) or -/etc/default/ctdb -(Debian)\&. However, these files should be reserved for variables used by the initscript\&. A historical alternative is -/usr/local/etc/ctdb/sysconfig/ctdb -\- this is deprecated\&. -.SH "INITSCRIPT CONFIGURATION" -.PP -Some options must be available to the initscript so they need to be set in the distribution\-specific initscript configuration, such as -/etc/sysconfig/ctdb -or -/etc/default/ctdb\&. -.PP -CTDB_PIDFILE=\fIFILENAME\fR -.RS 4 -FILENAME is the name of the file used to contain the process ID (PID) of the main CTDB daemon when it is running\&. This is passed from the initscript to -\fBctdbd_wrapper\fR(1)\&. -.sp -Default is -/usr/local/var/run/ctdb/ctdbd\&.pid\&. Corresponds to -\fB\-\-pidfile\fR\&. -.RE -.SH "GLOBAL CONFIGURATION" -.PP -These options may be used in the initscripts, daemon and scripts\&. -.PP -CTDB_BASE=\fIDIRECTORY\fR -.RS 4 -DIRECTORY containing CTDB scripts and configuration files\&. -.RE -.SH "DAEMON CONFIGURATION" -.PP -Variables in this section are processed by -\fBctdbd_wrapper\fR(1) -and are converted into command\-line arguments to -\fBctdbd\fR(1)\&. Correspondence with -\fBctdbd\fR(1) -options is shown for each variable\&. The the documentation for the relevant options for more details\&. -.PP -Many of these variables are also used by event scripts\&. -.PP -CTDB_CAPABILITY_LMASTER=yes|no -.RS 4 -Defaults to yes\&. Corresponds to -\fB\-\-no\-lmaster\fR\&. -.RE -.PP -CTDB_CAPABILITY_RECMASTER=yes|no -.RS 4 -Defaults to yes\&. Corresponds to -\fB\-\-no\-recmaster\fR\&. -.RE -.PP -CTDB_DBDIR=\fIDIRECTORY\fR -.RS 4 -Defaults to -/usr/local/var/lib/ctdb\&. -.sp -Apart from a DIRECTORY, this can take a special value of the form -\fBtmpfs\fR[:\fIOPTIONS\fR]\&. OPTIONS is a comma\-separated list of any permissible options to the tmpfs filesystem\&. The only pre\-specified default is -\fBmode=700\fR, which can overridden by specifying -\fBmode\fR -in OPTIONS\&. It probably makes sense to specify a maximum -\fBsize\fR\&. -.sp -Corresponds to -\fB\-\-dbdir\fR\&. -.RE -.PP -CTDB_DBDIR_PERSISTENT=\fIDIRECTORY\fR -.RS 4 -Defaults to -/usr/local/var/lib/ctdb/persistent\&. -.sp -Corresponds to -\fB\-\-dbdir\-persistent\fR\&. -.RE -.PP -CTDB_DBDIR_STATE=\fIDIRECTORY\fR -.RS 4 -Defaults to -/usr/local/var/lib/ctdb/state\&. -.sp -Corresponds to -\fB\-\-dbdir\-state\fR\&. -.RE -.PP -CTDB_DEBUGLEVEL=\fIDEBUGLEVEL\fR -.RS 4 -Default is NOTICE\&. Corresponds to -\fB\-d\fR -or -\fB\-\-debug\fR\&. -.RE -.PP -CTDB_EVENT_SCRIPT_DIR=\fIDIRECTORY\fR -.RS 4 -Default is -\fICTDB_BASE\fR/events\&.d, so usually -/usr/local/etc/ctdb/events\&.d\&. Corresponds to -\fB\-\-event\-script\-dir\fR\&. -.RE -.PP -CTDB_LOGGING=\fISTRING\fR -.RS 4 -STRING specifies where ctdbd will write its log\&. The default is file:/usr/local/var/log/log\&.ctdb\&. Corresponds to -\fB\-\-logging\fR\&. -.sp -Valid values are: -.PP -file:\fIFILENAME\fR -.RS 4 -FILENAME where ctdbd will write its log\&. This is usually -/usr/local/var/log/log\&.ctdb\&. -.RE -.PP -syslog[:\fIMETHOD\fR] -.RS 4 -CTDB will log to syslog\&. By default this will use the syslog(3) API\&. -.sp -If METHOD is specified then it specifies an extension that causes logging to be done in a non\-blocking fashion\&. This can be useful under heavy loads that might cause the syslog daemon to dequeue messages too slowly, which would otherwise cause CTDB to block when logging\&. METHOD must be one of: -.PP -nonblocking -.RS 4 -CTDB will log to syslog via -/dev/log -in non\-blocking mode\&. -.RE -.PP -udp -.RS 4 -CTDB will log to syslog via UDP to localhost:514\&. The syslog daemon must be configured to listen on (at least) localhost:514\&. Most implementations will log the messages against hostname "localhost" \- this is a limit of the implementation for compatibility with more syslog daemon implementations\&. -.RE -.PP -udp\-rfc5424 -.RS 4 -As with "udp" but messages are sent in RFC5424 format\&. This method will log the correct hostname but is not as widely implemented in syslog daemons\&. -.RE -.RE -.RE -.PP -CTDB_NODES=\fIFILENAME\fR -.RS 4 -Default is -\fICTDB_BASE\fR/nodes, so usually -/usr/local/etc/ctdb/nodes\&. Corresponds to -\fB\-\-nlist\fR\&. -.RE -.PP -CTDB_NOSETSCHED=yes|no -.RS 4 -Defaults to no\&. Corresponds to -\fB\-\-nosetsched\fR\&. -.sp -Usually CTDB runs with real\-time priority\&. If you are running CTDB on a platform that does not support real\-time priority, you can set this\&. -.RE -.PP -CTDB_NOTIFY_SCRIPT=\fIFILENAME\fR -.RS 4 -No default, usually -/usr/local/etc/ctdb/notify\&.sh\&. Corresponds to -\fB\-\-notification\-script\fR\&. -.RE -.PP -CTDB_MAX_PERSISTENT_CHECK_ERRORS=\fINUM\fR -.RS 4 -Default 0\&. Corresponds to -\fB\-\-max\-persistent\-check\-errors\fR\&. -.RE -.PP -CTDB_NODE_ADDRESS=\fIIPADDR\fR -.RS 4 -IPADDR is the private IP address that ctdbd will bind to\&. Corresponds to -\fB\-\-listen\fR\&. -.sp -By default ctdbd will select the first address from the nodes list that in can bind to\&. See also -CTDB_NODES\&. -.sp -This option is only required when automatic address detection can not be used\&. This can be the case when running multiple ctdbd daemons/nodes on the same physical host (usually for testing), using InfiniBand for the private network or on Linux when sysctl net\&.ipv4\&.ip_nonlocal_bind=1\&. -.RE -.PP -CTDB_PUBLIC_ADDRESSES=\fIFILENAME\fR -.RS 4 -No default, usually -/usr/local/etc/ctdb/public_addresses\&. Corresponds to -\fB\-\-public\-addresses\fR\&. -.RE -.PP -CTDB_PUBLIC_INTERFACE=\fIINTERFACE\fR -.RS 4 -No default\&. Corresponds to -\fB\-\-public\-interface\fR\&. -.RE -.PP -CTDB_RECOVERY_LOCK=\fILOCK\fR -.RS 4 -LOCK specifies the cluster\-wide mutex used to detect and prevent a partitioned cluster (or "split brain")\&. -.sp -No default, but the default configuration file specifies -/some/place/on/shared/storage, which should be change to a useful value\&. Corresponds to -\fB\-\-reclock\fR\&. -.sp -For information about the recovery lock please see the -RECOVERY LOCK -section in -\fBctdb\fR(7)\&. -.RE -.PP -CTDB_SCRIPT_LOG_LEVEL=\fIDEBUGLEVEL\fR -.RS 4 -Defaults to ERR\&. Corresponds to -\fB\-\-script\-log\-level\fR\&. -.RE -.PP -CTDB_SOCKET=\fIFILENAME\fR -.RS 4 -Defaults to -/usr/local/var/run/ctdb/ctdbd\&.socket\&. Corresponds to -\fB\-\-socket\fR\&. -.sp -If you change this then you probably want to set this in root\*(Aqs environment (perhaps in a file in -/etc/profile\&.d) so that you can use the -\fBctdb\fR(1) -command in a straightforward manner\&. -.RE -.PP -CTDB_START_AS_DISABLED=yes|no -.RS 4 -Default is no\&. Corresponds to -\fB\-\-start\-as\-disabled\fR\&. -.RE -.PP -CTDB_START_AS_STOPPED=yes|no -.RS 4 -Default is no\&. Corresponds to -\fB\-\-start\-as\-stopped\fR\&. -.RE -.PP -CTDB_TRANSPORT=tcp|infiniband -.RS 4 -Defaults to tcp\&. Corresponds to -\fB\-\-transport\fR\&. -.RE -.PP -While the following variables do not translate into daemon options they are used by -\fBctdbd_wrapper\fR(1) -when starting and stopping -\fBctdbd\fR(1)\&. -.PP -CTDB_SHUTDOWN_TIMEOUT=\fINUM\fR -.RS 4 -NUM is the number of seconds to wait for -\fBctdbd\fR(1) -to shut down gracefully before giving up and killing it\&. -.sp -Defaults is 30\&. -.RE -.PP -CTDB_STARTUP_TIMEOUT=\fINUM\fR -.RS 4 -NUM is the number of seconds to wait for -\fBctdbd\fR(1) -complete early initialisation up to a point where it is unlikely to abort\&. If -\fBctdbd\fR -doesn\*(Aqt complete the "setup" event before this timeout then it is killed\&. -.sp -Defaults is 10\&. -.RE -.SH "NETWORK CONFIGURATION" -.SS "NAT GATEWAY" -.PP -NAT gateway is used to configure fallback routing for nodes when they do not host any public IP addresses\&. For example, it allows unhealthy nodes to reliably communicate with external infrastructure\&. One node in a NAT gateway group will be designated as the NAT gateway master node and other (slave) nodes will be configured with fallback routes via the NAT gateway master node\&. For more information, see the -NAT GATEWAY -section in -\fBctdb\fR(7)\&. -.PP -CTDB_NATGW_DEFAULT_GATEWAY=\fIIPADDR\fR -.RS 4 -IPADDR is an alternate network gateway to use on the NAT gateway master node\&. If set, a fallback default route is added via this network gateway\&. -.sp -No default\&. Setting this variable is optional \- if not set that no route is created on the NAT gateway master node\&. -.RE -.PP -CTDB_NATGW_NODES=\fIFILENAME\fR -.RS 4 -FILENAME contains the list of nodes that belong to the same NAT gateway group\&. -.sp -File format: -.sp -.if n \{\ -.RS 4 -.\} -.nf -\fIIPADDR\fR [slave\-only] - -.fi -.if n \{\ -.RE -.\} -.sp -IPADDR is the private IP address of each node in the NAT gateway group\&. -.sp -If "slave\-only" is specified then the corresponding node can not be the NAT gateway master node\&. In this case -\fICTDB_NATGW_PUBLIC_IFACE\fR -and -\fICTDB_NATGW_PUBLIC_IP\fR -are optional and unused\&. -.sp -No default, usually -/usr/local/etc/ctdb/natgw_nodes -when enabled\&. -.RE -.PP -CTDB_NATGW_PRIVATE_NETWORK=\fIIPADDR/MASK\fR -.RS 4 -IPADDR/MASK is the private sub\-network that is internally routed via the NAT gateway master node\&. This is usually the private network that is used for node addresses\&. -.sp -No default\&. -.RE -.PP -CTDB_NATGW_PUBLIC_IFACE=\fIIFACE\fR -.RS 4 -IFACE is the network interface on which the CTDB_NATGW_PUBLIC_IP will be configured\&. -.sp -No default\&. -.RE -.PP -CTDB_NATGW_PUBLIC_IP=\fIIPADDR/MASK\fR -.RS 4 -IPADDR/MASK indicates the IP address that is used for outgoing traffic (originating from CTDB_NATGW_PRIVATE_NETWORK) on the NAT gateway master node\&. This -\fImust not\fR -be a configured public IP address\&. -.sp -No default\&. -.RE -.PP -CTDB_NATGW_STATIC_ROUTES=\fIIPADDR/MASK[@GATEWAY]\fR \&.\&.\&. -.RS 4 -Each IPADDR/MASK identifies a network or host to which NATGW should create a fallback route, instead of creating a single default route\&. This can be used when there is already a default route, via an interface that can not reach required infrastructure, that overrides the NAT gateway default route\&. -.sp -If GATEWAY is specified then the corresponding route on the NATGW master node will be via GATEWAY\&. Such routes are created even if -\fICTDB_NATGW_DEFAULT_GATEWAY\fR -is not specified\&. If GATEWAY is not specified for some networks then routes are only created on the NATGW master node for those networks if -\fICTDB_NATGW_DEFAULT_GATEWAY\fR -is specified\&. -.sp -This should be used with care to avoid causing traffic to unnecessarily double\-hop through the NAT gateway master, even when a node is hosting public IP addresses\&. Each specified network or host should probably have a corresponding automatically created link route or static route to avoid this\&. -.sp -No default\&. -.RE -.sp -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.br -.ps +1 -\fBExample\fR -.RS 4 -.sp -.if n \{\ -.RS 4 -.\} -.nf -CTDB_NATGW_NODES=/usr/local/etc/ctdb/natgw_nodes -CTDB_NATGW_PRIVATE_NETWORK=192\&.168\&.1\&.0/24 -CTDB_NATGW_DEFAULT_GATEWAY=10\&.0\&.0\&.1 -CTDB_NATGW_PUBLIC_IP=10\&.0\&.0\&.227/24 -CTDB_NATGW_PUBLIC_IFACE=eth0 - -.fi -.if n \{\ -.RE -.\} -.PP -A variation that ensures that infrastructure (ADS, DNS, \&.\&.\&.) directly attached to the public network (10\&.0\&.0\&.0/24) is always reachable would look like this: -.sp -.if n \{\ -.RS 4 -.\} -.nf -CTDB_NATGW_NODES=/usr/local/etc/ctdb/natgw_nodes -CTDB_NATGW_PRIVATE_NETWORK=192\&.168\&.1\&.0/24 -CTDB_NATGW_PUBLIC_IP=10\&.0\&.0\&.227/24 -CTDB_NATGW_PUBLIC_IFACE=eth0 -CTDB_NATGW_STATIC_ROUTES=10\&.0\&.0\&.0/24 - -.fi -.if n \{\ -.RE -.\} -.PP -Note that -\fICTDB_NATGW_DEFAULT_GATEWAY\fR -is not specified\&. -.RE -.SS "POLICY ROUTING" -.PP -A node running CTDB may be a component of a complex network topology\&. In particular, public addresses may be spread across several different networks (or VLANs) and it may not be possible to route packets from these public addresses via the system\*(Aqs default route\&. Therefore, CTDB has support for policy routing via the -13\&.per_ip_routing -eventscript\&. This allows routing to be specified for packets sourced from each public address\&. The routes are added and removed as CTDB moves public addresses between nodes\&. -.PP -For more information, see the -POLICY ROUTING -section in -\fBctdb\fR(7)\&. -.PP -CTDB_PER_IP_ROUTING_CONF=\fIFILENAME\fR -.RS 4 -FILENAME contains elements for constructing the desired routes for each source address\&. -.sp -The special FILENAME value -\fB__auto_link_local__\fR -indicates that no configuration file is provided and that CTDB should generate reasonable link\-local routes for each public IP address\&. -.sp -File format: -.sp -.if n \{\ -.RS 4 -.\} -.nf -\fIIPADDR\fR \fIDEST\-IPADDR/MASK\fR [\fIGATEWAY\-IPADDR\fR] - -.fi -.if n \{\ -.RE -.\} -.sp -No default, usually -/usr/local/etc/ctdb/policy_routing -when enabled\&. -.RE -.PP -CTDB_PER_IP_ROUTING_RULE_PREF=\fINUM\fR -.RS 4 -NUM sets the priority (or preference) for the routing rules that are added by CTDB\&. -.sp -This should be (strictly) greater than 0 and (strictly) less than 32766\&. A priority of 100 is recommended, unless this conflicts with a priority already in use on the system\&. See -\fBip\fR(8), for more details\&. -.RE -.PP -CTDB_PER_IP_ROUTING_TABLE_ID_LOW=\fILOW\-NUM\fR, CTDB_PER_IP_ROUTING_TABLE_ID_HIGH=\fIHIGH\-NUM\fR -.RS 4 -CTDB determines a unique routing table number to use for the routing related to each public address\&. LOW\-NUM and HIGH\-NUM indicate the minimum and maximum routing table numbers that are used\&. -.sp -\fBip\fR(8) -uses some reserved routing table numbers below 255\&. Therefore, CTDB_PER_IP_ROUTING_TABLE_ID_LOW should be (strictly) greater than 255\&. -.sp -CTDB uses the standard file -/etc/iproute2/rt_tables -to maintain a mapping between the routing table numbers and labels\&. The label for a public address -\fIADDR\fR -will look like ctdb\&.\fIaddr\fR\&. This means that the associated rules and routes are easy to read (and manipulate)\&. -.sp -No default, usually 1000 and 9000\&. -.RE -.sp -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.br -.ps +1 -\fBExample\fR -.RS 4 -.sp -.if n \{\ -.RS 4 -.\} -.nf -CTDB_PER_IP_ROUTING_CONF=/usr/local/etc/ctdb/policy_routing -CTDB_PER_IP_ROUTING_RULE_PREF=100 -CTDB_PER_IP_ROUTING_TABLE_ID_LOW=1000 -CTDB_PER_IP_ROUTING_TABLE_ID_HIGH=9000 - -.fi -.if n \{\ -.RE -.\} -.RE -.SS "LVS" -.PP -For a general description see the -LVS -section in -\fBctdb\fR(7)\&. -.sp -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.br -.ps +1 -\fBEventscript\fR -.RS 4 -.RS 4 -91\&.lvs -.RE -.RE -.PP -CTDB_LVS_NODES=\fIFILENAME\fR -.RS 4 -FILENAME contains the list of nodes that belong to the same LVS group\&. -.sp -File format: -.sp -.if n \{\ -.RS 4 -.\} -.nf -\fIIPADDR\fR [slave\-only] - -.fi -.if n \{\ -.RE -.\} -.sp -IPADDR is the private IP address of each node in the LVS group\&. -.sp -If "slave\-only" is specified then the corresponding node can not be the LVS master node\&. In this case -\fICTDB_LVS_PUBLIC_IFACE\fR -and -\fICTDB_LVS_PUBLIC_IP\fR -are optional and unused\&. -.sp -No default, usually -/usr/local/etc/ctdb/lvs_nodes -when enabled\&. -.RE -.PP -CTDB_LVS_PUBLIC_IFACE=\fIINTERFACE\fR -.RS 4 -INTERFACE is the network interface that clients will use to connection to -\fICTDB_LVS_PUBLIC_IP\fR\&. This is optional for slave\-only nodes\&. No default\&. -.RE -.PP -CTDB_LVS_PUBLIC_IP=\fIIPADDR\fR -.RS 4 -CTDB_LVS_PUBLIC_IP is the LVS public address\&. No default\&. -.RE -.SS "MISCELLANEOUS NETWORK CONFIGURATION" -.PP -CTDB_PARTIALLY_ONLINE_INTERFACES=yes|no -.RS 4 -Whether one or more offline interfaces should cause a monitor event to fail if there are other interfaces that are up\&. If this is "yes" and a node has some interfaces that are down then -\fBctdb status\fR -will display the node as "PARTIALLYONLINE"\&. -.sp -Note that CTDB_PARTIALLY_ONLINE_INTERFACES=yes is incompatible with NAT gateway, since NAT gateway relies on the interface configured by CTDB_NATGW_PUBLIC_IFACE to be up\&. -.sp -Default is "no"\&. -.RE -.SH "SERVICE CONFIGURATION" -.PP -CTDB can be configured to manage and/or monitor various NAS (and other) services via its eventscripts\&. -.PP -In the simplest case CTDB will manage a service\&. This means the service will be started and stopped along with CTDB, CTDB will monitor the service and CTDB will do any required reconfiguration of the service when public IP addresses are failed over\&. -.SS "SAMBA" -.sp -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.br -.ps +1 -\fBEventscripts\fR -.RS 4 -.RS 4 -49\&.winbind -.RE -.RS 4 -50\&.samba -.RE -.RE -.PP -CTDB_MANAGES_SAMBA=yes|no -.RS 4 -Should CTDB manage Samba? -.sp -Default is no\&. -.RE -.PP -CTDB_MANAGES_WINBIND=yes|no -.RS 4 -Should CTDB manage Winbind? -.sp -Default is no\&. -.RE -.PP -CTDB_SAMBA_CHECK_PORTS=\fIPORT\-LIST\fR -.RS 4 -When monitoring Samba, check TCP ports in space\-separated PORT\-LIST\&. -.sp -Default is to monitor ports that Samba is configured to listen on\&. -.RE -.PP -CTDB_SAMBA_SKIP_SHARE_CHECK=yes|no -.RS 4 -As part of monitoring, should CTDB skip the check for the existence of each directory configured as share in Samba\&. This may be desirable if there is a large number of shares\&. -.sp -Default is no\&. -.RE -.PP -CTDB_SERVICE_NMB=\fISERVICE\fR -.RS 4 -Distribution specific SERVICE for managing nmbd\&. -.sp -Default is distribution\-dependant\&. -.RE -.PP -CTDB_SERVICE_SMB=\fISERVICE\fR -.RS 4 -Distribution specific SERVICE for managing smbd\&. -.sp -Default is distribution\-dependant\&. -.RE -.PP -CTDB_SERVICE_WINBIND=\fISERVICE\fR -.RS 4 -Distribution specific SERVICE for managing winbindd\&. -.sp -Default is "winbind"\&. -.RE -.SS "NFS" -.PP -This includes parameters for the kernel NFS server\&. Alternative NFS subsystems (such as -\m[blue]\fBNFS\-Ganesha\fR\m[]\&\s-2\u[1]\d\s+2) can be integrated using -\fICTDB_NFS_CALLOUT\fR\&. -.sp -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.br -.ps +1 -\fBEventscript\fR -.RS 4 -.RS 4 -60\&.nfs -.RE -.RE -.PP -CTDB_MANAGES_NFS=yes|no -.RS 4 -Should CTDB manage NFS? -.sp -Default is no\&. -.RE -.PP -CTDB_NFS_CALLOUT=\fICOMMAND\fR -.RS 4 -COMMAND specifies the path to a callout to handle interactions with the configured NFS system, including startup, shutdown, monitoring\&. -.sp -Default is the included -\fBnfs\-linux\-kernel\-callout\fR\&. -.RE -.PP -CTDB_NFS_CHECKS_DIR=\fIDIRECTORY\fR -.RS 4 -Specifies the path to a DIRECTORY containing files that describe how to monitor the responsiveness of NFS RPC services\&. See the README file for this directory for an explanation of the contents of these "check" files\&. -.sp -CTDB_NFS_CHECKS_DIR can be used to point to different sets of checks for different NFS servers\&. -.sp -One way of using this is to have it point to, say, -/usr/local/etc/ctdb/nfs\-checks\-enabled\&.d -and populate it with symbolic links to the desired check files\&. This avoids duplication and is upgrade\-safe\&. -.sp -Default is -/usr/local/etc/ctdb/nfs\-checks\&.d, which contains NFS RPC checks suitable for Linux kernel NFS\&. -.RE -.PP -CTDB_NFS_SKIP_SHARE_CHECK=yes|no -.RS 4 -As part of monitoring, should CTDB skip the check for the existence of each directory exported via NFS\&. This may be desirable if there is a large number of exports\&. -.sp -Default is no\&. -.RE -.PP -CTDB_RPCINFO_LOCALHOST=\fIIPADDR\fR|\fIHOSTNAME\fR -.RS 4 -IPADDR or HOSTNAME indicates the address that -\fBrpcinfo\fR -should connect to when doing -\fBrpcinfo\fR -check on IPv4 RPC service during monitoring\&. Optimally this would be "localhost"\&. However, this can add some performance overheads\&. -.sp -Default is "127\&.0\&.0\&.1"\&. -.RE -.PP -CTDB_RPCINFO_LOCALHOST6=\fIIPADDR\fR|\fIHOSTNAME\fR -.RS 4 -IPADDR or HOSTNAME indicates the address that -\fBrpcinfo\fR -should connect to when doing -\fBrpcinfo\fR -check on IPv6 RPC service during monitoring\&. Optimally this would be "localhost6" (or similar)\&. However, this can add some performance overheads\&. -.sp -Default is "::1"\&. -.RE -.PP -CTDB_NFS_STATE_FS_TYPE=\fITYPE\fR -.RS 4 -The type of filesystem used for a clustered NFS\*(Aq shared state\&. No default\&. -.RE -.PP -CTDB_NFS_STATE_MNT=\fIDIR\fR -.RS 4 -The directory where a clustered NFS\*(Aq shared state will be located\&. No default\&. -.RE -.SS "APACHE HTTPD" -.PP -CTDB can manage the Apache web server\&. -.sp -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.br -.ps +1 -\fBEventscript\fR -.RS 4 -.RS 4 -41\&.httpd -.RE -.RE -.PP -CTDB_MANAGES_HTTPD=yes|no -.RS 4 -Should CTDB manage the Apache web server? -.sp -Default is no\&. -.RE -.SS "CLAMAV" -.PP -CTDB has support to manage the popular anti\-virus daemon ClamAV\&. -.sp -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.br -.ps +1 -\fBEventscript\fR -.RS 4 -.RS 4 -31\&.clamd -.RE -.PP -This eventscript is not enabled by default\&. Use -\fBctdb enablescript\fR -to enable it\&. -.RE -.PP -CTDB_MANAGES_CLAMD=yes|no -.RS 4 -Should CTDB manage ClamAV? -.sp -Default is no\&. -.RE -.PP -CTDB_CLAMD_SOCKET=\fIFILENAME\fR -.RS 4 -FILENAME is the socket to monitor ClamAV\&. -.sp -No default\&. -.RE -.SS "ISCSI" -.PP -CTDB has support for managing the Linux iSCSI tgtd service\&. -.sp -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.br -.ps +1 -\fBEventscript\fR -.RS 4 -.RS 4 -70\&.iscsi -.RE -.RE -.PP -CTDB_MANAGES_ISCSI=yes|no -.RS 4 -Should CTDB manage iSCSI tgtd? -.sp -Default is no\&. -.RE -.PP -CTDB_START_ISCSI_SCRIPTS=\fIDIRECTORY\fR -.RS 4 -DIRECTORY on shared storage containing scripts to start tgtd for each public IP address\&. -.sp -No default\&. -.RE -.SS "MULTIPATHD" -.PP -CTDB can monitor multipath devices to ensure that active paths are available\&. -.sp -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.br -.ps +1 -\fBEventscript\fR -.RS 4 -.RS 4 -20\&.multipathd -.RE -.PP -This eventscript is not enabled by default\&. Use -\fBctdb enablescript\fR -to enable it\&. -.RE -.PP -CTDB_MONITOR_MPDEVICES=\fIMP\-DEVICE\-LIST\fR -.RS 4 -MP\-DEVICE\-LIST is a list of multipath devices for CTDB to monitor? -.sp -No default\&. -.RE -.SS "VSFTPD" -.PP -CTDB can manage the vsftpd FTP server\&. -.sp -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.br -.ps +1 -\fBEventscript\fR -.RS 4 -.RS 4 -40\&.vsftpd -.RE -.RE -.PP -CTDB_MANAGES_VSFTPD=yes|no -.RS 4 -Should CTDB manage the vsftpd FTP server? -.sp -Default is no\&. -.RE -.SS "SYSTEM RESOURCE MONITORING CONFIGURATION" -.PP -CTDB can experience seemingly random (performance and other) issues if system resources become too constrained\&. Options in this section can be enabled to allow certain system resources to be checked\&. They allows warnings to be logged and nodes to be marked unhealthy when system resource usage reaches the configured thresholds\&. -.PP -Some checks are enabled by default\&. It is recommended that these checks remain enabled or are augmented by extra checks\&. There is no supported way of completely disabling the checks\&. -.sp -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.br -.ps +1 -\fBEventscripts\fR -.RS 4 -.RS 4 -05\&.system -.RE -.PP -Filesystem and memory usage monitoring is in -05\&.system\&. -.RE -.PP -CTDB_MONITOR_FILESYSTEM_USAGE=\fIFS\-LIMIT\-LIST\fR -.RS 4 -FS\-LIMIT\-LIST is a space\-separated list of -\fIFILESYSTEM\fR:\fIWARN_LIMIT\fR[:\fIUNHEALTHY_LIMIT\fR] -triples indicating that warnings should be logged if the space used on FILESYSTEM reaches WARN_LIMIT%\&. If usage reaches UNHEALTHY_LIMIT then the node should be flagged unhealthy\&. Either WARN_LIMIT or UNHEALTHY_LIMIT may be left blank, meaning that check will be omitted\&. -.sp -Default is to warn for each filesystem containing a database directory (\fBCTDB_DBDIR\fR, -\fBCTDB_DBDIR_PERSISTENT\fR, -\fBCTDB_DBDIR_STATE\fR) with a threshold of 90%\&. -.RE -.PP -CTDB_MONITOR_MEMORY_USAGE=\fIMEM\-LIMITS\fR -.RS 4 -MEM\-LIMITS takes the form -\fIWARN_LIMIT\fR[:\fIUNHEALTHY_LIMIT\fR] -indicating that warnings should be logged if memory usage reaches WARN_LIMIT%\&. If usage reaches UNHEALTHY_LIMIT then the node should be flagged unhealthy\&. Either WARN_LIMIT or UNHEALTHY_LIMIT may be left blank, meaning that check will be omitted\&. -.sp -Default is 80, so warnings will be logged when memory usage reaches 80%\&. -.RE -.PP -CTDB_MONITOR_SWAP_USAGE=\fISWAP\-LIMITS\fR -.RS 4 -SWAP\-LIMITS takes the form -\fIWARN_LIMIT\fR[:\fIUNHEALTHY_LIMIT\fR] -indicating that warnings should be logged if swap usage reaches WARN_LIMIT%\&. If usage reaches UNHEALTHY_LIMIT then the node should be flagged unhealthy\&. Either WARN_LIMIT or UNHEALTHY_LIMIT may be left blank, meaning that check will be omitted\&. -.sp -Default is 25, so warnings will be logged when swap usage reaches 25%\&. -.RE -.SS "MISCELLANEOUS SERVICE\-RELATED CONFIGURATION" -.PP -CTDB_MANAGED_SERVICES=\fISERVICE\-LIST\fR -.RS 4 -SERVICE\-LIST is a space\-separated list of SERVICEs that CTDB should manage\&. This can be used as an alternative to the -\fICTDB_MANAGES_\fR\fI\fISERVICE\fR\fR -variables\&. -.sp -No default\&. -.RE -.SH "TUNABLES CONFIGURATION" -.PP -CTDB tunables (see -\fBctdbd-tunables\fR(7)) can be set from the configuration file\&. They are set as follows: -.sp -.if n \{\ -.RS 4 -.\} -.nf -CTDB_SET_\fITUNABLE\fR=\fIVALUE\fR - -.fi -.if n \{\ -.RE -.\} -.PP -For example: -.sp -.if n \{\ -.RS 4 -.\} -.nf -CTDB_SET_MonitorInterval=20 - -.fi -.if n \{\ -.RE -.\} -.sp -.SH "DEBUG AND TEST" -.PP -Variable in this section are for debugging and testing CTDB\&. They should not generally be needed\&. -.PP -CTDB_DEBUG_HUNG_SCRIPT=\fIFILENAME\fR -.RS 4 -FILENAME is a script to run to log debug information when an event script times out\&. -.sp -Default is -\fICTDB_BASE\fR/debug\-hung\-script\&.sh\&. -.RE -.PP -CTDB_DEBUG_HUNG_SCRIPT_LOGFILE=\fIFILENAME\fR -.RS 4 -FILENAME specifies where log messages should go when debugging hung eventscripts\&. This is a testing option\&. See also -CTDB_DEBUG_HUNG_SCRIPT\&. -.sp -No default\&. Messages go to stdout/stderr and are logged to the same place as other CTDB log messages\&. -.RE -.PP -CTDB_DEBUG_HUNG_SCRIPT_STACKPAT=\fIREGEXP\fR -.RS 4 -REGEXP specifies interesting processes for which stack traces should be logged when debugging hung eventscripts and those processes are matched in pstree output\&. REGEXP is an extended regexp so choices are separated by pipes (\*(Aq|\*(Aq)\&. However, REGEXP should not contain parentheses\&. See also -CTDB_DEBUG_HUNG_SCRIPT\&. -.sp -Default is "exportfs|rpcinfo"\&. -.RE -.PP -CTDB_DEBUG_LOCKS=\fIFILENAME\fR -.RS 4 -FILENAME is a script to run to log debug information when an CTDB fails to freeze databases during recovery\&. -.sp -No default, usually -\fICTDB_BASE\fR/debug_locks\&.sh\&. -.RE -.PP -CTDB_SYS_ETCDIR=\fIDIRECTORY\fR -.RS 4 -DIRECTORY containing system configuration files\&. This is used to provide alternate configuration when testing and should not need to be changed from the default\&. -.sp -Default is -/etc\&. -.RE -.PP -CTDB_INIT_STYLE=debian|redhat|suse -.RS 4 -This is the init style used by the Linux distribution (or other operating system) being used\&. This is usually determined dynamically by checking the system\&. This variable is used by the initscript to determine which init system primitives to use\&. It is also used by some eventscripts to choose the name of initscripts for certain services, since these can vary between distributions\&. -.sp -No fixed default\&. -.sp -If this option needs to be changed from the calculated default for the initscript to function properly, then it must be set in the distribution\-specific initscript configuration, such as -/etc/sysconfig/ctdb -.RE -.PP -CTDB_MAX_CORRUPT_DB_BACKUPS=\fINUM\fR -.RS 4 -NUM is the maximum number of volatile TDB database backups to be kept (for each database) when a corrupt database is found during startup\&. Volatile TDBs are zeroed during startup so backups are needed to debug any corruption that occurs before a restart\&. -.sp -Default is 10\&. -.RE -.PP -CTDB_MAX_OPEN_FILES=\fINUM\fR -.RS 4 -NUM is the maximum number of open files\&. -.sp -There is no default\&. -.RE -.PP -CTDB_RC_LOCAL=\fIFILENAME\fR -.RS 4 -FILENAME is a script fragment to be sourced by the -functions -that is sourced by scripts\&. On example use would be to override function definitions in unit tests\&. As a sanity check, this file must be executable for it to be used\&. -.sp -No default\&. -.RE -.PP -CTDB_RUN_TIMEOUT_MONITOR=yes|no -.RS 4 -Whether CTDB should simulate timing out monitor events\&. This uses the -99\&.timeout -eventscript\&. -.sp -Default is no\&. -.RE -.PP -CTDB_SUPPRESS_COREFILE=yes|no -.RS 4 -Whether CTDB core files should be suppressed\&. -.sp -Default is no\&. -.RE -.PP -CTDB_VALGRIND=yes|no|\fICOMMAND\fR -.RS 4 -If "yes", this causes -\fBctdbd\fR(1) -to be run under -\fBvalgrind\fR(1) -with logs going to -/usr/local/var/log/ctdb_valgrind\&. If neither "yes" nor "no" then the value is assumed to be a COMMAND (e\&.g\&. a -\fBvalgrind\fR -variation, a -\fBgdb\fR(1) -command) that is used in place of the default -\fBvalgrind\fR -command\&. In either case, the -\fB\-\-valgrind\fR -option is passed to -\fBctdbd\fR\&. -.sp -Default is no\&. -.RE -.PP -CTDB_VARDIR=\fIDIRECTORY\fR -.RS 4 -DIRECTORY containing CTDB files that are modified at runtime\&. -.sp -Defaults to -/usr/local/var/lib/ctdb\&. -.RE -.SH "FILES" -.RS 4 -/usr/local/etc/ctdb/ctdbd\&.conf -.RE -.RS 4 -/etc/sysconfig/ctdb -.RE -.RS 4 -/etc/default/ctdb -.RE -.RS 4 -/usr/local/etc/ctdb/sysconfig/ctdb -.RE -.SH "SEE ALSO" -.PP -\fBctdbd\fR(1), -\fBctdbd_wrapper\fR(1), -\fBonnode\fR(1), -\fBctdb\fR(7), -\fBctdb-tunables\fR(7), -\m[blue]\fB\%http://ctdb.samba.org/\fR\m[] -.SH "AUTHOR" -.br -.PP -This documentation was written by Amitay Isaacs, Martin Schwenke -.SH "COPYRIGHT" -.br -Copyright \(co 2007 Andrew Tridgell, Ronnie Sahlberg -.br -.PP -This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version\&. -.PP -This program 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 General Public License for more details\&. -.PP -You should have received a copy of the GNU General Public License along with this program; if not, see -\m[blue]\fB\%http://www.gnu.org/licenses\fR\m[]\&. -.sp -.SH "NOTES" -.IP " 1." 4 -NFS-Ganesha -.RS 4 -\%https://github.com/nfs-ganesha/nfs-ganesha/wiki -.RE Property changes on: head/net/samba410/files/man/ctdbd.conf.5 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/samba410/files/man/ctdb-script.options.5 =================================================================== --- head/net/samba410/files/man/ctdb-script.options.5 (nonexistent) +++ head/net/samba410/files/man/ctdb-script.options.5 (revision 505446) @@ -0,0 +1,567 @@ +'\" t +.\" Title: ctdb-script.options +.\" Author: +.\" Generator: DocBook XSL Stylesheets v1.79.1 +.\" Date: 11/18/2018 +.\" Manual: CTDB - clustered TDB database +.\" Source: ctdb +.\" Language: English +.\" +.TH "CTDB\-SCRIPT\&.OPTIO" "5" "11/18/2018" "ctdb" "CTDB \- clustered TDB database" +.\" ----------------------------------------------------------------- +.\" * 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" +ctdb-script.options \- CTDB scripts configuration files +.SH "DESCRIPTION" +.PP +Each CTDB script has 2 possible locations for its configuration options: +.PP +/usr/local/etc/ctdb/script\&.options +.RS 4 +This is a catch\-all global file for general purpose scripts and for options that are used in multiple event scripts\&. +.RE +.PP +\fISCRIPT\fR\&.options +.RS 4 +That is, options for +\fISCRIPT\fR +are placed in a file alongside the script, with a "\&.script" suffix added\&. This style is usually recommended for event scripts\&. +.sp +Options in this script\-specific file override those in the global file\&. +.RE +.PP +These files should include simple shell\-style variable assignments and shell\-style comments\&. +.SH "NETWORK CONFIGURATION" +.SS "10\&.interface" +.PP +This event script handles monitoring of interfaces using by public IP addresses\&. +.PP +CTDB_PARTIALLY_ONLINE_INTERFACES=yes|no +.RS 4 +Whether one or more offline interfaces should cause a monitor event to fail if there are other interfaces that are up\&. If this is "yes" and a node has some interfaces that are down then +\fBctdb status\fR +will display the node as "PARTIALLYONLINE"\&. +.sp +Note that CTDB_PARTIALLY_ONLINE_INTERFACES=yes is not generally compatible with NAT gateway or LVS\&. NAT gateway relies on the interface configured by CTDB_NATGW_PUBLIC_IFACE to be up and LVS replies on CTDB_LVS_PUBLIC_IFACE to be up\&. CTDB does not check if these options are set in an incompatible way so care is needed to understand the interaction\&. +.sp +Default is "no"\&. +.RE +.SS "11\&.natgw" +.PP +Provides CTDB\*(Aqs NAT gateway functionality\&. +.PP +NAT gateway is used to configure fallback routing for nodes when they do not host any public IP addresses\&. For example, it allows unhealthy nodes to reliably communicate with external infrastructure\&. One node in a NAT gateway group will be designated as the NAT gateway master node and other (slave) nodes will be configured with fallback routes via the NAT gateway master node\&. For more information, see the +NAT GATEWAY +section in +\fBctdb\fR(7)\&. +.PP +CTDB_NATGW_DEFAULT_GATEWAY=\fIIPADDR\fR +.RS 4 +IPADDR is an alternate network gateway to use on the NAT gateway master node\&. If set, a fallback default route is added via this network gateway\&. +.sp +No default\&. Setting this variable is optional \- if not set that no route is created on the NAT gateway master node\&. +.RE +.PP +CTDB_NATGW_NODES=\fIFILENAME\fR +.RS 4 +FILENAME contains the list of nodes that belong to the same NAT gateway group\&. +.sp +File format: +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fIIPADDR\fR [slave\-only] + +.fi +.if n \{\ +.RE +.\} +.sp +IPADDR is the private IP address of each node in the NAT gateway group\&. +.sp +If "slave\-only" is specified then the corresponding node can not be the NAT gateway master node\&. In this case +\fICTDB_NATGW_PUBLIC_IFACE\fR +and +\fICTDB_NATGW_PUBLIC_IP\fR +are optional and unused\&. +.sp +No default, usually +/usr/local/etc/ctdb/natgw_nodes +when enabled\&. +.RE +.PP +CTDB_NATGW_PRIVATE_NETWORK=\fIIPADDR/MASK\fR +.RS 4 +IPADDR/MASK is the private sub\-network that is internally routed via the NAT gateway master node\&. This is usually the private network that is used for node addresses\&. +.sp +No default\&. +.RE +.PP +CTDB_NATGW_PUBLIC_IFACE=\fIIFACE\fR +.RS 4 +IFACE is the network interface on which the CTDB_NATGW_PUBLIC_IP will be configured\&. +.sp +No default\&. +.RE +.PP +CTDB_NATGW_PUBLIC_IP=\fIIPADDR/MASK\fR +.RS 4 +IPADDR/MASK indicates the IP address that is used for outgoing traffic (originating from CTDB_NATGW_PRIVATE_NETWORK) on the NAT gateway master node\&. This +\fImust not\fR +be a configured public IP address\&. +.sp +No default\&. +.RE +.PP +CTDB_NATGW_STATIC_ROUTES=\fIIPADDR/MASK[@GATEWAY]\fR \&.\&.\&. +.RS 4 +Each IPADDR/MASK identifies a network or host to which NATGW should create a fallback route, instead of creating a single default route\&. This can be used when there is already a default route, via an interface that can not reach required infrastructure, that overrides the NAT gateway default route\&. +.sp +If GATEWAY is specified then the corresponding route on the NATGW master node will be via GATEWAY\&. Such routes are created even if +\fICTDB_NATGW_DEFAULT_GATEWAY\fR +is not specified\&. If GATEWAY is not specified for some networks then routes are only created on the NATGW master node for those networks if +\fICTDB_NATGW_DEFAULT_GATEWAY\fR +is specified\&. +.sp +This should be used with care to avoid causing traffic to unnecessarily double\-hop through the NAT gateway master, even when a node is hosting public IP addresses\&. Each specified network or host should probably have a corresponding automatically created link route or static route to avoid this\&. +.sp +No default\&. +.RE +.sp +.it 1 an-trap +.nr an-no-space-flag 1 +.nr an-break-flag 1 +.br +.ps +1 +\fBExample\fR +.RS 4 +.sp +.if n \{\ +.RS 4 +.\} +.nf +CTDB_NATGW_NODES=/usr/local/etc/ctdb/natgw_nodes +CTDB_NATGW_PRIVATE_NETWORK=192\&.168\&.1\&.0/24 +CTDB_NATGW_DEFAULT_GATEWAY=10\&.0\&.0\&.1 +CTDB_NATGW_PUBLIC_IP=10\&.0\&.0\&.227/24 +CTDB_NATGW_PUBLIC_IFACE=eth0 + +.fi +.if n \{\ +.RE +.\} +.PP +A variation that ensures that infrastructure (ADS, DNS, \&.\&.\&.) directly attached to the public network (10\&.0\&.0\&.0/24) is always reachable would look like this: +.sp +.if n \{\ +.RS 4 +.\} +.nf +CTDB_NATGW_NODES=/usr/local/etc/ctdb/natgw_nodes +CTDB_NATGW_PRIVATE_NETWORK=192\&.168\&.1\&.0/24 +CTDB_NATGW_PUBLIC_IP=10\&.0\&.0\&.227/24 +CTDB_NATGW_PUBLIC_IFACE=eth0 +CTDB_NATGW_STATIC_ROUTES=10\&.0\&.0\&.0/24 + +.fi +.if n \{\ +.RE +.\} +.PP +Note that +\fICTDB_NATGW_DEFAULT_GATEWAY\fR +is not specified\&. +.RE +.SS "13\&.per_ip_routing" +.PP +Provides CTDB\*(Aqs policy routing functionality\&. +.PP +A node running CTDB may be a component of a complex network topology\&. In particular, public addresses may be spread across several different networks (or VLANs) and it may not be possible to route packets from these public addresses via the system\*(Aqs default route\&. Therefore, CTDB has support for policy routing via the +13\&.per_ip_routing +eventscript\&. This allows routing to be specified for packets sourced from each public address\&. The routes are added and removed as CTDB moves public addresses between nodes\&. +.PP +For more information, see the +POLICY ROUTING +section in +\fBctdb\fR(7)\&. +.PP +CTDB_PER_IP_ROUTING_CONF=\fIFILENAME\fR +.RS 4 +FILENAME contains elements for constructing the desired routes for each source address\&. +.sp +The special FILENAME value +\fB__auto_link_local__\fR +indicates that no configuration file is provided and that CTDB should generate reasonable link\-local routes for each public IP address\&. +.sp +File format: +.sp +.if n \{\ +.RS 4 +.\} +.nf + \fIIPADDR\fR \fIDEST\-IPADDR/MASK\fR [\fIGATEWAY\-IPADDR\fR] + +.fi +.if n \{\ +.RE +.\} +.sp +No default, usually +/usr/local/etc/ctdb/policy_routing +when enabled\&. +.RE +.PP +CTDB_PER_IP_ROUTING_RULE_PREF=\fINUM\fR +.RS 4 +NUM sets the priority (or preference) for the routing rules that are added by CTDB\&. +.sp +This should be (strictly) greater than 0 and (strictly) less than 32766\&. A priority of 100 is recommended, unless this conflicts with a priority already in use on the system\&. See +\fBip\fR(8), for more details\&. +.RE +.PP +CTDB_PER_IP_ROUTING_TABLE_ID_LOW=\fILOW\-NUM\fR, CTDB_PER_IP_ROUTING_TABLE_ID_HIGH=\fIHIGH\-NUM\fR +.RS 4 +CTDB determines a unique routing table number to use for the routing related to each public address\&. LOW\-NUM and HIGH\-NUM indicate the minimum and maximum routing table numbers that are used\&. +.sp +\fBip\fR(8) +uses some reserved routing table numbers below 255\&. Therefore, CTDB_PER_IP_ROUTING_TABLE_ID_LOW should be (strictly) greater than 255\&. +.sp +CTDB uses the standard file +/etc/iproute2/rt_tables +to maintain a mapping between the routing table numbers and labels\&. The label for a public address +\fIADDR\fR +will look like ctdb\&.\fIaddr\fR\&. This means that the associated rules and routes are easy to read (and manipulate)\&. +.sp +No default, usually 1000 and 9000\&. +.RE +.sp +.it 1 an-trap +.nr an-no-space-flag 1 +.nr an-break-flag 1 +.br +.ps +1 +\fBExample\fR +.RS 4 +.sp +.if n \{\ +.RS 4 +.\} +.nf +CTDB_PER_IP_ROUTING_CONF=/usr/local/etc/ctdb/policy_routing +CTDB_PER_IP_ROUTING_RULE_PREF=100 +CTDB_PER_IP_ROUTING_TABLE_ID_LOW=1000 +CTDB_PER_IP_ROUTING_TABLE_ID_HIGH=9000 + +.fi +.if n \{\ +.RE +.\} +.RE +.SS "91\&.lvs" +.PP +Provides CTDB\*(Aqs LVS functionality\&. +.PP +For a general description see the +LVS +section in +\fBctdb\fR(7)\&. +.PP +CTDB_LVS_NODES=\fIFILENAME\fR +.RS 4 +FILENAME contains the list of nodes that belong to the same LVS group\&. +.sp +File format: +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fIIPADDR\fR [slave\-only] + +.fi +.if n \{\ +.RE +.\} +.sp +IPADDR is the private IP address of each node in the LVS group\&. +.sp +If "slave\-only" is specified then the corresponding node can not be the LVS master node\&. In this case +\fICTDB_LVS_PUBLIC_IFACE\fR +and +\fICTDB_LVS_PUBLIC_IP\fR +are optional and unused\&. +.sp +No default, usually +/usr/local/etc/ctdb/lvs_nodes +when enabled\&. +.RE +.PP +CTDB_LVS_PUBLIC_IFACE=\fIINTERFACE\fR +.RS 4 +INTERFACE is the network interface that clients will use to connection to +\fICTDB_LVS_PUBLIC_IP\fR\&. This is optional for slave\-only nodes\&. No default\&. +.RE +.PP +CTDB_LVS_PUBLIC_IP=\fIIPADDR\fR +.RS 4 +CTDB_LVS_PUBLIC_IP is the LVS public address\&. No default\&. +.RE +.SH "SERVICE CONFIGURATION" +.PP +CTDB can be configured to manage and/or monitor various NAS (and other) services via its eventscripts\&. +.PP +In the simplest case CTDB will manage a service\&. This means the service will be started and stopped along with CTDB, CTDB will monitor the service and CTDB will do any required reconfiguration of the service when public IP addresses are failed over\&. +.SS "20\&.multipathd" +.PP +Provides CTDB\*(Aqs Linux multipathd service management\&. +.PP +It can monitor multipath devices to ensure that active paths are available\&. +.PP +CTDB_MONITOR_MPDEVICES=\fIMP\-DEVICE\-LIST\fR +.RS 4 +MP\-DEVICE\-LIST is a list of multipath devices for CTDB to monitor? +.sp +No default\&. +.RE +.SS "31\&.clamd" +.PP +This event script provide CTDB\*(Aqs ClamAV anti\-virus service management\&. +.PP +This eventscript is not enabled by default\&. Use +\fBctdb enablescript\fR +to enable it\&. +.PP +CTDB_CLAMD_SOCKET=\fIFILENAME\fR +.RS 4 +FILENAME is the socket to monitor ClamAV\&. +.sp +No default\&. +.RE +.SS "49\&.winbind" +.PP +Provides CTDB\*(Aqs Samba winbind service management\&. +.PP +CTDB_SERVICE_WINBIND=\fISERVICE\fR +.RS 4 +Distribution specific SERVICE for managing winbindd\&. +.sp +Default is "winbind"\&. +.RE +.SS "50\&.samba" +.PP +Provides the core of CTDB\*(Aqs Samba file service management\&. +.PP +CTDB_SAMBA_CHECK_PORTS=\fIPORT\-LIST\fR +.RS 4 +When monitoring Samba, check TCP ports in space\-separated PORT\-LIST\&. +.sp +Default is to monitor ports that Samba is configured to listen on\&. +.RE +.PP +CTDB_SAMBA_SKIP_SHARE_CHECK=yes|no +.RS 4 +As part of monitoring, should CTDB skip the check for the existence of each directory configured as share in Samba\&. This may be desirable if there is a large number of shares\&. +.sp +Default is no\&. +.RE +.PP +CTDB_SERVICE_NMB=\fISERVICE\fR +.RS 4 +Distribution specific SERVICE for managing nmbd\&. +.sp +Default is distribution\-dependant\&. +.RE +.PP +CTDB_SERVICE_SMB=\fISERVICE\fR +.RS 4 +Distribution specific SERVICE for managing smbd\&. +.sp +Default is distribution\-dependant\&. +.RE +.SS "60\&.nfs" +.PP +This event script (along with 06\&.nfs) provides CTDB\*(Aqs NFS service management\&. +.PP +This includes parameters for the kernel NFS server\&. Alternative NFS subsystems (such as +\m[blue]\fBNFS\-Ganesha\fR\m[]\&\s-2\u[1]\d\s+2) can be integrated using +\fICTDB_NFS_CALLOUT\fR\&. +.PP +CTDB_NFS_CALLOUT=\fICOMMAND\fR +.RS 4 +COMMAND specifies the path to a callout to handle interactions with the configured NFS system, including startup, shutdown, monitoring\&. +.sp +Default is the included +\fBnfs\-linux\-kernel\-callout\fR\&. +.RE +.PP +CTDB_NFS_CHECKS_DIR=\fIDIRECTORY\fR +.RS 4 +Specifies the path to a DIRECTORY containing files that describe how to monitor the responsiveness of NFS RPC services\&. See the README file for this directory for an explanation of the contents of these "check" files\&. +.sp +CTDB_NFS_CHECKS_DIR can be used to point to different sets of checks for different NFS servers\&. +.sp +One way of using this is to have it point to, say, +/usr/local/etc/ctdb/nfs\-checks\-enabled\&.d +and populate it with symbolic links to the desired check files\&. This avoids duplication and is upgrade\-safe\&. +.sp +Default is +/usr/local/etc/ctdb/nfs\-checks\&.d, which contains NFS RPC checks suitable for Linux kernel NFS\&. +.RE +.PP +CTDB_NFS_SKIP_SHARE_CHECK=yes|no +.RS 4 +As part of monitoring, should CTDB skip the check for the existence of each directory exported via NFS\&. This may be desirable if there is a large number of exports\&. +.sp +Default is no\&. +.RE +.PP +CTDB_RPCINFO_LOCALHOST=\fIIPADDR\fR|\fIHOSTNAME\fR +.RS 4 +IPADDR or HOSTNAME indicates the address that +\fBrpcinfo\fR +should connect to when doing +\fBrpcinfo\fR +check on IPv4 RPC service during monitoring\&. Optimally this would be "localhost"\&. However, this can add some performance overheads\&. +.sp +Default is "127\&.0\&.0\&.1"\&. +.RE +.PP +CTDB_RPCINFO_LOCALHOST6=\fIIPADDR\fR|\fIHOSTNAME\fR +.RS 4 +IPADDR or HOSTNAME indicates the address that +\fBrpcinfo\fR +should connect to when doing +\fBrpcinfo\fR +check on IPv6 RPC service during monitoring\&. Optimally this would be "localhost6" (or similar)\&. However, this can add some performance overheads\&. +.sp +Default is "::1"\&. +.RE +.PP +CTDB_NFS_STATE_FS_TYPE=\fITYPE\fR +.RS 4 +The type of filesystem used for a clustered NFS\*(Aq shared state\&. No default\&. +.RE +.PP +CTDB_NFS_STATE_MNT=\fIDIR\fR +.RS 4 +The directory where a clustered NFS\*(Aq shared state will be located\&. No default\&. +.RE +.SS "70\&.iscsi" +.PP +Provides CTDB\*(Aqs Linux iSCSI tgtd service management\&. +.PP +CTDB_START_ISCSI_SCRIPTS=\fIDIRECTORY\fR +.RS 4 +DIRECTORY on shared storage containing scripts to start tgtd for each public IP address\&. +.sp +No default\&. +.RE +.SH "DATABASE SETUP" +.PP +CTDB checks the consistency of databases during startup\&. +.SS "00\&.ctdb" +.PP +CTDB_MAX_CORRUPT_DB_BACKUPS=\fINUM\fR +.RS 4 +NUM is the maximum number of volatile TDB database backups to be kept (for each database) when a corrupt database is found during startup\&. Volatile TDBs are zeroed during startup so backups are needed to debug any corruption that occurs before a restart\&. +.sp +Default is 10\&. +.RE +.SH "SYSTEM RESOURCE MONITORING" +.SS "05\&.system" +.PP +Provides CTDB\*(Aqs filesystem and memory usage monitoring\&. +.PP +CTDB can experience seemingly random (performance and other) issues if system resources become too constrained\&. Options in this section can be enabled to allow certain system resources to be checked\&. They allows warnings to be logged and nodes to be marked unhealthy when system resource usage reaches the configured thresholds\&. +.PP +Some checks are enabled by default\&. It is recommended that these checks remain enabled or are augmented by extra checks\&. There is no supported way of completely disabling the checks\&. +.PP +CTDB_MONITOR_FILESYSTEM_USAGE=\fIFS\-LIMIT\-LIST\fR +.RS 4 +FS\-LIMIT\-LIST is a space\-separated list of +\fIFILESYSTEM\fR:\fIWARN_LIMIT\fR[:\fIUNHEALTHY_LIMIT\fR] +triples indicating that warnings should be logged if the space used on FILESYSTEM reaches WARN_LIMIT%\&. If usage reaches UNHEALTHY_LIMIT then the node should be flagged unhealthy\&. Either WARN_LIMIT or UNHEALTHY_LIMIT may be left blank, meaning that check will be omitted\&. +.sp +Default is to warn for each filesystem containing a database directory (volatile\ \&database\ \&directory, +persistent\ \&database\ \&directory, +state\ \&database\ \&directory) with a threshold of 90%\&. +.RE +.PP +CTDB_MONITOR_MEMORY_USAGE=\fIMEM\-LIMITS\fR +.RS 4 +MEM\-LIMITS takes the form +\fIWARN_LIMIT\fR[:\fIUNHEALTHY_LIMIT\fR] +indicating that warnings should be logged if memory usage reaches WARN_LIMIT%\&. If usage reaches UNHEALTHY_LIMIT then the node should be flagged unhealthy\&. Either WARN_LIMIT or UNHEALTHY_LIMIT may be left blank, meaning that check will be omitted\&. +.sp +Default is 80, so warnings will be logged when memory usage reaches 80%\&. +.RE +.PP +CTDB_MONITOR_SWAP_USAGE=\fISWAP\-LIMITS\fR +.RS 4 +SWAP\-LIMITS takes the form +\fIWARN_LIMIT\fR[:\fIUNHEALTHY_LIMIT\fR] +indicating that warnings should be logged if swap usage reaches WARN_LIMIT%\&. If usage reaches UNHEALTHY_LIMIT then the node should be flagged unhealthy\&. Either WARN_LIMIT or UNHEALTHY_LIMIT may be left blank, meaning that check will be omitted\&. +.sp +Default is 25, so warnings will be logged when swap usage reaches 25%\&. +.RE +.SH "EVENT SCRIPT DEBUGGING" +.SS "debug\-hung\-script\&.sh" +.PP +CTDB_DEBUG_HUNG_SCRIPT_STACKPAT=\fIREGEXP\fR +.RS 4 +REGEXP specifies interesting processes for which stack traces should be logged when debugging hung eventscripts and those processes are matched in pstree output\&. REGEXP is an extended regexp so choices are separated by pipes (\*(Aq|\*(Aq)\&. However, REGEXP should not contain parentheses\&. See also the +\fBctdb.conf\fR(5) +[event] "debug\ \&script" option\&. +.sp +Default is "exportfs|rpcinfo"\&. +.RE +.SH "FILES" +.RS 4 +/usr/local/etc/ctdb/script\&.options +.RE +.SH "SEE ALSO" +.PP +\fBctdbd\fR(1), +\fBctdb\fR(7), +\m[blue]\fB\%http://ctdb.samba.org/\fR\m[] +.SH "AUTHOR" +.br +.PP +This documentation was written by Amitay Isaacs, Martin Schwenke +.SH "COPYRIGHT" +.br +Copyright \(co 2007 Andrew Tridgell, Ronnie Sahlberg +.br +.PP +This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version\&. +.PP +This program 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 General Public License for more details\&. +.PP +You should have received a copy of the GNU General Public License along with this program; if not, see +\m[blue]\fB\%http://www.gnu.org/licenses\fR\m[]\&. +.sp +.SH "NOTES" +.IP " 1." 4 +NFS-Ganesha +.RS 4 +\%https://github.com/nfs-ganesha/nfs-ganesha/wiki +.RE Property changes on: head/net/samba410/files/man/ctdb-script.options.5 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/samba410/files/man/ctdb-statistics.7 =================================================================== --- head/net/samba410/files/man/ctdb-statistics.7 (revision 505445) +++ head/net/samba410/files/man/ctdb-statistics.7 (revision 505446) @@ -1,528 +1,550 @@ '\" t .\" Title: ctdb-statistics .\" Author: .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 11/20/2017 +.\" Date: 11/18/2018 .\" Manual: CTDB - clustered TDB database .\" Source: ctdb .\" Language: English .\" -.TH "CTDB\-STATISTICS" "7" "11/20/2017" "ctdb" "CTDB \- clustered TDB database" +.TH "CTDB\-STATISTICS" "7" "11/18/2018" "ctdb" "CTDB \- clustered TDB database" .\" ----------------------------------------------------------------- .\" * 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" ctdb-statistics \- CTDB statistics output .SH "OVERALL STATISTICS" .PP CTDB maintains information about various messages communicated and some of the important operations per node\&. See the \fBctdb\fR(1) commands \fBstatistics\fR and \fBstatisticsreset\fR for displaying statistics\&. .SS "Example: ctdb statistics" .sp .if n \{\ .RS 4 .\} .nf CTDB version 1 Current time of statistics : Fri Sep 12 13:32:32 2014 Statistics collected since : (000 01:49:20) Fri Sep 12 11:43:12 2014 num_clients 6 frozen 0 recovering 0 num_recoveries 2 client_packets_sent 281293 client_packets_recv 296317 node_packets_sent 452387 node_packets_recv 182394 keepalive_packets_sent 3927 keepalive_packets_recv 3928 node req_call 48605 reply_call 1 req_dmaster 23404 reply_dmaster 24917 reply_error 0 req_message 958 req_control 197513 reply_control 153705 client req_call 130866 req_message 770 req_control 168921 timeouts call 0 control 0 traverse 0 locks num_calls 220 num_current 0 num_pending 0 num_failed 0 total_calls 130866 pending_calls 0 childwrite_calls 1 pending_childwrite_calls 0 memory_used 334490 max_hop_count 18 total_ro_delegations 2 total_ro_revokes 2 hop_count_buckets: 42816 5464 26 1 0 0 0 0 0 0 0 0 0 0 0 0 lock_buckets: 9 165 14 15 7 2 2 0 0 0 0 0 0 0 0 0 locks_latency MIN/AVG/MAX 0\&.000685/0\&.160302/6\&.369342 sec out of 214 reclock_ctdbd MIN/AVG/MAX 0\&.004940/0\&.004969/0\&.004998 sec out of 2 reclock_recd MIN/AVG/MAX 0\&.000000/0\&.000000/0\&.000000 sec out of 0 call_latency MIN/AVG/MAX 0\&.000006/0\&.000719/4\&.562991 sec out of 126626 childwrite_latency MIN/AVG/MAX 0\&.014527/0\&.014527/0\&.014527 sec out of 1 .fi .if n \{\ .RE .\} .SS "CTDB version" .PP Version of the ctdb protocol used by the node\&. .SS "Current time of statistics" .PP Time when the statistics are generated\&. .PP This is useful when collecting statistics output periodically for post\-processing\&. .SS "Statistics collected since" .PP Time when ctdb was started or the last time statistics was reset\&. The output shows the duration and the timestamp\&. .SS "num_clients" .PP Number of processes currently connected to CTDB\*(Aqs unix socket\&. This includes recovery daemon, ctdb tool and samba processes (smbd, winbindd)\&. .SS "frozen" .PP 1 if the the databases are currently frozen, 0 otherwise\&. .SS "recovering" .PP 1 if recovery is active, 0 otherwise\&. .SS "num_recoveries" .PP Number of recoveries since the start of ctdb or since the last statistics reset\&. .SS "client_packets_sent" .PP Number of packets sent to client processes via unix domain socket\&. .SS "client_packets_recv" .PP Number of packets received from client processes via unix domain socket\&. .SS "node_packets_sent" .PP Number of packets sent to the other nodes in the cluster via TCP\&. .SS "node_packets_recv" .PP Number of packets received from the other nodes in the cluster via TCP\&. .SS "keepalive_packets_sent" .PP Number of keepalive messages sent to other nodes\&. .PP CTDB periodically sends keepalive messages to other nodes\&. See KeepaliveInterval tunable in \fBctdb-tunables\fR(7) for more details\&. .SS "keepalive_packets_recv" .PP Number of keepalive messages received from other nodes\&. .SS "node" .PP This section lists various types of messages processed which originated from other nodes via TCP\&. .sp .it 1 an-trap .nr an-no-space-flag 1 .nr an-break-flag 1 .br .ps +1 \fBreq_call\fR .RS 4 .PP Number of REQ_CALL messages from the other nodes\&. .RE .sp .it 1 an-trap .nr an-no-space-flag 1 .nr an-break-flag 1 .br .ps +1 \fBreply_call\fR .RS 4 .PP Number of REPLY_CALL messages from the other nodes\&. .RE .sp .it 1 an-trap .nr an-no-space-flag 1 .nr an-break-flag 1 .br .ps +1 \fBreq_dmaster\fR .RS 4 .PP Number of REQ_DMASTER messages from the other nodes\&. .RE .sp .it 1 an-trap .nr an-no-space-flag 1 .nr an-break-flag 1 .br .ps +1 \fBreply_dmaster\fR .RS 4 .PP Number of REPLY_DMASTER messages from the other nodes\&. .RE .sp .it 1 an-trap .nr an-no-space-flag 1 .nr an-break-flag 1 .br .ps +1 \fBreply_error\fR .RS 4 .PP Number of REPLY_ERROR messages from the other nodes\&. .RE .sp .it 1 an-trap .nr an-no-space-flag 1 .nr an-break-flag 1 .br .ps +1 \fBreq_message\fR .RS 4 .PP Number of REQ_MESSAGE messages from the other nodes\&. .RE .sp .it 1 an-trap .nr an-no-space-flag 1 .nr an-break-flag 1 .br .ps +1 \fBreq_control\fR .RS 4 .PP Number of REQ_CONTROL messages from the other nodes\&. .RE .sp .it 1 an-trap .nr an-no-space-flag 1 .nr an-break-flag 1 .br .ps +1 \fBreply_control\fR .RS 4 .PP Number of REPLY_CONTROL messages from the other nodes\&. .RE +.sp +.it 1 an-trap +.nr an-no-space-flag 1 +.nr an-break-flag 1 +.br +.ps +1 +\fBreq_tunnel\fR +.RS 4 +.PP +Number of REQ_TUNNEL messages from the other nodes\&. +.RE .SS "client" .PP This section lists various types of messages processed which originated from clients via unix domain socket\&. .sp .it 1 an-trap .nr an-no-space-flag 1 .nr an-break-flag 1 .br .ps +1 \fBreq_call\fR .RS 4 .PP Number of REQ_CALL messages from the clients\&. .RE .sp .it 1 an-trap .nr an-no-space-flag 1 .nr an-break-flag 1 .br .ps +1 \fBreq_message\fR .RS 4 .PP Number of REQ_MESSAGE messages from the clients\&. .RE .sp .it 1 an-trap .nr an-no-space-flag 1 .nr an-break-flag 1 .br .ps +1 \fBreq_control\fR .RS 4 .PP Number of REQ_CONTROL messages from the clients\&. +.RE +.sp +.it 1 an-trap +.nr an-no-space-flag 1 +.nr an-break-flag 1 +.br +.ps +1 +\fBreq_tunnel\fR +.RS 4 +.PP +Number of REQ_TUNNEL messages from the clients\&. .RE .SS "timeouts" .PP This section lists timeouts occurred when sending various messages\&. .sp .it 1 an-trap .nr an-no-space-flag 1 .nr an-break-flag 1 .br .ps +1 \fBcall\fR .RS 4 .PP Number of timeouts for REQ_CALL messages\&. .RE .sp .it 1 an-trap .nr an-no-space-flag 1 .nr an-break-flag 1 .br .ps +1 \fBcontrol\fR .RS 4 .PP Number of timeouts for REQ_CONTROL messages\&. .RE .sp .it 1 an-trap .nr an-no-space-flag 1 .nr an-break-flag 1 .br .ps +1 \fBtraverse\fR .RS 4 .PP Number of timeouts for database traverse operations\&. .RE .SS "locks" .PP This section lists locking statistics\&. .sp .it 1 an-trap .nr an-no-space-flag 1 .nr an-break-flag 1 .br .ps +1 \fBnum_calls\fR .RS 4 .PP Number of completed lock calls\&. This includes database locks and record locks\&. .RE .sp .it 1 an-trap .nr an-no-space-flag 1 .nr an-break-flag 1 .br .ps +1 \fBnum_current\fR .RS 4 .PP Number of scheduled lock calls\&. This includes database locks and record locks\&. .RE .sp .it 1 an-trap .nr an-no-space-flag 1 .nr an-break-flag 1 .br .ps +1 \fBnum_pending\fR .RS 4 .PP Number of queued lock calls\&. This includes database locks and record locks\&. .RE .sp .it 1 an-trap .nr an-no-space-flag 1 .nr an-break-flag 1 .br .ps +1 \fBnum_failed\fR .RS 4 .PP Number of failed lock calls\&. This includes database locks and record locks\&. .RE .SS "total_calls" .PP Number of req_call messages processed from clients\&. This number should be same as client \-\-> req_call\&. .SS "pending_calls" .PP Number of req_call messages which are currenly being processed\&. This number indicates the number of record migrations in flight\&. .SS "childwrite_calls" .PP Number of record update calls\&. Record update calls are used to update a record under a transaction\&. .SS "pending_childwrite_calls" .PP Number of record update calls currently active\&. .SS "memory_used" .PP The amount of memory in bytes currently used by CTDB using talloc\&. This includes all the memory used for CTDB\*(Aqs internal data structures\&. This does not include the memory mapped TDB databases\&. .SS "max_hop_count" .PP The maximum number of hops required for a record migration request to obtain the record\&. High numbers indicate record contention\&. .SS "total_ro_delegations" .PP Number of readonly delegations created\&. .SS "total_ro_revokes" .PP Number of readonly delegations that were revoked\&. The difference between total_ro_revokes and total_ro_delegations gives the number of currently active readonly delegations\&. .SS "hop_count_buckets" .PP Distribution of migration requests based on hop counts values\&. Buckets are 1, < 4, < 8, < 16, < 32, < 64, < 128, < 256, < 512, ≥ 512\&. .SS "lock_buckets" .PP Distribution of record lock requests based on time required to obtain locks\&. Buckets are < 1ms, < 10ms, < 100ms, < 1s, < 2s, < 4s, < 8s, < 16s, < 32s, < 64s, ≥ 64s\&. .SS "locks_latency" .PP The minimum, the average and the maximum time (in seconds) required to obtain record locks\&. .SS "reclock_ctdbd" .PP The minimum, the average and the maximum time (in seconds) required to check if recovery lock is still held by recovery daemon when recovery mode is changed\&. This check is done in ctdb daemon\&. .SS "reclock_recd" .PP The minimum, the average and the maximum time (in seconds) required to check if recovery lock is still held by recovery daemon during recovery\&. This check is done in recovery daemon\&. .SS "call_latency" .PP The minimum, the average and the maximum time (in seconds) required to process a REQ_CALL message from client\&. This includes the time required to migrate a record from remote node, if the record is not available on the local node\&. .SS "childwrite_latency" .PP Default: 0 .PP The minimum, the average and the maximum time (in seconds) required to update records under a transaction\&. .SH "DATABASE STATISTICS" .PP CTDB maintains per database statistics about important operations\&. See the \fBctdb\fR(1) command \fBdbstatistics\fR for displaying database statistics\&. .SS "Example: ctdb dbstatistics notify_index\&.tdb" .sp .if n \{\ .RS 4 .\} .nf DB Statistics: notify_index\&.tdb ro_delegations 0 ro_revokes 0 locks total 131 failed 0 current 0 pending 0 hop_count_buckets: 9890 5454 26 1 0 0 0 0 0 0 0 0 0 0 0 0 lock_buckets: 4 117 10 0 0 0 0 0 0 0 0 0 0 0 0 0 locks_latency MIN/AVG/MAX 0\&.000683/0\&.004198/0\&.014730 sec out of 131 Num Hot Keys: 3 Count:7 Key:2f636c75737465726673 Count:18 Key:2f636c757374657266732f64617461 Count:7 Key:2f636c757374657266732f646174612f636c69656e7473 .fi .if n \{\ .RE .\} .SS "DB Statistics" .PP Name of the database\&. .SS "ro_delegations" .PP Number of readonly delegations created in the database\&. .SS "ro_revokes" .PP Number of readonly delegations revoked\&. The difference in ro_delegations and ro_revokes indicates the currently active readonly delegations\&. .SS "locks" .PP This section lists locking statistics\&. .sp .it 1 an-trap .nr an-no-space-flag 1 .nr an-break-flag 1 .br .ps +1 \fBtotal\fR .RS 4 .PP Number of completed lock calls\&. This includes database locks and record locks\&. .RE .sp .it 1 an-trap .nr an-no-space-flag 1 .nr an-break-flag 1 .br .ps +1 \fBfailed\fR .RS 4 .PP Number of failed lock calls\&. This includes database locks and record locks\&. .RE .sp .it 1 an-trap .nr an-no-space-flag 1 .nr an-break-flag 1 .br .ps +1 \fBcurrent\fR .RS 4 .PP Number of scheduled lock calls\&. This includes database locks and record locks\&. .RE .sp .it 1 an-trap .nr an-no-space-flag 1 .nr an-break-flag 1 .br .ps +1 \fBpending\fR .RS 4 .PP Number of queued lock calls\&. This includes database locks and record locks\&. .RE .SS "hop_count_buckets" .PP Distribution of migration requests based on hop counts values\&. Buckets are 1, < 4, < 8, < 16, < 32, < 64, < 128, < 256, < 512, ≥ 512\&. .SS "lock_buckets" .PP Distribution of record lock requests based on time required to obtain locks\&. Buckets are < 1ms, < 10ms, < 100ms, < 1s, < 2s, < 4s, < 8s, < 16s, < 32s, < 64s, ≥ 64s\&. .SS "locks_latency" .PP The minimum, the average and the maximum time (in seconds) required to obtain record locks\&. .SS "Num Hot Keys" .PP Number of contended records determined by hop count\&. CTDB keeps track of top 10 hot records and the output shows hex encoded keys for the hot records\&. .SH "SEE ALSO" .PP \fBctdb\fR(1), \fBctdbd\fR(1), \fBctdb-tunables\fR(7), \m[blue]\fB\%http://ctdb.samba.org/\fR\m[] .SH "AUTHOR" .br .PP This documentation was written by Amitay Isaacs, Martin Schwenke .SH "COPYRIGHT" .br Copyright \(co 2007 Andrew Tridgell, Ronnie Sahlberg .br .PP This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version\&. .PP This program 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 General Public License for more details\&. .PP You should have received a copy of the GNU General Public License along with this program; if not, see \m[blue]\fB\%http://www.gnu.org/licenses\fR\m[]\&. .sp Index: head/net/samba410/files/man/ctdb-tunables.7 =================================================================== --- head/net/samba410/files/man/ctdb-tunables.7 (revision 505445) +++ head/net/samba410/files/man/ctdb-tunables.7 (revision 505446) @@ -1,409 +1,424 @@ '\" t .\" Title: ctdb-tunables .\" Author: .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 11/20/2017 +.\" Date: 11/18/2018 .\" Manual: CTDB - clustered TDB database .\" Source: ctdb .\" Language: English .\" -.TH "CTDB\-TUNABLES" "7" "11/20/2017" "ctdb" "CTDB \- clustered TDB database" +.TH "CTDB\-TUNABLES" "7" "11/18/2018" "ctdb" "CTDB \- clustered TDB database" .\" ----------------------------------------------------------------- .\" * 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" ctdb-tunables \- CTDB tunable configuration variables .SH "DESCRIPTION" .PP CTDB\*(Aqs behaviour can be configured by setting run\-time tunable variables\&. This lists and describes all tunables\&. See the \fBctdb\fR(1) \fBlistvars\fR, \fBsetvar\fR and \fBgetvar\fR commands for more details\&. .PP Unless otherwise stated, tunables should be set to the same value on all nodes\&. Setting tunables to different values across nodes may produce unexpected results\&. Future releases may set (some or most) tunables globally across the cluster but doing so is currently a manual process\&. .PP -The tunable variables are listed alphabetically\&. +Tunables can be set at startup from the +/usr/local/etc/ctdb/ctdb\&.tunables +configuration file\&. +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fITUNABLE\fR=\fIVALUE\fR + +.fi +.if n \{\ +.RE +.\} +.PP +For example: +.sp +.if n \{\ +.RS 4 +.\} +.nf +MonitorInterval=20 + +.fi +.if n \{\ +.RE +.\} +.PP +The available tunable variables are listed alphabetically below\&. .SS "AllowClientDBAttach" .PP Default: 1 .PP When set to 0, clients are not allowed to attach to any databases\&. This can be used to temporarily block any new processes from attaching to and accessing the databases\&. This is mainly used for detaching a volatile database using \*(Aqctdb detach\*(Aq\&. .SS "AllowMixedVersions" .PP Default: 0 .PP CTDB will not allow incompatible versions to co\-exist in a cluster\&. If a version mismatch is found, then losing CTDB will shutdown\&. To disable the incompatible version check, set this tunable to 1\&. .PP For version checking, CTDB uses major and minor version\&. For example, CTDB 4\&.6\&.1 and CTDB CTDB 4\&.6\&.2 are matching versions; CTDB 4\&.5\&.x and CTDB 4\&.6\&.y do not match\&. .PP CTDB with version check support will lose to CTDB without version check support\&. Between two different CTDB versions with version check support, one running for less time will lose\&. If the running time for both CTDB versions with version check support is equal (to seconds), then the older version will lose\&. The losing CTDB daemon will shutdown\&. .SS "AllowUnhealthyDBRead" .PP Default: 0 .PP When set to 1, ctdb allows database traverses to read unhealthy databases\&. By default, ctdb does not allow reading records from unhealthy databases\&. .SS "ControlTimeout" .PP Default: 60 .PP This is the default setting for timeout for when sending a control message to either the local or a remote ctdb daemon\&. .SS "DatabaseHashSize" .PP Default: 100001 .PP Number of the hash chains for the local store of the tdbs that ctdb manages\&. .SS "DatabaseMaxDead" .PP Default: 5 .PP Maximum number of dead records per hash chain for the tdb databses managed by ctdb\&. .SS "DBRecordCountWarn" .PP Default: 100000 .PP When set to non\-zero, ctdb will log a warning during recovery if a database has more than this many records\&. This will produce a warning if a database grows uncontrollably with orphaned records\&. .SS "DBRecordSizeWarn" .PP Default: 10000000 .PP When set to non\-zero, ctdb will log a warning during recovery if a single record is bigger than this size\&. This will produce a warning if a database record grows uncontrollably\&. .SS "DBSizeWarn" .PP Default: 1000000000 .PP When set to non\-zero, ctdb will log a warning during recovery if a database size is bigger than this\&. This will produce a warning if a database grows uncontrollably\&. .SS "DeferredAttachTO" .PP Default: 120 .PP When databases are frozen we do not allow clients to attach to the databases\&. Instead of returning an error immediately to the client, the attach request from the client is deferred until the database becomes available again at which stage we respond to the client\&. .PP This timeout controls how long we will defer the request from the client before timing it out and returning an error to the client\&. -.SS "DisableIPFailover" -.PP -Default: 0 -.PP -When set to non\-zero, ctdb will not perform failover or failback\&. Even if a node fails while holding public IPs, ctdb will not recover the IPs or assign them to another node\&. -.PP -When this tunable is enabled, ctdb will no longer attempt to recover the cluster by failing IP addresses over to other nodes\&. This leads to a service outage until the administrator has manually performed IP failover to replacement nodes using the \*(Aqctdb moveip\*(Aq command\&. .SS "ElectionTimeout" .PP Default: 3 .PP The number of seconds to wait for the election of recovery master to complete\&. If the election is not completed during this interval, then that round of election fails and ctdb starts a new election\&. .SS "EnableBans" .PP Default: 1 .PP This parameter allows ctdb to ban a node if the node is misbehaving\&. .PP When set to 0, this disables banning completely in the cluster and thus nodes can not get banned, even it they break\&. Don\*(Aqt set to 0 unless you know what you are doing\&. .SS "EventScriptTimeout" .PP Default: 30 .PP Maximum time in seconds to allow an event to run before timing out\&. This is the total time for all enabled scripts that are run for an event, not just a single event script\&. .PP Note that timeouts are ignored for some events ("takeip", "releaseip", "startrecovery", "recovered") and converted to success\&. The logic here is that the callers of these events implement their own additional timeout\&. .SS "FetchCollapse" .PP Default: 1 .PP This parameter is used to avoid multiple migration requests for the same record from a single node\&. All the record requests for the same record are queued up and processed when the record is migrated to the current node\&. .PP When many clients across many nodes try to access the same record at the same time this can lead to a fetch storm where the record becomes very active and bounces between nodes very fast\&. This leads to high CPU utilization of the ctdbd daemon, trying to bounce that record around very fast, and poor performance\&. This can improve performance and reduce CPU utilization for certain workloads\&. .SS "HopcountMakeSticky" .PP Default: 50 .PP For database(s) marked STICKY (using \*(Aqctdb setdbsticky\*(Aq), any record that is migrating so fast that hopcount exceeds this limit is marked as STICKY record for \fIStickyDuration\fR seconds\&. This means that after each migration the sticky record will be kept on the node \fIStickyPindown\fRmilliseconds and prevented from being migrated off the node\&. .PP This will improve performance for certain workloads, such as locking\&.tdb if many clients are opening/closing the same file concurrently\&. .SS "IPAllocAlgorithm" .PP Default: 2 .PP Selects the algorithm that CTDB should use when doing public IP address allocation\&. Meaningful values are: .PP 0 .RS 4 Deterministic IP address allocation\&. .sp This is a simple and fast option\&. However, it can cause unnecessary address movement during fail\-over because each address has a "home" node\&. Works badly when some nodes do not have any addresses defined\&. Should be used with care when addresses are defined across multiple networks\&. .RE .PP 1 .RS 4 Non\-deterministic IP address allocation\&. .sp This is a relatively fast option that attempts to do a minimise unnecessary address movements\&. Addresses do not have a "home" node\&. Rebalancing is limited but it usually adequate\&. Works badly when addresses are defined across multiple networks\&. .RE .PP 2 .RS 4 LCP2 IP address allocation\&. .sp Uses a heuristic to assign addresses defined across multiple networks, usually balancing addresses on each network evenly across nodes\&. Addresses do not have a "home" node\&. Minimises unnecessary address movements\&. The algorithm is complex, so is slower than other choices for a large number of addresses\&. However, it can calculate an optimal assignment of 900 addresses in under 10 seconds on modern hardware\&. .RE .PP If the specified value is not one of these then the default will be used\&. .SS "KeepaliveInterval" .PP Default: 5 .PP How often in seconds should the nodes send keep\-alive packets to each other\&. .SS "KeepaliveLimit" .PP Default: 5 .PP After how many keepalive intervals without any traffic should a node wait until marking the peer as DISCONNECTED\&. .PP If a node has hung, it can take \fIKeepaliveInterval\fR * (\fIKeepaliveLimit\fR + 1) seconds before ctdb determines that the node is DISCONNECTED and performs a recovery\&. This limit should not be set too high to enable early detection and avoid any application timeouts (e\&.g\&. SMB1) to kick in before the fail over is completed\&. .SS "LockProcessesPerDB" .PP Default: 200 .PP This is the maximum number of lock helper processes ctdb will create for obtaining record locks\&. When ctdb cannot get a record lock without blocking, it creates a helper process that waits for the lock to be obtained\&. .SS "LogLatencyMs" .PP Default: 0 .PP When set to non\-zero, ctdb will log if certains operations take longer than this value, in milliseconds, to complete\&. These operations include "process a record request from client", "take a record or database lock", "update a persistent database record" and "vaccum a database"\&. .SS "MaxQueueDropMsg" .PP Default: 1000000 .PP This is the maximum number of messages to be queued up for a client before ctdb will treat the client as hung and will terminate the client connection\&. .SS "MonitorInterval" .PP Default: 15 .PP How often should ctdb run the \*(Aqmonitor\*(Aq event in seconds to check for a node\*(Aqs health\&. .SS "MonitorTimeoutCount" .PP Default: 20 .PP How many \*(Aqmonitor\*(Aq events in a row need to timeout before a node is flagged as UNHEALTHY\&. This setting is useful if scripts can not be written so that they do not hang for benign reasons\&. .SS "NoIPFailback" .PP Default: 0 .PP When set to 1, ctdb will not perform failback of IP addresses when a node becomes healthy\&. When a node becomes UNHEALTHY, ctdb WILL perform failover of public IP addresses, but when the node becomes HEALTHY again, ctdb will not fail the addresses back\&. .PP Use with caution! Normally when a node becomes available to the cluster ctdb will try to reassign public IP addresses onto the new node as a way to distribute the workload evenly across the clusternode\&. Ctdb tries to make sure that all running nodes have approximately the same number of public addresses it hosts\&. .PP When you enable this tunable, ctdb will no longer attempt to rebalance the cluster by failing IP addresses back to the new nodes\&. An unbalanced cluster will therefore remain unbalanced until there is manual intervention from the administrator\&. When this parameter is set, you can manually fail public IP addresses over to the new node(s) using the \*(Aqctdb moveip\*(Aq command\&. -.SS "NoIPHostOnAllDisabled" -.PP -Default: 0 -.PP -If no nodes are HEALTHY then by default ctdb will happily host public IPs on disabled (unhealthy or administratively disabled) nodes\&. This can cause problems, for example if the underlying cluster filesystem is not mounted\&. When set to 1 and a node is disabled, any IPs hosted by this node will be released and the node will not takeover any IPs until it is no longer disabled\&. .SS "NoIPTakeover" .PP Default: 0 .PP -When set to 1, ctdb will not allow IP addresses to be failed over to other nodes\&. Any IP addresses already hosted on healthy nodes will remain\&. Usually IP addresses hosted on unhealthy nodes will also remain, if NoIPHostOnAllDisabled is 0\&. However, if NoIPHostOnAllDisabled is 1 then IP addresses will be released by unhealthy nodes and will become un\-hosted\&. +When set to 1, ctdb will not allow IP addresses to be failed over to other nodes\&. Any IP addresses already hosted on healthy nodes will remain\&. Any IP addresses hosted on unhealthy nodes will be released by unhealthy nodes and will become un\-hosted\&. .SS "PullDBPreallocation" .PP Default: 10*1024*1024 .PP This is the size of a record buffer to pre\-allocate for sending reply to PULLDB control\&. Usually record buffer starts with size of the first record and gets reallocated every time a new record is added to the record buffer\&. For a large number of records, this can be very inefficient to grow the record buffer one record at a time\&. .SS "QueueBufferSize" .PP Default: 1024 .PP This is the maximum amount of data (in bytes) ctdb will read from a socket at a time\&. .PP For a busy setup, if ctdb is not able to process the TCP sockets fast enough (large amount of data in Recv\-Q for tcp sockets), then this tunable value should be increased\&. However, large values can keep ctdb busy processing packets and prevent ctdb from handling other events\&. .SS "RecBufferSizeLimit" .PP Default: 1000000 .PP This is the limit on the size of the record buffer to be sent in various controls\&. This limit is used by new controls used for recovery and controls used in vacuuming\&. .SS "RecdFailCount" .PP Default: 10 .PP If the recovery daemon has failed to ping the main dameon for this many consecutive intervals, the main daemon will consider the recovery daemon as hung and will try to restart it to recover\&. .SS "RecdPingTimeout" .PP Default: 60 .PP If the main dameon has not heard a "ping" from the recovery dameon for this many seconds, the main dameon will log a message that the recovery daemon is potentially hung\&. This also increments a counter which is checked against \fIRecdFailCount\fR for detection of hung recovery daemon\&. .SS "RecLockLatencyMs" .PP Default: 1000 .PP When using a reclock file for split brain prevention, if set to non\-zero this tunable will make the recovery dameon log a message if the fcntl() call to lock/testlock the recovery file takes longer than this number of milliseconds\&. .SS "RecoverInterval" .PP Default: 1 .PP How frequently in seconds should the recovery daemon perform the consistency checks to determine if it should perform a recovery\&. .SS "RecoverTimeout" .PP Default: 120 .PP This is the default setting for timeouts for controls when sent from the recovery daemon\&. We allow longer control timeouts from the recovery daemon than from normal use since the recovery dameon often use controls that can take a lot longer than normal controls\&. .SS "RecoveryBanPeriod" .PP Default: 300 .PP The duration in seconds for which a node is banned if the node fails during recovery\&. After this time has elapsed the node will automatically get unbanned and will attempt to rejoin the cluster\&. .PP A node usually gets banned due to real problems with the node\&. Don\*(Aqt set this value too small\&. Otherwise, a problematic node will try to re\-join cluster too soon causing unnecessary recoveries\&. .SS "RecoveryDropAllIPs" .PP Default: 120 .PP If a node is stuck in recovery, or stopped, or banned, for this many seconds, then ctdb will release all public addresses on that node\&. .SS "RecoveryGracePeriod" .PP Default: 120 .PP During recoveries, if a node has not caused recovery failures during the last grace period in seconds, any records of transgressions that the node has caused recovery failures will be forgiven\&. This resets the ban\-counter back to zero for that node\&. .SS "RepackLimit" .PP Default: 10000 .PP During vacuuming, if the number of freelist records are more than \fIRepackLimit\fR, then the database is repacked to get rid of the freelist records to avoid fragmentation\&. .PP Databases are repacked only if both \fIRepackLimit\fR and \fIVacuumLimit\fR are exceeded\&. .SS "RerecoveryTimeout" .PP Default: 10 .PP Once a recovery has completed, no additional recoveries are permitted until this timeout in seconds has expired\&. .SS "SeqnumInterval" .PP Default: 1000 .PP -Some databases have seqnum tracking enabled, so that samba will be able to detect asynchronously when there has been updates to the database\&. Everytime a database is updated its sequence number is increased\&. +Some databases have seqnum tracking enabled, so that samba will be able to detect asynchronously when there has been updates to the database\&. Every time a database is updated its sequence number is increased\&. .PP This tunable is used to specify in milliseconds how frequently ctdb will send out updates to remote nodes to inform them that the sequence number is increased\&. .SS "StatHistoryInterval" .PP Default: 1 .PP Granularity of the statistics collected in the statistics history\&. This is reported by \*(Aqctdb stats\*(Aq command\&. .SS "StickyDuration" .PP Default: 600 .PP Once a record has been marked STICKY, this is the duration in seconds, the record will be flagged as a STICKY record\&. .SS "StickyPindown" .PP Default: 200 .PP Once a STICKY record has been migrated onto a node, it will be pinned down on that node for this number of milliseconds\&. Any request from other nodes to migrate the record off the node will be deferred\&. .SS "TakeoverTimeout" .PP Default: 9 .PP This is the duration in seconds in which ctdb tries to complete IP failover\&. -.SS "TDBMutexEnabled" -.PP -Default: 1 -.PP -This parameter enables TDB_MUTEX_LOCKING feature on volatile databases if the robust mutexes are supported\&. This optimizes the record locking using robust mutexes and is much more efficient that using posix locks\&. .SS "TickleUpdateInterval" .PP Default: 20 .PP Every \fITickleUpdateInterval\fR seconds, ctdb synchronizes the client connection information across nodes\&. .SS "TraverseTimeout" .PP Default: 20 .PP This is the duration in seconds for which a database traverse is allowed to run\&. If the traverse does not complete during this interval, ctdb will abort the traverse\&. .SS "VacuumFastPathCount" .PP Default: 60 .PP During a vacuuming run, ctdb usually processes only the records marked for deletion also called the fast path vacuuming\&. After finishing \fIVacuumFastPathCount\fR number of fast path vacuuming runs, ctdb will trigger a scan of complete database for any empty records that need to be deleted\&. .SS "VacuumInterval" .PP Default: 10 .PP Periodic interval in seconds when vacuuming is triggered for volatile databases\&. .SS "VacuumLimit" .PP Default: 5000 .PP During vacuuming, if the number of deleted records are more than \fIVacuumLimit\fR, then databases are repacked to avoid fragmentation\&. .PP Databases are repacked only if both \fIRepackLimit\fR and \fIVacuumLimit\fR are exceeded\&. .SS "VacuumMaxRunTime" .PP Default: 120 .PP The maximum time in seconds for which the vacuuming process is allowed to run\&. If vacuuming process takes longer than this value, then the vacuuming process is terminated\&. .SS "VerboseMemoryNames" .PP Default: 0 .PP When set to non\-zero, ctdb assigns verbose names for some of the talloc allocated memory objects\&. These names are visible in the talloc memory report generated by \*(Aqctdb dumpmemory\*(Aq\&. +.SH "FILES>" +.RS 4 +/usr/local/etc/ctdb/ctdb\&.tunables +.RE .SH "SEE ALSO" .PP \fBctdb\fR(1), \fBctdbd\fR(1), -\fBctdbd.conf\fR(5), +\fBctdb.conf\fR(5), \fBctdb\fR(7), \m[blue]\fB\%http://ctdb.samba.org/\fR\m[] .SH "AUTHOR" .br .PP This documentation was written by Ronnie Sahlberg, Amitay Isaacs, Martin Schwenke .SH "COPYRIGHT" .br Copyright \(co 2007 Andrew Tridgell, Ronnie Sahlberg .br .PP This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version\&. .PP This program 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 General Public License for more details\&. .PP You should have received a copy of the GNU General Public License along with this program; if not, see \m[blue]\fB\%http://www.gnu.org/licenses\fR\m[]\&. .sp Index: head/net/samba410/files/man/ctdb.1 =================================================================== --- head/net/samba410/files/man/ctdb.1 (revision 505445) +++ head/net/samba410/files/man/ctdb.1 (revision 505446) @@ -1,1566 +1,1527 @@ '\" t .\" Title: ctdb .\" Author: .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 11/20/2017 +.\" Date: 11/18/2018 .\" Manual: CTDB - clustered TDB database .\" Source: ctdb .\" Language: English .\" -.TH "CTDB" "1" "11/20/2017" "ctdb" "CTDB \- clustered TDB database" +.TH "CTDB" "1" "11/18/2018" "ctdb" "CTDB \- clustered TDB database" .\" ----------------------------------------------------------------- .\" * 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" ctdb \- CTDB management utility .SH "SYNOPSIS" .HP \w'\fBctdb\fR\ 'u \fBctdb\fR [\fIOPTION\fR...] {\fICOMMAND\fR} [\fICOMMAND\-ARGS\fR] .SH "DESCRIPTION" .PP ctdb is a utility to view and manage a CTDB cluster\&. .PP The following terms are used when referring to nodes in a cluster: .PP PNN .RS 4 Physical Node Number\&. The physical node number is an integer that describes the node in the cluster\&. The first node has physical node number 0\&. in a cluster\&. .RE .PP PNN\-LIST .RS 4 This is either a single PNN, a comma\-separate list of PNNs or "all"\&. .RE .PP Commands that reference a database use the following terms: .PP DB .RS 4 This is either a database name, such as locking\&.tdb or a database ID such as "0x42fe72c5"\&. .RE .PP DB\-LIST .RS 4 A space separated list of at least one \fIDB\fR\&. .RE .SH "OPTIONS" .PP \-n \fIPNN\fR .RS 4 The node specified by PNN should be queried for the requested information\&. Default is to query the daemon running on the local host\&. .RE .PP \-Y .RS 4 Produce output in machine readable form for easier parsing by scripts\&. This uses a field delimiter of \*(Aq:\*(Aq\&. Not all commands support this option\&. .RE .PP \-x \fISEPARATOR\fR .RS 4 Use SEPARATOR to delimit fields in machine readable output\&. This implies \-Y\&. .RE .PP \-X .RS 4 Produce output in machine readable form for easier parsing by scripts\&. This uses a field delimiter of \*(Aq|\*(Aq\&. Not all commands support this option\&. .sp This is equivalent to "\-x|" and avoids some shell quoting issues\&. .RE .PP \-t \fITIMEOUT\fR .RS 4 Indicates that ctdb should wait up to TIMEOUT seconds for a response to most commands sent to the CTDB daemon\&. The default is 10 seconds\&. .RE .PP \-T \fITIMELIMIT\fR .RS 4 Indicates that TIMELIMIT is the maximum run time (in seconds) for the ctdb command\&. When TIMELIMIT is exceeded the ctdb command will terminate with an error\&. The default is 120 seconds\&. .RE .PP \-? \-\-help .RS 4 Print some help text to the screen\&. .RE .PP \-\-usage .RS 4 Print useage information to the screen\&. .RE .PP \-d \-\-debug=\fIDEBUGLEVEL\fR .RS 4 Change the debug level for the command\&. Default is NOTICE\&. .RE -.PP -\-\-socket=\fIFILENAME\fR -.RS 4 -Specify that FILENAME is the name of the Unix domain socket to use when connecting to the local CTDB daemon\&. The default is -/usr/local/var/run/ctdb/ctdbd\&.socket\&. -.RE .SH "ADMINISTRATIVE COMMANDS" .PP These are commands used to monitor and administer a CTDB cluster\&. .SS "pnn" .PP This command displays the PNN of the current node\&. .SS "status" .PP This command shows the current status of all CTDB nodes based on information from the queried node\&. .PP Note: If the the queried node is INACTIVE then the status might not be current\&. .sp .it 1 an-trap .nr an-no-space-flag 1 .nr an-break-flag 1 .br .ps +1 \fBNode status\fR .RS 4 .PP This includes the number of physical nodes and the status of each node\&. See \fBctdb\fR(7) for information about node states\&. .RE .sp .it 1 an-trap .nr an-no-space-flag 1 .nr an-break-flag 1 .br .ps +1 \fBGeneration\fR .RS 4 .PP The generation id is a number that indicates the current generation of a cluster instance\&. Each time a cluster goes through a reconfiguration or a recovery its generation id will be changed\&. .PP This number does not have any particular meaning other than to keep track of when a cluster has gone through a recovery\&. It is a random number that represents the current instance of a ctdb cluster and its databases\&. The CTDB daemon uses this number internally to be able to tell when commands to operate on the cluster and the databases was issued in a different generation of the cluster, to ensure that commands that operate on the databases will not survive across a cluster database recovery\&. After a recovery, all old outstanding commands will automatically become invalid\&. .PP Sometimes this number will be shown as "INVALID"\&. This only means that the ctdbd daemon has started but it has not yet merged with the cluster through a recovery\&. All nodes start with generation "INVALID" and are not assigned a real generation id until they have successfully been merged with a cluster through a recovery\&. .RE .sp .it 1 an-trap .nr an-no-space-flag 1 .nr an-break-flag 1 .br .ps +1 \fBVirtual Node Number (VNN) map\fR .RS 4 .PP -Consists of the number of virtual nodes and mapping from virtual node numbers to physical node numbers\&. Virtual nodes host CTDB databases\&. Only nodes that are participating in the VNN map can become lmaster or dmaster for database records\&. +Consists of the number of virtual nodes and mapping from virtual node numbers to physical node numbers\&. Only nodes that are participating in the VNN map can become lmaster for database records\&. .RE .sp .it 1 an-trap .nr an-no-space-flag 1 .nr an-break-flag 1 .br .ps +1 \fBRecovery mode\fR .RS 4 .PP This is the current recovery mode of the cluster\&. There are two possible modes: .PP NORMAL \- The cluster is fully operational\&. .PP RECOVERY \- The cluster databases have all been frozen, pausing all services while the cluster awaits a recovery process to complete\&. A recovery process should finish within seconds\&. If a cluster is stuck in the RECOVERY state this would indicate a cluster malfunction which needs to be investigated\&. .PP Once the recovery master detects an inconsistency, for example a node becomes disconnected/connected, the recovery daemon will trigger a cluster recovery process, where all databases are remerged across the cluster\&. When this process starts, the recovery master will first "freeze" all databases to prevent applications such as samba from accessing the databases and it will also mark the recovery mode as RECOVERY\&. .PP When the CTDB daemon starts up, it will start in RECOVERY mode\&. Once the node has been merged into a cluster and all databases have been recovered, the node mode will change into NORMAL mode and the databases will be "thawed", allowing samba to access the databases again\&. .RE .sp .it 1 an-trap .nr an-no-space-flag 1 .nr an-break-flag 1 .br .ps +1 \fBRecovery master\fR .RS 4 .PP This is the cluster node that is currently designated as the recovery master\&. This node is responsible of monitoring the consistency of the cluster and to perform the actual recovery process when reqired\&. .PP Only one node at a time can be the designated recovery master\&. Which node is designated the recovery master is decided by an election process in the recovery daemons running on each node\&. .RE .sp .it 1 an-trap .nr an-no-space-flag 1 .nr an-break-flag 1 .br .ps +1 \fBExample\fR .RS 4 .sp .if n \{\ .RS 4 .\} .nf # ctdb status Number of nodes:4 pnn:0 192\&.168\&.2\&.200 OK (THIS NODE) pnn:1 192\&.168\&.2\&.201 OK pnn:2 192\&.168\&.2\&.202 OK pnn:3 192\&.168\&.2\&.203 OK Generation:1362079228 Size:4 hash:0 lmaster:0 hash:1 lmaster:1 hash:2 lmaster:2 hash:3 lmaster:3 Recovery mode:NORMAL (0) Recovery master:0 .fi .if n \{\ .RE .\} .RE .SS "nodestatus [\fIPNN\-LIST\fR]" .PP This command is similar to the \fBstatus\fR command\&. It displays the "node status" subset of output\&. The main differences are: .sp .RS 4 .ie n \{\ \h'-04'\(bu\h'+03'\c .\} .el \{\ .sp -1 .IP \(bu 2.3 .\} The exit code is the bitwise\-OR of the flags for each specified node, while \fBctdb status\fR exits with 0 if it was able to retrieve status for all nodes\&. .RE .sp .RS 4 .ie n \{\ \h'-04'\(bu\h'+03'\c .\} .el \{\ .sp -1 .IP \(bu 2.3 .\} \fBctdb status\fR provides status information for all nodes\&. \fBctdb nodestatus\fR defaults to providing status for only the current node\&. If PNN\-LIST is provided then status is given for the indicated node(s)\&. .RE .PP A common invocation in scripts is \fBctdb nodestatus all\fR to check whether all nodes in a cluster are healthy\&. .sp .it 1 an-trap .nr an-no-space-flag 1 .nr an-break-flag 1 .br .ps +1 \fBExample\fR .RS 4 .sp .if n \{\ .RS 4 .\} .nf # ctdb nodestatus pnn:0 10\&.0\&.0\&.30 OK (THIS NODE) # ctdb nodestatus all Number of nodes:2 pnn:0 10\&.0\&.0\&.30 OK (THIS NODE) pnn:1 10\&.0\&.0\&.31 OK .fi .if n \{\ .RE .\} .RE .SS "recmaster" .PP This command shows the pnn of the node which is currently the recmaster\&. .PP Note: If the the queried node is INACTIVE then the status might not be current\&. .SS "uptime" .PP This command shows the uptime for the ctdb daemon\&. When the last recovery or ip\-failover completed and how long it took\&. If the "duration" is shown as a negative number, this indicates that there is a recovery/failover in progress and it started that many seconds ago\&. .sp .it 1 an-trap .nr an-no-space-flag 1 .nr an-break-flag 1 .br .ps +1 \fBExample\fR .RS 4 .sp .if n \{\ .RS 4 .\} .nf # ctdb uptime Current time of node : Thu Oct 29 10:38:54 2009 Ctdbd start time : (000 16:54:28) Wed Oct 28 17:44:26 2009 Time of last recovery/failover: (000 16:53:31) Wed Oct 28 17:45:23 2009 Duration of last recovery/failover: 2\&.248552 seconds .fi .if n \{\ .RE .\} .RE .SS "listnodes" .PP This command shows lists the ip addresses of all the nodes in the cluster\&. .sp .it 1 an-trap .nr an-no-space-flag 1 .nr an-break-flag 1 .br .ps +1 \fBExample\fR .RS 4 .sp .if n \{\ .RS 4 .\} .nf # ctdb listnodes 192\&.168\&.2\&.200 192\&.168\&.2\&.201 192\&.168\&.2\&.202 192\&.168\&.2\&.203 .fi .if n \{\ .RE .\} .RE .SS "natgw {master|list|status}" .PP This command shows different aspects of NAT gateway status\&. For an overview of CTDB\*(Aqs NAT gateway functionality please see the NAT GATEWAY section in \fBctdb\fR(7)\&. .PP master .RS 4 Show the PNN and private IP address of the current NAT gateway master node\&. .sp Example output: .sp .if n \{\ .RS 4 .\} .nf 1 192\&.168\&.2\&.201 .fi .if n \{\ .RE .\} .RE .PP list .RS 4 List the private IP addresses of nodes in the current NAT gateway group, annotating the master node\&. .sp Example output: .sp .if n \{\ .RS 4 .\} .nf 192\&.168\&.2\&.200 192\&.168\&.2\&.201 MASTER 192\&.168\&.2\&.202 192\&.168\&.2\&.203 .fi .if n \{\ .RE .\} .RE .PP status .RS 4 List the nodes in the current NAT gateway group and their status\&. .sp Example output: .sp .if n \{\ .RS 4 .\} .nf pnn:0 192\&.168\&.2\&.200 UNHEALTHY (THIS NODE) pnn:1 192\&.168\&.2\&.201 OK pnn:2 192\&.168\&.2\&.202 OK pnn:3 192\&.168\&.2\&.203 OK .fi .if n \{\ .RE .\} .RE .SS "ping" .PP This command will "ping" specified CTDB nodes in the cluster to verify that they are running\&. .sp .it 1 an-trap .nr an-no-space-flag 1 .nr an-break-flag 1 .br .ps +1 \fBExample\fR .RS 4 .sp .if n \{\ .RS 4 .\} .nf # ctdb ping response from 0 time=0\&.000054 sec (3 clients) .fi .if n \{\ .RE .\} .RE .SS "ifaces" .PP This command will display the list of network interfaces, which could host public addresses, along with their status\&. .sp .it 1 an-trap .nr an-no-space-flag 1 .nr an-break-flag 1 .br .ps +1 \fBExample\fR .RS 4 .sp .if n \{\ .RS 4 .\} .nf # ctdb ifaces Interfaces on node 0 name:eth5 link:up references:2 name:eth4 link:down references:0 name:eth3 link:up references:1 name:eth2 link:up references:1 # ctdb \-X ifaces |Name|LinkStatus|References| |eth5|1|2| |eth4|0|0| |eth3|1|1| |eth2|1|1| .fi .if n \{\ .RE .\} .RE .SS "ip" .PP This command will display the list of public addresses that are provided by the cluster and which physical node is currently serving this ip\&. By default this command will ONLY show those public addresses that are known to the node itself\&. To see the full list of all public ips across the cluster you must use "ctdb ip all"\&. .sp .it 1 an-trap .nr an-no-space-flag 1 .nr an-break-flag 1 .br .ps +1 \fBExample\fR .RS 4 .sp .if n \{\ .RS 4 .\} .nf # ctdb ip \-v Public IPs on node 0 172\&.31\&.91\&.82 node[1] active[] available[eth2,eth3] configured[eth2,eth3] 172\&.31\&.91\&.83 node[0] active[eth3] available[eth2,eth3] configured[eth2,eth3] 172\&.31\&.91\&.84 node[1] active[] available[eth2,eth3] configured[eth2,eth3] 172\&.31\&.91\&.85 node[0] active[eth2] available[eth2,eth3] configured[eth2,eth3] 172\&.31\&.92\&.82 node[1] active[] available[eth5] configured[eth4,eth5] 172\&.31\&.92\&.83 node[0] active[eth5] available[eth5] configured[eth4,eth5] 172\&.31\&.92\&.84 node[1] active[] available[eth5] configured[eth4,eth5] 172\&.31\&.92\&.85 node[0] active[eth5] available[eth5] configured[eth4,eth5] # ctdb \-X ip \-v |Public IP|Node|ActiveInterface|AvailableInterfaces|ConfiguredInterfaces| |172\&.31\&.91\&.82|1||eth2,eth3|eth2,eth3| |172\&.31\&.91\&.83|0|eth3|eth2,eth3|eth2,eth3| |172\&.31\&.91\&.84|1||eth2,eth3|eth2,eth3| |172\&.31\&.91\&.85|0|eth2|eth2,eth3|eth2,eth3| |172\&.31\&.92\&.82|1||eth5|eth4,eth5| |172\&.31\&.92\&.83|0|eth5|eth5|eth4,eth5| |172\&.31\&.92\&.84|1||eth5|eth4,eth5| |172\&.31\&.92\&.85|0|eth5|eth5|eth4,eth5| .fi .if n \{\ .RE .\} .RE .SS "ipinfo \fIIP\fR" .PP This command will display details about the specified public addresses\&. .sp .it 1 an-trap .nr an-no-space-flag 1 .nr an-break-flag 1 .br .ps +1 \fBExample\fR .RS 4 .sp .if n \{\ .RS 4 .\} .nf # ctdb ipinfo 172\&.31\&.92\&.85 Public IP[172\&.31\&.92\&.85] info on node 0 IP:172\&.31\&.92\&.85 CurrentNode:0 NumInterfaces:2 Interface[1]: Name:eth4 Link:down References:0 Interface[2]: Name:eth5 Link:up References:2 (active) .fi .if n \{\ .RE .\} .RE .SS "event run|status|script list|script enable|script disable" .PP This command is used to control event daemon and to inspect status of various events\&. .PP -run \fIEVENT\fR \fITIMEOUT\fR [\fIARGUMENTS\fR] +The commands below require a component to be specified\&. In the current version the only valid component is +legacy\&. +.PP +run \fITIMEOUT\fR \fICOMPONENT\fR \fIEVENT\fR [\fIARGUMENTS\fR] .RS 4 -This command can be used to manually run specified EVENT with optional ARGUMENTS\&. The event will be allowed to run a maximum of TIMEOUT seconds\&. If TIMEOUT is 0, then there is no time limit for running the event\&. +This command can be used to manually run specified EVENT in COMPONENT with optional ARGUMENTS\&. The event will be allowed to run a maximum of TIMEOUT seconds\&. If TIMEOUT is 0, then there is no time limit for running the event\&. .RE .PP -status [\fIEVENT\fR] [lastrun|lastpass|lastfail] +status \fICOMPONENT\fR \fIEVENT\fR .RS 4 -This command displays the last execution status of the specified EVENT\&. If no event is specified, then the status of last executed monitor event will be displayed\&. +This command displays the last execution status of the specified EVENT in COMPONENT\&. .sp -To see the last successful execution of the event, lastpass can be specified\&. Similarly lastfail can be specified to see the last unsuccessful execution of the event\&. The optional lastrun can be specified to query the last execution of the event\&. +The command will terminate with the exit status corresponding to the overall status of event that is displayed\&. .sp -The command will terminate with the exit status corresponding to the overall status of event that is displayed\&. If lastpass is specified, then the command will always terminate with 0\&. If lastfail is specified then the command will always terminate with non\-zero exit status\&. If lastrun is specified, then the command will terminate with 0 or not depending on if the last execution of the event was successful or not\&. -.sp The output is the list of event scripts executed\&. Each line shows the name, status, duration and start time for each script\&. .sp Example output: .sp .if n \{\ .RS 4 .\} .nf 00\&.ctdb OK 0\&.014 Sat Dec 17 19:39:11 2016 01\&.reclock OK 0\&.013 Sat Dec 17 19:39:11 2016 05\&.system OK 0\&.029 Sat Dec 17 19:39:11 2016 06\&.nfs OK 0\&.014 Sat Dec 17 19:39:11 2016 -10\&.external DISABLED 10\&.interface OK 0\&.037 Sat Dec 17 19:39:11 2016 11\&.natgw OK 0\&.011 Sat Dec 17 19:39:11 2016 11\&.routing OK 0\&.007 Sat Dec 17 19:39:11 2016 13\&.per_ip_routing OK 0\&.007 Sat Dec 17 19:39:11 2016 20\&.multipathd OK 0\&.007 Sat Dec 17 19:39:11 2016 31\&.clamd OK 0\&.007 Sat Dec 17 19:39:11 2016 40\&.vsftpd OK 0\&.013 Sat Dec 17 19:39:11 2016 41\&.httpd OK 0\&.018 Sat Dec 17 19:39:11 2016 49\&.winbind OK 0\&.023 Sat Dec 17 19:39:11 2016 50\&.samba OK 0\&.100 Sat Dec 17 19:39:12 2016 60\&.nfs OK 0\&.376 Sat Dec 17 19:39:12 2016 70\&.iscsi OK 0\&.009 Sat Dec 17 19:39:12 2016 91\&.lvs OK 0\&.007 Sat Dec 17 19:39:12 2016 -99\&.timeout OK 0\&.007 Sat Dec 17 19:39:12 2016 .fi .if n \{\ .RE .\} .RE .PP -script list +script list \fICOMPONENT\fR .RS 4 -List the available event scripts\&. +List the available event scripts in COMPONENT\&. Enabled scripts are flagged with a \*(Aq*\*(Aq\&. .sp +Generally, event scripts are provided by CTDB\&. However, local or 3rd party event scripts may also be available\&. These are shown in a separate section after those provided by CTDB\&. +.sp Example output: .sp .if n \{\ .RS 4 .\} .nf -00\&.ctdb -01\&.reclock -05\&.system -06\&.nfs -10\&.external DISABLED -10\&.interface -11\&.natgw -11\&.routing -13\&.per_ip_routing -20\&.multipathd -31\&.clamd -40\&.vsftpd -41\&.httpd -49\&.winbind -50\&.samba -60\&.nfs -70\&.iscsi -91\&.lvs -99\&.timeout +* 00\&.ctdb +* 01\&.reclock +* 05\&.system +* 06\&.nfs +* 10\&.interface + 11\&.natgw + 11\&.routing + 13\&.per_ip_routing + 20\&.multipathd + 31\&.clamd + 40\&.vsftpd + 41\&.httpd +* 49\&.winbind +* 50\&.samba +* 60\&.nfs + 70\&.iscsi + 91\&.lvs + +* 02\&.local .fi .if n \{\ .RE .\} .RE .PP -script enable \fISCRIPT\fR +script enable \fICOMPONENT\fR \fISCRIPT\fR .RS 4 -Enable the specified event SCRIPT\&. Only enabled scripts will be executed when running any event\&. +Enable the specified event SCRIPT in COMPONENT\&. Only enabled scripts will be executed when running any event\&. .RE .PP -script disable \fISCRIPT\fR +script disable \fICOMPONENT\fR \fISCRIPT\fR .RS 4 -Disable the specified event SCRIPT\&. This will prevent the script from executing when running any event\&. +Disable the specified event SCRIPT in COMPONENT\&. This will prevent the script from executing when running any event\&. .RE .SS "scriptstatus" .PP This command displays which event scripts where run in the previous monitoring cycle and the result of each script\&. If a script failed with an error, causing the node to become unhealthy, the output from that script is also shown\&. .PP This command is deprecated\&. It\*(Aqs provided for backward compatibility\&. In place of \fBctdb scriptstatus\fR, use \fBctdb event status\fR\&. .sp .it 1 an-trap .nr an-no-space-flag 1 .nr an-break-flag 1 .br .ps +1 \fBExample\fR .RS 4 .sp .if n \{\ .RS 4 .\} .nf # ctdb scriptstatus 00\&.ctdb OK 0\&.011 Sat Dec 17 19:40:46 2016 01\&.reclock OK 0\&.010 Sat Dec 17 19:40:46 2016 05\&.system OK 0\&.030 Sat Dec 17 19:40:46 2016 06\&.nfs OK 0\&.014 Sat Dec 17 19:40:46 2016 -10\&.external DISABLED 10\&.interface OK 0\&.041 Sat Dec 17 19:40:46 2016 11\&.natgw OK 0\&.008 Sat Dec 17 19:40:46 2016 11\&.routing OK 0\&.007 Sat Dec 17 19:40:46 2016 13\&.per_ip_routing OK 0\&.007 Sat Dec 17 19:40:46 2016 20\&.multipathd OK 0\&.007 Sat Dec 17 19:40:46 2016 31\&.clamd OK 0\&.007 Sat Dec 17 19:40:46 2016 40\&.vsftpd OK 0\&.013 Sat Dec 17 19:40:46 2016 41\&.httpd OK 0\&.015 Sat Dec 17 19:40:46 2016 49\&.winbind OK 0\&.022 Sat Dec 17 19:40:46 2016 50\&.samba ERROR 0\&.077 Sat Dec 17 19:40:46 2016 OUTPUT: ERROR: samba tcp port 445 is not responding .fi .if n \{\ .RE .\} .RE .SS "listvars" .PP List all tuneable variables, except the values of the obsolete tunables like VacuumMinInterval\&. The obsolete tunables can be retrieved only explicitly with the "ctdb getvar" command\&. .sp .it 1 an-trap .nr an-no-space-flag 1 .nr an-break-flag 1 .br .ps +1 \fBExample\fR .RS 4 .sp .if n \{\ .RS 4 .\} .nf # ctdb listvars SeqnumInterval = 1000 ControlTimeout = 60 TraverseTimeout = 20 KeepaliveInterval = 5 KeepaliveLimit = 5 RecoverTimeout = 120 RecoverInterval = 1 ElectionTimeout = 3 TakeoverTimeout = 9 MonitorInterval = 15 TickleUpdateInterval = 20 EventScriptTimeout = 30 MonitorTimeoutCount = 20 RecoveryGracePeriod = 120 RecoveryBanPeriod = 300 DatabaseHashSize = 100001 DatabaseMaxDead = 5 RerecoveryTimeout = 10 EnableBans = 1 NoIPFailback = 0 -DisableIPFailover = 0 VerboseMemoryNames = 0 RecdPingTimeout = 60 RecdFailCount = 10 LogLatencyMs = 0 RecLockLatencyMs = 1000 RecoveryDropAllIPs = 120 VacuumInterval = 10 VacuumMaxRunTime = 120 RepackLimit = 10000 VacuumLimit = 5000 VacuumFastPathCount = 60 MaxQueueDropMsg = 1000000 AllowUnhealthyDBRead = 0 StatHistoryInterval = 1 DeferredAttachTO = 120 AllowClientDBAttach = 1 RecoverPDBBySeqNum = 1 DeferredRebalanceOnNodeAdd = 300 FetchCollapse = 1 HopcountMakeSticky = 50 StickyDuration = 600 StickyPindown = 200 NoIPTakeover = 0 DBRecordCountWarn = 100000 DBRecordSizeWarn = 10000000 DBSizeWarn = 100000000 PullDBPreallocation = 10485760 -NoIPHostOnAllDisabled = 0 -TDBMutexEnabled = 1 LockProcessesPerDB = 200 RecBufferSizeLimit = 1000000 QueueBufferSize = 1024 IPAllocAlgorithm = 2 .fi .if n \{\ .RE .\} .RE .SS "getvar \fINAME\fR" .PP Get the runtime value of a tuneable variable\&. .sp .it 1 an-trap .nr an-no-space-flag 1 .nr an-break-flag 1 .br .ps +1 \fBExample\fR .RS 4 .sp .if n \{\ .RS 4 .\} .nf # ctdb getvar MonitorInterval MonitorInterval = 15 .fi .if n \{\ .RE .\} .RE .SS "setvar \fINAME\fR \fIVALUE\fR" .PP Set the runtime value of a tuneable variable\&. .sp .it 1 an-trap .nr an-no-space-flag 1 .nr an-break-flag 1 .br .ps +1 \fBExample\fR .RS 4 .sp .if n \{\ .RS 4 .\} .nf # ctdb setvar MonitorInterval 20 .fi .if n \{\ .RE .\} .RE .SS "lvs {master|list|status}" .PP This command shows different aspects of LVS status\&. For an overview of CTDB\*(Aqs LVS functionality please see the LVS section in \fBctdb\fR(7)\&. .PP master .RS 4 Shows the PNN of the current LVS master node\&. .sp Example output: .sp .if n \{\ .RS 4 .\} .nf 2 .fi .if n \{\ .RE .\} .RE .PP list .RS 4 Lists the currently usable LVS nodes\&. .sp Example output: .sp .if n \{\ .RS 4 .\} .nf 2 10\&.0\&.0\&.13 3 10\&.0\&.0\&.14 .fi .if n \{\ .RE .\} .RE .PP status .RS 4 List the nodes in the current LVS group and their status\&. .sp Example output: .sp .if n \{\ .RS 4 .\} .nf pnn:0 10\&.0\&.0\&.11 UNHEALTHY (THIS NODE) pnn:1 10\&.0\&.0\&.12 UNHEALTHY pnn:2 10\&.0\&.0\&.13 OK pnn:3 10\&.0\&.0\&.14 OK .fi .if n \{\ .RE .\} .RE .SS "getcapabilities" .PP This command shows the capabilities of the current node\&. See the CAPABILITIES section in \fBctdb\fR(7) for more details\&. .PP Example output: .sp .if n \{\ .RS 4 .\} .nf RECMASTER: YES LMASTER: YES .fi .if n \{\ .RE .\} .SS "statistics" .PP Collect statistics from the CTDB daemon about how many calls it has served\&. Information about various fields in statistics can be found in \fBctdb-statistics\fR(7)\&. .sp .it 1 an-trap .nr an-no-space-flag 1 .nr an-break-flag 1 .br .ps +1 \fBExample\fR .RS 4 .sp .if n \{\ .RS 4 .\} .nf # ctdb statistics CTDB version 1 Current time of statistics : Tue Mar 8 15:18:51 2016 Statistics collected since : (003 21:31:32) Fri Mar 4 17:47:19 2016 num_clients 9 frozen 0 recovering 0 num_recoveries 2 client_packets_sent 8170534 client_packets_recv 7166132 node_packets_sent 16549998 node_packets_recv 5244418 keepalive_packets_sent 201969 keepalive_packets_recv 201969 node req_call 26 reply_call 0 req_dmaster 9 reply_dmaster 12 reply_error 0 req_message 1339231 req_control 8177506 reply_control 6831284 client req_call 15 req_message 334809 req_control 6831308 timeouts call 0 control 0 traverse 0 locks num_calls 8 num_current 0 num_pending 0 num_failed 0 total_calls 15 pending_calls 0 childwrite_calls 0 pending_childwrite_calls 0 memory_used 394879 max_hop_count 1 total_ro_delegations 0 total_ro_revokes 0 hop_count_buckets: 8 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 lock_buckets: 0 0 8 0 0 0 0 0 0 0 0 0 0 0 0 0 locks_latency MIN/AVG/MAX 0\&.010005/0\&.010418/0\&.011010 sec out of 8 reclock_ctdbd MIN/AVG/MAX 0\&.002538/0\&.002538/0\&.002538 sec out of 1 reclock_recd MIN/AVG/MAX 0\&.000000/0\&.000000/0\&.000000 sec out of 0 call_latency MIN/AVG/MAX 0\&.000044/0\&.002142/0\&.011702 sec out of 15 childwrite_latency MIN/AVG/MAX 0\&.000000/0\&.000000/0\&.000000 sec out of 0 .fi .if n \{\ .RE .\} .RE .SS "statisticsreset" .PP This command is used to clear all statistics counters in a node\&. .PP Example: ctdb statisticsreset .SS "dbstatistics \fIDB\fR" .PP Display statistics about the database DB\&. Information about various fields in dbstatistics can be found in \fBctdb-statistics\fR(7)\&. .sp .it 1 an-trap .nr an-no-space-flag 1 .nr an-break-flag 1 .br .ps +1 \fBExample\fR .RS 4 .sp .if n \{\ .RS 4 .\} .nf # ctdb dbstatistics locking\&.tdb DB Statistics: locking\&.tdb ro_delegations 0 ro_revokes 0 locks total 14356 failed 0 current 0 pending 0 hop_count_buckets: 28087 2 1 0 0 0 0 0 0 0 0 0 0 0 0 0 lock_buckets: 0 14188 38 76 32 19 3 0 0 0 0 0 0 0 0 0 locks_latency MIN/AVG/MAX 0\&.001066/0\&.012686/4\&.202292 sec out of 14356 vacuum_latency MIN/AVG/MAX 0\&.000472/0\&.002207/15\&.243570 sec out of 224530 Num Hot Keys: 1 Count:8 Key:ff5bd7cb3ee3822edc1f0000000000000000000000000000 .fi .if n \{\ .RE .\} .RE .SS "getreclock" .PP Show details of the recovery lock, if any\&. .PP Example output: .sp .if n \{\ .RS 4 .\} .nf /clusterfs/\&.ctdb/recovery\&.lock .fi .if n \{\ .RE .\} .SS "getdebug" .PP Get the current debug level for the node\&. the debug level controls what information is written to the log file\&. .PP The debug levels are mapped to the corresponding syslog levels\&. When a debug level is set, only those messages at that level and higher levels will be printed\&. .PP The list of debug levels from highest to lowest are : .PP ERROR WARNING NOTICE INFO DEBUG .SS "setdebug \fIDEBUGLEVEL\fR" .PP Set the debug level of a node\&. This controls what information will be logged\&. .PP The debuglevel is one of ERROR WARNING NOTICE INFO DEBUG .SS "getpid" .PP This command will return the process id of the ctdb daemon\&. .SS "disable" .PP This command is used to administratively disable a node in the cluster\&. A disabled node will still participate in the cluster and host clustered TDB records but its public ip address has been taken over by a different node and it no longer hosts any services\&. .SS "enable" .PP Re\-enable a node that has been administratively disabled\&. .SS "stop" .PP This command is used to administratively STOP a node in the cluster\&. A STOPPED node is connected to the cluster but will not host any public ip addresse, nor does it participate in the VNNMAP\&. The difference between a DISABLED node and a STOPPED node is that a STOPPED node does not host any parts of the database which means that a recovery is required to stop/continue nodes\&. .SS "continue" .PP Re\-start a node that has been administratively stopped\&. .SS "addip \fIIPADDR\fR/\fImask\fR \fIIFACE\fR" .PP This command is used to add a new public ip to a node during runtime\&. It should be followed by a \fBctdb ipreallocate\fR\&. This allows public addresses to be added to a cluster without having to restart the ctdb daemons\&. .PP Note that this only updates the runtime instance of ctdb\&. Any changes will be lost next time ctdb is restarted and the public addresses file is re\-read\&. If you want this change to be permanent you must also update the public addresses file manually\&. .SS "delip \fIIPADDR\fR" .PP This command flags IPADDR for deletion from a node at runtime\&. It should be followed by a \fBctdb ipreallocate\fR\&. If IPADDR is currently hosted by the node it is being removed from, this ensures that the IP will first be failed over to another node, if possible, and that it is then actually removed\&. .PP Note that this only updates the runtime instance of CTDB\&. Any changes will be lost next time CTDB is restarted and the public addresses file is re\-read\&. If you want this change to be permanent you must also update the public addresses file manually\&. .SS "moveip \fIIPADDR\fR \fIPNN\fR" .PP This command can be used to manually fail a public ip address to a specific node\&. .PP In order to manually override the "automatic" distribution of public ip addresses that ctdb normally provides, this command only works when you have changed the tunables for the daemon to: .PP IPAllocAlgorithm != 0 .PP NoIPFailback = 1 .SS "shutdown" .PP This command will shutdown a specific CTDB daemon\&. .SS "setlmasterrole on|off" .PP This command is used ot enable/disable the LMASTER capability for a node at runtime\&. This capability determines whether or not a node can be used as an LMASTER for records in the database\&. A node that does not have the LMASTER capability will not show up in the vnnmap\&. .PP Nodes will by default have this capability, but it can be stripped off nodes by the setting in the sysconfig file or by using this command\&. .PP Once this setting has been enabled/disabled, you need to perform a recovery for it to take effect\&. .PP See also "ctdb getcapabilities" .SS "setrecmasterrole on|off" .PP This command is used ot enable/disable the RECMASTER capability for a node at runtime\&. This capability determines whether or not a node can be used as an RECMASTER for the cluster\&. A node that does not have the RECMASTER capability can not win a recmaster election\&. A node that already is the recmaster for the cluster when the capability is stripped off the node will remain the recmaster until the next cluster election\&. .PP Nodes will by default have this capability, but it can be stripped off nodes by the setting in the sysconfig file or by using this command\&. .PP See also "ctdb getcapabilities" .SS "reloadnodes" .PP This command is used when adding new nodes, or removing existing nodes from an existing cluster\&. .PP Procedure to add nodes: .sp .RS 4 .ie n \{\ \h'-04' 1.\h'+01'\c .\} .el \{\ .sp -1 .IP " 1." 4.2 .\} To expand an existing cluster, first ensure with \fBctdb status\fR that all nodes are up and running and that they are all healthy\&. Do not try to expand a cluster unless it is completely healthy! .RE .sp .RS 4 .ie n \{\ \h'-04' 2.\h'+01'\c .\} .el \{\ .sp -1 .IP " 2." 4.2 .\} On all nodes, edit /usr/local/etc/ctdb/nodes and \fIadd the new nodes at the end of this file\fR\&. .RE .sp .RS 4 .ie n \{\ \h'-04' 3.\h'+01'\c .\} .el \{\ .sp -1 .IP " 3." 4.2 .\} Verify that all the nodes have identical /usr/local/etc/ctdb/nodes files after adding the new nodes\&. .RE .sp .RS 4 .ie n \{\ \h'-04' 4.\h'+01'\c .\} .el \{\ .sp -1 .IP " 4." 4.2 .\} Run \fBctdb reloadnodes\fR to force all nodes to reload the nodes file\&. .RE .sp .RS 4 .ie n \{\ \h'-04' 5.\h'+01'\c .\} .el \{\ .sp -1 .IP " 5." 4.2 .\} Use \fBctdb status\fR on all nodes and verify that they now show the additional nodes\&. .RE .sp .RS 4 .ie n \{\ \h'-04' 6.\h'+01'\c .\} .el \{\ .sp -1 .IP " 6." 4.2 .\} Install and configure the new node and bring it online\&. .RE .PP Procedure to remove nodes: .sp .RS 4 .ie n \{\ \h'-04' 1.\h'+01'\c .\} .el \{\ .sp -1 .IP " 1." 4.2 .\} To remove nodes from an existing cluster, first ensure with \fBctdb status\fR that all nodes, except the node to be deleted, are up and running and that they are all healthy\&. Do not try to remove nodes from a cluster unless the cluster is completely healthy! .RE .sp .RS 4 .ie n \{\ \h'-04' 2.\h'+01'\c .\} .el \{\ .sp -1 .IP " 2." 4.2 .\} Shutdown and power off the node to be removed\&. .RE .sp .RS 4 .ie n \{\ \h'-04' 3.\h'+01'\c .\} .el \{\ .sp -1 .IP " 3." 4.2 .\} On all other nodes, edit the /usr/local/etc/ctdb/nodes file and \fIcomment out\fR the nodes to be removed\&. \fIDo not delete the lines for the deleted nodes\fR, just comment them out by adding a \*(Aq#\*(Aq at the beginning of the lines\&. .RE .sp .RS 4 .ie n \{\ \h'-04' 4.\h'+01'\c .\} .el \{\ .sp -1 .IP " 4." 4.2 .\} Run \fBctdb reloadnodes\fR to force all nodes to reload the nodes file\&. .RE .sp .RS 4 .ie n \{\ \h'-04' 5.\h'+01'\c .\} .el \{\ .sp -1 .IP " 5." 4.2 .\} Use \fBctdb status\fR on all nodes and verify that the deleted nodes are no longer listed\&. .RE .SS "reloadips [\fIPNN\-LIST\fR]" .PP This command reloads the public addresses configuration file on the specified nodes\&. When it completes addresses will be reconfigured and reassigned across the cluster as necessary\&. .PP This command is currently unable to make changes to the netmask or interfaces associated with existing addresses\&. Such changes must be made in 2 steps by deleting addresses in question and re\-adding then\&. Unfortunately this will disrupt connections to the changed addresses\&. .SS "getdbmap" .PP This command lists all clustered TDB databases that the CTDB daemon has attached to\&. Some databases are flagged as PERSISTENT, this means that the database stores data persistently and the data will remain across reboots\&. One example of such a database is secrets\&.tdb where information about how the cluster was joined to the domain is stored\&. Some database are flagged as REPLICATED, this means that the data in that database is replicated across all the nodes\&. But the data will not remain across reboots\&. This type of database is used by CTDB to store it\*(Aqs internal state\&. .PP If a PERSISTENT database is not in a healthy state the database is flagged as UNHEALTHY\&. If there\*(Aqs at least one completely healthy node running in the cluster, it\*(Aqs possible that the content is restored by a recovery run automaticly\&. Otherwise an administrator needs to analyze the problem\&. .PP See also "ctdb getdbstatus", "ctdb backupdb", "ctdb restoredb", "ctdb dumpbackup", "ctdb wipedb", "ctdb setvar AllowUnhealthyDBRead 1" and (if samba or tdb\-utils are installed) "tdbtool check"\&. .PP Most databases are not persistent and only store the state information that the currently running samba daemons need\&. These databases are always wiped when ctdb/samba starts and when a node is rebooted\&. .sp .it 1 an-trap .nr an-no-space-flag 1 .nr an-break-flag 1 .br .ps +1 \fBExample\fR .RS 4 .sp .if n \{\ .RS 4 .\} .nf # ctdb getdbmap Number of databases:10 -dbid:0x435d3410 name:notify\&.tdb path:/usr/local/var/lib/ctdb/notify\&.tdb\&.0 -dbid:0x42fe72c5 name:locking\&.tdb path:/usr/local/var/lib/ctdb/locking\&.tdb\&.0 -dbid:0x1421fb78 name:brlock\&.tdb path:/usr/local/var/lib/ctdb/brlock\&.tdb\&.0 -dbid:0x17055d90 name:connections\&.tdb path:/usr/local/var/lib/ctdb/connections\&.tdb\&.0 -dbid:0xc0bdde6a name:sessionid\&.tdb path:/usr/local/var/lib/ctdb/sessionid\&.tdb\&.0 -dbid:0x122224da name:test\&.tdb path:/usr/local/var/lib/ctdb/test\&.tdb\&.0 -dbid:0x2672a57f name:idmap2\&.tdb path:/usr/local/var/lib/ctdb/persistent/idmap2\&.tdb\&.0 PERSISTENT -dbid:0xb775fff6 name:secrets\&.tdb path:/usr/local/var/lib/ctdb/persistent/secrets\&.tdb\&.0 PERSISTENT -dbid:0xe98e08b6 name:group_mapping\&.tdb path:/usr/local/var/lib/ctdb/persistent/group_mapping\&.tdb\&.0 PERSISTENT -dbid:0x7bbbd26c name:passdb\&.tdb path:/usr/local/var/lib/ctdb/persistent/passdb\&.tdb\&.0 PERSISTENT +dbid:0x435d3410 name:notify\&.tdb path:/var/lib/ctdb/notify\&.tdb\&.0 +dbid:0x42fe72c5 name:locking\&.tdb path:/var/lib/ctdb/locking\&.tdb\&.0 +dbid:0x1421fb78 name:brlock\&.tdb path:/var/lib/ctdb/brlock\&.tdb\&.0 +dbid:0x17055d90 name:connections\&.tdb path:/var/lib/ctdb/connections\&.tdb\&.0 +dbid:0xc0bdde6a name:sessionid\&.tdb path:/var/lib/ctdb/sessionid\&.tdb\&.0 +dbid:0x122224da name:test\&.tdb path:/var/lib/ctdb/test\&.tdb\&.0 +dbid:0x2672a57f name:idmap2\&.tdb path:/var/lib/ctdb/persistent/idmap2\&.tdb\&.0 PERSISTENT +dbid:0xb775fff6 name:secrets\&.tdb path:/var/lib/ctdb/persistent/secrets\&.tdb\&.0 PERSISTENT +dbid:0xe98e08b6 name:group_mapping\&.tdb path:/var/lib/ctdb/persistent/group_mapping\&.tdb\&.0 PERSISTENT +dbid:0x7bbbd26c name:passdb\&.tdb path:/var/lib/ctdb/persistent/passdb\&.tdb\&.0 PERSISTENT # ctdb getdbmap # example for unhealthy database Number of databases:1 -dbid:0xb775fff6 name:secrets\&.tdb path:/usr/local/var/lib/ctdb/persistent/secrets\&.tdb\&.0 PERSISTENT UNHEALTHY +dbid:0xb775fff6 name:secrets\&.tdb path:/var/lib/ctdb/persistent/secrets\&.tdb\&.0 PERSISTENT UNHEALTHY # ctdb \-X getdbmap |ID|Name|Path|Persistent|Unhealthy| -|0x7bbbd26c|passdb\&.tdb|/usr/local/var/lib/ctdb/persistent/passdb\&.tdb\&.0|1|0| +|0x7bbbd26c|passdb\&.tdb|/var/lib/ctdb/persistent/passdb\&.tdb\&.0|1|0| .fi .if n \{\ .RE .\} .RE .SS "backupdb \fIDB\fR \fIFILE\fR" .PP Copy the contents of database DB to FILE\&. FILE can later be read back using \fBrestoredb\fR\&. This is mainly useful for backing up persistent databases such as secrets\&.tdb and similar\&. .SS "restoredb \fIFILE\fR [\fIDB\fR]" .PP This command restores a persistent database that was previously backed up using backupdb\&. By default the data will be restored back into the same database as it was created from\&. By specifying dbname you can restore the data into a different database\&. .SS "setdbreadonly \fIDB\fR" .PP This command will enable the read\-only record support for a database\&. This is an experimental feature to improve performance for contended records primarily in locking\&.tdb and brlock\&.tdb\&. When enabling this feature you must set it on all nodes in the cluster\&. .SS "setdbsticky \fIDB\fR" .PP This command will enable the sticky record support for the specified database\&. This is an experimental feature to improve performance for contended records primarily in locking\&.tdb and brlock\&.tdb\&. When enabling this feature you must set it on all nodes in the cluster\&. .SH "INTERNAL COMMANDS" .PP Internal commands are used by CTDB\*(Aqs scripts and are not required for managing a CTDB cluster\&. Their parameters and behaviour are subject to change\&. .SS "gettickles \fIIPADDR\fR" .PP Show TCP connections that are registered with CTDB to be "tickled" if there is a failover\&. .SS "gratarp \fIIPADDR\fR \fIINTERFACE\fR" .PP Send out a gratuitous ARP for the specified interface through the specified interface\&. This command is mainly used by the ctdb eventscripts\&. .SS "pdelete \fIDB\fR \fIKEY\fR" .PP Delete KEY from DB\&. .SS "pfetch \fIDB\fR \fIKEY\fR" .PP Print the value associated with KEY in DB\&. .SS "pstore \fIDB\fR \fIKEY\fR \fIFILE\fR" .PP Store KEY in DB with contents of FILE as the associated value\&. .SS "ptrans \fIDB\fR [\fIFILE\fR]" .PP Read a list of key\-value pairs, one per line from FILE, and store them in DB using a single transaction\&. An empty value is equivalent to deleting the given key\&. .PP The key and value should be separated by spaces or tabs\&. Each key/value should be a printable string enclosed in double\-quotes\&. .SS "runstate [setup|first_recovery|startup|running]" .PP Print the runstate of the specified node\&. Runstates are used to serialise important state transitions in CTDB, particularly during startup\&. .PP If one or more optional runstate arguments are specified then the node must be in one of these runstates for the command to succeed\&. .sp .it 1 an-trap .nr an-no-space-flag 1 .nr an-break-flag 1 .br .ps +1 \fBExample\fR .RS 4 .sp .if n \{\ .RS 4 .\} .nf # ctdb runstate RUNNING .fi .if n \{\ .RE .\} .RE .SS "setifacelink \fIIFACE\fR up|down" .PP Set the internal state of network interface IFACE\&. This is typically used in the 10\&.interface script in the "monitor" event\&. .PP Example: ctdb setifacelink eth0 up .SS "tickle" .PP Read a list of TCP connections, one per line, from standard input and send a TCP tickle to the source host for each connection\&. A connection is specified as: .sp .if n \{\ .RS 4 .\} .nf \fISRC\-IPADDR\fR:\fISRC\-PORT\fR \fIDST\-IPADDR\fR:\fIDST\-PORT\fR .fi .if n \{\ .RE .\} .PP A single connection can be specified on the command\-line rather than on standard input\&. .PP A TCP tickle is a TCP ACK packet with an invalid sequence and acknowledge number and will when received by the source host result in it sending an immediate correct ACK back to the other end\&. .PP TCP tickles are useful to "tickle" clients after a IP failover has occurred since this will make the client immediately recognize the TCP connection has been disrupted and that the client will need to reestablish\&. This greatly speeds up the time it takes for a client to detect and reestablish after an IP failover in the ctdb cluster\&. .SS "version" .PP Display the CTDB version\&. .SH "DEBUGGING COMMANDS" .PP These commands are primarily used for CTDB development and testing and should not be used for normal administration\&. .SS "OPTIONS" .PP \-\-print\-emptyrecords .RS 4 This enables printing of empty records when dumping databases with the catdb, cattbd and dumpdbbackup commands\&. Records with empty data segment are considered deleted by ctdb and cleaned by the vacuuming mechanism, so this switch can come in handy for debugging the vacuuming behaviour\&. .RE .PP \-\-print\-datasize .RS 4 This lets database dumps (catdb, cattdb, dumpdbbackup) print the size of the record data instead of dumping the data contents\&. .RE .PP \-\-print\-lmaster .RS 4 This lets catdb print the lmaster for each record\&. .RE .PP \-\-print\-hash .RS 4 This lets database dumps (catdb, cattdb, dumpdbbackup) print the hash for each record\&. .RE .PP \-\-print\-recordflags .RS 4 This lets catdb and dumpdbbackup print the record flags for each record\&. Note that cattdb always prints the flags\&. .RE .SS "process\-exists \fIPID\fR \fI[SRVID]\fR" .PP This command checks if a specific process exists on the CTDB host\&. This is mainly used by Samba to check if remote instances of samba are still running or not\&. When the optional SRVID argument is specified, the command check if a specific process exists on the CTDB host and has registered for specified SRVID\&. .SS "getdbstatus \fIDB\fR" .PP This command displays more details about a database\&. .sp .it 1 an-trap .nr an-no-space-flag 1 .nr an-break-flag 1 .br .ps +1 \fBExample\fR .RS 4 .sp .if n \{\ .RS 4 .\} .nf # ctdb getdbstatus test\&.tdb\&.0 dbid: 0x122224da name: test\&.tdb -path: /usr/local/var/lib/ctdb/test\&.tdb\&.0 +path: /var/lib/ctdb/test\&.tdb\&.0 PERSISTENT: no HEALTH: OK # ctdb getdbstatus registry\&.tdb # with a corrupted TDB dbid: 0xf2a58948 name: registry\&.tdb -path: /usr/local/var/lib/ctdb/persistent/registry\&.tdb\&.0 +path: /var/lib/ctdb/persistent/registry\&.tdb\&.0 PERSISTENT: yes -HEALTH: NO\-HEALTHY\-NODES \- ERROR \- Backup of corrupted TDB in \*(Aq/usr/local/var/lib/ctdb/persistent/registry\&.tdb\&.0\&.corrupted\&.20091208091949\&.0Z\*(Aq +HEALTH: NO\-HEALTHY\-NODES \- ERROR \- Backup of corrupted TDB in \*(Aq/var/lib/ctdb/persistent/registry\&.tdb\&.0\&.corrupted\&.20091208091949\&.0Z\*(Aq .fi .if n \{\ .RE .\} .RE .SS "catdb \fIDB\fR" .PP Print a dump of the clustered TDB database DB\&. .SS "cattdb \fIDB\fR" .PP Print a dump of the contents of the local TDB database DB\&. .SS "dumpdbbackup \fIFILE\fR" .PP Print a dump of the contents from database backup FILE, similar to \fBcatdb\fR\&. .SS "wipedb \fIDB\fR" .PP Remove all contents of database DB\&. .SS "recover" .PP This command will trigger the recovery daemon to do a cluster recovery\&. .SS "ipreallocate, sync" .PP This command will force the recovery master to perform a full ip reallocation process and redistribute all ip addresses\&. This is useful to "reset" the allocations back to its default state if they have been changed using the "moveip" command\&. While a "recover" will also perform this reallocation, a recovery is much more hevyweight since it will also rebuild all the databases\&. -.SS "getmonmode" -.PP -This command prints the monitoring mode of a node\&. This indicates when CTDB is monitoring services on the node\&. The monitoring mode is either ENABLED or DISABLED\&. .SS "attach \fIDBNAME\fR [persistent|replicated]" .PP Create a new CTDB database called DBNAME and attach to it on all nodes\&. .SS "detach \fIDB\-LIST\fR" .PP Detach specified non\-persistent database(s) from the cluster\&. This command will disconnect specified database(s) on all nodes in the cluster\&. This command should only be used when none of the specified database(s) are in use\&. .PP All nodes should be active and tunable AllowClientDBAccess should be disabled on all nodes before detaching databases\&. .SS "dumpmemory" .PP This is a debugging command\&. This command will make the ctdb daemon to write a fill memory allocation map to standard output\&. .SS "rddumpmemory" .PP This is a debugging command\&. This command will dump the talloc memory allocation tree for the recovery daemon to standard output\&. .SS "ban \fIBANTIME\fR" .PP Administratively ban a node for BANTIME seconds\&. The node will be unbanned after BANTIME seconds have elapsed\&. .PP A banned node does not participate in the cluster\&. It does not host any records for the clustered TDB and does not host any public IP addresses\&. .PP Nodes are automatically banned if they misbehave\&. For example, a node may be banned if it causes too many cluster recoveries\&. .PP To administratively exclude a node from a cluster use the \fBstop\fR command\&. .SS "unban" .PP This command is used to unban a node that has either been administratively banned using the ban command or has been automatically banned\&. -.SS "check_srvids \fISRVID\fR \&.\&.\&." -.PP -This command checks whether a set of srvid message ports are registered on the node or not\&. The command takes a list of values to check\&. -.sp -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.br -.ps +1 -\fBExample\fR -.RS 4 -.sp -.if n \{\ -.RS 4 -.\} -.nf -# ctdb check_srvids 1 2 3 14765 -Server id 0:1 does not exist -Server id 0:2 does not exist -Server id 0:3 does not exist -Server id 0:14765 exists - -.fi -.if n \{\ -.RE -.\} -.RE .SH "SEE ALSO" .PP \fBctdbd\fR(1), \fBonnode\fR(1), \fBctdb\fR(7), \fBctdb-statistics\fR(7), \fBctdb-tunables\fR(7), \m[blue]\fB\%http://ctdb.samba.org/\fR\m[] .SH "AUTHOR" .br .PP This documentation was written by Ronnie Sahlberg, Amitay Isaacs, Martin Schwenke .SH "COPYRIGHT" .br Copyright \(co 2007 Andrew Tridgell, Ronnie Sahlberg .br .PP This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version\&. .PP This program 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 General Public License for more details\&. .PP You should have received a copy of the GNU General Public License along with this program; if not, see \m[blue]\fB\%http://www.gnu.org/licenses\fR\m[]\&. .sp Index: head/net/samba410/files/man/ctdb.7 =================================================================== --- head/net/samba410/files/man/ctdb.7 (revision 505445) +++ head/net/samba410/files/man/ctdb.7 (revision 505446) @@ -1,783 +1,783 @@ '\" t .\" Title: ctdb .\" Author: .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 11/20/2017 +.\" Date: 11/18/2018 .\" Manual: CTDB - clustered TDB database .\" Source: ctdb .\" Language: English .\" -.TH "CTDB" "7" "11/20/2017" "ctdb" "CTDB \- clustered TDB database" +.TH "CTDB" "7" "11/18/2018" "ctdb" "CTDB \- clustered TDB database" .\" ----------------------------------------------------------------- .\" * 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" ctdb \- Clustered TDB .SH "DESCRIPTION" .PP CTDB is a clustered database component in clustered Samba that provides a high\-availability load\-sharing CIFS server cluster\&. .PP The main functions of CTDB are: .sp .RS 4 .ie n \{\ \h'-04'\(bu\h'+03'\c .\} .el \{\ .sp -1 .IP \(bu 2.3 .\} Provide a clustered version of the TDB database with automatic rebuild/recovery of the databases upon node failures\&. .RE .sp .RS 4 .ie n \{\ \h'-04'\(bu\h'+03'\c .\} .el \{\ .sp -1 .IP \(bu 2.3 .\} Monitor nodes in the cluster and services running on each node\&. .RE .sp .RS 4 .ie n \{\ \h'-04'\(bu\h'+03'\c .\} .el \{\ .sp -1 .IP \(bu 2.3 .\} Manage a pool of public IP addresses that are used to provide services to clients\&. Alternatively, CTDB can be used with LVS\&. .RE .PP Combined with a cluster filesystem CTDB provides a full high\-availablity (HA) environment for services such as clustered Samba, NFS and other services\&. .SH "ANATOMY OF A CTDB CLUSTER" .PP A CTDB cluster is a collection of nodes with 2 or more network interfaces\&. All nodes provide network (usually file/NAS) services to clients\&. Data served by file services is stored on shared storage (usually a cluster filesystem) that is accessible by all nodes\&. .PP CTDB provides an "all active" cluster, where services are load balanced across all nodes\&. .SH "RECOVERY LOCK" .PP CTDB uses a \fIrecovery lock\fR to avoid a \fIsplit brain\fR, where a cluster becomes partitioned and each partition attempts to operate independently\&. Issues that can result from a split brain include file data corruption, because file locking metadata may not be tracked correctly\&. .PP CTDB uses a \fIcluster leader and follower\fR model of cluster management\&. All nodes in a cluster elect one node to be the leader\&. The leader node coordinates privileged operations such as database recovery and IP address failover\&. CTDB refers to the leader node as the \fIrecovery master\fR\&. This node takes and holds the recovery lock to assert its privileged role in the cluster\&. .PP By default, the recovery lock is implemented using a file (specified by -\fICTDB_RECOVERY_LOCK\fR) residing in shared storage (usually) on a cluster filesystem\&. To support a recovery lock the cluster filesystem must support lock coherence\&. See +\fIrecovery lock\fR +in the +[cluster] +section of +\fBctdb.conf\fR(5)) residing in shared storage (usually) on a cluster filesystem\&. To support a recovery lock the cluster filesystem must support lock coherence\&. See \fBping_pong\fR(1) for more details\&. .PP The recovery lock can also be implemented using an arbitrary cluster mutex call\-out by using an exclamation point (\*(Aq!\*(Aq) as the first character of -\fICTDB_RECOVERY_LOCK\fR\&. For example, a value of +\fIrecovery lock\fR\&. For example, a value of \fB!/usr/local/bin/myhelper recovery\fR would run the given helper with the specified arguments\&. See the source code relating to cluster mutexes for clues about writing call\-outs\&. .PP If a cluster becomes partitioned (for example, due to a communication failure) and a different recovery master is elected by the nodes in each partition, then only one of these recovery masters will be able to take the recovery lock\&. The recovery master in the "losing" partition will not be able to take the recovery lock and will be excluded from the cluster\&. The nodes in the "losing" partition will elect each node in turn as their recovery master so eventually all the nodes in that partition will be excluded\&. .PP CTDB does sanity checks to ensure that the recovery lock is held as expected\&. .PP CTDB can run without a recovery lock but this is not recommended as there will be no protection from split brains\&. .SH "PRIVATE VS PUBLIC ADDRESSES" .PP Each node in a CTDB cluster has multiple IP addresses assigned to it: .sp .RS 4 .ie n \{\ \h'-04'\(bu\h'+03'\c .\} .el \{\ .sp -1 .IP \(bu 2.3 .\} A single private IP address that is used for communication between nodes\&. .RE .sp .RS 4 .ie n \{\ \h'-04'\(bu\h'+03'\c .\} .el \{\ .sp -1 .IP \(bu 2.3 .\} One or more public IP addresses that are used to provide NAS or other services\&. .RE .sp .SS "Private address" .PP Each node is configured with a unique, permanently assigned private address\&. This address is configured by the operating system\&. This address uniquely identifies a physical node in the cluster and is the address that CTDB daemons will use to communicate with the CTDB daemons on other nodes\&. .PP -Private addresses are listed in the file specified by the -\fICTDB_NODES\fR -configuration variable (see -\fBctdbd.conf\fR(5), default +Private addresses are listed in the file /usr/local/etc/ctdb/nodes)\&. This file contains the list of private addresses for all nodes in the cluster, one per line\&. This file must be the same on all nodes in the cluster\&. .PP +Some users like to put this configuration file in their cluster filesystem\&. A symbolic link should be used in this case\&. +.PP Private addresses should not be used by clients to connect to services provided by the cluster\&. .PP It is strongly recommended that the private addresses are configured on a private network that is separate from client networks\&. This is because the CTDB protocol is both unauthenticated and unencrypted\&. If clients share the private network then steps need to be taken to stop injection of packets to relevant ports on the private addresses\&. It is also likely that CTDB protocol traffic between nodes could leak sensitive information if it can be intercepted\&. .PP Example /usr/local/etc/ctdb/nodes for a four node cluster: .sp .if n \{\ .RS 4 .\} .nf 192\&.168\&.1\&.1 192\&.168\&.1\&.2 192\&.168\&.1\&.3 192\&.168\&.1\&.4 .fi .if n \{\ .RE .\} .SS "Public addresses" .PP Public addresses are used to provide services to clients\&. Public addresses are not configured at the operating system level and are not permanently associated with a particular node\&. Instead, they are managed by CTDB and are assigned to interfaces on physical nodes at runtime\&. .PP The CTDB cluster will assign/reassign these public addresses across the available healthy nodes in the cluster\&. When one node fails, its public addresses will be taken over by one or more other nodes in the cluster\&. This ensures that services provided by all public addresses are always available to clients, as long as there are nodes available capable of hosting this address\&. .PP -The public address configuration is stored in a file on each node specified by the -\fICTDB_PUBLIC_ADDRESSES\fR -configuration variable (see -\fBctdbd.conf\fR(5), recommended -/usr/local/etc/ctdb/public_addresses)\&. This file contains a list of the public addresses that the node is capable of hosting, one per line\&. Each entry also contains the netmask and the interface to which the address should be assigned\&. +The public address configuration is stored in +/usr/local/etc/ctdb/public_addresses +on each node\&. This file contains a list of the public addresses that the node is capable of hosting, one per line\&. Each entry also contains the netmask and the interface to which the address should be assigned\&. If this file is missing then no public addresses are configured\&. .PP +Some users who have the same public addresses on all nodes like to put this configuration file in their cluster filesystem\&. A symbolic link should be used in this case\&. +.PP Example /usr/local/etc/ctdb/public_addresses for a node that can host 4 public addresses, on 2 different interfaces: .sp .if n \{\ .RS 4 .\} .nf 10\&.1\&.1\&.1/24 eth1 10\&.1\&.1\&.2/24 eth1 10\&.1\&.2\&.1/24 eth2 10\&.1\&.2\&.2/24 eth2 .fi .if n \{\ .RE .\} .PP In many cases the public addresses file will be the same on all nodes\&. However, it is possible to use different public address configurations on different nodes\&. .PP Example: 4 nodes partitioned into two subgroups: .sp .if n \{\ .RS 4 .\} .nf Node 0:/usr/local/etc/ctdb/public_addresses 10\&.1\&.1\&.1/24 eth1 10\&.1\&.1\&.2/24 eth1 Node 1:/usr/local/etc/ctdb/public_addresses 10\&.1\&.1\&.1/24 eth1 10\&.1\&.1\&.2/24 eth1 Node 2:/usr/local/etc/ctdb/public_addresses 10\&.1\&.2\&.1/24 eth2 10\&.1\&.2\&.2/24 eth2 Node 3:/usr/local/etc/ctdb/public_addresses 10\&.1\&.2\&.1/24 eth2 10\&.1\&.2\&.2/24 eth2 .fi .if n \{\ .RE .\} .PP In this example nodes 0 and 1 host two public addresses on the 10\&.1\&.1\&.x network while nodes 2 and 3 host two public addresses for the 10\&.1\&.2\&.x network\&. .PP Public address 10\&.1\&.1\&.1 can be hosted by either of nodes 0 or 1 and will be available to clients as long as at least one of these two nodes are available\&. .PP If both nodes 0 and 1 become unavailable then public address 10\&.1\&.1\&.1 also becomes unavailable\&. 10\&.1\&.1\&.1 can not be failed over to nodes 2 or 3 since these nodes do not have this public address configured\&. .PP The \fBctdb ip\fR command can be used to view the current assignment of public addresses to physical nodes\&. .SH "NODE STATUS" .PP The current status of each node in the cluster can be viewed by the \fBctdb status\fR command\&. .PP A node can be in one of the following states: .PP OK .RS 4 This node is healthy and fully functional\&. It hosts public addresses to provide services\&. .RE .PP DISCONNECTED .RS 4 This node is not reachable by other nodes via the private network\&. It is not currently participating in the cluster\&. It \fIdoes not\fR host public addresses to provide services\&. It might be shut down\&. .RE .PP DISABLED .RS 4 This node has been administratively disabled\&. This node is partially functional and participates in the cluster\&. However, it \fIdoes not\fR host public addresses to provide services\&. .RE .PP UNHEALTHY .RS 4 A service provided by this node has failed a health check and should be investigated\&. This node is partially functional and participates in the cluster\&. However, it \fIdoes not\fR host public addresses to provide services\&. Unhealthy nodes should be investigated and may require an administrative action to rectify\&. .RE .PP BANNED .RS 4 CTDB is not behaving as designed on this node\&. For example, it may have failed too many recovery attempts\&. Such nodes are banned from participating in the cluster for a configurable time period before they attempt to rejoin the cluster\&. A banned node \fIdoes not\fR host public addresses to provide services\&. All banned nodes should be investigated and may require an administrative action to rectify\&. .RE .PP STOPPED .RS 4 This node has been administratively exclude from the cluster\&. A stopped node does no participate in the cluster and \fIdoes not\fR host public addresses to provide services\&. This state can be used while performing maintenance on a node\&. .RE .PP PARTIALLYONLINE .RS 4 A node that is partially online participates in a cluster like a healthy (OK) node\&. Some interfaces to serve public addresses are down, but at least one interface is up\&. See also \fBctdb ifaces\fR\&. .RE .SH "CAPABILITIES" .PP Cluster nodes can have several different capabilities enabled\&. These are listed below\&. .PP RECMASTER .RS 4 Indicates that a node can become the CTDB cluster recovery master\&. The current recovery master is decided via an election held by all active nodes with this capability\&. .sp Default is YES\&. .RE .PP LMASTER .RS 4 Indicates that a node can be the location master (LMASTER) for database records\&. The LMASTER always knows which node has the latest copy of a record in a volatile database\&. .sp Default is YES\&. .RE .PP The RECMASTER and LMASTER capabilities can be disabled when CTDB is used to create a cluster spanning across WAN links\&. In this case CTDB acts as a WAN accelerator\&. .SH "LVS" .PP LVS is a mode where CTDB presents one single IP address for the entire cluster\&. This is an alternative to using public IP addresses and round\-robin DNS to loadbalance clients across the cluster\&. .PP This is similar to using a layer\-4 loadbalancing switch but with some restrictions\&. .PP One extra LVS public address is assigned on the public network to each LVS group\&. Each LVS group is a set of nodes in the cluster that presents the same LVS address public address to the outside world\&. Normally there would only be one LVS group spanning an entire cluster, but in situations where one CTDB cluster spans multiple physical sites it might be useful to have one LVS group for each site\&. There can be multiple LVS groups in a cluster but each node can only be member of one LVS group\&. .PP Client access to the cluster is load\-balanced across the HEALTHY nodes in an LVS group\&. If no HEALTHY nodes exists then all nodes in the group are used, regardless of health status\&. CTDB will, however never load\-balance LVS traffic to nodes that are BANNED, STOPPED, DISABLED or DISCONNECTED\&. The \fBctdb lvs\fR command is used to show which nodes are currently load\-balanced across\&. .PP In each LVS group, one of the nodes is selected by CTDB to be the LVS master\&. This node receives all traffic from clients coming in to the LVS public address and multiplexes it across the internal network to one of the nodes that LVS is using\&. When responding to the client, that node will send the data back directly to the client, bypassing the LVS master node\&. The command -\fBctdb lvsmaster\fR +\fBctdb lvs master\fR will show which node is the current LVS master\&. .PP The path used for a client I/O is: .sp .RS 4 .ie n \{\ \h'-04' 1.\h'+01'\c .\} .el \{\ .sp -1 .IP " 1." 4.2 .\} Client sends request packet to LVSMASTER\&. .RE .sp .RS 4 .ie n \{\ \h'-04' 2.\h'+01'\c .\} .el \{\ .sp -1 .IP " 2." 4.2 .\} LVSMASTER passes the request on to one node across the internal network\&. .RE .sp .RS 4 .ie n \{\ \h'-04' 3.\h'+01'\c .\} .el \{\ .sp -1 .IP " 3." 4.2 .\} Selected node processes the request\&. .RE .sp .RS 4 .ie n \{\ \h'-04' 4.\h'+01'\c .\} .el \{\ .sp -1 .IP " 4." 4.2 .\} Node responds back to client\&. .RE .PP -This means that all incoming traffic to the cluster will pass through one physical node, which limits scalability\&. You can send more data to the LVS address that one physical node can multiplex\&. This means that you should not use LVS if your I/O pattern is write\-intensive since you will be limited in the available network bandwidth that node can handle\&. LVS does work wery well for read\-intensive workloads where only smallish READ requests are going through the LVSMASTER bottleneck and the majority of the traffic volume (the data in the read replies) goes straight from the processing node back to the clients\&. For read\-intensive i/o patterns you can achieve very high throughput rates in this mode\&. +This means that all incoming traffic to the cluster will pass through one physical node, which limits scalability\&. You can send more data to the LVS address that one physical node can multiplex\&. This means that you should not use LVS if your I/O pattern is write\-intensive since you will be limited in the available network bandwidth that node can handle\&. LVS does work very well for read\-intensive workloads where only smallish READ requests are going through the LVSMASTER bottleneck and the majority of the traffic volume (the data in the read replies) goes straight from the processing node back to the clients\&. For read\-intensive i/o patterns you can achieve very high throughput rates in this mode\&. .PP Note: you can use LVS and public addresses at the same time\&. .PP If you use LVS, you must have a permanent address configured for the public interface on each node\&. This address must be routable and the cluster nodes must be configured so that all traffic back to client hosts are routed through this interface\&. This is also required in order to allow samba/winbind on the node to talk to the domain controller\&. This LVS IP address can not be used to initiate outgoing traffic\&. .PP Make sure that the domain controller and the clients are reachable from a node \fIbefore\fR you enable LVS\&. Also ensure that outgoing traffic to these hosts is routed out through the configured public interface\&. .SS "Configuration" .PP To activate LVS on a CTDB node you must specify the \fICTDB_LVS_PUBLIC_IFACE\fR, \fICTDB_LVS_PUBLIC_IP\fR and \fICTDB_LVS_NODES\fR configuration variables\&. \fICTDB_LVS_NODES\fR specifies a file containing the private address of all nodes in the current node\*(Aqs LVS group\&. .PP Example: .sp .if n \{\ .RS 4 .\} .nf CTDB_LVS_PUBLIC_IFACE=eth1 CTDB_LVS_PUBLIC_IP=10\&.1\&.1\&.237 CTDB_LVS_NODES=/usr/local/etc/ctdb/lvs_nodes .fi .if n \{\ .RE .\} .PP Example /usr/local/etc/ctdb/lvs_nodes: .sp .if n \{\ .RS 4 .\} .nf 192\&.168\&.1\&.2 192\&.168\&.1\&.3 192\&.168\&.1\&.4 .fi .if n \{\ .RE .\} .PP Normally any node in an LVS group can act as the LVS master\&. Nodes that are highly loaded due to other demands maybe flagged with the "slave\-only" option in the \fICTDB_LVS_NODES\fR file to limit the LVS functionality of those nodes\&. .PP LVS nodes file that excludes 192\&.168\&.1\&.4 from being the LVS master node: .sp .if n \{\ .RS 4 .\} .nf 192\&.168\&.1\&.2 192\&.168\&.1\&.3 192\&.168\&.1\&.4 slave\-only .fi .if n \{\ .RE .\} .SH "TRACKING AND RESETTING TCP CONNECTIONS" .PP CTDB tracks TCP connections from clients to public IP addresses, on known ports\&. When an IP address moves from one node to another, all existing TCP connections to that IP address are reset\&. The node taking over this IP address will also send gratuitous ARPs (for IPv4, or neighbour advertisement, for IPv6)\&. This allows clients to reconnect quickly, rather than waiting for TCP timeouts, which can be very long\&. .PP It is important that established TCP connections do not survive a release and take of a public IP address on the same node\&. Such connections can get out of sync with sequence and ACK numbers, potentially causing a disruptive ACK storm\&. .SH "NAT GATEWAY" .PP NAT gateway (NATGW) is an optional feature that is used to configure fallback routing for nodes\&. This allows cluster nodes to connect to external services (e\&.g\&. DNS, AD, NIS and LDAP) when they do not host any public addresses (e\&.g\&. when they are unhealthy)\&. .PP This also applies to node startup because CTDB marks nodes as UNHEALTHY until they have passed a "monitor" event\&. In this context, NAT gateway helps to avoid a "chicken and egg" situation where a node needs to access an external service to become healthy\&. .PP Another way of solving this type of problem is to assign an extra static IP address to a public interface on every node\&. This is simpler but it uses an extra IP address per node, while NAT gateway generally uses only one extra IP address\&. .SS "Operation" .PP One extra NATGW public address is assigned on the public network to each NATGW group\&. Each NATGW group is a set of nodes in the cluster that shares the same NATGW address to talk to the outside world\&. Normally there would only be one NATGW group spanning an entire cluster, but in situations where one CTDB cluster spans multiple physical sites it might be useful to have one NATGW group for each site\&. .PP There can be multiple NATGW groups in a cluster but each node can only be member of one NATGW group\&. .PP In each NATGW group, one of the nodes is selected by CTDB to be the NATGW master and the other nodes are consider to be NATGW slaves\&. NATGW slaves establish a fallback default route to the NATGW master via the private network\&. When a NATGW slave hosts no public IP addresses then it will use this route for outbound connections\&. The NATGW master hosts the NATGW public IP address and routes outgoing connections from slave nodes via this IP address\&. It also establishes a fallback default route\&. .SS "Configuration" .PP NATGW is usually configured similar to the following example configuration: .sp .if n \{\ .RS 4 .\} .nf CTDB_NATGW_NODES=/usr/local/etc/ctdb/natgw_nodes CTDB_NATGW_PRIVATE_NETWORK=192\&.168\&.1\&.0/24 CTDB_NATGW_PUBLIC_IP=10\&.0\&.0\&.227/24 CTDB_NATGW_PUBLIC_IFACE=eth0 CTDB_NATGW_DEFAULT_GATEWAY=10\&.0\&.0\&.1 .fi .if n \{\ .RE .\} .PP Normally any node in a NATGW group can act as the NATGW master\&. Some configurations may have special nodes that lack connectivity to a public network\&. In such cases, those nodes can be flagged with the "slave\-only" option in the \fICTDB_NATGW_NODES\fR file to limit the NATGW functionality of those nodes\&. .PP See the NAT GATEWAY section in -\fBctdbd.conf\fR(5) +\fBctdb-script.options\fR(5) for more details of NATGW configuration\&. .SS "Implementation details" .PP When the NATGW functionality is used, one of the nodes is selected to act as a NAT gateway for all the other nodes in the group when they need to communicate with the external services\&. The NATGW master is selected to be a node that is most likely to have usable networks\&. .PP The NATGW master hosts the NATGW public IP address \fICTDB_NATGW_PUBLIC_IP\fR on the configured public interfaces \fICTDB_NATGW_PUBLIC_IFACE\fR and acts as a router, masquerading outgoing connections from slave nodes via this IP address\&. If \fICTDB_NATGW_DEFAULT_GATEWAY\fR is set then it also establishes a fallback default route to the configured this gateway with a metric of 10\&. A metric 10 route is used so it can co\-exist with other default routes that may be available\&. .PP A NATGW slave establishes its fallback default route to the NATGW master via the private network \fICTDB_NATGW_PRIVATE_NETWORK\fRwith a metric of 10\&. This route is used for outbound connections when no other default route is available because the node hosts no public addresses\&. A metric 10 routes is used so that it can co\-exist with other default routes that may be available when the node is hosting public addresses\&. .PP \fICTDB_NATGW_STATIC_ROUTES\fR can be used to have NATGW create more specific routes instead of just default routes\&. .PP This is implemented in the 11\&.natgw eventscript\&. Please see the eventscript file and the NAT GATEWAY section in -\fBctdbd.conf\fR(5) +\fBctdb-script.options\fR(5) for more details\&. .SH "POLICY ROUTING" .PP Policy routing is an optional CTDB feature to support complex network topologies\&. Public addresses may be spread across several different networks (or VLANs) and it may not be possible to route packets from these public addresses via the system\*(Aqs default route\&. Therefore, CTDB has support for policy routing via the 13\&.per_ip_routing eventscript\&. This allows routing to be specified for packets sourced from each public address\&. The routes are added and removed as CTDB moves public addresses between nodes\&. .SS "Configuration variables" .PP There are 4 configuration variables related to policy routing: \fICTDB_PER_IP_ROUTING_CONF\fR, \fICTDB_PER_IP_ROUTING_RULE_PREF\fR, \fICTDB_PER_IP_ROUTING_TABLE_ID_LOW\fR, \fICTDB_PER_IP_ROUTING_TABLE_ID_HIGH\fR\&. See the POLICY ROUTING section in -\fBctdbd.conf\fR(5) +\fBctdb-script.options\fR(5) for more details\&. .SS "Configuration" .PP The format of each line of \fICTDB_PER_IP_ROUTING_CONF\fR is: .sp .if n \{\ .RS 4 .\} .nf [ ] .fi .if n \{\ .RE .\} .PP Leading whitespace is ignored and arbitrary whitespace may be used as a separator\&. Lines that have a "public address" item that doesn\*(Aqt match an actual public address are ignored\&. This means that comment lines can be added using a leading character such as \*(Aq#\*(Aq, since this will never match an IP address\&. .PP A line without a gateway indicates a link local route\&. .PP For example, consider the configuration line: .sp .if n \{\ .RS 4 .\} .nf 192\&.168\&.1\&.99 192\&.168\&.1\&.1/24 .fi .if n \{\ .RE .\} .PP If the corresponding public_addresses line is: .sp .if n \{\ .RS 4 .\} .nf 192\&.168\&.1\&.99/24 eth2,eth3 .fi .if n \{\ .RE .\} .PP \fICTDB_PER_IP_ROUTING_RULE_PREF\fR is 100, and CTDB adds the address to eth2 then the following routing information is added: .sp .if n \{\ .RS 4 .\} .nf ip rule add from 192\&.168\&.1\&.99 pref 100 table ctdb\&.192\&.168\&.1\&.99 ip route add 192\&.168\&.1\&.0/24 dev eth2 table ctdb\&.192\&.168\&.1\&.99 .fi .if n \{\ .RE .\} .PP This causes traffic from 192\&.168\&.1\&.1 to 192\&.168\&.1\&.0/24 go via eth2\&. .PP The \fBip rule\fR command will show (something like \- depending on other public addresses and other routes on the system): .sp .if n \{\ .RS 4 .\} .nf 0: from all lookup local 100: from 192\&.168\&.1\&.99 lookup ctdb\&.192\&.168\&.1\&.99 32766: from all lookup main 32767: from all lookup default .fi .if n \{\ .RE .\} .PP \fBip route show table ctdb\&.192\&.168\&.1\&.99\fR will show: .sp .if n \{\ .RS 4 .\} .nf 192\&.168\&.1\&.0/24 dev eth2 scope link .fi .if n \{\ .RE .\} .PP The usual use for a line containing a gateway is to add a default route corresponding to a particular source address\&. Consider this line of configuration: .sp .if n \{\ .RS 4 .\} .nf 192\&.168\&.1\&.99 0\&.0\&.0\&.0/0 192\&.168\&.1\&.1 .fi .if n \{\ .RE .\} .PP In the situation described above this will cause an extra routing command to be executed: .sp .if n \{\ .RS 4 .\} .nf ip route add 0\&.0\&.0\&.0/0 via 192\&.168\&.1\&.1 dev eth2 table ctdb\&.192\&.168\&.1\&.99 .fi .if n \{\ .RE .\} .PP With both configuration lines, \fBip route show table ctdb\&.192\&.168\&.1\&.99\fR will show: .sp .if n \{\ .RS 4 .\} .nf 192\&.168\&.1\&.0/24 dev eth2 scope link default via 192\&.168\&.1\&.1 dev eth2 .fi .if n \{\ .RE .\} .SS "Sample configuration" .PP Here is a more complete example configuration\&. .sp .if n \{\ .RS 4 .\} .nf /usr/local/etc/ctdb/public_addresses: 192\&.168\&.1\&.98 eth2,eth3 192\&.168\&.1\&.99 eth2,eth3 /usr/local/etc/ctdb/policy_routing: 192\&.168\&.1\&.98 192\&.168\&.1\&.0/24 192\&.168\&.1\&.98 192\&.168\&.200\&.0/24 192\&.168\&.1\&.254 192\&.168\&.1\&.98 0\&.0\&.0\&.0/0 192\&.168\&.1\&.1 192\&.168\&.1\&.99 192\&.168\&.1\&.0/24 192\&.168\&.1\&.99 192\&.168\&.200\&.0/24 192\&.168\&.1\&.254 192\&.168\&.1\&.99 0\&.0\&.0\&.0/0 192\&.168\&.1\&.1 .fi .if n \{\ .RE .\} .PP The routes local packets as expected, the default route is as previously discussed, but packets to 192\&.168\&.200\&.0/24 are routed via the alternate gateway 192\&.168\&.1\&.254\&. -.SH "NOTIFICATION SCRIPT" +.SH "NOTIFICATIONS" .PP -When certain state changes occur in CTDB, it can be configured to perform arbitrary actions via a notification script\&. For example, sending SNMP traps or emails when a node becomes unhealthy or similar\&. +When certain state changes occur in CTDB, it can be configured to perform arbitrary actions via notifications\&. For example, sending SNMP traps or emails when a node becomes unhealthy or similar\&. .PP -This is activated by setting the -\fICTDB_NOTIFY_SCRIPT\fR -configuration variable\&. The specified script must be executable\&. +The notification mechanism runs all executable files ending in "\&.script" in +/usr/local/etc/ctdb/events/notification/, ignoring any failures and continuing to run all files\&. .PP -Use of the provided -/usr/local/etc/ctdb/notify\&.sh -script is recommended\&. It executes files in -/usr/local/etc/ctdb/notify\&.d/\&. -.PP CTDB currently generates notifications after CTDB changes to these states: .RS 4 init .RE .RS 4 setup .RE .RS 4 startup .RE .RS 4 healthy .RE .RS 4 unhealthy .RE -.SH "DEBUG LEVELS" +.SH "LOG LEVELS" .PP -Valid values for DEBUGLEVEL are: +Valid log levels, in increasing order of verbosity, are: .RS 4 -ERR +ERROR .RE .RS 4 WARNING .RE .RS 4 NOTICE .RE .RS 4 INFO .RE .RS 4 DEBUG .RE .SH "REMOTE CLUSTER NODES" .PP It is possible to have a CTDB cluster that spans across a WAN link\&. For example where you have a CTDB cluster in your datacentre but you also want to have one additional CTDB node located at a remote branch site\&. This is similar to how a WAN accelerator works but with the difference that while a WAN\-accelerator often acts as a Proxy or a MitM, in the ctdb remote cluster node configuration the Samba instance at the remote site IS the genuine server, not a proxy and not a MitM, and thus provides 100% correct CIFS semantics to clients\&. .PP See the cluster as one single multihomed samba server where one of the NICs (the remote node) is very far away\&. .PP NOTE: This does require that the cluster filesystem you use can cope with WAN\-link latencies\&. Not all cluster filesystems can handle WAN\-link latencies! Whether this will provide very good WAN\-accelerator performance or it will perform very poorly depends entirely on how optimized your cluster filesystem is in handling high latency for data and metadata operations\&. .PP -To activate a node as being a remote cluster node you need to set the following two parameters in /etc/sysconfig/ctdb for the remote node: +To activate a node as being a remote cluster node you need to set the following two parameters in /usr/local/etc/ctdb/ctdb\&.conf for the remote node: .sp .if n \{\ .RS 4 .\} .nf -CTDB_CAPABILITY_LMASTER=no -CTDB_CAPABILITY_RECMASTER=no +[legacy] + lmaster capability = false + recmaster capability = false .fi .if n \{\ .RE .\} .PP Verify with the command "ctdb getcapabilities" that that node no longer has the recmaster or the lmaster capabilities\&. .SH "SEE ALSO" .PP \fBctdb\fR(1), \fBctdbd\fR(1), \fBctdbd_wrapper\fR(1), \fBctdb_diagnostics\fR(1), \fBltdbtool\fR(1), \fBonnode\fR(1), \fBping_pong\fR(1), -\fBctdbd.conf\fR(5), +\fBctdb.conf\fR(5), +\fBctdb-script.options\fR(5), +\fBctdb.sysconfig\fR(5), \fBctdb-statistics\fR(7), \fBctdb-tunables\fR(7), \m[blue]\fB\%http://ctdb.samba.org/\fR\m[] .SH "AUTHOR" .br .PP This documentation was written by Ronnie Sahlberg, Amitay Isaacs, Martin Schwenke .SH "COPYRIGHT" .br Copyright \(co 2007 Andrew Tridgell, Ronnie Sahlberg .br .PP This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version\&. .PP This program 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 General Public License for more details\&. .PP You should have received a copy of the GNU General Public License along with this program; if not, see \m[blue]\fB\%http://www.gnu.org/licenses\fR\m[]\&. .sp Index: head/net/samba410/files/man/ctdb.conf.5 =================================================================== --- head/net/samba410/files/man/ctdb.conf.5 (nonexistent) +++ head/net/samba410/files/man/ctdb.conf.5 (revision 505446) @@ -0,0 +1,359 @@ +'\" t +.\" Title: ctdb.conf +.\" Author: +.\" Generator: DocBook XSL Stylesheets v1.79.1 +.\" Date: 11/18/2018 +.\" Manual: CTDB - clustered TDB database +.\" Source: ctdb +.\" Language: English +.\" +.TH "CTDB\&.CONF" "5" "11/18/2018" "ctdb" "CTDB \- clustered TDB database" +.\" ----------------------------------------------------------------- +.\" * 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" +ctdb.conf \- CTDB configuration file +.SH "DESCRIPTION" +.PP +This file contains CTDB configuration options that affect the operation of CTDB daemons and command\-line tools\&. The default location of this file is +/usr/local/etc/ctdb/ctdb\&.conf\&. +.PP +Note that this is a Samba\-style configuration file, so it has a very different syntax to previous CTDB configuration files\&. +.PP +For event script options please see +\fBctdb-script.options\fR(5)\&. +.PP +Configuration options are grouped into several sections below\&. There are only a few options in each section, allowing them to be ordered (approximately) in decreasing order of importance\&. +.SH "LOGGING CONFIGURATION" +.PP +Options in this section control CTDB\*(Aqs logging\&. They are valid within the +\fIlogging\fR +section of file, indicated by +[logging]\&. +.PP +log level = \fILOGLEVEL\fR +.RS 4 +LOGLEVEL is a string that controls the verbosity of ctdbd\*(Aqs logging\&. See the +LOG LEVELS +section in +\fBctdb\fR(7) +for more details\&. +.sp +Default: +NOTICE +.RE +.PP +location = \fISTRING\fR +.RS 4 +STRING specifies where ctdbd will write its log\&. +.sp +Valid values are: +.PP +file:\fIFILENAME\fR +.RS 4 +FILENAME where ctdbd will write its log\&. This is usually +/var/log/log\&.ctdb\&. +.RE +.PP +syslog[:\fIMETHOD\fR] +.RS 4 +CTDB will log to syslog\&. By default this will use the syslog(3) API\&. +.sp +If METHOD is specified then it specifies an extension that causes logging to be done in a non\-blocking fashion\&. This can be useful under heavy loads that might cause the syslog daemon to dequeue messages too slowly, which would otherwise cause CTDB to block when logging\&. METHOD must be one of: +.PP +nonblocking +.RS 4 +CTDB will log to syslog via +/dev/log +in non\-blocking mode\&. +.RE +.PP +udp +.RS 4 +CTDB will log to syslog via UDP to localhost:514\&. The syslog daemon must be configured to listen on (at least) localhost:514\&. Most implementations will log the messages against hostname "localhost" \- this is a limit of the implementation for compatibility with more syslog daemon implementations\&. +.RE +.PP +udp\-rfc5424 +.RS 4 +As with "udp" but messages are sent in RFC5424 format\&. This method will log the correct hostname but is not as widely implemented in syslog daemons\&. +.RE +.RE +.sp +Default: file:/var/log/log\&.ctdb +.RE +.SH "CLUSTER CONFIGURATION" +.PP +Options in this section affect the CTDB cluster setup\&. They are valid within the +\fIcluster\fR +section of file, indicated by +[cluster]\&. +.PP +recovery lock = \fILOCK\fR +.RS 4 +LOCK specifies the cluster\-wide mutex used to detect and prevent a partitioned cluster (or "split brain")\&. +.sp +For information about the recovery lock please see the +RECOVERY LOCK +section in +\fBctdb\fR(7)\&. +.sp +Default: NONE\&. However, uses of a recovery lock is +\fIstrongly recommended\fR\&. +.RE +.PP +node address = \fIIPADDR\fR +.RS 4 +IPADDR is the private IP address that ctdbd will bind to\&. +.sp +This option is only required when automatic address detection can not be used\&. This can be the case when running multiple ctdbd daemons/nodes on the same physical host (usually for testing), using InfiniBand for the private network or on Linux when sysctl net\&.ipv4\&.ip_nonlocal_bind=1\&. +.sp +Default: CTDB selects the first address from the nodes list that it can bind to\&. See also the +PRIVATE ADDRESS +section in +\fBctdb\fR(7)\&. +.RE +.PP +transport = tcp|ib +.RS 4 +This option specifies which transport to use for ctdbd internode communications on the private network\&. +.sp +ib +means InfiniBand\&. The InfiniBand support is not regularly tested\&. If it is known to be broken then it may be disabled so that a value of +ib +is considered invalid\&. +.sp +Default: +tcp +.RE +.SH "DATABASE CONFIGURATION" +.PP +Options in this section affect the CTDB database setup\&. They are valid within the +\fIdatabase\fR +section of file, indicated by +[database]\&. +.PP +volatile database directory = \fIDIRECTORY\fR +.RS 4 +DIRECTORY on local storage where CTDB keeps a local copy of volatile TDB databases\&. This directory is local for each node and should not be stored on the shared cluster filesystem\&. +.sp +Mounting a tmpfs (or similar memory filesystem) on this directory can provide a significant performance improvement when there is I/O contention on the local disk\&. +.sp +Default: +/var/lib/ctdb/volatile +.RE +.PP +persistent database directory=\fIDIRECTORY\fR +.RS 4 +DIRECTORY on local storage where CTDB keeps a local copy of persistent TDB databases\&. This directory is local for each node and should not be stored on the shared cluster filesystem\&. +.sp +Default: +/var/lib/ctdb/persistent +.RE +.PP +state database directory = \fIDIRECTORY\fR +.RS 4 +DIRECTORY on local storage where CTDB keeps a local copy of internal state TDB databases\&. This directory is local for each node and should not be stored on the shared cluster filesystem\&. +.sp +Default: +/var/lib/ctdb/state +.RE +.PP +tdb mutexes = true|false +.RS 4 +This parameter enables TDB_MUTEX_LOCKING feature on volatile databases if the robust mutexes are supported\&. This optimizes the record locking using robust mutexes and is much more efficient that using posix locks\&. +.sp +If robust mutexes are unreliable on the platform being used then they can be disabled by setting this to +false\&. +.RE +.PP +lock debug script = \fIFILENAME\fR +.RS 4 +FILENAME is a script used by CTDB\*(Aqs database locking code to attempt to provide debugging information when CTDB is unable to lock an entire database or a record\&. +.sp +This script should be a bare filename relative to the CTDB configuration directory (/usr/local/etc/ctdb/)\&. Any directory prefix is ignored and the path is calculated relative to this directory\&. +.sp +CTDB provides a lock debugging script and installs it as +/usr/local/etc/ctdb/debug_locks\&.sh\&. +.sp +Default: NONE +.RE +.SH "EVENT HANDLING CONFIGURATION" +.PP +Options in this section affect CTDB event handling\&. They are valid within the +\fIevent\fR +section of file, indicated by +[event]\&. +.PP +debug script = \fIFILENAME\fR +.RS 4 +FILENAME is a script used by CTDB\*(Aqs event handling code to attempt to provide debugging information when an event times out\&. +.sp +This script should be a bare filename relative to the CTDB configuration directory (/usr/local/etc/ctdb/)\&. Any directory prefix is ignored and the path is calculated relative to this directory\&. +.sp +CTDB provides a script for debugging timed out event scripts and installs it as +/usr/local/etc/ctdb/debug\-hung\-script\&.sh\&. +.sp +Default: NONE +.RE +.SH "FAILOVER CONFIGURATION" +.PP +Options in this section affect CTDB failover\&. They are valid within the +\fIfailover\fR +section of file, indicated by +[failover]\&. +.PP +disabled = true|false +.RS 4 +If set to +true +then public IP failover is disabled\&. +.sp +Default: +false +.RE +.SH "LEGACY CONFIGURATION" +.PP +Options in this section affect legacy CTDB setup\&. They are valid within the +\fIlegacy\fR +section of file, indicated by +[legacy]\&. +.PP +ctdb start as stopped = true|false +.RS 4 +If set to +true +CTDB starts in the STOPPED state\&. +.sp +To allow the node to take part in the cluster it must be manually continued with the the +\fBctdb continue\fR +command\&. +.sp +Please see the +NODE STATES +section in +\fBctdb\fR(7) +for more information about the STOPPED state\&. +.sp +Default: +false +.RE +.PP +start as disabled = true|false +.RS 4 +If set to +true +CTDB starts in the DISABLED state\&. +.sp +To allow the node to host public IP addresses and services, it must be manually enabled using the +\fBctdb enable\fR +command\&. +.sp +Please see the +NODE STATES +section in +\fBctdb\fR(7) +for more information about the DISABLED state\&. +.sp +Default: +false +.RE +.PP +realtime scheduling = true|false +.RS 4 +Usually CTDB runs with real\-time priority\&. This helps it to perform effectively on a busy system, such as when there are thousands of Samba clients\&. If you are running CTDB on a platform that does not support real\-time priority, you can set this to +false\&. +.sp +Default: +true +.RE +.PP +recmaster capability = true|false +.RS 4 +Indicates whether a node can become the recovery master for the cluster\&. If this is set to +false +then the node will not be able to become the recovery master for the cluster\&. This feature is primarily used for making a cluster span across a WAN link and use CTDB as a WAN\-accelerator\&. +.sp +Please see the +REMOTE CLUSTER NODES +section in +\fBctdb\fR(7) +for more information\&. +.sp +Default: +true +.RE +.PP +lmaster capability = true|false +.RS 4 +Indicates whether a node can become a location master for records in a database\&. If this is set to +false +then the node will not be part of the vnnmap\&. This feature is primarily used for making a cluster span across a WAN link and use CTDB as a WAN\-accelerator\&. +.sp +Please see the +REMOTE CLUSTER NODES +section in +\fBctdb\fR(7) +for more information\&. +.sp +Default: +true +.RE +.PP +script log level = \fILOGLEVEL\fR +.RS 4 +This option sets the debug level of event script output to LOGLEVEL\&. +.sp +See the +DEBUG LEVELS +section in +\fBctdb\fR(7) +for more information\&. +.sp +Default: +ERROR +.RE +.SH "FILES" +.RS 4 +/usr/local/etc/ctdb/ctdb\&.conf +.RE +.SH "SEE ALSO" +.PP +\fBctdbd\fR(1), +\fBonnode\fR(1), +\fBctdb.sysconfig\fR(5), +\fBctdb-script.options\fR(5), +\fBctdb\fR(7), +\fBctdb-tunables\fR(7), +\m[blue]\fB\%http://ctdb.samba.org/\fR\m[] +.SH "AUTHOR" +.br +.PP +This documentation was written by Amitay Isaacs, Martin Schwenke +.SH "COPYRIGHT" +.br +Copyright \(co 2007 Andrew Tridgell, Ronnie Sahlberg +.br +.PP +This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version\&. +.PP +This program 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 General Public License for more details\&. +.PP +You should have received a copy of the GNU General Public License along with this program; if not, see +\m[blue]\fB\%http://www.gnu.org/licenses\fR\m[]\&. +.sp Property changes on: head/net/samba410/files/man/ctdb.conf.5 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/samba410/files/man/ctdb.sysconfig.5 =================================================================== --- head/net/samba410/files/man/ctdb.sysconfig.5 (nonexistent) +++ head/net/samba410/files/man/ctdb.sysconfig.5 (revision 505446) @@ -0,0 +1,139 @@ +'\" t +.\" Title: ctdb.sysconfig +.\" Author: +.\" Generator: DocBook XSL Stylesheets v1.79.1 +.\" Date: 11/18/2018 +.\" Manual: CTDB - clustered TDB database +.\" Source: ctdb +.\" Language: English +.\" +.TH "CTDB\&.SYSCONFIG" "5" "11/18/2018" "ctdb" "CTDB \- clustered TDB database" +.\" ----------------------------------------------------------------- +.\" * 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" +ctdb.sysconfig \- CTDB daemon configuration file +.SH "DESCRIPTION" +.PP +This file contains configuration that affects the operation of CTDB\&. This is a distribution\-specific service configuration file such as +/etc/sysconfig/ctdb +(Red Hat) or +/etc/default/ctdb +(Debian) and is a shell script (see +\fBsh\fR(1))\&. +.SH "GLOBAL CONFIGURATION" +.PP +CTDB_INIT_STYLE=debian|redhat|suse +.RS 4 +This is the init style used by the Linux distribution (or other operating system) being used\&. This is usually determined dynamically by checking the system\&. This variable is used by the initscript to determine which init system primitives to use\&. It is also used by some eventscripts to choose the name of initscripts for certain services, since these can vary between distributions\&. +.sp +If using CTDB\*(Aqs event scripts are unable to determine an appropriate default then this option can also be placed in a relevant +\fBctdb-script.options\fR(5) +file\&. +.sp +Default: NONE\&. Guessed, based on features of distribution\&. +.RE +.PP +CTDB_STARTUP_TIMEOUT=\fINUM\fR +.RS 4 +NUM is the number of seconds to wait for +\fBctdbd\fR(1) +complete early initialisation up to a point where it is unlikely to abort\&. If +\fBctdbd\fR +doesn\*(Aqt complete the "setup" event before this timeout then it is killed\&. +.sp +Defaults: 10 +.RE +.SH "RESOURCE LIMITS" +.SS "Maximum number of open files" +.PP +CTDB can use a lot of file descriptors, especially when used with Samba\&. If there are thousands of smbd processes connected to CTDB when this can mean that thousands of file descriptors are used\&. For CTDB, it is often necessary to increase limit on the maximum number of open files\&. +.PP +The maximum number of open files should be configured using an operating system mechanism\&. +.PP +systemd +.RS 4 +The +LimitNOFILE=\fBLIMIT\fR +option can be used in a unit/service file increase the maximum number of open files\&. See +\fBsystemd.exec\fR(5) +for details\&. +.RE +.PP +SYSV init +.RS 4 +Use a command like +\fBulimit \-n \fR\fB\fBLIMIT\fR\fR +to increase the maximum number of open files\&. This command can be put in the relevant distribution\-specific service configuration file\&. +.RE +.SS "Allowing core dumps" +.PP +Many distributions do not allow core dump files to be generated by default\&. To assist with debugging, core files can be enabled\&. This should be configured using an operating system mechanism\&. +.PP +systemd +.RS 4 +The +LimitCORE=0|unlimited +option can be used in a unit/service file\&. +0 +disallows core files, +unlimited +allows them\&. maximum number of open files\&. See +\fBsystemd.exec\fR(5) +for details\&. +.RE +.PP +SYSV init +.RS 4 +Use a command like +\fBulimit \-c 0|unlimited\fR +to disable or enable core files as required\&. This command can be put in the relevant distribution\-specific service configuration file\&. +.RE +.SH "FILES" +.RS 4 +/etc/sysconfig/ctdb +.RE +.RS 4 +/etc/default/ctdb +.RE +.RS 4 +/usr/local/etc/ctdb/script\&.options +.RE +.SH "SEE ALSO" +.PP +\fBctdbd\fR(1), +\fBctdb-script.options\fR(5), +\fBctdb\fR(7), +\m[blue]\fB\%http://ctdb.samba.org/\fR\m[] +.SH "AUTHOR" +.br +.PP +This documentation was written by Martin Schwenke +.SH "COPYRIGHT" +.br +Copyright \(co 2007 Andrew Tridgell, Ronnie Sahlberg +.br +.PP +This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version\&. +.PP +This program 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 General Public License for more details\&. +.PP +You should have received a copy of the GNU General Public License along with this program; if not, see +\m[blue]\fB\%http://www.gnu.org/licenses\fR\m[]\&. +.sp Property changes on: head/net/samba410/files/man/ctdb.sysconfig.5 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/samba410/files/man/ctdb_diagnostics.1 =================================================================== --- head/net/samba410/files/man/ctdb_diagnostics.1 (revision 505445) +++ head/net/samba410/files/man/ctdb_diagnostics.1 (revision 505446) @@ -1,79 +1,79 @@ '\" t .\" Title: ctdb_diagnostics .\" Author: .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 11/20/2017 +.\" Date: 11/18/2018 .\" Manual: CTDB - clustered TDB database .\" Source: ctdb .\" Language: English .\" -.TH "CTDB_DIAGNOSTICS" "1" "11/20/2017" "ctdb" "CTDB \- clustered TDB database" +.TH "CTDB_DIAGNOSTICS" "1" "11/18/2018" "ctdb" "CTDB \- clustered TDB database" .\" ----------------------------------------------------------------- .\" * 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" ctdb_diagnostics \- dump diagnostic information about CTDB/Samba installation .SH "SYNOPSIS" .HP \w'\fBctdb_diagnostics\fR\ 'u \fBctdb_diagnostics\fR [OPTIONS] \&.\&.\&. .SH "DESCRIPTION" .PP ctdb_diagnostics is used to dump diagnostic information about a clustered Samba installation\&. This includes configuration files, output of relevant commands and logs\&. This information can be used to check the correctness of the configuration and to diagnose problems\&. .SH "OPTIONS" .PP \-n .RS 4 Comma separated list of nodes to operate on .RE .PP \-c .RS 4 Ignore comment lines (starting with \*(Aq#\*(Aq) in file comparisons .RE .PP \-w .RS 4 Ignore whitespace in file comparisons .RE .PP \-\-no\-ads .RS 4 Do not use commands that assume an Active Directory Server .RE .SH "SEE ALSO" .PP \fBctdb\fR(1), \fBctdb\fR(7), \m[blue]\fB\%https://ctdb.samba.org/\fR\m[] .SH "AUTHOR" .br .PP This documentation was written by Martijn van Brummelen .SH "COPYRIGHT" .br Copyright \(co 2015 Martijn van Brummelen .br .PP This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version\&. .PP This program 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 General Public License for more details\&. .PP You should have received a copy of the GNU General Public License along with this program; if not, see \m[blue]\fB\%http://www.gnu.org/licenses\fR\m[]\&. .sp Index: head/net/samba410/files/man/ctdbd.1 =================================================================== --- head/net/samba410/files/man/ctdbd.1 (revision 505445) +++ head/net/samba410/files/man/ctdbd.1 (revision 505446) @@ -1,358 +1,81 @@ '\" t .\" Title: ctdbd .\" Author: .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 11/20/2017 +.\" Date: 11/18/2018 .\" Manual: CTDB - clustered TDB database .\" Source: ctdb .\" Language: English .\" -.TH "CTDBD" "1" "11/20/2017" "ctdb" "CTDB \- clustered TDB database" +.TH "CTDBD" "1" "11/18/2018" "ctdb" "CTDB \- clustered TDB database" .\" ----------------------------------------------------------------- .\" * 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" ctdbd \- The CTDB cluster daemon .SH "SYNOPSIS" .HP \w'\fBctdbd\fR\ 'u \fBctdbd\fR [\fIOPTION\fR...] .SH "DESCRIPTION" .PP ctdbd is the main CTDB daemon\&. .PP Note that ctdbd is not usually invoked directly\&. It is invoked via \fBctdbd_wrapper\fR(1) or via the initscript\&. .PP See \fBctdb\fR(7) for an overview of CTDB\&. .SH "GENERAL OPTIONS" .PP -\-d, \-\-debug=\fIDEBUGLEVEL\fR +\-i, \-\-interactive .RS 4 -This option sets the debug level to DEBUGLEVEL, which controls what will be written by the logging subsystem\&. The default is 2\&. -.sp -See the -DEBUG LEVELS -section in -\fBctdb\fR(7) -for more information\&. +Enable interactive mode\&. This will make ctdbd run in the foreground and not detach from the terminal\&. By default ctdbd will detach itself and run in the background as a daemon\&. .RE .PP -\-\-dbdir=\fIDIRECTORY\fR -.RS 4 -DIRECTORY on local storage where ctdbd keeps a local copy of TDB databases\&. This directory is local for each node and should not be stored on the shared cluster filesystem\&. -.sp -Defaults to -/usr/local/var/lib/ctdb\&. -.RE -.PP -\-\-dbdir\-persistent=\fIDIRECTORY\fR -.RS 4 -DIRECTORY on local storage where ctdbd keeps a local copy of persistent TDB databases\&. This directory is local for each node and should not be stored on the shared cluster filesystem\&. -.sp -Defaults to -/usr/local/var/lib/ctdb/persistent\&. -.RE -.PP -\-\-dbdir\-state=\fIDIRECTORY\fR -.RS 4 -DIRECTORY on local storage where ctdbd keep internal state TDB files\&. This directory is local for each node and should not be stored on the shared cluster filesystem\&. -.sp -Defaults to -/usr/local/var/lib/ctdb/state\&. -.RE -.PP -\-\-event\-script\-dir=\fIDIRECTORY\fR -.RS 4 -DIRECTORY where the CTDB event scripts are stored\&. See the -EVENT SCRIPTS -section in -\fBctdb\fR(7) -for more information\&. -.sp -Default is -\fBCTDB_BASE\fR/events\&.d, so usually -/usr/local/etc/ctdb/events\&.d, which is part of the CTDB installation\&. -.RE -.PP -\-\-listen=\fIIPADDR\fR -.RS 4 -IPADDR is the private IP address that ctdbd will bind to\&. -.sp -By default ctdbd will select the first address from the nodes list that in can bind to\&. See also -\-\-nlist\&. -.sp -This option is only required when automatic address detection can not be used\&. This can be the case when running multiple ctdbd daemons/nodes on the same physical host (usually for testing), using InfiniBand for the private network or on Linux when sysctl net\&.ipv4\&.ip_nonlocal_bind=1\&. -.RE -.PP -\-\-logging=\fISTRING\fR -.RS 4 -STRING specifies where ctdbd will write its log\&. The default is file:/usr/local/var/log/log\&.ctdb\&. -.sp -Valid values are: -.PP -file:\fIFILENAME\fR -.RS 4 -FILENAME where ctdbd will write its log\&. This is usually -/usr/local/var/log/log\&.ctdb\&. -.RE -.PP -syslog[:\fIMETHOD\fR] -.RS 4 -CTDB will log to syslog\&. By default this will use the syslog(3) API\&. -.sp -Under heavy loads syslog(3) can block if the syslog daemon processes messages too slowly\&. This can cause CTDB to block when logging\&. -.sp -If METHOD is specified then it specifies an extension that causes logging to be done in a non\-blocking mode\&. Note that -\fIthis may cause messages to be dropped\fR\&. METHOD must be one of: -.PP -nonblocking -.RS 4 -CTDB will log to syslog via -/dev/log -in non\-blocking mode\&. -.RE -.PP -udp -.RS 4 -CTDB will log to syslog via UDP to localhost:514\&. The syslog daemon must be configured to listen on (at least) localhost:514\&. Most syslog daemons will log the messages with hostname "localhost" \- this is a limitation of the implementation, for compatibility with more syslog daemons\&. -.RE -.PP -udp\-rfc5424 -.RS 4 -As with "udp" but messages are sent in RFC5424 format\&. This method will log the correct hostname but is not as widely implemented in syslog daemons\&. -.RE -.RE -.RE -.PP -\-\-max\-persistent\-check\-errors=\fINUM\fR -.RS 4 -NUM specifies the maximum number of health check failures allowed for persistent databases during startup\&. -.sp -The default value is 0\&. Setting this to non\-zero allows a node with unhealthy persistent databases to startup and join the cluster as long as there is another node with healthy persistent databases\&. -.RE -.PP -\-\-nlist=\fIFILENAME\fR -.RS 4 -FILENAME containing a list of the private IP addresses, one per line, for each node in the cluster\&. This file -\fImust be the same on each node\fR -in the cluster\&. -.sp -Default is -\fBCTDB_BASE\fR/nodes, so usually -/usr/local/etc/ctdb/nodes\&. -.RE -.PP -\-\-no\-lmaster -.RS 4 -This argument specifies that this node can NOT become an lmaster for records in the database\&. This means that it will never show up in the vnnmap\&. This feature is primarily used for making a cluster span across a WAN link and use CTDB as a WAN\-accelerator\&. -.sp -Please see the -REMOTE CLUSTER NODES -section in -\fBctdb\fR(7) -for more information\&. -.RE -.PP -\-\-no\-recmaster -.RS 4 -This argument specifies that this node can NOT become a recmaster for the database\&. This feature is primarily used for making a cluster span across a WAN link and use CTDB as a WAN\-accelerator\&. -.sp -Please see the -REMOTE CLUSTER NODES -section in -\fBctdb\fR(7) -for more information\&. -.RE -.PP -\-\-notification\-script=\fIFILENAME\fR -.RS 4 -FILENAME specifying a script to be invoked by ctdbd when certain state changes occur\&. -.sp -This file is usually -/usr/local/etc/ctdb/notify\&.sh\&. -.sp -Please see the -NOTIFICATION SCRIPT -section in -\fBctdb\fR(7) -for more information\&. -.RE -.PP -\-\-pidfile=\fIFILENAME\fR -.RS 4 -FILENAME for file containing process ID of main CTDB daemon\&. This file is automatically created and removed by CTDB\&. -.sp -The default is to not create a PID file\&. -.RE -.PP -\-\-public_addresses=\fIFILENAME\fR -.RS 4 -FILENAME specifying a file containing the public IP addresses to use on the cluster when CTDB should use IP takeover\&. This file contains a list of IP addresses, netmasks and interfaces\&. CTDB will distribute these public IP addresses appropriately across the available nodes\&. -.sp -The IP addresses specified in this file can differ across nodes\&. -.sp -This is usually the file -/usr/local/etc/ctdb/public_addresses -.RE -.PP -\-\-public\-interface=\fIINTERFACE\fR -.RS 4 -Default INTERFACE on which to attach public IP addresses\&. -.sp -When using public IP addresses, this is only required if interfaces are not explicitly specified in the public addresses file\&. -.RE -.PP -\-\-reclock=\fILOCK\fR -.RS 4 -LOCK specifies the cluster\-wide mutex used to detect and prevent a partitioned cluster (or "split brain")\&. -.sp -For information about the recovery lock please see the -RECOVERY LOCK -section in -\fBctdb\fR(7)\&. -.RE -.PP -\-\-start\-as\-disabled -.RS 4 -This makes ctdbd start in the DISABLED state\&. -.sp -To allow the node to host public IP addresses and services, it must be manually enabled using the -\fBctdb enable\fR -command\&. -.sp -Please see the -NODE STATES -section in -\fBctdb\fR(7) -for more information about the DISABLED state\&. -.RE -.PP -\-\-start\-as\-stopped -.RS 4 -This makes ctdbd start in the STOPPED state\&. -.sp -To allow the node to take part in the cluster it must be manually continued with the the -\fBctdb enable\fR -command\&. -.sp -Please see the -NODE STATES -section in -\fBctdb\fR(7) -for more information about the STOPPED state\&. -.RE -.PP -\-\-transport=tcp|infiniband -.RS 4 -This option specifies which transport to use for ctdbd internode communications\&. The default is "tcp"\&. -.sp -The "infiniband" support is not regularly tested\&. -.RE -.PP \-?, \-\-help .RS 4 Display a summary of options\&. .RE -.SH "DEBUGGING OPTIONS" -.PP -\-i, \-\-interactive -.RS 4 -Enable interactive mode\&. This will make ctdbd run in the foreground and not detach from the terminal\&. By default ctdbd will detach itself and run in the background as a daemon\&. -.RE -.PP -\-\-nopublicipcheck -.RS 4 -This option is used when testing with multiple local daemons on a single machine\&. It disables checks related to public IP addresses\&. -.RE -.PP -\-\-nosetsched -.RS 4 -This is a debugging option\&. This option is only used when debugging ctdbd\&. -.sp -Normally ctdbd will change its scheduler to run as a real\-time process\&. This is the default mode for a normal ctdbd operation to gurarantee that ctdbd always gets the CPU cycles that it needs\&. -.sp -This option is used to tell ctdbd to -\fInot\fR -run as a real\-time process and instead run ctdbd as a normal userspace process\&. This is useful for debugging and when you want to run ctdbd under valgrind or gdb\&. (You don\*(Aqt want to attach valgrind or gdb to a real\-time process\&.) -.RE -.PP -\-\-socket=\fIFILENAME\fR -.RS 4 -FILENAME specifies the name of the Unix domain socket that ctdbd will create\&. This socket is used by local clients to communicate with ctdbd\&. -.sp -The default is -/usr/local/var/run/ctdb/ctdbd\&.socket\&. You only need to use this option if you plan to run multiple ctdbd daemons on the same physical host, usually for testing\&. -.RE -.PP -\-\-script\-log\-level=\fIDEBUGLEVEL\fR -.RS 4 -This option sets the debug level of event script output to DEBUGLEVEL\&. The default is ERR\&. -.sp -See the -DEBUG LEVELS -section in -\fBctdb\fR(7) -for more information\&. -.RE -.PP -\-\-sloppy\-start -.RS 4 -This is debugging option\&. This speeds up the initial recovery during startup at the expense of some consistency checking\&. -\fIDon\*(Aqt use this option in production\fR\&. -.RE -.PP -\-\-torture -.RS 4 -This option is only used for development and testing of CTDB\&. It adds artificial errors and failures to the common codepaths in ctdbd to verify that ctdbd can recover correctly from failures\&. -.sp -\fIDo not use this option\fR -unless you are developing and testing new functionality in CTDB\&. -.RE -.PP -\-\-valgrinding -.RS 4 -This is a debugging option\&. This option is only used when debugging ctdbd\&. This enables additional debugging capabilities and implies \-\-nosetsched\&. -.RE .SH "SEE ALSO" .PP \fBctdb\fR(1), \fBctdbd_wrapper\fR(1), \fBonnode\fR(1), +\fBctdb.conf\fR(5), \fBctdb\fR(7), \fBctdb-tunables\fR(7), \m[blue]\fB\%http://ctdb.samba.org/\fR\m[] .SH "AUTHOR" .br .PP This documentation was written by Ronnie Sahlberg, Amitay Isaacs, Martin Schwenke .SH "COPYRIGHT" .br Copyright \(co 2007 Andrew Tridgell, Ronnie Sahlberg .br .PP This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version\&. .PP This program 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 General Public License for more details\&. .PP You should have received a copy of the GNU General Public License along with this program; if not, see \m[blue]\fB\%http://www.gnu.org/licenses\fR\m[]\&. .sp Index: head/net/samba410/files/man/ctdbd_wrapper.1 =================================================================== --- head/net/samba410/files/man/ctdbd_wrapper.1 (revision 505445) +++ head/net/samba410/files/man/ctdbd_wrapper.1 (revision 505446) @@ -1,69 +1,63 @@ '\" t .\" Title: ctdbd_wrapper .\" Author: .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 11/20/2017 +.\" Date: 11/18/2018 .\" Manual: CTDB - clustered TDB database .\" Source: ctdb .\" Language: English .\" -.TH "CTDBD_WRAPPER" "1" "11/20/2017" "ctdb" "CTDB \- clustered TDB database" +.TH "CTDBD_WRAPPER" "1" "11/18/2018" "ctdb" "CTDB \- clustered TDB database" .\" ----------------------------------------------------------------- .\" * 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" ctdbd_wrapper \- Wrapper for ctdbd .SH "SYNOPSIS" .HP \w'\fBctdbd_wrapper\fR\ 'u -\fBctdbd_wrapper\fR {\fIPIDFILE\fR} {start | stop} +\fBctdbd_wrapper\fR {start | stop} .SH "DESCRIPTION" .PP ctdbd_wrapper is used to start or stop the main CTDB daemon\&. .PP -\fIPIDFILE\fR -specifies the location of the file containing the PID of the main CTDB daemon\&. -.PP -ctdbd_wrapper constructs command\-line options for ctdbd from configuration variables specified in -\fBctdbd.conf\fR(5)\&. -.PP See \fBctdb\fR(7) for an overview of CTDB\&. .SH "SEE ALSO" .PP \fBctdbd\fR(1), -\fBctdbd.conf\fR(5), +\fBctdb.sysconfig\fR(5), \fBctdb\fR(7), \m[blue]\fB\%http://ctdb.samba.org/\fR\m[] .SH "AUTHOR" .br .PP This documentation was written by Amitay Isaacs, Martin Schwenke .SH "COPYRIGHT" .br Copyright \(co 2007 Andrew Tridgell, Ronnie Sahlberg .br .PP This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version\&. .PP This program 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 General Public License for more details\&. .PP You should have received a copy of the GNU General Public License along with this program; if not, see \m[blue]\fB\%http://www.gnu.org/licenses\fR\m[]\&. .sp Index: head/net/samba410/files/man/samba-gpupdate.8 =================================================================== --- head/net/samba410/files/man/samba-gpupdate.8 (nonexistent) +++ head/net/samba410/files/man/samba-gpupdate.8 (revision 505446) @@ -0,0 +1,113 @@ +'\" t +.\" Title: SAMBA_GPOUPDATE +.\" Author: [see the "AUTHOR" section] +.\" Generator: DocBook XSL Stylesheets v1.76.1 +.\" Date: 2017-07-11 +.\" Manual: System Administration tools +.\" Source: Samba 4.8.0 +.\" Language: English +.\" +.TH "SAMBA_GPOUPDATE" "8" "2017\-07\-11" "Samba 4\&.8\&.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" +samba_gpoupdate \- apply group policy +.SH "SYNOPSIS" +.HP \w'\fBsamba_gpoupdate\fR\ 'u +\fBsamba_gpoupdate\fR +.HP \w'\fBsamba_gpoupdate\fR\ 'u +\fBsamba_gpoupdate\fR [\fIoptions\fR] +.SH "DESCRIPTION" +.PP +This tool is part of the +\fBsamba\fR(1) +suite\&. +.PP +\fBsamba_gpoupdate\fR +a script for applying and unapplying Group Policy\&. Group Policy application is experimental\&. Currently this applies password policies (minimum/maximum password age, minimum password length, and password complexity) and kerberos policies (user/service ticket lifetime and renew lifetime)\&. +.SH "OPTIONS" +.PP +\fB\-h\fR, +\fB\-\-help\fR +show this help message and exit +.PP +\fB\-H \fRURL, +\fB\-\-url\fR=\fIURL\fR +URL for the samdb +.PP +\fB\-X\fR, +\fB\-\-unapply\fR +Unapply Group Policy +.PP +Samba Common Options: +.PP +\fB\-s \fRFILE, +\fB\-\-configfile\fR=\fIFILE\fR +Configuration file +.PP +\fB\-d \fRDEBUGLEVEL, +\fB\-\-debuglevel\fR=\fIDEBUGLEVEL\fR +debug level +.PP +\fB\-\-option\fR=\fIOPTION\fR +set smb\&.conf option from command line +.PP +\fB\-\-realm\fR=\fIREALM\fR +set the realm name +.PP +Version Options: +.PP +\fB\-V\fR, +\fB\-\-version\fR +Display version number +.PP +Credentials Options: +.PP +\fB\-\-simple\-bind\-dn\fR=\fIDN\fR +DN to use for a simple bind +.PP +\fB\-\-password\fR=\fIPASSWORD\fR +Password +.PP +\fB\-U \fRUSERNAME, +\fB\-\-username\fR=\fIUSERNAME\fR +Username +.PP +\fB\-W \fRWORKGROUP, +\fB\-\-workgroup\fR=\fIWORKGROUP\fR +Workgroup +.PP +\fB\-N\fR, +\fB\-\-no\-pass\fR +Don\*(Aqt ask for a password +.PP +\fB\-k \fRKERBEROS, +\fB\-\-kerberos\fR=\fIKERBEROS\fR +Use Kerberos +.PP +\fB\-\-ipaddress\fR=\fIIPADDRESS\fR +IP address of server +.PP +\fB\-P\fR, +\fB\-\-machine\-pass\fR +Use stored machine account password +.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\&. Property changes on: head/net/samba410/files/man/samba-gpupdate.8 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/samba410/files/man/vfs_freebsd.8 =================================================================== --- head/net/samba410/files/man/vfs_freebsd.8 (nonexistent) +++ head/net/samba410/files/man/vfs_freebsd.8 (revision 505446) @@ -0,0 +1,204 @@ +'\" t +.\" Title: vfs_freebsd +.\" Author: [see the "AUTHOR" section] +.\" Generator: DocBook XSL Stylesheets v1.79.1 +.\" Date: 06/24/2019 +.\" Manual: System Administration tools +.\" Source: Samba 4.10.5 +.\" Language: English +.\" +.TH "VFS_FREEBSD" "8" "06/24/2019" "Samba 4\&.10\&.5" "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" +vfs_freebsd \- FreeBSD\-specific VFS functions +.SH "SYNOPSIS" +.HP \w'\ 'u +vfs objects = freebsd +.SH "DESCRIPTION" +.PP +This VFS module is part of the +\fBsamba\fR(7) +suite\&. +.PP +The +vfs_freebsd +module implements some of the FreeBSD\-specific VFS functions\&. +.PP +This module is stackable\&. +.SH "OPTIONS" +.PP +freebsd:extattr mode=[legacy|compat|secure] +.RS 4 +This parameter defines how the emulation of the Linux attr(5) extended attributes is performed through the FreeBSD native extattr(9) system calls\&. +.sp +Currently the +\fIsecurity\fR, +\fIsystem\fR, +\fItrusted\fR +and +\fIuser\fR +extended attribute(xattr) classes are defined in Linux\&. Contrary FreeBSD has only +\fIUSER\fR +and +\fISYSTEM\fR +extended attribute(extattr) namespaces, so mapping of one set into another isn\*(Aqt straightforward and can be done in different ways\&. +.sp +Historically the Samba(7) built\-in xattr mapping implementation simply converted +\fIsystem\fR +and +\fIuser\fR +xattr into corresponding +\fISYSTEM\fR +and +\fIUSER\fR +extattr namespaces, dropping the class prefix name with the separating dot and using attribute name only within the mapped namespace\&. It also rejected any other xattr classes, like +\fIsecurity\fR +and +\fItrusted\fR +as invalid\&. Such behavior in particular broke AD provisioning on UFS2 file systems as essential +\fIsecurity\&.NTACL\fR +xattr was rejected as invalid\&. +.sp +This module tries to address this problem and provide secure, where it\*(Aqs possible, way to map Linux xattr into FreeBSD\*(Aqs extattr\&. +.sp +When +\fImode\fR +is set to the +\fIlegacy (default)\fR +then modified version of built\-in mapping is used, where +\fIsystem\fR +xattr is mapped into SYSTEM namespace, while +\fIsecure\fR, +\fItrusted\fR +and +\fIuser\fR +xattr are all mapped into the USER namespace, dropping class prefixes and mix them all together\&. This is the way how Samba FreeBSD ports were patched up to the 4\&.9 version and that created multiple potential security issues\&. This mode is aimed for the compatibility with the legacy installations only and should be avoided in new setups\&. +.sp +The +\fIcompat\fR +mode is mostly designed for the jailed environments, where it\*(Aqs not possible to write extattrs into the secure SYSTEM namespace, so all four classes are mapped into the USER namespace\&. To preserve information about origin of the extended attribute it is stored together with the class preffix in the +\fIclass\&.attribute\fR +format\&. +.sp +The +\fIsecure\fR +mode is meant for storing extended attributes in a secure manner, so that +\fIsecurity\fR, +\fIsystem\fR +and +\fItrusted\fR +are stored in the SYSTEM namespace, which can be modified only by root\&. +.RE +.SH "" +.sp +.it 1 an-trap +.nr an-no-space-flag 1 +.nr an-break-flag 1 +.br +.B Table\ \&1.\ \&Attributes mapping +.TS +allbox tab(:); +lB lB lB lB lB. +T{ + +T}:T{ +built\-in +T}:T{ +legacy +T}:T{ +compat/jail +T}:T{ +secure +T} +.T& +lB l l l l +lB l l l l +lB l l l l +lB l l l l. +T{ +user +T}:T{ +USER; attribute +T}:T{ +USER; attribute +T}:T{ +USER; user\&.attribute +T}:T{ +USER; user\&.attribute +T} +T{ +system +T}:T{ +SYSTEM; attribute +T}:T{ +SYSTEM; attribute +T}:T{ +USER; system\&.attribute +T}:T{ +SYSTEM; system\&.attribute +T} +T{ +trusted +T}:T{ +FAIL +T}:T{ +USER; attribute +T}:T{ +USER; trusted\&.attribute +T}:T{ +SYSTEM; trusted\&.attribute +T} +T{ +security +T}:T{ +FAIL +T}:T{ +USER; attribute +T}:T{ +USER; security\&.attribute +T}:T{ +SYSTEM; security\&.attribute +T} +.TE +.sp 1 +.SH "EXAMPLES" +.PP +Use secure method of setting extended attributes on the share: +.sp +.if n \{\ +.RS 4 +.\} +.nf + \fI[sysvol]\fR + \m[blue]\fBvfs objects = freebsd\fR\m[] + \m[blue]\fBfreebsd:extattr mode = secure\fR\m[] +.fi +.if n \{\ +.RE +.\} +.SH "VERSION" +.PP +This man page is part of version 4\&.10\&.5 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 +This module was written by Timur I\&. Bakeyev Property changes on: head/net/samba410/files/man/vfs_freebsd.8 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/samba410/files/patch-bind14 =================================================================== --- head/net/samba410/files/patch-bind14 (nonexistent) +++ head/net/samba410/files/patch-bind14 (revision 505446) @@ -0,0 +1,88 @@ +--- source4/dns_server/wscript_build.orig 2019-01-15 10:07:00 UTC ++++ source4/dns_server/wscript_build +@@ -68,6 +68,26 @@ bld.SAMBA_LIBRARY('dlz_bind9_12', + deps='samba-hostconfig samdb-common gensec popt dnsserver_common', + enabled=bld.AD_DC_BUILD_IS_ENABLED()) + ++bld.SAMBA_LIBRARY('dlz_bind9_13', ++ source='dlz_bind9.c', ++ cflags='-DBIND_VERSION_9_13', ++ private_library=True, ++ link_name='modules/bind9/dlz_bind9_13.so', ++ realname='dlz_bind9_13.so', ++ install_path='${MODULESDIR}/bind9', ++ deps='samba-hostconfig samdb-common gensec popt dnsserver_common', ++ enabled=bld.AD_DC_BUILD_IS_ENABLED()) ++ ++bld.SAMBA_LIBRARY('dlz_bind9_14', ++ source='dlz_bind9.c', ++ cflags='-DBIND_VERSION_9_14', ++ private_library=True, ++ link_name='modules/bind9/dlz_bind9_14.so', ++ realname='dlz_bind9_14.so', ++ install_path='${MODULESDIR}/bind9', ++ deps='samba-hostconfig samdb-common gensec popt dnsserver_common', ++ enabled=bld.AD_DC_BUILD_IS_ENABLED()) ++ + bld.SAMBA_LIBRARY('dlz_bind9_for_torture', + source='dlz_bind9.c', + cflags='-DBIND_VERSION_9_8', +--- source4/dns_server/dlz_minimal.h.orig 2019-01-15 10:07:00 UTC ++++ source4/dns_server/dlz_minimal.h +@@ -31,10 +31,7 @@ + #elif defined (BIND_VERSION_9_10) + # define DLZ_DLOPEN_VERSION 3 + # define DNS_CLIENTINFO_VERSION 1 +-#elif defined (BIND_VERSION_9_11) +-# define DLZ_DLOPEN_VERSION 3 +-# define DNS_CLIENTINFO_VERSION 2 +-#elif defined (BIND_VERSION_9_12) ++#elif defined (BIND_VERSION_9_11) || defined (BIND_VERSION_9_12) || defined (BIND_VERSION_9_13) || defined (BIND_VERSION_9_14) + # define DLZ_DLOPEN_VERSION 3 + # define DNS_CLIENTINFO_VERSION 2 + #else +--- source4/setup/named.conf.dlz.orig 2019-06-22 09:56:57 UTC ++++ source4/setup/named.conf.dlz +@@ -22,5 +22,8 @@ dlz "AD DNS Zone" { + # For BIND 9.11.x + ${BIND9_11} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_11.so"; + ++ # For BIND 9.12.x ++ ${BIND9_12} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_12.so"; ++ + }; + +--- python/samba/provision/sambadns.py.orig 2019-01-15 10:07:00 UTC ++++ python/samba/provision/sambadns.py +@@ -960,6 +960,8 @@ def create_named_conf(paths, realm, dnsd + bind9_10 = '#' + bind9_11 = '#' + bind9_12 = '#' ++ bind9_13 = '#' ++ bind9_14 = '#' + if bind_info.upper().find('BIND 9.8') != -1: + bind9_8 = '' + elif bind_info.upper().find('BIND 9.9') != -1: +@@ -970,6 +972,10 @@ def create_named_conf(paths, realm, dnsd + bind9_11 = '' + elif bind_info.upper().find('BIND 9.12') != -1: + bind9_12 = '' ++ elif bind_info.upper().find('BIND 9.13') != -1: ++ bind9_13 = '' ++ elif bind_info.upper().find('BIND 9.14') != -1: ++ bind9_14 = '' + elif bind_info.upper().find('BIND 9.7') != -1: + raise ProvisioningError("DLZ option incompatible with BIND 9.7.") + else: +@@ -981,8 +987,9 @@ def create_named_conf(paths, realm, dnsd + "BIND9_9": bind9_9, + "BIND9_10": bind9_10, + "BIND9_11": bind9_11, +- "BIND9_12": bind9_12 +- ++ "BIND9_12" : bind9_12, ++ "BIND9_13" : bind9_13, ++ "BIND9_14" : bind9_14 + }) + + Property changes on: head/net/samba410/files/patch-bind14 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/samba410/files/patch-buildtools_scripts_abi__gen.sh =================================================================== --- head/net/samba410/files/patch-buildtools_scripts_abi__gen.sh (nonexistent) +++ head/net/samba410/files/patch-buildtools_scripts_abi__gen.sh (revision 505446) @@ -0,0 +1,21 @@ +--- buildtools/scripts/abi_gen.sh.orig 2019-01-15 10:07:00 UTC ++++ buildtools/scripts/abi_gen.sh +@@ -9,13 +9,14 @@ GDBSCRIPT="gdb_syms.$$" + cat < $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 | sed -e 's/:type =/:/g' + rm -f $GDBSCRIPT Property changes on: head/net/samba410/files/patch-buildtools_scripts_abi__gen.sh ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/samba410/files/patch-buildtools_wafsamba_samba__autoconf.py =================================================================== --- head/net/samba410/files/patch-buildtools_wafsamba_samba__autoconf.py (nonexistent) +++ head/net/samba410/files/patch-buildtools_wafsamba_samba__autoconf.py (revision 505446) @@ -0,0 +1,51 @@ +--- buildtools/wafsamba/samba_autoconf.py.orig 2019-01-15 10:07:00 UTC ++++ buildtools/wafsamba/samba_autoconf.py +@@ -575,7 +575,7 @@ def library_flags(self, libs): + + + @conf +-def CHECK_LIB(conf, libs, mandatory=False, empty_decl=True, set_target=True, shlib=False): ++def CHECK_LIB(conf, libs, mandatory=False, empty_decl=True, set_target=True, shlib=False, msg=None): + '''check if a set of libraries exist as system libraries + + returns the sublist of libs that do exist as a syslib or [] +@@ -595,11 +595,29 @@ int foo() + ret.append(lib) + continue + ++ if msg is None: ++ msg = 'Checking for library %s' % lib ++ + (ccflags, ldflags, cpppath) = library_flags(conf, lib) ++ + if shlib: +- res = conf.check(features='c cshlib', fragment=fragment, lib=lib, uselib_store=lib, cflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False) ++ res = conf.check(features='c cshlib', ++ fragment=fragment, ++ lib=lib, ++ uselib_store=lib, ++ cflags=ccflags, ++ ldflags=ldflags, ++ uselib=lib.upper(), ++ mandatory=False, ++ msg=msg) + else: +- res = conf.check(lib=lib, uselib_store=lib, cflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False) ++ res = conf.check(lib=lib, ++ uselib_store=lib, ++ cflags=ccflags, ++ ldflags=ldflags, ++ uselib=lib.upper(), ++ mandatory=False, ++ msg=msg) + + if not res: + if mandatory: +@@ -927,6 +945,6 @@ def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(c + conf.env.undefined_ldflags = conf.ADD_LDFLAGS('-Wl,-no-undefined', testflags=True) + + if not sys.platform.startswith("openbsd") and conf.env.undefined_ignore_ldflags == []: +- if conf.CHECK_LDFLAGS(['-undefined', 'dynamic_lookup']): ++ if conf.CHECK_LDFLAGS(['-undefined', 'dynamic_lookup'] + conf.env.WERROR_CFLAGS): + conf.env.undefined_ignore_ldflags = ['-undefined', 'dynamic_lookup'] + Property changes on: head/net/samba410/files/patch-buildtools_wafsamba_samba__autoconf.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/samba410/files/patch-buildtools_wafsamba_samba__install.py =================================================================== --- head/net/samba410/files/patch-buildtools_wafsamba_samba__install.py (nonexistent) +++ head/net/samba410/files/patch-buildtools_wafsamba_samba__install.py (revision 505446) @@ -0,0 +1,11 @@ +--- buildtools/wafsamba/samba_install.py.orig 2019-01-15 10:07:00 UTC ++++ buildtools/wafsamba/samba_install.py +@@ -118,7 +118,7 @@ def install_library(self): + 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: Property changes on: head/net/samba410/files/patch-buildtools_wafsamba_samba__install.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/samba410/files/patch-buildtools_wafsamba_wafsamba.py =================================================================== --- head/net/samba410/files/patch-buildtools_wafsamba_wafsamba.py (nonexistent) +++ head/net/samba410/files/patch-buildtools_wafsamba_wafsamba.py (revision 505446) @@ -0,0 +1,11 @@ +--- ./buildtools/wafsamba/wafsamba.py.orig 2015-07-21 09:47:48 UTC ++++ ./buildtools/wafsamba/wafsamba.py +@@ -892,7 +892,7 @@ + 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_CATALOG = bld.srcnode.abspath() + '/bin/default/docs-xml/build/catalog.xml' +- bld.env.SAMBA_CATALOGS = 'file:///etc/xml/catalog file:///usr/local/share/xml/catalog file://' + bld.env.SAMBA_CATALOG ++ bld.env.SAMBA_CATALOGS = 'file:///etc/xml/catalog file://%%LOCALBASE%%/share/xml/catalog file://' + bld.env.SAMBA_CATALOG + + for m in manpages.split(): + source = m + '.xml' Property changes on: head/net/samba410/files/patch-buildtools_wafsamba_wafsamba.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/samba410/files/patch-buildtools_wafsamba_wscript =================================================================== --- head/net/samba410/files/patch-buildtools_wafsamba_wscript (nonexistent) +++ head/net/samba410/files/patch-buildtools_wafsamba_wscript (revision 505446) @@ -0,0 +1,22 @@ +--- buildtools/wafsamba/wscript.orig 2019-01-15 10:07:00 UTC ++++ buildtools/wafsamba/wscript +@@ -80,12 +80,17 @@ def options(opt): + help=("private library directory [PREFIX/lib/%s]" % Context.g_module.APPNAME), + action="store", dest='PRIVATELIBDIR', default=None) + ++ opt.add_option('--with-openldap', ++ help='additional directory to search for OpenLDAP libs', ++ action='store', dest='ldap_open', default=None, ++ match = ['Checking for library lber', 'Checking for library ldap']) ++ + opt.add_option('--with-libiconv', + help='additional directory to search for libiconv', +- action='store', dest='iconv_open', default='/usr/local', ++ action='store', dest='iconv_open', default=None, + match = ['Checking for library iconv', 'Checking for iconv_open', 'Checking for header iconv.h']) + opt.add_option('--without-gettext', +- help=("Disable use of gettext"), ++ help=("disable use of gettext"), + action="store_true", dest='disable_gettext', default=False) + + gr = opt.option_group('developer options') Property changes on: head/net/samba410/files/patch-buildtools_wafsamba_wscript ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/samba410/files/patch-ctdb_wscript =================================================================== --- head/net/samba410/files/patch-ctdb_wscript (nonexistent) +++ head/net/samba410/files/patch-ctdb_wscript (revision 505446) @@ -0,0 +1,61 @@ +--- ctdb/wscript.orig 2019-05-22 10:16:26 UTC ++++ ctdb/wscript +@@ -104,6 +104,9 @@ def options(opt): + opt.add_option('--enable-ceph-reclock', + help=("Enable Ceph CTDB recovery lock helper (default=no)"), + action="store_true", dest='ctdb_ceph_reclock', default=False) ++ opt.add_option('--disable-ctdb-tests', ++ help=("Disable CTDB tests (default=no)"), ++ action="store_true", dest='ctdb_no_tests', default=False) + + opt.add_option('--with-logdir', + help=("Path to log directory"), +@@ -260,7 +263,7 @@ def configure(conf): + conf.env['LIBPATH_CEPH-COMMON'] = conf.env['LIBPATH_RADOS'] + '/ceph' + + if (conf.CHECK_HEADERS('rados/librados.h', False, False, 'rados') and +- conf.CHECK_LIB('rados', shlib=True)): ++ conf.CHECK_LIB('rados', shlib=True)): + conf.CHECK_LIB('ceph-common', shlib=True) + Logs.info('Building with Ceph librados recovery lock support') + conf.define('HAVE_LIBRADOS', 1) +@@ -300,8 +303,14 @@ def configure(conf): + conf.env.CTDB_VARDIR, + conf.env.CTDB_RUNDIR)) + +- conf.env.CTDB_TEST_DATADIR = os.path.join(conf.env.CTDB_DATADIR, 'tests') +- conf.env.CTDB_TEST_LIBEXECDIR = os.path.join(conf.env.LIBEXECDIR, 'ctdb/tests') ++ if Options.options.ctdb_no_tests: ++ conf.env.ctdb_tests = False ++ else: ++ conf.env.ctdb_tests = True ++ ++ if conf.env.ctdb_tests: ++ conf.env.CTDB_TEST_DATADIR = os.path.join(conf.env.CTDB_DATADIR, 'tests') ++ conf.env.CTDB_TEST_LIBEXECDIR = os.path.join(conf.env.LIBEXECDIR, 'ctdb/tests') + + # Allow unified compilation and separate compilation of utilities + # to find includes +@@ -679,9 +688,9 @@ def build(bld): + if bld.env.HAVE_LIBRADOS: + bld.SAMBA_BINARY('ctdb_mutex_ceph_rados_helper', + source='utils/ceph/ctdb_mutex_ceph_rados_helper.c', +- deps='talloc tevent rados ceph-common', +- includes='include', +- install_path='${CTDB_HELPER_BINDIR}') ++ deps='talloc tevent rados ceph-common', ++ includes='include', ++ install_path='${CTDB_HELPER_BINDIR}') + + sed_expr1 = 's|/usr/local/var/lib/ctdb|%s|g' % (bld.env.CTDB_VARDIR) + sed_expr2 = 's|/usr/local/etc/ctdb|%s|g' % (bld.env.CTDB_ETCDIR) +@@ -858,6 +867,9 @@ def build(bld): + for d in ['volatile', 'persistent', 'state']: + bld.INSTALL_DIR(os.path.join(bld.env.CTDB_VARDIR, d)) + ++ if not bld.env.ctdb_tests: ++ return ++ + bld.SAMBA_BINARY('errcode', + source='tests/src/errcode.c', + deps='replace', Property changes on: head/net/samba410/files/patch-ctdb_wscript ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/samba410/files/patch-dwrap =================================================================== --- head/net/samba410/files/patch-dwrap (nonexistent) +++ head/net/samba410/files/patch-dwrap (revision 505446) @@ -0,0 +1,96 @@ +--- lib/dbwrap/dbwrap.c.orig 2019-01-15 10:07:00 UTC ++++ lib/dbwrap/dbwrap.c +@@ -28,6 +28,9 @@ + #include "lib/util/util_tdb.h" + #include "lib/util/tevent_ntstatus.h" + ++#undef DBGC_CLASS ++#define DBGC_CLASS DBGC_LOCKING ++ + /* + * Fall back using fetch if no genuine exists operation is provided + */ +--- lib/dbwrap/dbwrap_local_open.c.orig 2019-01-15 10:07:00 UTC ++++ lib/dbwrap/dbwrap_local_open.c +@@ -23,6 +23,9 @@ + #include "dbwrap/dbwrap_tdb.h" + #include "tdb.h" + ++#undef DBGC_CLASS ++#define DBGC_CLASS DBGC_LOCKING ++ + struct db_context *dbwrap_local_open(TALLOC_CTX *mem_ctx, + const char *name, + int hash_size, int tdb_flags, +--- lib/dbwrap/dbwrap_rbt.c.orig 2019-01-15 10:07:00 UTC ++++ lib/dbwrap/dbwrap_rbt.c +@@ -24,6 +24,9 @@ + #include "../lib/util/rbtree.h" + #include "../lib/util/dlinklist.h" + ++#undef DBGC_CLASS ++#define DBGC_CLASS DBGC_LOCKING ++ + #define DBWRAP_RBT_ALIGN(_size_) (((_size_)+15)&~15) + + struct db_rbt_ctx { +--- lib/dbwrap/dbwrap_tdb.c.orig 2019-01-15 10:07:00 UTC ++++ lib/dbwrap/dbwrap_tdb.c +@@ -27,6 +27,9 @@ + #include "lib/param/param.h" + #include "libcli/util/error.h" + ++#undef DBGC_CLASS ++#define DBGC_CLASS DBGC_LOCKING ++ + struct db_tdb_ctx { + struct tdb_wrap *wtdb; + +--- lib/dbwrap/dbwrap_util.c.orig 2019-01-15 10:07:00 UTC ++++ lib/dbwrap/dbwrap_util.c +@@ -26,6 +26,9 @@ + #include "dbwrap.h" + #include "lib/util/util_tdb.h" + ++#undef DBGC_CLASS ++#define DBGC_CLASS DBGC_LOCKING ++ + struct dbwrap_fetch_int32_state { + NTSTATUS status; + int32_t result; +--- source3/lib/dbwrap/dbwrap_ctdb.c.orig 2019-01-15 10:07:00 UTC ++++ source3/lib/dbwrap/dbwrap_ctdb.c +@@ -38,6 +38,9 @@ + #include "lib/cluster_support.h" + #include "lib/util/tevent_ntstatus.h" + ++#undef DBGC_CLASS ++#define DBGC_CLASS DBGC_LOCKING ++ + struct db_ctdb_transaction_handle { + struct db_ctdb_ctx *ctx; + /* +--- source3/lib/dbwrap/dbwrap_open.c.orig 2019-01-15 10:07:00 UTC ++++ source3/lib/dbwrap/dbwrap_open.c +@@ -31,6 +31,9 @@ + #include "ctdbd_conn.h" + #include "messages.h" + ++#undef DBGC_CLASS ++#define DBGC_CLASS DBGC_LOCKING ++ + bool db_is_local(const char *name) + { + const char *sockname = lp_ctdbd_socket(); +--- source3/lib/dbwrap/dbwrap_watch.c.orig 2019-01-15 10:07:00 UTC ++++ source3/lib/dbwrap/dbwrap_watch.c +@@ -28,6 +28,9 @@ + #include "server_id_watch.h" + #include "lib/dbwrap/dbwrap_private.h" + ++#undef DBGC_CLASS ++#define DBGC_CLASS DBGC_LOCKING ++ + static ssize_t dbwrap_record_watchers_key(struct db_context *db, + struct db_record *rec, + uint8_t *wkey, size_t wkey_len) Property changes on: head/net/samba410/files/patch-dwrap ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/samba410/files/patch-dynconfig_wscript =================================================================== --- head/net/samba410/files/patch-dynconfig_wscript (nonexistent) +++ head/net/samba410/files/patch-dynconfig_wscript (revision 505446) @@ -0,0 +1,32 @@ +--- dynconfig/wscript.orig 2019-01-15 10:07:00 UTC ++++ dynconfig/wscript +@@ -141,6 +141,8 @@ dynconfig = { + 'PKGCONFIGDIR' : { + 'STD-PATH': '${LIBDIR}/pkgconfig', + 'FHS-PATH': '${LIBDIR}/pkgconfig', ++ 'OPTION': '--with-pkgconfigdir', ++ 'HELPTEXT': 'Where to put .pc files', + }, + 'CODEPAGEDIR' : { + 'STD-PATH': '${DATADIR}/codepages', +@@ -247,8 +249,8 @@ dynconfig = { + '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' : { +@@ -307,9 +309,6 @@ def configure(conf): + 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 Errors.WafError("ERROR: invalid --prefix=%s value" % (conf.env.PREFIX)) + + explicit_set ={} + Property changes on: head/net/samba410/files/patch-dynconfig_wscript ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/samba410/files/patch-examples_pdb_wscript__build =================================================================== --- head/net/samba410/files/patch-examples_pdb_wscript__build (nonexistent) +++ head/net/samba410/files/patch-examples_pdb_wscript__build (revision 505446) @@ -0,0 +1,11 @@ +--- examples/pdb/wscript_build.orig 2019-01-15 10:07:00 UTC ++++ examples/pdb/wscript_build +@@ -3,7 +3,7 @@ + bld.SAMBA3_MODULE('pdb_test', + subsystem='pdb', + source='test.c', +- deps='samba-util', ++ deps='samba-util samba-debug', + init_function='', + internal_module=bld.SAMBA3_IS_STATIC_MODULE('pdb_test'), + enabled=bld.SAMBA3_IS_ENABLED_MODULE('pdb_test')) Property changes on: head/net/samba410/files/patch-examples_pdb_wscript__build ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/samba410/files/patch-lib_crypto_wscript__configure =================================================================== --- head/net/samba410/files/patch-lib_crypto_wscript__configure (nonexistent) +++ head/net/samba410/files/patch-lib_crypto_wscript__configure (revision 505446) @@ -0,0 +1,15 @@ +--- lib/crypto/wscript_configure.orig 2019-01-15 10:07:00 UTC ++++ lib/crypto/wscript_configure +@@ -4,10 +4,10 @@ from waflib import Errors, Logs + + if not conf.CHECK_FUNCS_IN('MD5Init', 'bsd', headers='bsd/md5.h', + checklibc=True): +- conf.CHECK_FUNCS_IN('MD5Init', 'md5', headers='sys/md5.h', +- checklibc=True) + conf.CHECK_FUNCS_IN('MD5Init', 'md', headers='sys/md5.h', + checklibc=True) ++ conf.CHECK_FUNCS_IN('MD5Init', 'md5', headers='sys/md5.h', ++ checklibc=True) + conf.CHECK_FUNCS_IN('CC_MD5_Init', '', headers='CommonCrypto/CommonDigest.h', + checklibc=True) + Property changes on: head/net/samba410/files/patch-lib_crypto_wscript__configure ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/samba410/files/patch-lib_ldb_ldb__key__value_ldb__kv__cache.c =================================================================== --- head/net/samba410/files/patch-lib_ldb_ldb__key__value_ldb__kv__cache.c (nonexistent) +++ head/net/samba410/files/patch-lib_ldb_ldb__key__value_ldb__kv__cache.c (revision 505446) @@ -0,0 +1,13 @@ +--- lib/ldb/ldb_key_value/ldb_kv_cache.c.orig 2019-01-15 10:07:00 UTC ++++ lib/ldb/ldb_key_value/ldb_kv_cache.c +@@ -90,7 +90,9 @@ static int ldb_schema_attribute_compare( + { + const struct ldb_schema_attribute *sa1 = (const struct ldb_schema_attribute *)p1; + const struct ldb_schema_attribute *sa2 = (const struct ldb_schema_attribute *)p2; +- return ldb_attr_cmp(sa1->name, sa2->name); ++ int res = ldb_attr_cmp(sa1->name, sa2->name); ++ ++ return (res) ? res : (sa1->flags > sa2->flags) ? 1 : (sa1->flags < sa2->flags) ? -1 : 0; + } + + /* Property changes on: head/net/samba410/files/patch-lib_ldb_ldb__key__value_ldb__kv__cache.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/samba410/files/patch-lib_ldb_ldb__mdb_ldb__mdb.c =================================================================== --- head/net/samba410/files/patch-lib_ldb_ldb__mdb_ldb__mdb.c (nonexistent) +++ head/net/samba410/files/patch-lib_ldb_ldb__mdb_ldb__mdb.c (revision 505446) @@ -0,0 +1,11 @@ +--- lib/ldb/ldb_mdb/ldb_mdb.c.orig 2019-01-15 10:07:00 UTC ++++ lib/ldb/ldb_mdb/ldb_mdb.c +@@ -183,7 +183,7 @@ static int lmdb_store(struct ldb_kv_priv + + if (flags == TDB_INSERT) { + mdb_flags = MDB_NOOVERWRITE; +- } else if ((flags == TDB_MODIFY)) { ++ } else if (flags == TDB_MODIFY) { + /* + * Modifying a record, ensure that it exists. + * This mimics the TDB semantics Property changes on: head/net/samba410/files/patch-lib_ldb_ldb__mdb_ldb__mdb.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/samba410/files/patch-lib_ldb_wscript =================================================================== --- head/net/samba410/files/patch-lib_ldb_wscript (nonexistent) +++ head/net/samba410/files/patch-lib_ldb_wscript (revision 505446) @@ -0,0 +1,24 @@ +--- lib/ldb/wscript.orig 2019-05-07 08:38:21 UTC ++++ lib/ldb/wscript +@@ -451,7 +451,7 @@ def build(bld): + + LDB_TOOLS='ldbadd ldbsearch ldbdel ldbmodify ldbedit ldbrename' + for t in LDB_TOOLS.split(): +- bld.SAMBA_BINARY(t, 'tools/%s.c' % t, deps='ldb-cmdline ldb', ++ bld.SAMBA_BINARY('samba-%s' % t, 'tools/%s.c' % t, deps='ldb-cmdline ldb', + manpages='man/%s.1' % t) + + # ldbtest doesn't get installed +@@ -463,10 +463,10 @@ def build(bld): + else: + lmdb_deps = '' + # ldbdump doesn't get installed +- bld.SAMBA_BINARY('ldbdump', ++ bld.SAMBA_BINARY('samba-ldbdump', + 'tools/ldbdump.c', + deps='ldb-cmdline ldb' + lmdb_deps, +- install=False) ++ install=True) + + bld.SAMBA_LIBRARY('ldb-cmdline', + source='tools/ldbutil.c tools/cmdline.c', Property changes on: head/net/samba410/files/patch-lib_ldb_wscript ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/samba410/files/patch-lib_replace_wscript =================================================================== --- head/net/samba410/files/patch-lib_replace_wscript (nonexistent) +++ head/net/samba410/files/patch-lib_replace_wscript (revision 505446) @@ -0,0 +1,11 @@ +--- lib/replace/wscript.orig 2019-01-15 10:07:00 UTC ++++ lib/replace/wscript +@@ -119,7 +119,7 @@ def configure(conf): + conf.CHECK_HEADERS('sys/atomic.h stdatomic.h') + conf.CHECK_HEADERS('libgen.h') + +- if conf.CHECK_CFLAGS('-Wno-format-truncation'): ++ if conf.CHECK_CFLAGS(['-Wno-format-truncation'] + conf.env.WERROR_CFLAGS): + conf.define('HAVE_WNO_FORMAT_TRUNCATION', '1') + + if conf.CHECK_CFLAGS('-Wno-unused-function'): Property changes on: head/net/samba410/files/patch-lib_replace_wscript ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/samba410/files/patch-lib_talloc_talloc.c =================================================================== --- head/net/samba410/files/patch-lib_talloc_talloc.c (nonexistent) +++ head/net/samba410/files/patch-lib_talloc_talloc.c (revision 505446) @@ -0,0 +1,20 @@ +--- lib/talloc/talloc.c.orig 2019-01-15 10:07:00 UTC ++++ lib/talloc/talloc.c +@@ -391,6 +391,9 @@ void talloc_lib_init(void) __attribute__ + void talloc_lib_init(void) + { + uint32_t random_value; ++#if defined(HAVE_ARC4RANDOM) ++ random_value = arc4random(); ++#else + #if defined(HAVE_GETAUXVAL) && defined(AT_RANDOM) + uint8_t *p; + /* +@@ -424,6 +427,7 @@ void talloc_lib_init(void) + */ + random_value = ((uintptr_t)talloc_lib_init & 0xFFFFFFFF); + } ++#endif /* HAVE_ARC4RANDOM */ + talloc_magic = random_value & ~TALLOC_FLAG_MASK; + } + #else Property changes on: head/net/samba410/files/patch-lib_talloc_talloc.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/samba410/files/patch-lib_talloc_wscript =================================================================== --- head/net/samba410/files/patch-lib_talloc_wscript (nonexistent) +++ head/net/samba410/files/patch-lib_talloc_wscript (revision 505446) @@ -0,0 +1,18 @@ +--- lib/talloc/wscript.orig 2019-05-07 08:38:21 UTC ++++ lib/talloc/wscript +@@ -45,13 +45,14 @@ def configure(conf): + conf.env.TALLOC_COMPAT1 = False + if conf.env.standalone_talloc: + conf.env.TALLOC_COMPAT1 = Options.options.TALLOC_COMPAT1 +- conf.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig' ++ conf.env.PKGCONFIGDIR = '%%PKGCONFIGDIR%%' + conf.env.TALLOC_VERSION = VERSION + + conf.CHECK_XSLTPROC_MANPAGES() + + conf.CHECK_HEADERS('sys/auxv.h') + conf.CHECK_FUNCS('getauxval') ++ conf.CHECK_FUNCS('arc4random') + + conf.SAMBA_CONFIG_H() + Property changes on: head/net/samba410/files/patch-lib_talloc_wscript ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/samba410/files/patch-lib_util_wscript__build =================================================================== --- head/net/samba410/files/patch-lib_util_wscript__build (nonexistent) +++ head/net/samba410/files/patch-lib_util_wscript__build (revision 505446) @@ -0,0 +1,11 @@ +--- lib/util/wscript_build.orig 2019-05-07 08:38:21 UTC ++++ lib/util/wscript_build +@@ -151,7 +151,7 @@ else: + + bld.SAMBA_LIBRARY('samba-modules', + source='modules.c', +- deps='samba-errors samba-util', ++ deps='samba-errors samba-util samba-debug', + local_include=False, + private_library=True) + Property changes on: head/net/samba410/files/patch-lib_util_wscript__build ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/samba410/files/patch-listen-backlog =================================================================== --- head/net/samba410/files/patch-listen-backlog (nonexistent) +++ head/net/samba410/files/patch-listen-backlog (revision 505446) @@ -0,0 +1,94 @@ +--- lib/tevent/echo_server.c.orig 2019-01-15 10:07:00 UTC ++++ lib/tevent/echo_server.c +@@ -633,7 +633,7 @@ int main(int argc, const char **argv) + exit(1); + } + +- ret = listen(listen_sock, 5); ++ ret = listen(listen_sock, -1); + if (ret == -1) { + perror("listen() failed"); + exit(1); +--- source3/include/local.h.orig 2019-01-15 10:07:00 UTC ++++ source3/include/local.h +@@ -173,7 +173,18 @@ + #define WINBIND_SERVER_MUTEX_WAIT_TIME (( ((NUM_CLI_AUTH_CONNECT_RETRIES) * ((CLI_AUTH_TIMEOUT)/1000)) + 5)*2) + + /* size of listen() backlog in smbd */ ++#if defined (FREEBSD) ++#define SMBD_LISTEN_BACKLOG -1 ++#else + #define SMBD_LISTEN_BACKLOG 50 ++#endif ++ ++/* size of listen() default backlog */ ++#if defined (FREEBSD) ++#define DEFAULT_LISTEN_BACKLOG -1 ++#else ++#define DEFAULT_LISTEN_BACKLOG 5 ++#endif + + /* Number of microseconds to wait before a sharing violation. */ + #define SHARING_VIOLATION_USEC_WAIT 950000 +--- source3/libsmb/unexpected.c.orig 2019-01-15 10:07:00 UTC ++++ source3/libsmb/unexpected.c +@@ -95,7 +95,7 @@ NTSTATUS nb_packet_server_create(TALLOC_ + status = map_nt_error_from_unix(errno); + goto fail; + } +- rc = listen(result->listen_sock, 5); ++ rc = listen(result->listen_sock, DEFAULT_LISTEN_BACKLOG); + if (rc < 0) { + status = map_nt_error_from_unix(errno); + goto fail; +--- source3/rpc_server/rpc_server.c.orig 2019-01-15 10:07:00 UTC ++++ source3/rpc_server/rpc_server.c +@@ -158,7 +158,7 @@ bool setup_named_pipe_socket(const char + goto out; + } + +- rc = listen(state->fd, 5); ++ rc = listen(state->fd, DEFAULT_LISTEN_BACKLOG); + if (rc < 0) { + DEBUG(0, ("Failed to listen on pipe socket %s: %s\n", + pipe_name, strerror(errno))); +@@ -830,7 +830,7 @@ bool setup_dcerpc_ncalrpc_socket(struct + goto out; + } + +- rc = listen(state->fd, 5); ++ rc = listen(state->fd, DEFAULT_LISTEN_BACKLOG); + if (rc < 0) { + DEBUG(0, ("Failed to listen on ncalrpc socket %s: %s\n", + name, strerror(errno))); +--- source3/utils/smbfilter.c.orig 2019-01-15 10:07:00 UTC ++++ source3/utils/smbfilter.c +@@ -291,7 +291,7 @@ static void start_filter(char *desthost) + exit(1); + } + +- if (listen(s, 5) == -1) { ++ if (listen(s, DEFAULT_LISTEN_BACKLOG) == -1) { + d_printf("listen failed\n"); + } + +--- source3/winbindd/winbindd.c.orig 2019-01-15 10:07:00 UTC ++++ source3/winbindd/winbindd.c +@@ -1317,7 +1317,7 @@ static bool winbindd_setup_listeners(voi + if (pub_state->fd == -1) { + goto failed; + } +- rc = listen(pub_state->fd, 5); ++ rc = listen(pub_state->fd, DEFAULT_LISTEN_BACKLOG); + if (rc < 0) { + goto failed; + } +@@ -1349,7 +1349,7 @@ static bool winbindd_setup_listeners(voi + if (priv_state->fd == -1) { + goto failed; + } +- rc = listen(priv_state->fd, 5); ++ rc = listen(priv_state->fd, DEFAULT_LISTEN_BACKLOG); + if (rc < 0) { + goto failed; + } Property changes on: head/net/samba410/files/patch-listen-backlog ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/samba410/files/patch-mdns =================================================================== --- head/net/samba410/files/patch-mdns (nonexistent) +++ head/net/samba410/files/patch-mdns (revision 505446) @@ -0,0 +1,532 @@ +From 923bc7a1afeb0b920e60e14846987ae1d2d7dca4 Mon Sep 17 00:00:00 2001 +From: John Hixson +Date: Thu, 7 Dec 2017 09:36:32 -0500 +Subject: [PATCH] Freenas/master mdns fixes (#22) + +* mDNS fixes for Samba (work in progress). + +* Fix mDNS - Can advertise on individual interfaces + +* Fix mDNS browsing in smbclient + +Signed-off-by: Timur I. Bakeyev + +--- source3/client/dnsbrowse.c.orig 2019-01-15 10:07:00 UTC ++++ source3/client/dnsbrowse.c +@@ -39,6 +39,7 @@ struct mdns_smbsrv_result + struct mdns_browse_state + { + struct mdns_smbsrv_result *listhead; /* Browse result list head */ ++ TALLOC_CTX * ctx; + int browseDone; + + }; +@@ -64,7 +65,7 @@ static void do_smb_resolve(struct mdns_s + struct timeval tv; + DNSServiceErrorType err; + +- TALLOC_CTX * ctx = talloc_tos(); ++ TALLOC_CTX * ctx = talloc_new(NULL); + + err = DNSServiceResolve(&mdns_conn_sdref, 0 /* flags */, + browsesrv->ifIndex, +@@ -91,7 +92,7 @@ static void do_smb_resolve(struct mdns_s + } + } + +- TALLOC_FREE(fdset); ++ TALLOC_FREE(ctx); + DNSServiceRefDeallocate(mdns_conn_sdref); + } + +@@ -124,18 +125,19 @@ do_smb_browse_reply(DNSServiceRef sdRef, + return; + } + +- bresult = talloc_array(talloc_tos(), struct mdns_smbsrv_result, 1); ++ bresult = talloc_array(bstatep->ctx, struct mdns_smbsrv_result, 1); + if (bresult == NULL) { + return; + } + ++ bresult->nextResult = NULL; + if (bstatep->listhead != NULL) { + bresult->nextResult = bstatep->listhead; + } + +- bresult->serviceName = talloc_strdup(talloc_tos(), serviceName); +- bresult->regType = talloc_strdup(talloc_tos(), regtype); +- bresult->domain = talloc_strdup(talloc_tos(), replyDomain); ++ bresult->serviceName = talloc_strdup(bstatep->ctx, serviceName); ++ bresult->regType = talloc_strdup(bstatep->ctx, regtype); ++ bresult->domain = talloc_strdup(bstatep->ctx, replyDomain); + bresult->ifIndex = interfaceIndex; + bstatep->listhead = bresult; + } +@@ -151,10 +153,13 @@ int do_smb_browse(void) + DNSServiceRef mdns_conn_sdref = NULL; + DNSServiceErrorType err; + +- TALLOC_CTX * ctx = talloc_stackframe(); ++ TALLOC_CTX * ctx = talloc_new(NULL); + + ZERO_STRUCT(bstate); + ++ bstate.ctx = ctx; ++ bstate.listhead = NULL; ++ + err = DNSServiceBrowse(&mdns_conn_sdref, 0, 0, "_smb._tcp", "", + do_smb_browse_reply, &bstate); + +--- source3/smbd/dnsregister.c.orig 2019-01-15 10:07:00 UTC ++++ source3/smbd/dnsregister.c +@@ -29,6 +29,29 @@ + * browse for advertised SMB services. + */ + ++/* ++ * Time Machine Errata: ++ * sys=adVF=0x100 -- this is required when ._adisk._tcp is present on device. When it is ++ * set, the MacOS client will send a NetShareEnumAll IOCTL and shares will be visible. ++ * Otherwise, Finder will only see the Time Machine share. In the absence of ._adisk._tcp ++ * MacOS will _always_ send NetShareEnumAll IOCTL. ++ * ++ * waMa=0 -- MacOS server uses waMa=0, while embedded devices have it set to their Mac Address. ++ * Speculation in Samba-Technical indicates that this stands for "Wireless AirDisk Mac Address". ++ * ++ * adVU -- AirDisk Volume UUID. Mac OS servers generate a UUID. Time machine over SMB works without one ++ * set. Netatalk generates a UUID and stores it persistently in afp_voluuid.conf. This can be ++ * set by adding the share parameter "fruit:volume_uuid = " ++ * ++ * dk(n)=adVF= ++ * 0xa1, 0x81 - AFP support ++ * 0xa2, 0x82 - SMB support ++ * 0xa3, 0x83 - AFP and SMB support ++ * ++ * adVN -- AirDisk Volume Name. We set this to the share name. ++ * ++ */ ++ + #define DNS_REG_RETRY_INTERVAL (5*60) /* in seconds */ + + #ifdef WITH_DNSSD_SUPPORT +@@ -36,85 +59,177 @@ + #include + + struct dns_reg_state { +- struct tevent_context *event_ctx; +- uint16_t port; +- DNSServiceRef srv_ref; +- struct tevent_timer *te; +- int fd; +- struct tevent_fd *fde; ++ int count; ++ struct reg_state { ++ DNSServiceRef srv_ref; ++ TALLOC_CTX *mem_ctx; ++ struct tevent_context *event_ctx; ++ struct tevent_timer *te; ++ struct tevent_fd *fde; ++ uint16_t port; ++ int if_index; ++ int fd; ++ } *drs; + }; + +-static int dns_reg_state_destructor(struct dns_reg_state *dns_state) ++static void dns_register_smbd_retry(struct tevent_context *ctx, ++ struct tevent_timer *te, ++ struct timeval now, ++ void *private_data); ++static void dns_register_smbd_fde_handler(struct tevent_context *ev, ++ struct tevent_fd *fde, ++ uint16_t flags, ++ void *private_data); ++ ++ ++static int reg_state_destructor(struct reg_state *state) + { +- if (dns_state->srv_ref != NULL) { ++ if (state == NULL) { ++ return -1; ++ } ++ ++ if (state->srv_ref != NULL) { + /* Close connection to the mDNS daemon */ +- DNSServiceRefDeallocate(dns_state->srv_ref); +- dns_state->srv_ref = NULL; ++ DNSServiceRefDeallocate(state->srv_ref); ++ state->srv_ref = NULL; + } + + /* Clear event handler */ +- TALLOC_FREE(dns_state->te); +- TALLOC_FREE(dns_state->fde); +- dns_state->fd = -1; ++ TALLOC_FREE(state->te); ++ TALLOC_FREE(state->fde); ++ state->fd = -1; + + return 0; + } + +-static void dns_register_smbd_retry(struct tevent_context *ctx, +- struct tevent_timer *te, +- struct timeval now, +- void *private_data); +-static void dns_register_smbd_fde_handler(struct tevent_context *ev, +- struct tevent_fd *fde, +- uint16_t flags, +- void *private_data); ++int TXTRecordPrintf(TXTRecordRef * rec, const char * key, const char * fmt, ... ) ++{ ++ int ret = 0; ++ char *str; ++ va_list ap; ++ va_start( ap, fmt ); + +-static bool dns_register_smbd_schedule(struct dns_reg_state *dns_state, ++ if( 0 > vasprintf(&str, fmt, ap ) ) { ++ va_end(ap); ++ return -1; ++ } ++ va_end(ap); ++ ++ if( kDNSServiceErr_NoError != TXTRecordSetValue(rec, key, strlen(str), str) ) { ++ ret = -1; ++ } ++ ++ free(str); ++ return ret; ++} ++ ++int TXTRecordKeyPrintf(TXTRecordRef * rec, const char * key_fmt, int key_var, const char * fmt, ...) ++{ ++ int ret = 0; ++ char *key = NULL, *str = NULL; ++ va_list ap; ++ ++ if( 0 > asprintf(&key, key_fmt, key_var)) { ++ DEBUG(1, ("Failed in asprintf\n")); ++ return -1; ++ } ++ ++ va_start( ap, fmt ); ++ if( 0 > vasprintf(&str, fmt, ap )) { ++ va_end(ap); ++ DEBUG(1, ("Failed in vasprintf\n")); ++ ret = -1; ++ goto exit; ++ } ++ va_end(ap); ++ ++ if( kDNSServiceErr_NoError != TXTRecordSetValue(rec, key, strlen(str), str) ) { ++ DEBUG(1, ("Failed in TXTRecordSetValuen")); ++ ret = -1; ++ goto exit; ++ } ++ ++ exit: ++ if (str) ++ free(str); ++ if (key) ++ free(key); ++ return ret; ++} ++ ++ ++static bool dns_register_smbd_schedule(struct reg_state *state, + struct timeval tval) + { +- dns_reg_state_destructor(dns_state); ++ reg_state_destructor(state); + +- dns_state->te = tevent_add_timer(dns_state->event_ctx, +- dns_state, ++ state->te = tevent_add_timer(state->event_ctx, ++ state->mem_ctx, + tval, + dns_register_smbd_retry, +- dns_state); +- if (!dns_state->te) { ++ state); ++ if (!state->te) { + return false; + } + + return true; + } + ++static void dns_register_smbd_callback(DNSServiceRef service, ++ DNSServiceFlags flags, ++ DNSServiceErrorType errorCode, ++ const char *name, ++ const char *type, ++ const char *domain, ++ void *context) ++{ ++ if (errorCode != kDNSServiceErr_NoError) { ++ DEBUG(6, ("error=%d\n", errorCode)); ++ } else { ++ DEBUG(6, ("%-15s %s.%s%s\n", "REGISTER", name, type, domain)); ++ } ++} ++ + static void dns_register_smbd_retry(struct tevent_context *ctx, + struct tevent_timer *te, + struct timeval now, + void *private_data) + { +- struct dns_reg_state *dns_state = talloc_get_type_abort(private_data, +- struct dns_reg_state); ++ struct reg_state *state = (struct reg_state *)private_data; + DNSServiceErrorType err; ++ int snum; ++ size_t dk = 0; ++ bool sys_txt_created = false; ++ TXTRecordRef txt_adisk; ++ TXTRecordRef txt_devinfo; ++ char *servname; ++ char *v_uuid; ++ int num_services = lp_numservices(); + +- dns_reg_state_destructor(dns_state); ++ reg_state_destructor(state); + +- DEBUG(6, ("registering _smb._tcp service on port %d\n", +- dns_state->port)); ++ TXTRecordCreate(&txt_adisk, 0, NULL); ++ ++ DEBUG(6, ("registering _smb._tcp service on port %d index %d\n", ++ state->port, state->if_index)); + + /* Register service with DNS. Connects with the mDNS + * daemon running on the local system to perform DNS + * service registration. + */ +- err = DNSServiceRegister(&dns_state->srv_ref, 0 /* flags */, +- kDNSServiceInterfaceIndexAny, +- NULL /* service name */, +- "_smb._tcp" /* service type */, +- NULL /* domain */, +- "" /* SRV target host name */, +- htons(dns_state->port), +- 0 /* TXT record len */, +- NULL /* TXT record data */, +- NULL /* callback func */, +- NULL /* callback context */); ++ err = DNSServiceRegister(&state->srv_ref, ++ 0 /* flags */, ++ state->if_index /* interface index */, ++ NULL /* service name */, ++ "_smb._tcp" /* service type */, ++ NULL /* domain */, ++ "" /* SRV target host name */, ++ htons(state->port) /* port */, ++ 0 /* TXT record len */, ++ NULL /* TXT record data */, ++ dns_register_smbd_callback /* callback func */, ++ NULL /* callback context */); ++ + + if (err != kDNSServiceErr_NoError) { + /* Failed to register service. Schedule a re-try attempt. +@@ -123,24 +238,96 @@ static void dns_register_smbd_retry(stru + goto retry; + } + +- dns_state->fd = DNSServiceRefSockFD(dns_state->srv_ref); +- if (dns_state->fd == -1) { ++ /* ++ * Check for services that are configured as Time Machine targets ++ * ++ */ ++ for (snum = 0; snum < num_services; snum++) { ++ if (lp_snum_ok(snum) && lp_parm_bool(snum, "fruit", "time machine", false)) ++ { ++ if (!sys_txt_created) { ++ if( 0 > TXTRecordPrintf(&txt_adisk, "sys", "adVF=0x100") ) { ++ DEBUG(1, ("Failed to create Zeroconf TXTRecord for sys") ); ++ goto retry; ++ } ++ else ++ { ++ sys_txt_created = true; ++ } ++ } ++ ++ v_uuid = lp_parm_const_string(snum, "fruit", "volume_uuid", NULL); ++ servname = lp_const_servicename(snum); ++ DEBUG(1, ("Registering volume %s for TimeMachine\n", servname)); ++ if (v_uuid) { ++ if( 0 > TXTRecordKeyPrintf(&txt_adisk, "dk%zu", dk++, "adVN=%s,adVF=0x82,adVU=%s", ++ servname, v_uuid) ) { ++ DEBUG(1, ("Could not set Zeroconf TXTRecord for dk%zu \n", dk)); ++ goto retry; ++ } ++ DEBUG(1, ("Registering TimeMachine with the following TXT parameters: " ++ "dk%zu,adVN=%s,adVF=0x82,adVU=%s\n", dk, servname, v_uuid) ); ++ } ++ else { ++ if( 0 > TXTRecordKeyPrintf(&txt_adisk, "dk%zu", dk++, "adVN=%s,adVF=0x82", ++ servname) ) { ++ DEBUG(1, ("Could not set Zeroconf TXTRecord for dk%zu \n", dk)); ++ goto retry; ++ } ++ DEBUG(1, ("Registering TimeMachine with the following TXT parameters: " ++ "dk%zu,adVN=%s,adVF=0x82\n", dk, servname) ); ++ } ++ } ++ } ++ ++ if (dk) { ++ err = DNSServiceRegister(&state->srv_ref, ++ 0 /* flags */, ++ state->if_index /* interface index */, ++ NULL /* service name */, ++ "_adisk._tcp" /* service type */, ++ NULL /* domain */, ++ "" /* SRV target host name */, ++ /* ++ * We would probably use port 0 zero, but we can't, from man DNSServiceRegister: ++ * "A value of 0 for a port is passed to register placeholder services. ++ * Place holder services are not found when browsing, but other ++ * clients cannot register with the same name as the placeholder service." ++ * We therefor use port 9 which is used by the adisk service type. ++ */ ++ htons(9) /* port */, ++ TXTRecordGetLength(&txt_adisk) /* TXT record len */, ++ TXTRecordGetBytesPtr(&txt_adisk) /* TXT record data */, ++ dns_register_smbd_callback /* callback func */, ++ NULL /* callback context */); ++ ++ ++ if (err != kDNSServiceErr_NoError) { ++ /* Failed to register service. Schedule a re-try attempt. ++ */ ++ DEBUG(1, ("unable to register with mDNS (err %d)\n", err)); ++ goto retry; ++ } ++ } ++ ++ state->fd = DNSServiceRefSockFD(state->srv_ref); ++ if (state->fd == -1) { + goto retry; + } + +- dns_state->fde = tevent_add_fd(dns_state->event_ctx, +- dns_state, +- dns_state->fd, +- TEVENT_FD_READ, +- dns_register_smbd_fde_handler, +- dns_state); +- if (!dns_state->fde) { ++ state->fde = tevent_add_fd(state->event_ctx, ++ state->mem_ctx, ++ state->fd, ++ TEVENT_FD_READ, ++ dns_register_smbd_fde_handler, ++ state); ++ if (!state->fde) { + goto retry; + } + + return; + retry: +- dns_register_smbd_schedule(dns_state, ++ dns_register_smbd_schedule(state, + timeval_current_ofs(DNS_REG_RETRY_INTERVAL, 0)); + } + +@@ -150,44 +337,77 @@ static void dns_register_smbd_fde_handle + uint16_t flags, + void *private_data) + { +- struct dns_reg_state *dns_state = talloc_get_type_abort(private_data, +- struct dns_reg_state); ++ struct reg_state *state = (struct reg_state *)private_data; + DNSServiceErrorType err; + +- err = DNSServiceProcessResult(dns_state->srv_ref); ++ err = DNSServiceProcessResult(state->srv_ref); + if (err != kDNSServiceErr_NoError) { +- DEBUG(3, ("failed to process mDNS result (err %d), re-trying\n", +- err)); ++ DEBUG(3, ("failed to process mDNS result (err %d), re-trying\n", err)); + goto retry; + } + +- talloc_free(dns_state); + return; + + retry: +- dns_register_smbd_schedule(dns_state, +- timeval_current_ofs(DNS_REG_RETRY_INTERVAL, 0)); ++ dns_register_smbd_schedule(state, timeval_zero()); ++} ++ ++static int dns_reg_state_destructor(struct dns_reg_state *state) ++{ ++ if (state != NULL) { ++ talloc_free(state); ++ } ++ return 0; + } + ++ + bool smbd_setup_mdns_registration(struct tevent_context *ev, + TALLOC_CTX *mem_ctx, + uint16_t port) + { + struct dns_reg_state *dns_state; ++ bool bind_all = true; ++ int i; + + dns_state = talloc_zero(mem_ctx, struct dns_reg_state); +- if (dns_state == NULL) { ++ if (dns_state == NULL) ++ return false; ++ ++ if (lp_interfaces() && lp_bind_interfaces_only()) ++ bind_all = false; ++ ++ dns_state->count = iface_count(); ++ if (dns_state->count <= 0 || bind_all == true) ++ dns_state->count = 1; ++ ++ dns_state->drs = talloc_array(mem_ctx, struct reg_state, dns_state->count); ++ if (dns_state->drs == NULL) { ++ talloc_free(dns_state); + return false; + } +- dns_state->event_ctx = ev; +- dns_state->port = port; +- dns_state->fd = -1; + +- talloc_set_destructor(dns_state, dns_reg_state_destructor); ++ for (i = 0; i < dns_state->count; i++) { ++ struct interface *iface = get_interface(i); ++ struct reg_state *state = &dns_state->drs[i]; + +- return dns_register_smbd_schedule(dns_state, timeval_zero()); ++ state->mem_ctx = mem_ctx; ++ state->srv_ref = NULL; ++ state->event_ctx = ev; ++ state->te = NULL; ++ state->fde = NULL; ++ state->port = port; ++ state->fd = -1; ++ ++ state->if_index = bind_all ? kDNSServiceInterfaceIndexAny : iface->if_index; ++ ++ dns_register_smbd_schedule(&dns_state->drs[i], timeval_zero()); ++ } ++ ++ talloc_set_destructor(dns_state, dns_reg_state_destructor); ++ return true; + } + ++ + #else /* WITH_DNSSD_SUPPORT */ + + bool smbd_setup_mdns_registration(struct tevent_context *ev, Property changes on: head/net/samba410/files/patch-mdns ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/samba410/files/patch-nsswitch_wscript__build =================================================================== --- head/net/samba410/files/patch-nsswitch_wscript__build (nonexistent) +++ head/net/samba410/files/patch-nsswitch_wscript__build (revision 505446) @@ -0,0 +1,17 @@ +--- nsswitch/wscript_build.orig 2019-01-15 10:07:00 UTC ++++ nsswitch/wscript_build +@@ -61,12 +61,14 @@ elif (host_os.rfind('freebsd') > -1): + source='winbind_nss_linux.c winbind_nss_freebsd.c', + deps='winbind-client', + realname='nss_winbind.so.1', ++ install_path='${PAMMODULESDIR}', + vnum='1') + + bld.SAMBA3_LIBRARY('nss_wins', + source='wins.c wins_freebsd.c', + deps='''wbclient''', + realname='nss_wins.so.1', ++ install_path='${PAMMODULESDIR}', + vnum='1') + + elif (host_os.rfind('netbsd') > -1): Property changes on: head/net/samba410/files/patch-nsswitch_wscript__build ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/samba410/files/patch-source3_include_includes.h =================================================================== --- head/net/samba410/files/patch-source3_include_includes.h (nonexistent) +++ head/net/samba410/files/patch-source3_include_includes.h (revision 505446) @@ -0,0 +1,11 @@ +--- source3/include/includes.h.orig 2019-01-15 10:07:00 UTC ++++ source3/include/includes.h +@@ -322,6 +322,8 @@ typedef char fstring[FSTRING_LEN]; + * the *bottom* of include files so as not to conflict. */ + #ifdef ENABLE_DMALLOC + # include ++#elif ENABLE_JEMALLOC ++# include + #endif + + Property changes on: head/net/samba410/files/patch-source3_include_includes.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/samba410/files/patch-source3_lib_sysquotas__4B.c =================================================================== --- head/net/samba410/files/patch-source3_lib_sysquotas__4B.c (nonexistent) +++ head/net/samba410/files/patch-source3_lib_sysquotas__4B.c (revision 505446) @@ -0,0 +1,18 @@ +--- source3/lib/sysquotas_4B.c.orig 2019-01-15 10:07:00 UTC ++++ source3/lib/sysquotas_4B.c +@@ -141,7 +141,14 @@ static int sys_quotactl_4B(const char * + /* ENOTSUP means quota support is not compiled in. EINVAL + * means that quotas are not configured (commonly). + */ +- if (errno != ENOTSUP && errno != EINVAL) { ++ if (errno != ENOTSUP && errno != EINVAL ++/* ++ * FreeBSD 12 between r336017 and r342928 wrongfuly return ENOENT for the not enabled qoutas on ZFS. ++ */ ++#if defined(__FreeBSD__) && ((__FreeBSD_version >= 1102503 && __FreeBSD_version <= 1102506) || (__FreeBSD_version >= 1200072 && __FreeBSD_version <= 1200503) || (__FreeBSD_version >= 1300000 && __FreeBSD_version <= 1300009)) ++ && errno != ENOENT ++#endif ++ ) { + DEBUG(0, ("failed to %s quota for %s ID %u on %s: %s\n", + (cmd & QCMD(Q_GETQUOTA, 0)) ? "get" : "set", + (cmd & QCMD(0, GRPQUOTA)) ? "group" : "user", Property changes on: head/net/samba410/files/patch-source3_lib_sysquotas__4B.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/samba410/files/patch-source3_lib_util.c =================================================================== --- head/net/samba410/files/patch-source3_lib_util.c (nonexistent) +++ head/net/samba410/files/patch-source3_lib_util.c (revision 505446) @@ -0,0 +1,14 @@ +--- source3/lib/util.c.orig 2019-05-07 08:38:21 UTC ++++ source3/lib/util.c +@@ -1916,7 +1916,10 @@ bool any_nt_status_not_ok(NTSTATUS err1, + + int timeval_to_msec(struct timeval t) + { +- return t.tv_sec * 1000 + (t.tv_usec+999) / 1000; ++ unsigned long result; ++ ++ result = t.tv_sec * 1000 + (t.tv_usec+999) / 1000; ++ return result > INT_MAX ? INT_MAX : result; + } + + /******************************************************************* Property changes on: head/net/samba410/files/patch-source3_lib_util.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/samba410/files/patch-source3_librpc_crypto_gse.c =================================================================== --- head/net/samba410/files/patch-source3_librpc_crypto_gse.c (nonexistent) +++ head/net/samba410/files/patch-source3_librpc_crypto_gse.c (revision 505446) @@ -0,0 +1,16 @@ +--- source3/librpc/crypto/gse.c.orig 2019-01-15 10:07:00 UTC ++++ source3/librpc/crypto/gse.c +@@ -621,11 +621,12 @@ static NTSTATUS gse_get_server_auth_toke + struct gse_context *gse_ctx = + talloc_get_type_abort(gensec_security->private_data, + struct gse_context); +- OM_uint32 gss_maj, gss_min; ++ OM_uint32 gss_min; + gss_buffer_desc in_data; + gss_buffer_desc out_data; + DATA_BLOB blob = data_blob_null; + NTSTATUS status; ++ OM_uint32 gss_maj = -1; + OM_uint32 time_rec = 0; + struct timeval tv; + Property changes on: head/net/samba410/files/patch-source3_librpc_crypto_gse.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/samba410/files/patch-source3_modules_vfs__fruit.c =================================================================== --- head/net/samba410/files/patch-source3_modules_vfs__fruit.c (nonexistent) +++ head/net/samba410/files/patch-source3_modules_vfs__fruit.c (revision 505446) @@ -0,0 +1,71 @@ +From d9b748869a8f4018ebee302aae8246bf29f60309 Mon Sep 17 00:00:00 2001 +From: "Timur I. Bakeyev" +Date: Fri, 1 Jun 2018 01:35:08 +0800 +Subject: [PATCH 1/2] vfs_fruit: allow broken AFP_Signature where the first + byte is 0 + +FreeBSD bug ... caused the first byte of the AFP_AfpInfo xattr to be 0 +instead of 'A'. This hack allows such broken AFP_AfpInfo blobs to be +parsed by afpinfo_unpack(). + +FreeBSD Bug: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=228462 + +Signed-off-by: Ralph Boehme + +--- source3/modules/vfs_fruit.c.orig 2019-05-07 08:38:21 UTC ++++ source3/modules/vfs_fruit.c +@@ -2350,6 +2350,8 @@ static ssize_t afpinfo_pack(const AfpInf + return AFP_INFO_SIZE; + } + ++#define BROKEN_FREEBSD_AFP_Signature 0x00465000 ++ + /** + * Unpack a buffer into a AfpInfo structure + * +@@ -2369,10 +2371,20 @@ static AfpInfo *afpinfo_unpack(TALLOC_CT + memcpy(ai->afpi_FinderInfo, (const char *)data + 16, + sizeof(ai->afpi_FinderInfo)); + +- if (ai->afpi_Signature != AFP_Signature +- || ai->afpi_Version != AFP_Version) { +- DEBUG(1, ("Bad AfpInfo signature or version\n")); ++ if (ai->afpi_Signature != AFP_Signature) { ++ DBG_WARNING("Bad AFP signature [%x]\n", ai->afpi_Signature); ++ ++ if (ai->afpi_Signature != BROKEN_FREEBSD_AFP_Signature) { ++ DBG_ERR("Bad AfpInfo signature\n"); ++ TALLOC_FREE(ai); ++ return NULL; ++ } ++ } ++ ++ if (ai->afpi_Version != AFP_Version) { ++ DBG_ERR("Bad AfpInfo version\n"); + TALLOC_FREE(ai); ++ return NULL; + } + + return ai; +@@ -4242,9 +4254,20 @@ static ssize_t fruit_pread_meta_stream(v + { + ssize_t nread; + int ret; ++ char *p = (char *)data; + + nread = SMB_VFS_NEXT_PREAD(handle, fsp, data, n, offset); +- if (nread == -1 || nread == n) { ++ ++ if (nread == -1) { ++ return -1; ++ } ++ ++ if (nread == n) { ++ if (offset == 0 && nread > 3 && p[0] == 0 && p[1] == 'F' && p[2] == 'P') { ++ DBG_NOTICE("Fixing AFP_Info of [%s]\n", ++ fsp_str_dbg(fsp)); ++ p[0] = 'A'; ++ } + return nread; + } + Property changes on: head/net/samba410/files/patch-source3_modules_vfs__fruit.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/samba410/files/patch-source3_modules_vfs__streams__xattr.c =================================================================== --- head/net/samba410/files/patch-source3_modules_vfs__streams__xattr.c (revision 505445) +++ head/net/samba410/files/patch-source3_modules_vfs__streams__xattr.c (revision 505446) @@ -1,526 +1,526 @@ ---- source3/modules/vfs_streams_xattr.c.orig 2018-11-08 07:58:08 UTC +--- source3/modules/vfs_streams_xattr.c.orig 2019-01-15 10:07:00 UTC +++ source3/modules/vfs_streams_xattr.c @@ -1,10 +1,10 @@ /* * Store streams in xattrs * - * Copyright (C) Volker Lendecke, 2008 + * Copyright (C) Volker Lendecke, 2008 + * Copyright (C) Timur I. Bakeyev, 2017 * * Partly based on James Peach's Darwin module, which is - * * Copyright (C) James Peach 2006-2007 * * This program is free software; you can redistribute it and/or modify @@ -79,25 +79,79 @@ static SMB_INO_T stream_inode(const SMB_ } static ssize_t get_xattr_size(connection_struct *conn, - const struct smb_filename *smb_fname, - const char *xattr_name) + const struct smb_filename *smb_fname, + const char *xattr_name) { - NTSTATUS status; - struct ea_struct ea; ssize_t result; - status = get_ea_value(talloc_tos(), conn, NULL, smb_fname, - xattr_name, &ea); + result = SMB_VFS_GETXATTR(conn, smb_fname, xattr_name, NULL, 0); + // ? -1 + return result; +} - if (!NT_STATUS_IS_OK(status)) { - return -1; +static NTSTATUS get_xattr_value(TALLOC_CTX *mem_ctx, + connection_struct *conn, + const struct smb_filename *smb_fname, + const char *ea_name, + struct ea_struct *pea) +{ + ssize_t attr_size; + + attr_size = get_xattr_size(conn, smb_fname, ea_name); + + if (attr_size == -1) { + return map_nt_error_from_unix(errno); } - result = ea.value.length-1; - TALLOC_FREE(ea.value.data); - return result; + pea->value = data_blob_talloc(mem_ctx, NULL, attr_size); + /* We may have xattr of a 0 size */ + if(pea->value.data == NULL && attr_size) { + DEBUG(5, + ("get_xattr_value: for EA '%s' failed to allocate %lu bytes\n", + ea_name, (unsigned long)attr_size) + ); + return NT_STATUS_NO_MEMORY; + } + + attr_size = SMB_VFS_GETXATTR(conn, smb_fname, ea_name, pea->value.data, pea->value.length); + + if (attr_size == -1) { + return map_nt_error_from_unix(errno); + } + + if(pea->value.length != attr_size) { + DEBUG(5, + ("get_xattr_value: for EA '%s' requested %lu, read %lu bytes\n", + ea_name, (unsigned long)pea->value.length, (unsigned long)attr_size) + ); + return NT_STATUS_UNSUCCESSFUL; + } + + DEBUG(10,("get_xattr_value: EA '%s' is of length %lu\n", ea_name, (unsigned long)attr_size)); + /* + * This can dump huge amount of data multiple times. For example + * for 1Mb ADS and chunk size 64Kb the same 1Mb dump will be + * logged 16 times! + */ + dump_data(50, (uint8_t *)pea->value.data, pea->value.length); + + pea->flags = 0; + // ? user. + if (strnequal(ea_name, "user.", 5)) { + pea->name = talloc_strdup(mem_ctx, &ea_name[5]); + } else { + pea->name = talloc_strdup(mem_ctx, ea_name); + } + + if (pea->name == NULL) { + data_blob_free(&pea->value); + return NT_STATUS_NO_MEMORY; + } + + return NT_STATUS_OK; } + /** * Given a stream name, populate xattr_name with the xattr name to use for * accessing the stream. @@ -114,6 +168,7 @@ static NTSTATUS streams_xattr_get_name(v SMB_VFS_HANDLE_GET_DATA(handle, config, struct streams_xattr_config, return NT_STATUS_UNSUCCESSFUL); + // stream_name is passed as ':stream', so skip leading ':' sname = talloc_strdup(ctx, stream_name + 1); if (sname == NULL) { return NT_STATUS_NO_MEMORY; @@ -125,7 +180,7 @@ static NTSTATUS streams_xattr_get_name(v * characters from their on-the-wire Unicode Private Range * encoding to their native ASCII representation. * - * As as result the name of xattrs storing the streams (via + * As a result the name of xattrs storing the streams (via * vfs_streams_xattr) may contain a colon, so we have to use * strrchr_m() instead of strchr_m() for matching the stream * type suffix. @@ -157,7 +212,7 @@ static NTSTATUS streams_xattr_get_name(v return NT_STATUS_NO_MEMORY; } - DEBUG(10, ("xattr_name: %s, stream_name: %s\n", *xattr_name, + DEBUG(10, ("xattr_name: '%s', stream_name: '%s'\n", *xattr_name, stream_name)); talloc_free(sname); -@@ -265,8 +320,8 @@ static int streams_xattr_fstat(vfs_handl +@@ -270,8 +325,8 @@ static int streams_xattr_fstat(vfs_handl return -1; } - sbuf->st_ex_size = get_xattr_size(handle->conn, - smb_fname_base, io->xattr_name); + sbuf->st_ex_size = get_xattr_size(handle->conn, smb_fname_base, + io->xattr_name); if (sbuf->st_ex_size == -1) { TALLOC_FREE(smb_fname_base); SET_STAT_INVALID(*sbuf); -@@ -441,10 +496,10 @@ static int streams_xattr_open(vfs_handle +@@ -446,10 +501,10 @@ static int streams_xattr_open(vfs_handle goto fail; } - status = get_ea_value(talloc_tos(), handle->conn, NULL, - smb_fname, xattr_name, &ea); + status = get_xattr_value(talloc_tos(), handle->conn, + smb_fname, xattr_name, &ea); - DEBUG(10, ("get_ea_value returned %s\n", nt_errstr(status))); + DEBUG(10, ("get_xattr_value returned %s\n", nt_errstr(status))); if (!NT_STATUS_IS_OK(status)) { if (!NT_STATUS_EQUAL(status, NT_STATUS_NOT_FOUND)) { -@@ -475,19 +530,13 @@ static int streams_xattr_open(vfs_handle +@@ -480,19 +535,13 @@ static int streams_xattr_open(vfs_handle /* * The attribute does not exist or needs to be truncated */ - - /* - * Darn, xattrs need at least 1 byte - */ - char null = '\0'; - DEBUG(10, ("creating or truncating attribute %s on file %s\n", xattr_name, smb_fname->base_name)); ret = SMB_VFS_SETXATTR(fsp->conn, smb_fname, xattr_name, - &null, sizeof(null), + NULL, 0, flags & O_EXCL ? XATTR_CREATE : 0); if (ret != 0) { goto fail; -@@ -643,8 +692,8 @@ static int streams_xattr_rename(vfs_hand +@@ -678,8 +727,8 @@ static int streams_xattr_rename(vfs_hand } /* read the old stream */ - status = get_ea_value(talloc_tos(), handle->conn, NULL, - smb_fname_src, src_xattr_name, &ea); + status = get_xattr_value(talloc_tos(), handle->conn, + smb_fname_src, src_xattr_name, &ea); if (!NT_STATUS_IS_OK(status)) { errno = ENOENT; goto fail; -@@ -731,14 +780,13 @@ static NTSTATUS walk_xattr_streams(vfs_h +@@ -766,14 +815,13 @@ static NTSTATUS walk_xattr_streams(vfs_h continue; } - status = get_ea_value(names, + status = get_xattr_value(names, handle->conn, - NULL, smb_fname, names[i], &ea); if (!NT_STATUS_IS_OK(status)) { - DEBUG(10, ("Could not get ea %s for file %s: %s\n", + DEBUG(10, ("Could not get EA %s for file %s: %s\n", names[i], smb_fname->base_name, nt_errstr(status))); -@@ -800,16 +848,17 @@ struct streaminfo_state { +@@ -835,16 +883,17 @@ struct streaminfo_state { NTSTATUS status; }; -static bool collect_one_stream(struct ea_struct *ea, void *private_data) +static bool collect_one_stream(struct ea_struct *pea, void *private_data) { struct streaminfo_state *state = (struct streaminfo_state *)private_data; + // ? -1 if (!add_one_stream(state->mem_ctx, &state->num_streams, &state->streams, - ea->name, ea->value.length-1, + pea->name, pea->value.length, smb_roundup(state->handle->conn, - ea->value.length-1))) { + pea->value.length))) { state->status = NT_STATUS_NO_MEMORY; return false; } -@@ -929,14 +978,17 @@ static ssize_t streams_xattr_pwrite(vfs_ +@@ -964,14 +1013,17 @@ static ssize_t streams_xattr_pwrite(vfs_ files_struct *fsp, const void *data, size_t n, off_t offset) { - struct stream_io *sio = + struct stream_io *sio = (struct stream_io *)VFS_FETCH_FSP_EXTENSION(handle, fsp); + struct smb_filename *smb_fname_base = NULL; + TALLOC_CTX *frame = NULL; + struct ea_struct ea; NTSTATUS status; - struct smb_filename *smb_fname_base = NULL; int ret; - DEBUG(10, ("streams_xattr_pwrite called for %d bytes\n", (int)n)); + DEBUG(10, ("streams_xattr_pwrite: offset=%lu, size=%lu\n", + (unsigned long)offset, (unsigned long)n)); if (sio == NULL) { return SMB_VFS_NEXT_PWRITE(handle, fsp, data, n, offset); -@@ -946,6 +998,8 @@ static ssize_t streams_xattr_pwrite(vfs_ +@@ -981,6 +1033,8 @@ static ssize_t streams_xattr_pwrite(vfs_ return -1; } + frame = talloc_stackframe(); + /* Create an smb_filename with stream_name == NULL. */ smb_fname_base = synthetic_smb_fname(talloc_tos(), sio->base, -@@ -953,39 +1007,55 @@ static ssize_t streams_xattr_pwrite(vfs_ +@@ -988,39 +1042,55 @@ static ssize_t streams_xattr_pwrite(vfs_ NULL, fsp->fsp_name->flags); if (smb_fname_base == NULL) { + TALLOC_FREE(frame); errno = ENOMEM; return -1; } - status = get_ea_value(talloc_tos(), handle->conn, NULL, - smb_fname_base, sio->xattr_name, &ea); - if (!NT_STATUS_IS_OK(status)) { - return -1; - } - - if ((offset + n) > ea.value.length-1) { - uint8_t *tmp; + status = get_xattr_value(talloc_tos(), handle->conn, + smb_fname_base, sio->xattr_name, &ea); - tmp = talloc_realloc(talloc_tos(), ea.value.data, uint8_t, - offset + n + 1); + if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_FOUND)) { + /* + * This can happen if we sit behind vfs_fruit: + * fruit_ftruncate calls UNLINK on an attribute + * truncating the "file" to zero length. A later + * pwrite faces a non-existing attribute, we need to + * cope with that here. + * + * This might be not the last word on this. + */ - if (tmp == NULL) { - TALLOC_FREE(ea.value.data); - errno = ENOMEM; - return -1; - } - ea.value.data = tmp; - ea.value.length = offset + n + 1; - ea.value.data[offset+n] = 0; - } + ea = (struct ea_struct) {0}; + ea.name = talloc_strdup(talloc_tos(), sio->xattr_name); + if (ea.name == NULL) { + TALLOC_FREE(frame); + errno = ENOMEM; + return -1; + } + status = NT_STATUS_OK; + } - memcpy(ea.value.data + offset, data, n); + if (!NT_STATUS_IS_OK(status)) { + TALLOC_FREE(frame); + return -1; + } + // ? -1 + if ((offset + n) > ea.value.length) { + if(!data_blob_realloc(talloc_tos(), &ea.value, offset + n)) { + TALLOC_FREE(frame); + errno = ENOMEM; + return -1; + } + } + memcpy(ea.value.data + offset, data, n); ret = SMB_VFS_SETXATTR(fsp->conn, fsp->fsp_name, sio->xattr_name, ea.value.data, ea.value.length, 0); - TALLOC_FREE(ea.value.data); + + TALLOC_FREE(frame); if (ret == -1) { return -1; -@@ -998,15 +1068,17 @@ static ssize_t streams_xattr_pread(vfs_h +@@ -1033,15 +1103,17 @@ static ssize_t streams_xattr_pread(vfs_h files_struct *fsp, void *data, size_t n, off_t offset) { - struct stream_io *sio = + struct stream_io *sio = (struct stream_io *)VFS_FETCH_FSP_EXTENSION(handle, fsp); + struct smb_filename *smb_fname_base = NULL; + TALLOC_CTX *frame = NULL; + struct ea_struct ea; NTSTATUS status; - size_t length, overlap; - struct smb_filename *smb_fname_base = NULL; + size_t overlap; - DEBUG(10, ("streams_xattr_pread: offset=%d, size=%d\n", - (int)offset, (int)n)); + DEBUG(10, ("streams_xattr_pread: offset=%lu, size=%lu\n", + (unsigned long)offset, (unsigned long)n)); if (sio == NULL) { return SMB_VFS_NEXT_PREAD(handle, fsp, data, n, offset); -@@ -1016,6 +1088,8 @@ static ssize_t streams_xattr_pread(vfs_h +@@ -1051,6 +1123,8 @@ static ssize_t streams_xattr_pread(vfs_h return -1; } + frame = talloc_stackframe(); + /* Create an smb_filename with stream_name == NULL. */ smb_fname_base = synthetic_smb_fname(talloc_tos(), sio->base, -@@ -1023,31 +1097,35 @@ static ssize_t streams_xattr_pread(vfs_h +@@ -1058,31 +1132,35 @@ static ssize_t streams_xattr_pread(vfs_h NULL, fsp->fsp_name->flags); if (smb_fname_base == NULL) { + TALLOC_FREE(frame); errno = ENOMEM; return -1; } - status = get_ea_value(talloc_tos(), handle->conn, NULL, - smb_fname_base, sio->xattr_name, &ea); + status = get_xattr_value(talloc_tos(), handle->conn, + smb_fname_base, sio->xattr_name, &ea); if (!NT_STATUS_IS_OK(status)) { + TALLOC_FREE(frame); return -1; } + // ? -1 + //length = ea.value.length-1; - length = ea.value.length-1; + DEBUG(10, ("streams_xattr_pread: get_xattr_value() returned %lu bytes\n", + (unsigned long)ea.value.length)); - DEBUG(10, ("streams_xattr_pread: get_ea_value returned %d bytes\n", - (int)length)); + /* Attempt to read past EOF. */ + if (ea.value.length <= offset) { + TALLOC_FREE(frame); + return 0; + } - /* Attempt to read past EOF. */ - if (length <= offset) { - return 0; - } + overlap = (offset + n) > ea.value.length ? (ea.value.length - offset) : n; + memcpy(data, ea.value.data + offset, overlap); - overlap = (offset + n) > length ? (length - offset) : n; - memcpy(data, ea.value.data + offset, overlap); + TALLOC_FREE(frame); - TALLOC_FREE(ea.value.data); - return overlap; + return overlap; } struct streams_xattr_pread_state { -@@ -1214,16 +1292,18 @@ static int streams_xattr_ftruncate(struc +@@ -1249,16 +1327,18 @@ static int streams_xattr_ftruncate(struc struct files_struct *fsp, off_t offset) { - int ret; - uint8_t *tmp; - struct ea_struct ea; - NTSTATUS status; - struct stream_io *sio = + struct stream_io *sio = (struct stream_io *)VFS_FETCH_FSP_EXTENSION(handle, fsp); struct smb_filename *smb_fname_base = NULL; + TALLOC_CTX *frame = NULL; - DEBUG(10, ("streams_xattr_ftruncate called for file %s offset %.0f\n", - fsp_str_dbg(fsp), (double)offset)); + struct ea_struct ea; + NTSTATUS status; + size_t orig_length; + int ret; + + DEBUG(10, ("streams_xattr_ftruncate: called for file '%s' with offset %lu\n", + fsp_str_dbg(fsp), (unsigned long)offset)); if (sio == NULL) { return SMB_VFS_NEXT_FTRUNCATE(handle, fsp, offset); -@@ -1233,6 +1313,8 @@ static int streams_xattr_ftruncate(struc +@@ -1268,6 +1348,8 @@ static int streams_xattr_ftruncate(struc return -1; } + frame = talloc_stackframe(); + /* Create an smb_filename with stream_name == NULL. */ smb_fname_base = synthetic_smb_fname(talloc_tos(), sio->base, -@@ -1240,40 +1322,46 @@ static int streams_xattr_ftruncate(struc +@@ -1275,40 +1357,46 @@ static int streams_xattr_ftruncate(struc NULL, fsp->fsp_name->flags); if (smb_fname_base == NULL) { + TALLOC_FREE(frame); errno = ENOMEM; return -1; } - status = get_ea_value(talloc_tos(), handle->conn, NULL, - smb_fname_base, sio->xattr_name, &ea); + status = get_xattr_value(talloc_tos(), handle->conn, + smb_fname_base, sio->xattr_name, &ea); if (!NT_STATUS_IS_OK(status)) { + TALLOC_FREE(frame); return -1; } + orig_length = ea.value.length; - tmp = talloc_realloc(talloc_tos(), ea.value.data, uint8_t, - offset + 1); + /* Requested size matches the original size */ + if(orig_length == offset) { + TALLOC_FREE(frame); + return 0; + } - if (tmp == NULL) { - TALLOC_FREE(ea.value.data); + /* That can both shrink and expand */ + /* XXX: If offset == 0 the result of talloc_realloc is NULL, but still valid */ + if(offset && !data_blob_realloc(talloc_tos(), &ea.value, offset)) { + TALLOC_FREE(frame); errno = ENOMEM; return -1; } - /* Did we expand ? */ - if (ea.value.length < offset + 1) { - memset(&tmp[ea.value.length], '\0', - offset + 1 - ea.value.length); + /* If we expanded, fill up extra space with zeros */ + if (orig_length < offset) { + memset(ea.value.data + orig_length, 0, + offset - orig_length); } - ea.value.data = tmp; - ea.value.length = offset + 1; - ea.value.data[offset] = 0; - + /* XXX: We should use ea.value.length here, but when offset == 0 + it's not reset to 0 in data_blob_realloc() */ ret = SMB_VFS_SETXATTR(fsp->conn, fsp->fsp_name, sio->xattr_name, - ea.value.data, ea.value.length, 0); - TALLOC_FREE(ea.value.data); + ea.value.data, offset, 0); + TALLOC_FREE(frame); if (ret == -1) { return -1; -@@ -1291,9 +1379,9 @@ static int streams_xattr_fallocate(struc +@@ -1326,9 +1414,9 @@ static int streams_xattr_fallocate(struc struct stream_io *sio = (struct stream_io *)VFS_FETCH_FSP_EXTENSION(handle, fsp); - DEBUG(10, ("streams_xattr_fallocate called for file %s offset %.0f" - "len = %.0f\n", - fsp_str_dbg(fsp), (double)offset, (double)len)); + DEBUG(10, ("streams_xattr_fallocate: called for file '%s' with offset %lu" + "len = %lu\n", + fsp_str_dbg(fsp), (unsigned long)offset, (unsigned long)len)); if (sio == NULL) { return SMB_VFS_NEXT_FALLOCATE(handle, fsp, mode, offset, len); Index: head/net/samba410/files/patch-source3_modules_vfs__virusfilter__utils.c =================================================================== --- head/net/samba410/files/patch-source3_modules_vfs__virusfilter__utils.c (nonexistent) +++ head/net/samba410/files/patch-source3_modules_vfs__virusfilter__utils.c (revision 505446) @@ -0,0 +1,36 @@ +--- source3/modules/vfs_virusfilter_utils.c.orig 2019-01-15 10:07:00 UTC ++++ source3/modules/vfs_virusfilter_utils.c +@@ -392,6 +392,10 @@ bool virusfilter_io_writel( + + bool virusfilter_io_writefl( + struct virusfilter_io_handle *io_h, ++ const char *data_fmt, ...) PRINTF_ATTRIBUTE(2, 3); ++ ++bool virusfilter_io_writefl( ++ struct virusfilter_io_handle *io_h, + const char *data_fmt, ...) + { + va_list ap; +@@ -415,6 +419,10 @@ bool virusfilter_io_writefl( + + bool virusfilter_io_vwritefl( + struct virusfilter_io_handle *io_h, ++ const char *data_fmt, va_list ap) PRINTF_ATTRIBUTE(2, 0); ++ ++bool virusfilter_io_vwritefl( ++ struct virusfilter_io_handle *io_h, + const char *data_fmt, va_list ap) + { + char data[VIRUSFILTER_IO_BUFFER_SIZE + VIRUSFILTER_IO_EOL_SIZE]; +@@ -666,6 +674,11 @@ bool virusfilter_io_readl(TALLOC_CTX *ct + bool virusfilter_io_writefl_readl( + struct virusfilter_io_handle *io_h, + char **read_line, ++ const char *fmt, ...) PRINTF_ATTRIBUTE(3, 4); ++ ++bool virusfilter_io_writefl_readl( ++ struct virusfilter_io_handle *io_h, ++ char **read_line, + const char *fmt, ...) + { + bool ok; Property changes on: head/net/samba410/files/patch-source3_modules_vfs__virusfilter__utils.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/samba410/files/patch-source3_registry_tests_test__regfio.c =================================================================== --- head/net/samba410/files/patch-source3_registry_tests_test__regfio.c (nonexistent) +++ head/net/samba410/files/patch-source3_registry_tests_test__regfio.c (revision 505446) @@ -0,0 +1,10 @@ +--- source3/registry/tests/test_regfio.c.orig 2019-05-07 08:38:21 UTC ++++ source3/registry/tests/test_regfio.c +@@ -24,6 +24,7 @@ + + #include + #include ++#include + #include + #include + #include Property changes on: head/net/samba410/files/patch-source3_registry_tests_test__regfio.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/samba410/files/patch-source3_smbd_quotas.c =================================================================== --- head/net/samba410/files/patch-source3_smbd_quotas.c (nonexistent) +++ head/net/samba410/files/patch-source3_smbd_quotas.c (revision 505446) @@ -0,0 +1,19 @@ +--- source3/smbd/quotas.c.orig 2019-01-15 10:07:00 UTC ++++ source3/smbd/quotas.c +@@ -125,6 +125,7 @@ static bool nfs_quotas(char *nfspath, ui + 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)); +@@ -133,7 +134,7 @@ static bool nfs_quotas(char *nfspath, ui + 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; Property changes on: head/net/samba410/files/patch-source3_smbd_quotas.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/samba410/files/patch-source3_smbd_utmp.c =================================================================== --- head/net/samba410/files/patch-source3_smbd_utmp.c (nonexistent) +++ head/net/samba410/files/patch-source3_smbd_utmp.c (revision 505446) @@ -0,0 +1,261 @@ +--- source3/smbd/utmp.c.orig 2019-01-15 10:07:00 UTC ++++ source3/smbd/utmp.c +@@ -257,7 +257,7 @@ static char *uw_pathname(TALLOC_CTX *ctx + Update utmp file directly. No subroutine interface: probably a BSD system. + ****************************************************************************/ + +-static void pututline_my(const char *uname, struct utmp *u, bool claim) ++static void pututline_my(const char *uname, STRUCT_UTMP *u, bool claim) + { + DEBUG(1,("pututline_my: not yet implemented\n")); + /* BSD implementor: may want to consider (or not) adjusting "lastlog" */ +@@ -271,7 +271,7 @@ static void pututline_my(const char *una + Credit: Michail Vidiassov + ****************************************************************************/ + +-static void updwtmp_my(const char *wname, struct utmp *u, bool claim) ++static void updwtmp_my(const char *wname, STRUCT_UTMP *u, bool claim) + { + int fd; + struct stat buf; +@@ -303,7 +303,7 @@ static void updwtmp_my(const char *wname + if ((fd = open(wname, O_WRONLY|O_APPEND, 0)) < 0) + return; + if (fstat(fd, &buf) == 0) { +- if (write(fd, (char *)u, sizeof(struct utmp)) != sizeof(struct utmp)) ++ if (write(fd, (char *)u, sizeof(STRUCT_UTMP)) != sizeof(STRUCT_UTMP)) + (void) ftruncate(fd, buf.st_size); + } + (void) close(fd); +@@ -314,12 +314,12 @@ static void updwtmp_my(const char *wname + Update via utmp/wtmp (not utmpx/wtmpx). + ****************************************************************************/ + +-static void utmp_nox_update(struct utmp *u, bool claim) ++static void utmp_nox_update(STRUCT_UTMP *u, bool claim) + { + char *uname = NULL; + char *wname = NULL; + #if defined(PUTUTLINE_RETURNS_UTMP) +- struct utmp *urc; ++ STRUCT_UTMP *urc; + #endif /* PUTUTLINE_RETURNS_UTMP */ + + uname = uw_pathname(talloc_tos(), "utmp", ut_pathname); +@@ -376,127 +376,52 @@ static void utmp_nox_update(struct utmp + } + } + +-/**************************************************************************** +- Copy a string in the utmp structure. +-****************************************************************************/ + +-static void utmp_strcpy(char *dest, const char *src, size_t n) +-{ +- size_t len = 0; + +- memset(dest, '\0', n); +- if (src) +- len = strlen(src); +- if (len >= n) { +- memcpy(dest, src, n); +- } else { +- if (len) +- memcpy(dest, src, len); +- } +-} ++ + + /**************************************************************************** + Update via utmpx/wtmpx (preferred) or via utmp/wtmp. + ****************************************************************************/ + +-static void sys_utmp_update(struct utmp *u, const char *hostname, bool claim) ++static void sys_utmp_update(STRUCT_UTMP *u, const char *hostname, bool claim) + { +-#if !defined(HAVE_UTMPX_H) +- /* No utmpx stuff. Drop to non-x stuff */ +- utmp_nox_update(u, claim); +-#elif !defined(HAVE_PUTUTXLINE) +- /* Odd. Have utmpx.h but no "pututxline()". Drop to non-x stuff */ +- DEBUG(1,("utmp_update: have utmpx.h but no pututxline() function\n")); +- utmp_nox_update(u, claim); +-#elif !defined(HAVE_GETUTMPX) +- /* Odd. Have utmpx.h but no "getutmpx()". Drop to non-x stuff */ +- DEBUG(1,("utmp_update: have utmpx.h but no getutmpx() function\n")); +- utmp_nox_update(u, claim); +-#elif !defined(HAVE_UPDWTMPX) +- /* Have utmpx.h but no "updwtmpx()". Drop to non-x stuff */ +- DEBUG(1,("utmp_update: have utmpx.h but no updwtmpx() function\n")); +- utmp_nox_update(u, claim); +-#else +- char *uname = NULL; +- char *wname = NULL; +- struct utmpx ux, *uxrc; +- +- getutmpx(u, &ux); +- +-#if defined(HAVE_UX_UT_SYSLEN) +- if (hostname) +- ux.ut_syslen = strlen(hostname) + 1; /* include end NULL */ +- else +- ux.ut_syslen = 0; +-#endif +-#if defined(HAVE_UX_UT_HOST) +- utmp_strcpy(ux.ut_host, hostname, sizeof(ux.ut_host)); +-#endif +- +- uname = uw_pathname(talloc_tos(), "utmpx", ux_pathname); +- wname = uw_pathname(talloc_tos(), "wtmpx", wx_pathname); +- if (uname && wname) { +- DEBUG(2,("utmp_update: uname:%s wname:%s\n", uname, wname)); +- } ++ STRUCT_UTMP *urc; + +- /* +- * Check for either uname or wname being empty. +- * Some systems, such as Redhat 6, have a "utmpx.h" which doesn't +- * define default filenames. +- * Also, our local installation has not provided an override. +- * Drop to non-x method. (E.g. RH6 has good defaults in "utmp.h".) +- */ +- if (!uname || !wname || (strlen(uname) == 0) || (strlen(wname) == 0)) { +- utmp_nox_update(u, claim); +- } else { +- utmpxname(uname); +- setutxent(); +- uxrc = pututxline(&ux); +- endutxent(); +- if (uxrc == NULL) { +- DEBUG(2,("utmp_update: pututxline() failed\n")); +- return; +- } +- updwtmpx(wname, &ux); ++ setutxent(); ++ urc = pututxline(u); ++ endutxent(); ++ if (urc == NULL) { ++ DEBUG(2,("utmp_update: pututxline() failed\n")); ++ return; + } +-#endif /* HAVE_UTMPX_H */ + } + + #if defined(HAVE_UT_UT_ID) + /**************************************************************************** + Encode the unique connection number into "ut_id". + ****************************************************************************/ +- +-static int ut_id_encode(int i, char *fourbyte) ++static void ut_id_encode(char *buf, int id, size_t buf_size) + { +- int nbase; +- const char *ut_id_encstr = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"; +- +-/* +- * 'ut_id_encstr' is the character set on which modulo arithmetic is done. +- * Example: digits would produce the base-10 numbers from '001'. +- */ +- nbase = strlen(ut_id_encstr); ++ const char ut_id_encstr[] = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"; + +- fourbyte[0] = ut_id_encstr[i % nbase]; +- i /= nbase; +- fourbyte[1] = ut_id_encstr[i % nbase]; +- i /= nbase; +- fourbyte[3] = ut_id_encstr[i % nbase]; +- i /= nbase; +- fourbyte[2] = ut_id_encstr[i % nbase]; +- i /= nbase; ++ int nbase = sizeof(ut_id_encstr) - 1; ++ /* ++ * 'ut_id_encstr' is the character set on which modulo arithmetic is done. ++ * Example: digits would produce the base-10 numbers from '001'. ++ */ + +- /* we do not care about overflows as i is a random number */ +- return 0; ++ for(int i = 0; i < buf_size; i++) { ++ buf[i] = ut_id_encstr[id % nbase]; ++ id /= nbase; ++ } + } + #endif /* defined(HAVE_UT_UT_ID) */ + +- + /* + fill a system utmp structure given all the info we can gather + */ +-static bool sys_utmp_fill(struct utmp *u, ++static bool sys_utmp_fill(STRUCT_UTMP *u, + const char *username, const char *hostname, + const char *id_str, int id_num) + { +@@ -509,16 +434,16 @@ static bool sys_utmp_fill(struct utmp *u + * rather than to try to detect and optimise. + */ + #if defined(HAVE_UT_UT_USER) +- utmp_strcpy(u->ut_user, username, sizeof(u->ut_user)); ++ strncpy(u->ut_user, username, sizeof(u->ut_user)); + #elif defined(HAVE_UT_UT_NAME) +- utmp_strcpy(u->ut_name, username, sizeof(u->ut_name)); ++ strncpy(u->ut_name, username, sizeof(u->ut_name)); + #endif + + /* + * ut_line: + * If size limit proves troublesome, then perhaps use "ut_id_encode()". + */ +- utmp_strcpy(u->ut_line, id_str, sizeof(u->ut_line)); ++ strncpy(u->ut_line, id_str, sizeof(u->ut_line)); + + #if defined(HAVE_UT_UT_PID) + u->ut_pid = getpid(); +@@ -535,20 +460,23 @@ static bool sys_utmp_fill(struct utmp *u + u->ut_time = timeval.tv_sec; + #elif defined(HAVE_UT_UT_TV) + GetTimeOfDay(&timeval); +- u->ut_tv = timeval; ++ u->ut_tv.tv_sec = timeval.tv_sec; ++ u->ut_tv.tv_usec = timeval.tv_usec; + #else + #error "with-utmp must have UT_TIME or UT_TV" + #endif + + #if defined(HAVE_UT_UT_HOST) +- utmp_strcpy(u->ut_host, hostname, sizeof(u->ut_host)); ++ if(hostname != NULL) { ++ strncpy(u->ut_host, hostname, sizeof(u->ut_host)); ++#if defined(HAVE_UT_UT_SYSLEN) ++ u->ut_syslen = strlen(hostname) + 1; /* include trailing NULL */ ++#endif ++ } + #endif + + #if defined(HAVE_UT_UT_ID) +- if (ut_id_encode(id_num, u->ut_id) != 0) { +- DEBUG(1,("utmp_fill: cannot encode id %d\n", id_num)); +- return False; +- } ++ ut_id_encode(u->ut_id, id_num, sizeof(u->ut_id)); + #endif + + return True; +@@ -561,7 +489,7 @@ static bool sys_utmp_fill(struct utmp *u + void sys_utmp_yield(const char *username, const char *hostname, + const char *id_str, int id_num) + { +- struct utmp u; ++ STRUCT_UTMP u; + + ZERO_STRUCT(u); + +@@ -587,7 +515,7 @@ void sys_utmp_yield(const char *username + void sys_utmp_claim(const char *username, const char *hostname, + const char *id_str, int id_num) + { +- struct utmp u; ++ STRUCT_UTMP u; + + ZERO_STRUCT(u); + Property changes on: head/net/samba410/files/patch-source3_smbd_utmp.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/samba410/files/patch-source3_torture_cmd__vfs.c =================================================================== --- head/net/samba410/files/patch-source3_torture_cmd__vfs.c (nonexistent) +++ head/net/samba410/files/patch-source3_torture_cmd__vfs.c (revision 505446) @@ -0,0 +1,138 @@ +--- source3/torture/cmd_vfs.c.orig 2019-01-15 10:07:00 UTC ++++ source3/torture/cmd_vfs.c +@@ -141,6 +141,82 @@ static NTSTATUS cmd_disk_free(struct vfs + return NT_STATUS_OK; + } + ++static NTSTATUS cmd_get_quota(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc, const char **argv) ++{ ++ struct smb_filename *smb_fname = NULL; ++ uint64_t quota, bsize, dfree, dsize; ++ enum SMB_QUOTA_TYPE qtype; ++ SMB_DISK_QUOTA D; ++ unid_t id; ++ int r; ++ ++ if (argc != 4) { ++ printf("Usage: get_quota [user|group] id\n"); ++ return NT_STATUS_OK; ++ } ++ ++ smb_fname = synthetic_smb_fname(talloc_tos(), ++ argv[1], ++ NULL, ++ NULL, ++ ssf_flags()); ++ if (smb_fname == NULL) { ++ return NT_STATUS_NO_MEMORY; ++ } ++ ++ if(strcmp(argv[2], "user") == 0) { ++ qtype = SMB_USER_FS_QUOTA_TYPE; ++ } ++ else if(strcmp(argv[2], "group") == 0) { ++ qtype = SMB_GROUP_FS_QUOTA_TYPE; ++ } ++ else { ++ printf("Usage: get_quota [user|group] id\n"); ++ return NT_STATUS_OK; ++ } ++ ++ id.uid = atoi(argv[3]); ++ ++ ZERO_STRUCT(D); ++ ++ r = SMB_VFS_GET_QUOTA(vfs->conn, smb_fname, qtype, id, &D); ++ ++ if (r == -1 && errno != ENOSYS) { ++ return NT_STATUS_UNSUCCESSFUL; ++ } ++ ++ if (r == 0 && (D.qflags & QUOTAS_DENY_DISK) == 0) { ++ return NT_STATUS_UNSUCCESSFUL; ++ } ++ ++ bsize = D.bsize; ++ /* Use softlimit to determine disk space, except when it has been exceeded */ ++ if ( ++ (D.softlimit && D.curblocks >= D.softlimit) || ++ (D.hardlimit && D.curblocks >= D.hardlimit) || ++ (D.isoftlimit && D.curinodes >= D.isoftlimit) || ++ (D.ihardlimit && D.curinodes>=D.ihardlimit) ++ ) { ++ dfree = 0; ++ dsize = D.curblocks; ++ } else if (D.softlimit==0 && D.hardlimit==0) { ++ return NT_STATUS_UNSUCCESSFUL; ++ } else { ++ if (D.softlimit == 0) { ++ D.softlimit = D.hardlimit; ++ } ++ dfree = D.softlimit - D.curblocks; ++ dsize = D.softlimit; ++ } ++ ++ printf("get_quota: bsize = %lu, dfree = %lu, dsize = %lu\n", ++ (unsigned long)bsize, ++ (unsigned long)dfree, ++ (unsigned long)dsize); ++ ++ return NT_STATUS_OK; ++} ++ + + static NTSTATUS cmd_opendir(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc, const char **argv) + { +@@ -1947,6 +2023,7 @@ struct cmd_set vfs_commands[] = { + { "connect", cmd_connect, "VFS connect()", "connect" }, + { "disconnect", cmd_disconnect, "VFS disconnect()", "disconnect" }, + { "disk_free", cmd_disk_free, "VFS disk_free()", "disk_free " }, ++ { "get_quota", cmd_get_quota, "VFS get_quota()", "get_quota [user|group] id" }, + { "opendir", cmd_opendir, "VFS opendir()", "opendir " }, + { "readdir", cmd_readdir, "VFS readdir()", "readdir" }, + { "mkdir", cmd_mkdir, "VFS mkdir()", "mkdir " }, +@@ -1977,33 +2054,22 @@ struct cmd_set vfs_commands[] = { + { "link", cmd_link, "VFS link()", "link " }, + { "mknod", cmd_mknod, "VFS mknod()", "mknod " }, + { "realpath", cmd_realpath, "VFS realpath()", "realpath " }, +- { "getxattr", cmd_getxattr, "VFS getxattr()", +- "getxattr " }, +- { "listxattr", cmd_listxattr, "VFS listxattr()", +- "listxattr " }, +- { "setxattr", cmd_setxattr, "VFS setxattr()", +- "setxattr []" }, +- { "removexattr", cmd_removexattr, "VFS removexattr()", +- "removexattr \n" }, +- { "fget_nt_acl", cmd_fget_nt_acl, "VFS fget_nt_acl()", +- "fget_nt_acl \n" }, +- { "get_nt_acl", cmd_get_nt_acl, "VFS get_nt_acl()", +- "get_nt_acl \n" }, +- { "fset_nt_acl", cmd_fset_nt_acl, "VFS fset_nt_acl()", +- "fset_nt_acl \n" }, +- { "set_nt_acl", cmd_set_nt_acl, "VFS open() and fset_nt_acl()", +- "set_nt_acl \n" }, ++ { "getxattr", cmd_getxattr, "VFS getxattr()", "getxattr " }, ++ { "listxattr", cmd_listxattr, "VFS listxattr()", "listxattr " }, ++ { "setxattr", cmd_setxattr, "VFS setxattr()", "setxattr []" }, ++ { "removexattr", cmd_removexattr, "VFS removexattr()", "removexattr \n" }, ++ { "fget_nt_acl", cmd_fget_nt_acl, "VFS fget_nt_acl()", "fget_nt_acl \n" }, ++ { "get_nt_acl", cmd_get_nt_acl, "VFS get_nt_acl()", "get_nt_acl \n" }, ++ { "fset_nt_acl", cmd_fset_nt_acl, "VFS fset_nt_acl()", "fset_nt_acl \n" }, ++ { "set_nt_acl", cmd_set_nt_acl, "VFS open() and fset_nt_acl()", "set_nt_acl \n" }, + { "sys_acl_get_file", cmd_sys_acl_get_file, "VFS sys_acl_get_file()", "sys_acl_get_file " }, + { "sys_acl_get_fd", cmd_sys_acl_get_fd, "VFS sys_acl_get_fd()", "sys_acl_get_fd " }, +- { "sys_acl_blob_get_file", cmd_sys_acl_blob_get_file, +- "VFS sys_acl_blob_get_file()", "sys_acl_blob_get_file " }, +- { "sys_acl_blob_get_fd", cmd_sys_acl_blob_get_fd, +- "VFS sys_acl_blob_get_fd()", "sys_acl_blob_get_fd " }, ++ { "sys_acl_blob_get_file", cmd_sys_acl_blob_get_file, "VFS sys_acl_blob_get_file()", "sys_acl_blob_get_file " }, ++ { "sys_acl_blob_get_fd", cmd_sys_acl_blob_get_fd, "VFS sys_acl_blob_get_fd()", "sys_acl_blob_get_fd " }, + { "sys_acl_delete_def_file", cmd_sys_acl_delete_def_file, "VFS sys_acl_delete_def_file()", "sys_acl_delete_def_file " }, + + +- { "test_chain", cmd_test_chain, "test chain code", +- "test_chain" }, ++ { "test_chain", cmd_test_chain, "test chain code", "test_chain" }, + { "translate_name", cmd_translate_name, "VFS translate_name()", "translate_name unix_filename" }, + { NULL } + }; Property changes on: head/net/samba410/files/patch-source3_torture_cmd__vfs.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/samba410/files/patch-source3_utils_net.c =================================================================== --- head/net/samba410/files/patch-source3_utils_net.c (nonexistent) +++ head/net/samba410/files/patch-source3_utils_net.c (revision 505446) @@ -0,0 +1,18 @@ +--- source3/utils/net.c.orig 2019-01-15 10:07:00 UTC ++++ source3/utils/net.c +@@ -1096,8 +1096,13 @@ static void get_credentials_file(struct + lp_set_cmdline("netbios name", 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) { Property changes on: head/net/samba410/files/patch-source3_utils_net.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/samba410/files/patch-source3_utils_net__time.c =================================================================== --- head/net/samba410/files/patch-source3_utils_net__time.c (nonexistent) +++ head/net/samba410/files/patch-source3_utils_net__time.c (revision 505446) @@ -0,0 +1,19 @@ +--- source3/utils/net_time.c.orig 2019-01-15 10:07:00 UTC ++++ source3/utils/net_time.c +@@ -81,10 +81,15 @@ static const char *systime(time_t t) + 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) Property changes on: head/net/samba410/files/patch-source3_utils_net__time.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/samba410/files/patch-source3_winbindd_wscript__build =================================================================== --- head/net/samba410/files/patch-source3_winbindd_wscript__build (nonexistent) +++ head/net/samba410/files/patch-source3_winbindd_wscript__build (revision 505446) @@ -0,0 +1,20 @@ +--- source3/winbindd/wscript_build.orig 2019-01-15 10:07:00 UTC ++++ source3/winbindd/wscript_build +@@ -2,7 +2,7 @@ + + bld.SAMBA3_LIBRARY('idmap', + source='idmap.c idmap_util.c', +- deps='samba-util pdb', ++ deps='pdb samba-modules secrets3', + allow_undefined_symbols=True, + private_library=True) + +@@ -116,7 +116,7 @@ bld.SAMBA3_MODULE('idmap_autorid', + + bld.SAMBA3_LIBRARY('nss_info', + source='nss_info.c', +- deps='samba-util smbconf', ++ deps='samba-util samba-modules smbconf', + private_library=True) + + bld.SAMBA3_MODULE('nss_info_template', Property changes on: head/net/samba410/files/patch-source3_winbindd_wscript__build ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/samba410/files/patch-source3_wscript =================================================================== --- head/net/samba410/files/patch-source3_wscript (nonexistent) +++ head/net/samba410/files/patch-source3_wscript (revision 505446) @@ -0,0 +1,94 @@ +--- source3/wscript.orig 2019-05-07 08:38:21 UTC ++++ source3/wscript +@@ -50,6 +50,7 @@ def options(opt): + opt.SAMBA3_ADD_OPTION('sendfile-support', default=None) + opt.SAMBA3_ADD_OPTION('utmp') + opt.SAMBA3_ADD_OPTION('avahi', with_name="enable", without_name="disable") ++ opt.SAMBA3_ADD_OPTION('dnssd', with_name="enable", without_name="disable") + opt.SAMBA3_ADD_OPTION('iconv') + opt.SAMBA3_ADD_OPTION('acl-support') + opt.SAMBA3_ADD_OPTION('dnsupdate') +@@ -787,34 +788,39 @@ msg.msg_accrightslen = sizeof(fd); + + if Options.options.with_utmp: + conf.env.with_utmp = True +- if not conf.CHECK_HEADERS('utmp.h'): conf.env.with_utmp = False +- conf.CHECK_FUNCS('pututline pututxline updwtmp updwtmpx getutmpx getutxent') +- conf.CHECK_STRUCTURE_MEMBER('struct utmp', 'ut_name', headers='utmp.h', ++ if not conf.CHECK_HEADERS('utmpx.h') and not conf.CHECK_HEADERS('utmp.h'): ++ conf.env.with_utmp = False ++ if conf.CONFIG_SET('HAVE_UTMPX_H'): ++ conf.DEFINE('STRUCT_UTMP', 'struct utmpx') ++ elif conf.CONFIG_SET('HAVE_UTMP_H'): ++ conf.DEFINE('STRUCT_UTMP', 'struct utmp') ++ conf.CHECK_FUNCS('pututxline getutxid getutxline updwtmpx getutmpx setutxent endutxent') ++ conf.CHECK_FUNCS('pututline getutid getutline updwtmp getutmp setutent endutent') ++ conf.CHECK_STRUCTURE_MEMBER('STRUCT_UTMP', 'ut_name', headers='utmpx.h utmp.h', + define='HAVE_UT_UT_NAME') +- conf.CHECK_STRUCTURE_MEMBER('struct utmp', 'ut_user', headers='utmp.h', ++ ++ conf.CHECK_STRUCTURE_MEMBER('STRUCT_UTMP', 'ut_user', headers='utmpx.h utmp.h', + define='HAVE_UT_UT_USER') +- conf.CHECK_STRUCTURE_MEMBER('struct utmp', 'ut_id', headers='utmp.h', ++ conf.CHECK_STRUCTURE_MEMBER('STRUCT_UTMP', 'ut_id', headers='utmpx.h utmp.h', + define='HAVE_UT_UT_ID') +- conf.CHECK_STRUCTURE_MEMBER('struct utmp', 'ut_host', headers='utmp.h', ++ conf.CHECK_STRUCTURE_MEMBER('STRUCT_UTMP', 'ut_host', headers='utmpx.h utmp.h', + define='HAVE_UT_UT_HOST') +- conf.CHECK_STRUCTURE_MEMBER('struct utmp', 'ut_time', headers='utmp.h', ++ conf.CHECK_STRUCTURE_MEMBER('STRUCT_UTMP', 'ut_time', headers='utmpx.h utmp.h', + define='HAVE_UT_UT_TIME') +- conf.CHECK_STRUCTURE_MEMBER('struct utmp', 'ut_tv', headers='utmp.h', ++ conf.CHECK_STRUCTURE_MEMBER('STRUCT_UTMP', 'ut_tv', headers='utmpx.h utmp.h', + define='HAVE_UT_UT_TV') +- conf.CHECK_STRUCTURE_MEMBER('struct utmp', 'ut_type', headers='utmp.h', ++ conf.CHECK_STRUCTURE_MEMBER('STRUCT_UTMP', 'ut_type', headers='utmpx.h utmp.h', + define='HAVE_UT_UT_TYPE') +- conf.CHECK_STRUCTURE_MEMBER('struct utmp', 'ut_pid', headers='utmp.h', ++ conf.CHECK_STRUCTURE_MEMBER('STRUCT_UTMP', 'ut_pid', headers='utmpx.h utmp.h', + define='HAVE_UT_UT_PID') +- conf.CHECK_STRUCTURE_MEMBER('struct utmp', 'ut_exit.e_exit', headers='utmp.h', ++ conf.CHECK_STRUCTURE_MEMBER('STRUCT_UTMP', 'ut_exit.e_exit', headers='utmpx.h utmp.h', + define='HAVE_UT_UT_EXIT') +- conf.CHECK_STRUCTURE_MEMBER('struct utmpx', 'ut_syslen', headers='utmpx.h', +- define='HAVE_UX_UT_SYSLEN') +- conf.CHECK_STRUCTURE_MEMBER('struct utmpx', 'ut_host', headers='utmpx.h', +- define='HAVE_UX_UT_HOST') ++ conf.CHECK_STRUCTURE_MEMBER('STRUCT_UTMP', 'ut_syslen', headers='utmpx.h utmp.h', ++ define='HAVE_UT_UT_SYSLEN') + conf.CHECK_CODE('struct utmp utarg; struct utmp *utreturn; utreturn = pututline(&utarg);', + 'PUTUTLINE_RETURNS_UTMP', headers='utmp.h', + msg="Checking whether pututline returns pointer") +- conf.CHECK_SIZEOF(['((struct utmp *)NULL)->ut_line'], headers='utmp.h', ++ conf.CHECK_SIZEOF(['((STRUCT_UTMP *)NULL)->ut_line'], headers='utmpx.h utmp.h', + define='SIZEOF_UTMP_UT_LINE', critical=False) + if not conf.CONFIG_SET('SIZEOF_UTMP_UT_LINE'): + conf.env.with_utmp = False +@@ -836,6 +842,17 @@ msg.msg_accrightslen = sizeof(fd); + conf.SET_TARGET_TYPE('avahi-common', 'EMPTY') + conf.SET_TARGET_TYPE('avahi-client', 'EMPTY') + ++ if Options.options.with_dnssd: ++ conf.env.with_dnssd = True ++ if not conf.CHECK_HEADERS('dns_sd.h'): ++ conf.env.with_dnssd = False ++ if not conf.CHECK_FUNCS_IN('DNSServiceRegister', 'dns_sd'): ++ conf.env.with_dnssd = False ++ if conf.env.with_dnssd: ++ conf.DEFINE('WITH_DNSSD_SUPPORT', 1) ++ else: ++ conf.SET_TARGET_TYPE('dns_sd', 'EMPTY') ++ + if Options.options.with_iconv: + conf.env.with_iconv = True + if not conf.CHECK_FUNCS_IN('iconv_open', 'iconv', headers='iconv.h'): +@@ -1730,9 +1747,6 @@ main() { + if conf.CONFIG_SET('HAVE_VXFS'): + default_shared_modules.extend(TO_LIST('vfs_vxfs')) + +- if conf.CONFIG_SET('HAVE_DBUS'): +- default_shared_modules.extend(TO_LIST('vfs_snapper')) +- + explicit_shared_modules = TO_LIST(Options.options.shared_modules, delimiter=',') + explicit_static_modules = TO_LIST(Options.options.static_modules, delimiter=',') + Property changes on: head/net/samba410/files/patch-source3_wscript ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/samba410/files/patch-source3_wscript__build =================================================================== --- head/net/samba410/files/patch-source3_wscript__build (nonexistent) +++ head/net/samba410/files/patch-source3_wscript__build (revision 505446) @@ -0,0 +1,50 @@ +--- source3/wscript_build.orig 2019-05-07 08:38:21 UTC ++++ source3/wscript_build +@@ -236,11 +236,9 @@ bld.SAMBA3_SUBSYSTEM('SMBREGISTRY', + talloc + replace + util_reg +- samba-util +- samba-security + errors3 + dbwrap +- samba3-util ++ samba3util + ''') + + # Do not link against this use 'smbconf' +@@ -514,7 +512,7 @@ bld.SAMBA3_LIBRARY('secrets3', + + bld.SAMBA3_LIBRARY('smbldap', + source='lib/smbldap.c', +- deps='ldap lber samba-util smbconf', ++ deps='ldap lber samba3util smbd_shim samba-debug smbconf', + enabled=bld.CONFIG_SET("HAVE_LDAP"), + private_library=False, + abi_directory='lib/ABI', +@@ -739,6 +737,7 @@ bld.SAMBA3_LIBRARY('smbd_base', + smbd_conn + param_service + AVAHI ++ dns_sd + PRINTBASE + PROFILE + LOCKING +@@ -1116,6 +1115,7 @@ bld.SAMBA3_BINARY('client/smbclient', + msrpc3 + RPC_NDR_SRVSVC + cli_smb_common ++ dns_sd + archive + ''') + +@@ -1284,8 +1284,7 @@ bld.SAMBA3_BINARY('vfstest', + popt_samba3 + smbconf + SMBREADLINE +- ''', +- install=False) ++ ''') + + bld.SAMBA3_BINARY('versiontest', + source='lib/version_test.c', Property changes on: head/net/samba410/files/patch-source3_wscript__build ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/samba410/files/patch-source4_heimdal__build_wscript__configure =================================================================== --- head/net/samba410/files/patch-source4_heimdal__build_wscript__configure (nonexistent) +++ head/net/samba410/files/patch-source4_heimdal__build_wscript__configure (revision 505446) @@ -0,0 +1,20 @@ +--- source4/heimdal_build/wscript_configure.orig 2019-01-15 10:07:00 UTC ++++ source4/heimdal_build/wscript_configure +@@ -171,7 +171,7 @@ if not krb5_config: + krb5_config = conf.find_program("krb5-config", var="HEIMDAL_KRB5_CONFIG") + if krb5_config: + # Not ideal, but seems like the best way to get at these paths: +- f = open(krb5_config[0], 'r') ++ f = open(krb5_config[0], 'r', errors='ignore') + try: + for l in f: + if l.startswith("libdir="): +@@ -181,6 +181,8 @@ if krb5_config: + heimdal_includedirs.append(include_path) + conf.define('HEIMDAL_KRB5_TYPES_PATH', + include_path + "/krb5-types.h") ++ except: ++ pass + finally: + f.close() + Property changes on: head/net/samba410/files/patch-source4_heimdal__build_wscript__configure ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/samba410/files/patch-source4_heimdal_lib_roken_rand.c =================================================================== --- head/net/samba410/files/patch-source4_heimdal_lib_roken_rand.c (nonexistent) +++ head/net/samba410/files/patch-source4_heimdal_lib_roken_rand.c (revision 505446) @@ -0,0 +1,10 @@ +--- source4/heimdal/lib/roken/rand.c.orig 2019-01-15 10:07:00 UTC ++++ source4/heimdal/lib/roken/rand.c +@@ -37,7 +37,6 @@ void ROKEN_LIB_FUNCTION + rk_random_init(void) + { + #if defined(HAVE_ARC4RANDOM) +- arc4random_stir(); + #elif defined(HAVE_SRANDOMDEV) + srandomdev(); + #elif defined(HAVE_RANDOM) Property changes on: head/net/samba410/files/patch-source4_heimdal_lib_roken_rand.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/samba410/files/patch-source4_kdc_kdc-service-mit.c =================================================================== --- head/net/samba410/files/patch-source4_kdc_kdc-service-mit.c (nonexistent) +++ head/net/samba410/files/patch-source4_kdc_kdc-service-mit.c (revision 505446) @@ -0,0 +1,17 @@ +--- source4/kdc/kdc-service-mit.c.orig 2019-01-15 10:07:00 UTC ++++ source4/kdc/kdc-service-mit.c +@@ -36,9 +36,13 @@ + #include "kdc/samba_kdc.h" + #include "kdc/kdc-server.h" + #include "kdc/kpasswd-service.h" +-#include + #include + ++#pragma clang diagnostic push ++#pragma clang diagnostic ignored "-Wstrict-prototypes" ++#include ++#pragma clang diagnostic pop ++ + #include "source4/kdc/mit_kdc_irpc.h" + + /* PROTOTYPES */ Property changes on: head/net/samba410/files/patch-source4_kdc_kdc-service-mit.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/samba410/files/patch-source4_lib_http_http.c =================================================================== --- head/net/samba410/files/patch-source4_lib_http_http.c (nonexistent) +++ head/net/samba410/files/patch-source4_lib_http_http.c (revision 505446) @@ -0,0 +1,69 @@ +--- source4/lib/http/http.c.orig 2019-01-15 10:07:00 UTC ++++ source4/lib/http/http.c +@@ -134,7 +134,19 @@ static enum http_read_status http_parse_ + return HTTP_ALL_DATA_READ; + } + ++#ifdef FREEBSD ++ int s0, s1, s2, s3; s0 = s1 = s2 = s3 = 0; ++ n = sscanf(line, "%n%*[^:]%n: %n%*[^\r\n]%n\r\n", &s0, &s1, &s2, &s3); ++ ++ if(n >= 0) { ++ key = calloc(sizeof(char), s1-s0+1); ++ value = calloc(sizeof(char), s3-s2+1); ++ ++ n = sscanf(line, "%[^:]: %[^\r\n]\r\n", key, value); ++ } ++#else + n = sscanf(line, "%m[^:]: %m[^\r\n]\r\n", &key, &value); ++#endif + if (n != 2) { + DEBUG(0, ("%s: Error parsing header '%s'\n", __func__, line)); + status = HTTP_DATA_CORRUPTED; +@@ -160,7 +172,7 @@ error: + static bool http_parse_response_line(struct http_read_response_state *state) + { + bool status = true; +- char *protocol; ++ char *protocol = NULL; + char *msg = NULL; + char major; + char minor; +@@ -180,12 +192,22 @@ static bool http_parse_response_line(str + return false; + } + ++#ifdef FREEBSD ++ int s0, s1, s2, s3; s0 = s1 = s2 = s3 = 0; ++ n = sscanf(line, "%n%*[^/]%n/%c.%c %d %n%*[^\r\n]%n\r\n", ++ &s0, &s1, &major, &minor, &code, &s2, &s3); ++ ++ if(n == 3) { ++ protocol = calloc(sizeof(char), s1-s0+1); ++ msg = calloc(sizeof(char), s3-s2+1); ++ ++ n = sscanf(line, "%[^/]/%c.%c %d %[^\r\n]\r\n", ++ protocol, &major, &minor, &code, msg); ++ } ++#else + n = sscanf(line, "%m[^/]/%c.%c %d %m[^\r\n]\r\n", + &protocol, &major, &minor, &code, &msg); +- +- DEBUG(11, ("%s: Header parsed(%i): protocol->%s, major->%c, minor->%c, " +- "code->%d, message->%s\n", __func__, n, protocol, major, minor, +- code, msg)); ++#endif + + if (n != 5) { + DEBUG(0, ("%s: Error parsing header\n", __func__)); +@@ -193,6 +215,10 @@ static bool http_parse_response_line(str + goto error; + } + ++ DEBUG(11, ("%s: Header parsed(%i): protocol->%s, major->%c, minor->%c, " ++ "code->%d, message->%s\n", __func__, n, protocol, major, minor, ++ code, msg)); ++ + if (major != '1') { + DEBUG(0, ("%s: Bad HTTP major number '%c'\n", __func__, major)); + status = false; Property changes on: head/net/samba410/files/patch-source4_lib_http_http.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/samba410/files/patch-vfs_freebsd =================================================================== --- head/net/samba410/files/patch-vfs_freebsd (nonexistent) +++ head/net/samba410/files/patch-vfs_freebsd (revision 505446) @@ -0,0 +1,1010 @@ +--- docs-xml/wscript_build.orig 2019-06-25 00:52:38 UTC ++++ docs-xml/wscript_build +@@ -79,6 +79,7 @@ vfs_module_manpages = ['vfs_acl_tdb', + 'vfs_extd_audit', + 'vfs_fake_perms', + 'vfs_fileid', ++ 'vfs_freebsd', + 'vfs_fruit', + 'vfs_full_audit', + 'vfs_glusterfs', +--- source3/modules/wscript_build.orig 2019-05-07 08:38:21 UTC ++++ source3/modules/wscript_build +@@ -243,6 +243,14 @@ bld.SAMBA3_MODULE('vfs_zfsacl', + internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_zfsacl'), + enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_zfsacl')) + ++bld.SAMBA3_MODULE('vfs_freebsd', ++ subsystem='vfs', ++ source='vfs_freebsd.c', ++ deps='samba-util', ++ init_function='', ++ internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_freebsd'), ++ enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_freebsd')) ++ + xdr_buf_hack = 'sed -e "s@^\([ \t]*register int32_t \*buf\);@\\1 = buf;@"' + + bld.SAMBA_GENERATOR('nfs41acl-xdr-c', +--- source3/modules/vfs_freebsd.c.orig 2019-06-22 11:56:57 UTC ++++ source3/modules/vfs_freebsd.c +@@ -0,0 +1,808 @@ ++/* ++ * This module implements VFS calls specific to FreeBSD ++ * ++ * Copyright (C) Timur I. Bakeyev, 2018 ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 3 of the License, or ++ * (at your option) any later version. ++ * ++ * This program 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 General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, see . ++ */ ++ ++#include "includes.h" ++ ++#include "lib/util/tevent_unix.h" ++#include "lib/util/tevent_ntstatus.h" ++#include "system/filesys.h" ++ ++#include ++ ++static int vfs_freebsd_debug_level = DBGC_VFS; ++ ++#undef DBGC_CLASS ++#define DBGC_CLASS vfs_freebsd_debug_level ++ ++#ifndef EXTATTR_MAXNAMELEN ++#define EXTATTR_MAXNAMELEN UINT8_MAX ++#endif ++ ++#define EXTATTR_NAMESPACE(NS) EXTATTR_NAMESPACE_ ## NS, \ ++ EXTATTR_NAMESPACE_ ## NS ## _STRING ".", \ ++ .data.len = (sizeof(EXTATTR_NAMESPACE_ ## NS ## _STRING ".") - 1) ++ ++#define EXTATTR_EMPTY 0x00 ++#define EXTATTR_USER 0x01 ++#define EXTATTR_SYSTEM 0x02 ++#define EXTATTR_SECURITY 0x03 ++#define EXTATTR_TRUSTED 0x04 ++ ++enum extattr_mode { ++ FREEBSD_EXTATTR_SECURE, ++ FREEBSD_EXTATTR_COMPAT, ++ FREEBSD_EXTATTR_LEGACY ++}; ++ ++typedef struct { ++ int namespace; ++ char name[EXTATTR_MAXNAMELEN+1]; ++ union { ++ uint16_t len; ++ uint16_t flags; ++ } data; ++} extattr_attr; ++ ++typedef struct { ++ enum { ++ EXTATTR_FILE, EXTATTR_LINK, EXTATTR_FDES ++ } method; ++ union { ++ const char *path; ++ int filedes; ++ } param; ++} extattr_arg; ++ ++static const struct enum_list extattr_mode_param[] = { ++ { FREEBSD_EXTATTR_SECURE, "secure" }, /* */ ++ { FREEBSD_EXTATTR_COMPAT, "compat" }, /* */ ++ { FREEBSD_EXTATTR_LEGACY, "legacy" }, /* */ ++ { -1, NULL } ++}; ++ ++ ++/* */ ++struct freebsd_handle_data { ++ enum extattr_mode extattr_mode; ++}; ++ ++ ++/* XXX: This order doesn't match namespace ids order! */ ++static extattr_attr extattr[] = { ++ { EXTATTR_NAMESPACE(EMPTY) }, ++ { EXTATTR_NAMESPACE(SYSTEM) }, ++ { EXTATTR_NAMESPACE(USER) }, ++}; ++ ++ ++static bool freebsd_in_jail(void) { ++ int val = 0; ++ size_t val_len = sizeof(val); ++ ++ if((sysctlbyname("security.jail.jailed", &val, &val_len, NULL, 0) != -1) && val == 1) { ++ return true; ++ } ++ return false; ++} ++ ++static uint16_t freebsd_map_attrname(const char *name) ++{ ++ if(name == NULL || name[0] == '\0') { ++ return EXTATTR_EMPTY; ++ } ++ ++ switch(name[0]) { ++ case 'u': ++ if(strncmp(name, "user.", 5) == 0) ++ return EXTATTR_USER; ++ break; ++ case 't': ++ if(strncmp(name, "trusted.", 8) == 0) ++ return EXTATTR_TRUSTED; ++ break; ++ case 's': ++ /* name[1] could be any character, including '\0' */ ++ switch(name[1]) { ++ case 'e': ++ if(strncmp(name, "security.", 9) == 0) ++ return EXTATTR_SECURITY; ++ break; ++ case 'y': ++ if(strncmp(name, "system.", 7) == 0) ++ return EXTATTR_SYSTEM; ++ break; ++ } ++ break; ++ } ++ return EXTATTR_USER; ++} ++ ++/* security, system, trusted or user */ ++static extattr_attr* freebsd_map_xattr(enum extattr_mode extattr_mode, const char *name, extattr_attr *attr) ++{ ++ int attrnamespace = EXTATTR_NAMESPACE_EMPTY; ++ const char *p, *attrname = name; ++ ++ if(name == NULL || name[0] == '\0') { ++ return NULL; ++ } ++ ++ if(attr == NULL) { ++ return NULL; ++ } ++ ++ uint16_t flags = freebsd_map_attrname(name); ++ ++ switch(flags) { ++ case EXTATTR_SECURITY: ++ case EXTATTR_TRUSTED: ++ case EXTATTR_SYSTEM: ++ attrnamespace = (extattr_mode == FREEBSD_EXTATTR_SECURE) ? ++ EXTATTR_NAMESPACE_SYSTEM : ++ EXTATTR_NAMESPACE_USER; ++ break; ++ case EXTATTR_USER: ++ attrnamespace = EXTATTR_NAMESPACE_USER; ++ break; ++ default: ++ /* Default to "user" namespace if nothing else was specified */ ++ attrnamespace = EXTATTR_NAMESPACE_USER; ++ flags = EXTATTR_USER; ++ break; ++ } ++ ++ if (extattr_mode == FREEBSD_EXTATTR_LEGACY) { ++ switch(flags) { ++ case EXTATTR_SECURITY: ++ attrname = name + 9; ++ break; ++ case EXTATTR_TRUSTED: ++ attrname = name + 8; ++ break; ++ case EXTATTR_SYSTEM: ++ attrname = name + 7; ++ break; ++ case EXTATTR_USER: ++ attrname = name + 5; ++ break; ++ default: ++ attrname = ((p=strchr(name, '.')) != NULL) ? p + 1 : name; ++ break; ++ } ++ } ++ ++ attr->namespace = attrnamespace; ++ attr->data.flags = flags; ++ strlcpy(attr->name, attrname, EXTATTR_MAXNAMELEN + 1); ++ ++ return attr; ++} ++ ++static ssize_t extattr_size(extattr_arg arg, extattr_attr *attr) ++{ ++ ssize_t result; ++ ++ switch(arg.method) { ++#if defined(HAVE_EXTATTR_GET_FILE) ++ case EXTATTR_FILE: ++ result = extattr_get_file(arg.param.path, attr->namespace, attr->name, NULL, 0); ++ break; ++#endif ++#if defined(HAVE_EXTATTR_GET_LINK) ++ case EXTATTR_LINK: ++ result = extattr_get_link(arg.param.path, attr->namespace, attr->name, NULL, 0); ++ break; ++#endif ++#if defined(HAVE_EXTATTR_GET_FD) ++ case EXTATTR_FDES: ++ result = extattr_get_fd(arg.param.filedes, attr->namespace, attr->name, NULL, 0); ++ break; ++#endif ++ default: ++ errno = ENOSYS; ++ return -1; ++ } ++ ++ if(result < 0) { ++ errno = EINVAL; ++ return -1; ++ } ++ ++ return result; ++} ++ ++ ++/* ++ * The list of names is returned as an unordered array of NULL-terminated ++ * character strings (attribute names are separated by NULL characters), ++ * like this: ++ * user.name1\0system.name1\0user.name2\0 ++ * ++ * Filesystems like ext2, ext3 and XFS which implement POSIX ACLs using ++ * extended attributes, might return a list like this: ++ * system.posix_acl_access\0system.posix_acl_default\0 ++ */ ++/* ++ * The extattr_list_file() returns a list of attributes present in the ++ * requested namespace. Each list entry consists of a single byte containing ++ * the length of the attribute name, followed by the attribute name. The ++ * attribute name is not terminated by ASCII 0 (nul). ++*/ ++ ++static ssize_t freebsd_extattr_list(extattr_arg arg, enum extattr_mode extattr_mode, char *list, size_t size) ++{ ++ ssize_t list_size, total_size = 0; ++ char *p, *q, *list_end; ++ int len; ++ /* ++ Ignore all but user namespace when we are not root or in jail ++ See: https://bugzilla.samba.org/show_bug.cgi?id=10247 ++ */ ++ bool as_root = (geteuid() == 0); ++ ++ int ns = (extattr_mode == FREEBSD_EXTATTR_SECURE && as_root) ? 1 : 2; ++ ++ /* Iterate through extattr(2) namespaces */ ++ for(; ns < ARRAY_SIZE(extattr); ns++) { ++ switch(arg.method) { ++#if defined(HAVE_EXTATTR_LIST_FILE) ++ case EXTATTR_FILE: ++ list_size = extattr_list_file(arg.param.path, extattr[ns].namespace, list, size); ++ break; ++#endif ++#if defined(HAVE_EXTATTR_LIST_LINK) ++ case EXTATTR_LINK: ++ list_size = extattr_list_link(arg.param.path, extattr[ns].namespace, list, size); ++ break; ++#endif ++#if defined(HAVE_EXTATTR_LIST_FD) ++ case EXTATTR_FDES: ++ list_size = extattr_list_fd(arg.param.filedes, extattr[ns].namespace, list, size); ++ break; ++#endif ++ default: ++ errno = ENOSYS; ++ return -1; ++ } ++ /* Some error happend. Errno should be set by the previous call */ ++ if(list_size < 0) ++ return -1; ++ /* No attributes in this namespace */ ++ if(list_size == 0) ++ continue; ++ /* ++ Call with an empty buffer may be used to calculate ++ necessary buffer size. ++ */ ++ if(list == NULL) { ++ /* ++ XXX: Unfortunately, we can't say, how many attributes were ++ returned, so here is the potential problem with the emulation. ++ */ ++ if(extattr_mode == FREEBSD_EXTATTR_LEGACY) { ++ /* ++ Take the worse case of one char attribute names - ++ two bytes per name plus one more for sanity. ++ */ ++ total_size += list_size + (list_size/2 + 1)*extattr[ns].data.len; ++ } ++ else { ++ total_size += list_size; ++ } ++ continue; ++ } ++ ++ if(extattr_mode == FREEBSD_EXTATTR_LEGACY) { ++ /* Count necessary offset to fit namespace prefixes */ ++ int extra_len = 0; ++ uint16_t flags; ++ list_end = list + list_size; ++ for(list_size = 0, p = q = list; p < list_end; p += len) { ++ len = p[0] + 1; ++ (void)strlcpy(q, p + 1, len); ++ flags = freebsd_map_attrname(q); ++ /* Skip secure attributes for non-root user */ ++ if(extattr_mode != FREEBSD_EXTATTR_SECURE && !as_root && flags > EXTATTR_USER) { ++ continue; ++ } ++ if(flags <= EXTATTR_USER) { ++ /* Don't count trailing '\0' */ ++ extra_len += extattr[ns].data.len; ++ } ++ list_size += len; ++ q += len; ++ } ++ total_size += list_size + extra_len; ++ /* Buffer is too small to fit the results */ ++ if(total_size > size) { ++ errno = ERANGE; ++ return -1; ++ } ++ /* Shift results backwards, so we can prepend prefixes */ ++ list_end = list + extra_len; ++ p = (char*)memmove(list_end, list, list_size); ++ /* ++ We enter the loop with `p` pointing to the shifted list and ++ `extra_len` having the total margin between `list` and `p` ++ */ ++ for(list_end += list_size; p < list_end; p += len) { ++ len = strlen(p) + 1; ++ flags = freebsd_map_attrname(p); ++ if(flags <= EXTATTR_USER) { ++ /* Add namespace prefix */ ++ (void)strncpy(list, extattr[ns].name, extattr[ns].data.len); ++ list += extattr[ns].data.len; ++ } ++ /* Append attribute name */ ++ (void)strlcpy(list, p, len); ++ list += len; ++ } ++ } ++ else { ++ /* Convert UCSD strings into nul-terminated strings */ ++ for(list_end = list + list_size; list < list_end; list += len) { ++ len = list[0] + 1; ++ (void)strlcpy(list, list + 1, len); ++ } ++ total_size += list_size; ++ } ++ } ++ return total_size; ++} ++ ++/* ++static ssize_t freebsd_getxattr_size(vfs_handle_struct *handle, ++ const struct smb_filename *smb_fname, ++ const char *name) ++{ ++ struct freebsd_handle_data *data; ++ extattr_arg arg = { EXTATTR_FILE, smb_fname->base_name }; ++ extattr_attr attr; ++ ++ ++ SMB_VFS_HANDLE_GET_DATA(handle, data, ++ struct freebsd_handle_data, ++ return -1); ++ ++ if(!freebsd_map_xattr(data->extattr_mode, name, &attr)) { ++ errno = EINVAL; ++ return -1; ++ } ++ ++ if(data->extattr_mode != FREEBSD_EXTATTR_SECURE && geteuid() != 0 && attr.data.flags > EXTATTR_USER) { ++ errno = ENOATTR; ++ return -1; ++ } ++ ++ return extattr_size(arg, &attr); ++} ++*/ ++ ++/* VFS entries */ ++static ssize_t freebsd_getxattr(vfs_handle_struct *handle, ++ const struct smb_filename *smb_fname, ++ const char *name, ++ void *value, ++ size_t size) ++{ ++#if defined(HAVE_EXTATTR_GET_FILE) ++ struct freebsd_handle_data *data; ++ extattr_arg arg = { EXTATTR_FILE, .param.path = smb_fname->base_name }; ++ extattr_attr attr; ++ ssize_t res; ++ ++ SMB_VFS_HANDLE_GET_DATA(handle, data, ++ struct freebsd_handle_data, ++ return -1); ++ ++ if(!freebsd_map_xattr(data->extattr_mode, name, &attr)) { ++ errno = EINVAL; ++ return -1; ++ } ++ ++ /* Filter out 'secure' entries */ ++ if(data->extattr_mode != FREEBSD_EXTATTR_SECURE && geteuid() != 0 && attr.data.flags > EXTATTR_USER) { ++ errno = ENOATTR; ++ return -1; ++ } ++ ++ /* ++ * The BSD implementation has a nasty habit of silently truncating ++ * the returned value to the size of the buffer, so we have to check ++ * that the buffer is large enough to fit the returned value. ++ */ ++ if((res=extattr_size(arg, &attr)) < 0) { ++ return -1; ++ } ++ ++ if (size == 0) { ++ return res; ++ } ++ else if (res > size) { ++ errno = ERANGE; ++ return -1; ++ } ++ ++ if((res=extattr_get_file(smb_fname->base_name, attr.namespace, attr.name, value, size)) >= 0) { ++ return res; ++ } ++ return -1; ++#else ++ errno = ENOSYS; ++ return -1; ++#endif ++} ++ ++ ++static ssize_t freebsd_fgetxattr(vfs_handle_struct *handle, ++ struct files_struct *fsp, const char *name, ++ void *value, size_t size) ++{ ++#if defined(HAVE_EXTATTR_GET_FD) ++ struct freebsd_handle_data *data; ++ extattr_arg arg = { EXTATTR_FDES, .param.filedes = fsp->fh->fd }; ++ extattr_attr attr; ++ ssize_t res; ++ ++ SMB_VFS_HANDLE_GET_DATA(handle, data, ++ struct freebsd_handle_data, ++ return -1); ++ ++ if(!freebsd_map_xattr(data->extattr_mode, name, &attr)) { ++ errno = EINVAL; ++ return -1; ++ } ++ ++ /* Filter out 'secure' entries */ ++ if(data->extattr_mode != FREEBSD_EXTATTR_SECURE && geteuid() != 0 && attr.data.flags > EXTATTR_USER) { ++ errno = ENOATTR; ++ return -1; ++ } ++ ++ /* ++ * The BSD implementation has a nasty habit of silently truncating ++ * the returned value to the size of the buffer, so we have to check ++ * that the buffer is large enough to fit the returned value. ++ */ ++ if((res=extattr_size(arg, &attr)) < 0) { ++ return -1; ++ } ++ ++ if (size == 0) { ++ return res; ++ } ++ else if (res > size) { ++ errno = ERANGE; ++ return -1; ++ } ++ ++ if((res=extattr_get_fd(fsp->fh->fd, attr.namespace, attr.name, value, size)) >= 0) { ++ return res; ++ } ++ return -1; ++#else ++ errno = ENOSYS; ++ return -1; ++#endif ++} ++ ++ ++static ssize_t freebsd_listxattr(vfs_handle_struct *handle, ++ const struct smb_filename *smb_fname, ++ char *list, ++ size_t size) ++{ ++#if defined(HAVE_EXTATTR_LIST_FILE) ++ struct freebsd_handle_data *data; ++ ++ SMB_VFS_HANDLE_GET_DATA(handle, data, ++ struct freebsd_handle_data, ++ return -1); ++ ++ extattr_arg arg = { EXTATTR_FILE, .param.path = smb_fname->base_name }; ++ ++ return freebsd_extattr_list(arg, data->extattr_mode, list, size); ++#else ++ errno = ENOSYS; ++ return -1; ++#endif ++} ++ ++ ++static ssize_t freebsd_flistxattr(vfs_handle_struct *handle, ++ struct files_struct *fsp, char *list, ++ size_t size) ++{ ++#if defined(HAVE_EXTATTR_LIST_FD) ++ struct freebsd_handle_data *data; ++ extattr_arg arg = { EXTATTR_FDES, .param.filedes = fsp->fh->fd }; ++ ++ SMB_VFS_HANDLE_GET_DATA(handle, data, ++ struct freebsd_handle_data, ++ return -1); ++ ++ return freebsd_extattr_list(arg, data->extattr_mode, list, size); ++#else ++ errno = ENOSYS; ++ return -1; ++#endif ++} ++ ++static int freebsd_removexattr(vfs_handle_struct *handle, ++ const struct smb_filename *smb_fname, ++ const char *name) ++{ ++#if defined(HAVE_EXTATTR_DELETE_FILE) ++ struct freebsd_handle_data *data; ++ extattr_attr attr; ++ ++ SMB_VFS_HANDLE_GET_DATA(handle, data, ++ struct freebsd_handle_data, ++ return -1); ++ ++ ++ /* Filter out 'secure' entries */ ++ if(data->extattr_mode != FREEBSD_EXTATTR_SECURE && geteuid() != 0 && attr.data.flags > EXTATTR_USER) { ++ errno = ENOATTR; ++ return -1; ++ } ++ ++ return extattr_delete_file(smb_fname->base_name, attr.namespace, attr.name); ++#else ++ errno = ENOSYS; ++ return -1; ++#endif ++} ++ ++ ++static int freebsd_fremovexattr(vfs_handle_struct *handle, ++ struct files_struct *fsp, const char *name) ++{ ++#if defined(HAVE_EXTATTR_DELETE_FD) ++ struct freebsd_handle_data *data; ++ extattr_attr attr; ++ ++ SMB_VFS_HANDLE_GET_DATA(handle, data, ++ struct freebsd_handle_data, ++ return -1); ++ ++ if(!freebsd_map_xattr(data->extattr_mode, name, &attr)) { ++ errno = EINVAL; ++ return -1; ++ } ++ ++ /* Filter out 'secure' entries */ ++ if(data->extattr_mode != FREEBSD_EXTATTR_SECURE && geteuid() != 0 && attr.data.flags > EXTATTR_USER) { ++ errno = ENOATTR; ++ return -1; ++ } ++ ++ return extattr_delete_fd(fsp->fh->fd, attr.namespace, attr.name); ++#else ++ errno = ENOSYS; ++ return -1; ++#endif ++} ++ ++ ++static int freebsd_setxattr(vfs_handle_struct *handle, ++ const struct smb_filename *smb_fname, ++ const char *name, ++ const void *value, ++ size_t size, ++ int flags) ++{ ++#if defined(HAVE_EXTATTR_SET_FILE) ++ struct freebsd_handle_data *data; ++ extattr_attr attr; ++ ssize_t res; ++ ++ SMB_VFS_HANDLE_GET_DATA(handle, data, ++ struct freebsd_handle_data, ++ return -1); ++ ++ if(!freebsd_map_xattr(data->extattr_mode, name, &attr)) { ++ errno = EINVAL; ++ return -1; ++ } ++ ++ /* Filter out 'secure' entries */ ++ if(data->extattr_mode != FREEBSD_EXTATTR_SECURE && geteuid() != 0 && attr.data.flags > EXTATTR_USER) { ++ errno = ENOATTR; ++ return -1; ++ } ++ ++ if (flags) { ++ extattr_arg arg = { EXTATTR_FILE, .param.path = smb_fname->base_name }; ++ /* Check attribute existence */ ++ res = extattr_size(arg, &attr); ++ if (res < 0) { ++ /* REPLACE attribute, that doesn't exist */ ++ if ((flags & XATTR_REPLACE) && errno == ENOATTR) { ++ errno = ENOATTR; ++ return -1; ++ } ++ /* Ignore other errors */ ++ } ++ else { ++ /* CREATE attribute, that already exists */ ++ if (flags & XATTR_CREATE) { ++ errno = EEXIST; ++ return -1; ++ } ++ } ++ } ++ res = extattr_set_file(smb_fname->base_name, attr.namespace, attr.name, value, size); ++ ++ return (res >= 0) ? 0 : -1; ++#else ++ errno = ENOSYS; ++ return -1; ++#endif ++} ++ ++ ++static int freebsd_fsetxattr(vfs_handle_struct *handle, struct files_struct *fsp, ++ const char *name, const void *value, size_t size, ++ int flags) ++{ ++#if defined(HAVE_EXTATTR_SET_FD) ++ struct freebsd_handle_data *data; ++ extattr_attr attr; ++ ssize_t res; ++ ++ SMB_VFS_HANDLE_GET_DATA(handle, data, ++ struct freebsd_handle_data, ++ return -1); ++ ++ if(!freebsd_map_xattr(data->extattr_mode, name, &attr)) { ++ errno = EINVAL; ++ return -1; ++ } ++ ++ /* Filter out 'secure' entries */ ++ if(data->extattr_mode != FREEBSD_EXTATTR_SECURE && geteuid() != 0 && attr.data.flags > EXTATTR_USER) { ++ errno = ENOATTR; ++ return -1; ++ } ++ ++ if (flags) { ++ extattr_arg arg = { EXTATTR_FDES, .param.filedes = fsp->fh->fd }; ++ /* Check attribute existence */ ++ res = extattr_size(arg, &attr); ++ if (res < 0) { ++ /* REPLACE attribute, that doesn't exist */ ++ if ((flags & XATTR_REPLACE) && errno == ENOATTR) { ++ errno = ENOATTR; ++ return -1; ++ } ++ /* Ignore other errors */ ++ } ++ else { ++ /* CREATE attribute, that already exists */ ++ if (flags & XATTR_CREATE) { ++ errno = EEXIST; ++ return -1; ++ } ++ } ++ } ++ ++ res = extattr_set_fd(fsp->fh->fd, attr.namespace, attr.name, value, size); ++ ++ return (res >= 0) ? 0 : -1; ++#else ++ errno = ENOSYS; ++ return -1; ++#endif ++} ++ ++static int freebsd_connect(vfs_handle_struct *handle, const char *service, ++ const char *user) ++{ ++ struct freebsd_handle_data *data; ++ int enumval, saved_errno; ++ ++ int ret = SMB_VFS_NEXT_CONNECT(handle, service, user); ++ ++ if (ret < 0) { ++ return ret; ++ } ++ ++ data = talloc_zero(handle->conn, struct freebsd_handle_data); ++ if (!data) { ++ saved_errno = errno; ++ SMB_VFS_NEXT_DISCONNECT(handle); ++ DEBUG(0, ("talloc_zero() failed\n")); ++ errno = saved_errno; ++ return -1; ++ } ++ ++ enumval = lp_parm_enum(SNUM(handle->conn), "freebsd", ++ "extattr mode", extattr_mode_param, FREEBSD_EXTATTR_LEGACY); ++ if (enumval == -1) { ++ saved_errno = errno; ++ SMB_VFS_NEXT_DISCONNECT(handle); ++ DBG_DEBUG("value for freebsd: 'extattr mode' is unknown\n"); ++ errno = saved_errno; ++ return -1; ++ } ++ ++ if(freebsd_in_jail()) { ++ enumval = FREEBSD_EXTATTR_COMPAT; ++ DBG_WARNING("running in jail, enforcing 'compat' mode\n"); ++ } ++ ++ data->extattr_mode = (enum extattr_mode)enumval; ++ ++ SMB_VFS_HANDLE_SET_DATA(handle, data, NULL, ++ struct freebsd_handle_data, ++ return -1); ++ ++ DBG_DEBUG("connect to service[%s] with '%s' extattr mode\n", ++ service, extattr_mode_param[data->extattr_mode].name); ++ ++ return 0; ++} ++ ++static void freebsd_disconnect(vfs_handle_struct *handle) ++{ ++ SMB_VFS_NEXT_DISCONNECT(handle); ++} ++ ++/* VFS operations structure */ ++ ++struct vfs_fn_pointers freebsd_fns = { ++ /* Disk operations */ ++ ++ .connect_fn = freebsd_connect, ++ .disconnect_fn = freebsd_disconnect, ++ ++ /* EA operations. */ ++ .getxattr_fn = freebsd_getxattr, ++ .fgetxattr_fn = freebsd_fgetxattr, ++ .listxattr_fn = freebsd_listxattr, ++ .flistxattr_fn = freebsd_flistxattr, ++ .removexattr_fn = freebsd_removexattr, ++ .fremovexattr_fn = freebsd_fremovexattr, ++ .setxattr_fn = freebsd_setxattr, ++ .fsetxattr_fn = freebsd_fsetxattr, ++}; ++ ++static_decl_vfs; ++NTSTATUS vfs_freebsd_init(TALLOC_CTX *ctx) ++{ ++ NTSTATUS ret; ++ ++ ret = smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "freebsd", ++ &freebsd_fns); ++ ++ if (!NT_STATUS_IS_OK(ret)) { ++ return ret; ++ } ++ ++ vfs_freebsd_debug_level = debug_add_class("freebsd"); ++ if (vfs_freebsd_debug_level == -1) { ++ vfs_freebsd_debug_level = DBGC_VFS; ++ DEBUG(0, ("vfs_freebsd: Couldn't register custom debugging class!\n")); ++ } else { ++ DEBUG(10, ("vfs_freebsd: Debug class number of 'fileid': %d\n", vfs_freebsd_debug_level)); ++ } ++ ++ return ret; ++} +--- docs-xml/manpages/vfs_freebsd.8.xml.orig 2019-06-25 00:51:54 UTC ++++ docs-xml/manpages/vfs_freebsd.8.xml +@@ -0,0 +1,169 @@ ++ ++ ++ ++ ++ ++ vfs_freebsd ++ 8 ++ Samba ++ System Administration tools ++ &doc.version; ++ ++ ++ ++ vfs_freebsd ++ FreeBSD-specific VFS functions ++ ++ ++ ++ ++ vfs objects = freebsd ++ ++ ++ ++ ++ DESCRIPTION ++ ++ This VFS module is part of the samba ++ 7 suite. ++ ++ The vfs_freebsd module implements some of the FreeBSD-specific VFS functions. ++ ++ This module is stackable. ++ ++ ++ ++ ++ OPTIONS ++ ++ ++ ++ ++ freebsd:extattr mode=[legacy|compat|secure] ++ ++ This parameter defines how the emulation of the Linux attr(5) extended attributes ++ is performed through the FreeBSD native extattr(9) system calls. ++ ++ Currently the security, system, ++ trusted and user extended attribute(xattr) ++ classes are defined in Linux. Contrary FreeBSD has only USER ++ and SYSTEM extended attribute(extattr) namespaces, so mapping ++ of one set into another isn't straightforward and can be done in different ways. ++ ++ Historically the Samba(7) built-in xattr mapping implementation simply converted ++ system and user xattr into corresponding ++ SYSTEM and USER extattr namespaces, dropping ++ the class prefix name with the separating dot and using attribute name only within the ++ mapped namespace. It also rejected any other xattr classes, like security ++ and trusted as invalid. Such behavior in particular broke AD ++ provisioning on UFS2 file systems as essential security.NTACL ++ xattr was rejected as invalid. ++ ++ This module tries to address this problem and provide secure, where it's possible, ++ way to map Linux xattr into FreeBSD's extattr. ++ ++ When mode is set to the legacy (default) ++ then modified version of built-in mapping is used, where system xattr ++ is mapped into SYSTEM namespace, while secure, trusted ++ and user xattr are all mapped into the USER namespace, dropping class ++ prefixes and mix them all together. This is the way how Samba FreeBSD ports were patched ++ up to the 4.9 version and that created multiple potential security issues. This mode is aimed for ++ the compatibility with the legacy installations only and should be avoided in new setups. ++ ++ The compat mode is mostly designed for the jailed environments, ++ where it's not possible to write extattrs into the secure SYSTEM namespace, so all four ++ classes are mapped into the USER namespace. To preserve information about origin of the ++ extended attribute it is stored together with the class preffix in the class.attribute ++ format. ++ ++ The secure mode is meant for storing extended attributes in a secure ++ manner, so that security, system and trusted ++ are stored in the SYSTEM namespace, which can be modified only by root. ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ Attributes mapping ++ ++ ++ ++ ++ built-in ++ legacy ++ compat/jail ++ secure ++ ++ ++ ++ ++ user ++ USER; attribute ++ USER; attribute ++ USER; user.attribute ++ USER; user.attribute ++ ++ ++ system ++ SYSTEM; attribute ++ SYSTEM; attribute ++ USER; system.attribute ++ SYSTEM; system.attribute ++ ++ ++ trusted ++ FAIL ++ USER; attribute ++ USER; trusted.attribute ++ SYSTEM; trusted.attribute ++ ++ ++ security ++ FAIL ++ USER; attribute ++ USER; security.attribute ++ SYSTEM; security.attribute ++ ++ ++ ++
++ ++ ++ ++ EXAMPLES ++ ++ Use secure method of setting extended attributes on the share: ++ ++ ++ ++ freebsd ++ secure ++ ++ ++ ++ ++ ++ VERSION ++ ++ This man page is part of version &doc.version; of the Samba suite. ++ ++ ++ ++ ++ AUTHOR ++ ++ 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. ++ ++ This module was written by Timur I. Bakeyev ++ ++ ++ ++ Property changes on: head/net/samba410/files/patch-vfs_freebsd ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/samba410/pkg-plist =================================================================== --- head/net/samba410/pkg-plist (revision 505445) +++ head/net/samba410/pkg-plist (revision 505446) @@ -1,1346 +1,1154 @@ bin/cifsdd bin/dbwrap_tool -bin/eventlogadm +bin/dumpmscat bin/findsmb bin/gentest bin/locktest bin/masktest bin/mvxattr bin/ndrdump bin/net bin/nmblookup bin/ntlm_auth bin/oLschema2ldif bin/pdbedit bin/pidl bin/profiles bin/regdiff bin/regpatch bin/regshell bin/regtree bin/rpcclient bin/samba-regedit %%AD_DC%%bin/samba-tool bin/sharesec bin/smbcacls bin/smbclient bin/smbcontrol bin/smbcquotas bin/smbget bin/smbpasswd bin/smbspool bin/smbstatus bin/smbtar -%%SAMBA4_PYTHON2%%bin/smbtorture +%%SAMBA4_PYTHON%%bin/smbtorture bin/smbtree bin/testparm bin/vfstest bin/wbinfo +sbin/eventlogadm sbin/nmbd sbin/smbd sbin/winbindd %%AD_DC%%sbin/samba %%AD_DC%%sbin/samba_dnsupdate -%%AD_DC%%sbin/samba_gpoupdate +%%AD_DC%%sbin/samba-gpupdate %%AD_DC%%sbin/samba_kcc %%AD_DC%%sbin/samba_spnupdate %%AD_DC%%sbin/samba_upgradedns include/samba4/charset.h include/samba4/core/doserr.h include/samba4/core/error.h include/samba4/core/hresult.h include/samba4/core/ntstatus_gen.h include/samba4/core/ntstatus.h include/samba4/core/werror_gen.h include/samba4/core/werror.h include/samba4/credentials.h include/samba4/dcerpc.h %%AD_DC%%include/samba4/dcerpc_server.h %%LDAP%%include/samba4/smb_ldap.h %%LDAP%%include/samba4/smbldap.h include/samba4/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/krb5pac.h include/samba4/gen_ndr/lsa.h include/samba4/gen_ndr/misc.h include/samba4/gen_ndr/nbt.h include/samba4/gen_ndr/ndr_atsvc.h include/samba4/gen_ndr/ndr_dcerpc.h include/samba4/gen_ndr/ndr_drsblobs.h include/samba4/gen_ndr/ndr_drsuapi.h include/samba4/gen_ndr/ndr_krb5pac.h include/samba4/gen_ndr/ndr_misc.h include/samba4/gen_ndr/ndr_nbt.h include/samba4/gen_ndr/ndr_samr_c.h include/samba4/gen_ndr/ndr_samr.h include/samba4/gen_ndr/ndr_svcctl_c.h include/samba4/gen_ndr/ndr_svcctl.h include/samba4/gen_ndr/netlogon.h include/samba4/gen_ndr/samr.h include/samba4/gen_ndr/security.h include/samba4/gen_ndr/server_id.h include/samba4/gen_ndr/svcctl.h include/samba4/ldb_wrap.h include/samba4/libsmbclient.h include/samba4/lookup_sid.h include/samba4/machine_sid.h include/samba4/ndr.h include/samba4/ndr/ndr_dcerpc.h include/samba4/ndr/ndr_drsblobs.h include/samba4/ndr/ndr_drsuapi.h include/samba4/ndr/ndr_krb5pac.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 -%%SAMBA4_PYTHON2%%include/samba4/policy.h +%%SAMBA4_PYTHON%%include/samba4/policy.h include/samba4/rpc_common.h include/samba4/samba/session.h include/samba4/samba/version.h include/samba4/share.h include/samba4/smb2_lease_struct.h include/samba4/smbconf.h include/samba4/tdr.h include/samba4/tsocket_internal.h include/samba4/tsocket.h include/samba4/util_ldb.h include/samba4/util/attr.h include/samba4/util/blocking.h include/samba4/util/byteorder.h include/samba4/util/data_blob.h include/samba4/util/debug.h +include/samba4/util/discard.h include/samba4/util/fault.h include/samba4/util/genrand.h include/samba4/util/idtree_random.h include/samba4/util/idtree.h -include/samba4/util/memory.h -include/samba4/util/safe_string.h include/samba4/util/signal.h include/samba4/util/string_wrappers.h include/samba4/util/substitute.h -include/samba4/util/talloc_stack.h include/samba4/util/tevent_ntstatus.h include/samba4/util/tevent_unix.h include/samba4/util/tevent_werror.h include/samba4/util/tfork.h include/samba4/util/time.h include/samba4/wbclient.h @dir include/samba4/util @dir include/samba4/samba @dir include/samba4/ndr @dir include/samba4/gen_ndr @dir include/samba4/core @dir include/samba4 lib/samba4/libdcerpc-binding.so lib/samba4/libdcerpc-binding.so.0 lib/samba4/libdcerpc-samr.so lib/samba4/libdcerpc-samr.so.0 %%AD_DC%%lib/samba4/libdcerpc-server.so %%AD_DC%%lib/samba4/libdcerpc-server.so.0 lib/samba4/libdcerpc.so lib/samba4/libdcerpc.so.0 lib/samba4/libndr-krb5pac.so lib/samba4/libndr-krb5pac.so.0 lib/samba4/libndr-nbt.so lib/samba4/libndr-nbt.so.0 lib/samba4/libndr-standard.so lib/samba4/libndr-standard.so.0 lib/samba4/libndr.so lib/samba4/libndr.so.0 lib/samba4/libnetapi.so lib/samba4/libnetapi.so.0 lib/samba4/libsamba-credentials.so lib/samba4/libsamba-credentials.so.0 lib/samba4/libsamba-errors.so lib/samba4/libsamba-errors.so.1 lib/samba4/libsamba-hostconfig.so lib/samba4/libsamba-hostconfig.so.0 lib/samba4/libsamba-passdb.so lib/samba4/libsamba-passdb.so.0 -%%SAMBA4_PYTHON2%%lib/samba4/libsamba-policy.so -%%SAMBA4_PYTHON2%%lib/samba4/libsamba-policy.so.0 +%%SAMBA4_PYTHON%%lib/samba4/libsamba-policy.so +%%SAMBA4_PYTHON%%lib/samba4/libsamba-policy.so.0 lib/samba4/libsamba-util.so lib/samba4/libsamba-util.so.0 lib/samba4/libsamdb.so lib/samba4/libsamdb.so.0 lib/samba4/libsmbclient.so lib/samba4/libsmbclient.so.0 lib/samba4/libsmbconf.so lib/samba4/libsmbconf.so.0 %%LDAP%%lib/samba4/libsmbldap.so %%LDAP%%lib/samba4/libsmbldap.so.2 lib/samba4/libtevent-util.so lib/samba4/libtevent-util.so.0 lib/samba4/libwbclient.so lib/samba4/libwbclient.so.0 lib/nss_winbind.so.1 lib/nss_wins.so.1 lib/pam_winbind.so %%CUPS%%libexec/samba/smbspool_krb5_wrapper %%AD_DC%%lib/samba4/private/libdlz-bind9-for-torture-samba4.so %%AD_DC%%lib/samba4/private/libposix-eadb-samba4.so %%AD_DC%%lib/samba4/private/libprocess-model-samba4.so %%AD_DC%%lib/samba4/private/libservice-samba4.so lib/samba4/private/libCHARSET3-samba4.so %%AD_DC%%%%GSSAPI_BUILTIN%%lib/samba4/private/libHDB-SAMBA4-samba4.so lib/samba4/private/libLIBWBCLIENT-OLD-samba4.so lib/samba4/private/libMESSAGING-samba4.so lib/samba4/private/libMESSAGING-SEND-samba4.so lib/samba4/private/libaddns-samba4.so lib/samba4/private/libads-samba4.so %%GSSAPI_BUILTIN%%lib/samba4/private/libasn1-samba4.so.8 lib/samba4/private/libasn1util-samba4.so lib/samba4/private/libauth-samba4.so lib/samba4/private/libauth-unix-token-samba4.so lib/samba4/private/libauth4-samba4.so lib/samba4/private/libauthkrb5-samba4.so lib/samba4/private/libcli-cldap-samba4.so lib/samba4/private/libcli-ldap-common-samba4.so lib/samba4/private/libcli-ldap-samba4.so lib/samba4/private/libcli-nbt-samba4.so lib/samba4/private/libcli-smb-common-samba4.so +lib/samba4/private/libclidns-samba4.so lib/samba4/private/libcli-spoolss-samba4.so lib/samba4/private/libcliauth-samba4.so lib/samba4/private/libcluster-samba4.so -lib/samba4/private/libcmdline-credentials-samba4.so lib/samba4/private/libcmdline-contexts-samba4.so +lib/samba4/private/libcmdline-credentials-samba4.so %%GSSAPI_BUILTIN%%lib/samba4/private/libcom_err-samba4.so.0 lib/samba4/private/libcommon-auth-samba4.so %%AD_DC%%lib/samba4/private/libdb-glue-samba4.so lib/samba4/private/libdbwrap-samba4.so lib/samba4/private/libdcerpc-samba-samba4.so lib/samba4/private/libdcerpc-samba4.so %%AD_DC%%lib/samba4/private/libdfs-server-ad-samba4.so %%AD_DC%%lib/samba4/private/libdnsserver-common-samba4.so -lib/samba4/private/libdsdb-garbage-collect-tombstones-samba4.so lib/samba4/private/libdsdb-module-samba4.so +%%AD_DC%%lib/samba4/private/libdsdb-garbage-collect-tombstones-samba4.so lib/samba4/private/libevents-samba4.so lib/samba4/private/libflag-mapping-samba4.so lib/samba4/private/libgenrand-samba4.so lib/samba4/private/libgensec-samba4.so lib/samba4/private/libgpext-samba4.so lib/samba4/private/libgse-samba4.so %%GSSAPI_BUILTIN%%lib/samba4/private/libgssapi-samba4.so.2 %%GSSAPI_BUILTIN%%lib/samba4/private/libhcrypto-samba4.so.5 %%GSSAPI_BUILTIN%%lib/samba4/private/libhdb-samba4.so.11 %%GSSAPI_BUILTIN%%lib/samba4/private/libheimbase-samba4.so.1 %%GSSAPI_BUILTIN%%lib/samba4/private/libheimntlm-samba4.so.1 lib/samba4/private/libhttp-samba4.so %%GSSAPI_BUILTIN%%lib/samba4/private/libhx509-samba4.so.5 lib/samba4/private/libidmap-samba4.so lib/samba4/private/libinterfaces-samba4.so lib/samba4/private/libiov-buf-samba4.so %%GSSAPI_BUILTIN%%lib/samba4/private/libkdc-samba4.so.2 %%GSSAPI_BUILTIN%%lib/samba4/private/libkrb5-samba4.so.26 lib/samba4/private/libkrb5samba-samba4.so +lib/samba4/private/libldb-tdb-err-map-samba4.so +lib/samba4/private/libldb-tdb-int-samba4.so lib/samba4/private/libldbsamba-samba4.so lib/samba4/private/liblibcli-lsa3-samba4.so lib/samba4/private/liblibcli-netlogon3-samba4.so lib/samba4/private/liblibsmb-samba4.so lib/samba4/private/libmessages-dgm-samba4.so lib/samba4/private/libmessages-util-samba4.so +lib/samba4/private/libmscat-samba4.so lib/samba4/private/libmsghdr-samba4.so lib/samba4/private/libmsrpc3-samba4.so lib/samba4/private/libndr-samba-samba4.so lib/samba4/private/libndr-samba4.so lib/samba4/private/libnet-keytab-samba4.so lib/samba4/private/libnetif-samba4.so lib/samba4/private/libnon-posix-acls-samba4.so lib/samba4/private/libnpa-tstream-samba4.so lib/samba4/private/libnss-info-samba4.so %%AD_DC%%lib/samba4/private/libpac-samba4.so -lib/samba4/private/libpopt-samba3-samba4.so lib/samba4/private/libpopt-samba3-cmdline-samba4.so +lib/samba4/private/libpopt-samba3-samba4.so lib/samba4/private/libprinting-migrate-samba4.so lib/samba4/private/libregistry-samba4.so lib/samba4/private/libreplace-samba4.so %%GSSAPI_BUILTIN%%lib/samba4/private/libroken-samba4.so.19 lib/samba4/private/libsamba-cluster-support-samba4.so lib/samba4/private/libsamba-debug-samba4.so lib/samba4/private/libsamba-modules-samba4.so -%%SAMBA4_PYTHON2%%lib/samba4/private/libsamba-net-samba4.so -%%SAMBA4_PYTHON2%%lib/samba4/private/libsamba-python-samba4.so +%%SAMBA4_PYTHON%%lib/samba4/private/libsamba-net-samba4.so +%%SAMBA4_PYTHON%%lib/samba4/private/libsamba-python-samba4.so lib/samba4/private/libsamba-security-samba4.so lib/samba4/private/libsamba-sockets-samba4.so lib/samba4/private/libsamba3-util-samba4.so lib/samba4/private/libsamdb-common-samba4.so +%%AD_DC%%lib/samba4/private/libscavenge-dns-records-samba4.so lib/samba4/private/libsecrets3-samba4.so lib/samba4/private/libserver-id-db-samba4.so lib/samba4/private/libserver-role-samba4.so lib/samba4/private/libshares-samba4.so lib/samba4/private/libsmb-transport-samba4.so lib/samba4/private/libsmbclient-raw-samba4.so lib/samba4/private/libsmbd-base-samba4.so lib/samba4/private/libsmbd-conn-samba4.so lib/samba4/private/libsmbd-shim-samba4.so %%LDAP%%lib/samba4/private/libsmbldaphelper-samba4.so lib/samba4/private/libsmbpasswdparser-samba4.so lib/samba4/private/libsocket-blocking-samba4.so lib/samba4/private/libsys-rw-samba4.so lib/samba4/private/libtalloc-report-samba4.so lib/samba4/private/libtdb-wrap-samba4.so lib/samba4/private/libtime-basic-samba4.so lib/samba4/private/libtorture-samba4.so lib/samba4/private/libtrusts-util-samba4.so lib/samba4/private/libutil-cmdline-samba4.so lib/samba4/private/libutil-reg-samba4.so lib/samba4/private/libutil-setid-samba4.so lib/samba4/private/libutil-tdb-samba4.so lib/samba4/private/libwinbind-client-samba4.so %%GSSAPI_BUILTIN%%lib/samba4/private/libwind-samba4.so.0 lib/samba4/private/libxattr-tdb-samba4.so -%%AD_DC%%lib/shared-modules/bind9/dlz_bind9_10.so -%%AD_DC%%lib/shared-modules/bind9/dlz_bind9_11.so -%%AD_DC%%lib/shared-modules/bind9/dlz_bind9_12.so -%%AD_DC%%lib/shared-modules/bind9/dlz_bind9_13.so -%%AD_DC%%lib/shared-modules/bind9/dlz_bind9_14.so -%%AD_DC%%lib/shared-modules/bind9/dlz_bind9_9.so -%%AD_DC%%lib/shared-modules/bind9/dlz_bind9.so -%%AD_DC%%lib/shared-modules/gensec/krb5.so -%%AD_DC%%lib/shared-modules/krb5/winbind_krb5_locator.so -%%AD_DC%%lib/shared-modules/ldb/acl.so -%%AD_DC%%lib/shared-modules/ldb/aclread.so -%%AD_DC%%lib/shared-modules/ldb/anr.so -%%AD_DC%%lib/shared-modules/ldb/descriptor.so -%%AD_DC%%lib/shared-modules/ldb/dirsync.so -%%AD_DC%%lib/shared-modules/ldb/dns_notify.so -%%AD_DC%%lib/shared-modules/ldb/dsdb_notification.so -%%AD_DC%%lib/shared-modules/ldb/encrypted_secrets.so -%%AD_DC%%lib/shared-modules/ldb/extended_dn_in.so -%%AD_DC%%lib/shared-modules/ldb/extended_dn_out.so -%%AD_DC%%lib/shared-modules/ldb/extended_dn_store.so -%%AD_DC%%lib/shared-modules/ldb/ildap.so -%%AD_DC%%lib/shared-modules/ldb/instancetype.so -%%AD_DC%%lib/shared-modules/ldb/lazy_commit.so -%%AD_DC%%lib/shared-modules/ldb/ldbsamba_extensions.so -%%AD_DC%%lib/shared-modules/ldb/linked_attributes.so -%%AD_DC%%lib/shared-modules/ldb/local_password.so -%%AD_DC%%lib/shared-modules/ldb/new_partition.so -%%AD_DC%%lib/shared-modules/ldb/objectclass_attrs.so -%%AD_DC%%lib/shared-modules/ldb/objectclass.so -%%AD_DC%%lib/shared-modules/ldb/objectguid.so -%%AD_DC%%lib/shared-modules/ldb/operational.so -%%AD_DC%%lib/shared-modules/ldb/partition.so -%%AD_DC%%lib/shared-modules/ldb/password_hash.so -%%AD_DC%%lib/shared-modules/ldb/ranged_results.so -%%AD_DC%%lib/shared-modules/ldb/repl_meta_data.so -%%AD_DC%%lib/shared-modules/ldb/resolve_oids.so -%%AD_DC%%lib/shared-modules/ldb/rootdse.so -%%AD_DC%%lib/shared-modules/ldb/samba_dsdb.so -%%AD_DC%%lib/shared-modules/ldb/samba_secrets.so -%%AD_DC%%lib/shared-modules/ldb/samba3sam.so -%%AD_DC%%lib/shared-modules/ldb/samba3sid.so -%%AD_DC%%lib/shared-modules/ldb/samldb.so -%%AD_DC%%lib/shared-modules/ldb/schema_data.so -%%AD_DC%%lib/shared-modules/ldb/schema_load.so -%%AD_DC%%lib/shared-modules/ldb/secrets_tdb_sync.so -%%AD_DC%%lib/shared-modules/ldb/show_deleted.so -%%AD_DC%%lib/shared-modules/ldb/simple_dn.so -%%AD_DC%%lib/shared-modules/ldb/simple_ldap_map.so -%%AD_DC%%lib/shared-modules/ldb/subtree_delete.so -%%AD_DC%%lib/shared-modules/ldb/subtree_rename.so -%%AD_DC%%lib/shared-modules/ldb/tombstone_reanimate.so -%%AD_DC%%lib/shared-modules/ldb/unique_object_sids.so -%%AD_DC%%lib/shared-modules/ldb/update_keytab.so -%%AD_DC%%lib/shared-modules/ldb/vlv.so -%%AD_DC%%lib/shared-modules/ldb/wins_ldb.so -%%AD_DC%%lib/shared-modules/process_model/prefork.so -%%AD_DC%%lib/shared-modules/process_model/standard.so -%%AD_DC%%lib/shared-modules/service/cldap.so -%%AD_DC%%lib/shared-modules/service/dcerpc.so -%%AD_DC%%lib/shared-modules/service/dns_update.so -%%AD_DC%%lib/shared-modules/service/dns.so -%%AD_DC%%lib/shared-modules/service/drepl.so -%%AD_DC%%lib/shared-modules/service/kcc.so -%%AD_DC%%lib/shared-modules/service/kdc.so -%%AD_DC%%lib/shared-modules/service/ldap.so -%%AD_DC%%lib/shared-modules/service/nbtd.so -%%AD_DC%%lib/shared-modules/service/ntp_signd.so -%%AD_DC%%lib/shared-modules/service/s3fs.so -%%AD_DC%%lib/shared-modules/service/web.so -%%AD_DC%%lib/shared-modules/service/winbindd.so -%%AD_DC%%lib/shared-modules/service/wrepl.so -%%AD_DC%%lib/shared-modules/vfs/posix_eadb.so -lib/shared-modules/auth/script.so -lib/shared-modules/vfs/acl_tdb.so -lib/shared-modules/vfs/acl_xattr.so -lib/shared-modules/vfs/aio_fork.so -lib/shared-modules/vfs/aio_pthread.so -lib/shared-modules/vfs/audit.so -lib/shared-modules/vfs/cap.so -lib/shared-modules/vfs/catia.so -lib/shared-modules/vfs/commit.so -lib/shared-modules/vfs/crossrename.so -lib/shared-modules/vfs/default_quota.so -lib/shared-modules/vfs/dirsort.so -lib/shared-modules/vfs/expand_msdfs.so -lib/shared-modules/vfs/extd_audit.so -lib/shared-modules/vfs/fake_perms.so -lib/shared-modules/vfs/fruit.so -lib/shared-modules/vfs/full_audit.so -lib/shared-modules/vfs/glusterfs_fuse.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/offline.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/shadow_copy.so -lib/shared-modules/vfs/shadow_copy2.so -lib/shared-modules/vfs/shell_snap.so -lib/shared-modules/vfs/streams_depot.so -lib/shared-modules/vfs/streams_xattr.so -lib/shared-modules/vfs/syncops.so -lib/shared-modules/vfs/time_audit.so -lib/shared-modules/vfs/unityed_media.so -lib/shared-modules/vfs/virusfilter.so -lib/shared-modules/vfs/worm.so -lib/shared-modules/vfs/xattr_tdb.so -lib/shared-modules/vfs/zfsacl.so -@dir lib/shared-modules/vfs -%%AD_DC%%@dir lib/shared-modules/service -%%AD_DC%%@dir lib/shared-modules/process_model -@dir lib/shared-modules/perfcount -@dir lib/shared-modules/pdb -@dir lib/shared-modules/nss_info -@dir lib/shared-modules/ldb -@dir lib/shared-modules/idmap -@dir lib/shared-modules/gpext -@dir lib/shared-modules/gensec -@dir lib/shared-modules/bind9 -@dir lib/shared-modules/auth -@dir lib/shared-modules +%%AD_DC%%%%SAMBA4_MODULEDIR%%/bind9/dlz_bind9_10.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/bind9/dlz_bind9_11.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/bind9/dlz_bind9_12.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/bind9/dlz_bind9_13.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/bind9/dlz_bind9_14.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/bind9/dlz_bind9_9.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/bind9/dlz_bind9.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/gensec/krb5.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/krb5/winbind_krb5_locator.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/acl.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/aclread.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/anr.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/descriptor.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/dirsync.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/dns_notify.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/dsdb_notification.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/encrypted_secrets.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/extended_dn_in.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/extended_dn_out.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/extended_dn_store.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/ildap.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/instancetype.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/lazy_commit.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/ldbsamba_extensions.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/linked_attributes.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/local_password.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/new_partition.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/objectclass_attrs.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/objectclass.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/objectguid.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/operational.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/paged_results.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/partition.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/password_hash.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/ranged_results.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/repl_meta_data.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/resolve_oids.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/rootdse.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/samba_dsdb.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/samba_secrets.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/samba3sam.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/samba3sid.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/samldb.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/schema_data.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/schema_load.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/secrets_tdb_sync.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/show_deleted.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/simple_dn.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/simple_ldap_map.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/subtree_delete.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/subtree_rename.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/tombstone_reanimate.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/unique_object_sids.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/update_keytab.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/vlv.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/wins_ldb.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/process_model/prefork.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/process_model/standard.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/service/cldap.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/service/dcerpc.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/service/dns_update.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/service/dns.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/service/drepl.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/service/kcc.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/service/kdc.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/service/ldap.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/service/nbtd.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/service/ntp_signd.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/service/s3fs.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/service/web.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/service/winbindd.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/service/wrepl.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/vfs/posix_eadb.so +%%SAMBA4_MODULEDIR%%/auth/script.so +%%SAMBA4_MODULEDIR%%/vfs/acl_tdb.so +%%SAMBA4_MODULEDIR%%/vfs/acl_xattr.so +%%SAMBA4_MODULEDIR%%/vfs/aio_fork.so +%%SAMBA4_MODULEDIR%%/vfs/aio_pthread.so +%%SAMBA4_MODULEDIR%%/vfs/audit.so +%%SAMBA4_MODULEDIR%%/vfs/cap.so +%%SAMBA4_MODULEDIR%%/vfs/catia.so +%%SAMBA4_MODULEDIR%%/vfs/commit.so +%%SAMBA4_MODULEDIR%%/vfs/crossrename.so +%%SAMBA4_MODULEDIR%%/vfs/default_quota.so +%%SAMBA4_MODULEDIR%%/vfs/dirsort.so +%%SAMBA4_MODULEDIR%%/vfs/expand_msdfs.so +%%SAMBA4_MODULEDIR%%/vfs/extd_audit.so +%%SAMBA4_MODULEDIR%%/vfs/fake_perms.so +%%SAMBA4_MODULEDIR%%/vfs/fruit.so +%%SAMBA4_MODULEDIR%%/vfs/full_audit.so +%%SAMBA4_MODULEDIR%%/vfs/glusterfs_fuse.so +%%SAMBA4_MODULEDIR%%/vfs/linux_xfs_sgid.so +%%SAMBA4_MODULEDIR%%/vfs/media_harmony.so +%%SAMBA4_MODULEDIR%%/vfs/netatalk.so +%%SAMBA4_MODULEDIR%%/vfs/offline.so +%%SAMBA4_MODULEDIR%%/vfs/preopen.so +%%SAMBA4_MODULEDIR%%/vfs/readahead.so +%%SAMBA4_MODULEDIR%%/vfs/readonly.so +%%SAMBA4_MODULEDIR%%/vfs/recycle.so +%%SAMBA4_MODULEDIR%%/vfs/shadow_copy.so +%%SAMBA4_MODULEDIR%%/vfs/shadow_copy2.so +%%SAMBA4_MODULEDIR%%/vfs/shell_snap.so +%%SAMBA4_MODULEDIR%%/vfs/streams_depot.so +%%SAMBA4_MODULEDIR%%/vfs/streams_xattr.so +%%SAMBA4_MODULEDIR%%/vfs/syncops.so +%%SAMBA4_MODULEDIR%%/vfs/time_audit.so +%%SAMBA4_MODULEDIR%%/vfs/unityed_media.so +%%SAMBA4_MODULEDIR%%/vfs/virusfilter.so +%%SAMBA4_MODULEDIR%%/vfs/worm.so +%%SAMBA4_MODULEDIR%%/vfs/xattr_tdb.so +%%SAMBA4_MODULEDIR%%/vfs/zfsacl.so +@dir %%SAMBA4_MODULEDIR%%/vfs +%%AD_DC%%@dir %%SAMBA4_MODULEDIR%%/service +%%AD_DC%%@dir %%SAMBA4_MODULEDIR%%/process_model +@dir %%SAMBA4_MODULEDIR%%/perfcount +@dir %%SAMBA4_MODULEDIR%%/pdb +@dir %%SAMBA4_MODULEDIR%%/nss_info +@dir %%SAMBA4_MODULEDIR%%/ldb +@dir %%SAMBA4_MODULEDIR%%/idmap +@dir %%SAMBA4_MODULEDIR%%/gpext +@dir %%SAMBA4_MODULEDIR%%/gensec +@dir %%SAMBA4_MODULEDIR%%/bind9 +@dir %%SAMBA4_MODULEDIR%%/auth +@dir %%SAMBA4_MODULEDIR%% @dir lib/samba4/private @dir lib/samba4 %%PKGCONFIGDIR%%/dcerpc.pc %%PKGCONFIGDIR%%/dcerpc_samr.pc %%AD_DC%%%%PKGCONFIGDIR%%/dcerpc_server.pc %%PKGCONFIGDIR%%/ndr.pc %%PKGCONFIGDIR%%/ndr_krb5pac.pc %%PKGCONFIGDIR%%/ndr_nbt.pc %%PKGCONFIGDIR%%/ndr_standard.pc %%PKGCONFIGDIR%%/netapi.pc %%PKGCONFIGDIR%%/samba-credentials.pc %%PKGCONFIGDIR%%/samba-hostconfig.pc -%%SAMBA4_PYTHON2%%%%PKGCONFIGDIR%%/samba-policy.pc +%%SAMBA4_PYTHON%%%%PKGCONFIGDIR%%/samba-policy.pc %%PKGCONFIGDIR%%/samba-util.pc %%PKGCONFIGDIR%%/samdb.pc %%PKGCONFIGDIR%%/smbclient.pc %%PKGCONFIGDIR%%/wbclient.pc -@comment Python2 block -%%SAMBA4_PYTHON2%%%%AD_DC%%%%PYTHON_SITELIBDIR%%/samba/dckeytab.so -%%SAMBA4_PYTHON2%%%%AD_DC%%%%PYTHON_SITELIBDIR%%/samba/posix_eadb.so -%%SAMBA4_PYTHON2%%%%AD_DC%%%%PYTHON_SITELIBDIR%%/samba/xattr_native.so -%%SAMBA4_PYTHON2%%%%AD_DC%%%%PYTHON_SITELIBDIR%%/samba/xattr_tdb.so -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/__init__.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/_glue.so -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/_ldb.so -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/auth.so -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/colour.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/common.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/compat.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/credentials.so -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/crypto.so -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/dbchecker.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/__init__.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/atsvc.so -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/auth.so -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/base.so -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/dcerpc.so -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/dfs.so -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/dns.so -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/dnsp.so -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/dnsserver.so -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/drsblobs.so -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/drsuapi.so -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/echo.so -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/epmapper.so -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/idmap.so -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/initshutdown.so -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/irpc.so -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/krb5pac.so -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/lsa.so -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/messaging.so -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/mgmt.so -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/misc.so -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/nbt.so -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/netlogon.so -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/ntlmssp.so -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/samr.so -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/security.so -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/server_id.so -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/smb_acl.so -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/srvsvc.so -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/svcctl.so -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/unixinfo.so -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/winbind.so -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/winreg.so -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/wkssvc.so -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/xattr.so -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/descriptor.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/dnsserver.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/domain_update.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/drs_utils.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/dsdb_dns.so -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/dsdb.so -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/emulate/__init__.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/emulate/traffic_packets.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/emulate/traffic.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/forest_update.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/gensec.so -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/getopt.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/gpclass.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/gpo.so -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/graph.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/hostconfig.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/idmap.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/join.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/kcc/__init__.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/kcc/debug.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/kcc/graph_utils.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/kcc/graph.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/kcc/kcc_utils.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/kcc/ldif_import_export.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/messaging.so -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/ms_display_specifiers.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/ms_forest_updates_markdown.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/ms_schema_markdown.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/ms_schema.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/ndr.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/net.so -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/netbios.so -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/netcmd/__init__.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/netcmd/common.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/netcmd/dbcheck.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/netcmd/delegation.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/netcmd/dns.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/netcmd/domain.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/netcmd/drs.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/netcmd/dsacl.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/netcmd/fsmo.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/netcmd/gpo.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/netcmd/group.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/netcmd/ldapcmp.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/netcmd/main.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/netcmd/nettime.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/netcmd/ntacl.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/netcmd/processes.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/netcmd/rodc.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/netcmd/sites.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/netcmd/spn.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/netcmd/testparm.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/netcmd/user.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/netcmd/visualize.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/ntacls.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/ntstatus.so -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/param.so -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/policy.so -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/provision/__init__.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/provision/backend.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/provision/common.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/provision/kerberos_implementation.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/provision/kerberos.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/provision/sambadns.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/registry.so -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/remove_dc.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/samba3/__init__.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/samba3/libsmb_samba_internal.so -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/samba3/param.so -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/samba3/passdb.so -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/samba3/smbd.so -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/samdb.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/schema.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/sd_utils.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/security.so -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/sites.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/smb.so -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/subnets.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/subunit/__init__.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/subunit/run.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tdb_util.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/__init__.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/auth_log_base.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/auth_log_ncalrpc.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/auth_log_netlogon_bad_creds.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/auth_log_netlogon.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/auth_log_pass_change.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/auth_log_samlogon.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/auth_log.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/auth.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/__init__.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/check_output.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/ndrdump.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/samba_dnsupdate.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/smbcontrol.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/traffic_learner.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/traffic_replay.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/traffic_summary.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/common.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/core.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/credentials.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/__init__.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/array.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/bare.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/dnsserver.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/integer.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/misc.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/raw_protocol.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/raw_testcase.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/registry.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/rpc_talloc.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/rpcecho.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/sam.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/srvsvc.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/string.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/testrpc.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/unix.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/dns_base.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/dns_forwarder_helpers/server.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/dns_forwarder.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/dns_invalid.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/dns_tkey.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/dns_wildcard.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/dns.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/docs.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/dsdb_lock.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/dsdb_schema_attributes.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/dsdb.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/emulate/__init__.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/emulate/traffic_packet.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/emulate/traffic.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/encrypted_secrets.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/gensec.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/get_opt.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/glue.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/graph.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/hostconfig.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/join.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/kcc/__init__.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/kcc/graph_utils.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/kcc/graph.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/kcc/kcc_utils.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/kcc/ldif_import_export.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/krb5_credentials.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/libsmb_samba_internal.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/lsa_string.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/messaging.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/net_join_no_spnego.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/net_join.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/netcmd.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/netlogonsvc.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/ntacls.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/ntlmdisabled.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/pam_winbind_warn_pwd_expire.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/pam_winbind.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/param.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/password_hash_fl2003.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/password_hash_fl2008.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/password_hash_gpgme.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/password_hash_ldap.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/password_hash.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/password_quality.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/policy.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/posixacl.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/provision.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/py_credentials.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/registry.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/__init__.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/base.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/dnscmd.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/fsmo.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/gpo.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/group.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/help.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/join.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/ntacl.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/processes.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/provision_password_check.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/rodc.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/sites.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/timecmd.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/user_check_password_script.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/user_virtualCryptSHA.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/user_wdigest.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/user.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/visualize_drs.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/visualize.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/samba3.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/samba3sam.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/samdb.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/security.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/source.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/strings.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/subunitrun.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/tdb_util.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/unicodenames.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/upgrade.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/upgradeprovision.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/upgradeprovisionneeddc.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/xattr.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/third_party/__init__.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/upgrade.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/upgradehelpers.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/web_server/__init__.py -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/werror.so -%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/xattr.py -%%SAMBA4_PYTHON2%%@unexec find %D/%%PYTHON_SITELIBDIR%%/samba -name '*.py[co]' -delete >/dev/null 2>&1 -%%SAMBA4_PYTHON2%%@dir %%PYTHON_SITELIBDIR%%/samba/web_server -%%SAMBA4_PYTHON2%%@dir %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool -%%SAMBA4_PYTHON2%%@dir %%PYTHON_SITELIBDIR%%/samba/tests/dcerpc -%%SAMBA4_PYTHON2%%@dir %%PYTHON_SITELIBDIR%%/samba/tests/blackbox -%%SAMBA4_PYTHON2%%@dir %%PYTHON_SITELIBDIR%%/samba/tests -%%SAMBA4_PYTHON2%%@dir %%PYTHON_SITELIBDIR%%/samba/samba3 -%%SAMBA4_PYTHON2%%@dir %%PYTHON_SITELIBDIR%%/samba/provision -%%SAMBA4_PYTHON2%%@dir %%PYTHON_SITELIBDIR%%/samba/netcmd -%%SAMBA4_PYTHON2%%@dir %%PYTHON_SITELIBDIR%%/samba/dcerpc -%%SAMBA4_PYTHON2%%@dir %%PYTHON_SITELIBDIR%%/samba -@comment Python3 block -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/__init__.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/_glue.cpython-36m.so -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/_ldb.cpython-36m.so -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/auth.cpython-36m.so -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/colour.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/common.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/compat.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/credentials.cpython-36m.so -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/crypto.cpython-36m.so -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/dbchecker.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/dcerpc/__init__.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/dcerpc/atsvc.cpython-36m.so -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/dcerpc/auth.cpython-36m.so -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/dcerpc/base.cpython-36m.so -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/dcerpc/dcerpc.cpython-36m.so -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/dcerpc/dfs.cpython-36m.so -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/dcerpc/dns.cpython-36m.so -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/dcerpc/dnsp.cpython-36m.so -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/dcerpc/dnsserver.cpython-36m.so -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/dcerpc/drsblobs.cpython-36m.so -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/dcerpc/drsuapi.cpython-36m.so -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/dcerpc/echo.cpython-36m.so -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/dcerpc/epmapper.cpython-36m.so -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/dcerpc/idmap.cpython-36m.so -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/dcerpc/initshutdown.cpython-36m.so -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/dcerpc/irpc.cpython-36m.so -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/dcerpc/krb5pac.cpython-36m.so -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/dcerpc/lsa.cpython-36m.so -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/dcerpc/messaging.cpython-36m.so -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/dcerpc/mgmt.cpython-36m.so -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/dcerpc/misc.cpython-36m.so -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/dcerpc/nbt.cpython-36m.so -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/dcerpc/netlogon.cpython-36m.so -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/dcerpc/ntlmssp.cpython-36m.so -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/dcerpc/samr.cpython-36m.so -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/dcerpc/security.cpython-36m.so -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/dcerpc/server_id.cpython-36m.so -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/dcerpc/smb_acl.cpython-36m.so -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/dcerpc/srvsvc.cpython-36m.so -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/dcerpc/svcctl.cpython-36m.so -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/dcerpc/unixinfo.cpython-36m.so -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/dcerpc/winbind.cpython-36m.so -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/dcerpc/winreg.cpython-36m.so -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/dcerpc/wkssvc.cpython-36m.so -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/dcerpc/xattr.cpython-36m.so -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/descriptor.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/dnsserver.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/domain_update.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/drs_utils.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/emulate/__init__.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/emulate/traffic_packets.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/emulate/traffic.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/forest_update.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/gensec.cpython-36m.so -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/getopt.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/gpclass.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/graph.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/hostconfig.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/idmap.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/join.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/kcc/__init__.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/kcc/debug.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/kcc/graph_utils.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/kcc/graph.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/kcc/kcc_utils.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/kcc/ldif_import_export.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/messaging.cpython-36m.so -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/ms_display_specifiers.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/ms_forest_updates_markdown.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/ms_schema_markdown.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/ms_schema.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/ndr.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/net.cpython-36m.so -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/netcmd/__init__.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/netcmd/common.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/netcmd/dbcheck.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/netcmd/delegation.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/netcmd/dns.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/netcmd/domain.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/netcmd/drs.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/netcmd/dsacl.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/netcmd/fsmo.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/netcmd/gpo.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/netcmd/group.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/netcmd/ldapcmp.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/netcmd/main.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/netcmd/nettime.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/netcmd/ntacl.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/netcmd/processes.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/netcmd/rodc.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/netcmd/sites.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/netcmd/spn.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/netcmd/testparm.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/netcmd/user.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/netcmd/visualize.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/ntacls.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/ntstatus.cpython-36m.so -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/param.cpython-36m.so -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/posix_eadb.cpython-36m.so -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/provision/__init__.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/provision/backend.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/provision/common.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/provision/kerberos_implementation.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/provision/kerberos.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/provision/sambadns.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/registry.cpython-36m.so -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/remove_dc.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/samba3/__init__.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/samdb.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/schema.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/sd_utils.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/security.cpython-36m.so -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/sites.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/subnets.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/subunit/__init__.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/subunit/run.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tdb_util.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/__init__.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/auth_log_base.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/auth_log_ncalrpc.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/auth_log_netlogon_bad_creds.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/auth_log_netlogon.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/auth_log_pass_change.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/auth_log_samlogon.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/auth_log.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/auth.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/blackbox/__init__.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/blackbox/check_output.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/blackbox/ndrdump.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/blackbox/samba_dnsupdate.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/blackbox/smbcontrol.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/blackbox/traffic_learner.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/blackbox/traffic_replay.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/blackbox/traffic_summary.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/common.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/core.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/credentials.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/dcerpc/__init__.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/dcerpc/array.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/dcerpc/bare.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/dcerpc/dnsserver.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/dcerpc/integer.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/dcerpc/misc.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/dcerpc/raw_protocol.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/dcerpc/raw_testcase.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/dcerpc/registry.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/dcerpc/rpc_talloc.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/dcerpc/rpcecho.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/dcerpc/sam.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/dcerpc/srvsvc.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/dcerpc/string.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/dcerpc/testrpc.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/dcerpc/unix.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/dns_base.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/dns_forwarder_helpers/server.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/dns_forwarder.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/dns_invalid.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/dns_tkey.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/dns_wildcard.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/dns.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/docs.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/dsdb_lock.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/dsdb_schema_attributes.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/dsdb.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/emulate/__init__.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/emulate/traffic_packet.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/emulate/traffic.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/encrypted_secrets.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/gensec.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/get_opt.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/glue.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/graph.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/hostconfig.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/join.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/kcc/__init__.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/kcc/graph_utils.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/kcc/graph.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/kcc/kcc_utils.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/kcc/ldif_import_export.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/krb5_credentials.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/libsmb_samba_internal.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/lsa_string.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/messaging.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/net_join_no_spnego.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/net_join.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/netcmd.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/netlogonsvc.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/ntacls.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/ntlmdisabled.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/pam_winbind_warn_pwd_expire.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/pam_winbind.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/param.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/password_hash_fl2003.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/password_hash_fl2008.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/password_hash_gpgme.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/password_hash_ldap.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/password_hash.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/password_quality.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/policy.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/posixacl.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/provision.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/py_credentials.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/registry.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/samba_tool/__init__.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/samba_tool/base.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/samba_tool/dnscmd.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/samba_tool/fsmo.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/samba_tool/gpo.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/samba_tool/group.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/samba_tool/help.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/samba_tool/join.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/samba_tool/ntacl.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/samba_tool/processes.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/samba_tool/provision_password_check.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/samba_tool/rodc.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/samba_tool/sites.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/samba_tool/timecmd.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/samba_tool/user_check_password_script.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/samba_tool/user_virtualCryptSHA.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/samba_tool/user_wdigest.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/samba_tool/user.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/samba_tool/visualize_drs.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/samba_tool/visualize.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/samba3.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/samba3sam.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/samdb.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/security.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/source.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/strings.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/subunitrun.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/tdb_util.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/unicodenames.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/upgrade.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/upgradeprovision.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/upgradeprovisionneeddc.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/xattr.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/upgrade.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/upgradehelpers.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/web_server/__init__.py -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/werror.cpython-36m.so -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/xattr_native.cpython-36m.so -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/xattr_tdb.cpython-36m.so -%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/samba/xattr.py -%%SAMBA4_PYTHON3%%@unexec find %D/%%PYTHON_SITELIBDIR%%/samba -name '*.py[co]' -delete >/dev/null 2>&1 -%%SAMBA4_PYTHON3%%@dir %%SAMBA4_PYTHON3_SITELIBDIR%%/samba/web_server -%%SAMBA4_PYTHON3%%@dir %%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/samba_tool -%%SAMBA4_PYTHON3%%@dir %%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/dcerpc -%%SAMBA4_PYTHON3%%@dir %%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests/blackbox -%%SAMBA4_PYTHON3%%@dir %%SAMBA4_PYTHON3_SITELIBDIR%%/samba/tests -%%SAMBA4_PYTHON3%%@dir %%SAMBA4_PYTHON3_SITELIBDIR%%/samba/samba3 -%%SAMBA4_PYTHON3%%@dir %%SAMBA4_PYTHON3_SITELIBDIR%%/samba/provision -%%SAMBA4_PYTHON3%%@dir %%SAMBA4_PYTHON3_SITELIBDIR%%/samba/netcmd -%%SAMBA4_PYTHON3%%@dir %%SAMBA4_PYTHON3_SITELIBDIR%%/samba/dcerpc -%%SAMBA4_PYTHON3%%@dir %%SAMBA4_PYTHON3_SITELIBDIR%%/samba @comment Pidl block %%DATADIR%%/perl5/Parse/Pidl.pm %%DATADIR%%/perl5/Parse/Pidl/CUtil.pm %%DATADIR%%/perl5/Parse/Pidl/Compat.pm %%DATADIR%%/perl5/Parse/Pidl/Dump.pm %%DATADIR%%/perl5/Parse/Pidl/Expr.pm %%DATADIR%%/perl5/Parse/Pidl/IDL.pm %%DATADIR%%/perl5/Parse/Pidl/NDR.pm %%DATADIR%%/perl5/Parse/Pidl/ODL.pm %%DATADIR%%/perl5/Parse/Pidl/Samba3/ClientNDR.pm %%DATADIR%%/perl5/Parse/Pidl/Samba3/ServerNDR.pm %%DATADIR%%/perl5/Parse/Pidl/Samba4.pm %%DATADIR%%/perl5/Parse/Pidl/Samba4/COM/Header.pm %%DATADIR%%/perl5/Parse/Pidl/Samba4/COM/Proxy.pm %%DATADIR%%/perl5/Parse/Pidl/Samba4/COM/Stub.pm %%DATADIR%%/perl5/Parse/Pidl/Samba4/Header.pm %%DATADIR%%/perl5/Parse/Pidl/Samba4/NDR/Client.pm %%DATADIR%%/perl5/Parse/Pidl/Samba4/NDR/Parser.pm %%DATADIR%%/perl5/Parse/Pidl/Samba4/NDR/Server.pm %%DATADIR%%/perl5/Parse/Pidl/Samba4/Python.pm %%DATADIR%%/perl5/Parse/Pidl/Samba4/TDR.pm %%DATADIR%%/perl5/Parse/Pidl/Samba4/Template.pm %%DATADIR%%/perl5/Parse/Pidl/Typelist.pm %%DATADIR%%/perl5/Parse/Pidl/Util.pm %%DATADIR%%/perl5/Parse/Pidl/Wireshark/Conformance.pm %%DATADIR%%/perl5/Parse/Pidl/Wireshark/NDR.pm @dir %%DATADIR%%/perl5/Parse/Pidl/Wireshark @dir %%DATADIR%%/perl5/Parse/Pidl/Samba4/NDR @dir %%DATADIR%%/perl5/Parse/Pidl/Samba4/COM @dir %%DATADIR%%/perl5/Parse/Pidl/Samba4 @dir %%DATADIR%%/perl5/Parse/Pidl/Samba3 @dir %%DATADIR%%/perl5/Parse/Pidl @dir %%DATADIR%%/perl5/Parse @dir %%DATADIR%%/perl5 %%AD_DC%%%%DATADIR%%/setup/ad-schema/AD_DS_Attributes__Windows_Server_2012_R2.ldf %%AD_DC%%%%DATADIR%%/setup/ad-schema/AD_DS_Attributes__Windows_Server_2016.ldf %%AD_DC%%%%DATADIR%%/setup/ad-schema/AD_DS_Classes__Windows_Server_2012_R2.ldf %%AD_DC%%%%DATADIR%%/setup/ad-schema/AD_DS_Classes__Windows_Server_2016.ldf %%AD_DC%%%%DATADIR%%/setup/ad-schema/Attributes_for_AD_DS__Windows_Server_2008_R2.ldf %%AD_DC%%%%DATADIR%%/setup/ad-schema/Attributes_for_AD_DS__Windows_Server_2012.ldf %%AD_DC%%%%DATADIR%%/setup/ad-schema/Classes_for_AD_DS__Windows_Server_2008_R2.ldf %%AD_DC%%%%DATADIR%%/setup/ad-schema/Classes_for_AD_DS__Windows_Server_2012.ldf %%AD_DC%%%%DATADIR%%/setup/ad-schema/licence.txt %%AD_DC%%%%DATADIR%%/setup/ad-schema/MS-AD_Schema_2K8_Attributes.txt %%AD_DC%%%%DATADIR%%/setup/ad-schema/MS-AD_Schema_2K8_Classes.txt %%AD_DC%%%%DATADIR%%/setup/ad-schema/MS-AD_Schema_2K8_R2_Attributes.txt %%AD_DC%%%%DATADIR%%/setup/ad-schema/MS-AD_Schema_2K8_R2_Classes.txt %%AD_DC%%%%DATADIR%%/setup/adprep/fix-forest-rev.ldf %%AD_DC%%%%DATADIR%%/setup/adprep/WindowsServerDocs/Forest-Wide-Updates.md %%AD_DC%%%%DATADIR%%/setup/adprep/WindowsServerDocs/Sch49.ldf.diff %%AD_DC%%%%DATADIR%%/setup/adprep/WindowsServerDocs/Sch50.ldf.diff %%AD_DC%%%%DATADIR%%/setup/adprep/WindowsServerDocs/Sch51.ldf.diff %%AD_DC%%%%DATADIR%%/setup/adprep/WindowsServerDocs/Sch57.ldf.diff %%AD_DC%%%%DATADIR%%/setup/adprep/WindowsServerDocs/Sch59.ldf.diff %%AD_DC%%%%DATADIR%%/setup/adprep/WindowsServerDocs/Schema-Updates.md %%AD_DC%%%%DATADIR%%/setup/aggregate_schema.ldif %%AD_DC%%%%DATADIR%%/setup/cn=samba.ldif %%AD_DC%%%%DATADIR%%/setup/DB_CONFIG %%AD_DC%%%%DATADIR%%/setup/display-specifiers/DisplaySpecifiers-Win2k0.txt %%AD_DC%%%%DATADIR%%/setup/display-specifiers/DisplaySpecifiers-Win2k3.txt %%AD_DC%%%%DATADIR%%/setup/display-specifiers/DisplaySpecifiers-Win2k3R2.txt %%AD_DC%%%%DATADIR%%/setup/display-specifiers/DisplaySpecifiers-Win2k8.txt %%AD_DC%%%%DATADIR%%/setup/display-specifiers/DisplaySpecifiers-Win2k8R2.txt %%AD_DC%%%%DATADIR%%/setup/dns_update_list %%AD_DC%%%%DATADIR%%/setup/extended-rights.ldif %%AD_DC%%%%DATADIR%%/setup/fedora-ds-init.ldif %%AD_DC%%%%DATADIR%%/setup/fedorads-dna.ldif %%AD_DC%%%%DATADIR%%/setup/fedorads-index.ldif %%AD_DC%%%%DATADIR%%/setup/fedorads-linked-attributes.ldif %%AD_DC%%%%DATADIR%%/setup/fedorads-pam.ldif %%AD_DC%%%%DATADIR%%/setup/fedorads-partitions.ldif %%AD_DC%%%%DATADIR%%/setup/fedorads-refint-add.ldif %%AD_DC%%%%DATADIR%%/setup/fedorads-refint-delete.ldif %%AD_DC%%%%DATADIR%%/setup/fedorads-samba.ldif %%AD_DC%%%%DATADIR%%/setup/fedorads-sasl.ldif %%AD_DC%%%%DATADIR%%/setup/fedorads.inf %%AD_DC%%%%DATADIR%%/setup/idmap_init.ldif %%AD_DC%%%%DATADIR%%/setup/krb5.conf %%AD_DC%%%%DATADIR%%/setup/memberof.conf %%AD_DC%%%%DATADIR%%/setup/mmr_serverids.conf %%AD_DC%%%%DATADIR%%/setup/mmr_syncrepl.conf %%AD_DC%%%%DATADIR%%/setup/modules.conf %%AD_DC%%%%DATADIR%%/setup/named.conf %%AD_DC%%%%DATADIR%%/setup/named.conf.dlz %%AD_DC%%%%DATADIR%%/setup/named.conf.update %%AD_DC%%%%DATADIR%%/setup/named.txt %%AD_DC%%%%DATADIR%%/setup/olc_mmr.conf %%AD_DC%%%%DATADIR%%/setup/olc_seed.ldif %%AD_DC%%%%DATADIR%%/setup/olc_serverid.conf %%AD_DC%%%%DATADIR%%/setup/olc_syncrepl_seed.conf %%AD_DC%%%%DATADIR%%/setup/olc_syncrepl.conf %%AD_DC%%%%DATADIR%%/setup/prefixMap.txt %%AD_DC%%%%DATADIR%%/setup/provision_basedn_modify.ldif %%AD_DC%%%%DATADIR%%/setup/provision_basedn_options.ldif %%AD_DC%%%%DATADIR%%/setup/provision_basedn_references.ldif %%AD_DC%%%%DATADIR%%/setup/provision_basedn.ldif %%AD_DC%%%%DATADIR%%/setup/provision_computers_add.ldif %%AD_DC%%%%DATADIR%%/setup/provision_computers_modify.ldif %%AD_DC%%%%DATADIR%%/setup/provision_configuration_basedn.ldif %%AD_DC%%%%DATADIR%%/setup/provision_configuration_modify.ldif %%AD_DC%%%%DATADIR%%/setup/provision_configuration_references.ldif %%AD_DC%%%%DATADIR%%/setup/provision_configuration.ldif %%AD_DC%%%%DATADIR%%/setup/provision_dns_accounts_add.ldif %%AD_DC%%%%DATADIR%%/setup/provision_dns_add_samba.ldif %%AD_DC%%%%DATADIR%%/setup/provision_dnszones_add.ldif %%AD_DC%%%%DATADIR%%/setup/provision_dnszones_modify.ldif %%AD_DC%%%%DATADIR%%/setup/provision_dnszones_partitions.ldif %%AD_DC%%%%DATADIR%%/setup/provision_group_policy.ldif %%AD_DC%%%%DATADIR%%/setup/provision_init.ldif %%AD_DC%%%%DATADIR%%/setup/provision_partitions.ldif %%AD_DC%%%%DATADIR%%/setup/provision_privilege.ldif %%AD_DC%%%%DATADIR%%/setup/provision_rootdse_add.ldif %%AD_DC%%%%DATADIR%%/setup/provision_rootdse_modify.ldif %%AD_DC%%%%DATADIR%%/setup/provision_schema_basedn_modify.ldif %%AD_DC%%%%DATADIR%%/setup/provision_schema_basedn.ldif %%AD_DC%%%%DATADIR%%/setup/provision_self_join_config.ldif %%AD_DC%%%%DATADIR%%/setup/provision_self_join_modify_config.ldif %%AD_DC%%%%DATADIR%%/setup/provision_self_join_modify.ldif %%AD_DC%%%%DATADIR%%/setup/provision_self_join.ldif %%AD_DC%%%%DATADIR%%/setup/provision_users_add.ldif %%AD_DC%%%%DATADIR%%/setup/provision_users_modify.ldif %%AD_DC%%%%DATADIR%%/setup/provision_users.ldif %%AD_DC%%%%DATADIR%%/setup/provision_well_known_sec_princ.ldif %%AD_DC%%%%DATADIR%%/setup/provision.ldif %%AD_DC%%%%DATADIR%%/setup/provision.reg %%AD_DC%%%%DATADIR%%/setup/provision.zone %%AD_DC%%%%DATADIR%%/setup/refint.conf %%AD_DC%%%%DATADIR%%/setup/schema_samba4.ldif %%AD_DC%%%%DATADIR%%/setup/schema-map-fedora-ds-1.0 %%AD_DC%%%%DATADIR%%/setup/schema-map-openldap-2.3 %%AD_DC%%%%DATADIR%%/setup/secrets_dns.ldif %%AD_DC%%%%DATADIR%%/setup/secrets_init.ldif %%AD_DC%%%%DATADIR%%/setup/secrets_sasl_ldap.ldif %%AD_DC%%%%DATADIR%%/setup/secrets_simple_ldap.ldif %%AD_DC%%%%DATADIR%%/setup/secrets.ldif %%AD_DC%%%%DATADIR%%/setup/share.ldif %%AD_DC%%%%DATADIR%%/setup/slapd.conf %%AD_DC%%%%DATADIR%%/setup/spn_update_list %%AD_DC%%%%DATADIR%%/setup/ypServ30.ldif %%AD_DC%%@dir %%DATADIR%%/setup/display-specifiers %%AD_DC%%@dir %%DATADIR%%/setup/ad-schema %%AD_DC%%@dir %%DATADIR%%/setup %%AD_DC%%@dir %%DATADIR%% @comment Man pages man/man1/dbwrap_tool.1.gz man/man1/findsmb.1.gz man/man1/gentest.1.gz man/man1/locktest.1.gz man/man1/log2pcap.1.gz man/man1/masktest.1.gz man/man1/mvxattr.1.gz man/man1/ndrdump.1.gz man/man1/nmblookup.1.gz man/man1/ntlm_auth.1.gz man/man1/oLschema2ldif.1.gz man/man1/pidl.1.gz man/man1/profiles.1.gz man/man1/regdiff.1.gz man/man1/regpatch.1.gz man/man1/regshell.1.gz man/man1/regtree.1.gz man/man1/rpcclient.1.gz man/man1/sharesec.1.gz man/man1/smbcacls.1.gz man/man1/smbclient.1.gz man/man1/smbcontrol.1.gz man/man1/smbcquotas.1.gz man/man1/smbget.1.gz man/man1/smbstatus.1.gz man/man1/smbtar.1.gz -%%SAMBA4_PYTHON2%%man/man1/smbtorture.1.gz +%%SAMBA4_PYTHON%%man/man1/smbtorture.1.gz man/man1/smbtree.1.gz man/man1/testparm.1.gz man/man1/vfstest.1.gz man/man1/wbinfo.1.gz man/man3/Parse::Pidl::Dump.3.gz man/man3/Parse::Pidl::NDR.3.gz man/man3/Parse::Pidl::Util.3.gz man/man3/Parse::Pidl::Wireshark::Conformance.3.gz man/man3/Parse::Pidl::Wireshark::NDR.3.gz man/man5/lmhosts.5.gz man/man5/pam_winbind.conf.5.gz man/man5/smb.conf.5.gz man/man5/smb4.conf.5.gz man/man5/smbgetrc.5.gz man/man5/smbpasswd.5.gz man/man7/libsmbclient.7.gz man/man7/samba.7.gz man/man7/traffic_learner.7.gz man/man7/traffic_replay.7.gz man/man8/cifsdd.8.gz man/man8/eventlogadm.8.gz man/man8/idmap_ad.8.gz man/man8/idmap_autorid.8.gz man/man8/idmap_hash.8.gz man/man8/idmap_ldap.8.gz man/man8/idmap_nss.8.gz man/man8/idmap_rfc2307.8.gz man/man8/idmap_rid.8.gz man/man8/idmap_script.8.gz man/man8/idmap_tdb.8.gz man/man8/idmap_tdb2.8.gz man/man8/net.8.gz man/man8/nmbd.8.gz man/man8/pam_winbind.8.gz man/man8/pdbedit.8.gz -man/man8/samba_gpoupdate.8.gz +man/man8/samba-gpupdate.8.gz man/man8/samba-regedit.8.gz man/man8/samba-tool.8.gz man/man8/samba.8.gz man/man8/smbd.8.gz man/man8/smbpasswd.8.gz man/man8/smbspool_krb5_wrapper.8.gz man/man8/smbspool.8.gz man/man8/vfs_acl_tdb.8.gz man/man8/vfs_acl_xattr.8.gz man/man8/vfs_aio_fork.8.gz man/man8/vfs_aio_pthread.8.gz man/man8/vfs_audit.8.gz man/man8/vfs_cacheprime.8.gz man/man8/vfs_cap.8.gz man/man8/vfs_catia.8.gz man/man8/vfs_commit.8.gz man/man8/vfs_crossrename.8.gz man/man8/vfs_default_quota.8.gz man/man8/vfs_dirsort.8.gz man/man8/vfs_extd_audit.8.gz man/man8/vfs_fake_perms.8.gz -man/man8/vfs_fileid.8.gz +man/man8/vfs_freebsd.8.gz man/man8/vfs_fruit.8.gz man/man8/vfs_full_audit.8.gz -man/man8/vfs_glusterfs.8.gz man/man8/vfs_glusterfs_fuse.8.gz man/man8/vfs_linux_xfs_sgid.8.gz man/man8/vfs_media_harmony.8.gz man/man8/vfs_netatalk.8.gz -man/man8/vfs_nfs4acl_xattr.8.gz man/man8/vfs_offline.8.gz -man/man8/vfs_prealloc.8.gz man/man8/vfs_preopen.8.gz man/man8/vfs_readahead.8.gz man/man8/vfs_readonly.8.gz man/man8/vfs_recycle.8.gz man/man8/vfs_shadow_copy.8.gz man/man8/vfs_shadow_copy2.8.gz man/man8/vfs_shell_snap.8.gz -man/man8/vfs_snapper.8.gz man/man8/vfs_streams_depot.8.gz man/man8/vfs_streams_xattr.8.gz man/man8/vfs_syncops.8.gz man/man8/vfs_time_audit.8.gz -man/man8/vfs_tsmsm.8.gz man/man8/vfs_unityed_media.8.gz man/man8/vfs_virusfilter.8.gz man/man8/vfs_worm.8.gz man/man8/vfs_xattr_tdb.8.gz man/man8/vfs_zfsacl.8.gz man/man8/winbind_krb5_locator.8.gz man/man8/winbindd.8.gz @dir %%SAMBA4_RUNDIR%% @dir %%SAMBA4_LOGDIR%% @dir %%SAMBA4_LOCKDIR%% @dir %%SAMBA4_PRIVATEDIR%% @dir %%SAMBA4_BINDDNSDIR%% @comment Cluster %%CLUSTER%%bin/ctdb %%CLUSTER%%bin/ctdb_diagnostics %%CLUSTER%%bin/ltdbtool %%CLUSTER%%bin/onnode %%CLUSTER%%bin/ping_pong -%%CLUSTER%%sbin/ctdbd -%%CLUSTER%%sbin/ctdbd_wrapper %%CLUSTER%%etc/ctdb/ctdb-crash-cleanup.sh -%%CLUSTER%%etc/ctdb/debug-hung-script.sh %%CLUSTER%%etc/ctdb/debug_locks.sh -%%CLUSTER%%etc/ctdb/events.d/00.ctdb -%%CLUSTER%%etc/ctdb/events.d/01.reclock -%%CLUSTER%%etc/ctdb/events.d/05.system -%%CLUSTER%%etc/ctdb/events.d/06.nfs -%%CLUSTER%%etc/ctdb/events.d/10.external -%%CLUSTER%%etc/ctdb/events.d/10.interface -%%CLUSTER%%etc/ctdb/events.d/11.natgw -%%CLUSTER%%etc/ctdb/events.d/11.routing -%%CLUSTER%%etc/ctdb/events.d/13.per_ip_routing -%%CLUSTER%%etc/ctdb/events.d/20.multipathd -%%CLUSTER%%etc/ctdb/events.d/31.clamd -%%CLUSTER%%etc/ctdb/events.d/40.vsftpd -%%CLUSTER%%etc/ctdb/events.d/41.httpd -%%CLUSTER%%etc/ctdb/events.d/49.winbind -%%CLUSTER%%etc/ctdb/events.d/50.samba -%%CLUSTER%%etc/ctdb/events.d/60.nfs -%%CLUSTER%%etc/ctdb/events.d/70.iscsi -%%CLUSTER%%etc/ctdb/events.d/91.lvs -%%CLUSTER%%etc/ctdb/events.d/99.timeout -%%CLUSTER%%etc/ctdb/events.d/README +%%CLUSTER%%etc/ctdb/debug-hung-script.sh +%%CLUSTER%%etc/ctdb/events/legacy/00.ctdb.script +%%CLUSTER%%etc/ctdb/events/legacy/01.reclock.script +%%CLUSTER%%etc/ctdb/events/legacy/05.system.script +%%CLUSTER%%etc/ctdb/events/legacy/10.interface.script +%%CLUSTER%%etc/ctdb/events/notification/README %%CLUSTER%%etc/ctdb/functions -%%CLUSTER%%etc/ctdb/gcore_trace.sh %%CLUSTER%%etc/ctdb/nfs-checks.d/00.portmapper.check %%CLUSTER%%etc/ctdb/nfs-checks.d/10.status.check %%CLUSTER%%etc/ctdb/nfs-checks.d/20.nfs.check %%CLUSTER%%etc/ctdb/nfs-checks.d/30.nlockmgr.check %%CLUSTER%%etc/ctdb/nfs-checks.d/40.mountd.check %%CLUSTER%%etc/ctdb/nfs-checks.d/50.rquotad.check %%CLUSTER%%etc/ctdb/nfs-checks.d/README %%CLUSTER%%etc/ctdb/nfs-linux-kernel-callout -%%CLUSTER%%etc/ctdb/notify.d/README %%CLUSTER%%etc/ctdb/notify.sh %%CLUSTER%%etc/ctdb/statd-callout %%CLUSTER%%etc/sudoers.d/ctdb -%%CLUSTER%%libexec/ctdb/ctdb_event -%%CLUSTER%%libexec/ctdb/ctdb_eventd +%%CLUSTER%%lib/samba4/private/libctdb-event-client-samba4.so %%CLUSTER%%libexec/ctdb/ctdb_killtcp %%CLUSTER%%libexec/ctdb/ctdb_lock_helper %%CLUSTER%%libexec/ctdb/ctdb_lvs %%CLUSTER%%libexec/ctdb/ctdb_mutex_fcntl_helper %%CLUSTER%%libexec/ctdb/ctdb_natgw %%CLUSTER%%libexec/ctdb/ctdb_recovery_helper %%CLUSTER%%libexec/ctdb/ctdb_takeover_helper +%%CLUSTER%%libexec/ctdb/ctdb-config +%%CLUSTER%%libexec/ctdb/ctdb-event +%%CLUSTER%%libexec/ctdb/ctdb-eventd +%%CLUSTER%%libexec/ctdb/ctdb-path %%CLUSTER%%libexec/ctdb/smnotify -%%CLUSTER%%man/man1/ctdb.1.gz %%CLUSTER%%man/man1/ctdb_diagnostics.1.gz -%%CLUSTER%%man/man1/ctdbd.1.gz +%%CLUSTER%%man/man1/ctdb.1.gz %%CLUSTER%%man/man1/ctdbd_wrapper.1.gz +%%CLUSTER%%man/man1/ctdbd.1.gz %%CLUSTER%%man/man1/ltdbtool.1.gz %%CLUSTER%%man/man1/onnode.1.gz %%CLUSTER%%man/man1/ping_pong.1.gz -%%CLUSTER%%man/man5/ctdbd.conf.5.gz +%%CLUSTER%%man/man5/ctdb-script.options.5.gz +%%CLUSTER%%man/man5/ctdb.conf.5.gz +%%CLUSTER%%man/man5/ctdb.sysconfig.5.gz %%CLUSTER%%man/man7/ctdb-statistics.7.gz %%CLUSTER%%man/man7/ctdb-tunables.7.gz %%CLUSTER%%man/man7/ctdb.7.gz +%%CLUSTER%%sbin/ctdbd +%%CLUSTER%%sbin/ctdbd_wrapper +%%CLUSTER%%share/ctdb/events/legacy/00.ctdb.script +%%CLUSTER%%share/ctdb/events/legacy/01.reclock.script +%%CLUSTER%%share/ctdb/events/legacy/05.system.script +%%CLUSTER%%share/ctdb/events/legacy/06.nfs.script +%%CLUSTER%%share/ctdb/events/legacy/10.interface.script +%%CLUSTER%%share/ctdb/events/legacy/11.natgw.script +%%CLUSTER%%share/ctdb/events/legacy/11.routing.script +%%CLUSTER%%share/ctdb/events/legacy/13.per_ip_routing.script +%%CLUSTER%%share/ctdb/events/legacy/20.multipathd.script +%%CLUSTER%%share/ctdb/events/legacy/31.clamd.script +%%CLUSTER%%share/ctdb/events/legacy/40.vsftpd.script +%%CLUSTER%%share/ctdb/events/legacy/41.httpd.script +%%CLUSTER%%share/ctdb/events/legacy/49.winbind.script +%%CLUSTER%%share/ctdb/events/legacy/50.samba.script +%%CLUSTER%%share/ctdb/events/legacy/60.nfs.script +%%CLUSTER%%share/ctdb/events/legacy/70.iscsi.script +%%CLUSTER%%share/ctdb/events/legacy/91.lvs.script +%%CLUSTER%%@dir /var/lib/ctdb/volatile +%%CLUSTER%%@dir /var/lib/ctdb/state +%%CLUSTER%%@dir /var/lib/ctdb/persistent %%CLUSTER%%@dir /var/lib/ctdb %%CLUSTER%%@dir /var/lib %%CLUSTER%%@dir /var/run/ctdb @comment Use bundled libraries -%%SAMBA4_BUNDLED_LDB%%bin/ldbadd -%%SAMBA4_BUNDLED_LDB%%bin/ldbdel -%%SAMBA4_BUNDLED_LDB%%bin/ldbedit -%%SAMBA4_BUNDLED_LDB%%bin/ldbmodify -%%SAMBA4_BUNDLED_LDB%%bin/ldbrename -%%SAMBA4_BUNDLED_LDB%%bin/ldbsearch -%%SAMBA4_BUNDLED_TDB%%bin/tdbbackup -%%SAMBA4_BUNDLED_TDB%%bin/tdbdump -%%SAMBA4_BUNDLED_TDB%%bin/tdbrestore -%%SAMBA4_BUNDLED_TDB%%bin/tdbtool -%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/_ldb_text.py -%%SAMBA4_BUNDLED_TDB%%%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/_tdb_text.py -%%SAMBA4_BUNDLED_TEVENT%%%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/_tevent.so -%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/ldb.so -%%SAMBA4_BUNDLED_TALLOC%%%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/talloc.so -%%SAMBA4_BUNDLED_TDB%%%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/tdb.so -%%SAMBA4_BUNDLED_TEVENT%%%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/tevent.py -%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/_ldb_text.py -%%SAMBA4_BUNDLED_TDB%%%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/_tdb_text.py -%%SAMBA4_BUNDLED_TEVENT%%%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/_tevent.cpython-36m.so -%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/ldb.cpython-36m.so -%%SAMBA4_BUNDLED_TALLOC%%%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/talloc.cpython-36m.so -%%SAMBA4_BUNDLED_TDB%%%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/tdb.cpython-36m.so -%%SAMBA4_BUNDLED_TEVENT%%%%SAMBA4_PYTHON3%%%%SAMBA4_PYTHON3_SITELIBDIR%%/tevent.py %%SAMBA4_BUNDLED_CMOCKA%%lib/samba4/private/libcmocka-samba4.so +%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/_ldb_text.py +%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/ldb.so +%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_PYTHON%%lib/samba4/private/libpyldb-util.so.1 +%%SAMBA4_BUNDLED_LDB%%bin/samba-ldbdump +%%SAMBA4_BUNDLED_LDB%%bin/samba-ldbadd +%%SAMBA4_BUNDLED_LDB%%bin/samba-ldbdel +%%SAMBA4_BUNDLED_LDB%%bin/samba-ldbedit +%%SAMBA4_BUNDLED_LDB%%bin/samba-ldbmodify +%%SAMBA4_BUNDLED_LDB%%bin/samba-ldbrename +%%SAMBA4_BUNDLED_LDB%%bin/samba-ldbsearch %%SAMBA4_BUNDLED_LDB%%lib/samba4/private/libldb-cmdline-samba4.so +%%SAMBA4_BUNDLED_LDB%%lib/samba4/private/libldb-key-value-samba4.so %%SAMBA4_BUNDLED_LDB%%lib/samba4/private/libldb.so.1 -%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_PYTHON3%%lib/samba4/private/libpyldb-util.cpython-36m.so.1 -%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_PYTHON2%%lib/samba4/private/libpyldb-util.so.1 -%%SAMBA4_BUNDLED_TALLOC%%%%SAMBA4_PYTHON3%%lib/samba4/private/libpytalloc-util.cpython-36m.so.2 -%%SAMBA4_BUNDLED_TALLOC%%%%SAMBA4_PYTHON2%%lib/samba4/private/libpytalloc-util.so.2 -%%SAMBA4_BUNDLED_TALLOC%%lib/samba4/private/libtalloc.so.2 -%%SAMBA4_BUNDLED_TDB%%lib/samba4/private/libtdb.so.1 -%%SAMBA4_BUNDLED_TEVENT%%lib/samba4/private/libtevent.so.0 -%%SAMBA4_BUNDLED_LDB%%lib/shared-modules/ldb/asq.so -%%SAMBA4_BUNDLED_LDB%%lib/shared-modules/ldb/paged_results.so -%%SAMBA4_BUNDLED_LDB%%lib/shared-modules/ldb/paged_searches.so -%%SAMBA4_BUNDLED_LDB%%lib/shared-modules/ldb/rdn_name.so -%%SAMBA4_BUNDLED_LDB%%lib/shared-modules/ldb/sample.so -%%SAMBA4_BUNDLED_LDB%%lib/shared-modules/ldb/server_sort.so -%%SAMBA4_BUNDLED_LDB%%lib/shared-modules/ldb/skel.so -%%SAMBA4_BUNDLED_LDB%%lib/shared-modules/ldb/tdb.so +%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_MODULEDIR%%/ldb/asq.so +%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_MODULEDIR%%/ldb/ldb.so +%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_MODULEDIR%%/ldb/paged_searches.so +%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_MODULEDIR%%/ldb/rdn_name.so +%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_MODULEDIR%%/ldb/sample.so +%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_MODULEDIR%%/ldb/server_sort.so +%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_MODULEDIR%%/ldb/skel.so +%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_MODULEDIR%%/ldb/tdb.so +@comment %%SAMBA4_BUNDLED_LDB%%%%SAMBA4_MODULEDIR%%/ldb/audit_log.so +@comment %%SAMBA4_BUNDLED_LDB%%%%SAMBA4_MODULEDIR%%/ldb/group_audit_log.so +@comment %%SAMBA4_BUNDLED_LDB%%%%SAMBA4_MODULEDIR%%/ldb/mdb.so %%SAMBA4_BUNDLED_LDB%%man/man1/ldbadd.1.gz %%SAMBA4_BUNDLED_LDB%%man/man1/ldbdel.1.gz %%SAMBA4_BUNDLED_LDB%%man/man1/ldbedit.1.gz %%SAMBA4_BUNDLED_LDB%%man/man1/ldbmodify.1.gz %%SAMBA4_BUNDLED_LDB%%man/man1/ldbrename.1.gz %%SAMBA4_BUNDLED_LDB%%man/man1/ldbsearch.1.gz %%SAMBA4_BUNDLED_LDB%%man/man3/ldb.3.gz +%%SAMBA4_BUNDLED_TALLOC%%%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/talloc.so +%%SAMBA4_BUNDLED_TALLOC%%%%SAMBA4_PYTHON%%lib/samba4/private/libpytalloc-util.so.2 +%%SAMBA4_BUNDLED_TALLOC%%lib/samba4/private/libtalloc.so.2 %%SAMBA4_BUNDLED_TALLOC%%man/man3/talloc.3.gz +%%SAMBA4_BUNDLED_TDB%%%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/_tdb_text.py +%%SAMBA4_BUNDLED_TDB%%%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/tdb.so +%%SAMBA4_BUNDLED_TDB%%bin/tdbbackup +%%SAMBA4_BUNDLED_TDB%%bin/tdbdump +%%SAMBA4_BUNDLED_TDB%%bin/tdbrestore +%%SAMBA4_BUNDLED_TDB%%bin/tdbtool +%%SAMBA4_BUNDLED_TDB%%lib/samba4/private/libtdb.so.1 %%SAMBA4_BUNDLED_TDB%%man/man8/tdbbackup.8.gz %%SAMBA4_BUNDLED_TDB%%man/man8/tdbdump.8.gz %%SAMBA4_BUNDLED_TDB%%man/man8/tdbrestore.8.gz %%SAMBA4_BUNDLED_TDB%%man/man8/tdbtool.8.gz +%%SAMBA4_BUNDLED_TEVENT%%%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/_tevent.so +%%SAMBA4_BUNDLED_TEVENT%%%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/tevent.py +%%SAMBA4_BUNDLED_TEVENT%%lib/samba4/private/libtevent.so.0 +@comment Python2 block +%%AD_DC%%%%PYTHON_SITELIBDIR%%/samba/dckeytab.so +%%AD_DC%%%%PYTHON_SITELIBDIR%%/samba/posix_eadb.so +%%AD_DC%%%%PYTHON_SITELIBDIR%%/samba/xattr_native.so +%%AD_DC%%%%PYTHON_SITELIBDIR%%/samba/xattr_tdb.so +%%PYTHON_SITELIBDIR%%/samba/__init__.py +%%PYTHON_SITELIBDIR%%/samba/_glue.so +%%PYTHON_SITELIBDIR%%/samba/_ldb.so +%%PYTHON_SITELIBDIR%%/samba/auth.so +%%PYTHON_SITELIBDIR%%/samba/colour.py +%%PYTHON_SITELIBDIR%%/samba/common.py +%%PYTHON_SITELIBDIR%%/samba/compat.py +%%PYTHON_SITELIBDIR%%/samba/credentials.so +%%PYTHON_SITELIBDIR%%/samba/crypto.so +%%PYTHON_SITELIBDIR%%/samba/dbchecker.py +%%PYTHON_SITELIBDIR%%/samba/dcerpc/__init__.py +%%PYTHON_SITELIBDIR%%/samba/dcerpc/atsvc.so +%%PYTHON_SITELIBDIR%%/samba/dcerpc/auth.so +%%PYTHON_SITELIBDIR%%/samba/dcerpc/base.so +%%PYTHON_SITELIBDIR%%/samba/dcerpc/dcerpc.so +%%PYTHON_SITELIBDIR%%/samba/dcerpc/dfs.so +%%PYTHON_SITELIBDIR%%/samba/dcerpc/dns.so +%%PYTHON_SITELIBDIR%%/samba/dcerpc/dnsp.so +%%PYTHON_SITELIBDIR%%/samba/dcerpc/dnsserver.so +%%PYTHON_SITELIBDIR%%/samba/dcerpc/drsblobs.so +%%PYTHON_SITELIBDIR%%/samba/dcerpc/drsuapi.so +%%PYTHON_SITELIBDIR%%/samba/dcerpc/echo.so +%%PYTHON_SITELIBDIR%%/samba/dcerpc/epmapper.so +%%PYTHON_SITELIBDIR%%/samba/dcerpc/idmap.so +%%PYTHON_SITELIBDIR%%/samba/dcerpc/initshutdown.so +%%PYTHON_SITELIBDIR%%/samba/dcerpc/irpc.so +%%PYTHON_SITELIBDIR%%/samba/dcerpc/krb5pac.so +%%PYTHON_SITELIBDIR%%/samba/dcerpc/lsa.so +%%PYTHON_SITELIBDIR%%/samba/dcerpc/messaging.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/ntlmssp.so +%%PYTHON_SITELIBDIR%%/samba/dcerpc/preg.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/spoolss.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/windows_event_ids.so +%%PYTHON_SITELIBDIR%%/samba/dcerpc/winreg.so +%%PYTHON_SITELIBDIR%%/samba/dcerpc/winspool.so +%%PYTHON_SITELIBDIR%%/samba/dcerpc/witness.so +%%PYTHON_SITELIBDIR%%/samba/dcerpc/wkssvc.so +%%PYTHON_SITELIBDIR%%/samba/dcerpc/xattr.so +%%PYTHON_SITELIBDIR%%/samba/descriptor.py +%%PYTHON_SITELIBDIR%%/samba/dnsserver.py +%%PYTHON_SITELIBDIR%%/samba/domain_update.py +%%PYTHON_SITELIBDIR%%/samba/drs_utils.py +%%AD_DC%%%%PYTHON_SITELIBDIR%%/samba/dsdb_dns.so +%%AD_DC%%%%PYTHON_SITELIBDIR%%/samba/dsdb.so +%%PYTHON_SITELIBDIR%%/samba/emulate/__init__.py +%%PYTHON_SITELIBDIR%%/samba/emulate/traffic_packets.py +%%PYTHON_SITELIBDIR%%/samba/emulate/traffic.py +%%PYTHON_SITELIBDIR%%/samba/forest_update.py +%%PYTHON_SITELIBDIR%%/samba/gensec.so +%%PYTHON_SITELIBDIR%%/samba/getopt.py +%%PYTHON_SITELIBDIR%%/samba/gp_ext_loader.py +%%PYTHON_SITELIBDIR%%/samba/gp_parse/__init__.py +%%PYTHON_SITELIBDIR%%/samba/gp_parse/gp_aas.py +%%PYTHON_SITELIBDIR%%/samba/gp_parse/gp_csv.py +%%PYTHON_SITELIBDIR%%/samba/gp_parse/gp_inf.py +%%PYTHON_SITELIBDIR%%/samba/gp_parse/gp_ini.py +%%PYTHON_SITELIBDIR%%/samba/gp_parse/gp_pol.py +%%PYTHON_SITELIBDIR%%/samba/gp_sec_ext.py +%%PYTHON_SITELIBDIR%%/samba/gpclass.py +%%PYTHON_SITELIBDIR%%/samba/gpo.so +%%PYTHON_SITELIBDIR%%/samba/graph.py +%%PYTHON_SITELIBDIR%%/samba/hostconfig.py +%%PYTHON_SITELIBDIR%%/samba/idmap.py +%%PYTHON_SITELIBDIR%%/samba/join.py +%%PYTHON_SITELIBDIR%%/samba/kcc/__init__.py +%%PYTHON_SITELIBDIR%%/samba/kcc/debug.py +%%PYTHON_SITELIBDIR%%/samba/kcc/graph_utils.py +%%PYTHON_SITELIBDIR%%/samba/kcc/graph.py +%%PYTHON_SITELIBDIR%%/samba/kcc/kcc_utils.py +%%PYTHON_SITELIBDIR%%/samba/kcc/ldif_import_export.py +%%PYTHON_SITELIBDIR%%/samba/logger.py +%%PYTHON_SITELIBDIR%%/samba/mdb_util.py +%%PYTHON_SITELIBDIR%%/samba/messaging.so +%%PYTHON_SITELIBDIR%%/samba/ms_display_specifiers.py +%%PYTHON_SITELIBDIR%%/samba/ms_forest_updates_markdown.py +%%PYTHON_SITELIBDIR%%/samba/ms_schema_markdown.py +%%PYTHON_SITELIBDIR%%/samba/ms_schema.py +%%PYTHON_SITELIBDIR%%/samba/ndr.py +%%PYTHON_SITELIBDIR%%/samba/net.so +%%PYTHON_SITELIBDIR%%/samba/netbios.so +%%PYTHON_SITELIBDIR%%/samba/netcmd/__init__.py +%%PYTHON_SITELIBDIR%%/samba/netcmd/common.py +%%PYTHON_SITELIBDIR%%/samba/netcmd/computer.py +%%PYTHON_SITELIBDIR%%/samba/netcmd/dbcheck.py +%%PYTHON_SITELIBDIR%%/samba/netcmd/delegation.py +%%PYTHON_SITELIBDIR%%/samba/netcmd/dns.py +%%PYTHON_SITELIBDIR%%/samba/netcmd/domain_backup.py +%%PYTHON_SITELIBDIR%%/samba/netcmd/domain.py +%%PYTHON_SITELIBDIR%%/samba/netcmd/drs.py +%%PYTHON_SITELIBDIR%%/samba/netcmd/dsacl.py +%%PYTHON_SITELIBDIR%%/samba/netcmd/forest.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/nettime.py +%%PYTHON_SITELIBDIR%%/samba/netcmd/ntacl.py +%%PYTHON_SITELIBDIR%%/samba/netcmd/ou.py +%%PYTHON_SITELIBDIR%%/samba/netcmd/processes.py +%%PYTHON_SITELIBDIR%%/samba/netcmd/pso.py +%%PYTHON_SITELIBDIR%%/samba/netcmd/rodc.py +%%PYTHON_SITELIBDIR%%/samba/netcmd/schema.py +%%PYTHON_SITELIBDIR%%/samba/netcmd/sites.py +%%PYTHON_SITELIBDIR%%/samba/netcmd/spn.py +%%PYTHON_SITELIBDIR%%/samba/netcmd/testparm.py +%%PYTHON_SITELIBDIR%%/samba/netcmd/user.py +%%PYTHON_SITELIBDIR%%/samba/netcmd/visualize.py +%%PYTHON_SITELIBDIR%%/samba/ntacls.py +%%PYTHON_SITELIBDIR%%/samba/ntstatus.so +%%PYTHON_SITELIBDIR%%/samba/param.so +%%PYTHON_SITELIBDIR%%/samba/policy.so +%%PYTHON_SITELIBDIR%%/samba/provision/__init__.py +%%PYTHON_SITELIBDIR%%/samba/provision/backend.py +%%PYTHON_SITELIBDIR%%/samba/provision/common.py +%%PYTHON_SITELIBDIR%%/samba/provision/kerberos_implementation.py +%%PYTHON_SITELIBDIR%%/samba/provision/kerberos.py +%%PYTHON_SITELIBDIR%%/samba/provision/sambadns.py +%%PYTHON_SITELIBDIR%%/samba/registry.so +%%PYTHON_SITELIBDIR%%/samba/remove_dc.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/sd_utils.py +%%PYTHON_SITELIBDIR%%/samba/security.so +%%PYTHON_SITELIBDIR%%/samba/sites.py +%%PYTHON_SITELIBDIR%%/samba/smb.so +%%PYTHON_SITELIBDIR%%/samba/subnets.py +%%PYTHON_SITELIBDIR%%/samba/subunit/__init__.py +%%PYTHON_SITELIBDIR%%/samba/subunit/run.py +%%PYTHON_SITELIBDIR%%/samba/tdb_util.py +%%PYTHON_SITELIBDIR%%/samba/tests/__init__.py +%%PYTHON_SITELIBDIR%%/samba/tests/audit_log_base.py +%%PYTHON_SITELIBDIR%%/samba/tests/audit_log_dsdb.py +%%PYTHON_SITELIBDIR%%/samba/tests/audit_log_pass_change.py +%%PYTHON_SITELIBDIR%%/samba/tests/auth_log_base.py +%%PYTHON_SITELIBDIR%%/samba/tests/auth_log_ncalrpc.py +%%PYTHON_SITELIBDIR%%/samba/tests/auth_log_netlogon_bad_creds.py +%%PYTHON_SITELIBDIR%%/samba/tests/auth_log_netlogon.py +%%PYTHON_SITELIBDIR%%/samba/tests/auth_log_pass_change.py +%%PYTHON_SITELIBDIR%%/samba/tests/auth_log_samlogon.py +%%PYTHON_SITELIBDIR%%/samba/tests/auth_log.py +%%PYTHON_SITELIBDIR%%/samba/tests/auth.py +%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/__init__.py +%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/bug13653.py +%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/check_output.py +%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/ndrdump.py +%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/netads_json.py +%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/samba_dnsupdate.py +%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/smbcontrol_process.py +%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/smbcontrol.py +%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/traffic_learner.py +%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/traffic_replay.py +%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/traffic_summary.py +%%PYTHON_SITELIBDIR%%/samba/tests/common.py +%%PYTHON_SITELIBDIR%%/samba/tests/complex_expressions.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/array.py +%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/bare.py +%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/dnsserver.py +%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/integer.py +%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/misc.py +%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/raw_protocol.py +%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/raw_testcase.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/string_tests.py +%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/testrpc.py +%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/unix.py +%%PYTHON_SITELIBDIR%%/samba/tests/dckeytab.py +%%PYTHON_SITELIBDIR%%/samba/tests/dns_base.py +%%PYTHON_SITELIBDIR%%/samba/tests/dns_forwarder_helpers/dns_hub.py +%%PYTHON_SITELIBDIR%%/samba/tests/dns_forwarder_helpers/server.py +%%PYTHON_SITELIBDIR%%/samba/tests/dns_forwarder.py +%%PYTHON_SITELIBDIR%%/samba/tests/dns_invalid.py +%%PYTHON_SITELIBDIR%%/samba/tests/dns_tkey.py +%%PYTHON_SITELIBDIR%%/samba/tests/dns_wildcard.py +%%PYTHON_SITELIBDIR%%/samba/tests/dns.py +%%PYTHON_SITELIBDIR%%/samba/tests/docs.py +%%PYTHON_SITELIBDIR%%/samba/tests/domain_backup_offline.py +%%PYTHON_SITELIBDIR%%/samba/tests/domain_backup.py +%%PYTHON_SITELIBDIR%%/samba/tests/dsdb_lock.py +%%PYTHON_SITELIBDIR%%/samba/tests/dsdb_schema_attributes.py +%%PYTHON_SITELIBDIR%%/samba/tests/dsdb.py +%%PYTHON_SITELIBDIR%%/samba/tests/emulate/__init__.py +%%PYTHON_SITELIBDIR%%/samba/tests/emulate/traffic_packet.py +%%PYTHON_SITELIBDIR%%/samba/tests/emulate/traffic.py +%%PYTHON_SITELIBDIR%%/samba/tests/encrypted_secrets.py +%%PYTHON_SITELIBDIR%%/samba/tests/gensec.py +%%PYTHON_SITELIBDIR%%/samba/tests/get_opt.py +%%PYTHON_SITELIBDIR%%/samba/tests/getdcname.py +%%PYTHON_SITELIBDIR%%/samba/tests/glue.py +%%PYTHON_SITELIBDIR%%/samba/tests/gpo.py +%%PYTHON_SITELIBDIR%%/samba/tests/graph.py +%%PYTHON_SITELIBDIR%%/samba/tests/group_audit.py +%%PYTHON_SITELIBDIR%%/samba/tests/hostconfig.py +%%PYTHON_SITELIBDIR%%/samba/tests/join.py +%%PYTHON_SITELIBDIR%%/samba/tests/kcc/__init__.py +%%PYTHON_SITELIBDIR%%/samba/tests/kcc/graph_utils.py +%%PYTHON_SITELIBDIR%%/samba/tests/kcc/graph.py +%%PYTHON_SITELIBDIR%%/samba/tests/kcc/kcc_utils.py +%%PYTHON_SITELIBDIR%%/samba/tests/kcc/ldif_import_export.py +%%PYTHON_SITELIBDIR%%/samba/tests/krb5_credentials.py +%%PYTHON_SITELIBDIR%%/samba/tests/libsmb.py +%%PYTHON_SITELIBDIR%%/samba/tests/loadparm.py +%%PYTHON_SITELIBDIR%%/samba/tests/lsa_string.py +%%PYTHON_SITELIBDIR%%/samba/tests/messaging.py +%%PYTHON_SITELIBDIR%%/samba/tests/net_join_no_spnego.py +%%PYTHON_SITELIBDIR%%/samba/tests/net_join.py +%%PYTHON_SITELIBDIR%%/samba/tests/netbios.py +%%PYTHON_SITELIBDIR%%/samba/tests/netcmd.py +%%PYTHON_SITELIBDIR%%/samba/tests/netlogonsvc.py +%%PYTHON_SITELIBDIR%%/samba/tests/ntacls_backup.py +%%PYTHON_SITELIBDIR%%/samba/tests/ntacls.py +%%PYTHON_SITELIBDIR%%/samba/tests/ntlm_auth_base.py +%%PYTHON_SITELIBDIR%%/samba/tests/ntlm_auth_krb5.py +%%PYTHON_SITELIBDIR%%/samba/tests/ntlm_auth.py +%%PYTHON_SITELIBDIR%%/samba/tests/ntlmdisabled.py +%%PYTHON_SITELIBDIR%%/samba/tests/pam_winbind_chauthtok.py +%%PYTHON_SITELIBDIR%%/samba/tests/pam_winbind_warn_pwd_expire.py +%%PYTHON_SITELIBDIR%%/samba/tests/pam_winbind.py +%%PYTHON_SITELIBDIR%%/samba/tests/param.py +%%PYTHON_SITELIBDIR%%/samba/tests/password_hash_fl2003.py +%%PYTHON_SITELIBDIR%%/samba/tests/password_hash_fl2008.py +%%PYTHON_SITELIBDIR%%/samba/tests/password_hash_gpgme.py +%%PYTHON_SITELIBDIR%%/samba/tests/password_hash_ldap.py +%%PYTHON_SITELIBDIR%%/samba/tests/password_hash.py +%%PYTHON_SITELIBDIR%%/samba/tests/password_quality.py +%%PYTHON_SITELIBDIR%%/samba/tests/password_test.py +%%PYTHON_SITELIBDIR%%/samba/tests/policy.py +%%PYTHON_SITELIBDIR%%/samba/tests/posixacl.py +%%PYTHON_SITELIBDIR%%/samba/tests/prefork_restart.py +%%PYTHON_SITELIBDIR%%/samba/tests/process_limits.py +%%PYTHON_SITELIBDIR%%/samba/tests/provision.py +%%PYTHON_SITELIBDIR%%/samba/tests/pso.py +%%PYTHON_SITELIBDIR%%/samba/tests/py_credentials.py +%%PYTHON_SITELIBDIR%%/samba/tests/registry.py +%%PYTHON_SITELIBDIR%%/samba/tests/s3idmapdb.py +%%PYTHON_SITELIBDIR%%/samba/tests/s3param.py +%%PYTHON_SITELIBDIR%%/samba/tests/s3passdb.py +%%PYTHON_SITELIBDIR%%/samba/tests/s3registry.py +%%PYTHON_SITELIBDIR%%/samba/tests/s3windb.py +%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/__init__.py +%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/base.py +%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/computer.py +%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/demote.py +%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/dnscmd.py +%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/forest.py +%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/fsmo.py +%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/gpo.py +%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/group.py +%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/help.py +%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/join.py +%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/ntacl.py +%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/ou.py +%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/passwordsettings.py +%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/processes.py +%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/provision_password_check.py +%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/rodc.py +%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/schema.py +%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/sites.py +%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/timecmd.py +%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/user_check_password_script.py +%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/user_virtualCryptSHA.py +%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/user_wdigest.py +%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/user.py +%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/visualize_drs.py +%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/visualize.py +%%PYTHON_SITELIBDIR%%/samba/tests/samba3sam.py +%%PYTHON_SITELIBDIR%%/samba/tests/samdb_api.py +%%PYTHON_SITELIBDIR%%/samba/tests/samdb.py +%%PYTHON_SITELIBDIR%%/samba/tests/security.py +%%PYTHON_SITELIBDIR%%/samba/tests/smb.py +%%PYTHON_SITELIBDIR%%/samba/tests/smbd_base.py +%%PYTHON_SITELIBDIR%%/samba/tests/source.py +%%PYTHON_SITELIBDIR%%/samba/tests/strings.py +%%PYTHON_SITELIBDIR%%/samba/tests/subunitrun.py +%%PYTHON_SITELIBDIR%%/samba/tests/tdb_util.py +%%PYTHON_SITELIBDIR%%/samba/tests/upgrade.py +%%PYTHON_SITELIBDIR%%/samba/tests/upgradeprovision.py +%%PYTHON_SITELIBDIR%%/samba/tests/upgradeprovisionneeddc.py +%%PYTHON_SITELIBDIR%%/samba/tests/xattr.py +%%PYTHON_SITELIBDIR%%/samba/third_party/__init__.py +%%PYTHON_SITELIBDIR%%/samba/upgrade.py +%%PYTHON_SITELIBDIR%%/samba/upgradehelpers.py +%%PYTHON_SITELIBDIR%%/samba/web_server/__init__.py +%%PYTHON_SITELIBDIR%%/samba/uptodateness.py +%%PYTHON_SITELIBDIR%%/samba/werror.so +%%PYTHON_SITELIBDIR%%/samba/xattr.py +@unexec find %D/%%PYTHON_SITELIBDIR%%/samba -name '*.py[co]' -delete >/dev/null 2>&1 +@dir %%PYTHON_SITELIBDIR%%/samba/web_server +@dir %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool +@dir %%PYTHON_SITELIBDIR%%/samba/tests/dcerpc +@dir %%PYTHON_SITELIBDIR%%/samba/tests/blackbox +@dir %%PYTHON_SITELIBDIR%%/samba/tests +@dir %%PYTHON_SITELIBDIR%%/samba/samba3 +@dir %%PYTHON_SITELIBDIR%%/samba/provision +@dir %%PYTHON_SITELIBDIR%%/samba/netcmd +@dir %%PYTHON_SITELIBDIR%%/samba/dcerpc +@dir %%PYTHON_SITELIBDIR%%/samba