diff options
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/dbus-unit.c | 4 | ||||
| -rw-r--r-- | src/core/device.c | 2 | ||||
| -rw-r--r-- | src/core/load-fragment.c | 2 | ||||
| -rw-r--r-- | src/core/manager.c | 2 | ||||
| -rw-r--r-- | src/core/snapshot.c | 2 | ||||
| -rw-r--r-- | src/core/unit.c | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/src/core/dbus-unit.c b/src/core/dbus-unit.c index 4d3e3cc9ec..37c1e8cbf8 100644 --- a/src/core/dbus-unit.c +++ b/src/core/dbus-unit.c @@ -813,7 +813,7 @@ static int bus_unit_set_transient_property( if (r < 0) return r; - if (!unit_name_is_valid(s, false) || !endswith(s, ".slice")) + if (!unit_name_is_valid(s, TEMPLATE_INVALID) || !endswith(s, ".slice")) return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid slice name %s", s); if (isempty(s)) { @@ -865,7 +865,7 @@ static int bus_unit_set_transient_property( return r; while ((r = sd_bus_message_read(message, "s", &other)) > 0) { - if (!unit_name_is_valid(other, false)) + if (!unit_name_is_valid(other, TEMPLATE_INVALID)) return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid unit name %s", other); if (mode != UNIT_CHECK) { diff --git a/src/core/device.c b/src/core/device.c index d3976c9d47..c7bc1e25e7 100644 --- a/src/core/device.c +++ b/src/core/device.c @@ -268,7 +268,7 @@ static int device_update_unit(Manager *m, struct udev_device *dev, const char *p memcpy(e, w, l); e[l] = 0; - n = unit_name_mangle(e, false); + n = unit_name_mangle(e, MANGLE_NOGLOB); if (!n) { r = -ENOMEM; goto fail; diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c index 183c43d58f..7a2d32ddbd 100644 --- a/src/core/load-fragment.c +++ b/src/core/load-fragment.c @@ -2433,7 +2433,7 @@ static int open_follow(char **filename, FILE **_f, Set *names, char **_final) { * unit name. */ name = basename(*filename); - if (unit_name_is_valid(name, true)) { + if (unit_name_is_valid(name, TEMPLATE_VALID)) { id = set_get(names, name); if (!id) { diff --git a/src/core/manager.c b/src/core/manager.c index 6b33c18283..f69ae079df 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -1115,7 +1115,7 @@ int manager_load_unit_prepare( t = unit_name_to_type(name); - if (t == _UNIT_TYPE_INVALID || !unit_name_is_valid(name, false)) + if (t == _UNIT_TYPE_INVALID || !unit_name_is_valid(name, TEMPLATE_INVALID)) return sd_bus_error_setf(e, SD_BUS_ERROR_INVALID_ARGS, "Unit name %s is not valid.", name); ret = manager_get_unit(m, name); diff --git a/src/core/snapshot.c b/src/core/snapshot.c index 21e89ac996..d914af20e7 100644 --- a/src/core/snapshot.c +++ b/src/core/snapshot.c @@ -200,7 +200,7 @@ int snapshot_create(Manager *m, const char *name, bool cleanup, sd_bus_error *e, assert(_s); if (name) { - if (!unit_name_is_valid(name, false)) + if (!unit_name_is_valid(name, TEMPLATE_INVALID)) return sd_bus_error_setf(e, SD_BUS_ERROR_INVALID_ARGS, "Unit name %s is not valid.", name); if (unit_name_to_type(name) != UNIT_SNAPSHOT) diff --git a/src/core/unit.c b/src/core/unit.c index 160a346d86..e3b620603c 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -119,7 +119,7 @@ int unit_add_name(Unit *u, const char *text) { if (!s) return -ENOMEM; - if (!unit_name_is_valid(s, false)) { + if (!unit_name_is_valid(s, TEMPLATE_INVALID)) { r = -EINVAL; goto fail; } |