Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtp (Exim 4.80) (envelope-from ) id 1a6dGZ-0002aC-Ho for pgadmin-hackers@arkaria.postgresql.org; Wed, 09 Dec 2015 11:50:39 +0000 Received: from localhost ([127.0.0.1] helo=postgresql.org) by malur.postgresql.org with smtp (Exim 4.84) (envelope-from ) id 1a6dGY-00036A-6O for pgadmin-hackers@arkaria.postgresql.org; Wed, 09 Dec 2015 11:50:38 +0000 Received: from makus.postgresql.org ([2001:4800:1501:1::229]) by malur.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA384:256) (Exim 4.84) (envelope-from ) id 1a6dGK-0002bM-6g for pgadmin-hackers@postgresql.org; Wed, 09 Dec 2015 11:50:24 +0000 Received: from mail-wm0-x22f.google.com ([2a00:1450:400c:c09::22f]) by makus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.84) (envelope-from ) id 1a6dGG-0008Fq-Uf for pgadmin-hackers@postgresql.org; Wed, 09 Dec 2015 11:50:23 +0000 Received: by wmww144 with SMTP id w144so69483243wmw.0 for ; Wed, 09 Dec 2015 03:50:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=DuMX/ki1SCWPIhnrny/6aLfnKZ4LRxcDMlRdNhSJYjc=; b=D16NUMt5mdUJgugK0IRId5lkRppl/intkNOrVVrdv2cuJ2YIpUvG3y+gXKsxhQmulP Q0ahK6XUPuQdnK8SV5C9ImMW72I6k7reYEA9ur2z6KKxtOR7B7uXOCEUNU/aZnVoDDLX axno6OJ8omw6hn4p0HAX4kfgO5K/ENdHrSZ3aVLG04NpvoqZxlRuB4+5xuon0dSW7Gyr peZNEmLFZLqvW/ELTP4T9WUkalCYvR7FiXwjCQSquCNgj/lZhd4A03oJSR3mug9J7pfu keKxNxvhKZxQsiVqPfIDi9UTYzZ8LiSZe4TChubjHU/0B8juslM+6j2ofyA2jL20YQKC xAmQ== MIME-Version: 1.0 X-Received: by 10.28.64.131 with SMTP id n125mr9069996wma.103.1449661819579; Wed, 09 Dec 2015 03:50:19 -0800 (PST) Received: by 10.28.136.2 with HTTP; Wed, 9 Dec 2015 03:50:19 -0800 (PST) In-Reply-To: References: Date: Wed, 9 Dec 2015 14:50:19 +0300 Message-ID: Subject: Re: pgAdmin III commit: A manual merge of few last commits from libssh2 res From: Timon To: Ashesh Vashi Cc: pgadmin-hackers Content-Type: multipart/alternative; boundary=001a114afa76ccf75b052675b13b X-Pg-Spam-Score: -2.7 (--) List-Archive: List-Help: List-ID: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: X-Mailing-List: pgadmin-hackers Precedence: bulk Sender: pgadmin-hackers-owner@postgresql.org --001a114afa76ccf75b052675b13b Content-Type: text/plain; charset=UTF-8 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 : > 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 > > 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 --001a114afa76ccf75b052675b13b Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
forget ; at end of line

diff --git a/pgadmin/libssh= 2/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,
=C2= =A0=C2=A0=C2=A0=C2=A0 n =3D s;
=C2=A0
=C2=A0=C2=A0=C2=A0=C2=A0 ret = =3D _libssh2_rsa_new(&rsactx, e, e_len, n, n_len, NULL, 0,
-=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 NULL, 0, NULL, 0, NULL, 0, NULL, 0,= NULL, 0)
+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 NULL, 0, NULL,= 0, NULL, 0, NULL, 0, NULL, 0);
=C2=A0=C2=A0=C2=A0=C2=A0 if (ret) {
= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 return -1;
=C2=A0=C2=A0= =C2=A0=C2=A0 }


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

Branch
------
master

Details
-------
http://git.postgresql.org/gitweb?p=3Dpgadmin3.git;a=3Dcommitdiff;h= =3D5b2f89173e0da9c27afe4aa686e43dd46c9666ae
Author: Dmitriy Olshevskiy <olshev= skiy87@bk.ru>

Modified Files
--------------
pgadmin/libssh2/hostkey.c |=C2=A0 =C2=A0 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
--001a114afa76ccf75b052675b13b--