Merge branch 'jb43004' into 'master'

[sftp] Fix path to sftp-server, and set the config to overwrite. Fixes JB#43004 See merge request mer-core/openssh!6
sailfishos · Sep 20, 2018 · fe9c0e3 · fe9c0e3
2 parents b81036d + 3989be7
commit fe9c0e3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/rpm/openssh.spec b/rpm/openssh.spec
@@ -435,7 +435,7 @@ fi
 %attr(0644,root,root) %{_mandir}/man5/moduli.5*
 %attr(0644,root,root) %{_mandir}/man8/sshd.8*
 %attr(0644,root,root) %{_mandir}/man8/sftp-server.8*
-%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/ssh/sshd_config
+%attr(0600,root,root) %config %{_sysconfdir}/ssh/sshd_config
 %attr(0644,root,root) %config(noreplace) /etc/pam.d/sshd
 /%{_lib}/systemd/system/sshd.service 
 /%{_lib}/systemd/system/sshd.socket

diff --git a/rpm/sshd_config b/rpm/sshd_config
@@ -127,7 +127,7 @@ UsePrivilegeSeparation sandbox		# Default for new installations.
 #Banner none
 
 # override default of no subsystems
-Subsystem	sftp	/usr/libexec/sftp-server
+Subsystem	sftp	/usr/libexec/openssh/sftp-server
 
 # Example of overriding settings on a per-user basis
 #Match User anoncvs