forked from rpms/openssh
Get rid of ssh_keys group for new installations
This commit is contained in:
parent
b615362fd0
commit
7a21555354
@ -1,2 +0,0 @@
|
||||
#Type Name ID
|
||||
g ssh_keys 101
|
@ -73,7 +73,6 @@ Source13: sshd-keygen
|
||||
Source15: sshd-keygen.target
|
||||
Source16: ssh-agent.service
|
||||
Source17: ssh-agent.socket
|
||||
Source18: openssh-systemd-sysusers.conf
|
||||
Source19: openssh-server-systemd-sysusers.conf
|
||||
|
||||
#https://bugzilla.mindrot.org/show_bug.cgi?id=2581
|
||||
@ -582,7 +581,6 @@ install -m744 %{SOURCE13} $RPM_BUILD_ROOT/%{_libexecdir}/openssh/sshd-keygen
|
||||
install -m755 contrib/ssh-copy-id $RPM_BUILD_ROOT%{_bindir}/
|
||||
install contrib/ssh-copy-id.1 $RPM_BUILD_ROOT%{_mandir}/man1/
|
||||
install -d -m711 ${RPM_BUILD_ROOT}/%{_datadir}/empty.sshd
|
||||
install -p -D -m 0644 %{SOURCE18} %{buildroot}%{_sysusersdir}/openssh.conf
|
||||
install -p -D -m 0644 %{SOURCE19} %{buildroot}%{_sysusersdir}/openssh-server.conf
|
||||
|
||||
%if ! %{no_gnome_askpass}
|
||||
@ -608,9 +606,6 @@ pushd pam_ssh_agent_auth-pam_ssh_agent_auth-%{pam_ssh_agent_ver}
|
||||
popd
|
||||
%endif
|
||||
|
||||
%pre
|
||||
%sysusers_create_compat %{SOURCE18}
|
||||
|
||||
%pre server
|
||||
%sysusers_create_compat %{SOURCE19}
|
||||
# Migration scriptlet for Fedora 38/39
|
||||
|
@ -30,7 +30,6 @@ if ! $KEYGEN -q -t $KEYTYPE -f $KEY -C '' -N '' >&/dev/null; then
|
||||
fi
|
||||
|
||||
# sanitize permissions
|
||||
/usr/bin/chgrp ssh_keys $KEY
|
||||
/usr/bin/chmod 600 $KEY
|
||||
/usr/bin/chmod 644 $KEY.pub
|
||||
if [[ -x /usr/sbin/restorecon ]]; then
|
||||
|
Loading…
Reference in New Issue
Block a user