chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
networkd: netdev - add ipvlan support
[elogind.git]
/
src
/
resolve
/
resolved.c
diff --git
a/src/resolve/resolved.c
b/src/resolve/resolved.c
index 275f99c924fab6de5f4f4b6fb5a1b7ae06d02476..ce15a8011d551601f133cdcb25def20d6f06b908 100644
(file)
--- a/
src/resolve/resolved.c
+++ b/
src/resolve/resolved.c
@@
-21,11
+21,13
@@
#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 "selinux-util.h"
+
+#include "resolved-manager.h"
+#include "resolved-conf.h"
int main(int argc, char *argv[]) {
_cleanup_(manager_freep) Manager *m = NULL;
int main(int argc, char *argv[]) {
_cleanup_(manager_freep) Manager *m = NULL;
@@
-38,25
+40,30
@@
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;
goto finish;
}
if (argc != 1) {
log_error("This program takes no arguments.");
r = -EINVAL;
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)
);
+ 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) {
goto finish;
}
/* 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));
+ log_error_errno(r, "Could not create runtime directory: %m");
goto finish;
}
goto finish;
}
@@
-68,34
+75,42
@@
int main(int argc, char *argv[]) {
r = manager_new(&m);
if (r < 0) {
r = manager_new(&m);
if (r < 0) {
- log_error
("Could not create manager: %s", strerror(-r)
);
+ log_error
_errno(r, "Could not create manager: %m"
);
goto finish;
}
r = manager_parse_config_file(m);
if (r < 0)
goto finish;
}
r = manager_parse_config_file(m);
if (r < 0)
-
return r
;
+
log_warning_errno(r, "Failed to parse configuration file: %m")
;
- /* write finish default resolv.conf to avoid a dangling
- * symlink */
- r = manager_write_resolv_conf(m);
+ r = manager_start(m);
if (r < 0) {
if (r < 0) {
- log_error
("Could not create resolv.conf: %s", strerror(-r)
);
+ log_error
_errno(r, "Failed to start manager: %m"
);
goto finish;
}
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)
);
+ log_error
_errno(r, "Event loop failed: %m"
);
goto finish;
}
goto finish;
}
+ sd_event_get_exit_code(m->event, &r);
+
finish:
finish:
- sd_notify(false, "STATUS=Shutting down...");
+ sd_notify(false,
+ "STOPPING=1\n"
+ "STATUS=Shutting down...");
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
}
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
}