Re: pgAdmin III commit: A manual merge of few last commits from libssh2 res - Mailing list pgadmin-hackers

From Ashesh Vashi
Subject Re: pgAdmin III commit: A manual merge of few last commits from libssh2 res
Date
Msg-id CAG7mmozb_M8-14oDKfgrkXx=F2HpQ0=JpE1ypHq75Bjs832CZg@mail.gmail.com
Whole thread Raw
In response to Re: pgAdmin III commit: A manual merge of few last commits from libssh2 res  (Timon <timosha@gmail.com>)
List pgadmin-hackers
Thanks for pointing that out quickly.
I've made the changes. (I certainly need the break).

--

Thanks & Regards,

Ashesh Vashi
EnterpriseDB INDIA: Enterprise PostgreSQL Company


http://www.linkedin.com/in/asheshvashi


On Wed, Dec 9, 2015 at 5:20 PM, Timon <timosha@gmail.com> wrote:
forget ; at end of line

diff --git a/pgadmin/libssh2/hostkey.c b/pgadmin/libssh2/hostkey.c
index 3b72782..09955d7 100644
--- a/pgadmin/libssh2/hostkey.c
+++ b/pgadmin/libssh2/hostkey.c
@@ -94,7 +94,7 @@ hostkey_method_ssh_rsa_init(LIBSSH2_SESSION * session,
     n = s;
 
     ret = _libssh2_rsa_new(&rsactx, e, e_len, n, n_len, NULL, 0,
-                     NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0)
+                     NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0);
     if (ret) {
         return -1;
     }


2015-12-09 10:23 GMT+03:00 Ashesh Vashi <ashesh.vashi@enterprisedb.com>:
A manual merge of few last commits from libssh2 resulted into an critical issue.

Branch
------
master

Details
-------
http://git.postgresql.org/gitweb?p=pgadmin3.git;a=commitdiff;h=5b2f89173e0da9c27afe4aa686e43dd46c9666ae
Author: Dmitriy Olshevskiy <olshevskiy87@bk.ru>

Modified Files
--------------
pgadmin/libssh2/hostkey.c |    2 +-
1 file changed, 1 insertion(+), 1 deletion(-)


--
Sent via pgadmin-hackers mailing list (pgadmin-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgadmin-hackers



--
All bugs reserved

pgadmin-hackers by date:

Previous
From: Ashesh Vashi
Date:
Subject: pgAdmin III commit: More typos in previous commit (missed a semicolon).
Next
From: P O'Toole
Date:
Subject: pgAdmin's internal find-replace/search-replace dialog using regex groups in the replace-box?