sshd-keygen: do not exit as failure if restorecon is missing

diff --git a/openssh.spec b/openssh.spec
index f32cd468aec9f4f20beb19485a4ac19df9909d81..0ae1c27eb057bd8489e7299d2f5413a2708df0ce 100644 (file)
--- a/openssh.spec
+++ b/openssh.spec
@@ -46,7 +46,7 @@ Summary(ru.UTF-8):    OpenSSH - свободная реализация прото
 Summary(uk.UTF-8):     OpenSSH - вільна реалізація протоколу Secure Shell (SSH)
 Name:          openssh
 Version:       7.2p2
-Release:       1
+Release:       2
 Epoch:         2
 License:       BSD
 Group:         Applications/Networking

diff --git a/sshd-keygen b/sshd-keygen
old mode 100644 (file)
new mode 100755 (executable)
index b31c06b..a090614
--- a/sshd-keygen
+++ b/sshd-keygen
@@ -11,7 +11,7 @@ ssh_gen_key() {
 
        /usr/bin/ssh-keygen -t $type -f $keyfile -N '' >&2
        chmod 600 $keyfile
-       [ -x /sbin/restorecon ] && /sbin/restorecon $keyfile
+       [ ! -x /sbin/restorecon ] || /sbin/restorecon $keyfile
 }
 
 # generate new keys with empty passwords if they do not exist