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 1mZvxj-0003AP-7x for pgadmin-hackers@arkaria.postgresql.org; Mon, 11 Oct 2021 14:07:31 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.92) (envelope-from ) id 1mZvxh-00022u-EY for pgadmin-hackers@arkaria.postgresql.org; Mon, 11 Oct 2021 14:07:29 +0000 Received: from magus.postgresql.org ([2a02:c0:301:0:ffff::29]) by malur.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mZvxg-00022m-T2 for pgadmin-hackers@lists.postgresql.org; Mon, 11 Oct 2021 14:07:29 +0000 Received: from mail-pg1-x530.google.com ([2607:f8b0:4864:20::530]) by magus.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1mZvxb-0002uJ-Mv for pgadmin-hackers@postgresql.org; Mon, 11 Oct 2021 14:07:28 +0000 Received: by mail-pg1-x530.google.com with SMTP id g184so10917896pgc.6 for ; Mon, 11 Oct 2021 07:07:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=enterprisedb.com; s=google; h=mime-version:from:date:message-id:subject:to; bh=zSlyvqhlaky3+5gSbZM27VuXZ6IJEiHqG8ti/VECdP4=; b=CUNFBz1kRjswCK+y4Z/pogcABsk4WI7dMdoDiUfjiyxKKzBiCluWMZHmpLb+uv3wgF 2x540zRgr6Ju+em7iwTCL+pTPhqyKCjNmKxd8z8yf2IENBqXNiE5CtaqofR88nniUV+n 6O5rrF2QiYv3UX9CUlEK9nFu0bN1Dm2H1zzloDtlxzDAeJupX1TWfrioS1wiYvMV2vVP caQAsQXBTmwSt9V6HYkUMelfDyRX8/56jqKVDY4i7xz7Kaiz5y4J5Z7h77kdy06i3ZUT Q60PKLe+wkSj7eVgbq9osc9ACFmlaoACkrX2fBcE2GVR1ZWRbFuOCCmCF4a30hL6moKS 0aXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=zSlyvqhlaky3+5gSbZM27VuXZ6IJEiHqG8ti/VECdP4=; b=Si72OWqCBQjU8+ObIecA9dAbI9ts1p7y0DtFBopLWcZOmCD8MG3VXXV7rOEpsI1QU/ BdHE9XDh2SCDzVrwcXrfbW1rmmg4rXsr/SlsbtTaGBvnScLZMiepSbVeZSOR01ieXy5Q 83VmcNdrL9fvg7kGmNQlWE/PSJrg7VsOBnmJWR50d/TZ+7V37zHEvdRJkJyk7Qkpr6uV QhfCDyd38ooHfXRPVOLnN1cq8klDY40oqFsXjXrBr0SbLjo+QlOz4sCZfVGijvFPmqwI iVx9+yDzh2oLdmeKej9g9sGzeJ8vhvrkw1pvDHVfqoyoycYGWTPcEf182bT8d8Ft1T9G yuxQ== X-Gm-Message-State: AOAM531acCjBzGd8YaoYj9k2exJ8aMGGsKX3fgn0z3ppkWTvoBq4cmn6 kkMccUP3JVmzeX8Y/uO1CzE9LOc6tHpNPwVWnCC+G/ZbwIE81aRUELqqmVZvxySxJyVQgkPKNW4 TNmbl80+8LRSMkZSU/RusT3r4g20osZl+4ddfM9Jdz7xNfxyiyP0OXGGiQhdpkd4kHJRDddN9eB /WefP7AtshlUxwDZJcyCCdZM+YK4mbZaw9LR4r/iow9RIQvdYVxjPSItxERGH/h0On4g== X-Google-Smtp-Source: ABdhPJzBBiuWRBuzyHD4d9uSSnQRD5645zBRKyxZU2Gy3apPuRpD0BgB6FZ5KB9d/+mz7nW1oTeN+x+QOQ61xEjswDM= X-Received: by 2002:a05:6a00:1488:b0:44d:25b2:f80b with SMTP id v8-20020a056a00148800b0044d25b2f80bmr3147018pfu.20.1633961240559; Mon, 11 Oct 2021 07:07:20 -0700 (PDT) MIME-Version: 1.0 From: Pradip Parkale Date: Mon, 11 Oct 2021 19:37:09 +0530 Message-ID: Subject: [pgAdmin][RM6794]: Provide functionality to disable/enable rules To: pgadmin-hackers Content-Type: multipart/mixed; boundary="00000000000052a9a905ce143f6d" 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 --00000000000052a9a905ce143f6d Content-Type: multipart/alternative; boundary="00000000000052a9a705ce143f6b" --00000000000052a9a705ce143f6b Content-Type: text/plain; charset="UTF-8" Hi Hackers, Please find the updated patch for #6794 Provide functionality to disable/enable rules. This patch also includes the fix for #6870 Unable to delete server group if first server group has shared server. -- Thanks & Regards, Pradip Parkale Software Engineer | EnterpriseDB Corporation --00000000000052a9a705ce143f6b Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi Hackers,

Please find the updated pat= ch for #6794=C2=A0Provide functionality to disable/enable rules.
=
This patch also includes the fix for #6870=C2=A0Unable to de= lete server group if first server group has shared server.

--
= Thanks & Regards,
Pradip Parka= le
Software Engineer | EnterpriseDB Corporation
<= /div> --00000000000052a9a705ce143f6b-- --00000000000052a9a905ce143f6d Content-Type: application/octet-stream; name="RM6794.patch" Content-Disposition: attachment; filename="RM6794.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_kumq6t5u0 ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9fX2luaXRfXy5w eSBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9fX2luaXRfXy5weQppbmRleCA1 NjE3NzI2MzYuLjFjZWRjOWM1ZCAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2 ZXJfZ3JvdXBzL19faW5pdF9fLnB5CisrKyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dy b3Vwcy9fX2luaXRfXy5weQpAQCAtMTc3LDcgKzE3Nyw3IEBAIGNsYXNzIFNlcnZlckdyb3VwVmll dyhOb2RlVmlldyk6CiAgICAgICAgICMgaWYgc2VydmVyIGdyb3VwIGlkIGlzIDEgd2Ugd29uJ3Qg ZGVsZXRlIGl0LgogICAgICAgICBzZyA9IGdyb3Vwcy5maXJzdCgpCiAKLSAgICAgICAgc2hhcmVk X3NlcnZlcnMgPSBTZXJ2ZXIucXVlcnkuZmlsdGVyX2J5KHNlcnZlcmdyb3VwX2lkPXNnLmlkLAor ICAgICAgICBzaGFyZWRfc2VydmVycyA9IFNlcnZlci5xdWVyeS5maWx0ZXJfYnkoc2VydmVyZ3Jv dXBfaWQ9Z2lkLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgc2hhcmVkPVRydWUpLmFsbCgpCiAgICAgICAgIGlmIHNoYXJlZF9zZXJ2ZXJzOgogICAgICAg ICAgICAgcmV0dXJuIG1ha2VfanNvbl9yZXNwb25zZSgKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWlu L2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3RhYmxlcy9y dWxlcy9fX2luaXRfXy5weSBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2 ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3RhYmxlcy9ydWxlcy9fX2luaXRfXy5weQppbmRleCA3NWE5 MWM2YjMuLjRjMDc4MDQzZCAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJf Z3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdGFibGVzL3J1bGVzL19faW5pdF9fLnB5 CisrKyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNl cy9zY2hlbWFzL3RhYmxlcy9ydWxlcy9fX2luaXRfXy5weQpAQCAtMjQ5LDcgKzI0OSw3IEBAIGNs YXNzIFJ1bGVWaWV3KFBHQ2hpbGROb2RlVmlldywgU2NoZW1hRGlmZk9iamVjdENvbXBhcmUpOgog ICAgICAgICAgICAgcnNldFsncm93cyddWzBdWydvaWQnXSwKICAgICAgICAgICAgIHRpZCwKICAg ICAgICAgICAgIHJzZXRbJ3Jvd3MnXVswXVsnbmFtZSddLAotICAgICAgICAgICAgaWNvbj0iaWNv bi1ydWxlIgorICAgICAgICAgICAgaWNvbj0iaWNvbi1ydWxlIiBpZiByc2V0Wydyb3dzJ11bMF1b J2VuYWJsZWQnXSBlbHNlICJpY29uLXJ1bGUtYmFkIgogICAgICAgICApCiAKICAgICAgICAgcmV0 dXJuIG1ha2VfanNvbl9yZXNwb25zZSgKQEAgLTI3Niw3ICsyNzYsNyBAQCBjbGFzcyBSdWxlVmll dyhQR0NoaWxkTm9kZVZpZXcsIFNjaGVtYURpZmZPYmplY3RDb21wYXJlKToKICAgICAgICAgICAg ICAgICAgICAgcm93WydvaWQnXSwKICAgICAgICAgICAgICAgICAgICAgdGlkLAogICAgICAgICAg ICAgICAgICAgICByb3dbJ25hbWUnXSwKLSAgICAgICAgICAgICAgICAgICAgaWNvbj0iaWNvbi1y dWxlIgorICAgICAgICAgICAgICAgICAgICBpY29uPSJpY29uLXJ1bGUiIGlmIHJvd1snZW5hYmxl ZCddIGVsc2UgImljb24tcnVsZS1iYWQiCiAgICAgICAgICAgICAgICAgKSkKIAogICAgICAgICBy ZXR1cm4gbWFrZV9qc29uX3Jlc3BvbnNlKApAQCAtMzg1LDcgKzM4NSw5IEBAIGNsYXNzIFJ1bGVW aWV3KFBHQ2hpbGROb2RlVmlldywgU2NoZW1hRGlmZk9iamVjdENvbXBhcmUpOgogICAgICAgICAg ICAgICAgICAgICByaWQsCiAgICAgICAgICAgICAgICAgICAgIHRpZCwKICAgICAgICAgICAgICAg ICAgICAgbmFtZSwKLSAgICAgICAgICAgICAgICAgICAgaWNvbj0iaWNvbi0lcyIgJSBzZWxmLm5v ZGVfdHlwZQorICAgICAgICAgICAgICAgICAgICBpY29uPSJpY29uLSVzIiAlIHNlbGYubm9kZV90 eXBlIGlmICdlbmFibGVkJyBpbiBkYXRhIGFuZAorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRhdGFbJ2VuYWJsZWQnXQorICAgICAgICAgICAg ICAgICAgICBlbHNlICJpY29uLSVzLWJhZCIgJSBzZWxmLm5vZGVfdHlwZQogICAgICAgICAgICAg ICAgICkKICAgICAgICAgICAgICkKICAgICAgICAgZXhjZXB0IEV4Y2VwdGlvbiBhcyBlOgpkaWZm IC0tZ2l0IGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJh c2VzL3NjaGVtYXMvdGFibGVzL3J1bGVzL3N0YXRpYy9pbWcvcnVsZS1iYWQuc3ZnIGIvd2ViL3Bn YWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdGFi bGVzL3J1bGVzL3N0YXRpYy9pbWcvcnVsZS1iYWQuc3ZnCm5ldyBmaWxlIG1vZGUgMTAwNjQ0Cmlu ZGV4IDAwMDAwMDAwMC4uYTFiNGFlZjg3Ci0tLSAvZGV2L251bGwKKysrIGIvd2ViL3BnYWRtaW4v YnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdGFibGVzL3J1 bGVzL3N0YXRpYy9pbWcvcnVsZS1iYWQuc3ZnCkBAIC0wLDAgKzEsMjIgQEAKKzw/eG1sIHZlcnNp b249IjEuMCIgZW5jb2Rpbmc9InV0Zi04Ij8+Cis8IS0tIEdlbmVyYXRvcjogQWRvYmUgSWxsdXN0 cmF0b3IgMjUuNC4xLCBTVkcgRXhwb3J0IFBsdWctSW4gLiBTVkcgVmVyc2lvbjogNi4wMCBCdWls ZCAwKSAgLS0+Cis8c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkxheWVyXzEiIHhtbG5zPSJodHRwOi8v d3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkv eGxpbmsiIHg9IjBweCIgeT0iMHB4IgorCSB2aWV3Qm94PSIwIDAgMTYgMTYiIHN0eWxlPSJlbmFi bGUtYmFja2dyb3VuZDpuZXcgMCAwIDE2IDE2OyIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+Cis8c3R5 bGUgdHlwZT0idGV4dC9jc3MiPgorCS5zdDB7ZmlsbDojRkVFMDdCO3N0cm9rZTojRERBOTFEO3N0 cm9rZS13aWR0aDowLjc1O3N0cm9rZS1saW5lY2FwOnJvdW5kO3N0cm9rZS1saW5lam9pbjpyb3Vu ZDt9CisJLnN0MXtmaWxsOm5vbmU7c3Ryb2tlOiNEREE5MUQ7c3Ryb2tlLXdpZHRoOjAuNzU7c3Ry b2tlLWxpbmVjYXA6cm91bmQ7c3Ryb2tlLWxpbmVqb2luOnJvdW5kO30KKwkuc3Qye2ZpbGw6I0Qw MDIxQjt9Cis8L3N0eWxlPgorPGc+CisJPGcgaWQ9Il84Ij4KKwkJPHJlY3QgeD0iMi40IiB5PSI1 IiBjbGFzcz0ic3QwIiB3aWR0aD0iMTEuMSIgaGVpZ2h0PSI2Ii8+CisJCTxsaW5lIGNsYXNzPSJz dDEiIHgxPSIxMC45IiB5MT0iNS40IiB4Mj0iMTAuOSIgeTI9IjguOSIvPgorCQk8bGluZSBjbGFz cz0ic3QxIiB4MT0iNi45IiB5MT0iNS40IiB4Mj0iNi45IiB5Mj0iOC45Ii8+CisJCTxsaW5lIGNs YXNzPSJzdDEiIHgxPSI4LjkiIHkxPSI1LjQiIHgyPSI4LjkiIHkyPSI3LjkiLz4KKwkJPGxpbmUg Y2xhc3M9InN0MSIgeDE9IjQuOSIgeTE9IjUuNCIgeDI9IjQuOSIgeTI9IjcuOSIvPgorCTwvZz4K Kwk8cGF0aCBjbGFzcz0ic3QyIiBkPSJNMTQsNS4xbDEtMWMwLjMtMC4zLDAuMy0wLjgsMC0xLjFz LTAuOC0wLjMtMS4xLDBsLTEsMWwtMS0xYy0wLjMtMC4zLTAuOC0wLjMtMS4xLDBzLTAuMywwLjgs MCwxLjFsMSwxbC0xLDEKKwkJYy0wLjMsMC4zLTAuMywwLjgsMCwxLjFjMC4xLDAuMSwwLjMsMC4y LDAuNSwwLjJzMC42LTAuMSwwLjctMC4zbDEtMWwxLDFjMC4xLDAuMSwwLjMsMC4yLDAuNSwwLjJz MC40LDAsMC41LTAuMgorCQljMC4zLTAuMywwLjMtMC44LDAtMS4xTDE0LDUuMXoiLz4KKzwvZz4K Kzwvc3ZnPgpkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3Nl cnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdGFibGVzL3J1bGVzL3N0YXRpYy9qcy9ydWxlLmpzIGIv d2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVt YXMvdGFibGVzL3J1bGVzL3N0YXRpYy9qcy9ydWxlLmpzCmluZGV4IDQ4ZjA1NWI0MS4uZGIyOWZl ZGJmIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVy cy9kYXRhYmFzZXMvc2NoZW1hcy90YWJsZXMvcnVsZXMvc3RhdGljL2pzL3J1bGUuanMKKysrIGIv d2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVt YXMvdGFibGVzL3J1bGVzL3N0YXRpYy9qcy9ydWxlLmpzCkBAIC0xMiw4ICsxMiw4IEBAIGltcG9y dCBSdWxlU2NoZW1hIGZyb20gJy4vcnVsZS51aSc7CiBkZWZpbmUoJ3BnYWRtaW4ubm9kZS5ydWxl JywgWwogICAnc291cmNlcy9nZXR0ZXh0JywgJ3NvdXJjZXMvdXJsX2ZvcicsICdqcXVlcnknLCAn dW5kZXJzY29yZScsCiAgICdzb3VyY2VzL3BnYWRtaW4nLCAncGdhZG1pbi5icm93c2VyJywgJ3Bn YWRtaW4uYmFja2Zvcm0nLAotICAncGdhZG1pbi5ub2RlLnNjaGVtYS5kaXIvc2NoZW1hX2NoaWxk X3RyZWVfbm9kZScsCi1dLCBmdW5jdGlvbihnZXR0ZXh0LCB1cmxfZm9yLCAkLCBfLCBwZ0FkbWlu LCBwZ0Jyb3dzZXIsIEJhY2tmb3JtLCBTY2hlbWFDaGlsZFRyZWVOb2RlKSB7CisgICdwZ2FkbWlu Lm5vZGUuc2NoZW1hLmRpci9zY2hlbWFfY2hpbGRfdHJlZV9ub2RlJywgJ3BnYWRtaW4uYWxlcnRp ZnlqcycsCitdLCBmdW5jdGlvbihnZXR0ZXh0LCB1cmxfZm9yLCAkLCBfLCBwZ0FkbWluLCBwZ0Jy b3dzZXIsIEJhY2tmb3JtLCBTY2hlbWFDaGlsZFRyZWVOb2RlLCBhbGVydGlmeSkgewogCiAgIC8q KgogICAgIENyZWF0ZSBhbmQgYWRkIGEgcnVsZSBjb2xsZWN0aW9uIGludG8gbm9kZXMKQEAgLTEx Miw4ICsxMTIsOTMgQEAgZGVmaW5lKCdwZ2FkbWluLm5vZGUucnVsZScsIFsKICAgICAgICAgICBp Y29uOiAnd2NUYWJJY29uIGljb24tcnVsZScsIGRhdGE6IHthY3Rpb246ICdjcmVhdGUnLCBjaGVj azogdHJ1ZX0sCiAgICAgICAgICAgZW5hYmxlOiAnY2FuQ3JlYXRlJywKICAgICAgICAgfSwKKyAg ICAgICAgeworICAgICAgICAgIG5hbWU6ICdlbmFibGVfcnVsZScsIG5vZGU6ICdydWxlJywgbW9k dWxlOiB0aGlzLAorICAgICAgICAgIGFwcGxpZXM6IFsnb2JqZWN0JywgJ2NvbnRleHQnXSwgY2Fs bGJhY2s6ICdlbmFibGVfcnVsZScsCisgICAgICAgICAgY2F0ZWdvcnk6ICdjb25uZWN0JywgcHJp b3JpdHk6IDMsIGxhYmVsOiBnZXR0ZXh0KCdFbmFibGUgcnVsZScpLAorICAgICAgICAgIGljb246 ICdmYSBmYS1jaGVjaycsIGVuYWJsZTogJ2NhbkNyZWF0ZV93aXRoX3J1bGVfZW5hYmxlJywKKyAg ICAgICAgfSx7CisgICAgICAgICAgbmFtZTogJ2Rpc2FibGVfcnVsZScsIG5vZGU6ICdydWxlJywg bW9kdWxlOiB0aGlzLAorICAgICAgICAgIGFwcGxpZXM6IFsnb2JqZWN0JywgJ2NvbnRleHQnXSwg Y2FsbGJhY2s6ICdkaXNhYmxlX3J1bGUnLAorICAgICAgICAgIGNhdGVnb3J5OiAnZHJvcCcsIHBy aW9yaXR5OiAzLCBsYWJlbDogZ2V0dGV4dCgnRGlzYWJsZSBydWxlJyksCisgICAgICAgICAgaWNv bjogJ2ZhIGZhLXRpbWVzJywgZW5hYmxlOiAnY2FuQ3JlYXRlX3dpdGhfcnVsZV9kaXNhYmxlJwor ICAgICAgICB9CiAgICAgICAgIF0pOwogICAgICAgfSwKKyAgICAgIGNhbGxiYWNrczogeworICAg ICAgICAvKiBFbmFibGUgcnVsZSAqLworICAgICAgICBlbmFibGVfcnVsZTogZnVuY3Rpb24oYXJn cykgeworICAgICAgICAgIHZhciBpbnB1dCA9IGFyZ3MgfHwge30sCisgICAgICAgICAgICBvYmog PSB0aGlzLAorICAgICAgICAgICAgdCA9IHBnQnJvd3Nlci50cmVlLAorICAgICAgICAgICAgaSA9 IGlucHV0Lml0ZW0gfHwgdC5zZWxlY3RlZCgpLAorICAgICAgICAgICAgZCA9IGkgID8gdC5pdGVt RGF0YShpKSA6IHVuZGVmaW5lZDsKKworICAgICAgICAgIGlmICghZCkKKyAgICAgICAgICAgIHJl dHVybiBmYWxzZTsKKworICAgICAgICAgIHZhciBkYXRhID0gZDsKKyAgICAgICAgICAkLmFqYXgo eworICAgICAgICAgICAgdXJsOiBvYmouZ2VuZXJhdGVfdXJsKGksICdvYmonICwgZCwgdHJ1ZSks CisgICAgICAgICAgICB0eXBlOidQVVQnLAorICAgICAgICAgICAgZGF0YTogeydlbmFibGVkJyA6 ICd0cnVlJ30sCisgICAgICAgICAgICBkYXRhVHlwZTogJ2pzb24nLAorICAgICAgICAgIH0pCisg ICAgICAgICAgICAuZG9uZShmdW5jdGlvbigpIHsKKyAgICAgICAgICAgICAgYWxlcnRpZnkuc3Vj Y2VzcygnUnVsZSB1cGRhdGVkLicpOworICAgICAgICAgICAgICB0LnJlbW92ZUljb24oaSk7Cisg ICAgICAgICAgICAgIGRhdGEuaWNvbiA9ICdpY29uLXJ1bGUnOworICAgICAgICAgICAgICB0LmFk ZEljb24oaSwge2ljb246IGRhdGEuaWNvbn0pOworICAgICAgICAgICAgICB0LnVubG9hZChpKTsK KyAgICAgICAgICAgICAgdC5zZXRJbm9kZShmYWxzZSk7CisgICAgICAgICAgICAgIHQuZGVzZWxl Y3QoaSk7CisgICAgICAgICAgICAgIC8vIEZldGNoIHVwZGF0ZWQgZGF0YSBmcm9tIHNlcnZlcgor ICAgICAgICAgICAgICBzZXRUaW1lb3V0KGZ1bmN0aW9uKCkgeworICAgICAgICAgICAgICAgIHQu c2VsZWN0KGkpOworICAgICAgICAgICAgICB9LCAxMCk7CisgICAgICAgICAgICB9KQorICAgICAg ICAgICAgLmZhaWwoZnVuY3Rpb24oeGhyLCBzdGF0dXMsIGVycm9yKSB7CisgICAgICAgICAgICAg IGFsZXJ0aWZ5LnBnUmVzcEVycm9yTm90aWZ5KHhociwgZXJyb3IpOworICAgICAgICAgICAgICB0 LnVubG9hZChpKTsKKyAgICAgICAgICAgIH0pOworICAgICAgICB9LAorICAgICAgICAvKiBEaXNh YmxlIHJ1bGUgKi8KKyAgICAgICAgZGlzYWJsZV9ydWxlOiBmdW5jdGlvbihhcmdzKSB7CisgICAg ICAgICAgdmFyIGlucHV0ID0gYXJncyB8fCB7fSwKKyAgICAgICAgICAgIG9iaiA9IHRoaXMsCisg ICAgICAgICAgICB0ID0gcGdCcm93c2VyLnRyZWUsCisgICAgICAgICAgICBpID0gaW5wdXQuaXRl bSB8fCB0LnNlbGVjdGVkKCksCisgICAgICAgICAgICBkID0gaSAgPyB0Lml0ZW1EYXRhKGkpIDog dW5kZWZpbmVkOworCisgICAgICAgICAgaWYgKCFkKQorICAgICAgICAgICAgcmV0dXJuIGZhbHNl OworCisgICAgICAgICAgdmFyIGRhdGEgPSBkOworICAgICAgICAgICQuYWpheCh7CisgICAgICAg ICAgICB1cmw6IG9iai5nZW5lcmF0ZV91cmwoaSwgJ29iaicgLCBkLCB0cnVlKSwKKyAgICAgICAg ICAgIHR5cGU6J1BVVCcsCisgICAgICAgICAgICBkYXRhOiB7J2VuYWJsZWQnIDogJ2ZhbHNlJ30s CisgICAgICAgICAgICBkYXRhVHlwZTogJ2pzb24nLAorICAgICAgICAgIH0pCisgICAgICAgICAg ICAuZG9uZShmdW5jdGlvbigpIHsKKyAgICAgICAgICAgICAgYWxlcnRpZnkuc3VjY2VzcygnUnVs ZSB1cGRhdGVkJyk7CisgICAgICAgICAgICAgIHQucmVtb3ZlSWNvbihpKTsKKyAgICAgICAgICAg ICAgZGF0YS5pY29uID0gJ2ljb24tcnVsZS1iYWQnOworICAgICAgICAgICAgICB0LmFkZEljb24o aSwge2ljb246IGRhdGEuaWNvbn0pOworICAgICAgICAgICAgICB0LnVubG9hZChpKTsKKyAgICAg ICAgICAgICAgdC5zZXRJbm9kZShmYWxzZSk7CisgICAgICAgICAgICAgIHQuZGVzZWxlY3QoaSk7 CisgICAgICAgICAgICAgIC8vIEZldGNoIHVwZGF0ZWQgZGF0YSBmcm9tIHNlcnZlcgorICAgICAg ICAgICAgICBzZXRUaW1lb3V0KGZ1bmN0aW9uKCkgeworICAgICAgICAgICAgICAgIHQuc2VsZWN0 KGkpOworICAgICAgICAgICAgICB9LCAxMCk7CisgICAgICAgICAgICB9KQorICAgICAgICAgICAg LmZhaWwoZnVuY3Rpb24oeGhyLCBzdGF0dXMsIGVycm9yKSB7CisgICAgICAgICAgICAgIGFsZXJ0 aWZ5LnBnUmVzcEVycm9yTm90aWZ5KHhociwgZXJyb3IsIGdldHRleHQoJ0Rpc2FibGUgcnVsZSBm YWlsZWQnKSk7CisgICAgICAgICAgICAgIHQudW5sb2FkKGkpOworICAgICAgICAgICAgfSk7Cisg ICAgICAgIH0sCisgICAgICB9LAogICAgICAgZ2V0U2NoZW1hOiBmdW5jdGlvbih0cmVlTm9kZUlu Zm8sIGl0ZW1Ob2RlRGF0YSkgewogICAgICAgICByZXR1cm4gbmV3IFJ1bGVTY2hlbWEoCiAgICAg ICAgICAgewpAQCAtMjE2LDYgKzMwMSwyNiBAQCBkZWZpbmUoJ3BnYWRtaW4ubm9kZS5ydWxlJywg WwogCiAgICAgICB9LAogCisgICAgICBjYW5DcmVhdGVfd2l0aF9ydWxlX2VuYWJsZTogZnVuY3Rp b24oaXRlbURhdGEsIGl0ZW0sIGRhdGEpIHsKKyAgICAgICAgdmFyIHRyZWVEYXRhID0gcGdCcm93 c2VyLnRyZWUuZ2V0VHJlZU5vZGVIaWVyYXJjaHkoaXRlbSk7CisgICAgICAgIGlmICgndmlldycg aW4gdHJlZURhdGEpIHsKKyAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIH0KKworICAg ICAgICByZXR1cm4gaXRlbURhdGEuaWNvbiA9PT0gJ2ljb24tcnVsZS1iYWQnICYmCisgICAgICAg ICAgdGhpcy5jYW5DcmVhdGUuYXBwbHkodGhpcyxbaXRlbURhdGEsIGl0ZW0sIGRhdGFdKTsKKyAg ICAgIH0sCisgICAgICAvLyBDaGVjayB0byB3aGV0aGVyIHJ1bGUgaXMgZW5hYmxlID8KKyAgICAg IGNhbkNyZWF0ZV93aXRoX3J1bGVfZGlzYWJsZTogZnVuY3Rpb24oaXRlbURhdGEsIGl0ZW0sIGRh dGEpIHsKKyAgICAgICAgdmFyIHRyZWVEYXRhID0gcGdCcm93c2VyLnRyZWUuZ2V0VHJlZU5vZGVI aWVyYXJjaHkoaXRlbSk7CisgICAgICAgIGlmICgndmlldycgaW4gdHJlZURhdGEpIHsKKyAgICAg ICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIH0KKworICAgICAgICByZXR1cm4gaXRlbURhdGEu aWNvbiA9PT0gJ2ljb24tcnVsZScgJiYKKyAgICAgICAgICB0aGlzLmNhbkNyZWF0ZS5hcHBseShp dGVtRGF0YSwgaXRlbSwgZGF0YSk7CisgICAgICB9LAorCiAgICAgfSk7CiAgIH0KIApkaWZmIC0t Z2l0IGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2Vz L3NjaGVtYXMvdGFibGVzL3J1bGVzL3N0YXRpYy9qcy9ydWxlLnVpLmpzIGIvd2ViL3BnYWRtaW4v YnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdGFibGVzL3J1 bGVzL3N0YXRpYy9qcy9ydWxlLnVpLmpzCmluZGV4IDc3N2RlOGIxNy4uODBhMzM3NzhmIDEwMDY0 NAotLS0gYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFz ZXMvc2NoZW1hcy90YWJsZXMvcnVsZXMvc3RhdGljL2pzL3J1bGUudWkuanMKKysrIGIvd2ViL3Bn YWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdGFi bGVzL3J1bGVzL3N0YXRpYy9qcy9ydWxlLnVpLmpzCkBAIC02Niw2ICs2NiwxMSBAQCBleHBvcnQg ZGVmYXVsdCBjbGFzcyBSdWxlU2NoZW1hIGV4dGVuZHMgQmFzZVVJU2NoZW1hIHsKICAgICAgICAg ICBzdGF0ZS52aWV3ID0gb2JqLmZpZWxkT3B0aW9ucy5ub2RlRGF0YS5sYWJlbDsKICAgICAgICAg fSwKICAgICAgIH0sCisgICAgICB7CisgICAgICAgIGlkOiAnZW5hYmxlZCcsIGxhYmVsOiBnZXR0 ZXh0KCdFbmFibGVkPycpLAorICAgICAgICB0eXBlOiAnc3dpdGNoJywgbW9kZTogWydwcm9wZXJ0 aWVzJywgJ2VkaXQnXSwgCisgICAgICAgIGdyb3VwOiBnZXR0ZXh0KCdEZWZpbml0aW9uJyksCisg ICAgICB9LAogICAgICAgewogICAgICAgICBpZDogJ2V2ZW50JywgbGFiZWw6IGdldHRleHQoJ0V2 ZW50JyksIGNvbnRyb2w6ICdzZWxlY3QyJywKICAgICAgICAgZ3JvdXA6IGdldHRleHQoJ0RlZmlu aXRpb24nKSwgdHlwZTogJ3NlbGVjdCcsCkBAIC05NCwxMCArOTksNiBAQCBleHBvcnQgZGVmYXVs dCBjbGFzcyBSdWxlU2NoZW1hIGV4dGVuZHMgQmFzZVVJU2NoZW1hIHsKICAgICAgICAgaWQ6ICdz eXN0ZW1fcnVsZScsIGxhYmVsOiBnZXR0ZXh0KCdTeXN0ZW0gcnVsZT8nKSwKICAgICAgICAgdHlw ZTogJ3N3aXRjaCcsIG1vZGU6IFsncHJvcGVydGllcyddLAogICAgICAgfSwKLSAgICAgIHsKLSAg ICAgICAgaWQ6ICdlbmFibGVkJywgbGFiZWw6IGdldHRleHQoJ0VuYWJsZWQ/JyksCi0gICAgICAg IHR5cGU6ICdzd2l0Y2gnLCBtb2RlOiBbJ3Byb3BlcnRpZXMnXSwKLSAgICAgIH0sCiAgICAgICB7 CiAgICAgICAgIGlkOiAnY29tbWVudCcsIGxhYmVsOiBnZXR0ZXh0KCdDb21tZW50JyksIGNlbGw6 ICd0ZXh0JywgdHlwZTogJ211bHRpbGluZScsCiAgICAgICB9LApkaWZmIC0tZ2l0IGEvd2ViL3Bn YWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdGFi bGVzL3J1bGVzL3RlbXBsYXRlcy9ydWxlcy9jc3MvcnVsZS5jc3MgYi93ZWIvcGdhZG1pbi9icm93 c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy90YWJsZXMvcnVsZXMv dGVtcGxhdGVzL3J1bGVzL2Nzcy9ydWxlLmNzcwppbmRleCAwZDczMzljZjguLjYzZjRlY2JjZSAx MDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0 YWJhc2VzL3NjaGVtYXMvdGFibGVzL3J1bGVzL3RlbXBsYXRlcy9ydWxlcy9jc3MvcnVsZS5jc3MK KysrIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2Vz L3NjaGVtYXMvdGFibGVzL3J1bGVzL3RlbXBsYXRlcy9ydWxlcy9jc3MvcnVsZS5jc3MKQEAgLTcs MyArNywxNCBAQAogICB2ZXJ0aWNhbC1hbGlnbjogbWlkZGxlOwogICBoZWlnaHQ6IDEuM2VtOwog fQorCisKKy5pY29uLXJ1bGUtYmFkeworICBiYWNrZ3JvdW5kLWltYWdlOiB1cmwoJ3t7IHVybF9m b3IoJ05PREUtcnVsZS5zdGF0aWMnLCBmaWxlbmFtZT0naW1nL3J1bGUtYmFkLnN2ZycpIH19Jykg IWltcG9ydGFudDsKKyAgYm9yZGVyLXJhZGl1czogMTBweDsKKyAgYmFja2dyb3VuZC1zaXplOiAy MHB4ICFpbXBvcnRhbnQ7CisgIGJhY2tncm91bmQtcmVwZWF0OiBuby1yZXBlYXQ7CisgIGFsaWdu LWNvbnRlbnQ6IGNlbnRlcjsKKyAgdmVydGljYWwtYWxpZ246IG1pZGRsZTsKKyAgaGVpZ2h0OiAx LjNlbTsKK30KZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9z ZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3RhYmxlcy90ZW1wbGF0ZXMvcnVsZXMvc3FsL25vZGVz LnNxbCBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNl cy9zY2hlbWFzL3RhYmxlcy90ZW1wbGF0ZXMvcnVsZXMvc3FsL25vZGVzLnNxbAppbmRleCA2N2Rk YWUwMDIuLjIwMTkxOTdhMSAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJf Z3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdGFibGVzL3RlbXBsYXRlcy9ydWxlcy9z cWwvbm9kZXMuc3FsCisrKyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2 ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3RhYmxlcy90ZW1wbGF0ZXMvcnVsZXMvc3FsL25vZGVzLnNx bApAQCAtMSw2ICsxLDcgQEAKIFNFTEVDVAogICAgIHJ3Lm9pZCBBUyBvaWQsCi0gICAgcncucnVs ZW5hbWUgQVMgbmFtZQorICAgIHJ3LnJ1bGVuYW1lIEFTIG5hbWUsCisgICAgQ0FTRSBXSEVOIHJ3 LmV2X2VuYWJsZWQgIT0gJ0QnIFRIRU4gVHJ1ZSBFTFNFIEZhbHNlIEVORCBBUyBlbmFibGVkCiBG Uk9NCiAgICAgcGdfY2F0YWxvZy5wZ19yZXdyaXRlIHJ3CiBXSEVSRQpkaWZmIC0tZ2l0IGEvd2Vi L3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMv dGFibGVzL3RlbXBsYXRlcy9ydWxlcy9zcWwvdXBkYXRlLnNxbCBiL3dlYi9wZ2FkbWluL2Jyb3dz ZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3RhYmxlcy90ZW1wbGF0 ZXMvcnVsZXMvc3FsL3VwZGF0ZS5zcWwKaW5kZXggZTAzM2FmN2I4Li44MWM5NjFkOGYgMTAwNjQ0 Ci0tLSBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNl cy9zY2hlbWFzL3RhYmxlcy90ZW1wbGF0ZXMvcnVsZXMvc3FsL3VwZGF0ZS5zcWwKKysrIGIvd2Vi L3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMv dGFibGVzL3RlbXBsYXRlcy9ydWxlcy9zcWwvdXBkYXRlLnNxbApAQCAtMzUsMyArMzUsNyBAQCBD UkVBVEUgT1IgUkVQTEFDRSBSVUxFIHt7IGNvbm58cXRJZGVudChydWxlX25hbWUpIH19IEFTCiB7 JSBzZXQgb2xkX2NvbW1lbnQgPSBvX2RhdGEuY29tbWVudHxkZWZhdWx0KCcnLCB0cnVlKSAlfQog eyUgaWYgKGRhdGEuY29tbWVudCBpcyBkZWZpbmVkIGFuZCAoZGF0YS5jb21tZW50ICE9IG9sZF9j b21tZW50KSkgJX0KIENPTU1FTlQgT04gUlVMRSB7eyBjb25ufHF0SWRlbnQocnVsZV9uYW1lKSB9 fSBPTiB7eyBjb25ufHF0SWRlbnQob19kYXRhLnNjaGVtYSwgb19kYXRhLnZpZXcpIH19IElTIHt7 IGRhdGEuY29tbWVudHxxdExpdGVyYWwgfX07eyUgZW5kaWYgJX0KKworeyUgaWYgZGF0YS5lbmFi bGVkIGlzIGRlZmluZWQgYW5kIG9fZGF0YS5lbmFibGVkICE9IGRhdGEuZW5hYmxlZCAlfQorQUxU RVIgVEFCTEUge3sgY29ubnxxdElkZW50KG9fZGF0YS5zY2hlbWEsIG9fZGF0YS52aWV3KSB9fSB7 JSBpZiAoZGF0YS5lbmFibGVkIGluICBbJ2ZhbHNlJywgRmFsc2VdKSAlfURJU0FCTEV7JSBlbmRp ZiAlfXslIGlmIChkYXRhLmVuYWJsZWQgaW4gWyd0cnVlJywgVHJ1ZV0pICV9RU5BQkxFeyUgZW5k aWYgJX0gUlVMRSB7eyBjb25ufHF0SWRlbnQob19kYXRhLm5hbWUpIH19OworeyUgZW5kaWYgJX0K --00000000000052a9a905ce143f6d--