#include <getopt.h>
#include <string.h>
#include <signal.h>
+#include <errno.h>
+#include <string.h>
+#include <unistd.h>
+#include <grp.h>
+#include <pwd.h>
#include <libdaemon/dfork.h>
#include <libdaemon/dsignal.h>
DAEMON_RUN,
DAEMON_KILL,
DAEMON_VERSION,
- DAEMON_HELP
+ DAEMON_HELP,
+ DAEMON_RELOAD
} DaemonCommand;
typedef struct {
gboolean daemonize;
gchar *config_file;
gboolean enable_dbus;
+ gboolean drop_root;
} DaemonConfig;
static void server_callback(AvahiServer *s, AvahiServerState state, gpointer userdata) {
" -h --help Show this help\n"
" -D --daemonize Daemonize after startup\n"
" -k --kill Kill a running daemon\n"
+ " -r --reload Request a running daemon to reload static services\n"
" -V --version Show version\n"
- " -f --file=FILE Load the specified configuration file instead of the default\n",
+ " -f --file=FILE Load the specified configuration file instead of\n"
+ " "AVAHI_CONFIG_FILE"\n",
argv0);
}
{ "kill", no_argument, NULL, 'k' },
{ "version", no_argument, NULL, 'V' },
{ "file", required_argument, NULL, 'f' },
+ { "reload", no_argument, NULL, 'r' },
};
g_assert(config);
opterr = 0;
- while ((c = getopt_long(argc, argv, "hDkVf:", long_options, NULL)) >= 0) {
+ while ((c = getopt_long(argc, argv, "hDkVf:r", long_options, NULL)) >= 0) {
switch(c) {
case 'h':
g_free(config->config_file);
config->config_file = g_strdup(optarg);
break;
+ case 'r':
+ config->command = DAEMON_RELOAD;
+ break;
default:
fprintf(stderr, "Invalid command line argument: %c\n", c);
return -1;
int r = -1;
GKeyFile *f = NULL;
GError *err = NULL;
- gchar **groups = NULL, **g, **keys = NULL;
+ gchar **groups = NULL, **g, **keys = NULL, *v = NULL;
g_assert(config);
keys = g_key_file_get_keys(f, *g, NULL, NULL);
for (k = keys; *k; k++) {
+
+ v = g_key_file_get_value(f, *g, *k, NULL);
+
if (g_strcasecmp(*k, "host-name") == 0) {
g_free(config->server_config.host_name);
- config->server_config.host_name = g_strdup(g_key_file_get_string(f, *g, *k, NULL));
+ config->server_config.host_name = v;
+ v = NULL;
} else if (g_strcasecmp(*k, "domain-name") == 0) {
g_free(config->server_config.domain_name);
- config->server_config.domain_name = g_strdup(g_key_file_get_string(f, *g, *k, NULL));
+ config->server_config.domain_name = v;
+ v = NULL;
} else if (g_strcasecmp(*k, "use-ipv4") == 0)
- config->server_config.use_ipv4 = is_yes(g_key_file_get_string(f, *g, *k, NULL));
+ config->server_config.use_ipv4 = is_yes(v);
else if (g_strcasecmp(*k, "use-ipv6") == 0)
- config->server_config.use_ipv6 = is_yes(g_key_file_get_string(f, *g, *k, NULL));
+ config->server_config.use_ipv6 = is_yes(v);
else if (g_strcasecmp(*k, "check-response-ttl") == 0)
- config->server_config.check_response_ttl = is_yes(g_key_file_get_string(f, *g, *k, NULL));
+ config->server_config.check_response_ttl = is_yes(v);
else if (g_strcasecmp(*k, "use-iff-running") == 0)
- config->server_config.use_iff_running = is_yes(g_key_file_get_string(f, *g, *k, NULL));
+ config->server_config.use_iff_running = is_yes(v);
else if (g_strcasecmp(*k, "enable-dbus") == 0)
- config->enable_dbus = is_yes(g_key_file_get_string(f, *g, *k, NULL));
+ config->enable_dbus = is_yes(v);
+ else if (g_strcasecmp(*k, "drop-root") == 0)
+ config->drop_root = is_yes(v);
else {
fprintf(stderr, "Invalid configuration key \"%s\" in group \"%s\"\n", *k, *g);
goto finish;
}
+
+ g_free(v);
+ v = NULL;
}
+
+ g_strfreev(keys);
+ keys = NULL;
} else if (g_strcasecmp(*g, "publish") == 0) {
gchar **k;
keys = g_key_file_get_keys(f, *g, NULL, NULL);
for (k = keys; *k; k++) {
+
+ v = g_key_file_get_string(f, *g, *k, NULL);
+
if (g_strcasecmp(*k, "publish-addresses") == 0)
- config->server_config.publish_addresses = is_yes(g_key_file_get_string(f, *g, *k, NULL));
+ config->server_config.publish_addresses = is_yes(v);
else if (g_strcasecmp(*k, "publish-hinfo") == 0)
- config->server_config.publish_hinfo = is_yes(g_key_file_get_string(f, *g, *k, NULL));
+ config->server_config.publish_hinfo = is_yes(v);
else if (g_strcasecmp(*k, "publish-workstation") == 0)
- config->server_config.publish_workstation = is_yes(g_key_file_get_string(f, *g, *k, NULL));
+ config->server_config.publish_workstation = is_yes(v);
else if (g_strcasecmp(*k, "publish-domain") == 0)
- config->server_config.publish_domain = is_yes(g_key_file_get_string(f, *g, *k, NULL));
+ config->server_config.publish_domain = is_yes(v);
else {
fprintf(stderr, "Invalid configuration key \"%s\" in group \"%s\"\n", *k, *g);
goto finish;
}
+
+ g_free(v);
+ v = NULL;
}
+ g_strfreev(keys);
+ keys = NULL;
+
} else if (g_strcasecmp(*g, "reflector") == 0) {
gchar **k;
keys = g_key_file_get_keys(f, *g, NULL, NULL);
for (k = keys; *k; k++) {
+
+ v = g_key_file_get_string(f, *g, *k, NULL);
+
if (g_strcasecmp(*k, "enable-reflector") == 0)
- config->server_config.enable_reflector = is_yes(g_key_file_get_string(f, *g, *k, NULL));
+ config->server_config.enable_reflector = is_yes(v);
else if (g_strcasecmp(*k, "reflect-ipv") == 0)
- config->server_config.reflect_ipv = is_yes(g_key_file_get_string(f, *g, *k, NULL));
+ config->server_config.reflect_ipv = is_yes(v);
else {
fprintf(stderr, "Invalid configuration key \"%s\" in group \"%s\"\n", *k, *g);
goto finish;
}
+
+ g_free(v);
+ v = NULL;
}
+ g_strfreev(keys);
+ keys = NULL;
+
} else {
fprintf(stderr, "Invalid configuration file group \"%s\".\n", *g);
goto finish;
g_strfreev(groups);
g_strfreev(keys);
+ g_free(v);
if (err)
g_error_free (err);
daemon_log(log_level_map[level], "%s", txt);
}
+static gboolean signal_callback(GIOChannel *source, GIOCondition condition, gpointer data) {
+ gint sig;
+ g_assert(source);
+
+ if ((sig = daemon_signal_next()) <= 0) {
+ avahi_log_error("daemon_signal_next() failed");
+ return FALSE;
+ }
+
+ switch (sig) {
+ case SIGINT:
+ case SIGQUIT:
+ case SIGTERM:
+ avahi_log_info(
+ "Got %s, quitting.",
+ sig == SIGINT ? "SIGINT" :
+ (sig == SIGQUIT ? "SIGQUIT" : "SIGTERM"));
+ g_main_loop_quit((GMainLoop*) data);
+ break;
+
+ case SIGHUP:
+ avahi_log_info("Got SIGHUP, reloading.");
+ static_service_load();
+ static_service_add_to_server();
+ break;
+
+ default:
+ avahi_log_warn("Got spurious signal, ignoring.");
+ break;
+ }
+
+ return TRUE;
+}
+
static gint run_server(DaemonConfig *config) {
GMainLoop *loop = NULL;
gint r = -1;
+ GIOChannel *io = NULL;
+ guint watch_id = (guint) -1;
g_assert(config);
loop = g_main_loop_new(NULL, FALSE);
+
+ if (daemon_signal_init(SIGINT, SIGQUIT, SIGHUP, SIGTERM, 0) < 0) {
+ avahi_log_error("Could not register signal handlers (%s).", strerror(errno));
+ goto finish;
+ }
+
+ if (!(io = g_io_channel_unix_new(daemon_signal_fd()))) {
+ avahi_log_error( "Failed to create signal io channel.");
+ goto finish;
+ }
+
+ g_io_channel_set_close_on_unref(io, FALSE);
+ g_io_add_watch(io, G_IO_IN, signal_callback, loop);
if (simple_protocol_setup(NULL) < 0)
goto finish;
daemon_retval_send(0);
r = 0;
}
-
- g_main_loop_run(loop);
+ g_main_loop_run(loop);
finish:
if (avahi_server)
avahi_server_free(avahi_server);
+
+ daemon_signal_done();
+
+ if (watch_id != (guint) -1)
+ g_source_remove(watch_id);
+ if (io)
+ g_io_channel_unref(io);
+
+
if (loop)
g_main_loop_unref(loop);
if (r != 0 && config->daemonize)
- daemon_retval_send(0);
+ daemon_retval_send(1);
return r;
}
+static gint drop_root(void) {
+ struct passwd *pw;
+ struct group * gr;
+ gint r;
+
+ if (!(pw = getpwnam(AVAHI_USER))) {
+ avahi_log_error( "Failed to find user '"AVAHI_USER"'.");
+ return -1;
+ }
+
+ if (!(gr = getgrnam(AVAHI_GROUP))) {
+ avahi_log_error( "Failed to find group '"AVAHI_GROUP"'.");
+ return -1;
+ }
+
+ avahi_log_info("Found user '"AVAHI_USER"' (UID %lu) and group '"AVAHI_GROUP"' (GID %lu).", (unsigned long) pw->pw_uid, (unsigned long) gr->gr_gid);
+
+ if (initgroups(AVAHI_USER, gr->gr_gid) != 0) {
+ avahi_log_error("Failed to change group list: %s", strerror(errno));
+ return -1;
+ }
+
+#if defined(HAVE_SETRESGID)
+ r = setresgid(gr->gr_gid, gr->gr_gid, gr->gr_gid);
+#elif defined(HAVE_SETREGID)
+ r = setregid(gr->gr_gid, gr->gr_gid);
+#else
+ if ((r = setgid(gr->gr_gid)) >= 0)
+ r = setegid(gr->gr_gid);
+#endif
+
+ if (r < 0) {
+ avahi_log_error("Failed to change GID: %s", strerror(errno));
+ return -1;
+ }
+
+#if defined(HAVE_SETRESUID)
+ r = setresuid(pw->pw_uid, pw->pw_uid, pw->pw_uid);
+#elif defined(HAVE_SETREUID)
+ r = setreuid(pw->pw_uid, pw->pw_uid);
+#else
+ if ((r = setuid(pw->pw_uid)) >= 0)
+ r = seteuid(pw->pw_uid);
+#endif
+
+ if (r < 0) {
+ avahi_log_error("Failed to change UID: %s", strerror(errno));
+ return -1;
+ }
+
+ g_setenv("USER", pw->pw_name, 1);
+ g_setenv("LOGNAME", pw->pw_name, 1);
+ g_setenv("HOME", pw->pw_dir, 1);
+
+ avahi_log_info("Successfully dropped root privileges.");
+
+ return 0;
+}
+
int main(int argc, char *argv[]) {
gint r = 255;
DaemonConfig config;
config.daemonize = FALSE;
config.config_file = NULL;
config.enable_dbus = TRUE;
+ config.drop_root = TRUE;
if ((argv0 = strrchr(argv[0], '/')))
argv0++;
if (parse_command_line(&config, argc, argv) < 0)
goto finish;
- if (load_config_file(&config) < 0)
- goto finish;
-
if (config.command == DAEMON_HELP) {
help(stdout, argv0);
r = 0;
} else if (config.command == DAEMON_KILL) {
if (daemon_pid_file_kill_wait(SIGTERM, 5) < 0) {
- avahi_log_warn("Failed to kill daemon");
+ avahi_log_warn("Failed to kill daemon: %s", strerror(errno));
+ goto finish;
+ }
+
+ r = 0;
+
+ } else if (config.command == DAEMON_RELOAD) {
+ if (daemon_pid_file_kill(SIGHUP) < 0) {
+ avahi_log_warn("Failed to kill daemon: %s", strerror(errno));
goto finish;
}
} else if (config.command == DAEMON_RUN) {
pid_t pid;
+
+ if (getuid() != 0) {
+ 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;
}
+ if (load_config_file(&config) < 0)
+ goto finish;
+
if (config.daemonize) {
daemon_retval_init();
/* Child */
}
+ chdir("/");
+
if (daemon_pid_file_create() < 0) {
- avahi_log_error("Failed to create PID file.");
- daemon_retval_send(1);
+ avahi_log_error("Failed to create PID file: %s", strerror(errno));
+
+ if (config.daemonize)
+ daemon_retval_send(1);
goto finish;
} else
wrote_pid_file = TRUE;
+ if (config.drop_root) {
+ if (drop_root() < 0)
+ goto finish;
+ }
+
if (run_server(&config) == 0)
r = 0;
}
projects / catta / blobdiff