summaryrefslogtreecommitdiff
path: root/frontend/saned.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2020-08-24 18:45:34 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2020-08-24 18:45:34 +0200
commit2b3e02411ecc09e7d41741b5587655c9b2f955b7 (patch)
treed839746371ecb8ed64ac81d2e37c11fcd25a00ac /frontend/saned.c
parent787fb1d54ec9ee5fb941ae897fb201feb9cb2fd1 (diff)
parentad38bc6ecb80ddeb562841b33258dd53659b1da6 (diff)
Update upstream source from tag 'upstream/1.0.31'
Update to upstream version '1.0.31' with Debian dir aa7a39fe56343f5e164eec83783f4c923a394865
Diffstat (limited to 'frontend/saned.c')
-rw-r--r--frontend/saned.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/frontend/saned.c b/frontend/saned.c
index 6c3c40d..0317542 100644
--- a/frontend/saned.c
+++ b/frontend/saned.c
@@ -155,7 +155,7 @@ poll (struct pollfd *ufds, unsigned int nfds, int timeout)
}
#endif /* HAVE_SYS_POLL_H && HAVE_POLL */
-#ifdef WITH_AVAHI
+#if WITH_AVAHI
# include <avahi-client/client.h>
# include <avahi-client/publish.h>
@@ -2286,7 +2286,7 @@ wait_child (pid_t pid, int *status, int options)
if (ret <= 0)
return ret;
-#ifdef WITH_AVAHI
+#if WITH_AVAHI
if ((avahi_pid > 0) && (ret == avahi_pid))
{
avahi_pid = -1;
@@ -2428,7 +2428,7 @@ bail_out (int error)
{
DBG (DBG_ERR, "%sbailing out, waiting for children...\n", (error) ? "FATAL ERROR; " : "");
-#ifdef WITH_AVAHI
+#if WITH_AVAHI
if (avahi_pid > 0)
kill (avahi_pid, SIGTERM);
#endif /* WITH_AVAHI */
@@ -2457,7 +2457,7 @@ sig_int_term_handler (int signum)
}
-#ifdef WITH_AVAHI
+#if WITH_AVAHI
static void
saned_avahi (struct pollfd *fds, int nfds);
@@ -3221,7 +3221,7 @@ run_standalone (char *user)
if (user)
runas_user(user);
-#ifdef WITH_AVAHI
+#if WITH_AVAHI
DBG (DBG_INFO, "run_standalone: spawning Avahi process\n");
saned_avahi (fds, nfds);