core: complain and correct /var/run/ → /run/ for listening sockets
We already do that for PIDFile= paths, and for tmpfiles.d/ snippets, let's also do this for .socket paths.
This commit is contained in:
parent
7d2c9c6b50
commit
4a66b5c9bf
|
@ -318,16 +318,44 @@ int config_parse_unit_path_strv_printf(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int config_parse_socket_listen(const char *unit,
|
static int patch_var_run(
|
||||||
const char *filename,
|
const char *unit,
|
||||||
unsigned line,
|
const char *filename,
|
||||||
const char *section,
|
unsigned line,
|
||||||
unsigned section_line,
|
const char *lvalue,
|
||||||
const char *lvalue,
|
char **path) {
|
||||||
int ltype,
|
|
||||||
const char *rvalue,
|
const char *e;
|
||||||
void *data,
|
char *z;
|
||||||
void *userdata) {
|
|
||||||
|
e = path_startswith(*path, "/var/run/");
|
||||||
|
if (!e)
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
z = path_join("/run/", e);
|
||||||
|
if (!z)
|
||||||
|
return log_oom();
|
||||||
|
|
||||||
|
log_syntax(unit, LOG_NOTICE, filename, line, 0,
|
||||||
|
"%s= references a path below legacy directory /var/run/, updating %s → %s; "
|
||||||
|
"please update the unit file accordingly.", lvalue, *path, z);
|
||||||
|
|
||||||
|
free_and_replace(*path, z);
|
||||||
|
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
int config_parse_socket_listen(
|
||||||
|
const char *unit,
|
||||||
|
const char *filename,
|
||||||
|
unsigned line,
|
||||||
|
const char *section,
|
||||||
|
unsigned section_line,
|
||||||
|
const char *lvalue,
|
||||||
|
int ltype,
|
||||||
|
const char *rvalue,
|
||||||
|
void *data,
|
||||||
|
void *userdata) {
|
||||||
|
|
||||||
_cleanup_free_ SocketPort *p = NULL;
|
_cleanup_free_ SocketPort *p = NULL;
|
||||||
SocketPort *tail;
|
SocketPort *tail;
|
||||||
|
@ -364,6 +392,12 @@ int config_parse_socket_listen(const char *unit,
|
||||||
if (r < 0)
|
if (r < 0)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
if (ltype == SOCKET_FIFO) {
|
||||||
|
r = patch_var_run(unit, filename, line, lvalue, &k);
|
||||||
|
if (r < 0)
|
||||||
|
return r;
|
||||||
|
}
|
||||||
|
|
||||||
free_and_replace(p->path, k);
|
free_and_replace(p->path, k);
|
||||||
p->type = ltype;
|
p->type = ltype;
|
||||||
|
|
||||||
|
@ -393,6 +427,12 @@ int config_parse_socket_listen(const char *unit,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (k[0] == '/') { /* Only for AF_UNIX file system sockets… */
|
||||||
|
r = patch_var_run(unit, filename, line, lvalue, &k);
|
||||||
|
if (r < 0)
|
||||||
|
return r;
|
||||||
|
}
|
||||||
|
|
||||||
r = socket_address_parse_and_warn(&p->address, k);
|
r = socket_address_parse_and_warn(&p->address, k);
|
||||||
if (r < 0) {
|
if (r < 0) {
|
||||||
if (r != -EAFNOSUPPORT)
|
if (r != -EAFNOSUPPORT)
|
||||||
|
@ -4253,7 +4293,6 @@ int config_parse_pid_file(
|
||||||
_cleanup_free_ char *k = NULL, *n = NULL;
|
_cleanup_free_ char *k = NULL, *n = NULL;
|
||||||
Unit *u = userdata;
|
Unit *u = userdata;
|
||||||
char **s = data;
|
char **s = data;
|
||||||
const char *e;
|
|
||||||
int r;
|
int r;
|
||||||
|
|
||||||
assert(filename);
|
assert(filename);
|
||||||
|
@ -4283,20 +4322,11 @@ int config_parse_pid_file(
|
||||||
if (r < 0)
|
if (r < 0)
|
||||||
return r;
|
return r;
|
||||||
|
|
||||||
e = path_startswith(n, "/var/run/");
|
r = patch_var_run(unit, filename, line, lvalue, &n);
|
||||||
if (e) {
|
if (r < 0)
|
||||||
char *z;
|
return r;
|
||||||
|
|
||||||
z = strjoin("/run/", e);
|
|
||||||
if (!z)
|
|
||||||
return log_oom();
|
|
||||||
|
|
||||||
log_syntax(unit, LOG_NOTICE, filename, line, 0, "PIDFile= references path below legacy directory /var/run/, updating %s → %s; please update the unit file accordingly.", n, z);
|
|
||||||
|
|
||||||
free_and_replace(*s, z);
|
|
||||||
} else
|
|
||||||
free_and_replace(*s, n);
|
|
||||||
|
|
||||||
|
free_and_replace(*s, n);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue