Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bVgzn-0006So-Qw for pgadmin-hackers@arkaria.postgresql.org; Fri, 05 Aug 2016 15:25:12 +0000 Received: from localhost ([127.0.0.1] helo=postgresql.org) by malur.postgresql.org with smtp (Exim 4.84_2) (envelope-from ) id 1bVgzn-0000PD-1O for pgadmin-hackers@arkaria.postgresql.org; Fri, 05 Aug 2016 15:25:11 +0000 Received: from magus.postgresql.org ([2a02:c0:301:0:ffff::29]) by malur.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1bVgzm-0000Ms-4g for pgadmin-hackers@postgresql.org; Fri, 05 Aug 2016 15:25:10 +0000 Received: from mail-oi0-x233.google.com ([2607:f8b0:4003:c06::233]) by magus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.84_2) (envelope-from ) id 1bVgzi-0005MB-1v for pgadmin-hackers@postgresql.org; Fri, 05 Aug 2016 15:25:09 +0000 Received: by mail-oi0-x233.google.com with SMTP id j185so367439907oih.0 for ; Fri, 05 Aug 2016 08:25:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=enterprisedb-com.20150623.gappssmtp.com; s=20150623; h=mime-version:from:date:message-id:subject:to; bh=+xWrEtJR5NJDkACLfwlYK5cqr3stTPua0P6xzIOJ0Fo=; b=m3eG9uW/dk/u/z5wzPuH+BEgW1+xOOfOBb7xDKVJGigJHDR3Sf3FvK8+9FZBuwFy9j +/CjKxWL/f9QTcVIY5T5yFgfbJ9bAfl77hkSo0bB6MYomxPc4wz+TfKZ60If5lKz7cv0 Z0LOXJNNjP3ymLxe4fQqcXaKj9wgc2a+PhbUXNizN/GDbBGLHMJlAu32Z/Oq0AkvJYon /ECx0qnWBAiPLny4FQwRZNt21sT9lEkBDZ5cAVNT+V20WaxATeO0BiFFGXOWToKiJ/yu hSFftRdCcDT/DxUiSd3qE9ZUS88Y09w3d0oqIuoMtcDft4mT8trXykOmGHbRmKz1F8DI Capw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=+xWrEtJR5NJDkACLfwlYK5cqr3stTPua0P6xzIOJ0Fo=; b=OZpdUoNPTJ06tbTCuq1gEsutx+JEULjaBTcNrQPPBtyOryioUEv6llitITg1QA2eZd 3Nq4ri+mvAqdHRjgFarrVqVBpu5fYnW+fGrGVLwj9Z0JFyTKF3ejUjd7vLbcPmg7v8ib dDKEld3hPGABP1qKTXNYghmzjf97IBh8U+FTANudXjC5RPTxFtAUAolww1Aszt4HgWv5 oNUmzWUmMytusVDzxqz0NrXtqUghMx5DGxWYZDyayPSBapN6qRbzb8UX3es5rydW5FNZ Pp268l5o1BgOmBjEh4tvaPJ1evIuKwE3ZoA1zeylqs3yL26rg7rX3/Avjy6dzPpxIGWx 1nFg== X-Gm-Message-State: AEkoouv/RRmPSQ5L3H781/GtFrEMd1Qqd31CNEEnzdwNgJH+seghj5knfmlyi3fNF2l56F1EjHoYwJkDEBmRdC7e X-Received: by 10.202.241.66 with SMTP id p63mr49051609oih.166.1470410703758; Fri, 05 Aug 2016 08:25:03 -0700 (PDT) MIME-Version: 1.0 Received: by 10.157.5.99 with HTTP; Fri, 5 Aug 2016 08:25:03 -0700 (PDT) From: Harshal Dhumal Date: Fri, 5 Aug 2016 20:55:03 +0530 Message-ID: Subject: patch for RM1177 [pgadmin4] To: pgadmin-hackers Content-Type: multipart/mixed; boundary=94eb2c0953fcac1b98053954ab2d X-Pg-Spam-Score: -2.6 (--) 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 --94eb2c0953fcac1b98053954ab2d Content-Type: multipart/alternative; boundary=94eb2c0953fcac1b93053954ab2b --94eb2c0953fcac1b93053954ab2b Content-Type: text/plain; charset=UTF-8 Hi, PFA patch for RM1177. Issue fixed: Added a check to warn the user if the binary path is not set before running external commands. -- *Harshal Dhumal* *Software Engineer* EnterpriseDB India: http://www.enterprisedb.com The Enterprise PostgreSQL Company --94eb2c0953fcac1b93053954ab2b Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
Hi,

PFA patch for RM1177.

Issue fixed: Added a check to warn the user if the binary path is not s= et before running external commands.

<= div>
=
--=C2=A0
Harshal Dhumal
Software Engineer
Ent= erpriseDB India:=C2=A0http://www.ent= erprisedb.com
The Enterprise PostgreS= QL Company
=
--94eb2c0953fcac1b93053954ab2b-- --94eb2c0953fcac1b98053954ab2d Content-Type: text/x-patch; charset=US-ASCII; name="RM1177.patch" Content-Disposition: attachment; filename="RM1177.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_irhwhjaz0 ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvdGVtcGxhdGVzL2Jy b3dzZXIvanMvYnJvd3Nlci5qcyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvdGVt cGxhdGVzL2Jyb3dzZXIvanMvYnJvd3Nlci5qcwppbmRleCA1ZWQ1ODJhLi45 NTUyOGIwIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9icm93c2VyL3RlbXBs YXRlcy9icm93c2VyL2pzL2Jyb3dzZXIuanMKKysrIGIvd2ViL3BnYWRtaW4v YnJvd3Nlci90ZW1wbGF0ZXMvYnJvd3Nlci9qcy9icm93c2VyLmpzCkBAIC02 OTIsNyArNjkyLDI0IEBAIGZ1bmN0aW9uKHJlcXVpcmUsICQsIF8sIFMsIEJv b3RzdHJhcCwgcGdBZG1pbiwgYWxlcnRpZnksIENvZGVNaXJyb3IpIHsKICAg ICAgICAgcG5sRGlhbG9nSGVscC5mb2N1cygpOwogICAgICAgICBpZnJhbWUu b3BlblVSTCh1cmwpOwogICAgICAgfQorICAgIH0sCisKKyAgICBnZXRfcHJl ZmVyZW5jZShtb2R1bGUsIHByZWZlcmVuY2VfbmFtZSkgeworICAgICAgcHJl ZmVyZW5jZSA9IG51bGw7CisgICAgICAkLmFqYXgoeworICAgICAgICBhc3lu YzogZmFsc2UsCisgICAgICAgIHVybDogInt7IHVybF9mb3IoJ3ByZWZlcmVu Y2VzLnByZWZlcmVuY2VzJykgfX0iICsiLyIrIG1vZHVsZSArIi8iKyBwcmVm ZXJlbmNlX25hbWUsCisgICAgICAgIHN1Y2Nlc3M6IGZ1bmN0aW9uKHJlcykg eworICAgICAgICAgIHByZWZlcmVuY2UgPSByZXM7CisgICAgICAgIH0sCisg ICAgICAgIGVycm9yOiBmdW5jdGlvbih4aHIsIHN0YXR1cywgZXJyb3IpIHsK KworICAgICAgICB9CisgICAgICB9KTsKKworICAgICAgcmV0dXJuIHByZWZl cmVuY2U7CiAgICAgfQorCiAgIH0pOwogCiAgIHdpbmRvdy5vbmJlZm9yZXVu bG9hZCA9IGZ1bmN0aW9uKGV2KSB7CmRpZmYgLS1naXQgYS93ZWIvcGdhZG1p bi9wcmVmZXJlbmNlcy9fX2luaXRfXy5weSBiL3dlYi9wZ2FkbWluL3ByZWZl cmVuY2VzL19faW5pdF9fLnB5CmluZGV4IDk0NDU0MmQuLmIyODJlNDMgMTAw NjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL3ByZWZlcmVuY2VzL19faW5pdF9fLnB5 CisrKyBiL3dlYi9wZ2FkbWluL3ByZWZlcmVuY2VzL19faW5pdF9fLnB5CkBA IC04MiwxOCArODIsMzcgQEAgZGVmIHNjcmlwdCgpOgogCiAKIEBibHVlcHJp bnQucm91dGUoIi9wcmVmZXJlbmNlcyIsIG1ldGhvZHM9WyJHRVQiXSkKK0Bi bHVlcHJpbnQucm91dGUoIi9wcmVmZXJlbmNlcy88bW9kdWxlPi88cHJlZmVy ZW5jZT4iKQogQGxvZ2luX3JlcXVpcmVkCi1kZWYgcHJlZmVyZW5jZXMoKToK LSAgICAiIiJGZXRjaCBhbGwgdGhlIHByZWZlcmVuY2VzIG9mIHBnQWRtaW4g SVYuIiIiCitkZWYgcHJlZmVyZW5jZXMobW9kdWxlPU5vbmUsIHByZWZlcmVu Y2U9Tm9uZSk6CisgICAgIiIiRmV0Y2ggYWxsL29yIHJlcXVlc3RlZCBwcmVm ZXJlbmNlcyBvZiBwZ0FkbWluIElWLiIiIgorCisgICAgaWYgbW9kdWxlIGlz IG5vdCBOb25lIGFuZCBwcmVmZXJlbmNlIGlzIG5vdCBOb25lOgorICAgICAg ICB0cnk6CisgICAgICAgICAgICBtID0gUHJlZmVyZW5jZXMubW9kdWxlKG1v ZHVsZSwgY3JlYXRlPUZhbHNlKQorICAgICAgICAgICAgaWYgbSBpcyBOb25l OgorICAgICAgICAgICAgICAgIHJldHVybiBSZXNwb25zZShzdGF0dXM9NDA0 KQorCisgICAgICAgICAgICBwID0gbS5wcmVmZXJlbmNlKHByZWZlcmVuY2Up CisgICAgICAgICAgICBpZiBwIGlzIE5vbmU6CisgICAgICAgICAgICAgICAg cmV0dXJuIFJlc3BvbnNlKHN0YXR1cz00MDQpCisKKyAgICAgICAgICAgIHJl dHVybiBhamF4X3Jlc3BvbnNlKAorICAgICAgICAgICAgICAgIHJlc3BvbnNl PXAudG9fanNvbigpLAorICAgICAgICAgICAgICAgIHN0YXR1cz0yMDAKKyAg ICAgICAgICAgICkKKworICAgICAgICBleGNlcHQgRXhjZXB0aW9uIGFzIGU6 CisgICAgICAgICAgICByZXR1cm4gaW50ZXJuYWxfc2VydmVyX2Vycm9yKGVy cm9ybXNnPXN0cihlKSkKIAogICAgICMgTG9hZCBQcmVmZXJlbmNlcwotICAg IHByZWZlcmVuY2VzID0gUHJlZmVyZW5jZXMucHJlZmVyZW5jZXMoKQorICAg IHByZWYgPSBQcmVmZXJlbmNlcy5wcmVmZXJlbmNlcygpCiAgICAgcmVzID0g W10KIAogICAgIGRlZiBsYWJlbChwKToKICAgICAgICAgcmV0dXJuIHBbJ2xh YmVsJ10KIAotICAgIGZvciBtIGluIHByZWZlcmVuY2VzOgorICAgIGZvciBt IGluIHByZWY6CiAgICAgICAgIGlmIGxlbihtWydjYXRlZ29yaWVzJ10pOgog ICAgICAgICAgICAgb20gPSB7CiAgICAgICAgICAgICAgICAgImlkIjogbVsn aWQnXSwKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL3Rvb2xzL2JhY2t1cC90 ZW1wbGF0ZXMvYmFja3VwL2pzL2JhY2t1cC5qcyBiL3dlYi9wZ2FkbWluL3Rv b2xzL2JhY2t1cC90ZW1wbGF0ZXMvYmFja3VwL2pzL2JhY2t1cC5qcwppbmRl eCA5YjRmNjc5Li41ZDQ4NjVhIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi90 b29scy9iYWNrdXAvdGVtcGxhdGVzL2JhY2t1cC9qcy9iYWNrdXAuanMKKysr IGIvd2ViL3BnYWRtaW4vdG9vbHMvYmFja3VwL3RlbXBsYXRlcy9iYWNrdXAv anMvYmFja3VwLmpzCkBAIC0zNjEsNiArMzYxLDQ4IEBAIFRPRE8gTElTVCBG T1IgQkFDS1VQOgogCiAgICAgICAvLyBDYWxsYmFjayB0byBkcmF3IEJhY2t1 cCBEaWFsb2cgZm9yIGdsb2JhbHMvc2VydmVyCiAgICAgICBzdGFydF9iYWNr dXBfZ2xvYmFsX3NlcnZlcjogZnVuY3Rpb24oYWN0aW9uLCBpdGVtLCBwYXJh bXMpIHsKKyAgICAgICAgdmFyIGkgPSBpdGVtIHx8IHBnQnJvd3Nlci50cmVl LnNlbGVjdGVkKCksCisgICAgICAgICAgc2VydmVyX2RhdGEgPSBudWxsOwor CisgICAgICAgIHdoaWxlIChpKSB7CisgICAgICAgICAgdmFyIG5vZGVfZGF0 YSA9IHBnQnJvd3Nlci50cmVlLml0ZW1EYXRhKGkpOworICAgICAgICAgIGlm IChub2RlX2RhdGEuX3R5cGUgPT0gJ3NlcnZlcicpIHsKKyAgICAgICAgICAg IHNlcnZlcl9kYXRhID0gbm9kZV9kYXRhOworICAgICAgICAgICAgYnJlYWs7 CisgICAgICAgICAgfQorCisgICAgICAgICAgaWYgKHBnQnJvd3Nlci50cmVl Lmhhc1BhcmVudChpKSkgeworICAgICAgICAgICAgaSA9ICQocGdCcm93c2Vy LnRyZWUucGFyZW50KGkpKTsKKyAgICAgICAgICB9IGVsc2UgeworICAgICAg ICAgICAgYWxlcnRpZnkuYWxlcnQoInt7IF8oIlBsZWFzZSBzZWxlY3Qgc2Vy dmVyIG9yIGNoaWxkIG5vZGUgZnJvbSB0cmVlLiIpIH19Iik7CisgICAgICAg ICAgICBicmVhazsKKyAgICAgICAgICB9CisgICAgICAgIH0KKworICAgICAg ICBpZiAoIXNlcnZlcl9kYXRhKSB7CisgICAgICAgICAgcmV0dXJuOworICAg ICAgICB9CisKKyAgICAgICAgdmFyIG1vZHVsZSA9ICdwYXRocycsCisgICAg ICAgICAgcHJlZmVyZW5jZV9uYW1lID0gJ3BnX2Jpbl9kaXInLAorICAgICAg ICAgIG1zZyA9ICd7eyBfKCdQbGVhc2Ugc2V0IGJpbmFyeSBwYXRoIGZvciBQ b3N0Z3JlU1FMIFNlcnZlciBmcm9tIHByZWZlcmVuY2VzLicpIH19JzsKKwor ICAgICAgICBpZiAoc2VydmVyX2RhdGEuc2VydmVyX3R5cGUgPT0gJ3BwYXMn KSB7CisgICAgICAgICAgcHJlZmVyZW5jZV9uYW1lID0gJ3BwYXNfYmluX2Rp cic7CisgICAgICAgICAgbXNnID0gJ3t7IF8oJ1BsZWFzZSBzZXQgYmluYXJ5 IHBhdGggZm9yIEVEQiBBZHZhbmNlZCBTZXJ2ZXIgZnJvbSBwcmVmZXJlbmNl cy4nKSB9fSc7CisgICAgICAgIH0KKworICAgICAgICB2YXIgcHJlZmVyZW5j ZSA9IHBnQnJvd3Nlci5nZXRfcHJlZmVyZW5jZShtb2R1bGUsIHByZWZlcmVu Y2VfbmFtZSk7CisKKyAgICAgICAgaWYocHJlZmVyZW5jZSkgeworICAgICAg ICAgIGlmICghcHJlZmVyZW5jZS52YWx1ZSkgeworICAgICAgICAgICAgYWxl cnRpZnkuYWxlcnQobXNnKTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAg ICAgICB9CisgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgYWxlcnRpZnku YWxlcnQoUygne3sgXygnRmFpbGVkIHRvIGxvYWQgcHJlZmVyZW5jZSAlcyBv ZiBtb2R1bGUgJXMnKSB9fScpLnNwcmludGYocHJlZmVyZW5jZV9uYW1lLCBt b2R1bGUpLnZhbHVlKCkpOworICAgICAgICAgIHJldHVybjsKKyAgICAgICAg fQogCiAgICAgICAgIHZhciBvZl90eXBlID0gdW5kZWZpbmVkOwogCkBAIC01 MzMsNiArNTc1LDUwIEBAIFRPRE8gTElTVCBGT1IgQkFDS1VQOgogCiAgICAg ICAvLyBDYWxsYmFjayB0byBkcmF3IEJhY2t1cCBEaWFsb2cgZm9yIG9iamVj dHMKICAgICAgIGJhY2t1cF9vYmplY3RzOiBmdW5jdGlvbihhY3Rpb24sIHRy ZWVJdGVtKSB7CisKKyAgICAgICAgdmFyIGkgPSB0cmVlSXRlbSB8fCBwZ0Jy b3dzZXIudHJlZS5zZWxlY3RlZCgpLAorICAgICAgICAgIHNlcnZlcl9kYXRh ID0gbnVsbDsKKworICAgICAgICB3aGlsZSAoaSkgeworICAgICAgICAgIHZh ciBub2RlX2RhdGEgPSBwZ0Jyb3dzZXIudHJlZS5pdGVtRGF0YShpKTsKKyAg ICAgICAgICBpZiAobm9kZV9kYXRhLl90eXBlID09ICdzZXJ2ZXInKSB7Cisg ICAgICAgICAgICBzZXJ2ZXJfZGF0YSA9IG5vZGVfZGF0YTsKKyAgICAgICAg ICAgIGJyZWFrOworICAgICAgICAgIH0KKworICAgICAgICAgIGlmIChwZ0Jy b3dzZXIudHJlZS5oYXNQYXJlbnQoaSkpIHsKKyAgICAgICAgICAgIGkgPSAk KHBnQnJvd3Nlci50cmVlLnBhcmVudChpKSk7CisgICAgICAgICAgfSBlbHNl IHsKKyAgICAgICAgICAgIGFsZXJ0aWZ5LmFsZXJ0KCJ7eyBfKCJQbGVhc2Ug c2VsZWN0IHNlcnZlciBvciBjaGlsZCBub2RlIGZyb20gdHJlZS4iKSB9fSIp OworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgfQorICAgICAgICB9 CisKKyAgICAgICAgaWYgKCFzZXJ2ZXJfZGF0YSkgeworICAgICAgICAgIHJl dHVybjsKKyAgICAgICAgfQorCisgICAgICAgIHZhciBtb2R1bGUgPSAncGF0 aHMnLAorICAgICAgICAgIHByZWZlcmVuY2VfbmFtZSA9ICdwZ19iaW5fZGly JywKKyAgICAgICAgICBtc2cgPSAne3sgXygnUGxlYXNlIHNldCBiaW5hcnkg cGF0aCBmb3IgUG9zdGdyZVNRTCBTZXJ2ZXIgZnJvbSBwcmVmZXJlbmNlcy4n KSB9fSc7CisKKyAgICAgICAgaWYgKHNlcnZlcl9kYXRhLnNlcnZlcl90eXBl ID09ICdwcGFzJykgeworICAgICAgICAgIHByZWZlcmVuY2VfbmFtZSA9ICdw cGFzX2Jpbl9kaXInOworICAgICAgICAgIG1zZyA9ICd7eyBfKCdQbGVhc2Ug c2V0IGJpbmFyeSBwYXRoIGZvciBFREIgQWR2YW5jZWQgU2VydmVyIGZyb20g cHJlZmVyZW5jZXMuJykgfX0nOworICAgICAgICB9CisKKyAgICAgICAgdmFy IHByZWZlcmVuY2UgPSBwZ0Jyb3dzZXIuZ2V0X3ByZWZlcmVuY2UobW9kdWxl LCBwcmVmZXJlbmNlX25hbWUpOworCisgICAgICAgIGlmKHByZWZlcmVuY2Up IHsKKyAgICAgICAgICBpZiAoIXByZWZlcmVuY2UudmFsdWUpIHsKKyAgICAg ICAgICAgIGFsZXJ0aWZ5LmFsZXJ0KG1zZyk7CisgICAgICAgICAgICByZXR1 cm47CisgICAgICAgICAgfQorICAgICAgICB9IGVsc2UgeworICAgICAgICAg IGFsZXJ0aWZ5LmFsZXJ0KFMoJ3t7IF8oJ0ZhaWxlZCB0byBsb2FkIHByZWZl cmVuY2UgJXMgb2YgbW9kdWxlICVzJykgfX0nKS5zcHJpbnRmKHByZWZlcmVu Y2VfbmFtZSwgbW9kdWxlKS52YWx1ZSgpKTsKKyAgICAgICAgICByZXR1cm47 CisgICAgICAgIH0KKwogICAgICAgICB2YXIgdGl0bGUgPSBTKCd7eyAnQmFj a3VwICglczogJXMpJyB9fScpLAogICAgICAgICAgICAgdHJlZSA9IHBnQnJv d3Nlci50cmVlLAogICAgICAgICAgICAgaXRlbSA9IHRyZWVJdGVtIHx8IHRy ZWUuc2VsZWN0ZWQoKSwKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL3Rvb2xz L2ltcG9ydF9leHBvcnQvdGVtcGxhdGVzL2ltcG9ydF9leHBvcnQvanMvaW1w b3J0X2V4cG9ydC5qcyBiL3dlYi9wZ2FkbWluL3Rvb2xzL2ltcG9ydF9leHBv cnQvdGVtcGxhdGVzL2ltcG9ydF9leHBvcnQvanMvaW1wb3J0X2V4cG9ydC5q cwppbmRleCAxMTg4NDk5Li5mY2ViMTkzIDEwMDY0NAotLS0gYS93ZWIvcGdh ZG1pbi90b29scy9pbXBvcnRfZXhwb3J0L3RlbXBsYXRlcy9pbXBvcnRfZXhw b3J0L2pzL2ltcG9ydF9leHBvcnQuanMKKysrIGIvd2ViL3BnYWRtaW4vdG9v bHMvaW1wb3J0X2V4cG9ydC90ZW1wbGF0ZXMvaW1wb3J0X2V4cG9ydC9qcy9p bXBvcnRfZXhwb3J0LmpzCkBAIC0yOTgsNiArMjk4LDQ5IEBAIGRlZmluZSgK ICAgICAgICAgT3BlbiB0aGUgZGlhbG9nIGZvciB0aGUgaW1wb3J0IGZ1bmN0 aW9uYWxpdHkKICAgICAgICovCiAgICAgICBjYWxsYmFja19pbXBvcnRfZXhw b3J0OiBmdW5jdGlvbihhcmdzLCBpdGVtKSB7CisgICAgICAgIHZhciBpID0g aXRlbSB8fCBwZ0Jyb3dzZXIudHJlZS5zZWxlY3RlZCgpLAorICAgICAgICAg IHNlcnZlcl9kYXRhID0gbnVsbDsKKworICAgICAgICB3aGlsZSAoaSkgewor ICAgICAgICAgIHZhciBub2RlX2RhdGEgPSBwZ0Jyb3dzZXIudHJlZS5pdGVt RGF0YShpKTsKKyAgICAgICAgICBpZiAobm9kZV9kYXRhLl90eXBlID09ICdz ZXJ2ZXInKSB7CisgICAgICAgICAgICBzZXJ2ZXJfZGF0YSA9IG5vZGVfZGF0 YTsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgIH0KKworICAgICAg ICAgIGlmIChwZ0Jyb3dzZXIudHJlZS5oYXNQYXJlbnQoaSkpIHsKKyAgICAg ICAgICAgIGkgPSAkKHBnQnJvd3Nlci50cmVlLnBhcmVudChpKSk7CisgICAg ICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIEFsZXJ0aWZ5LmFsZXJ0KCJ7 eyBfKCJQbGVhc2Ugc2VsZWN0IHNlcnZlciBvciBjaGlsZCBub2RlIGZyb20g dHJlZS4iKSB9fSIpOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAg fQorICAgICAgICB9CisKKyAgICAgICAgaWYgKCFzZXJ2ZXJfZGF0YSkgewor ICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorCisgICAgICAgIHZhciBt b2R1bGUgPSAncGF0aHMnLAorICAgICAgICAgIHByZWZlcmVuY2VfbmFtZSA9 ICdwZ19iaW5fZGlyJywKKyAgICAgICAgICBtc2cgPSAne3sgXygnUGxlYXNl IHNldCBiaW5hcnkgcGF0aCBmb3IgUG9zdGdyZVNRTCBTZXJ2ZXIgZnJvbSBw cmVmZXJlbmNlcy4nKSB9fSc7CisKKyAgICAgICAgaWYgKHNlcnZlcl9kYXRh LnNlcnZlcl90eXBlID09ICdwcGFzJykgeworICAgICAgICAgIHByZWZlcmVu Y2VfbmFtZSA9ICdwcGFzX2Jpbl9kaXInOworICAgICAgICAgIG1zZyA9ICd7 eyBfKCdQbGVhc2Ugc2V0IGJpbmFyeSBwYXRoIGZvciBFREIgQWR2YW5jZWQg U2VydmVyIGZyb20gcHJlZmVyZW5jZXMuJykgfX0nOworICAgICAgICB9CisK KyAgICAgICAgdmFyIHByZWZlcmVuY2UgPSBwZ0Jyb3dzZXIuZ2V0X3ByZWZl cmVuY2UobW9kdWxlLCBwcmVmZXJlbmNlX25hbWUpOworCisgICAgICAgIGlm KHByZWZlcmVuY2UpIHsKKyAgICAgICAgICBpZiAoIXByZWZlcmVuY2UudmFs dWUpIHsKKyAgICAgICAgICAgIEFsZXJ0aWZ5LmFsZXJ0KG1zZyk7CisgICAg ICAgICAgICByZXR1cm47CisgICAgICAgICAgfQorICAgICAgICB9IGVsc2Ug eworICAgICAgICAgIEFsZXJ0aWZ5LmFsZXJ0KFMoJ3t7IF8oJ0ZhaWxlZCB0 byBsb2FkIHByZWZlcmVuY2UgJXMgb2YgbW9kdWxlICVzJykgfX0nKS5zcHJp bnRmKHByZWZlcmVuY2VfbmFtZSwgbW9kdWxlKS52YWx1ZSgpKTsKKyAgICAg ICAgICByZXR1cm47CisgICAgICAgIH0KKwogICAgICAgICB2YXIgc2VsZiA9 IHRoaXM7CiAgICAgICAgIHZhciBpbnB1dCA9IGFyZ3MgfHwge30sCiAgICAg ICAgICAgICB0ID0gcGdCcm93c2VyLnRyZWUsCmRpZmYgLS1naXQgYS93ZWIv cGdhZG1pbi90b29scy9tYWludGVuYW5jZS90ZW1wbGF0ZXMvbWFpbnRlbmFu Y2UvanMvbWFpbnRlbmFuY2UuanMgYi93ZWIvcGdhZG1pbi90b29scy9tYWlu dGVuYW5jZS90ZW1wbGF0ZXMvbWFpbnRlbmFuY2UvanMvbWFpbnRlbmFuY2Uu anMKaW5kZXggZmNhZDUzOC4uNmViMDc0ZSAxMDA2NDQKLS0tIGEvd2ViL3Bn YWRtaW4vdG9vbHMvbWFpbnRlbmFuY2UvdGVtcGxhdGVzL21haW50ZW5hbmNl L2pzL21haW50ZW5hbmNlLmpzCisrKyBiL3dlYi9wZ2FkbWluL3Rvb2xzL21h aW50ZW5hbmNlL3RlbXBsYXRlcy9tYWludGVuYW5jZS9qcy9tYWludGVuYW5j ZS5qcwpAQCAtMTg3LDggKzE4Nyw1MSBAQCBkZWZpbmUoCiAgICAgICAgIE9w ZW4gdGhlIGRpYWxvZyBmb3IgdGhlIG1haW50ZW5hbmNlIGZ1bmN0aW9uYWxp dHkKICAgICAgICovCiAgICAgICBjYWxsYmFja19tYWludGVuYWNlOiBmdW5j dGlvbihhcmdzLCBpdGVtKSB7Ci0gICAgICAgIHZhciBzZWxmID0gdGhpczsK LSAgICAgICAgdmFyIGlucHV0ID0gYXJncyB8fCB7fSwKKyAgICAgICAgdmFy IGkgPSBpdGVtIHx8IHBnQnJvd3Nlci50cmVlLnNlbGVjdGVkKCksCisgICAg ICAgICAgc2VydmVyX2RhdGEgPSBudWxsOworCisgICAgICAgIHdoaWxlIChp KSB7CisgICAgICAgICAgdmFyIG5vZGVfZGF0YSA9IHBnQnJvd3Nlci50cmVl Lml0ZW1EYXRhKGkpOworICAgICAgICAgIGlmIChub2RlX2RhdGEuX3R5cGUg PT0gJ3NlcnZlcicpIHsKKyAgICAgICAgICAgIHNlcnZlcl9kYXRhID0gbm9k ZV9kYXRhOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgfQorCisg ICAgICAgICAgaWYgKHBnQnJvd3Nlci50cmVlLmhhc1BhcmVudChpKSkgewor ICAgICAgICAgICAgaSA9ICQocGdCcm93c2VyLnRyZWUucGFyZW50KGkpKTsK KyAgICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgQWxlcnRpZnkuYWxl cnQoInt7IF8oIlBsZWFzZSBzZWxlY3Qgc2VydmVyIG9yIGNoaWxkIG5vZGUg ZnJvbSB0cmVlLiIpIH19Iik7CisgICAgICAgICAgICBicmVhazsKKyAgICAg ICAgICB9CisgICAgICAgIH0KKworICAgICAgICBpZiAoIXNlcnZlcl9kYXRh KSB7CisgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisKKyAgICAgICAg dmFyIG1vZHVsZSA9ICdwYXRocycsCisgICAgICAgICAgcHJlZmVyZW5jZV9u YW1lID0gJ3BnX2Jpbl9kaXInLAorICAgICAgICAgIG1zZyA9ICd7eyBfKCdQ bGVhc2Ugc2V0IGJpbmFyeSBwYXRoIGZvciBQb3N0Z3JlU1FMIFNlcnZlciBm cm9tIHByZWZlcmVuY2VzLicpIH19JzsKKworICAgICAgICBpZiAoc2VydmVy X2RhdGEuc2VydmVyX3R5cGUgPT0gJ3BwYXMnKSB7CisgICAgICAgICAgcHJl ZmVyZW5jZV9uYW1lID0gJ3BwYXNfYmluX2Rpcic7CisgICAgICAgICAgbXNn ID0gJ3t7IF8oJ1BsZWFzZSBzZXQgYmluYXJ5IHBhdGggZm9yIEVEQiBBZHZh bmNlZCBTZXJ2ZXIgZnJvbSBwcmVmZXJlbmNlcy4nKSB9fSc7CisgICAgICAg IH0KKworICAgICAgICB2YXIgcHJlZmVyZW5jZSA9IHBnQnJvd3Nlci5nZXRf cHJlZmVyZW5jZShtb2R1bGUsIHByZWZlcmVuY2VfbmFtZSk7CisKKyAgICAg ICAgaWYocHJlZmVyZW5jZSkgeworICAgICAgICAgIGlmICghcHJlZmVyZW5j ZS52YWx1ZSkgeworICAgICAgICAgICAgQWxlcnRpZnkuYWxlcnQobXNnKTsK KyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICB9CisgICAgICAgIH0g ZWxzZSB7CisgICAgICAgICAgQWxlcnRpZnkuYWxlcnQoUygne3sgXygnRmFp bGVkIHRvIGxvYWQgcHJlZmVyZW5jZSAlcyBvZiBtb2R1bGUgJXMnKSB9fScp LnNwcmludGYocHJlZmVyZW5jZV9uYW1lLCBtb2R1bGUpLnZhbHVlKCkpOwor ICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorCisgICAgICAgIHZhciBz ZWxmID0gdGhpcywKKyAgICAgICAgICBpbnB1dCA9IGFyZ3MgfHwge30sCiAg ICAgICAgICAgdCA9IHBnQnJvd3Nlci50cmVlLAogICAgICAgICAgIGkgPSBp dGVtIHx8IHQuc2VsZWN0ZWQoKSwKICAgICAgICAgICBkID0gaSAmJiBpLmxl bmd0aCA9PSAxID8gdC5pdGVtRGF0YShpKSA6IHVuZGVmaW5lZCwKZGlmZiAt LWdpdCBhL3dlYi9wZ2FkbWluL3Rvb2xzL3Jlc3RvcmUvdGVtcGxhdGVzL3Jl c3RvcmUvanMvcmVzdG9yZS5qcyBiL3dlYi9wZ2FkbWluL3Rvb2xzL3Jlc3Rv cmUvdGVtcGxhdGVzL3Jlc3RvcmUvanMvcmVzdG9yZS5qcwppbmRleCBlZjcz MWM2Li5kMTljYzE4IDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi90b29scy9y ZXN0b3JlL3RlbXBsYXRlcy9yZXN0b3JlL2pzL3Jlc3RvcmUuanMKKysrIGIv d2ViL3BnYWRtaW4vdG9vbHMvcmVzdG9yZS90ZW1wbGF0ZXMvcmVzdG9yZS9q cy9yZXN0b3JlLmpzCkBAIC0yODYsNiArMjg2LDUwIEBAIGRlZmluZShbCiAg ICAgICB9LAogICAgICAgLy8gQ2FsbGJhY2sgdG8gZHJhdyBCYWNrdXAgRGlh bG9nIGZvciBvYmplY3RzCiAgICAgICByZXN0b3JlX29iamVjdHM6IGZ1bmN0 aW9uKGFjdGlvbiwgdHJlZUl0ZW0pIHsKKworICAgICAgICB2YXIgaSA9IHRy ZWVJdGVtIHx8IHBnQnJvd3Nlci50cmVlLnNlbGVjdGVkKCksCisgICAgICAg ICAgc2VydmVyX2RhdGEgPSBudWxsOworCisgICAgICAgIHdoaWxlIChpKSB7 CisgICAgICAgICAgdmFyIG5vZGVfZGF0YSA9IHBnQnJvd3Nlci50cmVlLml0 ZW1EYXRhKGkpOworICAgICAgICAgIGlmIChub2RlX2RhdGEuX3R5cGUgPT0g J3NlcnZlcicpIHsKKyAgICAgICAgICAgIHNlcnZlcl9kYXRhID0gbm9kZV9k YXRhOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgfQorCisgICAg ICAgICAgaWYgKHBnQnJvd3Nlci50cmVlLmhhc1BhcmVudChpKSkgeworICAg ICAgICAgICAgaSA9ICQocGdCcm93c2VyLnRyZWUucGFyZW50KGkpKTsKKyAg ICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgYWxlcnRpZnkuYWxlcnQo Int7IF8oIlBsZWFzZSBzZWxlY3Qgc2VydmVyIG9yIGNoaWxkIG5vZGUgZnJv bSB0cmVlLiIpIH19Iik7CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAg ICB9CisgICAgICAgIH0KKworICAgICAgICBpZiAoIXNlcnZlcl9kYXRhKSB7 CisgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisKKyAgICAgICAgdmFy IG1vZHVsZSA9ICdwYXRocycsCisgICAgICAgICAgcHJlZmVyZW5jZV9uYW1l ID0gJ3BnX2Jpbl9kaXInLAorICAgICAgICAgIG1zZyA9ICd7eyBfKCdQbGVh c2Ugc2V0IGJpbmFyeSBwYXRoIGZvciBQb3N0Z3JlU1FMIFNlcnZlciBmcm9t IHByZWZlcmVuY2VzLicpIH19JzsKKworICAgICAgICBpZiAoc2VydmVyX2Rh dGEuc2VydmVyX3R5cGUgPT0gJ3BwYXMnKSB7CisgICAgICAgICAgcHJlZmVy ZW5jZV9uYW1lID0gJ3BwYXNfYmluX2Rpcic7CisgICAgICAgICAgbXNnID0g J3t7IF8oJ1BsZWFzZSBzZXQgYmluYXJ5IHBhdGggZm9yIEVEQiBBZHZhbmNl ZCBTZXJ2ZXIgZnJvbSBwcmVmZXJlbmNlcy4nKSB9fSc7CisgICAgICAgIH0K KworICAgICAgICB2YXIgcHJlZmVyZW5jZSA9IHBnQnJvd3Nlci5nZXRfcHJl ZmVyZW5jZShtb2R1bGUsIHByZWZlcmVuY2VfbmFtZSk7CisKKyAgICAgICAg aWYocHJlZmVyZW5jZSkgeworICAgICAgICAgIGlmICghcHJlZmVyZW5jZS52 YWx1ZSkgeworICAgICAgICAgICAgYWxlcnRpZnkuYWxlcnQobXNnKTsKKyAg ICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICB9CisgICAgICAgIH0gZWxz ZSB7CisgICAgICAgICAgYWxlcnRpZnkuYWxlcnQoUygne3sgXygnRmFpbGVk IHRvIGxvYWQgcHJlZmVyZW5jZSAlcyBvZiBtb2R1bGUgJXMnKSB9fScpLnNw cmludGYocHJlZmVyZW5jZV9uYW1lLCBtb2R1bGUpLnZhbHVlKCkpOworICAg ICAgICAgIHJldHVybjsKKyAgICAgICAgfQorCiAgICAgICAgIHZhciB0aXRs ZSA9IFMoJ3t7ICdSZXN0b3JlICglczogJXMpJyB9fScpLAogICAgICAgICAg ICAgdHJlZSA9IHBnQnJvd3Nlci50cmVlLAogICAgICAgICAgICAgaXRlbSA9 IHRyZWVJdGVtIHx8IHRyZWUuc2VsZWN0ZWQoKSwKZGlmZiAtLWdpdCBhL3dl Yi9wZ2FkbWluL3V0aWxzL3ByZWZlcmVuY2VzLnB5IGIvd2ViL3BnYWRtaW4v dXRpbHMvcHJlZmVyZW5jZXMucHkKaW5kZXggNWQyMWQyMC4uNThlNmViNSAx MDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vdXRpbHMvcHJlZmVyZW5jZXMucHkK KysrIGIvd2ViL3BnYWRtaW4vdXRpbHMvcHJlZmVyZW5jZXMucHkKQEAgLTM5 NCw4ICszOTQsNyBAQCBjbGFzcyBQcmVmZXJlbmNlcyhvYmplY3QpOgogICAg ICAgICAgICAgaWYgbmFtZSBpbiBjYXRbJ3ByZWZlcmVuY2VzJ106CiAgICAg ICAgICAgICAgICAgcmV0dXJuIChjYXRbJ3ByZWZlcmVuY2VzJ10pW25hbWVd CiAKLSAgICAgICAgYXNzZXJ0IEZhbHNlLCAiIiJDb3VsZG4ndCBmaW5kIHRo ZSBwcmVmZXJlbmNlIGluIHRoaXMgcHJlZmVyZW5jZSEKLURpZCB5b3UgZm9y Z2V0IHRvIHJlZ2lzdGVyIGl0PyIiIgorICAgICAgICByZXR1cm4gTm9uZQog CiAgICAgQGNsYXNzbWV0aG9kCiAgICAgZGVmIHByZWZlcmVuY2VzKGNscyk6 CkBAIC00NTIsMTIgKzQ1MSwxMyBAQCBEaWQgeW91IGZvcmdldCB0byByZWdp c3RlciBpdD8iIiIKICAgICAgICAgKQogCiAgICAgQGNsYXNzbWV0aG9kCi0g ICAgZGVmIG1vZHVsZShjbHMsIG5hbWUpOgorICAgIGRlZiBtb2R1bGUoY2xz LCBuYW1lLCBjcmVhdGU9VHJ1ZSk6CiAgICAgICAgICIiIgogICAgICAgICBt b2R1bGUgKGNsYXNzbWV0aG9kKQogICAgICAgICBHZXQgdGhlIG1vZHVsZSBw cmVmZXJlbmNlcyBvYmplY3QKIAogICAgICAgICA6cGFyYW0gbmFtZTogTmFt ZSBvZiB0aGUgbW9kdWxlCisgICAgICAgIDpwYXJhbSBjcmVhdGU6IEZsYWcg dG8gY3JlYXRlIFByZWZlcmVuY2VzIG9iamVjdAogICAgICAgICA6cmV0dXJu czogYSBQcmVmZXJlbmNlcyBvYmplY3QgcmVwcmVzZW50aW5nIGZvciB0aGUg bW9kdWxlLgogICAgICAgICAiIiIKICAgICAgICAgaWYgbmFtZSBpbiBQcmVm ZXJlbmNlcy5tb2R1bGVzOgpAQCAtNDY2LDEwICs0NjYsMTEgQEAgRGlkIHlv dSBmb3JnZXQgdG8gcmVnaXN0ZXIgaXQ/IiIiCiAgICAgICAgICAgICBpZiBt LmxhYmVsIGlzIE5vbmU6CiAgICAgICAgICAgICAgICAgbS5sYWJlbCA9IG5h bWUKICAgICAgICAgICAgIHJldHVybiBtCi0gICAgICAgIGVsc2U6Ci0gICAg ICAgICAgICBtID0gUHJlZmVyZW5jZXMobmFtZSwgTm9uZSkKIAotICAgICAg ICByZXR1cm4gbQorICAgICAgICBpZiBjcmVhdGU6CisgICAgICAgICAgICBy ZXR1cm4gUHJlZmVyZW5jZXMobmFtZSwgTm9uZSkKKworICAgICAgICByZXR1 cm4gTm9uZQogCiAgICAgQGNsYXNzbWV0aG9kCiAgICAgZGVmIHNhdmUoY2xz LCBtaWQsIGNpZCwgcGlkLCB2YWx1ZSk6Cg== --94eb2c0953fcac1b98053954ab2d Content-Type: text/plain Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 -- Sent via pgadmin-hackers mailing list (pgadmin-hackers@postgresql.org) To make changes to your subscription: http://www.postgresql.org/mailpref/pgadmin-hackers --94eb2c0953fcac1b98053954ab2d--