diff --git a/samba-disable-systemd-notifications.patch b/samba-disable-systemd-notifications.patch new file mode 100644 index 0000000..9e57630 --- /dev/null +++ b/samba-disable-systemd-notifications.patch @@ -0,0 +1,36 @@ +From 752de46cc57215b14b55f2c68334178454d7444f Mon Sep 17 00:00:00 2001 +From: "FeRD (Frank Dana)" +Date: Mon, 24 Jan 2022 22:14:31 -0500 +Subject: [PATCH] printing/bgqd: Disable systemd notifications + +samba-bgqd daemon is started by existing Samba daemons. When running +under systemd, those daemons control systemd notifications and +samba-bgqd messages need to be silenced. + +BUG: https://bugzilla.samba.org/show_bug.cgi?id=14947 + +Signed-off-by: FeRD (Frank Dana) +Reviewed-by: Alexander Bokovoy +Reviewed-by: Andreas Schneider +(cherry picked from commit 36c861e25b1d9c5ce44bfcb46247e7e4747930c5) +--- + source3/printing/samba-bgqd.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/source3/printing/samba-bgqd.c b/source3/printing/samba-bgqd.c +index f21327fc622..59ed0cc40db 100644 +--- a/source3/printing/samba-bgqd.c ++++ b/source3/printing/samba-bgqd.c +@@ -252,6 +252,9 @@ int main(int argc, const char *argv[]) + + log_stdout = (debug_get_log_type() == DEBUG_STDOUT); + ++ /* main process will notify systemd */ ++ daemon_sd_notifications(false); ++ + if (!cmdline_daemon_cfg->fork) { + daemon_status(progname, "Starting process ... "); + } else { +-- +2.34.1 + diff --git a/samba.spec b/samba.spec index 5d2ad1d..eda8b9e 100644 --- a/samba.spec +++ b/samba.spec @@ -205,6 +205,7 @@ Patch0: samba-s4u.patch Patch1: samba-ctdb-etcd-reclock.patch Patch2: samba-glibc-dns.patch Patch3: samba-printing-win7.patch +Patch4: samba-disable-systemd-notifications.patch Requires(pre): /usr/sbin/groupadd Requires(post): systemd @@ -4108,6 +4109,7 @@ fi - resolves: #2046129 - Fix CVE-2021-44141 - resolves: #2046154 - Fix CVE-2021-44142 - resolves: #2044405 - Fix printing no longer works on Windows 7 +- resolves: #2049485 - Fix systemd notifications * Mon Jan 24 2022 Pavel Filipenský - 4.15.4-100 - related: rhbz#2013578 - Rebase Samba to the the latest 4.15.x release