summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2012-04-22 01:01:22 +0200
committerLennart Poettering <lennart@poettering.net>2012-04-22 01:01:22 +0200
commit3a74cea5e4cea6d6f852a2a7118efe0e339b78c7 (patch)
tree5d2a0b2297500f82be71110e7fccb3d1cf6ff4ef
parenteaeb18dba95403b5f619d192c5a915546b5ace47 (diff)
nspawn: be more careful when initializing the hostname from the directory name
-rw-r--r--src/nspawn/nspawn.c31
1 files changed, 26 insertions, 5 deletions
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 71cdd3f39f..50f2c59111 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -101,8 +101,9 @@ static int parse_argv(int argc, char *argv[]) {
case 'D':
free(arg_directory);
- if (!(arg_directory = strdup(optarg))) {
- log_error("Failed to duplicate root directory.");
+ arg_directory = canonicalize_file_name(optarg);
+ if (!arg_directory) {
+ log_error("Failed to canonicalize root directory.");
return -ENOMEM;
}
@@ -474,6 +475,28 @@ finish:
return r;
}
+static int setup_hostname(void) {
+ char *hn;
+ int r = 0;
+
+ hn = file_name_from_path(arg_directory);
+ if (hn) {
+ hn = strdup(hn);
+ if (!hn)
+ return -ENOMEM;
+
+ hostname_cleanup(hn);
+
+ if (!isempty(hn))
+ if (sethostname(hn, strlen(hn)) < 0)
+ r = -errno;
+
+ free(hn);
+ }
+
+ return r;
+}
+
static int drop_capabilities(void) {
static const unsigned long retain[] = {
CAP_CHOWN,
@@ -872,7 +895,6 @@ int main(int argc, char *argv[]) {
if (pid == 0) {
/* child */
- const char *hn;
const char *home = NULL;
uid_t uid = (uid_t) -1;
gid_t gid = (gid_t) -1;
@@ -1000,8 +1022,7 @@ int main(int argc, char *argv[]) {
goto child_fail;
}
- if ((hn = file_name_from_path(arg_directory)))
- sethostname(hn, strlen(hn));
+ setup_hostname();
if (argc > optind)
execvpe(argv[optind], argv + optind, (char**) envp);