diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2020-09-10 19:11:27 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2020-09-10 19:11:27 +0200 |
| commit | 7e9455b3b15671ff99ed168638c405e2acedb6df (patch) | |
| tree | 444e59ece236e09dc153f665e42160aeb0208c24 /frontend/saned.c | |
| parent | bc8a517abd2e11e1435f4ef042cfcc8648b62ef7 (diff) | |
| parent | bce41b3c37c2a68e7dab234ce0247755a61ceb40 (diff) | |
Merge branch 'release/debian/1.0.31-1_experimental1' into masterdebian/1.0.31-1_experimental1
Diffstat (limited to 'frontend/saned.c')
| -rw-r--r-- | frontend/saned.c | 10 |
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); |