chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
treewide: a few more log_*_errno + return simplifications
[elogind.git]
/
src
/
resolve
/
resolved.c
diff --git
a/src/resolve/resolved.c
b/src/resolve/resolved.c
index f61b70f46b6814743c80f20424d8d76ba1901da5..c0ab947c0e88759fab91aeed87919bdcaba82dc3 100644
(file)
--- a/
src/resolve/resolved.c
+++ b/
src/resolve/resolved.c
@@
-21,14
+21,15
@@
#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 "label.h"
#include "capability.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;
const char *user = "systemd-resolve";
uid_t uid;
gid_t gid;
@@
-38,64
+39,76
@@
int main(int argc, char *argv[]) {
log_parse_environment();
log_open();
log_parse_environment();
log_open();
- umask(0022);
-
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;
+ }
+
+ umask(0022);
+
+ r = mac_selinux_init(NULL);
+ if (r < 0) {
+ log_error_errno(r, "SELinux setup failed: %m");
+ goto finish;
}
r = get_user_creds(&user, &uid, &gid, NULL, NULL);
if (r < 0) {
}
r = get_user_creds(&user, &uid, &gid, NULL, NULL);
if (r < 0) {
- log_error
("Cannot resolve user name %s: %s", user, strerror(-r)
);
- goto
out
;
+ log_error
_errno(r, "Cannot resolve user name %s: %m", user
);
+ goto
finish
;
}
/* Always create the directory where resolv.conf will live */
r = mkdir_safe_label("/run/systemd/resolve", 0755, uid, gid);
if (r < 0) {
}
/* Always create the directory where resolv.conf will live */
r = mkdir_safe_label("/run/systemd/resolve", 0755, uid, gid);
if (r < 0) {
- log_error("Could not create runtime directory: %s",
- strerror(-r));
- goto out;
+ log_error_errno(r, "Could not create runtime directory: %m");
+ goto finish;
}
r = drop_privileges(uid, gid, 0);
if (r < 0)
}
r = drop_privileges(uid, gid, 0);
if (r < 0)
- goto out;
+ goto finish;
+
+ assert_se(sigprocmask_many(SIG_BLOCK, SIGTERM, SIGINT, -1) == 0);
r = manager_new(&m);
if (r < 0) {
r = manager_new(&m);
if (r < 0) {
- log_error
("Could not create manager: %s", strerror(-r)
);
- goto
out
;
+ log_error
_errno(r, "Could not create manager: %m"
);
+ 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_errno(r, "Failed to parse configuration file: %m");
- /* 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
_errno(r, "Failed to start manager: %m"
);
+ goto
finish
;
}
}
+ /* Write finish default resolv.conf to avoid a dangling
+ * symlink */
+ r = manager_write_resolv_conf(m);
+ if (r < 0)
+ log_warning_errno(r, "Could not create resolv.conf: %m");
+
sd_notify(false,
"READY=1\n"
"STATUS=Processing requests...");
r = sd_event_loop(m->event);
if (r < 0) {
sd_notify(false,
"READY=1\n"
"STATUS=Processing requests...");
r = sd_event_loop(m->event);
if (r < 0) {
- log_error
("Event loop failed: %s", strerror(-r)
);
- goto
out
;
+ log_error
_errno(r, "Event loop failed: %m"
);
+ goto
finish
;
}
}
-out:
+ sd_event_get_exit_code(m->event, &r);
+
+finish:
sd_notify(false,
sd_notify(false,
+ "STOPPING=1\n"
"STATUS=Shutting down...");
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
"STATUS=Shutting down...");
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;