chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
resolved: properly pass aborted transaction result back to clients
[elogind.git]
/
src
/
resolve
/
resolved.c
diff --git
a/src/resolve/resolved.c
b/src/resolve/resolved.c
index 82f43d68031b398116215974c71d34e9a8a88a9f..892bb51386d8f27b97323085f6002415db458c86 100644
(file)
--- a/
src/resolve/resolved.c
+++ b/
src/resolve/resolved.c
@@
-21,13
+21,17
@@
#include "sd-event.h"
#include "sd-daemon.h"
#include "sd-event.h"
#include "sd-daemon.h"
-
-#include "resolved.h"
-
#include "mkdir.h"
#include "mkdir.h"
+#include "capability.h"
+
+#include "resolved-manager.h"
+#include "resolved-conf.h"
int main(int argc, char *argv[]) {
int main(int argc, char *argv[]) {
- _cleanup_manager_free_ Manager *m = NULL;
+ _cleanup_(manager_freep) Manager *m = NULL;
+ const char *user = "systemd-resolve";
+ uid_t uid;
+ gid_t gid;
int r;
log_set_target(LOG_TARGET_AUTO);
int r;
log_set_target(LOG_TARGET_AUTO);
@@
-39,35
+43,50
@@
int main(int argc, char *argv[]) {
if (argc != 1) {
log_error("This program takes no arguments.");
r = -EINVAL;
if (argc != 1) {
log_error("This program takes no arguments.");
r = -EINVAL;
- goto out;
+ goto finish;
+ }
+
+ r = get_user_creds(&user, &uid, &gid, NULL, NULL);
+ if (r < 0) {
+ log_error("Cannot resolve user name %s: %s", user, strerror(-r));
+ goto finish;
}
/* Always create the directory where resolv.conf will live */
}
/* Always create the directory where resolv.conf will live */
- r = mkdir_label("/run/systemd/network", 0755);
+ r = mkdir_safe_label("/run/systemd/resolve", 0755, uid, gid);
+ if (r < 0) {
+ log_error("Could not create runtime directory: %s", strerror(-r));
+ goto finish;
+ }
+
+ r = drop_privileges(uid, gid, 0);
if (r < 0)
if (r < 0)
- log_error("Could not create runtime directory: %s",
- strerror(-r));
+ goto finish;
+
+ assert_se(sigprocmask_many(SIG_BLOCK, SIGTERM, SIGINT, -1) == 0);
r = manager_new(&m);
if (r < 0) {
log_error("Could not create manager: %s", strerror(-r));
r = manager_new(&m);
if (r < 0) {
log_error("Could not create manager: %s", strerror(-r));
- goto
out
;
+ goto
finish
;
}
}
- r = manager_network_monitor_listen(m);
- if (r < 0) {
- log_error("Could not listen for network events: %s", strerror(-r));
- goto out;
- }
+ r = manager_parse_config_file(m);
+ if (r < 0)
+ log_warning("Failed to parse configuration file: %s", strerror(-r));
- /* write out default resolv.conf to avoid a
- * dangling symlink */
- r = manager_update_resolv_conf(m);
+ r = manager_start(m);
if (r < 0) {
if (r < 0) {
- log_error("
Could not create resolv.conf
: %s", strerror(-r));
- goto
out
;
+ log_error("
Failed to start manager
: %s", strerror(-r));
+ goto
finish
;
}
}
+ /* Write finish default resolv.conf to avoid a dangling
+ * symlink */
+ r = manager_write_resolv_conf(m);
+ if (r < 0)
+ log_warning("Could not create resolv.conf: %s", strerror(-r));
+
sd_notify(false,
"READY=1\n"
"STATUS=Processing requests...");
sd_notify(false,
"READY=1\n"
"STATUS=Processing requests...");
@@
-75,12
+94,11
@@
int main(int argc, char *argv[]) {
r = sd_event_loop(m->event);
if (r < 0) {
log_error("Event loop failed: %s", strerror(-r));
r = sd_event_loop(m->event);
if (r < 0) {
log_error("Event loop failed: %s", strerror(-r));
- goto
out
;
+ goto
finish
;
}
}
-out:
- sd_notify(false,
- "STATUS=Shutting down...");
+finish:
+ sd_notify(false, "STATUS=Shutting down...");
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
}
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
}