Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 26 Sep 2020 23:40:25 +0000 (UTC)
From:      "Timur I. Bakeyev" <timur@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r550234 - in head/net: . samba412 samba412/files samba412/files/man
Message-ID:  <202009262340.08QNePG7000406@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: timur
Date: Sat Sep 26 23:40:25 2020
New Revision: 550234
URL: https://svnweb.freebsd.org/changeset/ports/550234

Log:
  Add new samba412 port, version 4.12.7

Added:
  head/net/samba412/files/man/mdfind.1   (contents, props changed)
  head/net/samba412/files/man/nmblookup.1   (contents, props changed)
  head/net/samba412/files/man/ntlm_auth.1   (contents, props changed)
Deleted:
  head/net/samba412/files/patch-source3_modules_vfs__zfsacl.c
  head/net/samba412/files/patch-source4_dsdb_samdb_ldb__modules_count_attrs.c
  head/net/samba412/files/patch-source4_lib_http_http.c
Modified:
  head/net/Makefile
  head/net/samba412/Makefile
  head/net/samba412/distinfo
  head/net/samba412/files/0001-Zfs-provision-1.patch
  head/net/samba412/files/man/ctdb-script.options.5
  head/net/samba412/files/man/ctdb-statistics.7
  head/net/samba412/files/man/ctdb-tunables.7
  head/net/samba412/files/man/ctdb.1
  head/net/samba412/files/man/ctdb.7
  head/net/samba412/files/man/ctdb.conf.5
  head/net/samba412/files/man/ctdb.sysconfig.5
  head/net/samba412/files/man/ctdbd.1
  head/net/samba412/files/man/ctdbd_wrapper.1
  head/net/samba412/files/man/gentest.1
  head/net/samba412/files/man/ldbadd.1
  head/net/samba412/files/man/ldbdel.1
  head/net/samba412/files/man/ldbedit.1
  head/net/samba412/files/man/ldbmodify.1
  head/net/samba412/files/man/ldbrename.1
  head/net/samba412/files/man/ldbsearch.1
  head/net/samba412/files/man/locktest.1
  head/net/samba412/files/man/ltdbtool.1
  head/net/samba412/files/man/masktest.1
  head/net/samba412/files/man/ndrdump.1
  head/net/samba412/files/man/oLschema2ldif.1
  head/net/samba412/files/man/onnode.1
  head/net/samba412/files/man/ping_pong.1
  head/net/samba412/files/man/regdiff.1
  head/net/samba412/files/man/regpatch.1
  head/net/samba412/files/man/regshell.1
  head/net/samba412/files/man/regtree.1
  head/net/samba412/files/man/samba-gpupdate.8
  head/net/samba412/files/man/smbtorture.1
  head/net/samba412/files/patch-bind
  head/net/samba412/files/patch-ctdb_wscript
  head/net/samba412/files/patch-dwrap
  head/net/samba412/files/patch-lib_util_wscript__build
  head/net/samba412/files/patch-source3_modules_vfs__fruit.c
  head/net/samba412/files/patch-source3_winbindd_wscript__build
  head/net/samba412/files/patch-source3_wscript__build
  head/net/samba412/pkg-plist

Modified: head/net/Makefile
==============================================================================
--- head/net/Makefile	Sat Sep 26 23:36:13 2020	(r550233)
+++ head/net/Makefile	Sat Sep 26 23:40:25 2020	(r550234)
@@ -1339,6 +1339,7 @@
     SUBDIR += sacc
     SUBDIR += samba410
     SUBDIR += samba411
+    SUBDIR += samba412
     SUBDIR += samplicator
     SUBDIR += savvycan
     SUBDIR += sbd

Modified: head/net/samba412/Makefile
==============================================================================
--- head/net/samba412/Makefile	Sat Sep 26 23:36:13 2020	(r550233)
+++ head/net/samba412/Makefile	Sat Sep 26 23:40:25 2020	(r550234)
@@ -1,7 +1,7 @@
 # Created by: timur@FreeBSD.org
 # $FreeBSD$
 
-PORTNAME=			${SAMBA4_BASENAME}411
+PORTNAME=			${SAMBA4_BASENAME}412
 PORTVERSION=			${SAMBA4_VERSION}
 PORTREVISION=			0
 CATEGORIES?=			net
@@ -15,7 +15,7 @@ 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-9]-4.* samba410-4.10.* p5-Parse-Pidl-4.*
+CONFLICTS_INSTALL?=		samba4-4.0.* samba4[1-9]-4.* samba41[013-9]-4.1* p5-Parse-Pidl-4.*
 
 USES=				cpe
 
@@ -23,7 +23,7 @@ EXTRA_PATCHES+=			${PATCHDIR}/0001-Zfs-provision-1.pat
 
 SAMBA4_BASENAME=		samba
 SAMBA4_PORTNAME=		${SAMBA4_BASENAME}4
-SAMBA4_VERSION=			4.11.13
+SAMBA4_VERSION=			4.12.7
 SAMBA4_DISTNAME=		${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|}
 
 WRKSRC?=			${WRKDIR}/${DISTNAME}
@@ -85,15 +85,13 @@ OPTIONS_DEFINE=			AD_DC ADS CLUSTER CUPS DOCS FAM GPGM
 OPTIONS_DEFINE+=		DEVELOPER MANDOC
 #OPTIONS_DEFINE+=		MEMORY_DEBUG
 
-OPTIONS_DEFINE_amd64=		AESNI
-OPTIONS_DEFAULT_amd64=		AESNI
-
 OPTIONS_GROUP=			VFS
 OPTIONS_GROUP_VFS=		FRUIT GLUSTERFS
 
 OPTIONS_SINGLE=			GSSAPI ZEROCONF
-# GSSAPI_HEIMDAL
+
 OPTIONS_SINGLE_GSSAPI=		GSSAPI_BUILTIN GSSAPI_MIT
+#GSSAPI_HEIMDAL
 OPTIONS_SINGLE_ZEROCONF=	ZEROCONF_NONE AVAHI MDNSRESPONDER
 
 OPTIONS_RADIO=			DNS
@@ -105,7 +103,6 @@ OPTIONS_DEFAULT=		AD_DC ADS DOCS FAM LDAP \
 ##############################################################################
 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 support
 DEVELOPER_DESC=			With developer framework(implies NTVFS)
 FAM_DESC=			File Alteration Monitor
@@ -140,6 +137,8 @@ NSUPDATE_DESC=			Use samba NSUPDATE utility for AD DC
 
 # Iconv(picked up unconditionaly)
 LIB_DEPENDS+=			libiconv.so:converters/libiconv
+# unwind
+LIB_DEPENDS+=			libunwind.so:devel/libunwind
 # Readline(sponsored by Python)
 # XXX: USES=readline pollutes CPPFLAGS, so we explicitly put dependency
 LIB_DEPENDS+=			libreadline.so:devel/readline
@@ -156,7 +155,8 @@ LIB_DEPENDS+=			libsunacl.so:sysutils/libsunacl
 BUILD_DEPENDS+=			jansson>=2.10:devel/jansson
 RUN_DEPENDS+=			jansson>=2.10:devel/jansson
 # tasn1
-LIB_DEPENDS+=			libtasn1.so:security/libtasn1
+BUILD_DEPENDS+=			libtasn1>=3.8:security/libtasn1
+RUN_DEPENDS+=			libtasn1>=3.8:security/libtasn1
 # External Samba dependencies
 # Needed for IDL compiler
 BUILD_DEPENDS+=			p5-Parse-Yapp>=0:devel/p5-Parse-Yapp
@@ -180,6 +180,7 @@ SUB_LIST+=			SAMBA4_BUNDLED_CMOCKA=""
 .else
 SAMBA4_BUNDLED_LIBS+=		!cmocka
 BUILD_DEPENDS+=			cmocka>=1.1.3:sysutils/cmocka
+TEST_DEPENDS+=			cmocka>=1.1.3:sysutils/cmocka
 PLIST_SUB+=			SAMBA4_BUNDLED_CMOCKA="@comment "
 SUB_LIST+=			SAMBA4_BUNDLED_CMOCKA="@comment "
 .endif
@@ -191,8 +192,8 @@ PLIST_SUB+=			SAMBA4_BUNDLED_TALLOC=""
 SUB_LIST+=			SAMBA4_BUNDLED_TALLOC=""
 .else
 SAMBA4_BUNDLED_LIBS+=		!talloc
-BUILD_DEPENDS+=			talloc>=2.2.0:devel/talloc
-RUN_DEPENDS+=			talloc>=2.2.0:devel/talloc
+BUILD_DEPENDS+=			talloc>=2.3.1:devel/talloc
+RUN_DEPENDS+=			talloc>=2.3.1:devel/talloc
 PLIST_SUB+=			SAMBA4_BUNDLED_TALLOC="@comment "
 SUB_LIST+=			SAMBA4_BUNDLED_TALLOC="@comment "
 .endif
@@ -204,8 +205,8 @@ PLIST_SUB+=			SAMBA4_BUNDLED_TEVENT=""
 SUB_LIST+=			SAMBA4_BUNDLED_TEVENT=""
 .else
 SAMBA4_BUNDLED_LIBS+=		!tevent
-BUILD_DEPENDS+=			tevent>=0.10.0:devel/tevent
-RUN_DEPENDS+=			tevent>=0.10.0:devel/tevent
+BUILD_DEPENDS+=			tevent>=0.10.2:devel/tevent
+RUN_DEPENDS+=			tevent>=0.10.2:devel/tevent
 PLIST_SUB+=			SAMBA4_BUNDLED_TEVENT="@comment "
 SUB_LIST+=			SAMBA4_BUNDLED_TEVENT="@comment "
 .endif
@@ -217,8 +218,8 @@ PLIST_SUB+=			SAMBA4_BUNDLED_TDB=""
 SUB_LIST+=			SAMBA4_BUNDLED_TDB=""
 .else
 SAMBA4_BUNDLED_LIBS+=		!tdb
-BUILD_DEPENDS+=			tdb>=1.4.2:databases/tdb
-RUN_DEPENDS+=			tdb>=1.4.2:databases/tdb
+BUILD_DEPENDS+=			tdb>=1.4.3:databases/tdb
+RUN_DEPENDS+=			tdb>=1.4.3:databases/tdb
 PLIST_SUB+=			SAMBA4_BUNDLED_TDB="@comment "
 SUB_LIST+=			SAMBA4_BUNDLED_TDB="@comment "
 .endif
@@ -231,8 +232,8 @@ SUB_LIST+=			SAMBA4_BUNDLED_LDB=""
 SAMBA4_MODULEDIR=		${SAMBA4_LIBDIR}/modules
 .else
 SAMBA4_BUNDLED_LIBS+=		!ldb
-BUILD_DEPENDS+=			ldb20>=2.0.8:databases/ldb20
-RUN_DEPENDS+=			ldb20>=2.0.8:databases/ldb20
+BUILD_DEPENDS+=			ldb21>=2.1.2:databases/ldb21
+RUN_DEPENDS+=			ldb21>=2.1.2:databases/ldb21
 PLIST_SUB+=			SAMBA4_BUNDLED_LDB="@comment "
 SUB_LIST+=			SAMBA4_BUNDLED_LDB="@comment "
 SAMBA4_MODULEDIR=		${PREFIX}/lib/shared-modules
@@ -274,8 +275,7 @@ CONFIGURE_ARGS+=		\
 				--with-libarchive \
 				--with-acl-support \
 				--with-sendfile-support \
-				--disable-ctdb-tests \
-
+				--disable-ctdb-tests
 #				${ICONV_CONFIGURE_BASE}
 ##############################################################################
 FRUIT_PREVENTS=			ZEROCONF_NONE
@@ -284,7 +284,7 @@ FRUIT_VARS=			SAMBA4_MODULES+=vfs_fruit
 FRUIT_PLIST_FILES+=		man/man8/vfs_fruit.8.gz
 
 GLUSTERFS_CONFIGURE_ENABLE=	glusterfs
-GLUSTERFS_LIB_DEPENDS=		libglusterfs.so:net/glusterfs7-libs
+GLUSTERFS_LIB_DEPENDS=		libglusterfs.so:net/glusterfs
 GLUSTERFS_VARS=			SAMBA4_MODULES+=vfs_glusterfs
 GLUSTERFS_PLIST_FILES+=		man/man8/vfs_glusterfs.8.gz
 ##############################################################################
@@ -313,6 +313,7 @@ PICKY_DEVELOPER_CONFIGURE_ON=	--picky-developer
 
 DEVELOPER_IMPLIES=		NTVFS
 DEVELOPER_CONFIGURE_ON=		--enable-developer --enable-selftest --abi-check-disable
+DEVELOPER_CONFIGURE_ENV=	WAF_CMD_FORMAT=string
 DEVELOPER_RUN_DEPENDS=		${SAMBA4_LMDB_DEPENDS}
 DEVELOPER_BUILD_DEPENDS=	${GDB_CMD}:devel/gdb \
 				${SAMBA4_LMDB_DEPENDS}
@@ -343,6 +344,8 @@ 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
+# ICU
+SPOTLIGHT_LIB_DEPENDS+=		libicuuc.so:devel/icu
 SPOTLIGHT_USES=			bison gnome
 SPOTLIGHT_USE=			gnome=glib20
 
@@ -367,6 +370,11 @@ GSSAPI_MIT_CONFIGURE_ON=	--with-system-mitkrb5 ${GSSAP
 				--with-experimental-mit-ad-dc
 GSSAPI_MIT_USES=		gssapi:mit
 
+GSSAPI_HEIMDAL_CONFIGURE_ON=	--with-system-heimdalkrb5 ${GSSAPIBASEDIR}
+GSSAPI_HEIMDAL_USES=		gssapi:heimdal
+GSSAPI_HEIMDAL_PREVENTS=	AD_DC
+GSSAPI_HEIMDAL_PREVENTS_MSG=	GSSAPI_HEIMDAL and AD_DC enable conflicting options
+
 LIBZFS_CONFIGURE_WITH=		libzfs
 LIBZFS_VARS=			SAMBA4_MODULES+=vfs_zfs_space
 
@@ -441,11 +449,11 @@ SAMBA4_BUNDLED_LIBS+=		!pyldb !pyldb-util
 .	endif
 # samba-tool requires those for *upgrade
 .	if ${PORT_OPTIONS:MAD_DC}
-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}markdown>=2.6.11:textproc/py-markdown@${PY_FLAVOR}
 RUN_DEPENDS+=			${PYTHON_PKGNAMEPREFIX}markdown>=2.6.11:textproc/py-markdown@${PY_FLAVOR}
+.			if ${PORT_OPTIONS:MGPGME}
+RUN_DEPENDS+=			${PYTHON_PKGNAMEPREFIX}gpgme>=1.14.0:security/py-gpgme@${PY_FLAVOR}
+.			endif
 .	endif
 .endif
 
@@ -475,11 +483,9 @@ DEBUG_FLAGS?=			-g -ggdb3 -O0
 ##############################################################################
 .include <bsd.port.pre.mk>
 ##############################################################################
-
-# Require llvm 4.0 and AMD64
-.if ${PORT_OPTIONS:MAESNI} && ${ARCH} == "amd64"
+# Implemented in the gcrypt on AMD64
+.if ${ARCH} == "amd64"
 CONFIGURE_ARGS+=		--accel-aes=intelaesni
-PLIST_FILES+=			lib/samba4/private/libaesni-intel-samba4.so
 .else
 CONFIGURE_ARGS+=		--accel-aes=none
 .endif
@@ -606,10 +612,9 @@ pre-build-MANDOC-off:
 .endif
 
 post-install-rm-junk:
-.if defined(NO_PYTHON)
-				${RM} -r ${STAGEDIR}${PYTHON_SITELIBDIR}/samba/third_party/dns \
-					 ${STAGEDIR}${PYTHON_SITELIBDIR}/samba/third_party/iso8601
-.endif
+				${RM} -r ${STAGEDIR}${PYTHON_SITELIBDIR}/samba/third_party
+				${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name __pycache__ \
+					-type d -print0 | ${XARGS} -0 -n 1 -t ${RM} -r
 
 post-install-fix-manpages:
 .for f in vfs_aio_linux.8 vfs_btrfs.8 vfs_ceph.8 vfs_gpfs.8

Modified: head/net/samba412/distinfo
==============================================================================
--- head/net/samba412/distinfo	Sat Sep 26 23:36:13 2020	(r550233)
+++ head/net/samba412/distinfo	Sat Sep 26 23:40:25 2020	(r550234)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1600556641
-SHA256 (samba-4.11.13.tar.gz) = e71ed29ae01c5ce7be8cee1f53e0530db86dd19b911accb08fae60224e686ba1
-SIZE (samba-4.11.13.tar.gz) = 18598813
+TIMESTAMP = 1600628262
+SHA256 (samba-4.12.7.tar.gz) = 30556a0dd2f9ab3b251eb9db6132ffd4379c159f574366fc2f2eabbc018c6fd2
+SIZE (samba-4.12.7.tar.gz) = 18230157

Modified: head/net/samba412/files/0001-Zfs-provision-1.patch
==============================================================================
--- head/net/samba412/files/0001-Zfs-provision-1.patch	Sat Sep 26 23:36:13 2020	(r550233)
+++ head/net/samba412/files/0001-Zfs-provision-1.patch	Sat Sep 26 23:40:25 2020	(r550234)
@@ -26,7 +26,7 @@ diff --git a/python/samba/provision/__init__.py b/pyth
 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,
+@@ -1695,19 +1695,25 @@ def setsysvolacl(samdb, netlogon, sysvol, uid, gid, do
          s3conf = s3param.get_context()
          s3conf.load(lp.configfile)
  
@@ -40,8 +40,8 @@ index 5de986463a5..cd3b91f41b9 100644
 +        file = tempfile.NamedTemporaryFile(dir=sysvol_dir)
          try:
              try:
--                smbd.set_simple_acl(file.name, 0o755, gid)
-+                set_simple_acl(file.name, 0o755, gid)
+-                smbd.set_simple_acl(file.name, 0o755, system_session_unix(), gid)
++                set_simple_acl(file.name, 0o755, system_session_unix(), gid)
              except OSError:
 -                if not smbd.have_posix_acls():
 +                if not smbd.have_posix_acls() and not smbd.have_nfsv4_acls():
@@ -51,13 +51,13 @@ index 5de986463a5..cd3b91f41b9 100644
 -                    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,
+                 smbd.chown(file.name, uid, gid, system_session_unix())
+@@ -1984,6 +1990,9 @@ def provision_fill(samdb, secrets_ldb, logger, names, 
          samdb.transaction_commit()
  
      if serverrole == "active directory domain controller":
@@ -67,16 +67,16 @@ index 5de986463a5..cd3b91f41b9 100644
          # 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,
+@@ -2340,6 +2349,9 @@ def provision(logger, session_info, smbconf=None,
+ 
              if not os.path.isdir(paths.netlogon):
                  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
@@ -102,7 +102,23 @@ diff --git a/source3/param/loadparm.c b/source3/param/
 index a2fcc4246c9..4b676897fc1 100644
 --- a/source3/param/loadparm.c
 +++ b/source3/param/loadparm.c
-@@ -2740,6 +2740,13 @@ static void init_locals(void)
+@@ -2801,9 +2801,29 @@ static void init_locals(void)
+ 		} else {
+ 			if (lp_parm_const_string(-1, "xattr_tdb", "file", NULL)) {
+ 				lp_do_parameter(-1, "vfs objects", "dfs_samba4 acl_xattr xattr_tdb");
++			/*
++			 * By default, the samba sysvol is located in the statedir. Provisioning will fail in setntacl
++			 * unless we have zfacl enabled. Unfortunately, at this point the smb.conf has not been generated.
++			 * This workaround is freebsd-specific.
++			 */
++#if defined(_PC_ACL_EXTENDED)
++			} else if (pathconf(lp_state_directory(), _PC_ACL_EXTENDED) == 1) {
++				lp_do_parameter(-1, "vfs objects", "dfs_samba4 freebsd");
++#endif
++#if defined(_PC_ACL_NFS4)
++			} else if (pathconf(lp_state_directory(), _PC_ACL_NFS4) == 1) {
++				lp_do_parameter(-1, "vfs objects", "dfs_samba4 zfsacl");
++#endif
  			} else if (lp_parm_const_string(-1, "posix", "eadb", NULL)) {
  				lp_do_parameter(-1, "vfs objects", "dfs_samba4 acl_xattr posix_eadb");
  			} else {
@@ -120,7 +136,7 @@ diff --git a/source3/smbd/pysmbd.c b/source3/smbd/pysm
 index 63fc5d68c33..f5a536ee186 100644
 --- a/source3/smbd/pysmbd.c
 +++ b/source3/smbd/pysmbd.c
-@@ -393,6 +393,20 @@ static SMB_ACL_T make_simple_acl(TALLOC_
+@@ -419,6 +419,20 @@ static SMB_ACL_T make_simple_acl(TALLOC_CTX *mem_ctx,
  	return acl;
  }
  
@@ -141,29 +157,56 @@ index 63fc5d68c33..f5a536ee186 100644
  /*
    set a simple ACL on a file, as a test
   */
-@@ -438,6 +452,57 @@ static PyObject *py_smbd_set_simple_acl(
+@@ -491,7 +505,85 @@ static PyObject *py_smbd_set_simple_acl(PyObject *self
  	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 };
++	const char * const kwnames[] = {
++		"fname",
++		"mode",
++		"session_info",
++		"gid",
++		"service",
++		NULL
++	};
 +	char *fname, *service = NULL;
++	PyObject *py_session = Py_None;
++	struct auth_session_info *session_info = NULL;
 +	int ret;
 +	int mode, gid = -1;
 +	SMB_ACL_T acl;
 +	TALLOC_CTX *frame;
 +	connection_struct *conn;
 +
-+	if (!PyArg_ParseTupleAndKeywords(args, kwargs, "si|iz",
++	if (!PyArg_ParseTupleAndKeywords(args, kwargs, "siO|iz",
 +					 discard_const_p(char *, kwnames),
-+					 &fname, &mode, &gid, &service))
++					 &fname,
++					 &mode,
++					 &py_session,
++					 &gid,
++					 &service))
 +		return NULL;
 +
++	if (!py_check_dcerpc_type(py_session,
++				  "samba.dcerpc.auth",
++				  "session_info")) {
++		return NULL;
++	}
++	session_info = pytalloc_get_type(py_session,
++					 struct auth_session_info);
++	if (session_info == NULL) {
++		PyErr_Format(PyExc_TypeError,
++			     "Expected auth_session_info for session_info argument got %s",
++			     pytalloc_get_name(py_session));
++		return NULL;
++	}
++
 +	frame = talloc_stackframe();
 +
 +	acl = make_simple_nfsv4_acl(frame, gid, mode);
@@ -172,7 +215,7 @@ index 63fc5d68c33..f5a536ee186 100644
 +		Py_RETURN_NONE;
 +	}
 +
-+	conn = get_conn_tos(service, NULL);
++	conn = get_conn_tos(service, session_info);
 +	if (!conn) {
 +		TALLOC_FREE(frame);
 +		Py_RETURN_NONE;
@@ -196,10 +239,11 @@ index 63fc5d68c33..f5a536ee186 100644
 +	Py_RETURN_NONE;
 +}
 +
- /*
++/*
    chown a file
   */
-@@ -537,7 +602,7 @@ static PyObject *py_smbd_unlink(PyObject
+ static PyObject *py_smbd_chown(PyObject *self, PyObject *args, PyObject *kwargs)
+@@ -665,7 +757,7 @@ static PyObject *py_smbd_unlink(PyObject *self, PyObje
  }
  
  /*
@@ -208,7 +252,7 @@ index 63fc5d68c33..f5a536ee186 100644
   */
  static PyObject *py_smbd_have_posix_acls(PyObject *self,
  		PyObject *Py_UNUSED(ignored))
-@@ -549,6 +614,86 @@ static PyObject *py_smbd_have_posix_acls
+@@ -677,7 +769,84 @@ static PyObject *py_smbd_have_posix_acls(PyObject *sel
  #endif
  }
  
@@ -240,7 +284,7 @@ index 63fc5d68c33..f5a536ee186 100644
 +	return PyBool_FromLong(ret);
 +}
 +
-+/*
+ /*
 +  check if we have NFSv4 ACL support
 + */
 +static PyObject *py_smbd_have_nfsv4_acls(PyObject *self)
@@ -284,18 +328,16 @@ index 63fc5d68c33..f5a536ee186 100644
 +static PyObject *py_smbd_set_nfsv4_defaults(PyObject *self)
 +{
 +	/*
-+	 * This should really be done in source3/param/loadparm.c
++	 * It is 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
   */
-@@ -883,10 +1028,28 @@ static PyMethodDef py_smbd_methods[] = {
+ static PyObject *py_smbd_set_nt_acl(PyObject *self, PyObject *args, PyObject *kwargs)
+@@ -1124,8 +1296,26 @@ static PyMethodDef py_smbd_methods[] = {
  	{ "have_posix_acls",
  		(PyCFunction)py_smbd_have_posix_acls, METH_NOARGS,
  		NULL },
@@ -315,15 +357,13 @@ index 63fc5d68c33..f5a536ee186 100644
 +		NULL },
  	{ "set_simple_acl",
  		PY_DISCARD_FUNC_SIG(PyCFunction, py_smbd_set_simple_acl),
- 		METH_VARARGS|METH_KEYWORDS,
- 		NULL },
-+	{ "set_simple_nfsv4_acl",
-+		PY_DISCARD_FUNC_SIG(PyCFunction, py_smbd_set_simple_nfsv4_acl),
 +		METH_VARARGS|METH_KEYWORDS,
 +		NULL },
- 	{ "set_nt_acl",
- 		PY_DISCARD_FUNC_SIG(PyCFunction, py_smbd_set_nt_acl),
++	{ "set_simple_nfsv4_acl",
++		PY_DISCARD_FUNC_SIG(PyCFunction, py_smbd_set_simple_nfsv4_acl),
  		METH_VARARGS|METH_KEYWORDS,
+ 		NULL },
+ 	{ "set_nt_acl",
 -- 
 2.14.2
 

Modified: head/net/samba412/files/man/ctdb-script.options.5
==============================================================================
--- head/net/samba412/files/man/ctdb-script.options.5	Sat Sep 26 23:36:13 2020	(r550233)
+++ head/net/samba412/files/man/ctdb-script.options.5	Sat Sep 26 23:40:25 2020	(r550234)
@@ -2,12 +2,12 @@
 .\"     Title: ctdb-script.options
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>;
-.\"      Date: 11/18/2018
+.\"      Date: 09/23/2020
 .\"    Manual: CTDB - clustered TDB database
 .\"    Source: ctdb
 .\"  Language: English
 .\"
-.TH "CTDB\-SCRIPT\&.OPTIO" "5" "11/18/2018" "ctdb" "CTDB \- clustered TDB database"
+.TH "CTDB\-SCRIPT\&.OPTIO" "5" "09/23/2020" "ctdb" "CTDB \- clustered TDB database"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -513,15 +513,6 @@ MEM\-LIMITS takes the form
 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"

Modified: head/net/samba412/files/man/ctdb-statistics.7
==============================================================================
--- head/net/samba412/files/man/ctdb-statistics.7	Sat Sep 26 23:36:13 2020	(r550233)
+++ head/net/samba412/files/man/ctdb-statistics.7	Sat Sep 26 23:40:25 2020	(r550234)
@@ -2,12 +2,12 @@
 .\"     Title: ctdb-statistics
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>;
-.\"      Date: 11/18/2018
+.\"      Date: 09/23/2020
 .\"    Manual: CTDB - clustered TDB database
 .\"    Source: ctdb
 .\"  Language: English
 .\"
-.TH "CTDB\-STATISTICS" "7" "11/18/2018" "ctdb" "CTDB \- clustered TDB database"
+.TH "CTDB\-STATISTICS" "7" "09/23/2020" "ctdb" "CTDB \- clustered TDB database"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -115,7 +115,7 @@ Time when ctdb was started or the last time statistics
 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\&.
+1 if the databases are currently frozen, 0 otherwise\&.
 .SS "recovering"
 .PP
 1 if recovery is active, 0 otherwise\&.
@@ -383,7 +383,7 @@ Number of failed lock calls\&. This includes database 
 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\&.
+Number of req_call messages which are currently 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\&.
@@ -404,10 +404,10 @@ Number of readonly delegations created\&.
 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\&.
+Distribution of migration requests based on hop counts values\&. Buckets are 0, <\ \&2, <\ \&4, <\ \&8, <\ \&16, <\ \&32, <\ \&64, <\ \&128, <\ \&256, <\ \&512, <\ \&1024, <\ \&2048, <\ \&4096, <\ \&8192, <\ \&16384, ≥\ \&16384\&.
 .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\&.
+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\&.
@@ -516,10 +516,10 @@ Number of queued lock calls\&. This includes database 
 .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\&.
+Distribution of migration requests based on hop counts values\&. Buckets are 0, <\ \&2, <\ \&4, <\ \&8, <\ \&16, <\ \&32, <\ \&64, <\ \&128, <\ \&256, <\ \&512, <\ \&1024, <\ \&2048, <\ \&4096, <\ \&8192, <\ \&16384, ≥\ \&16384\&.
 .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\&.
+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\&.

Modified: head/net/samba412/files/man/ctdb-tunables.7
==============================================================================
--- head/net/samba412/files/man/ctdb-tunables.7	Sat Sep 26 23:36:13 2020	(r550233)
+++ head/net/samba412/files/man/ctdb-tunables.7	Sat Sep 26 23:40:25 2020	(r550234)
@@ -2,12 +2,12 @@
 .\"     Title: ctdb-tunables
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>;
-.\"      Date: 11/18/2018
+.\"      Date: 09/23/2020
 .\"    Manual: CTDB - clustered TDB database
 .\"    Source: ctdb
 .\"  Language: English
 .\"
-.TH "CTDB\-TUNABLES" "7" "11/18/2018" "ctdb" "CTDB \- clustered TDB database"
+.TH "CTDB\-TUNABLES" "7" "09/23/2020" "ctdb" "CTDB \- clustered TDB database"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -81,7 +81,7 @@ 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\&.
+For version checking, CTDB uses major and minor version\&. For example, CTDB 4\&.6\&.1 and 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"
@@ -214,7 +214,7 @@ This is the maximum number of lock helper processes ct
 .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"\&.
+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 "vacuum a database"\&.
 .SS "MaxQueueDropMsg"
 .PP
 Default: 1000000
@@ -265,19 +265,19 @@ This is the limit on the size of the record buffer to 
 .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\&.
+If the recovery daemon has failed to ping the main daemon 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
+If the main daemon has not heard a "ping" from the recovery daemon for this many seconds, the main daemon 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\&.
+When using a reclock file for split brain prevention, if set to non\-zero this tunable will make the recovery daemon 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
@@ -287,7 +287,7 @@ How frequently in seconds should the recovery daemon p
 .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\&.
+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 daemon often use controls that can take a lot longer than normal controls\&.
 .SS "RecoveryBanPeriod"
 .PP
 Default: 300
@@ -311,12 +311,6 @@ 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
@@ -373,18 +367,6 @@ number of fast path vacuuming runs, ctdb will trigger 
 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

Modified: head/net/samba412/files/man/ctdb.1
==============================================================================
--- head/net/samba412/files/man/ctdb.1	Sat Sep 26 23:36:13 2020	(r550233)
+++ head/net/samba412/files/man/ctdb.1	Sat Sep 26 23:40:25 2020	(r550234)
@@ -2,12 +2,12 @@
 .\"     Title: ctdb
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>;
-.\"      Date: 11/18/2018
+.\"      Date: 09/23/2020
 .\"    Manual: CTDB - clustered TDB database
 .\"    Source: ctdb
 .\"  Language: English
 .\"
-.TH "CTDB" "1" "11/18/2018" "ctdb" "CTDB \- clustered TDB database"
+.TH "CTDB" "1" "09/23/2020" "ctdb" "CTDB \- clustered TDB database"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -103,7 +103,7 @@ Print some help text to the screen\&.
 .PP
 \-\-usage
 .RS 4
-Print useage information to the screen\&.
+Print usage information to the screen\&.
 .RE
 .PP
 \-d \-\-debug=\fIDEBUGLEVEL\fR
@@ -120,7 +120,7 @@ This command displays the PNN of the current node\&.
 .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\&.
+Note: If the queried node is INACTIVE then the status might not be current\&.
 .sp
 .it 1 an-trap
 .nr an-no-space-flag 1
@@ -291,7 +291,7 @@ pnn:1 10\&.0\&.0\&.31        OK
 .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\&.
+Note: If 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\&.
@@ -728,7 +728,6 @@ RecoveryDropAllIPs      = 120
 VacuumInterval          = 10
 VacuumMaxRunTime        = 120
 RepackLimit             = 10000
-VacuumLimit             = 5000
 VacuumFastPathCount     = 60
 MaxQueueDropMsg         = 1000000
 AllowUnhealthyDBRead    = 0
@@ -1076,7 +1075,7 @@ NoIPFailback = 1
 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\&.
+This command is used to 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
@@ -1085,7 +1084,7 @@ Once this setting has been enabled/disabled, you need 
 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\&.
+This command is used to 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
@@ -1249,7 +1248,7 @@ This command is currently unable to make changes to th
 .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\&.
+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 automatically\&. 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

Modified: head/net/samba412/files/man/ctdb.7
==============================================================================
--- head/net/samba412/files/man/ctdb.7	Sat Sep 26 23:36:13 2020	(r550233)
+++ head/net/samba412/files/man/ctdb.7	Sat Sep 26 23:40:25 2020	(r550234)
@@ -2,12 +2,12 @@
 .\"     Title: ctdb
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>;
-.\"      Date: 11/18/2018
+.\"      Date: 09/23/2020
 .\"    Manual: CTDB - clustered TDB database
 .\"    Source: ctdb
 .\"  Language: English
 .\"
-.TH "CTDB" "7" "11/18/2018" "ctdb" "CTDB \- clustered TDB database"
+.TH "CTDB" "7" "09/23/2020" "ctdb" "CTDB \- clustered TDB database"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

Modified: head/net/samba412/files/man/ctdb.conf.5
==============================================================================
--- head/net/samba412/files/man/ctdb.conf.5	Sat Sep 26 23:36:13 2020	(r550233)
+++ head/net/samba412/files/man/ctdb.conf.5	Sat Sep 26 23:40:25 2020	(r550234)
@@ -2,12 +2,12 @@
 .\"     Title: ctdb.conf
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>;
-.\"      Date: 11/18/2018
+.\"      Date: 09/23/2020
 .\"    Manual: CTDB - clustered TDB database
 .\"    Source: ctdb
 .\"  Language: English
 .\"
-.TH "CTDB\&.CONF" "5" "11/18/2018" "ctdb" "CTDB \- clustered TDB database"
+.TH "CTDB\&.CONF" "5" "09/23/2020" "ctdb" "CTDB \- clustered TDB database"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -240,7 +240,7 @@ 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
+To allow the node to take part in the cluster it must be manually continued with the
 \fBctdb continue\fR
 command\&.
 .sp

Modified: head/net/samba412/files/man/ctdb.sysconfig.5
==============================================================================
--- head/net/samba412/files/man/ctdb.sysconfig.5	Sat Sep 26 23:36:13 2020	(r550233)
+++ head/net/samba412/files/man/ctdb.sysconfig.5	Sat Sep 26 23:40:25 2020	(r550234)
@@ -2,12 +2,12 @@
 .\"     Title: ctdb.sysconfig
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>;
-.\"      Date: 11/18/2018
+.\"      Date: 09/23/2020
 .\"    Manual: CTDB - clustered TDB database
 .\"    Source: ctdb
 .\"  Language: English
 .\"
-.TH "CTDB\&.SYSCONFIG" "5" "11/18/2018" "ctdb" "CTDB \- clustered TDB database"
+.TH "CTDB\&.SYSCONFIG" "5" "09/23/2020" "ctdb" "CTDB \- clustered TDB database"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

Modified: head/net/samba412/files/man/ctdbd.1
==============================================================================
--- head/net/samba412/files/man/ctdbd.1	Sat Sep 26 23:36:13 2020	(r550233)
+++ head/net/samba412/files/man/ctdbd.1	Sat Sep 26 23:40:25 2020	(r550234)
@@ -2,12 +2,12 @@
 .\"     Title: ctdbd
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>;
-.\"      Date: 11/18/2018
+.\"      Date: 09/23/2020
 .\"    Manual: CTDB - clustered TDB database
 .\"    Source: ctdb
 .\"  Language: English
 .\"
-.TH "CTDBD" "1" "11/18/2018" "ctdb" "CTDB \- clustered TDB database"
+.TH "CTDBD" "1" "09/23/2020" "ctdb" "CTDB \- clustered TDB database"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -47,7 +47,9 @@ for an overview of CTDB\&.
 .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\&.
+Enable interactive mode\&. This will make ctdbd run in the foreground and not detach from the terminal\&. In this mode ctdbd will log to stderr\&.
+.sp
+By default ctdbd will detach itself and run in the background as a daemon, logging to the configured destination\&.
 .RE
 .PP
 \-?, \-\-help

Modified: head/net/samba412/files/man/ctdbd_wrapper.1
==============================================================================
--- head/net/samba412/files/man/ctdbd_wrapper.1	Sat Sep 26 23:36:13 2020	(r550233)
+++ head/net/samba412/files/man/ctdbd_wrapper.1	Sat Sep 26 23:40:25 2020	(r550234)
@@ -2,12 +2,12 @@
 .\"     Title: ctdbd_wrapper
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>;
-.\"      Date: 11/18/2018
+.\"      Date: 09/23/2020
 .\"    Manual: CTDB - clustered TDB database
 .\"    Source: ctdb
 .\"  Language: English
 .\"
-.TH "CTDBD_WRAPPER" "1" "11/18/2018" "ctdb" "CTDB \- clustered TDB database"
+.TH "CTDBD_WRAPPER" "1" "09/23/2020" "ctdb" "CTDB \- clustered TDB database"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

Modified: head/net/samba412/files/man/gentest.1
==============================================================================
--- head/net/samba412/files/man/gentest.1	Sat Sep 26 23:36:13 2020	(r550233)
+++ head/net/samba412/files/man/gentest.1	Sat Sep 26 23:40:25 2020	(r550234)
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: gentest
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>;
-.\"      Date: 03/21/2017
+.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>;
+.\"      Date: 09/23/2020
 .\"    Manual: Test Suite
 .\"    Source: Samba 4.0
 .\"  Language: English
 .\"
-.TH "GENTEST" "1" "03/21/2017" "Samba 4\&.0" "Test Suite"
+.TH "GENTEST" "1" "09/23/2020" "Samba 4\&.0" "Test Suite"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

Modified: head/net/samba412/files/man/ldbadd.1
==============================================================================
--- head/net/samba412/files/man/ldbadd.1	Sat Sep 26 23:36:13 2020	(r550233)
+++ head/net/samba412/files/man/ldbadd.1	Sat Sep 26 23:40:25 2020	(r550234)
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: ldbadd
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>;
-.\"      Date: 11/05/2017
+.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>;
+.\"      Date: 09/23/2020
 .\"    Manual: System Administration tools
 .\"    Source: LDB 1.1
 .\"  Language: English
 .\"
-.TH "LDBADD" "1" "11/05/2017" "LDB 1\&.1" "System Administration tools"
+.TH "LDBADD" "1" "09/23/2020" "LDB 1\&.1" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -52,7 +52,7 @@ LDB URL to connect to\&. See ldb(3) for details\&.
 .PP
 LDB_URL
 .RS 4
-LDB URL to connect to (can be overrided by using the \-H command\-line option\&.)
+LDB URL to connect to (can be overridden by using the \-H command\-line option\&.)
 .RE
 .SH "VERSION"
 .PP

Modified: head/net/samba412/files/man/ldbdel.1
==============================================================================
--- head/net/samba412/files/man/ldbdel.1	Sat Sep 26 23:36:13 2020	(r550233)
+++ head/net/samba412/files/man/ldbdel.1	Sat Sep 26 23:40:25 2020	(r550234)
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: ldbdel
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>;
-.\"      Date: 11/05/2017
+.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>;
+.\"      Date: 09/23/2020
 .\"    Manual: System Administration tools
 .\"    Source: LDB 1.1
 .\"  Language: English
 .\"
-.TH "LDBDEL" "1" "11/05/2017" "LDB 1\&.1" "System Administration tools"
+.TH "LDBDEL" "1" "09/23/2020" "LDB 1\&.1" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -52,7 +52,7 @@ LDB URL to connect to\&. See ldb(3) for details\&.
 .PP
 LDB_URL
 .RS 4
-LDB URL to connect to (can be overrided by using the \-H command\-line option\&.)
+LDB URL to connect to (can be overridden by using the \-H command\-line option\&.)
 .RE
 .SH "VERSION"
 .PP

Modified: head/net/samba412/files/man/ldbedit.1
==============================================================================
--- head/net/samba412/files/man/ldbedit.1	Sat Sep 26 23:36:13 2020	(r550233)
+++ head/net/samba412/files/man/ldbedit.1	Sat Sep 26 23:40:25 2020	(r550234)
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: ldbedit
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>;
-.\"      Date: 11/05/2017
+.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>;
+.\"      Date: 09/23/2020
 .\"    Manual: System Administration tools
 .\"    Source: LDB 1.1
 .\"  Language: English
 .\"
-.TH "LDBEDIT" "1" "11/05/2017" "LDB 1\&.1" "System Administration tools"
+.TH "LDBEDIT" "1" "09/23/2020" "LDB 1\&.1" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

Modified: head/net/samba412/files/man/ldbmodify.1
==============================================================================
--- head/net/samba412/files/man/ldbmodify.1	Sat Sep 26 23:36:13 2020	(r550233)
+++ head/net/samba412/files/man/ldbmodify.1	Sat Sep 26 23:40:25 2020	(r550234)
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: ldbmodify
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>;
-.\"      Date: 11/05/2017
+.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>;
+.\"      Date: 09/23/2020
 .\"    Manual: System Administration tools
 .\"    Source: LDB 1.1
 .\"  Language: English
 .\"
-.TH "LDBMODIFY" "1" "11/05/2017" "LDB 1\&.1" "System Administration tools"
+.TH "LDBMODIFY" "1" "09/23/2020" "LDB 1\&.1" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -47,7 +47,7 @@ LDB URL to connect to\&. See ldb(3) for details\&.
 .PP
 LDB_URL
 .RS 4
-LDB URL to connect to (can be overrided by using the \-H command\-line option\&.)
+LDB URL to connect to (can be overridden by using the \-H command\-line option\&.)
 .RE
 .SH "VERSION"
 .PP

Modified: head/net/samba412/files/man/ldbrename.1
==============================================================================
--- head/net/samba412/files/man/ldbrename.1	Sat Sep 26 23:36:13 2020	(r550233)
+++ head/net/samba412/files/man/ldbrename.1	Sat Sep 26 23:40:25 2020	(r550234)
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: ldbrename
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>;
-.\"      Date: 11/05/2017
+.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>;
+.\"      Date: 09/23/2020
 .\"    Manual: System Administration tools
 .\"    Source: LDB 1.1
 .\"  Language: English
 .\"
-.TH "LDBRENAME" "1" "11/05/2017" "LDB 1\&.1" "System Administration tools"
+.TH "LDBRENAME" "1" "09/23/2020" "LDB 1\&.1" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -55,7 +55,7 @@ Extra ldb options, such as modules\&.
 .PP
 LDB_URL
 .RS 4
-LDB URL to connect to (can be overrided by using the \-H command\-line option\&.)
+LDB URL to connect to (can be overridden by using the \-H command\-line option\&.)

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009262340.08QNePG7000406>