shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-10-27 18:55:09 +03:00
Code

unit: do wildcard expansion in ListenStream= and friends

Browse Source
This commit is contained in:
Lennart Poettering 2011-07-01 00:55:34 +02:00
parent 31e54cc807
commit 1fd45a90f5
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/load-fragment.c
View File

@ -251,7 +251,7 @@ static int config_parse_listen(
if (streq(lvalue, "ListenFIFO")) {
p->type = SOCKET_FIFO;
if (!(p->path = strdup(rvalue))) {
if (!(p->path = unit_full_printf(UNIT(s), rvalue))) {
free(p);
return -ENOMEM;
}
@ -261,7 +261,7 @@ static int config_parse_listen(
} else if (streq(lvalue, "ListenSpecial")) {
p->type = SOCKET_SPECIAL;
if (!(p->path = strdup(rvalue))) {
if (!(p->path = unit_full_printf(UNIT(s), rvalue))) {
free(p);
return -ENOMEM;
}
@ -272,7 +272,7 @@ static int config_parse_listen(
p->type = SOCKET_MQUEUE;
if (!(p->path = strdup(rvalue))) {
if (!(p->path = unit_full_printf(UNIT(s), rvalue))) {
free(p);
return -ENOMEM;
}
@ -280,18 +280,30 @@ static int config_parse_listen(
path_kill_slashes(p->path);
} else if (streq(lvalue, "ListenNetlink")) {
p->type = SOCKET_SOCKET;
char *k;
int r;
if (socket_address_parse_netlink(&p->address, rvalue) < 0) {
p->type = SOCKET_SOCKET;
k = unit_full_printf(UNIT(s), rvalue);
r = socket_address_parse_netlink(&p->address, k);
free(k);
if (r < 0) {
log_error("[%s:%u] Failed to parse address value, ignoring: %s", filename, line, rvalue);
free(p);
return 0;
}
} else {
p->type = SOCKET_SOCKET;
char *k;
int r;
if (socket_address_parse(&p->address, rvalue) < 0) {
p->type = SOCKET_SOCKET;
k = unit_full_printf(UNIT(s), rvalue);
r = socket_address_parse(&p->address, k);
free(k);
if (r < 0) {
log_error("[%s:%u] Failed to parse address value, ignoring: %s", filename, line, rvalue);
free(p);
return 0;

1
src/logind.h
View File

@ -36,6 +36,7 @@
*
* spawn user systemd
* direct client API
* add display symlinks also per-session
*
* udev:
* drop redundant udev_device_get_is_initialized() use as soon as libudev is fixed