[X2Go-Commits] [x2goclient] 20/38: {pyhoca-cli, pyhoca/cli/frontend.py}: Only look for private ssh keys if appropriate.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit 8ce1d32efe640cffe9c0bd97fd747503ba7ac5e9
Author: Daniel Teichmann <daniel.teichmann at das-netzwerkteam.de>
Date:   Fri Sep 2 15:32:33 2022 +0200

    {pyhoca-cli, pyhoca/cli/frontend.py}: Only look for private ssh keys if appropriate.
---
 debian/changelog       | 2 ++
 pyhoca-cli             | 6 ++++++
 pyhoca/cli/frontend.py | 3 ++-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 12553f72..8e893107 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,8 @@ pyhoca-cli (0.6.1.3-0x2go1) UNRELEASED; urgency=medium
     - Fix typo in man page.
     - Add --non-interactive cmdline option for forcefully preventing password
       queries on the TTY.
+    - {pyhoca-cli, pyhoca/cli/frontend.py}: Only look for private ssh keys if
+      appropriate.
 
  -- X2Go Release Manager <git-admin at x2go.org>  Thu, 26 Dec 2019 17:03:42 +0100
 
diff --git a/pyhoca-cli b/pyhoca-cli
index fd08ad9e..d5356997 100755
--- a/pyhoca-cli
+++ b/pyhoca-cli
@@ -498,6 +498,12 @@ Possible values for the --pack NX option are:
     if not a.ssh_privkey and os.path.isfile('%s/.ssh/id_dsa' % current_home):
         a.ssh_privkey = '%s/.ssh/id_dsa' % current_home
 
+    # only look for ssh keys if no ssh privkey is specified
+    if a.ssh_privkey:
+        a.look_for_keys = False
+    else:
+        a.look_for_keys = True
+
     # hang around the keyboard chaos...
     a.kbd_type   = a.kbd_type.lower()
     a.kbd_layout = a.kbd_layout.lower()
diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py
index c3bc74be..3b0f1453 100644
--- a/pyhoca/cli/frontend.py
+++ b/pyhoca/cli/frontend.py
@@ -476,7 +476,8 @@ class PyHocaCLI(x2go.X2GoClient):
                                                            allow_share_local_folders=allow_share_local_folders,
                                                            forward_sshagent=self.args.forward_sshagent,
                                                            clipboard=self.args.clipboard_mode,
-                                                           cmd=self.args.command)
+                                                           cmd=self.args.command,
+                                                           look_for_keys=self.args.look_for_keys)
 
     def authenticate(self):
         """\

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git