public inbox for [email protected]  
help / color / mirror / Atom feed
pgAdmin III commit: A manual merge of few last commits from libssh2 res
3+ messages / 2 participants
[nested] [flat]

* pgAdmin III commit: A manual merge of few last commits from libssh2 res
@ 2015-12-09 07:23  Ashesh Vashi <[email protected]>
  0 siblings, 1 reply; 3+ messages in thread

From: Ashesh Vashi @ 2015-12-09 07:23 UTC (permalink / raw)
  To: pgadmin-hackers

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=5b2f89173e0da9c27afe4aa686e43dd46c966...
Author: Dmitriy Olshevskiy <[email protected]>

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


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


^ permalink  raw  reply  [nested|flat] 3+ messages in thread

* Re: pgAdmin III commit: A manual merge of few last commits from libssh2 res
@ 2015-12-09 11:50  Timon <[email protected]>
  parent: Ashesh Vashi <[email protected]>
  0 siblings, 1 reply; 3+ messages in thread

From: Timon @ 2015-12-09 11:50 UTC (permalink / raw)
  To: Ashesh Vashi <[email protected]>; +Cc: pgadmin-hackers

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 <[email protected]>:

> 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=5b2f89173e0da9c27afe4aa686e43dd46c966...
> Author: Dmitriy Olshevskiy <[email protected]>
>
> Modified Files
> --------------
> pgadmin/libssh2/hostkey.c |    2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>
> --
> Sent via pgadmin-hackers mailing list ([email protected])
> To make changes to your subscription:
> http://www.postgresql.org/mailpref/pgadmin-hackers
>



-- 
All bugs reserved


^ permalink  raw  reply  [nested|flat] 3+ messages in thread

* Re: pgAdmin III commit: A manual merge of few last commits from libssh2 res
@ 2015-12-09 12:53  Ashesh Vashi <[email protected]>
  parent: Timon <[email protected]>
  0 siblings, 0 replies; 3+ messages in thread

From: Ashesh Vashi @ 2015-12-09 12:53 UTC (permalink / raw)
  To: Timon <[email protected]>; +Cc: 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 <[email protected]> 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 <[email protected]>:
>
>> 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=5b2f89173e0da9c27afe4aa686e43dd46c966...
>> Author: Dmitriy Olshevskiy <[email protected]>
>>
>> Modified Files
>> --------------
>> pgadmin/libssh2/hostkey.c |    2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>>
>> --
>> Sent via pgadmin-hackers mailing list ([email protected])
>> To make changes to your subscription:
>> http://www.postgresql.org/mailpref/pgadmin-hackers
>>
>
>
>
> --
> All bugs reserved
>


^ permalink  raw  reply  [nested|flat] 3+ messages in thread


end of thread, other threads:[~2015-12-09 12:53 UTC | newest]

Thread overview: 3+ messages (download: mbox mbox.gz follow: Atom feed)
-- links below jump to the message on this page --
2015-12-09 07:23 pgAdmin III commit: A manual merge of few last commits from libssh2 res Ashesh Vashi <[email protected]>
2015-12-09 11:50 ` Timon <[email protected]>
2015-12-09 12:53   ` Ashesh Vashi <[email protected]>

This inbox is served by agora; see mirroring instructions
for how to clone and mirror all data and code used for this inbox