Mirror/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-07-25 20:25:28 +03:00
Code Issues Wiki Activity

main/openssh: fix init.d script to also look in sshd_config.d/*.conf

Browse source 
With 3903cd4657 , users are incentivized to
put directives like `UsePAM` in `/etc/ssh/sshd_config.d/*.conf` instead of
`/etc/ssh/sshd_config` itself, so tweak the init.d script to also look at
those files.

Fixes #15169
This commit is contained in:
Arnav Singh 2023-08-10 09:56:18 -07:00 • committed by Natanael Copa
parent 64520aa33e
commit 4b4cd657e5
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
main/openssh/APKBUILD
View file

@ -5,7 +5,7 @@
pkgname=openssh pkgname=openssh
pkgver=9.3_p2 pkgver=9.3_p2
_myver=${pkgver%_*}${pkgver#*_} _myver=${pkgver%_*}${pkgver#*_}
pkgrel=1 pkgrel=2
pkgdesc="Port of OpenBSD's free SSH release" pkgdesc="Port of OpenBSD's free SSH release"
url="https://www.openssh.com/portable.html" url="https://www.openssh.com/portable.html"
arch="all" arch="all"
@ -296,7 +296,7 @@ e85754b2b6c4c37b432d166e63d6293e58c9c8bb6ebd8d3527c83afa2337f14c06d6a4e008ffcc0a
f659641b841981f78b03281b7a01add9fbf35b91c0f21c11335a56d7e389ddf965d83d18d73b724385311cdb597b6d6c46446cbc702cdd4d15e8f43591306cb3 gss-serv.c.patch f659641b841981f78b03281b7a01add9fbf35b91c0f21c11335a56d7e389ddf965d83d18d73b724385311cdb597b6d6c46446cbc702cdd4d15e8f43591306cb3 gss-serv.c.patch
1fb55aae445dfd9ededeba1f204a0c3e4a752128ad0a388f473ace074e68b040112f309192243621fd4f16b0d1cce4f083612b1639c3e18166abf92babe52c93 default-internal-sftp.patch 1fb55aae445dfd9ededeba1f204a0c3e4a752128ad0a388f473ace074e68b040112f309192243621fd4f16b0d1cce4f083612b1639c3e18166abf92babe52c93 default-internal-sftp.patch
ff73563e6018e94a1b2dd320cf32426f3945c0f4aa509eeb95783c34dd5c5c8dec91f6d71e4d538c4735539a4d8c724cf61d71513887d8a96b84109ae3a5562e include-config-dir.patch ff73563e6018e94a1b2dd320cf32426f3945c0f4aa509eeb95783c34dd5c5c8dec91f6d71e4d538c4735539a4d8c724cf61d71513887d8a96b84109ae3a5562e include-config-dir.patch
50e407d72bfafc7fb276a1e56b1701f8cd91dfcbad2304bec516d69fc5e8334857ef96510dff76d0c407f29955dc2b18570d6f7b557688ceb641280f8279af83 sshd.initd 2cab1b844d4efb53f848308b4aaedbe74888d2e85bcb2e4dfdae7c18ac3ecea707829072a4276fbe90dfe2f537bbf48127d96f29ec5154e96c0bfb7437910d53 sshd.initd
be7dd5f6d319b2e03528525a66a58310d43444606713786b913a17a0fd9311869181d0fb7927a185d71d392674857dea3c97b6b8284886227d47b36193471a09 sshd.confd be7dd5f6d319b2e03528525a66a58310d43444606713786b913a17a0fd9311869181d0fb7927a185d71d392674857dea3c97b6b8284886227d47b36193471a09 sshd.confd
5d3b62d724d930bafb6263d0600828771e667751cb5ba5070414dce7c3d0559bebdfb05960b721cfd20c81d3ad824291ffb10498798171c8bbbcbf389b706265 sshd.pam 5d3b62d724d930bafb6263d0600828771e667751cb5ba5070414dce7c3d0559bebdfb05960b721cfd20c81d3ad824291ffb10498798171c8bbbcbf389b706265 sshd.pam
" "

2
main/openssh/sshd.initd
View file

@ -50,7 +50,7 @@ generate_host_keys() {
} }
get_conf() { get_conf() {
awk "/^$1/{ print \$2 }" "$cfgfile" 2>/dev/null awk "/^$1\s/{ print \$2; exit }" "$cfgfile" /etc/ssh/sshd_config.d/*.conf 2>/dev/null
} }
conf_enabled() { conf_enabled() {