diff options
Diffstat (limited to 'pkgs/tools/networking/openssh/locale_archive.patch')
| -rw-r--r-- | pkgs/tools/networking/openssh/locale_archive.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/tools/networking/openssh/locale_archive.patch b/pkgs/tools/networking/openssh/locale_archive.patch index a7f946d693a2..3fe4a21ea47e 100644 --- a/pkgs/tools/networking/openssh/locale_archive.patch +++ b/pkgs/tools/networking/openssh/locale_archive.patch @@ -1,15 +1,15 @@ -diff --git a/session.c b/session.c -index e032de6..44db2bb 100644 ---- a/session.c -+++ b/session.c -@@ -1196,6 +1196,10 @@ do_setup_env(Session *s, const char *shell) +diff --git i/session.c w/session.c +index 58826db1..658dd911 100644 +--- i/session.c ++++ w/session.c +@@ -1053,6 +1053,10 @@ do_setup_env(struct ssh *ssh, Session *s, const char *shell) if (getenv("TZ")) child_set_env(&env, &envsize, "TZ", getenv("TZ")); -+ /* NixOS path to the glibc locale archive, to be set in the upstart job */ ++ /* NixOS path to the glibc locale archive, to be set in the systemd job */ + if (getenv("LOCALE_ARCHIVE")) + child_set_env(&env, &envsize, "LOCALE_ARCHIVE", getenv("LOCALE_ARCHIVE")); + - /* Set custom environment options from RSA authentication. */ - if (!options.use_login) { - while (custom_environment) { + /* Set custom environment options from pubkey authentication. */ + if (options.permit_user_env) { + for (n = 0 ; n < auth_opts->nenv; n++) { |