chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test-socket-util: silence warnings
[elogind.git]
/
src
/
resolve
/
resolved.c
diff --git
a/src/resolve/resolved.c
b/src/resolve/resolved.c
index 2eaff60fce8e0e77dc0f1de1210c1dc397b72d34..275f99c924fab6de5f4f4b6fb5a1b7ae06d02476 100644
(file)
--- a/
src/resolve/resolved.c
+++ b/
src/resolve/resolved.c
@@
-25,9
+25,13
@@
#include "resolved.h"
#include "mkdir.h"
#include "resolved.h"
#include "mkdir.h"
+#include "capability.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,33
+43,45
@@
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/resolve", 0755
);
- if (r < 0)
+ 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("Could not create runtime directory: %s",
strerror(-r));
+ goto finish;
+ }
+
+ r = drop_privileges(uid, gid, 0);
+ if (r < 0)
+ 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)
+ return r;
- /* write
out default resolv.conf to avoid a
- *
dangling
symlink */
- r = manager_
upda
te_resolv_conf(m);
+ /* write
finish default resolv.conf to avoid a dangling
+ * symlink */
+ r = manager_
wri
te_resolv_conf(m);
if (r < 0) {
log_error("Could not create resolv.conf: %s", strerror(-r));
if (r < 0) {
log_error("Could not create resolv.conf: %s", strerror(-r));
- goto
out
;
+ goto
finish
;
}
sd_notify(false,
}
sd_notify(false,
@@
-75,12
+91,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;
}