proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-14 17:12:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

attach: non-functional changes

Browse Source 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
This commit is contained in:
Christian Brauner 2018-02-07 11:13:48 +01:00
parent 7385273fc4
commit 3d55242aa5
No known key found for this signature in database
GPG Key ID: 8EB056D53EECB12D
1 changed files with 37 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
src/lxc/attach.c
View File

@ -326,6 +326,7 @@ static int lxc_attach_set_environment(struct lxc_proc_context_info *init_ctx,
enum lxc_attach_env_policy_t policy, enum lxc_attach_env_policy_t policy,
char **extra_env, char **extra_keep) char **extra_env, char **extra_keep)
{ {
int ret;
struct lxc_list *iterator; struct lxc_list *iterator;
if (policy == LXC_ATTACH_CLEAR_ENV) { if (policy == LXC_ATTACH_CLEAR_ENV) {
@ -335,44 +336,41 @@ static int lxc_attach_set_environment(struct lxc_proc_context_info *init_ctx,
if (extra_keep) { if (extra_keep) {
size_t count, i; size_t count, i;
for (count = 0; extra_keep[count]; count++); for (count = 0; extra_keep[count]; count++)
;
extra_keep_store = calloc(count, sizeof(char *)); extra_keep_store = calloc(count, sizeof(char *));
if (!extra_keep_store) { if (!extra_keep_store)
SYSERROR("Failed to allocate memory for storing current "
"environment variable values that will be kept.");
return -1; return -1;
}
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
char *v = getenv(extra_keep[i]); char *v = getenv(extra_keep[i]);
if (v) { if (v) {
extra_keep_store[i] = strdup(v); extra_keep_store[i] = strdup(v);
if (!extra_keep_store[i]) { if (!extra_keep_store[i]) {
SYSERROR("Failed to allocate memory for storing current "
"environment variable values that will be kept.");
while (i > 0) while (i > 0)
free(extra_keep_store[--i]); free(extra_keep_store[--i]);
free(extra_keep_store); free(extra_keep_store);
return -1; return -1;
} }
if (strcmp(extra_keep[i], "PATH") == 0) if (strcmp(extra_keep[i], "PATH") == 0)
path_kept = 1; path_kept = 1;
} }
/* Calloc sets entire array to zero, so we don't
* need an else.
*/
} }
} }
if (clearenv()) { if (clearenv()) {
char **p;
SYSERROR("Failed to clear environment.");
if (extra_keep_store) { if (extra_keep_store) {
char **p;
for (p = extra_keep_store; *p; p++) for (p = extra_keep_store; *p; p++)
free(*p); free(*p);
free(extra_keep_store); free(extra_keep_store);
} }
SYSERROR("Failed to clear environment");
return -1; return -1;
} }
@ -381,8 +379,9 @@ static int lxc_attach_set_environment(struct lxc_proc_context_info *init_ctx,
for (i = 0; extra_keep[i]; i++) { for (i = 0; extra_keep[i]; i++) {
if (extra_keep_store[i]) { if (extra_keep_store[i]) {
if (setenv(extra_keep[i], extra_keep_store[i], 1) < 0) ret = setenv(extra_keep[i], extra_keep_store[i], 1);
SYSERROR("Unable to set environment variable."); if (ret < 0)
WARN("%s - Failed to set environment variable", strerror(errno));
} }
free(extra_keep_store[i]); free(extra_keep_store[i]);
} }
@ -394,27 +393,31 @@ static int lxc_attach_set_environment(struct lxc_proc_context_info *init_ctx,
* out there that just assume that getenv("PATH") is never NULL * out there that just assume that getenv("PATH") is never NULL
* and then die a painful segfault death. * and then die a painful segfault death.
*/ */
if (!path_kept) if (!path_kept) {
setenv("PATH", "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", 1); ret = setenv("PATH", "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", 1);
if (ret < 0)
WARN("%s - Failed to set environment variable", strerror(errno));
}
} }
if (putenv("container=lxc")) { ret = putenv("container=lxc");
SYSERROR("Failed to set environment variable."); if (ret < 0) {
WARN("%s - Failed to set environment variable", strerror(errno));
return -1; return -1;
} }
/* Set container environment variables.*/ /* Set container environment variables.*/
if (init_ctx && init_ctx->container && init_ctx->container->lxc_conf) { if (init_ctx && init_ctx->container && init_ctx->container->lxc_conf) {
lxc_list_for_each(iterator, &init_ctx->container->lxc_conf->environment) { lxc_list_for_each(iterator, &init_ctx->container->lxc_conf->environment) {
char *env_tmp = strdup((char *)iterator->elem); char *env_tmp;
if (!env_tmp) {
SYSERROR("Failed to allocate memory for container environment "
"variables.");
return -1;
}
if (putenv(env_tmp)) { env_tmp = strdup((char *)iterator->elem);
SYSERROR("Failed to set environment variable: %s.", (char *)iterator->elem); if (!env_tmp)
return -1;
ret = putenv(env_tmp);
if (ret < 0) {
SYSERROR("Failed to set environment variable: %s", (char *)iterator->elem);
return -1; return -1;
} }
} }
@ -423,19 +426,17 @@ static int lxc_attach_set_environment(struct lxc_proc_context_info *init_ctx,
/* Set extra environment variables. */ /* Set extra environment variables. */
if (extra_env) { if (extra_env) {
for (; *extra_env; extra_env++) { for (; *extra_env; extra_env++) {
/* Duplicate the string, just to be on the safe side, char *p;
* because putenv does not do it for us.
*/
char *p = strdup(*extra_env);
/* We just assume the user knows what they are doing, so /* We just assume the user knows what they are doing, so
* we don't do any checks. * we don't do any checks.
*/ */
if (!p) { p = strdup(*extra_env);
SYSERROR("Failed to allocate memory for additional environment " if (!p)
"variables.");
return -1; return -1;
}
putenv(p); ret = putenv(p);
if (ret < 0)
WARN("%s - Failed to set environment variable", strerror(errno));
} }
} }