From 399dfbc499f54bccb81318cbe86acddcd4bdfeee Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Sun, 25 May 2008 19:57:41 +0000 Subject: Check for blacklists in /usr/share/ssh/ as well as /etc/ssh/ (see #481283). --- pathnames.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'pathnames.h') diff --git a/pathnames.h b/pathnames.h index 8886e8edd..e07123437 100644 --- a/pathnames.h +++ b/pathnames.h @@ -18,6 +18,10 @@ #define SSHDIR ETCDIR "/ssh" #endif +#ifndef _PATH_SSH_DATADIR +#define _PATH_SSH_DATADIR "/usr/share/ssh" +#endif + #ifndef _PATH_SSH_PIDDIR #define _PATH_SSH_PIDDIR "/var/run" #endif @@ -43,7 +47,8 @@ /* Backwards compatibility */ #define _PATH_DH_PRIMES SSHDIR "/primes" -#define _PATH_BLACKLIST SSHDIR "/blacklist" +#define _PATH_BLACKLIST _PATH_SSH_DATADIR "/blacklist" +#define _PATH_BLACKLIST_CONFIG SSHDIR "/blacklist" #ifndef _PATH_SSH_PROGRAM #define _PATH_SSH_PROGRAM "/usr/bin/ssh" -- cgit v1.2.3