--- avahi-0.8/avahi-daemon/main.c.~1~ 2020-02-17 05:41:02.384380713 +0200 +++ avahi-0.8/avahi-daemon/main.c 2025-04-19 19:42:47.942458101 +0300 @@ -77,7 +77,9 @@ #include "setproctitle.h" #include "main.h" +#ifndef HAVE_BONJOUR #include "simple-protocol.h" +#endif #include "static-services.h" #include "static-hosts.h" #include "ini-file-parser.h" @@ -138,11 +140,13 @@ #define RESOLV_CONF "/etc/resolv.conf" #define BROWSE_DOMAINS_MAX 16 +#ifndef HAVE_BONJOUR static AvahiSEntryGroup *dns_servers_entry_group = NULL; static AvahiSEntryGroup *resolv_conf_entry_group = NULL; static char **resolv_conf_name_servers = NULL; static char **resolv_conf_search_domains = NULL; +#endif static DaemonConfig config; @@ -154,6 +158,7 @@ return strlen(s) >= l && strncmp(s, prefix, l) == 0; } +#ifndef HAVE_BONJOUR static int load_resolv_conf(void) { int ret = -1; FILE *f; @@ -338,6 +343,7 @@ avahi_server_set_browse_domains(avahi_server, l); avahi_string_list_free(l); } +#endif static void server_callback(AvahiServer *s, AvahiServerState state, void *userdata) { DaemonConfig *c = userdata; @@ -363,7 +369,7 @@ static_service_add_to_server(); static_hosts_add_to_server(); - +#ifndef HAVE_BONJOUR remove_dns_server_entry_groups(); if (c->publish_resolv_conf && resolv_conf_name_servers && resolv_conf_name_servers[0]) @@ -373,6 +379,7 @@ dns_servers_entry_group = add_dns_servers(s, dns_servers_entry_group, c->publish_dns_servers); simple_protocol_restart_queries(); +#endif break; case AVAHI_SERVER_COLLISION: { @@ -380,7 +387,9 @@ static_service_remove_from_server(); static_hosts_remove_from_server(); +#ifndef HAVE_BONJOUR remove_dns_server_entry_groups(); +#endif n = avahi_alternative_host_name(avahi_server_get_host_name(s)); @@ -409,7 +418,9 @@ static_service_remove_from_server(); static_hosts_remove_from_server(); +#ifndef HAVE_BONJOUR remove_dns_server_entry_groups(); +#endif break; @@ -429,9 +440,11 @@ " -r --reload Request a running daemon to reload static services\n" " -c --check Return 0 if a daemon is already running\n" " -V --version Show version\n" +#ifndef HAVE_BONJOUR " -f --file=FILE Load the specified configuration file instead of\n" " "AVAHI_CONFIG_FILE"\n" " --no-rlimits Don't enforce resource limits\n" +#endif " --no-drop-root Don't drop privileges\n" #ifdef ENABLE_CHROOT " --no-chroot Don't chroot()\n" @@ -460,11 +473,15 @@ { "daemonize", no_argument, NULL, 'D' }, { "kill", no_argument, NULL, 'k' }, { "version", no_argument, NULL, 'V' }, +#ifndef HAVE_BONJOUR { "file", required_argument, NULL, 'f' }, +#endif { "reload", no_argument, NULL, 'r' }, { "check", no_argument, NULL, 'c' }, { "syslog", no_argument, NULL, 's' }, +#ifndef HAVE_BONJOUR { "no-rlimits", no_argument, NULL, OPTION_NO_RLIMITS }, +#endif { "no-drop-root", no_argument, NULL, OPTION_NO_DROP_ROOT }, #ifdef ENABLE_CHROOT { "no-chroot", no_argument, NULL, OPTION_NO_CHROOT }, @@ -476,7 +493,11 @@ assert(c); +#ifdef HAVE_BONJOUR + while ((o = getopt_long(argc, argv, "hDkVrcs", long_options, NULL)) >= 0) { +#else while ((o = getopt_long(argc, argv, "hDkVf:rcs", long_options, NULL)) >= 0) { +#endif switch(o) { case 's': @@ -494,6 +515,7 @@ case 'V': c->command = DAEMON_VERSION; break; +#ifndef HAVE_BONJOUR case 'f': avahi_free(c->config_file); c->config_file = avahi_strdup(optarg); @@ -501,12 +523,15 @@ case 'r': c->command = DAEMON_RELOAD; break; +#endif case 'c': c->command = DAEMON_CHECK; break; +#ifndef HAVE_BONJOUR case OPTION_NO_RLIMITS: c->set_rlimits = 0; break; +#endif case OPTION_NO_DROP_ROOT: c->drop_root = 0; break; @@ -606,6 +631,7 @@ return avahi_strndup(buf, sizeof buf); } +#ifndef HAVE_BONJOUR static int load_config_file(DaemonConfig *c) { int r = -1; AvahiIniFile *f; @@ -896,6 +922,7 @@ return r; } +#endif static void log_function(AvahiLogLevel level, const char *txt) { @@ -1016,6 +1043,7 @@ static_service_add_to_server(); static_hosts_add_to_server(); +#ifndef HAVE_BONJOUR if (resolv_conf_entry_group) avahi_s_entry_group_reset(resolv_conf_entry_group); @@ -1026,6 +1054,7 @@ 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); +#endif } #ifdef HAVE_INOTIFY @@ -1111,8 +1140,12 @@ break; case SIGUSR1: +#ifdef HAVE_BONJOUR + avahi_log_info("Got SIGUSR1, ignoring recor."); +#else avahi_log_info("Got SIGUSR1, dumping record data."); avahi_server_dump(avahi_server, dump, NULL); +#endif break; default: @@ -1152,8 +1185,10 @@ ignore_signal(SIGPIPE); +#ifndef HAVE_BONJOUR if (!(nss_support = avahi_nss_support())) avahi_log_warn("WARNING: No NSS support for mDNS detected, consider installing nss-mdns!"); +#endif if (!(simple_poll_api = avahi_simple_poll_new())) { avahi_log_error("Failed to create main loop object."); @@ -1172,8 +1207,10 @@ goto finish; } +#ifndef HAVE_BONJOUR if (simple_protocol_setup(poll_api) < 0) goto finish; +#endif #ifdef HAVE_DBUS if (c->enable_dbus) { @@ -1242,7 +1279,9 @@ } #endif +#ifndef HAVE_BONJOUR load_resolv_conf(); +#endif #ifdef ENABLE_CHROOT static_service_load(config.use_chroot); static_hosts_load(config.use_chroot); @@ -1256,8 +1295,10 @@ goto finish; } +#ifndef HAVE_BONJOUR update_wide_area_servers(); update_browse_domains(); +#endif if (c->daemonize) { daemon_retval_send(0); @@ -1287,10 +1328,12 @@ static_hosts_remove_from_server(); static_hosts_free_all(); +#ifndef HAVE_BONJOUR remove_dns_server_entry_groups(); simple_protocol_shutdown(); +#endif #ifdef HAVE_DBUS if (c->enable_dbus) @@ -1604,8 +1647,10 @@ goto finish; } +#ifndef HAVE_BONJOUR if (load_config_file(&config) < 0) goto finish; +#endif if (config.daemonize) { daemon_retval_init(); @@ -1697,9 +1742,13 @@ avahi_server_config_free(&config.server_config); avahi_free(config.config_file); +#ifdef HAVE_BONJOUR + assert(config.publish_dns_servers == NULL); +#else avahi_strfreev(config.publish_dns_servers); avahi_strfreev(resolv_conf_name_servers); avahi_strfreev(resolv_conf_search_domains); +#endif if (wrote_pid_file) { #ifdef ENABLE_CHROOT --- avahi-0.8/avahi-daemon/static-services.c.~1~ 2020-02-17 05:41:02.384380713 +0200 +++ avahi-0.8/avahi-daemon/static-services.c 2025-04-20 16:10:33.966605076 +0300 @@ -915,7 +915,11 @@ break; #endif default: +#ifdef HAVE_BONJOUR + avahi_log_info("Failed to read "AVAHI_SERVICE_DIR"."); +#else avahi_log_error("Failed to read "AVAHI_SERVICE_DIR"."); +#endif break; }