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: no need to negate errno for log_*_errno()
[elogind.git]
/
src
/
network
/
networkd.c
diff --git
a/src/network/networkd.c
b/src/network/networkd.c
index 6b3bf12a4cf3e32299d4dcb52dab159b204cd97f..fe5860411deb1eeb270560197be82fd67f76560e 100644
(file)
--- a/
src/network/networkd.c
+++ b/
src/network/networkd.c
@@
-19,6
+19,7
@@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
+#include "capability.h"
#include "sd-event.h"
#include "sd-daemon.h"
#include "sd-event.h"
#include "sd-daemon.h"
@@
-26,6
+27,9
@@
int main(int argc, char *argv[]) {
_cleanup_manager_free_ Manager *m = NULL;
int main(int argc, char *argv[]) {
_cleanup_manager_free_ Manager *m = NULL;
+ const char *user = "systemd-network";
+ uid_t uid;
+ gid_t gid;
int r;
log_set_target(LOG_TARGET_AUTO);
int r;
log_set_target(LOG_TARGET_AUTO);
@@
-40,64
+44,72
@@
int main(int argc, char *argv[]) {
goto out;
}
goto out;
}
+ r = get_user_creds(&user, &uid, &gid, NULL, NULL);
+ if (r < 0) {
+ log_error_errno(r, "Cannot resolve user name %s: %m", user);
+ goto out;
+ }
+
/* Always create the directories people can create inotify
* watches in. */
/* Always create the directories people can create inotify
* watches in. */
- r = mkdir_
label("/run/systemd/network", 0755
);
+ r = mkdir_
safe_label("/run/systemd/netif", 0755, uid, gid
);
if (r < 0)
log_error("Could not create runtime directory: %s",
strerror(-r));
if (r < 0)
log_error("Could not create runtime directory: %s",
strerror(-r));
- r = mkdir_
label("/run/systemd/network/links", 0755
);
+ r = mkdir_
safe_label("/run/systemd/netif/links", 0755, uid, gid
);
if (r < 0)
log_error("Could not create runtime directory 'links': %s",
strerror(-r));
if (r < 0)
log_error("Could not create runtime directory 'links': %s",
strerror(-r));
- r = mkdir_
label("/run/systemd/network/leases", 0755
);
+ r = mkdir_
safe_label("/run/systemd/netif/leases", 0755, uid, gid
);
if (r < 0)
log_error("Could not create runtime directory 'leases': %s",
strerror(-r));
if (r < 0)
log_error("Could not create runtime directory 'leases': %s",
strerror(-r));
+ r = drop_privileges(uid, gid,
+ (1ULL << CAP_NET_ADMIN) |
+ (1ULL << CAP_NET_BIND_SERVICE) |
+ (1ULL << CAP_NET_BROADCAST) |
+ (1ULL << CAP_NET_RAW));
+ if (r < 0)
+ goto out;
+
+ 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)
);
+ log_error
_errno(r, "Could not create manager: %m"
);
goto out;
}
r = manager_udev_listen(m);
if (r < 0) {
goto out;
}
r = manager_udev_listen(m);
if (r < 0) {
- log_error
("Could not connect to udev: %s", strerror(-r)
);
+ log_error
_errno(r, "Could not connect to udev: %m"
);
goto out;
}
r = manager_rtnl_listen(m);
if (r < 0) {
goto out;
}
r = manager_rtnl_listen(m);
if (r < 0) {
- log_error
("Could not connect to rtnl: %s", strerror(-r)
);
+ log_error
_errno(r, "Could not connect to rtnl: %m"
);
goto out;
}
r = manager_bus_listen(m);
if (r < 0) {
goto out;
}
r = manager_bus_listen(m);
if (r < 0) {
- log_error
("Could not connect to system bus: %s", strerror(-r)
);
+ log_error
_errno(r, "Could not connect to system bus: %m"
);
goto out;
}
r = manager_load_config(m);
if (r < 0) {
goto out;
}
r = manager_load_config(m);
if (r < 0) {
- log_error
("Could not load configuration files: %s", strerror(-r)
);
+ log_error
_errno(r, "Could not load configuration files: %m"
);
goto out;
}
r = manager_rtnl_enumerate_links(m);
if (r < 0) {
goto out;
}
r = manager_rtnl_enumerate_links(m);
if (r < 0) {
- log_error("Could not enumerate links: %s", strerror(-r));
- goto out;
- }
-
- /* write out empty resolv.conf to avoid a
- * dangling symlink */
- r = manager_update_resolv_conf(m);
- if (r < 0) {
- log_error("Could not create resolv.conf: %s", strerror(-r));
+ log_error_errno(r, "Could not enumerate links: %m");
goto out;
}
goto out;
}
@@
-107,12
+119,13
@@
int main(int argc, char *argv[]) {
r = sd_event_loop(m->event);
if (r < 0) {
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 out;
}
out:
sd_notify(false,
goto out;
}
out:
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;