33 lines
838 B
Diff
33 lines
838 B
Diff
|
From c05ee9208db5e25d550ec6dd4b5ff54a199959fd Mon Sep 17 00:00:00 2001
|
||
|
|
From: MilhouseVH <milhouseVH.github@nmacleod.com>
|
||
|
|
Date: Mon, 16 Dec 2019 20:34:22 +0000
|
||
|
|
Subject: [PATCH] openssh: source /etc/environment
|
||
|
|
|
||
|
|
---
|
||
|
|
session.c | 2 --
|
||
|
|
1 file changed, 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/session.c b/session.c
|
||
|
|
index ac06b08..0a1c59a 100644
|
||
|
|
--- a/session.c
|
||
|
|
+++ b/session.c
|
||
|
|
@@ -1080,7 +1080,6 @@ do_setup_env(struct ssh *ssh, Session *s, const char *shell)
|
||
|
|
child_set_env(&env, &envsize, "KRB5CCNAME", cp);
|
||
|
|
}
|
||
|
|
|
||
|
|
-#ifdef _AIX
|
||
|
|
{
|
||
|
|
char *cp;
|
||
|
|
|
||
|
|
@@ -1089,7 +1088,6 @@ do_setup_env(struct ssh *ssh, Session *s, const char *shell)
|
||
|
|
read_environment_file(&env, &envsize, "/etc/environment",
|
||
|
|
options.permit_user_env_whitelist);
|
||
|
|
}
|
||
|
|
-#endif
|
||
|
|
#ifdef KRB5
|
||
|
|
if (s->authctxt->krb5_ccname)
|
||
|
|
child_set_env(&env, &envsize, "KRB5CCNAME",
|
||
|
|
--
|
||
|
|
2.7.4
|
||
|
|
|