[X2Go-Commits] [libx2goclient] 07/132: src/x2goclient-network-ssh.c: fix return value for initial failures in x2goclient_network_ssh_parent_connect ().

[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 libx2goclient.

commit 76d299df02afd928235293349c15b4449d352ca2
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat Oct 31 02:28:11 2020 +0100

    src/x2goclient-network-ssh.c: fix return value for initial failures in x2goclient_network_ssh_parent_connect ().
    
    We should return FALSE for failures.
---
 src/x2goclient-network-ssh.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/x2goclient-network-ssh.c b/src/x2goclient-network-ssh.c
index e22c027..6af22b1 100644
--- a/src/x2goclient-network-ssh.c
+++ b/src/x2goclient-network-ssh.c
@@ -800,7 +800,7 @@ gboolean x2goclient_network_ssh_connect (X2GoClientNetworkSSH * const self, GErr
 }
 
 static gboolean x2goclient_network_ssh_parent_connect (X2GoClientNetwork * const parent, GError ** const gerr) {
-  gboolean ret = TRUE;
+  gboolean ret = FALSE;
 
   g_return_val_if_fail (X2GOCLIENT_IS_NETWORK_SSH (parent), ret);
   g_return_val_if_fail (((NULL == gerr) || (NULL == *gerr)), ret);
@@ -809,6 +809,12 @@ static gboolean x2goclient_network_ssh_parent_connect (X2GoClientNetwork * const
 
   /* Actual implementation here. */
 
+  /*
+   * We'll hang down through ret to run or skip steps depending on previous
+   * failures, so make sure it's initialized to no error.
+   */
+  ret = TRUE;
+
   /* "Calculate" socket path. */
   gchar *session_path = NULL;
   g_object_get (G_OBJECT (self), "session-path", &session_path, NULL);

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