From: Lennart Poettering Date: Fri, 12 Dec 2008 19:13:58 +0000 (+0100) Subject: Drop private inotify code X-Git-Url: https://git.meshlink.io/?a=commitdiff_plain;h=abc3a9efd1124d74155c6a70798d10710b20786d;p=catta Drop private inotify code Quoting Adrian Bunk: "avahi-daemon ships with the contents of linux/inotify.h plus #define's for the syscall numbers. The latter are #if 0'ed. I'm not sure whether this setup could work at all with some kernel headers and glibc version, but considering that glibc already provides sys/inotify.h for some time it's IMHO time to drop the private inotify code." Original patch from Adrian Bunk. Closes #243. --- diff --git a/avahi-daemon/Makefile.am b/avahi-daemon/Makefile.am index 622b4de..0aac0fc 100644 --- a/avahi-daemon/Makefile.am +++ b/avahi-daemon/Makefile.am @@ -53,8 +53,7 @@ avahi_daemon_SOURCES = \ static-hosts.c static-hosts.h \ ini-file-parser.c ini-file-parser.h \ setproctitle.c setproctitle.h \ - ../avahi-client/check-nss.c \ - inotify-nosys.h + ../avahi-client/check-nss.c avahi_daemon_CFLAGS = $(AM_CFLAGS) $(LIBDAEMON_CFLAGS) $(XML_CFLAGS) avahi_daemon_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la ../avahi-core/libavahi-core.la $(LIBDAEMON_LIBS) $(XML_LIBS) diff --git a/avahi-daemon/inotify-nosys.h b/avahi-daemon/inotify-nosys.h deleted file mode 100644 index 6af44dc..0000000 --- a/avahi-daemon/inotify-nosys.h +++ /dev/null @@ -1,181 +0,0 @@ -/* - * This header is used if cannot be found. - * - * Inode based directory notification for Linux - * - * Copyright (C) 2005 John McCutchan - */ - -#ifndef _LINUX_INOTIFY_H -#define _LINUX_INOTIFY_H - -#include -#include -#include -#include - -/* - * struct inotify_event - structure read from the inotify device for each event - * - * When you are watching a directory, you will receive the filename for events - * such as IN_CREATE, IN_DELETE, IN_OPEN, IN_CLOSE, ..., relative to the wd. - */ -struct inotify_event { - int wd; /* watch descriptor */ - uint32_t mask; /* watch mask */ - uint32_t cookie; /* cookie to synchronize two events */ - uint32_t len; /* length (including nulls) of name */ - char name __flexarr; /* stub for possible name */ -}; - -/* the following are legal, implemented events that user-space can watch for */ -#define IN_ACCESS 0x00000001 /* File was accessed */ -#define IN_MODIFY 0x00000002 /* File was modified */ -#define IN_ATTRIB 0x00000004 /* Metadata changed */ -#define IN_CLOSE_WRITE 0x00000008 /* Writtable file was closed */ -#define IN_CLOSE_NOWRITE 0x00000010 /* Unwrittable file closed */ -#define IN_OPEN 0x00000020 /* File was opened */ -#define IN_MOVED_FROM 0x00000040 /* File was moved from X */ -#define IN_MOVED_TO 0x00000080 /* File was moved to Y */ -#define IN_CREATE 0x00000100 /* Subfile was created */ -#define IN_DELETE 0x00000200 /* Subfile was deleted */ -#define IN_DELETE_SELF 0x00000400 /* Self was deleted */ -#define IN_MOVE_SELF 0x00000800 /* Self was moved */ - -/* the following are legal events. they are sent as needed to any watch */ -#define IN_UNMOUNT 0x00002000 /* Backing fs was unmounted */ -#define IN_Q_OVERFLOW 0x00004000 /* Event queued overflowed */ -#define IN_IGNORED 0x00008000 /* File was ignored */ - -/* helper events */ -#define IN_CLOSE (IN_CLOSE_WRITE | IN_CLOSE_NOWRITE) /* close */ -#define IN_MOVE (IN_MOVED_FROM | IN_MOVED_TO) /* moves */ - -/* special flags */ -#define IN_ONLYDIR 0x01000000 /* only watch the path if it is a directory */ -#define IN_DONT_FOLLOW 0x02000000 /* don't follow a sym link */ -#define IN_MASK_ADD 0x20000000 /* add to the mask of an already existing watch */ -#define IN_ISDIR 0x40000000 /* event occurred against dir */ -#define IN_ONESHOT 0x80000000 /* only send event once */ - -/* - * All of the events - we build the list by hand so that we can add flags in - * the future and not break backward compatibility. Apps will get only the - * events that they originally wanted. Be sure to add new events here! - */ -#define IN_ALL_EVENTS (IN_ACCESS | IN_MODIFY | IN_ATTRIB | IN_CLOSE_WRITE | \ - IN_CLOSE_NOWRITE | IN_OPEN | IN_MOVED_FROM | \ - IN_MOVED_TO | IN_DELETE | IN_CREATE | IN_DELETE_SELF | \ - IN_MOVE_SELF) - -#if 0 -#if defined (__alpha__) -# define __NR_inotify_init 444 -# define __NR_inotify_add_watch 445 -# define __NR_inotify_rm_watch 446 - -#elif defined (__arm__) -# define __NR_inotify_init (__NR_SYSCALL_BASE+316) -# define __NR_inotify_add_watch (__NR_SYSCALL_BASE+317) -# define __NR_inotify_rm_watch (__NR_SYSCALL_BASE+318) - -#elif defined (__frv__) -# define __NR_inotify_init 291 -# define __NR_inotify_add_watch 292 -# define __NR_inotify_rm_watch 293 - -#elif defined(__i386__) -# define __NR_inotify_init 291 -# define __NR_inotify_add_watch 292 -# define __NR_inotify_rm_watch 293 - -#elif defined (__ia64__) -# define __NR_inotify_init 1277 -# define __NR_inotify_add_watch 1278 -# define __NR_inotify_rm_watch 1279 - -#elif defined (__mips__) -# if _MIPS_SIM == _MIPS_SIM_ABI32 -# define __NR_inotify_init (__NR_Linux + 284) -# define __NR_inotify_add_watch (__NR_Linux + 285) -# define __NR_inotify_rm_watch (__NR_Linux + 286) -# endif -# if _MIPS_SIM == _MIPS_SIM_ABI64 -# define __NR_inotify_init (__NR_Linux + 243) -# define __NR_inotify_add_watch (__NR_Linux + 243) -# define __NR_inotify_rm_watch (__NR_Linux + 243) -# endif -# if _MIPS_SIM == _MIPS_SIM_NABI32 -# define __NR_inotify_init (__NR_Linux + 247) -# define __NR_inotify_add_watch (__NR_Linux + 248) -# define __NR_inotify_rm_watch (__NR_Linux + 249) -# endif - -#elif defined(__parisc__) -# define __NR_inotify_init (__NR_Linux + 269) -# define __NR_inotify_add_watch (__NR_Linux + 270) -# define __NR_inotify_rm_watch (__NR_Linux + 271) - -#elif defined(__powerpc__) || defined(__powerpc64__) -# define __NR_inotify_init 275 -# define __NR_inotify_add_watch 276 -# define __NR_inotify_rm_watch 277 - -#elif defined (__s390__) -# define __NR_inotify_init 284 -# define __NR_inotify_add_watch 285 -# define __NR_inotify_rm_watch 286 - -#elif defined (__sh__) -# define __NR_inotify_init 290 -# define __NR_inotify_add_watch 291 -# define __NR_inotify_rm_watch 292 - -#elif defined (__sh64__) -# define __NR_inotify_init 318 -# define __NR_inotify_add_watch 319 -# define __NR_inotify_rm_watch 320 - -#elif defined (__sparc__) || defined (__sparc64__) -# define __NR_inotify_init 151 -# define __NR_inotify_add_watch 152 -# define __NR_inotify_rm_watch 156 - -#elif defined(__x86_64__) -# define __NR_inotify_init 253 -# define __NR_inotify_add_watch 254 -# define __NR_inotify_rm_watch 255 - -#else -# error "Unsupported architecture!" -#endif -#endif - -#ifndef __NR_inotify_init -# error "Unsupported architecture!" -#endif -#ifndef __NR_inotify_add_watch -# error "Unsupported architecture!" -#endif -#ifndef __NR_inotify_rm_watch -# error "Unsupported architecture!" -#endif - - -static inline int inotify_init (void) -{ - return syscall (__NR_inotify_init); -} - -static inline int inotify_add_watch (int fd, const char *name, uint32_t mask) -{ - return syscall (__NR_inotify_add_watch, fd, name, mask); -} - -static inline int inotify_rm_watch (int fd, uint32_t wd) -{ - return syscall (__NR_inotify_rm_watch, fd, wd); -} - - -#endif /* _LINUX_INOTIFY_H */ diff --git a/avahi-daemon/main.c b/avahi-daemon/main.c index d8f9aa6..7619399 100644 --- a/avahi-daemon/main.c +++ b/avahi-daemon/main.c @@ -2,17 +2,17 @@ /*** This file is part of avahi. - + avahi is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. - + avahi is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - + You should have received a copy of the GNU Lesser General Public License along with avahi; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 @@ -43,11 +43,7 @@ #include #ifdef HAVE_INOTIFY -#ifdef HAVE_SYS_INOTIFY_H #include -#else -#include "inotify-nosys.h" -#endif #endif #ifdef HAVE_KQUEUE @@ -148,7 +144,7 @@ static int has_prefix(const char *s, const char *prefix) { size_t l; l = strlen(prefix); - + return strlen(s) >= l && strncmp(s, prefix, l) == 0; } @@ -156,19 +152,19 @@ static int load_resolv_conf(void) { int ret = -1; FILE *f; int i = 0, j = 0; - + avahi_strfreev(resolv_conf_name_servers); resolv_conf_name_servers = NULL; avahi_strfreev(resolv_conf_search_domains); resolv_conf_search_domains = NULL; - + #ifdef ENABLE_CHROOT f = avahi_chroot_helper_get_file(RESOLV_CONF); #else f = fopen(RESOLV_CONF, "r"); #endif - + if (!f) { avahi_log_warn("Failed to open "RESOLV_CONF": %s", strerror(errno)); goto finish; @@ -223,7 +219,7 @@ finish: if (ret != 0) { avahi_strfreev(resolv_conf_name_servers); resolv_conf_name_servers = NULL; - + avahi_strfreev(resolv_conf_search_domains); resolv_conf_search_domains = NULL; } @@ -240,14 +236,14 @@ static AvahiSEntryGroup* add_dns_servers(AvahiServer *s, AvahiSEntryGroup* g, ch assert(s); assert(l); - if (!g) + if (!g) g = avahi_s_entry_group_new(s, NULL, NULL); assert(avahi_s_entry_group_is_empty(g)); for (p = l; *p; p++) { AvahiAddress a; - + if (!avahi_address_parse(*p, AVAHI_PROTO_UNSPEC, &a)) avahi_log_warn("Failed to parse address '%s', ignoring.", *p); else @@ -267,8 +263,8 @@ static void remove_dns_server_entry_groups(void) { if (resolv_conf_entry_group) avahi_s_entry_group_reset(resolv_conf_entry_group); - - if (dns_servers_entry_group) + + if (dns_servers_entry_group) avahi_s_entry_group_reset(dns_servers_entry_group); } @@ -297,10 +293,10 @@ static AvahiStringList *filter_duplicate_domains(AvahiStringList *l) { if (!l) return l; - + for (p = l, e = l->next; e; e = n) { n = e->next; - + if (avahi_domain_equal((char*) e->text, (char*) l->text)) { p->next = e->next; avahi_free(e); @@ -323,7 +319,7 @@ static void update_browse_domains(void) { } l = avahi_string_list_copy(config.server_config.browse_domains); - + for (p = resolv_conf_search_domains, n = 0; *p && n < BROWSE_DOMAINS_MAX; p++, n++) { if (!avahi_is_valid_domain_name(*p)) avahi_log_warn("'%s' is no valid domain name, ignoring.", *p); @@ -332,13 +328,13 @@ static void update_browse_domains(void) { } l = filter_duplicate_domains(l); - + avahi_server_set_browse_domains(avahi_server, l); } static void server_callback(AvahiServer *s, AvahiServerState state, void *userdata) { DaemonConfig *c = userdata; - + assert(s); assert(c); @@ -346,7 +342,7 @@ static void server_callback(AvahiServer *s, AvahiServerState state, void *userda * avahi_server has been set, therefore we do it explicitly */ avahi_server = s; - + #ifdef HAVE_DBUS if (c->enable_dbus && state != AVAHI_SERVER_INVALID && state != AVAHI_SERVER_FAILURE) dbus_protocol_server_state_changed(state); @@ -355,28 +351,28 @@ static void server_callback(AvahiServer *s, AvahiServerState state, void *userda switch (state) { case AVAHI_SERVER_RUNNING: avahi_log_info("Server startup complete. Host name is %s. Local service cookie is %u.", avahi_server_get_host_name_fqdn(s), avahi_server_get_local_service_cookie(s)); - + avahi_set_proc_title(argv0, "%s: running [%s]", argv0, avahi_server_get_host_name_fqdn(s)); - + static_service_add_to_server(); static_hosts_add_to_server(); - + remove_dns_server_entry_groups(); - + if (c->publish_resolv_conf && resolv_conf_name_servers && resolv_conf_name_servers[0]) resolv_conf_entry_group = add_dns_servers(s, resolv_conf_entry_group, resolv_conf_name_servers); - + if (c->publish_dns_servers && c->publish_dns_servers[0]) dns_servers_entry_group = add_dns_servers(s, dns_servers_entry_group, c->publish_dns_servers); - + simple_protocol_restart_queries(); break; - + case AVAHI_SERVER_COLLISION: { char *n; - + avahi_set_proc_title(argv0, "%s: collision", argv0); - + static_service_remove_from_server(); static_hosts_remove_from_server(); remove_dns_server_entry_groups(); @@ -398,16 +394,16 @@ static void server_callback(AvahiServer *s, AvahiServerState state, void *userda case AVAHI_SERVER_REGISTERING: avahi_set_proc_title(argv0, "%s: registering [%s]", argv0, avahi_server_get_host_name_fqdn(s)); - + static_service_remove_from_server(); static_hosts_remove_from_server(); remove_dns_server_entry_groups(); - + break; case AVAHI_SERVER_INVALID: break; - + } } @@ -425,9 +421,9 @@ static void help(FILE *f) { " "AVAHI_CONFIG_FILE"\n" " --no-rlimits Don't enforce resource limits\n" " --no-drop-root Don't drop privileges\n" -#ifdef ENABLE_CHROOT +#ifdef ENABLE_CHROOT " --no-chroot Don't chroot()\n" -#endif +#endif " --no-proc-title Don't modify process title\n" " --debug Increase verbosity\n", argv0); @@ -440,13 +436,13 @@ static int parse_command_line(DaemonConfig *c, int argc, char *argv[]) { enum { OPTION_NO_RLIMITS = 256, OPTION_NO_DROP_ROOT, -#ifdef ENABLE_CHROOT +#ifdef ENABLE_CHROOT OPTION_NO_CHROOT, #endif OPTION_NO_PROC_TITLE, OPTION_DEBUG }; - + static const struct option long_options[] = { { "help", no_argument, NULL, 'h' }, { "daemonize", no_argument, NULL, 'D' }, @@ -522,13 +518,13 @@ static int parse_command_line(DaemonConfig *c, int argc, char *argv[]) { fprintf(stderr, "Too many arguments\n"); return -1; } - + return 0; } static int is_yes(const char *s) { assert(s); - + return *s == 'y' || *s == 'Y' || *s == '1' || *s == 't' || *s == 'T'; } @@ -541,9 +537,9 @@ static int load_config_file(DaemonConfig *c) { if (!(f = avahi_ini_file_load(c->config_file ? c->config_file : AVAHI_CONFIG_FILE))) goto finish; - + for (g = f->groups; g; g = g->groups_next) { - + if (strcasecmp(g->name, "server") == 0) { AvahiIniFilePair *p; @@ -559,7 +555,7 @@ static int load_config_file(DaemonConfig *c) { char **e, **t; e = avahi_split_csv(p->value); - + for (t = e; *t; t++) { char cleaned[AVAHI_DOMAIN_NAME_MAX]; @@ -571,7 +567,7 @@ static int load_config_file(DaemonConfig *c) { c->server_config.browse_domains = avahi_string_list_add(c->server_config.browse_domains, cleaned); } - + avahi_strfreev(e); c->server_config.browse_domains = filter_duplicate_domains(c->server_config.browse_domains); @@ -606,12 +602,12 @@ static int load_config_file(DaemonConfig *c) { goto finish; } } - + } else if (strcasecmp(g->name, "publish") == 0) { AvahiIniFilePair *p; for (p = g->pairs; p; p = p->pairs_next) { - + if (strcasecmp(p->key, "publish-addresses") == 0) c->server_config.publish_addresses = is_yes(p->value); else if (strcasecmp(p->key, "publish-hinfo") == 0) @@ -645,7 +641,7 @@ static int load_config_file(DaemonConfig *c) { AvahiIniFilePair *p; for (p = g->pairs; p; p = p->pairs_next) { - + if (strcasecmp(p->key, "enable-wide-area") == 0) c->server_config.enable_wide_area = is_yes(p->value); else { @@ -653,12 +649,12 @@ static int load_config_file(DaemonConfig *c) { goto finish; } } - + } else if (strcasecmp(g->name, "reflector") == 0) { AvahiIniFilePair *p; for (p = g->pairs; p; p = p->pairs_next) { - + if (strcasecmp(p->key, "enable-reflector") == 0) c->server_config.enable_reflector = is_yes(p->value); else if (strcasecmp(p->key, "reflect-ipv") == 0) @@ -668,12 +664,12 @@ static int load_config_file(DaemonConfig *c) { goto finish; } } - + } else if (strcasecmp(g->name, "rlimits") == 0) { AvahiIniFilePair *p; for (p = g->pairs; p; p = p->pairs_next) { - + if (strcasecmp(p->key, "rlimit-as") == 0) { c->rlimit_as_set = 1; c->rlimit_as = atoi(p->value); @@ -705,7 +701,7 @@ static int load_config_file(DaemonConfig *c) { } } - + } else { avahi_log_error("Invalid configuration file group \"%s\".\n", g->name); goto finish; @@ -718,7 +714,7 @@ finish: if (f) avahi_ini_file_free(f); - + return r; } @@ -731,7 +727,7 @@ static void log_function(AvahiLogLevel level, const char *txt) { LOG_INFO, LOG_DEBUG }; - + assert(level < AVAHI_LOG_LEVEL_MAX); assert(txt); @@ -758,7 +754,7 @@ static void add_inotify_watches(void) { #ifdef ENABLE_CHROOT c = config.use_chroot; #endif - + inotify_add_watch(inotify_fd, c ? "/services" : AVAHI_SERVICE_DIR, IN_CLOSE_WRITE|IN_DELETE|IN_DELETE_SELF|IN_MOVED_FROM|IN_MOVED_TO|IN_MOVE_SELF #ifdef IN_ONLYDIR |IN_ONLYDIR @@ -837,18 +833,18 @@ static void reload_config(void) { #else static_service_load(0); static_hosts_load(0); -#endif +#endif static_service_add_to_server(); static_hosts_add_to_server(); - + if (resolv_conf_entry_group) avahi_s_entry_group_reset(resolv_conf_entry_group); - + load_resolv_conf(); - + update_wide_area_servers(); update_browse_domains(); - + if (config.publish_resolv_conf && resolv_conf_name_servers && resolv_conf_name_servers[0]) resolv_conf_entry_group = add_dns_servers(avahi_server, resolv_conf_entry_group, resolv_conf_name_servers); } @@ -908,7 +904,7 @@ static void kqueue_callback(AvahiWatch *watch, int fd, AVAHI_GCC_UNUSED AvahiWat static void signal_callback(AvahiWatch *watch, AVAHI_GCC_UNUSED int fd, AVAHI_GCC_UNUSED AvahiWatchEvent event, AVAHI_GCC_UNUSED void *userdata) { int sig; const AvahiPoll *poll_api; - + assert(watch); assert(simple_poll_api); @@ -1013,17 +1009,17 @@ static int run_server(DaemonConfig *c) { avahi_log_error("Failed to chroot(): %s", strerror(errno)); goto finish; } - + avahi_log_info("Successfully called chroot()."); chdir("/"); - + if (avahi_caps_drop_all() < 0) { avahi_log_error("Failed to drop capabilities."); goto finish; } avahi_log_info("Successfully dropped remaining capabilities."); } - + #endif #ifdef HAVE_INOTIFY @@ -1031,7 +1027,7 @@ static int run_server(DaemonConfig *c) { avahi_log_warn( "Failed to initialize inotify: %s", strerror(errno)); else { add_inotify_watches(); - + if (!(inotify_watch = poll_api->watch_new(poll_api, inotify_fd, AVAHI_WATCH_IN, inotify_callback, NULL))) { avahi_log_error( "Failed to create inotify watcher"); goto finish; @@ -1080,17 +1076,17 @@ static int run_server(DaemonConfig *c) { /* We handle signals through an FD, so let's continue */ if (errno == EINTR) continue; - + avahi_log_error("poll(): %s", strerror(errno)); goto finish; } else if (r > 0) /* Quit */ break; } - + finish: - + static_service_remove_from_server(); static_service_free_all(); @@ -1098,7 +1094,7 @@ finish: static_hosts_free_all(); remove_dns_server_entry_groups(); - + simple_protocol_shutdown(); #ifdef HAVE_DBUS @@ -1133,7 +1129,7 @@ finish: close(kfds[i]); } #endif - + if (simple_poll_api) { avahi_simple_poll_free(simple_poll_api); simple_poll_api = NULL; @@ -1141,7 +1137,7 @@ finish: if (!retval_is_sent && c->daemonize) daemon_retval_send(1); - + return r; } @@ -1151,7 +1147,7 @@ static int drop_root(void) { struct passwd *pw; struct group * gr; int r; - + if (!(pw = getpwnam(AVAHI_USER))) { avahi_log_error( "Failed to find user '"AVAHI_USER"'."); return -1; @@ -1234,12 +1230,12 @@ static int make_runtime_dir(void) { u = umask(0000); reset_umask = 1; - + if (mkdir(AVAHI_DAEMON_RUNTIME_DIR, 0755) < 0 && errno != EEXIST) { avahi_log_error("mkdir(\""AVAHI_DAEMON_RUNTIME_DIR"\"): %s", strerror(errno)); goto fail; } - + chown(AVAHI_DAEMON_RUNTIME_DIR, pw->pw_uid, gr->gr_gid); if (stat(AVAHI_DAEMON_RUNTIME_DIR, &st) < 0) { @@ -1322,7 +1318,7 @@ int main(int argc, char *argv[]) { avahi_set_log_function(log_function); init_rand_seed(); - + avahi_server_config_init(&config.server_config); config.command = DAEMON_RUN; config.daemonize = 0; @@ -1331,7 +1327,7 @@ int main(int argc, char *argv[]) { config.enable_dbus = 1; config.fail_on_missing_dbus = 1; #endif - + config.drop_root = 1; config.set_rlimits = 1; #ifdef ENABLE_CHROOT @@ -1353,7 +1349,7 @@ int main(int argc, char *argv[]) { #ifdef RLIMIT_NPROC config.rlimit_nproc_set = 0; #endif - + if ((argv0 = strrchr(argv[0], '/'))) argv0 = avahi_strdup(argv0 + 1); else @@ -1362,7 +1358,7 @@ int main(int argc, char *argv[]) { daemon_pid_file_ident = (const char *) argv0; daemon_log_ident = (char*) argv0; daemon_pid_file_proc = pid_file_proc; - + if (parse_command_line(&config, argc, argv) < 0) goto finish; @@ -1372,7 +1368,7 @@ int main(int argc, char *argv[]) { #ifdef ENABLE_CHROOT config.use_chroot = config.use_chroot && config.drop_root; #endif - + if (config.command == DAEMON_HELP) { help(stdout); r = 0; @@ -1394,7 +1390,7 @@ int main(int argc, char *argv[]) { } r = 0; - + } else if (config.command == DAEMON_CHECK) r = (daemon_pid_file_is_running() >= 0) ? 0 : 1; else if (config.command == DAEMON_RUN) { @@ -1404,7 +1400,7 @@ int main(int argc, char *argv[]) { avahi_log_error("This program is intended to be run as root."); goto finish; } - + if ((pid = daemon_pid_file_is_running()) >= 0) { avahi_log_error("Daemon already running on PID %u", pid); goto finish; @@ -1412,10 +1408,10 @@ int main(int argc, char *argv[]) { if (load_config_file(&config) < 0) goto finish; - + if (config.daemonize) { daemon_retval_init(); - + if ((pid = daemon_fork()) < 0) goto finish; else if (pid != 0) { @@ -1441,7 +1437,7 @@ int main(int argc, char *argv[]) { avahi_log_error("Failed to close remaining file descriptors: %s", strerror(errno)); goto finish; } - + if (make_runtime_dir() < 0) goto finish; @@ -1451,7 +1447,7 @@ int main(int argc, char *argv[]) { if (avahi_caps_reduce() < 0) goto finish; #endif - + if (drop_root() < 0) goto finish; @@ -1486,11 +1482,11 @@ int main(int argc, char *argv[]) { avahi_log_info("%s "PACKAGE_VERSION" starting up.", argv0); avahi_set_proc_title(argv0, "%s: starting up", argv0); - + if (run_server(&config) == 0) r = 0; } - + finish: if (config.daemonize) @@ -1515,6 +1511,6 @@ finish: #endif avahi_free(argv0); - + return r; } diff --git a/configure.ac b/configure.ac index ce365b4..8c41f6b 100644 --- a/configure.ac +++ b/configure.ac @@ -387,7 +387,6 @@ fi AM_CONDITIONAL(HAVE_DLOPEN, test "x$HAVE_DLOPEN" = "xyes") have_inotify=no -AC_CHECK_HEADERS([linux/inotify.h], [have_inotify=yes]) AC_CHECK_HEADERS([sys/inotify.h], [have_inotify=yes]) AM_CONDITIONAL(HAVE_INOTIFY, test "x$have_inotify" = "xyes")