chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
a60e9f7
)
nspawn: properly validate machine names
author
Lennart Poettering
<lennart@poettering.net>
Fri, 12 Dec 2014 01:49:40 +0000
(
02:49
+0100)
committer
Lennart Poettering
<lennart@poettering.net>
Fri, 12 Dec 2014 12:35:32 +0000
(13:35 +0100)
src/nspawn/nspawn.c
patch
|
blob
|
history
diff --git
a/src/nspawn/nspawn.c
b/src/nspawn/nspawn.c
index 0466ddbff3ebae0f1b0569da607f8adbf93d27e9..e1e1c367f0250437f3ce621e2d9bf5b9aabccc22 100644
(file)
--- a/
src/nspawn/nspawn.c
+++ b/
src/nspawn/nspawn.c
@@
-369,15
+369,13
@@
static int parse_argv(int argc, char *argv[]) {
free(arg_machine);
arg_machine = NULL;
} else {
-
- if (!hostname_is_valid(optarg)) {
+ if (!machine_name_is_valid(optarg)) {
log_error("Invalid machine name: %s", optarg);
return -EINVAL;
}
- free(arg_machine);
- arg_machine = strdup(optarg);
- if (!arg_machine)
+ r = free_and_strdup(&arg_machine, optarg);
+ if (r < 0)
return log_oom();
break;