diff options
| author | Duncan Eastoe <duncan.eastoe@att.com> | 2020-10-21 10:11:10 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2020-10-29 13:45:10 +1100 |
| commit | a575cf44e59a65506c67bddb62a712208a7a279c (patch) | |
| tree | a6b3fbca3ab4d02920e3b0964c838b728ccb716a /session.c | |
| parent | 33267feaffd5d98aa56d2f0b3a99ec352effe938 (diff) | |
| download | openssh-git-a575cf44e59a65506c67bddb62a712208a7a279c.tar.gz | |
session.c: use "denylist" terminology
Follow upstream (6d755706a0059eb9e2d63517f288b75cbc3b4701) language
improvements in this portable-specific code.
Diffstat (limited to 'session.c')
| -rw-r--r-- | session.c | 20 |
1 files changed, 10 insertions, 10 deletions
@@ -944,8 +944,8 @@ read_etc_default_login(char ***env, u_int *envsize, uid_t uid) #if defined(USE_PAM) || defined(HAVE_CYGWIN) static void -copy_environment_blacklist(char **source, char ***env, u_int *envsize, - const char *blacklist) +copy_environment_denylist(char **source, char ***env, u_int *envsize, + const char *denylist) { char *var_name, *var_val; int i; @@ -961,8 +961,8 @@ copy_environment_blacklist(char **source, char ***env, u_int *envsize, } *var_val++ = '\0'; - if (blacklist == NULL || - match_pattern_list(var_name, blacklist, 0) != 1) { + if (denylist == NULL || + match_pattern_list(var_name, denylist, 0) != 1) { debug3("Copy environment: %s=%s", var_name, var_val); child_set_env(env, envsize, var_name, var_val); } @@ -976,7 +976,7 @@ copy_environment_blacklist(char **source, char ***env, u_int *envsize, static void copy_environment(char **source, char ***env, u_int *envsize) { - copy_environment_blacklist(source, env, envsize, NULL); + copy_environment_denylist(source, env, envsize, NULL); } #endif @@ -1138,15 +1138,15 @@ do_setup_env(struct ssh *ssh, Session *s, const char *shell) * Don't allow PAM-internal env vars to leak * back into the session environment. */ -#define PAM_ENV_BLACKLIST "SSH_AUTH_INFO*,SSH_CONNECTION*" +#define PAM_ENV_DENYLIST "SSH_AUTH_INFO*,SSH_CONNECTION*" p = fetch_pam_child_environment(); - copy_environment_blacklist(p, &env, &envsize, - PAM_ENV_BLACKLIST); + copy_environment_denylist(p, &env, &envsize, + PAM_ENV_DENYLIST); free_pam_environment(p); p = fetch_pam_environment(); - copy_environment_blacklist(p, &env, &envsize, - PAM_ENV_BLACKLIST); + copy_environment_denylist(p, &env, &envsize, + PAM_ENV_DENYLIST); free_pam_environment(p); } #endif /* USE_PAM */ |