Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1llp34-0006Om-HN for pgadmin-hackers@arkaria.postgresql.org; Wed, 26 May 2021 08:37:54 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.92) (envelope-from ) id 1llp33-0005KT-4k for pgadmin-hackers@arkaria.postgresql.org; Wed, 26 May 2021 08:37:53 +0000 Received: from makus.postgresql.org ([2001:4800:3e1:1::229]) by malur.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1llp32-0005KL-NY for pgadmin-hackers@lists.postgresql.org; Wed, 26 May 2021 08:37:52 +0000 Received: from mail-io1-xd2a.google.com ([2607:f8b0:4864:20::d2a]) by makus.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1llp2y-0005cE-3C for pgadmin-hackers@postgresql.org; Wed, 26 May 2021 08:37:51 +0000 Received: by mail-io1-xd2a.google.com with SMTP id r4so171587iol.6 for ; Wed, 26 May 2021 01:37:47 -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=8bYcdCboE/Ae7u5ANnTievLCSw+F+pdZxsVK0KkeamE=; b=PahCYR4N83+mZu4qmVlqMln6X4uEKRu1E80JZtHXy3lRKrE1O1tcqbsMaiQpF63dyD 3bFI04xRatWw9PhNCrBnTEi0Clu2KyQmrKkpOxWYHCISpyEXs1/JmmjDn/554RtkSfiW fwJ/8afj++oNOS4SBbixl6yPnvNqdClotXZ8a3yxs2hBHjxienWCw9vvSM3pHJzCKP+S o31TbLnv/GJNsOfBBytSJCl0TeHt9OKcbnQt0cR9d9H9P4ULL2z8A6uRKz1WznK6DV0W EB3TMmbqUPvZV2aZR/NMKHldfrkh+Dfo6WmD298KQ4D2nxuyPJpV3atRBWXnW+3k2qkb A0pg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=8bYcdCboE/Ae7u5ANnTievLCSw+F+pdZxsVK0KkeamE=; b=CK6rlCDbN9DXvvN6EGsLJ11+5P30RHc2j4L/by9X78OdiqujYYMeWvsQLYvqb3+9IA 5vOCYtyBBnSd54x0eCMDIbXBFIeV7SHZM9LsEBk+B/JCF6Y8qktE39PI9bgvENsmmk9K Ii2TykzqZYy7KmeBJbvlcsSmoaK1B18oFCf622jfDX3xknxDmRovinMOf9S/htnus3Ne l307Kcb8GFlpsavD2p6u9gi57SY70uw46ir10fwlMmQzbYS0uha7TrP2hJWotG47gm7s PXcJIaap440+qXM5mJ0hubMURWKjIZnaMmYn3GEbOF89XssJwm0ohjEnGty4LpyWK3O9 a4ww== X-Gm-Message-State: AOAM5322mM525Mp4Ybdc6D5LcBaot5YSsA7PY2qZJbzeSGF1zyTC7o9l RCFOU3MjeArKqziYwxkt42gkyglrQuZtXLkWDvvNRBqOfVPBMsfYJn+7q5+tjgN2Id9x0KngTuZ /hnm3vllK/jpPov1BcVboSMXjHxwIxdZ1Sdj/VPdZW8BCjEIom9oRzYY7RjNH46PBRQx4MGu6p1 jB1JsQ0OSgEOQ43A5DN75px4qFANWS7Yb28eSTImroWpcc64wU5mNtxIbAHSlmaCA= X-Google-Smtp-Source: ABdhPJwQIDA9tooZjKOt2gSHwyMt7QoNQMSVjUuy7E/7m5lCRwLpHtRFb7JTLTMm3yp7ESDP57Kx6RhVl/E2O0X9Q5g= X-Received: by 2002:a6b:fb0f:: with SMTP id h15mr23575933iog.24.1622018266504; Wed, 26 May 2021 01:37:46 -0700 (PDT) MIME-Version: 1.0 From: Rahul Shirsat Date: Wed, 26 May 2021 14:07:10 +0530 Message-ID: Subject: [Patch][pgAdmin] RM4203 Rename Database by another user To: pgadmin-hackers Content-Type: multipart/mixed; boundary="000000000000984ebb05c3378e0c" X-CLOUD-SEC-AV-Info: enterprisedb,google_mail,monitor X-CLOUD-SEC-AV-Sent: true X-Gm-Spam: 0 X-Gm-Phishy: 0 List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Archived-At: Precedence: bulk --000000000000984ebb05c3378e0c Content-Type: multipart/alternative; boundary="000000000000984eb905c3378e0a" --000000000000984eb905c3378e0a Content-Type: text/plain; charset="UTF-8" Hi Hackers, Please find the attached patch which resolves the issue of renaming the database by another user. A minor issue of navigation button alignment is also fixed in this patch. -- *Rahul Shirsat* Senior Software Engineer | EnterpriseDB Corporation. --000000000000984eb905c3378e0a Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi Hackers,

Please find the attached pa= tch which resolves the issue of renaming the database by another user.

A minor issue of navigation button alignment is also f= ixed in this patch.

--
Rahul= Shirsat
Senior Software Engineer=C2=A0|=C2= =A0EnterpriseDB=C2=A0Corporation.
--000000000000984eb905c3378e0a-- --000000000000984ebb05c3378e0c Content-Type: application/octet-stream; name="RM4203.patch" Content-Disposition: attachment; filename="RM4203.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_kp57rs5a0 ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc3RhdGljL2pzL3Rvb2xiYXIuanMgYi93 ZWIvcGdhZG1pbi9icm93c2VyL3N0YXRpYy9qcy90b29sYmFyLmpzCmluZGV4IDA5YmFhZjIyOC4u ZjkwY2U1M2E3IDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9icm93c2VyL3N0YXRpYy9qcy90b29s YmFyLmpzCisrKyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc3RhdGljL2pzL3Rvb2xiYXIuanMKQEAg LTE4LDkgKzE4LDkgQEAgbGV0IF9icm93c2VyUGFuZWwgPSBudWxsOwogLy8gRGVmYXVsdCBUb29s IEJhciBCdXR0b25zLgogbGV0IF9kZWZhdWx0VG9vbEJhckJ1dHRvbnMgPSBbCiAgIHsKLSAgICBs YWJlbDogZ2V0dGV4dCgnUXVlcnkgVG9vbCcpLAotICAgIGFyaWFMYWJlbDogZ2V0dGV4dCgnUXVl cnkgVG9vbCcpLAotICAgIGJ0bkNsYXNzOiAncGctZm9udC1pY29uIGljb24tcXVlcnlfdG9vbCcs CisgICAgbGFiZWw6IGdldHRleHQoJ1NlYXJjaCBvYmplY3RzJyksCisgICAgYXJpYUxhYmVsOiBn ZXR0ZXh0KCdTZWFyY2ggb2JqZWN0cycpLAorICAgIGJ0bkNsYXNzOiAnZmEgZmEtc2VhcmNoJywK ICAgICB0ZXh0OiAnJywKICAgICB0b2dnbGVkOiBmYWxzZSwKICAgICB0b2dnbGVDbGFzczogJycs CkBAIC0yOCw5ICsyOCw5IEBAIGxldCBfZGVmYXVsdFRvb2xCYXJCdXR0b25zID0gWwogICAgIGVu YWJsZWQ6IGZhbHNlLAogICB9LAogICB7Ci0gICAgbGFiZWw6IGdldHRleHQoJ1ZpZXcgRGF0YScp LAotICAgIGFyaWFMYWJlbDogZ2V0dGV4dCgnVmlldyBEYXRhJyksCi0gICAgYnRuQ2xhc3M6ICdw Zy1mb250LWljb24gc3FsLWljb24tbGcgaWNvbi12aWV3X2RhdGEnLAorICAgIGxhYmVsOiBnZXR0 ZXh0KCdGaWx0ZXJlZCBSb3dzJyksCisgICAgYXJpYUxhYmVsOiBnZXR0ZXh0KCdGaWx0ZXJlZCBS b3dzJyksCisgICAgYnRuQ2xhc3M6ICdwZy1mb250LWljb24gaWNvbi1yb3dfZmlsdGVyJywKICAg ICB0ZXh0OiAnJywKICAgICB0b2dnbGVkOiBmYWxzZSwKICAgICB0b2dnbGVDbGFzczogJycsCkBA IC0zOCw5ICszOCw5IEBAIGxldCBfZGVmYXVsdFRvb2xCYXJCdXR0b25zID0gWwogICAgIGVuYWJs ZWQ6IGZhbHNlLAogICB9LAogICB7Ci0gICAgbGFiZWw6IGdldHRleHQoJ0ZpbHRlcmVkIFJvd3Mn KSwKLSAgICBhcmlhTGFiZWw6IGdldHRleHQoJ0ZpbHRlcmVkIFJvd3MnKSwKLSAgICBidG5DbGFz czogJ3BnLWZvbnQtaWNvbiBpY29uLXJvd19maWx0ZXInLAorICAgIGxhYmVsOiBnZXR0ZXh0KCdW aWV3IERhdGEnKSwKKyAgICBhcmlhTGFiZWw6IGdldHRleHQoJ1ZpZXcgRGF0YScpLAorICAgIGJ0 bkNsYXNzOiAncGctZm9udC1pY29uIHNxbC1pY29uLWxnIGljb24tdmlld19kYXRhJywKICAgICB0 ZXh0OiAnJywKICAgICB0b2dnbGVkOiBmYWxzZSwKICAgICB0b2dnbGVDbGFzczogJycsCkBAIC00 OCw5ICs0OCw5IEBAIGxldCBfZGVmYXVsdFRvb2xCYXJCdXR0b25zID0gWwogICAgIGVuYWJsZWQ6 IGZhbHNlLAogICB9LAogICB7Ci0gICAgbGFiZWw6IGdldHRleHQoJ1NlYXJjaCBvYmplY3RzJyks Ci0gICAgYXJpYUxhYmVsOiBnZXR0ZXh0KCdTZWFyY2ggb2JqZWN0cycpLAotICAgIGJ0bkNsYXNz OiAnZmEgZmEtc2VhcmNoJywKKyAgICBsYWJlbDogZ2V0dGV4dCgnUXVlcnkgVG9vbCcpLAorICAg IGFyaWFMYWJlbDogZ2V0dGV4dCgnUXVlcnkgVG9vbCcpLAorICAgIGJ0bkNsYXNzOiAncGctZm9u dC1pY29uIGljb24tcXVlcnlfdG9vbCcsCiAgICAgdGV4dDogJycsCiAgICAgdG9nZ2xlZDogZmFs c2UsCiAgICAgdG9nZ2xlQ2xhc3M6ICcnLApkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vc3RhdGlj L2pzL3NxbGVkaXRvci9jYWxsX3JlbmRlcl9hZnRlcl9wb2xsLmpzIGIvd2ViL3BnYWRtaW4vc3Rh dGljL2pzL3NxbGVkaXRvci9jYWxsX3JlbmRlcl9hZnRlcl9wb2xsLmpzCmluZGV4IDIxNWU4NDky YS4uODg0OTY2YjFjIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9zdGF0aWMvanMvc3FsZWRpdG9y L2NhbGxfcmVuZGVyX2FmdGVyX3BvbGwuanMKKysrIGIvd2ViL3BnYWRtaW4vc3RhdGljL2pzL3Nx bGVkaXRvci9jYWxsX3JlbmRlcl9hZnRlcl9wb2xsLmpzCkBAIC01MCw2ICs1MCw4IEBAIGV4cG9y dCBmdW5jdGlvbiBjYWxsUmVuZGVyQWZ0ZXJQb2xsKHNxbEVkaXRvciwgYWxlcnRpZnksIHJlcykg ewogICAgIHNxbEVkaXRvci5kaXNhYmxlX3Rvb2xfYnV0dG9ucyhmYWxzZSk7CiAgIH0KIAorICBz cWxFZGl0b3IuY2hlY2tfZGJfbmFtZV9jaGFuZ2UocmVzKTsKKwogICBzcWxFZGl0b3Iuc2V0SXNR dWVyeVJ1bm5pbmcoZmFsc2UpOwogICBzcWxFZGl0b3IudHJpZ2dlcigncGdhZG1pbi1zcWxlZGl0 b3I6bG9hZGluZy1pY29uOmhpZGUnKTsKIH0KZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL3N0YXRp Yy9zY3NzL193ZWJjYWJpbi5wZ2FkbWluLnNjc3MgYi93ZWIvcGdhZG1pbi9zdGF0aWMvc2Nzcy9f d2ViY2FiaW4ucGdhZG1pbi5zY3NzCmluZGV4IDQ0NGM3ZmY3ZS4uYmExNWVkYzE1IDEwMDY0NAot LS0gYS93ZWIvcGdhZG1pbi9zdGF0aWMvc2Nzcy9fd2ViY2FiaW4ucGdhZG1pbi5zY3NzCisrKyBi L3dlYi9wZ2FkbWluL3N0YXRpYy9zY3NzL193ZWJjYWJpbi5wZ2FkbWluLnNjc3MKQEAgLTY0LDcg KzY0LDcgQEAKICAgZGlzcGxheTogZmxleDsKIH0KIAotLndjRmxvYXRpbmcgLndjRnJhbWVCdXR0 b25CYXIgeworLndjRnJhbWVCdXR0b25CYXIgewogICBmbGV4LWRpcmVjdGlvbjogcm93LXJldmVy c2U7CiB9CiAKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL3Rvb2xzL2RhdGFncmlkL3N0YXRpYy9q cy9zaG93X2RhdGEuanMgYi93ZWIvcGdhZG1pbi90b29scy9kYXRhZ3JpZC9zdGF0aWMvanMvc2hv d19kYXRhLmpzCmluZGV4IGVmNmNiOTNkNS4uNjlmZjEzZDdmIDEwMDY0NAotLS0gYS93ZWIvcGdh ZG1pbi90b29scy9kYXRhZ3JpZC9zdGF0aWMvanMvc2hvd19kYXRhLmpzCisrKyBiL3dlYi9wZ2Fk bWluL3Rvb2xzL2RhdGFncmlkL3N0YXRpYy9qcy9zaG93X2RhdGEuanMKQEAgLTEzLDYgKzEzLDcg QEAgaW1wb3J0IHtnZXREYXRhYmFzZUxhYmVsLCBnZW5lcmF0ZVRpdGxlfSBmcm9tICcuL2RhdGFn cmlkX3BhbmVsX3RpdGxlJzsKIGltcG9ydCBDb2RlTWlycm9yIGZyb20gJ2J1bmRsZWRfY29kZW1p cnJvcic7CiBpbXBvcnQgKiBhcyBTcWxFZGl0b3JVdGlscyBmcm9tICdzb3VyY2VzL3NxbGVkaXRv cl91dGlscyc7CiBpbXBvcnQgJCBmcm9tICdqcXVlcnknOworaW1wb3J0IF8gZnJvbSAndW5kZXJz Y29yZSc7CiAKIGV4cG9ydCBmdW5jdGlvbiBzaG93RGF0YUdyaWQoCiAgIGRhdGFncmlkLApAQCAt Mjg5LDcgKzI5MCw3IEBAIGZ1bmN0aW9uIGhhc1NjaGVtYU9yQ2F0YWxvZ09yVmlld0luZm9ybWF0 aW9uKHBhcmVudERhdGEpIHsKICAgICBwYXJlbnREYXRhLmNhdGFsb2cgIT09IHVuZGVmaW5lZDsK IH0KIAotZXhwb3J0IGZ1bmN0aW9uIGdlbmVyYXRlRGF0YWdyaWRUaXRsZShwZ0Jyb3dzZXIsIGFj aVRyZWVJZGVudGlmaWVyLCBjdXN0b21fdGl0bGU9bnVsbCkgeworZXhwb3J0IGZ1bmN0aW9uIGdl bmVyYXRlRGF0YWdyaWRUaXRsZShwZ0Jyb3dzZXIsIGFjaVRyZWVJZGVudGlmaWVyLCBjdXN0b21f dGl0bGU9bnVsbCwgYmFja2VuZF9lbnRpdHk9bnVsbCkgewogICAvL2NvbnN0IGJhc2VUaXRsZSA9 IGdldFBhbmVsVGl0bGUocGdCcm93c2VyLCBhY2lUcmVlSWRlbnRpZmllcik7CiAgIHZhciBwcmVm ZXJlbmNlcyA9IHBnQnJvd3Nlci5nZXRfcHJlZmVyZW5jZXNfZm9yX21vZHVsZSgnYnJvd3Nlcicp OwogICBjb25zdCBwYXJlbnREYXRhID0gZ2V0VHJlZU5vZGVIaWVyYXJjaHlGcm9tSWRlbnRpZmll ci5jYWxsKApAQCAtMjk4LDcgKzI5OSw3IEBAIGV4cG9ydCBmdW5jdGlvbiBnZW5lcmF0ZURhdGFn cmlkVGl0bGUocGdCcm93c2VyLCBhY2lUcmVlSWRlbnRpZmllciwgY3VzdG9tX3RpdGxlCiAgICk7 CiAKICAgY29uc3QgbmFtZXNwYWNlTmFtZSA9IHJldHJpZXZlTmFtZVNwYWNlTmFtZShwYXJlbnRE YXRhKTsKLSAgY29uc3QgZGJfbGFiZWwgPSBnZXREYXRhYmFzZUxhYmVsKHBhcmVudERhdGEpOwor ICBjb25zdCBkYl9sYWJlbCA9ICFfLmlzVW5kZWZpbmVkKGJhY2tlbmRfZW50aXR5KSAmJiBiYWNr ZW5kX2VudGl0eSAhPSBudWxsICYmIGJhY2tlbmRfZW50aXR5Lmhhc093blByb3BlcnR5KCdhY3R1 YWxfZGJfbmFtZScpID8gYmFja2VuZF9lbnRpdHlbJ2FjdHVhbF9kYl9uYW1lJ10gOiBnZXREYXRh YmFzZUxhYmVsKHBhcmVudERhdGEpOwogICBjb25zdCBub2RlID0gcGdCcm93c2VyLnRyZWVNZW51 LmZpbmROb2RlQnlEb21FbGVtZW50KGFjaVRyZWVJZGVudGlmaWVyKTsKIAogICB2YXIgZHRnX3Rp dGxlX3BsYWNlaG9sZGVyID0gJyc7CmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi90b29scy9zcWxl ZGl0b3IvX19pbml0X18ucHkgYi93ZWIvcGdhZG1pbi90b29scy9zcWxlZGl0b3IvX19pbml0X18u cHkKaW5kZXggZGUzODY0YmU1Li5hMTlmZmU1MjIgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL3Rv b2xzL3NxbGVkaXRvci9fX2luaXRfXy5weQorKysgYi93ZWIvcGdhZG1pbi90b29scy9zcWxlZGl0 b3IvX19pbml0X18ucHkKQEAgLTUyMCw2ICs1MjAsNyBAQCBkZWYgcG9sbCh0cmFuc19pZCk6CiAg ICAgICAgICAgICAnaGFzX29pZHMnOiBoYXNfb2lkcywKICAgICAgICAgICAgICdvaWRzJzogb2lk cywKICAgICAgICAgICAgICd0cmFuc2FjdGlvbl9zdGF0dXMnOiB0cmFuc2FjdGlvbl9zdGF0dXMs CisgICAgICAgICAgICAnYWN0dWFsX2RiX25hbWUnOiBjb25uLmRiLAogICAgICAgICB9LAogICAg ICAgICBlbmNvZGluZz1jb25uLnB5dGhvbl9lbmNvZGluZwogICAgICkKZGlmZiAtLWdpdCBhL3dl Yi9wZ2FkbWluL3Rvb2xzL3NxbGVkaXRvci9zdGF0aWMvanMvc3FsZWRpdG9yLmpzIGIvd2ViL3Bn YWRtaW4vdG9vbHMvc3FsZWRpdG9yL3N0YXRpYy9qcy9zcWxlZGl0b3IuanMKaW5kZXggYzEwZTY1 MTdhLi4wNzc4NGFmMDEgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL3Rvb2xzL3NxbGVkaXRvci9z dGF0aWMvanMvc3FsZWRpdG9yLmpzCisrKyBiL3dlYi9wZ2FkbWluL3Rvb2xzL3NxbGVkaXRvci9z dGF0aWMvanMvc3FsZWRpdG9yLmpzCkBAIC0xMyw2ICsxMyw3IEBAIF9fd2VicGFja19wdWJsaWNf cGF0aF9fID0gd2luZG93LnJlc291cmNlQmFzZVBhdGg7CiAvKiBlc2xpbnQtZW5hYmxlICovCiAK IGltcG9ydCB7bGF1bmNoRGF0YUdyaWR9IGZyb20gJ3Rvb2xzL2RhdGFncmlkL3N0YXRpYy9qcy9z aG93X3F1ZXJ5X3Rvb2wnOworaW1wb3J0IHtnZW5lcmF0ZURhdGFncmlkVGl0bGV9IGZyb20gJ3Rv b2xzL2RhdGFncmlkL3N0YXRpYy9qcy9zaG93X2RhdGEnOwogCiBkZWZpbmUoJ3Rvb2xzLnF1ZXJ5 dG9vbCcsIFsKICAgJ3NvdXJjZXMvZ2V0dGV4dCcsICdzb3VyY2VzL3VybF9mb3InLCAnanF1ZXJ5 JywgJ2pxdWVyeS51aScsCkBAIC01MDg3LDYgKzUwODgsNzIgQEAgZGVmaW5lKCd0b29scy5xdWVy eXRvb2wnLCBbCiAgICAgICB1cGRhdGVfbm90aWZpY2F0aW9uczogZnVuY3Rpb24gKG5vdGlmaWNh dGlvbnMpIHsKICAgICAgICAgcXVlcnlUb29sTm90aWZpY2F0aW9ucy51cGRhdGVOb3RpZmljYXRp b25zKG5vdGlmaWNhdGlvbnMpOwogICAgICAgfSwKKworICAgICAgY2hlY2tfZGJfbmFtZV9jaGFu Z2U6IGZ1bmN0aW9uKGRhdGEpIHsKKworICAgICAgICB2YXIgc2VsZiA9IHRoaXM7CisKKyAgICAg ICAgdmFyIHNlbGVjdGVkX2l0ZW0gPSBwZ1dpbmRvdy5kZWZhdWx0LnBnQWRtaW4uQnJvd3Nlci50 cmVlTWVudS5zZWxlY3RlZCgpOworICAgICAgICB2YXIgdHJlZV9kYXRhID0gcGdXaW5kb3cuZGVm YXVsdC5wZ0FkbWluLkJyb3dzZXIudHJlZU1lbnUudHJhbnNsYXRlVHJlZU5vZGVJZEZyb21BQ0lU cmVlKHNlbGVjdGVkX2l0ZW0pOworICAgICAgICB2YXIgc2VydmVyX2RhdGEgPSBwZ1dpbmRvdy5k ZWZhdWx0LnBnQWRtaW4uQnJvd3Nlci50cmVlTWVudS5maW5kTm9kZSh0cmVlX2RhdGEuc2xpY2Uo MCwyKSk7CisgICAgICAgIHZhciBkYXRhYmFzZV9kYXRhID0gcGdXaW5kb3cuZGVmYXVsdC5wZ0Fk bWluLkJyb3dzZXIudHJlZU1lbnUuZmluZE5vZGUodHJlZV9kYXRhLnNsaWNlKDAsNCkpOworCisg ICAgICAgIHZhciBkYl9uYW1lID0gZGF0YWJhc2VfZGF0YS5kYXRhLmxhYmVsOworCisgICAgICAg IHNlbGYuZ3JpZFZpZXcuY29ubmVjdGlvbl9saXN0LmZvckVhY2gob3B0aW9uID0+eworICAgICAg ICAgIGlmKGRhdGEuYWN0dWFsX2RiX25hbWUgPT0gb3B0aW9uWydkYXRhYmFzZV9uYW1lJ10pIHsK KyAgICAgICAgICAgIGRiX25hbWUgPSBvcHRpb25bJ2RhdGFiYXNlX25hbWUnXTsKKyAgICAgICAg ICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgICB9CisgICAgICAgIH0pOworCisgICAgICAgIGlm KCFfLmlzRXF1YWwoZGJfbmFtZSwgZGF0YS5hY3R1YWxfZGJfbmFtZSkpIHsKKyAgICAgICAgICB2 YXIgbWVzc2FnZSA9IGBQbGVhc2Ugbm90ZSB0aGF0IHRoZSBkYXRhYmFzZSB5b3UgYXJlIHdvcmtp bmcgb24gaGFzIGJlZW4gbW92ZWQgb3IgcmVuYW1lZCB0byAke2RhdGEuYWN0dWFsX2RiX25hbWV9 LiBSZWZyZXNoIGRhdGFiYXNlcyBpbiBicm93c2VyIHBhbmVsIG9yIGNsaWNrIE9LIHRvIGNvbnRp bnVlLi5gOworCisgICAgICAgICAgYWxlcnRpZnkuYWxlcnQoKQorICAgICAgICAgICAgLnNldHRp bmcoeworICAgICAgICAgICAgICAndGl0bGUnOiBnZXR0ZXh0KCdEYXRhYmFzZSBtb3ZlZC9yZW5h bWVkLi4nKSwKKyAgICAgICAgICAgICAgJ2xhYmVsJzpnZXR0ZXh0KCdPSycpLAorICAgICAgICAg ICAgICAnbWVzc2FnZSc6IGdldHRleHQobWVzc2FnZSksCisgICAgICAgICAgICAgICdvbm9rJzog ZnVuY3Rpb24oKXsKKyAgICAgICAgICAgICAgICAvL1NldCB0aGUgb3JpZ2luYWwgZGIgbmFtZSBh cyBzb29uIGFzIHVzZXIgY2xpY2tzIG9rIGJ1dHRvbgorCisgICAgICAgICAgICAgICAgdmFyIHRp dGxlID0gc2VsZi51cmxfcGFyYW1zLnRpdGxlOworCisgICAgICAgICAgICAgICAgaWYoc2VsZi5p c19xdWVyeV90b29sKSB7Ly8gZm9yIHF1ZXJ5IHRvb2wKKworICAgICAgICAgICAgICAgICAgdmFy IHF0X3RpdGxlX3BsYWNlaG9sZGVyID0gc2VsZi5ncmlkVmlldy5icm93c2VyX3ByZWZlcmVuY2Vz WydxdF90YWJfdGl0bGVfcGxhY2Vob2xkZXInXTsKKyAgICAgICAgICAgICAgICAgIHZhciB0aXRs ZV9kYXRhID0geworICAgICAgICAgICAgICAgICAgICAnZGF0YWJhc2UnOiBkYXRhLmFjdHVhbF9k Yl9uYW1lLAorICAgICAgICAgICAgICAgICAgICAndXNlcm5hbWUnOiBzZXJ2ZXJfZGF0YS5kYXRh LnVzZXIubmFtZSwKKyAgICAgICAgICAgICAgICAgICAgJ3NlcnZlcic6IHNlcnZlcl9kYXRhLmRh dGEubGFiZWwsCisgICAgICAgICAgICAgICAgICAgICd0eXBlJzogJ3F1ZXJ5X3Rvb2wnCisgICAg ICAgICAgICAgICAgICB9OworICAgICAgICAgICAgICAgICAgdGl0bGUgPSBwYW5lbFRpdGxlRnVu Yy5nZW5lcmF0ZVRpdGxlKHF0X3RpdGxlX3BsYWNlaG9sZGVyLCB0aXRsZV9kYXRhKTsKKyAgICAg ICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgZWxzZSB7IC8vIGZvciBkYXRhZ3JpZAorICAg ICAgICAgICAgICAgICAgdGl0bGUgPSBnZW5lcmF0ZURhdGFncmlkVGl0bGUocGdXaW5kb3cuZGVm YXVsdC5wZ0FkbWluLkJyb3dzZXIsIHNlbGVjdGVkX2l0ZW0sIG51bGwsIGRhdGEpOworICAgICAg ICAgICAgICAgIH0KKworICAgICAgICAgICAgICAgIHNlbGYuZ3JpZFZpZXcuc2V0X2VkaXRvcl90 aXRsZShfLnVuZXNjYXBlKHRpdGxlKSk7CisgICAgICAgICAgICAgICAgc2VsZi5ncmlkVmlldy5o YW5kbGVyLnNldFRpdGxlKF8udW5lc2NhcGUodGl0bGUpKTsKKworICAgICAgICAgICAgICAgIHNl bGYudXJsX3BhcmFtcy50aXRsZSA9IHRpdGxlOyAgLy8gZml4aW5nIHRoZSB0aXRsZSB3aGVuIHVz ZXIgcmVmcmVzaGVzIHRoZSBicm93c2VyIHBhbmVsCisKKyAgICAgICAgICAgICAgICBzZWxmLmdy aWRWaWV3LmNvbm5lY3Rpb25fbGlzdC5mb3JFYWNoKG9wdGlvbiA9PnsKKyAgICAgICAgICAgICAg ICAgIGlmKGRhdGFiYXNlX2RhdGEuZGF0YS5faWQgPT0gb3B0aW9uWydkYXRhYmFzZSddKSB7Cisg ICAgICAgICAgICAgICAgICAgIG9wdGlvbi5kYXRhYmFzZV9uYW1lID0gZGF0YS5hY3R1YWxfZGJf bmFtZTsKKyAgICAgICAgICAgICAgICAgICAgb3B0aW9uLnRpdGxlID0gdGl0bGU7CisgICAgICAg ICAgICAgICAgICAgIGlmKCdpc19zZWxlY3RlZCcgaW4gb3B0aW9uICYmIG9wdGlvblsnaXNfc2Vs ZWN0ZWQnXSkgeworICAgICAgICAgICAgICAgICAgICAgIHNlbGYuZ3JpZFZpZXcuJGVsLmZpbmQo J3VsI2Nvbm5lY3Rpb25zLWxpc3QgbGkuc2VsZWN0ZWQtY29ubmVjdGlvbiA+IGEnKS50ZXh0KHRp dGxlKTsKKyAgICAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgICAgICByZXR1cm4g dHJ1ZTsKKyAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICB9KTsKKyAgICAgICAg ICAgICAgfSwKKyAgICAgICAgICAgIH0pLnNob3coKTsKKyAgICAgICAgfQorICAgICAgfSwKICAg ICB9KTsKIAogICBwZ0FkbWluLlNxbEVkaXRvciA9IHsKZGlmZiAtLWdpdCBhL3dlYi9yZWdyZXNz aW9uL2phdmFzY3JpcHQvc3FsZWRpdG9yL2NhbGxfcmVuZGVyX2FmdGVyX3BvbGxfc3BlYy5qcyBi L3dlYi9yZWdyZXNzaW9uL2phdmFzY3JpcHQvc3FsZWRpdG9yL2NhbGxfcmVuZGVyX2FmdGVyX3Bv bGxfc3BlYy5qcwppbmRleCA2NmU1NDkwYjYuLmFiMDUxYmVmNyAxMDA2NDQKLS0tIGEvd2ViL3Jl Z3Jlc3Npb24vamF2YXNjcmlwdC9zcWxlZGl0b3IvY2FsbF9yZW5kZXJfYWZ0ZXJfcG9sbF9zcGVj LmpzCisrKyBiL3dlYi9yZWdyZXNzaW9uL2phdmFzY3JpcHQvc3FsZWRpdG9yL2NhbGxfcmVuZGVy X2FmdGVyX3BvbGxfc3BlYy5qcwpAQCAtMjUsNiArMjUsNyBAQCBkZXNjcmliZSgnI2NhbGxSZW5k ZXJBZnRlclBvbGwnLCAoKSA9PiB7CiAgICAgICBkaXNhYmxlX3RyYW5zYWN0aW9uX2J1dHRvbnM6 IGphc21pbmUuY3JlYXRlU3B5KCdTUUxFZGl0b3IuZGlzYWJsZV90cmFuc2FjdGlvbl9idXR0b25z JyksCiAgICAgICByZXNldF9kYXRhX3N0b3JlOiBqYXNtaW5lLmNyZWF0ZVNweSgnU1FMRWRpdG9y LnJlc2V0X2RhdGFfc3RvcmUnKSwKICAgICAgIGVuYWJsZV9kaXNhYmxlX2Rvd25sb2FkX2J0bjog amFzbWluZS5jcmVhdGVTcHkoJ1NRTEVkaXRvci5lbmFibGVfZGlzYWJsZV9kb3dubG9hZF9idG4n KSwKKyAgICAgIGNoZWNrX2RiX25hbWVfY2hhbmdlOiBqYXNtaW5lLmNyZWF0ZVNweSgnU1FMRWRp dG9yLmNoZWNrX2RiX25hbWVfY2hhbmdlJyksCiAgICAgICBxdWVyeV9zdGFydF90aW1lOiBuZXcg RGF0ZSgpLAogICAgIH07CiAgICAgYWxlcnRpZnkgPSBqYXNtaW5lLmNyZWF0ZVNweU9iaignYWxl cnRpZnknLCBbJ3N1Y2Nlc3MnXSk7CkBAIC0yMjksNiArMjMwLDEyIEBAIGRlc2NyaWJlKCcjY2Fs bFJlbmRlckFmdGVyUG9sbCcsICgpID0+IHsKIAogICAgICAgICBleHBlY3Qoc3FsRWRpdG9yU3B5 LnRyaWdnZXIpLnRvSGF2ZUJlZW5DYWxsZWRXaXRoKCdwZ2FkbWluLXNxbGVkaXRvcjpsb2FkaW5n LWljb246aGlkZScpOwogICAgICAgfSk7CisKKyAgICAgIGl0KCdjaGVjayB3aGV0aGVyIGRhdGFi YXNlIGhhcyBiZWVuIG1vdmVkL3JlbmFtZWQnLCAoKSA9PiB7CisgICAgICAgIGNhbGxSZW5kZXJB ZnRlclBvbGwoc3FsRWRpdG9yU3B5LCBhbGVydGlmeSwgcXVlcnlSZXN1bHQpOworCisgICAgICAg IGV4cGVjdChzcWxFZGl0b3JTcHkuY2hlY2tfZGJfbmFtZV9jaGFuZ2UpLnRvSGF2ZUJlZW5DYWxs ZWQoKTsKKyAgICAgIH0pOwogICAgIH0pOwogICB9KTsKIH0pOwo= --000000000000984ebb05c3378e0c--