diff options
-rw-r--r-- | etc/inc/allow-ssh.inc | 2 | ||||
-rw-r--r-- | etc/inc/disable-common.inc | 1 | ||||
-rw-r--r-- | etc/profile-m-z/ssh-agent.profile | 2 | ||||
-rw-r--r-- | etc/profile-m-z/ssh.profile | 2 |
4 files changed, 5 insertions, 2 deletions
diff --git a/etc/inc/allow-ssh.inc b/etc/inc/allow-ssh.inc index 2e864ad64..48b1f91ba 100644 --- a/etc/inc/allow-ssh.inc +++ b/etc/inc/allow-ssh.inc | |||
@@ -3,3 +3,5 @@ | |||
3 | include allow-ssh.local | 3 | include allow-ssh.local |
4 | 4 | ||
5 | noblacklist ${HOME}/.ssh | 5 | noblacklist ${HOME}/.ssh |
6 | noblacklist /etc/ssh | ||
7 | noblacklist /etc/ssh/ssh_config | ||
diff --git a/etc/inc/disable-common.inc b/etc/inc/disable-common.inc index eeafe3ec4..e1c930b43 100644 --- a/etc/inc/disable-common.inc +++ b/etc/inc/disable-common.inc | |||
@@ -396,6 +396,7 @@ blacklist /etc/shadow | |||
396 | blacklist /etc/shadow+ | 396 | blacklist /etc/shadow+ |
397 | blacklist /etc/shadow- | 397 | blacklist /etc/shadow- |
398 | blacklist /etc/ssh | 398 | blacklist /etc/ssh |
399 | blacklist /etc/ssh/* | ||
399 | blacklist /home/.ecryptfs | 400 | blacklist /home/.ecryptfs |
400 | blacklist /home/.fscrypt | 401 | blacklist /home/.fscrypt |
401 | blacklist /var/backup | 402 | blacklist /var/backup |
diff --git a/etc/profile-m-z/ssh-agent.profile b/etc/profile-m-z/ssh-agent.profile index d2e2b3408..0b7caed7d 100644 --- a/etc/profile-m-z/ssh-agent.profile +++ b/etc/profile-m-z/ssh-agent.profile | |||
@@ -6,7 +6,7 @@ include ssh-agent.local | |||
6 | # Persistent global definitions | 6 | # Persistent global definitions |
7 | include globals.local | 7 | include globals.local |
8 | 8 | ||
9 | noblacklist /etc/ssh | 9 | noblacklist /etc/ssh/* |
10 | noblacklist /tmp/ssh-* | 10 | noblacklist /tmp/ssh-* |
11 | 11 | ||
12 | # Allow ssh (blacklisted by disable-common.inc) | 12 | # Allow ssh (blacklisted by disable-common.inc) |
diff --git a/etc/profile-m-z/ssh.profile b/etc/profile-m-z/ssh.profile index efdf63976..eb7bc3ec5 100644 --- a/etc/profile-m-z/ssh.profile +++ b/etc/profile-m-z/ssh.profile | |||
@@ -7,7 +7,7 @@ include ssh.local | |||
7 | # Persistent global definitions | 7 | # Persistent global definitions |
8 | include globals.local | 8 | include globals.local |
9 | 9 | ||
10 | noblacklist /etc/ssh | 10 | noblacklist /etc/ssh/* |
11 | noblacklist /tmp/ssh-* | 11 | noblacklist /tmp/ssh-* |
12 | # nc can be used as ProxyCommand, e.g. when using tor | 12 | # nc can be used as ProxyCommand, e.g. when using tor |
13 | noblacklist ${PATH}/nc | 13 | noblacklist ${PATH}/nc |