The branch, v4-22-test has been updated
via ca2add8c968 s3:smbd: disable "vfs mkdir use tmp name = auto" on
OpenBSD
via 1fab55c3be1 ctdb-utils: Fix incorrect FSF address
from a210c2b2bc5 python:tdb_util: "samba-tool domain backup offline"
hangs
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-22-test
- Log -----------------------------------------------------------------
commit ca2add8c96822cccc91d5008ab975c54e7244533
Author: Ralph Boehme <[email protected]>
Date: Tue Mar 4 17:33:44 2025 +0100
s3:smbd: disable "vfs mkdir use tmp name = auto" on OpenBSD
This is the simplest way to avoid a regression.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15801
Pair-Programmed-With: Stefan Metzmacher <[email protected]>
Signed-off-by: Ralph Boehme <[email protected]>
Signed-off-by: Stefan Metzmacher <[email protected]>
Autobuild-User(master): Stefan Metzmacher <[email protected]>
Autobuild-Date(master): Wed Mar 5 12:37:40 UTC 2025 on atb-devel-224
(cherry picked from commit a3f129f66346dcec41a01caf8060fe1a9da484ac)
Autobuild-User(v4-22-test): Jule Anger <[email protected]>
Autobuild-Date(v4-22-test): Wed Mar 5 15:13:18 UTC 2025 on atb-devel-224
commit 1fab55c3be13f83498c81955beb5faedbb865d41
Author: Martin Schwenke <[email protected]>
Date: Wed Mar 5 09:16:20 2025 +1100
ctdb-utils: Fix incorrect FSF address
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15820
Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Douglas Bagnall <[email protected]>
Autobuild-User(master): Douglas Bagnall <[email protected]>
Autobuild-Date(master): Wed Mar 5 03:40:15 UTC 2025 on atb-devel-224
(cherry picked from commit 9675d8aed8e3368f0a797490f3bf85d8026e5acc)
-----------------------------------------------------------------------
Summary of changes:
ctdb/utils/pmda/Install | 3 +--
ctdb/utils/pmda/Remove | 3 +--
ctdb/utils/pmda/domain.h | 3 +--
ctdb/utils/pmda/help | 3 +--
ctdb/utils/pmda/pmda_ctdb.c | 3 +--
ctdb/utils/pmda/pmns | 3 +--
docs-xml/smbdotconf/vfs/vfsmkdirusetmpname.xml | 2 ++
source3/smbd/open.c | 13 +++++++++++++
source3/wscript | 3 +++
9 files changed, 24 insertions(+), 12 deletions(-)
Changeset truncated at 500 lines:
diff --git a/ctdb/utils/pmda/Install b/ctdb/utils/pmda/Install
index a56a63506a8..bd12b7486cf 100644
--- a/ctdb/utils/pmda/Install
+++ b/ctdb/utils/pmda/Install
@@ -13,8 +13,7 @@
# for more details.
#
# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# with this program; if not, see <https://www.gnu.org/licenses/>.
#
# Install the ctdb PMDA and/or PMNS
#
diff --git a/ctdb/utils/pmda/Remove b/ctdb/utils/pmda/Remove
index 7d1c509e50e..8bf0fe76e15 100644
--- a/ctdb/utils/pmda/Remove
+++ b/ctdb/utils/pmda/Remove
@@ -13,8 +13,7 @@
# for more details.
#
# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# with this program; if not, see <https://www.gnu.org/licenses/>.
#
# Remove the ctdb PMDA
#
diff --git a/ctdb/utils/pmda/domain.h b/ctdb/utils/pmda/domain.h
index 0bed7fef599..b00d32d90dc 100644
--- a/ctdb/utils/pmda/domain.h
+++ b/ctdb/utils/pmda/domain.h
@@ -13,7 +13,6 @@
* 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
#define CTDB 110
diff --git a/ctdb/utils/pmda/help b/ctdb/utils/pmda/help
index 0e9984eab3a..26b5385b0da 100644
--- a/ctdb/utils/pmda/help
+++ b/ctdb/utils/pmda/help
@@ -12,8 +12,7 @@
# for more details.
#
# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# with this program; if not, see <https://www.gnu.org/licenses/>.
#
# ctdb PMDA help file in the ASCII format
#
diff --git a/ctdb/utils/pmda/pmda_ctdb.c b/ctdb/utils/pmda/pmda_ctdb.c
index 4f7933de9c5..7ac8a3b38d1 100644
--- a/ctdb/utils/pmda/pmda_ctdb.c
+++ b/ctdb/utils/pmda/pmda_ctdb.c
@@ -15,8 +15,7 @@
* for more details.
*
* You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * with this program; if not, see <https://www.gnu.org/licenses/>.
*/
#include "replace.h"
diff --git a/ctdb/utils/pmda/pmns b/ctdb/utils/pmda/pmns
index dc7e3ac2bfa..c9f6644d52f 100644
--- a/ctdb/utils/pmda/pmns
+++ b/ctdb/utils/pmda/pmns
@@ -15,8 +15,7 @@
* for more details.
*
* You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * with this program; if not, see <https://www.gnu.org/licenses/>.
*/
ctdb {
diff --git a/docs-xml/smbdotconf/vfs/vfsmkdirusetmpname.xml
b/docs-xml/smbdotconf/vfs/vfsmkdirusetmpname.xml
index 92a39f8f541..a0d733c47f8 100644
--- a/docs-xml/smbdotconf/vfs/vfsmkdirusetmpname.xml
+++ b/docs-xml/smbdotconf/vfs/vfsmkdirusetmpname.xml
@@ -31,6 +31,8 @@
<smbconfoption name="inherit permissions"/>,
<smbconfoption name="nt acl support"/> or
<smbconfoption name="store dos attributes"/>.
+ Note on OpenBSD Auto (the default) is mapped to <constant>no</constant>,
+ see <ulink
url="https://bugzilla.samba.org/show_bug.cgi?id=15801";>https://bugzilla.samba.org/show_bug.cgi?id=15801</ulink>.
</para>
<para>
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 3982c39ed47..771734f6203 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -4564,6 +4564,19 @@ static NTSTATUS mkdir_internal(connection_struct *conn,
need_tmpname = true;
}
+#ifdef OPENBSD
+ /*
+ * OpenBSD requires to have write permissions
+ * on both source and destimation of renameat(),
+ * see https://bugzilla.samba.org/show_bug.cgi?id=15801
+ *
+ * For now just disable the new code by default.
+ */
+ if (vfs_use_tmp == Auto) {
+ vfs_use_tmp = false;
+ }
+#endif
+
if (vfs_use_tmp != Auto) {
need_tmpname = vfs_use_tmp;
}
diff --git a/source3/wscript b/source3/wscript
index 26327cba32f..64ce229d030 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -457,6 +457,9 @@ vsyslog
conf.DEFINE('HAVE_FREEBSD_SUNACL_H', '1')
conf.CHECK_FUNCS_IN(['acl'], 'sunacl')
conf.DEFINE('STAT_ST_BLOCKSIZE', '512')
+ elif (host_os.rfind('openbsd') > -1):
+ conf.DEFINE('OPENBSD', 1)
+ conf.DEFINE('STAT_ST_BLOCKSIZE', '512')
elif (host_os.rfind('irix') > -1):
conf.DEFINE('IRIX', 1)
conf.DEFINE('STAT_ST_BLOCKSIZE', '512')
--
Samba Shared Repository
