diff options
| author | Simon Rettberg | 2018-05-14 11:18:45 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2018-05-14 11:18:45 +0200 |
| commit | 5de7046fc9f63cab4fc9b95f6e82df138d93a58c (patch) | |
| tree | 0014eb1b126622335e9c9d62a327436babc385c5 /core/modules | |
| parent | [run-virt] wait before calling slxlog on exit 141 (diff) | |
| download | mltk-5de7046fc9f63cab4fc9b95f6e82df138d93a58c.tar.gz mltk-5de7046fc9f63cab4fc9b95f6e82df138d93a58c.tar.xz mltk-5de7046fc9f63cab4fc9b95f6e82df138d93a58c.zip | |
[mgmt-sshd] Don't use PAM stack
Closes #3364
Diffstat (limited to 'core/modules')
| -rwxr-xr-x | core/modules/idleaction/data/opt/openslx/scripts/idleaction-scheduled_action | 4 | ||||
| -rw-r--r-- | core/modules/mgmt-sshd/data/etc/ssh/mgmt/sshd_config | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/core/modules/idleaction/data/opt/openslx/scripts/idleaction-scheduled_action b/core/modules/idleaction/data/opt/openslx/scripts/idleaction-scheduled_action index 7a1b2afd..2717d6cb 100755 --- a/core/modules/idleaction/data/opt/openslx/scripts/idleaction-scheduled_action +++ b/core/modules/idleaction/data/opt/openslx/scripts/idleaction-scheduled_action @@ -1,5 +1,7 @@ #!/bin/ash +export PATH="$PATH:/opt/openslx/bin:/opt/openslx/sbin" + if ! touch "/run"; then echo "Only root can call this" >&2 exit 1 @@ -33,7 +35,7 @@ while [ $# -gt 0 ]; do fi shift done -[ -n "$1" ] && DELAY=$1 +[ -n "$1" ] && [ -z "$DELAY" ] && DELAY=$1 if [ -n "$TS" ]; then # Sanity check for trigger by cron diff --git a/core/modules/mgmt-sshd/data/etc/ssh/mgmt/sshd_config b/core/modules/mgmt-sshd/data/etc/ssh/mgmt/sshd_config index b51a1109..ea259180 100644 --- a/core/modules/mgmt-sshd/data/etc/ssh/mgmt/sshd_config +++ b/core/modules/mgmt-sshd/data/etc/ssh/mgmt/sshd_config @@ -3,8 +3,6 @@ Protocol 2 HostKey /etc/ssh/mgmt/ssh_host_rsa_key HostKey /etc/ssh/mgmt/ssh_host_dsa_key HostKey /etc/ssh/mgmt/ssh_host_ecdsa_key -UsePrivilegeSeparation yes -KeyRegenerationInterval 3600 SyslogFacility AUTH LogLevel INFO LoginGraceTime 30 @@ -13,7 +11,6 @@ StrictModes yes PubkeyAuthentication yes AuthorizedKeysFile /etc/ssh/mgmt/authorized_keys IgnoreRhosts yes -RhostsRSAAuthentication no HostbasedAuthentication no PermitEmptyPasswords no ChallengeResponseAuthentication no @@ -27,7 +24,7 @@ TCPKeepAlive yes #Banner /etc/issue.net #PrintMotd yes AcceptEnv LANG LC_* -UsePAM yes +UsePAM no UseDNS no PidFile /run/sshd_mgmt.pid AllowUsers root |