[packages/openssh] sshd-keygen: do not exit as failure if restorecon is missing

[glen]

commit aca544f0f091538eb23826168de3a35a3f3ad128
Author: Elan Ruusamäe <g...@delfi.ee>
Date:   Fri Jul 29 19:56:21 2016 +0300

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

 openssh.spec | 2 +-
 sshd-keygen  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/openssh.spec b/openssh.spec
index f32cd46..0ae1c27 100644
--- 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
new mode 100755
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
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/openssh.git/commitdiff/aca544f0f091538eb23826168de3a35a3f3ad128

_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit