return 0;
}
+static int config_parse_path_printf(
+ const char *filename,
+ unsigned line,
+ const char *section,
+ const char *lvalue,
+ int ltype,
+ const char *rvalue,
+ void *data,
+ void *userdata) {
+
+ Unit *u = userdata;
+ char **s = data;
+ char *k;
+
+ assert(filename);
+ assert(lvalue);
+ assert(rvalue);
+ assert(s);
+ assert(u);
+
+ if (!(k = unit_full_printf(u, rvalue)))
+ return -ENOMEM;
+
+ if (!path_is_absolute(k)) {
+ log_error("[%s:%u] Not an absolute path: %s", filename, line, k);
+ free(k);
+ return -EINVAL;
+ }
+
+ path_kill_slashes(k);
+
+ free(*s);
+ *s = k;
+
+ return 0;
+}
+
static int config_parse_listen(
const char *filename,
unsigned line,
* unit name. */
name = file_name_from_path(*filename);
- if (unit_name_is_valid(name, false)) {
- if (!(id = set_get(names, name))) {
+ if (unit_name_is_valid(name, true)) {
- if (!(id = strdup(name)))
+ id = set_get(names, name);
+ if (!id) {
+ id = strdup(name);
+ if (!id)
return -ENOMEM;
- if ((r = set_put(names, id)) < 0) {
+ r = set_put(names, id);
+ if (r < 0) {
free(id);
return r;
}
{ config_parse_bool, "BOOLEAN" },
{ config_parse_string, "STRING" },
{ config_parse_path, "PATH" },
+ { config_parse_path_printf, "PATH" },
{ config_parse_strv, "STRING [...]" },
{ config_parse_nice, "NICE" },
{ config_parse_oom_score_adjust, "OOMSCOREADJUST" },
};
#define EXEC_CONTEXT_CONFIG_ITEMS(context, section) \
- { "WorkingDirectory", config_parse_path, 0, &(context).working_directory, section }, \
- { "RootDirectory", config_parse_path, 0, &(context).root_directory, section }, \
+ { "WorkingDirectory", config_parse_path_printf, 0, &(context).working_directory, section }, \
+ { "RootDirectory", config_parse_path_printf, 0, &(context).root_directory, section }, \
{ "User", config_parse_string_printf, 0, &(context).user, section }, \
{ "Group", config_parse_string_printf, 0, &(context).group, section }, \
{ "SupplementaryGroups", config_parse_strv, 0, &(context).supplementary_groups, section }, \
{ "StandardInput", config_parse_input, 0, &(context).std_input, section }, \
{ "StandardOutput", config_parse_output, 0, &(context).std_output, section }, \
{ "StandardError", config_parse_output, 0, &(context).std_error, section }, \
- { "TTYPath", config_parse_path, 0, &(context).tty_path, section }, \
+ { "TTYPath", config_parse_path_printf, 0, &(context).tty_path, section }, \
+ { "TTYReset", config_parse_bool, 0, &(context).tty_reset, section }, \
+ { "TTYVHangup", config_parse_bool, 0, &(context).tty_vhangup, section }, \
+ { "TTYVTDisallocate", config_parse_bool, 0, &(context).tty_vt_disallocate, section }, \
{ "SyslogIdentifier", config_parse_string_printf, 0, &(context).syslog_identifier, section }, \
{ "SyslogFacility", config_parse_facility, 0, &(context).syslog_priority, section }, \
{ "SyslogLevel", config_parse_level, 0, &(context).syslog_priority, section }, \
{ "ConditionSecurity", config_parse_condition_string, CONDITION_SECURITY, u, "Unit" },
{ "ConditionNull", config_parse_condition_null, 0, u, "Unit" },
- { "PIDFile", config_parse_path, 0, &u->service.pid_file, "Service" },
+ { "PIDFile", config_parse_path_printf, 0, &u->service.pid_file, "Service" },
{ "ExecStartPre", config_parse_exec, 0, u->service.exec_command+SERVICE_EXEC_START_PRE, "Service" },
{ "ExecStart", config_parse_exec, 0, u->service.exec_command+SERVICE_EXEC_START, "Service" },
{ "ExecStartPost", config_parse_exec, 0, u->service.exec_command+SERVICE_EXEC_START_POST, "Service" },
{ "Mark", config_parse_int, 0, &u->socket.mark, "Socket" },
{ "PipeSize", config_parse_size, 0, &u->socket.pipe_size, "Socket" },
{ "FreeBind", config_parse_bool, 0, &u->socket.free_bind, "Socket" },
+ { "Transparent", config_parse_bool, 0, &u->socket.transparent, "Socket" },
+ { "Broadcast", config_parse_bool, 0, &u->socket.broadcast, "Socket" },
{ "TCPCongestion", config_parse_string, 0, &u->socket.tcp_congestion, "Socket" },
{ "MessageQueueMaxMessages", config_parse_long, 0, &u->socket.mq_maxmsg, "Socket" },
{ "MessageQueueMessageSize", config_parse_long, 0, &u->socket.mq_msgsize, "Socket" },