The branch, v4-21-test has been updated
via bbfc736f268 s3: SIGHUP handlers use consistent log level 3
via 8fa36e029bd shadow_copy2: Ignore VFS_OPEN_HOW_WITH_BACKUP_INTENT
from f36c7d623ba s4:lib/messaging: fix interaction between
imessaging_reinit and irpc_destructor
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-21-test
- Log -----------------------------------------------------------------
commit bbfc736f268af22d059a22dc85ed3c4345df4cb1
Author: Jones Syue <joness...@qnap.com>
Date: Mon Sep 2 17:11:00 2024 +0800
s3: SIGHUP handlers use consistent log level 3
When turn-on 'log level = 3', sending SIGHUP to samba processes, for
example: smbd parent/children, smbd-notifyd, and smbd-cleanupd. Then
monitor log.smbd in order to parse sighup logs, it looks like the log level
is inconsistent among these processes: smbd parent/children use level 1,
and smbd-notifyd/smbd-cleanupd use level 3.
This patch raises sighup handler's log level from level 1 to level 3, which
is more consistent with smbd-notifyd by Commit 6e5bff80a0a0b ("s3:notifyd:
Handle sigup in notifyd to reparse smb.conf"), and smbd-cleanupd by Commit
57c1e115ecef4 ("smbd: reopen logs on SIGHUP for notifyd and cleanupd").
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15706
Signed-off-by: Jones Syue <joness...@qnap.com>
Reviewed-by: Jeremy Allison <j...@samba.org>
Reviewed-by: Martin Schwenke <mar...@meltin.net>
Autobuild-User(master): Martin Schwenke <mart...@samba.org>
Autobuild-Date(master): Wed Sep 25 01:38:02 UTC 2024 on atb-devel-224
(cherry picked from commit 4f3dfb2029c667b6dcd43223fe154dca59143e95)
Autobuild-User(v4-21-test): Jule Anger <jan...@samba.org>
Autobuild-Date(v4-21-test): Fri Oct 4 10:13:17 UTC 2024 on atb-devel-224
commit 8fa36e029bd6c7a1a17469a2bece8904610ee075
Author: Christof Schmitt <c...@samba.org>
Date: Tue Oct 1 13:29:56 2024 -0700
shadow_copy2: Ignore VFS_OPEN_HOW_WITH_BACKUP_INTENT
d1846452e96 vfs: Add VFS_OPEN_HOW_WITH_BACKUP_INTENT introduced
VFS_OPEN_HOW_WITH_BACKUP_INTENT for files opened with
FILE_OPEN_FOR_BACKUP_INTENT. shadow_copy2 refuses the open on a file if
any flage in how.resolve is set. Change the check in shadow_copy2 to
allow opening of files with VFS_OPEN_HOW_WITH_BACKUP_INTENT.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15730
Signed-off-by: Christof Schmitt <c...@samba.org>
Reviewed-by: Volker Lendecke <v...@samba.org>
Autobuild-User(master): Volker Lendecke <v...@samba.org>
Autobuild-Date(master): Wed Oct 2 08:06:38 UTC 2024 on atb-devel-224
(cherry picked from commit 30b0fa892ad66bfad92403186f97fd46496e62de)
-----------------------------------------------------------------------
Summary of changes:
source3/modules/vfs_shadow_copy2.c | 2 +-
source3/printing/queue_process.c | 2 +-
source3/smbd/server.c | 2 +-
source3/smbd/smb2_process.c | 2 +-
source3/winbindd/winbindd_dual.c | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/modules/vfs_shadow_copy2.c
b/source3/modules/vfs_shadow_copy2.c
index 9d3f5843f43..c14c7b6be6b 100644
--- a/source3/modules/vfs_shadow_copy2.c
+++ b/source3/modules/vfs_shadow_copy2.c
@@ -1560,7 +1560,7 @@ static int shadow_copy2_openat(vfs_handle_struct *handle,
int ret;
bool ok;
- if (how.resolve != 0) {
+ if ((how.resolve & ~VFS_OPEN_HOW_WITH_BACKUP_INTENT) != 0) {
errno = ENOSYS;
return -1;
}
diff --git a/source3/printing/queue_process.c b/source3/printing/queue_process.c
index d1e95bb083a..0f95bd736f2 100644
--- a/source3/printing/queue_process.c
+++ b/source3/printing/queue_process.c
@@ -221,7 +221,7 @@ static void bq_sig_hup_handler(struct tevent_context *ev,
state = talloc_get_type_abort(pvt, struct bq_state);
change_to_root_user();
- DEBUG(1, ("Reloading pcap cache after SIGHUP\n"));
+ DBG_NOTICE("Reloading pcap cache after SIGHUP\n");
pcap_cache_reload(state->ev, state->msg,
reload_pcap_change_notify);
printing_subsystem_queue_tasks(state);
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index e9ba7be9166..71deecb3d96 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -1426,7 +1426,7 @@ static void smbd_parent_sig_hup_handler(struct
tevent_context *ev,
void *private_data)
{
change_to_root_user();
- DEBUG(1,("parent: Reloading services after SIGHUP\n"));
+ DBG_NOTICE("parent: Reloading services after SIGHUP\n");
reload_services(NULL, NULL, false);
}
diff --git a/source3/smbd/smb2_process.c b/source3/smbd/smb2_process.c
index a4a0e8265ad..6931bfba81c 100644
--- a/source3/smbd/smb2_process.c
+++ b/source3/smbd/smb2_process.c
@@ -1677,7 +1677,7 @@ static void smbd_sig_hup_handler(struct tevent_context
*ev,
struct smbd_server_connection);
change_to_root_user();
- DEBUG(1,("Reloading services after SIGHUP\n"));
+ DBG_NOTICE("Reloading services after SIGHUP\n");
reload_services(sconn, conn_snum_used, false);
}
diff --git a/source3/winbindd/winbindd_dual.c b/source3/winbindd/winbindd_dual.c
index fdb66d0e1c7..d4e1995f928 100644
--- a/source3/winbindd/winbindd_dual.c
+++ b/source3/winbindd/winbindd_dual.c
@@ -2062,7 +2062,7 @@ static void winbindd_sig_hup_handler(struct
tevent_context *ev,
{
const char *file = (const char *)private_data;
- DEBUG(1,("Reloading services after SIGHUP\n"));
+ DBG_NOTICE("Reloading services after SIGHUP\n");
flush_caches_noinit();
winbindd_reload_services_file(file);
}
--
Samba Shared Repository
