Bugfix on ssh channel open (it seams that it must be closed everyone that it is used).

diff --git a/src/aute_smbldap.c b/src/aute_smbldap.c
index b2b4044682d2e3318ae2a7bc5e421ddf327229d0..692ffd230f4f36eda6fb7634643b91f386c6242c 100644 (file)
--- a/src/aute_smbldap.c
+++ b/src/aute_smbldap.c
@@ -142,8 +142,7 @@ static GtkWindow
 }
 
 static void
-exec_ssh_command (const gchar *host, const gchar *utente,
-                  const gchar *password, const gchar *command)
+exec_ssh_command (const gchar *host, const gchar *command)
 {
        int rc;
        char buf[4096];
@@ -197,30 +196,24 @@ exec_ssh_command (const gchar *host, const gchar *utente,
                                }
                }
 
-       if (channel == NULL || !channel_is_open (channel))
+       channel = channel_new (session);
+       if (channel == NULL)
                {
-                       if (channel == NULL)
-                               {
-                                       channel = channel_new (session);
-                                       if (channel == NULL)
-                                               {
-                                                       g_warning ("Unable to open the SSH channel.");
-                                                       ssh_disconnect (session);
-                                                       ssh_finalize ();
-                                                       return;
-                                               }
-                               }
+                       g_warning ("Unable to open the SSH channel.");
+                       ssh_disconnect (session);
+                       ssh_finalize ();
+                       return;
+               }
 
-                       rc = channel_open_session (channel);
-                       if (rc < 0)
-                               {
-                                       g_warning ("Unable to open the SSH session on the channel.");
-                                       channel_close (channel);
-                                       ssh_disconnect (session);
-                                       ssh_finalize ();
-                                       channel = NULL;
-                                       return;
-                               }
+       rc = channel_open_session (channel);
+       if (rc < 0)
+               {
+                       g_warning ("Unable to open the session on the SSH channel.");
+                       channel_close (channel);
+                       ssh_disconnect (session);
+                       ssh_finalize ();
+                       channel = NULL;
+                       return;
                }
 
        if (command != NULL)
@@ -234,6 +227,7 @@ exec_ssh_command (const gchar *host, const gchar *utente,
                        rc = channel_request_exec (channel, cmd);
                        if (rc < 0)
                                {
+                                       g_warning ("Unable to execute the SSH command: %s.", ssh_get_error (session));
                                        return;
                                }
 
@@ -242,14 +236,17 @@ exec_ssh_command (const gchar *host, const gchar *utente,
                                        if (channel_is_open (channel)
                                                && !channel_is_eof (channel))
                                                {
-                                                       rc = channel_read (channel, buf, sizeof (buf), 0);
+                                                       rc = channel_read (channel, buf, sizeof (buf), 1);
                                                        if (rc > 0)
                                                                {
-                                                                       /*fwrite (buf, 1, rc, stdout);*/
+                                                                       fwrite (buf, rc, 1, stdout);
                                                                }
                                                }
                                } while (rc > 0);
                }
+
+       channel_close (channel);
+       channel = NULL;
 }
 
 static void
@@ -450,7 +447,7 @@ static gchar
                                        /* cambio la password */
                                        gchar *command = g_strdup_printf ("echo -e \"%s\\n\" | sudo -k -S echo -e \"%s\\\\n%s\\\\n\" | sudo /usr/sbin/smbldap-passwd \"%s\"", password, password_nuova, password_nuova, utente);
 
-                                       exec_ssh_command (host_ssh, utente, password, command);
+                                       exec_ssh_command (host_ssh, command);
                                }
                }
 
@@ -756,7 +753,7 @@ autesmbldap_on_btn_delete_clicked (GtkButton *button,
                                                                                        col_cn, &cn,
                                                                                        -1);
 
-                                       exec_ssh_command (host_ssh, utente, password, g_strdup_printf ("%s%s", command, cn));
+                                       exec_ssh_command (host_ssh, g_strdup_printf ("%s%s", command, cn));
 
                                        (*load_list) ();
                                }