Re: pgAdmin III commit: A manual merge of few last commits from libssh2 res

From: Ashesh Vashi <ashesh(dot)vashi(at)enterprisedb(dot)com>
To: Timon <timosha(at)gmail(dot)com>
Cc: pgadmin-hackers <pgadmin-hackers(at)postgresql(dot)org>
Subject: Re: pgAdmin III commit: A manual merge of few last commits from libssh2 res
Date: 2015-12-09 12:53:56
Message-ID: CAG7mmozb_M8-14oDKfgrkXx=F2HpQ0=JpE1ypHq75Bjs832CZg@mail.gmail.com
Views: Raw Message | Whole Thread | Download mbox | Resend email
Thread:
Lists: 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.enterprisedb.com>

*http://www.linkedin.com/in/asheshvashi*
<http://www.linkedin.com/in/asheshvashi>

On Wed, Dec 9, 2015 at 5:20 PM, Timon <timosha(at)gmail(dot)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(dot)vashi(at)enterprisedb(dot)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(at)bk(dot)ru>
>>
>> Modified Files
>> --------------
>> pgadmin/libssh2/hostkey.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>>
>> --
>> Sent via pgadmin-hackers mailing list (pgadmin-hackers(at)postgresql(dot)org)
>> To make changes to your subscription:
>> http://www.postgresql.org/mailpref/pgadmin-hackers
>>
>
>
>
> --
> All bugs reserved
>

In response to

Browse pgadmin-hackers by date

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