From: Damien Miller <djm@mindrot.org>
Date: Tue, 21 Jan 2020 01:32:16 +0000 (+1100)
Subject: Wrap copy_environment_blacklist() in #ifdef
X-Git-Tag: V_8_2_P1~122
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a8bd5fdbdb7581afc7123a042a7cd6ca25357388;p=thirdparty%2Fopenssh-portable.git

Wrap copy_environment_blacklist() in #ifdef

It's only needed for USE_PAM or HAVE_CYGWIN cases and will cause compiler
warnings otherwise.
---

diff --git a/session.c b/session.c
index 431ccd832..e16f876c5 100644
--- a/session.c
+++ b/session.c
@@ -946,6 +946,7 @@ read_etc_default_login(char ***env, u_int *envsize, uid_t uid)
 }
 #endif /* HAVE_ETC_DEFAULT_LOGIN */
 
+#if defined(USE_PAM) || defined(HAVE_CYGWIN)
 static void
 copy_environment_blacklist(char **source, char ***env, u_int *envsize,
     const char *blacklist)
@@ -973,6 +974,7 @@ copy_environment_blacklist(char **source, char ***env, u_int *envsize,
 		free(var_name);
 	}
 }
+#endif /* defined(USE_PAM) || defined(HAVE_CYGWIN) */
 
 #ifdef HAVE_CYGWIN
 static void