diff options
author | Günther Deschner <gd@samba.org> | 2016-06-07 13:09:24 +0200 |
---|---|---|
committer | Günther Deschner <gd@samba.org> | 2016-06-07 14:36:53 +0200 |
commit | b7fe01738a0cc847430fa5256db1731ef17ef746 (patch) | |
tree | a6e2d41eb57f08bef9f3d26e545fb53e2b31e8c2 /samba-use-libsystemd.patch | |
parent | 81464d93926f6099e16a320a1e20ae7e07c47592 (diff) |
Update to Samba 4.4.4
resolves: #1343529
Guenther
Diffstat (limited to 'samba-use-libsystemd.patch')
-rw-r--r-- | samba-use-libsystemd.patch | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/samba-use-libsystemd.patch b/samba-use-libsystemd.patch deleted file mode 100644 index 114b771..0000000 --- a/samba-use-libsystemd.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git samba-4.4.3/lib/util/become_daemon.c~ samba-4.4.3/lib/util/become_daemon.c -index 4622971907..04d77da529 100644 ---- samba-4.4.3/lib/util/become_daemon.c~ -+++ samba-4.4.3/lib/util/become_daemon.c -@@ -24,7 +24,7 @@ - #include "includes.h" - #include "system/filesys.h" - #include "system/locale.h" --#if HAVE_LIBSYSTEMD_DAEMON -+#if defined(HAVE_LIBSYSTEMD_DAEMON) || defined(HAVE_LIBSYSTEMD) - #include <systemd/sd-daemon.h> - #endif - #include "lib/util/close_low_fd.h" -@@ -69,7 +69,7 @@ _PUBLIC_ void become_daemon(bool do_fork, bool no_process_group, bool log_stdout - if (do_fork) { - newpid = fork(); - if (newpid) { --#if HAVE_LIBSYSTEMD_DAEMON -+#if defined(HAVE_LIBSYSTEMD_DAEMON) || defined(HAVE_LIBSYSTEMD) - sd_notifyf(0, "READY=0\nSTATUS=Starting process...\nMAINPID=%lu", (unsigned long) newpid); - #endif /* HAVE_LIBSYSTEMD_DAEMON */ - _exit(0); -@@ -98,7 +98,7 @@ _PUBLIC_ void become_daemon(bool do_fork, bool no_process_group, bool log_stdout - - _PUBLIC_ void exit_daemon(const char *msg, int error) - { --#ifdef HAVE_LIBSYSTEMD_DAEMON -+#if defined(HAVE_LIBSYSTEMD_DAEMON) || defined(HAVE_LIBSYSTEMD) - if (msg == NULL) { - msg = strerror(error); - } -@@ -117,7 +117,7 @@ _PUBLIC_ void daemon_ready(const char *name) - if (name == NULL) { - name = "Samba"; - } --#ifdef HAVE_LIBSYSTEMD_DAEMON -+#if defined(HAVE_LIBSYSTEMD_DAEMON) || defined(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 @@ _PUBLIC_ void daemon_status(const char *name, const char *msg) - if (name == NULL) { - name = "Samba"; - } --#ifdef HAVE_LIBSYSTEMD_DAEMON -+#if defined(HAVE_LIBSYSTEMD_DAEMON) || defined(HAVE_LIBSYSTEMD) - sd_notifyf(0, "\nSTATUS=%s: %s", name, msg); - #endif - DEBUG(0, ("STATUS=daemon '%s' : %s", name, msg)); |