Accepting request 717662 from home:Vogtinator:branches:network

- ssh-askpass: Try a fallback if the other option is not available

OBS-URL: https://build.opensuse.org/request/show/717662
OBS-URL: https://build.opensuse.org/package/show/network/openssh?expand=0&rev=192
This commit is contained in:
Hans Petter Jansson 2019-07-22 18:28:13 +00:00 committed by Git OBS Bridge
parent 5c0c497eea
commit 084c35400e
4 changed files with 11 additions and 4 deletions

View File

@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via https://bugs.opensuse.org/
# #

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Jul 22 16:55:25 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>
- ssh-askpass: Try a fallback if the other option is not available
------------------------------------------------------------------- -------------------------------------------------------------------
Fri May 31 11:14:42 UTC 2019 - Vítězslav Čížek <vcizek@suse.com> Fri May 31 11:14:42 UTC 2019 - Vítězslav Čížek <vcizek@suse.com>

View File

@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via https://bugs.opensuse.org/
# #

View File

@ -15,10 +15,12 @@ KDE_SSH_ASKPASS="@LIBEXECDIR@/ssh/ksshaskpass"
case "$SESSION" in case "$SESSION" in
kde) kde)
exec $KDE_SSH_ASKPASS ${1+"$@"} [ -e $KDE_SSH_ASKPASS ] && exec $KDE_SSH_ASKPASS ${1+"$@"}
exec $GNOME_SSH_ASKPASS ${1+"$@"}
;; ;;
*) *)
exec $GNOME_SSH_ASKPASS ${1+"$@"} [ -e GNOME_SSH_ASKPASS ] && exec $GNOME_SSH_ASKPASS ${1+"$@"}
exec $KDE_SSH_ASKPASS ${1+"$@"}
;; ;;
esac esac