summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMantas Mikulėnas2017-09-05 09:10:47 +0300
committerMantas Mikulėnas2017-09-05 09:10:47 +0300
commite240cc4767356ccc5783aea46c401abc8d7358ef (patch)
tree05a66737402b6fff0d08663d34aeedc41661cee5
parent626dc4c66c8798b5b8151b23af181b0528513949 (diff)
downloadaur-e240cc4767356ccc5783aea46c401abc8d7358ef.tar.gz
use setuid telnetlogin, try 2
-rw-r--r--PKGBUILD6
-rw-r--r--netkit-telnet-ssl.install2
-rw-r--r--netkit-telnet-ssl.sysusers2
-rw-r--r--netkit-telnetd-ssl@.service1
-rw-r--r--netkit-telnetd@.service1
5 files changed, 7 insertions, 5 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 35fe5a5edad7..5e0cabd0d23a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -22,11 +22,11 @@ source=(https://deb.debian.org/debian/pool/main/n/${pkgname}/${pkgname}_${_debve
sha256sums=('9c80d5c7838361a328fb6b60016d503def9ce53ad3c589f3b08ff71a2bb88e00'
'3f8b155bc5085e37a0d836867af330f2911953055010e30f30ca46698559a0aa'
'2d3bf162cbb2e3df4ba6014206d95bbccf84ff4a277fdf9c0935a830f52443ee'
- '79fa821d14e29273da7a0405f7cbc0d8f13a961b168b6b257c71342d06878eb8'
+ 'be6cc69383e1326a9aa49d36bfda856d049f16512655ea83b991910800d540ba'
'25a9cd6c6fd3dd50a20038c05d755c519be1081e42bcb148f71e7a8f182e91a2'
'a9a14476c43d65a57d50eec7e7d773ff1031cf1c13c12e84a9de5eaa14279434'
- 'db921a9ad938ecdb208f6568466950360a892ca0c0754cf51ee082216cd3c8ff'
- '7a3b68541840a8a9ed5c40fbec815ba21f72b9b2726c42fab6b7aa3d1e0e0d9b'
+ '6e45cfed7968af48b59f172523934db421964e58fdb624872a831160e2848284'
+ 'b4220954373f5431b127509b4344dad32d5c692871c536106507fa8b052ef40a'
'9f1506cbe02b48fe7ac53932f068f3ebc8a8441ad92bdec17e2cd40ca7bcbaa8')
install=$pkgname.install
diff --git a/netkit-telnet-ssl.install b/netkit-telnet-ssl.install
index 5b75801f78a9..76455d4f131e 100644
--- a/netkit-telnet-ssl.install
+++ b/netkit-telnet-ssl.install
@@ -4,6 +4,6 @@ post_install() {
post_upgrade() {
systemd-sysusers netkit-telnet-ssl.conf
- chown root:telnetd /usr/lib/telnetlogin
+ chown root:_telnetd /usr/lib/telnetlogin
chmod 04754 /usr/lib/telnetlogin
}
diff --git a/netkit-telnet-ssl.sysusers b/netkit-telnet-ssl.sysusers
index 3574b8016251..d9e28c85ee2c 100644
--- a/netkit-telnet-ssl.sysusers
+++ b/netkit-telnet-ssl.sysusers
@@ -1 +1 @@
-g telnetd - -
+u _telnetd - "Telnet Daemon"
diff --git a/netkit-telnetd-ssl@.service b/netkit-telnetd-ssl@.service
index 9b2d30348752..737773262208 100644
--- a/netkit-telnetd-ssl@.service
+++ b/netkit-telnetd-ssl@.service
@@ -2,6 +2,7 @@
Description=Netkit Telnet Server Instance
[Service]
+User=_telnetd
EnvironmentFile=-/etc/default/telnetd
ExecStart=-/usr/bin/in.telnetd-ssl -z ssl $TELNETD_ARGS
StandardInput=socket
diff --git a/netkit-telnetd@.service b/netkit-telnetd@.service
index 115a797a0fa7..b9ccc91ca589 100644
--- a/netkit-telnetd@.service
+++ b/netkit-telnetd@.service
@@ -2,6 +2,7 @@
Description=Netkit Telnet Server Instance
[Service]
+User=_telnetd
EnvironmentFile=-/etc/default/telnetd
ExecStart=-/usr/bin/in.telnetd-ssl $TELNETD_ARGS
StandardInput=socket