Skip to content

L
lxc
Unverified Commit 434f12c1 by Christian Brauner
Options

confile: clean up hooks

Signed-off-by: 's avatarChristian Brauner <christian.brauner@ubuntu.com>
parent 2b9319af
Showing with 5 additions and 9 deletions
src/lxc/confile.c
...@@ -1105,10 +1105,8 @@ static int set_config_hooks(const char *key, const char *value, ...@@ -1105,10 +1105,8 @@ static int set_config_hooks(const char *key, const char *value,
if (lxc_config_value_empty(value)) if (lxc_config_value_empty(value))
return lxc_clear_hooks(lxc_conf, key); return lxc_clear_hooks(lxc_conf, key);
if (strcmp(key + 4, "hook") == 0) { if (strcmp(key + 4, "hook") == 0)
ERROR("lxc.hook must not have a value"); return log_error_errno(-EINVAL, EINVAL, "lxc.hook must not have a value");
return -1;
}
copy = strdup(value); copy = strdup(value);
if (!copy) if (!copy)
...@@ -1151,11 +1149,9 @@ static int set_config_hooks_version(const char *key, const char *value, ...@@ -1151,11 +1149,9 @@ static int set_config_hooks_version(const char *key, const char *value,
if (ret < 0) if (ret < 0)
return -1; return -1;
if (tmp > 1) { if (tmp > 1)
ERROR("Invalid hook version specified. Currently only 0 " return log_error_errno(-EINVAL,
"(legacy) and 1 are supported"); EINVAL, "Invalid hook version specified. Currently only 0 (legacy) and 1 are supported");
return -1;
}
lxc_conf->hooks_version = tmp; lxc_conf->hooks_version = tmp;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment