mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-27 07:57:27 +00:00
Samba: use only libsystemd
This patch was disappeared while moved to 4.4.2 Signed-off-by: Gyorgy Szombathelyi <gyurco@freemail.hu> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
This commit is contained in:
committed by
Joe MacDonald
parent
6b2fc930c4
commit
b6e805c83e
@@ -0,0 +1,81 @@
|
|||||||
|
diff -ur samba-4.4.2/lib/util/become_daemon.c samba-4.4.2/lib/util/become_daemon.c
|
||||||
|
--- samba-4.4.2/lib/util/become_daemon.c 2016-05-08 18:33:24.000000000 +0200
|
||||||
|
+++ samba-4.4.2/lib/util/become_daemon.c 2016-05-08 18:26:50.275177918 +0200
|
||||||
|
@@ -24,7 +24,7 @@
|
||||||
|
#include "includes.h"
|
||||||
|
#include "system/filesys.h"
|
||||||
|
#include "system/locale.h"
|
||||||
|
-#if HAVE_LIBSYSTEMD_DAEMON
|
||||||
|
+#if HAVE_LIBSYSTEMD
|
||||||
|
#include <systemd/sd-daemon.h>
|
||||||
|
#endif
|
||||||
|
#include "lib/util/close_low_fd.h"
|
||||||
|
@@ -69,9 +69,9 @@
|
||||||
|
if (do_fork) {
|
||||||
|
newpid = fork();
|
||||||
|
if (newpid) {
|
||||||
|
-#if HAVE_LIBSYSTEMD_DAEMON
|
||||||
|
+#if HAVE_LIBSYSTEMD
|
||||||
|
sd_notifyf(0, "READY=0\nSTATUS=Starting process...\nMAINPID=%lu", (unsigned long) newpid);
|
||||||
|
-#endif /* HAVE_LIBSYSTEMD_DAEMON */
|
||||||
|
+#endif /* HAVE_LIBSYSTEMD */
|
||||||
|
_exit(0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@@ -98,7 +98,7 @@
|
||||||
|
|
||||||
|
_PUBLIC_ void exit_daemon(const char *msg, int error)
|
||||||
|
{
|
||||||
|
-#ifdef HAVE_LIBSYSTEMD_DAEMON
|
||||||
|
+#ifdef HAVE_LIBSYSTEMD
|
||||||
|
if (msg == NULL) {
|
||||||
|
msg = strerror(error);
|
||||||
|
}
|
||||||
|
@@ -117,7 +117,7 @@
|
||||||
|
if (name == NULL) {
|
||||||
|
name = "Samba";
|
||||||
|
}
|
||||||
|
-#ifdef HAVE_LIBSYSTEMD_DAEMON
|
||||||
|
+#ifdef HAVE_LIBSYSTEMD
|
||||||
|
sd_notifyf(0, "READY=1\nSTATUS=%s: ready to serve connections...", name);
|
||||||
|
#endif
|
||||||
|
DEBUG(0, ("STATUS=daemon '%s' finished starting up and ready to serve "
|
||||||
|
@@ -129,7 +129,7 @@
|
||||||
|
if (name == NULL) {
|
||||||
|
name = "Samba";
|
||||||
|
}
|
||||||
|
-#ifdef HAVE_LIBSYSTEMD_DAEMON
|
||||||
|
+#ifdef HAVE_LIBSYSTEMD
|
||||||
|
sd_notifyf(0, "\nSTATUS=%s: %s", name, msg);
|
||||||
|
#endif
|
||||||
|
DEBUG(0, ("STATUS=daemon '%s' : %s", name, msg));
|
||||||
|
diff -ur samba-4.4.2/lib/util/debug.c samba-4.4.2/lib/util/debug.c
|
||||||
|
--- samba-4.4.2/lib/util/debug.c 2016-05-08 18:33:24.000000000 +0200
|
||||||
|
+++ samba-4.4.2/lib/util/debug.c 2016-05-08 18:27:09.341481492 +0200
|
||||||
|
@@ -102,7 +102,7 @@
|
||||||
|
.fd = 2 /* stderr by default */
|
||||||
|
};
|
||||||
|
|
||||||
|
-#if defined(WITH_SYSLOG) || defined(HAVE_LIBSYSTEMD_JOURNAL)
|
||||||
|
+#if defined(WITH_SYSLOG) || defined(HAVE_LIBSYSTEMD)
|
||||||
|
static int debug_level_to_priority(int level)
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
@@ -179,7 +179,7 @@
|
||||||
|
}
|
||||||
|
#endif /* WITH_SYSLOG */
|
||||||
|
|
||||||
|
-#ifdef HAVE_LIBSYSTEMD_JOURNAL
|
||||||
|
+#ifdef HAVE_LIBSYSTEMD
|
||||||
|
#include <systemd/sd-journal.h>
|
||||||
|
static void debug_systemd_log(int msg_level,
|
||||||
|
const char *msg, const char *msg_no_nl)
|
||||||
|
@@ -251,7 +251,7 @@
|
||||||
|
},
|
||||||
|
#endif
|
||||||
|
|
||||||
|
-#ifdef HAVE_LIBSYSTEMD_JOURNAL
|
||||||
|
+#ifdef HAVE_LIBSYSTEMD
|
||||||
|
{
|
||||||
|
.name = "systemd",
|
||||||
|
.log = debug_systemd_log,
|
||||||
@@ -13,6 +13,7 @@ ${SAMBA_MIRROR} http://www.mirrorservice.org/sites/ftp.samba.org \n \
|
|||||||
|
|
||||||
SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \
|
SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \
|
||||||
file://00-fix-typos-in-man-pages.patch \
|
file://00-fix-typos-in-man-pages.patch \
|
||||||
|
file://10-use-only-libsystemd.patch \
|
||||||
file://16-do-not-check-xsltproc-manpages.patch \
|
file://16-do-not-check-xsltproc-manpages.patch \
|
||||||
file://20-do-not-import-target-module-while-cross-compile.patch \
|
file://20-do-not-import-target-module-while-cross-compile.patch \
|
||||||
file://21-add-config-option-without-valgrind.patch \
|
file://21-add-config-option-without-valgrind.patch \
|
||||||
|
|||||||
Reference in New Issue
Block a user