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 1kp6Ry-0001wK-IG for pgadmin-hackers@arkaria.postgresql.org; Tue, 15 Dec 2020 09:16: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 1kp6Rx-0006AJ-GM for pgadmin-hackers@arkaria.postgresql.org; Tue, 15 Dec 2020 09:16:53 +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 1kp6Rx-0006AC-7k for pgadmin-hackers@lists.postgresql.org; Tue, 15 Dec 2020 09:16:53 +0000 Received: from mail-qk1-x72c.google.com ([2607:f8b0:4864:20::72c]) by magus.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1kp6Rv-0007Pc-9Q for pgadmin-hackers@postgresql.org; Tue, 15 Dec 2020 09:16:52 +0000 Received: by mail-qk1-x72c.google.com with SMTP id n142so18376422qkn.2 for ; Tue, 15 Dec 2020 01:16:50 -0800 (PST) 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=4vVCREk4AMjC0ftMLkfx3aGrUj1Cg6lWJ7FpXivYA5M=; b=ZNmLe7Ep5DFLLSf6SkiWhienVlDI7OuxVprNMo2sie0Xxp0CJR+fpxmsIch1RWn5ma dx6t8zHOxYizLTzNyNKNrNLVU3EP8YD+7ktbW9YIWtUtIbTb0qWjeckYH0298LqaOLpw 8L+y5Ja6n2CMklAxvjhJtJoVdiMzseU2Uy9fGKd8ddjJCcRrjaianaH7+x4GxG/7EsJg TBU2T8BRm9G2ukdalUNnN3MIcLq4CP69bLrj2HG9jmNoTcznL88C13BANIbcpfiu1Ep8 Xu6JgBhMRmPIxl0KjJYBNzCwdl73inYep18UYm0dlOpHw0E+NOsKJHl1ANLu1NCzB0nx 33Hg== 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=4vVCREk4AMjC0ftMLkfx3aGrUj1Cg6lWJ7FpXivYA5M=; b=sZPeReceZ45lRj2Q7c2eCtVap0se5e+h2Xp+d2JyIwMvsu6s+q8ECb4ZLXXAf2WcY4 +9NEOdYdMwz8AWhQCzyAOL/jukUf39apRUMsAcSVH63uvleUHxYKd744/qiG8aeP/hzA JhEDMILdt1f/nSACipGXYCUaXszK+CeJwBJjsXsbYLQdP5Tz8wMp9r+ZWT/eYoweGGb0 xZd8VN/SWza9LBtTyH5DR8l5jGQKCs1C8Lu0VLlZyenQyXC1OpTu/xJlfPjZe1F1KMqp lAhUTAlC+HEiWSlGP5KGX01SSTkfqg1ZWkw/y/dKfZ6O1J9i9Vdsqga8abZQsfmzODJc HOWA== X-Gm-Message-State: AOAM530wXC0/uyIbvFkAxFTXvC/a3xMSohLHibW20muzs/e/fvHmAD8W U5kd8iRw8zJBxLo/dpFsSh/iJJGSRaRHCdDLNgCrhsQb5eqpNjcmFSHOMUNJoNGmsKSzRQHvRZ/ ZOu6qxjJlerkEhujSNJq8Y4IYmnq1Q7VnBbgL2QI5gozxUNqnSwbrOsw18grXClPY/9apOGydxv Cf6GYbCNoFbmbm+HMWodK/K1FN3Wsz2Gno/dxNsWHKxMRFYeNhqMFLQnyedGPAVYV0KbK2cH4= X-Google-Smtp-Source: ABdhPJyBg8FFOxFHnMV9tMHaDQm6VZ8m5jY7I4/BHvI9uKWolewEFSz7K6K8qCaD9TavTJfROBWxDswU3tKyiyRM/48= X-Received: by 2002:a37:4796:: with SMTP id u144mr36520442qka.235.1608023808690; Tue, 15 Dec 2020 01:16:48 -0800 (PST) MIME-Version: 1.0 From: Rahul Shirsat Date: Tue, 15 Dec 2020 14:46:12 +0530 Message-ID: Subject: [pgAdmin] RM5875 template1 is shown after you use pg_upgrade To: pgadmin-hackers Content-Type: multipart/mixed; boundary="000000000000e88b6105b67d3711" 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: Precedence: bulk --000000000000e88b6105b67d3711 Content-Type: multipart/alternative; boundary="000000000000e88b5f05b67d370f" --000000000000e88b5f05b67d370f Content-Type: text/plain; charset="UTF-8" Hi Hackers, Please find the attached patch below which resolves the issue of showing template1 after pg_upgrade. Testing of the patch has been done on : 1. Windows Server 2016 (PostgreSQL 12.5, compiled by Visual C++ build 1914, 64-bit & PostgreSQL 13.1, compiled by Visual C++ build 1914, 64-bit) 2. MacOSX -- *Rahul Shirsat* Senior Software Engineer | EnterpriseDB Corporation. --000000000000e88b5f05b67d370f Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi Hackers,

Please find the attached pa= tch below which resolves the issue of showing template1 after pg_upgrade.

Testing of the patch has been done on :
<= ol>
  • Windows Server 2016 (PostgreSQL 12.5, compiled by Visual C++ build 1= 914, 64-bit & PostgreSQL 13.1, compiled by Visual C++ build 1914, 64-bi= t)
  • MacOSX

    • --
    <= div dir=3D"ltr">
    Rahul Shirsat
    Senior Software Engineer=C2=A0|=C2=A0Enterpri= seDB=C2=A0Corporation.
    --000000000000e88b5f05b67d370f-- --000000000000e88b6105b67d3711 Content-Type: application/octet-stream; name="RM5875.patch" Content-Disposition: attachment; filename="RM5875.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_kiprslcr0 ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2Rh dGFiYXNlcy9fX2luaXRfXy5weSBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9z ZXJ2ZXJzL2RhdGFiYXNlcy9fX2luaXRfXy5weQppbmRleCBlN2E2OTE0OWEuLmVhNDc1NGFiMyAx MDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0 YWJhc2VzL19faW5pdF9fLnB5CisrKyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vw cy9zZXJ2ZXJzL2RhdGFiYXNlcy9fX2luaXRfXy5weQpAQCAtMTgyLDYgKzE4Miw3IEBAIGNsYXNz IERhdGFiYXNlVmlldyhQR0NoaWxkTm9kZVZpZXcpOgogICAgICAgICAgICAgICAgICAgICByZXR1 cm4gZ29uZShlcnJvcm1zZz1fKCJDb3VsZCBub3QgZmluZCB0aGUgc2VydmVyLiIpKQogCiAgICAg ICAgICAgICAgICAgc2VsZi5kYXRsYXN0c3lzb2lkID0gMAorICAgICAgICAgICAgICAgIHNlbGYu ZGF0aXN0ZW1wbGF0ZSA9IEZhbHNlCiAgICAgICAgICAgICAgICAgaWYgYWN0aW9uIGFuZCBhY3Rp b24gaW4gWyJkcm9wIl06CiAgICAgICAgICAgICAgICAgICAgIHNlbGYuY29ubiA9IHNlbGYubWFu YWdlci5jb25uZWN0aW9uKCkKICAgICAgICAgICAgICAgICBlbGlmICdkaWQnIGluIGt3YXJnczoK QEAgLTE5NSw2ICsxOTYsMTEgQEAgY2xhc3MgRGF0YWJhc2VWaWV3KFBHQ2hpbGROb2RlVmlldyk6 CiAgICAgICAgICAgICAgICAgICAgICAgICBpZiBzZWxmLl9kYlsnZGF0YWxsb3djb25uJ10gaXMg RmFsc2U6CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc2VsZi5jb25uID0gc2VsZi5tYW5h Z2VyLmNvbm5lY3Rpb24oKQogICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNlbGYuZGJfYWxs b3dfY29ubmVjdGlvbiA9IEZhbHNlCisKKyAgICAgICAgICAgICAgICAgICAgICAgIHNlbGYuZGF0 aXN0ZW1wbGF0ZSA9IFwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBzZWxmLm1hbmFnZXIu ZGJfaW5mb1trd2FyZ3NbJ2RpZCddXVsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg J2RhdGlzdGVtcGxhdGUnXSBpZiAnZGF0aXN0ZW1wbGF0ZScgaW4gXAorICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHNlbGYubWFuYWdlci5kYl9pbmZvW2t3YXJnc1snZGlkJ11dIGVsc2UgRmFs c2UKICAgICAgICAgICAgICAgICBlbHNlOgogICAgICAgICAgICAgICAgICAgICBzZWxmLmNvbm4g PSBzZWxmLm1hbmFnZXIuY29ubmVjdGlvbigpCiAKQEAgLTIyNSw3ICsyMzEsOCBAQCBjbGFzcyBE YXRhYmFzZVZpZXcoUEdDaGlsZE5vZGVWaWV3KToKICAgICAgICAgICAgICIvIi5qb2luKFtzZWxm LnRlbXBsYXRlX3BhdGgsIHNlbGYuX1BST1BFUlRJRVNfU1FMXSksCiAgICAgICAgICAgICBjb25u PXNlbGYuY29ubiwKICAgICAgICAgICAgIGxhc3Rfc3lzdGVtX29pZD1sYXN0X3N5c3RlbV9vaWQs Ci0gICAgICAgICAgICBkYl9yZXN0cmljdGlvbnM9ZGJfZGlzcF9yZXMKKyAgICAgICAgICAgIGRi X3Jlc3RyaWN0aW9ucz1kYl9kaXNwX3JlcywKKyAgICAgICAgICAgIHNob3dfc3lzdGVtX29iamVj dHM9c2VsZi5ibHVlcHJpbnQuc2hvd19zeXN0ZW1fb2JqZWN0cywKICAgICAgICAgKQogICAgICAg ICBzdGF0dXMsIHJlcyA9IHNlbGYuY29ubi5leGVjdXRlX2RpY3QoU1FMLCBwYXJhbXMpCiAKQEAg LTI3Nyw3ICsyODQsOCBAQCBjbGFzcyBEYXRhYmFzZVZpZXcoUEdDaGlsZE5vZGVWaWV3KToKICAg ICAgICAgU1FMID0gcmVuZGVyX3RlbXBsYXRlKAogICAgICAgICAgICAgIi8iLmpvaW4oW3NlbGYu dGVtcGxhdGVfcGF0aCwgc2VsZi5fTk9ERVNfU1FMXSksCiAgICAgICAgICAgICBsYXN0X3N5c3Rl bV9vaWQ9bGFzdF9zeXN0ZW1fb2lkLAotICAgICAgICAgICAgZGJfcmVzdHJpY3Rpb25zPWRiX2Rp c3BfcmVzCisgICAgICAgICAgICBkYl9yZXN0cmljdGlvbnM9ZGJfZGlzcF9yZXMsCisgICAgICAg ICAgICBzaG93X3N5c3RlbV9vYmplY3RzPXNlbGYuYmx1ZXByaW50LnNob3dfc3lzdGVtX29iamVj dHMsCiAgICAgICAgICkKICAgICAgICAgc3RhdHVzLCByc2V0ID0gc2VsZi5jb25uLmV4ZWN1dGVf ZGljdChTUUwsIHBhcmFtcykKIApAQCAtMzM1LDYgKzM0Myw3IEBAIGNsYXNzIERhdGFiYXNlVmll dyhQR0NoaWxkTm9kZVZpZXcpOgogICAgICAgICBTUUwgPSByZW5kZXJfdGVtcGxhdGUoCiAgICAg ICAgICAgICAiLyIuam9pbihbc2VsZi50ZW1wbGF0ZV9wYXRoLCBzZWxmLl9OT0RFU19TUUxdKSwK ICAgICAgICAgICAgIGxhc3Rfc3lzdGVtX29pZD0wLAorICAgICAgICAgICAgc2hvd19zeXN0ZW1f b2JqZWN0cz1zZWxmLmJsdWVwcmludC5zaG93X3N5c3RlbV9vYmplY3RzLAogICAgICAgICApCiAg ICAgICAgIHN0YXR1cywgcnNldCA9IHNlbGYuY29ubi5leGVjdXRlX2RpY3QoU1FMKQogCkBAIC0z NTMsNyArMzYyLDggQEAgY2xhc3MgRGF0YWJhc2VWaWV3KFBHQ2hpbGROb2RlVmlldyk6CiAgICAg ZGVmIG5vZGUoc2VsZiwgZ2lkLCBzaWQsIGRpZCk6CiAgICAgICAgIFNRTCA9IHJlbmRlcl90ZW1w bGF0ZSgKICAgICAgICAgICAgICIvIi5qb2luKFtzZWxmLnRlbXBsYXRlX3BhdGgsIHNlbGYuX05P REVTX1NRTF0pLAotICAgICAgICAgICAgZGlkPWRpZCwgY29ubj1zZWxmLmNvbm4sIGxhc3Rfc3lz dGVtX29pZD0wCisgICAgICAgICAgICBkaWQ9ZGlkLCBjb25uPXNlbGYuY29ubiwgbGFzdF9zeXN0 ZW1fb2lkPTAsCisgICAgICAgICAgICBzaG93X3N5c3RlbV9vYmplY3RzPXNlbGYuYmx1ZXByaW50 LnNob3dfc3lzdGVtX29iamVjdHMsCiAgICAgICAgICkKICAgICAgICAgc3RhdHVzLCByc2V0ID0g c2VsZi5jb25uLmV4ZWN1dGVfMmRhcnJheShTUUwpCiAKQEAgLTM5MSw3ICs0MDEsOCBAQCBjbGFz cyBEYXRhYmFzZVZpZXcoUEdDaGlsZE5vZGVWaWV3KToKIAogICAgICAgICBTUUwgPSByZW5kZXJf dGVtcGxhdGUoCiAgICAgICAgICAgICAiLyIuam9pbihbc2VsZi50ZW1wbGF0ZV9wYXRoLCBzZWxm Ll9QUk9QRVJUSUVTX1NRTF0pLAotICAgICAgICAgICAgZGlkPWRpZCwgY29ubj1zZWxmLmNvbm4s IGxhc3Rfc3lzdGVtX29pZD0wCisgICAgICAgICAgICBkaWQ9ZGlkLCBjb25uPXNlbGYuY29ubiwg bGFzdF9zeXN0ZW1fb2lkPTAsCisgICAgICAgICAgICBzaG93X3N5c3RlbV9vYmplY3RzPXNlbGYu Ymx1ZXByaW50LnNob3dfc3lzdGVtX29iamVjdHMsCiAgICAgICAgICkKICAgICAgICAgc3RhdHVz LCByZXMgPSBzZWxmLmNvbm4uZXhlY3V0ZV9kaWN0KFNRTCkKIApAQCAtNDI1LDcgKzQzNiw3IEBA IGNsYXNzIERhdGFiYXNlVmlldyhQR0NoaWxkTm9kZVZpZXcpOgogCiAgICAgICAgIHJlc3VsdCA9 IHJlc1sncm93cyddWzBdCiAgICAgICAgIHJlc3VsdFsnaXNfc3lzX29iaiddID0gKAotICAgICAg ICAgICAgcmVzdWx0WydvaWQnXSA8PSBzZWxmLmRhdGxhc3RzeXNvaWQpCisgICAgICAgICAgICBy ZXN1bHRbJ29pZCddIDw9IHNlbGYuZGF0bGFzdHN5c29pZCBvciBzZWxmLmRhdGlzdGVtcGxhdGUp CiAgICAgICAgICMgRmV0Y2hpbmcgdmFyaWFibGUgZm9yIGRhdGFiYXNlCiAgICAgICAgIFNRTCA9 IHJlbmRlcl90ZW1wbGF0ZSgKICAgICAgICAgICAgICIvIi5qb2luKFtzZWxmLnRlbXBsYXRlX3Bh dGgsICdnZXRfdmFyaWFibGVzLnNxbCddKSwKQEAgLTYxNyw3ICs2MjgsOCBAQCBjbGFzcyBEYXRh YmFzZVZpZXcoUEdDaGlsZE5vZGVWaWV3KToKICAgICAgICAgIyBXZSBuZWVkIG9pZCBvZiBuZXds eSBjcmVhdGVkIGRhdGFiYXNlCiAgICAgICAgIFNRTCA9IHJlbmRlcl90ZW1wbGF0ZSgKICAgICAg ICAgICAgICIvIi5qb2luKFtzZWxmLnRlbXBsYXRlX3BhdGgsIHNlbGYuX1BST1BFUlRJRVNfU1FM XSksCi0gICAgICAgICAgICBuYW1lPWRhdGFbJ25hbWUnXSwgY29ubj1zZWxmLmNvbm4sIGxhc3Rf c3lzdGVtX29pZD0wCisgICAgICAgICAgICBuYW1lPWRhdGFbJ25hbWUnXSwgY29ubj1zZWxmLmNv bm4sIGxhc3Rfc3lzdGVtX29pZD0wLAorICAgICAgICAgICAgc2hvd19zeXN0ZW1fb2JqZWN0cz1z ZWxmLmJsdWVwcmludC5zaG93X3N5c3RlbV9vYmplY3RzLAogICAgICAgICApCiAgICAgICAgIFNR TCA9IFNRTC5zdHJpcCgnXG4nKS5zdHJpcCgnICcpCiAgICAgICAgIGlmIFNRTCBhbmQgU1FMICE9 ICIiOgpAQCAtNjkzLDcgKzcwNSw4IEBAIGNsYXNzIERhdGFiYXNlVmlldyhQR0NoaWxkTm9kZVZp ZXcpOgogICAgICAgICAgICAgc3RhdHVzLCByc2V0ID0gc2VsZi5jb25uLmV4ZWN1dGVfZGljdCgK ICAgICAgICAgICAgICAgICByZW5kZXJfdGVtcGxhdGUoCiAgICAgICAgICAgICAgICAgICAgICIv Ii5qb2luKFtzZWxmLnRlbXBsYXRlX3BhdGgsIHNlbGYuX05PREVTX1NRTF0pLAotICAgICAgICAg ICAgICAgICAgICBkaWQ9ZGlkLCBjb25uPXNlbGYuY29ubiwgbGFzdF9zeXN0ZW1fb2lkPTAKKyAg ICAgICAgICAgICAgICAgICAgZGlkPWRpZCwgY29ubj1zZWxmLmNvbm4sIGxhc3Rfc3lzdGVtX29p ZD0wLAorICAgICAgICAgICAgICAgICAgICBzaG93X3N5c3RlbV9vYmplY3RzPXNlbGYuYmx1ZXBy aW50LnNob3dfc3lzdGVtX29iamVjdHMsCiAgICAgICAgICAgICAgICAgKQogICAgICAgICAgICAg KQogICAgICAgICAgICAgaWYgbm90IHN0YXR1czoKQEAgLTc5Nyw3ICs4MTAsOCBAQCBjbGFzcyBE YXRhYmFzZVZpZXcoUEdDaGlsZE5vZGVWaWV3KToKICAgICAgICAgc3RhdHVzLCByc2V0ID0gc2Vs Zi5jb25uLmV4ZWN1dGVfZGljdCgKICAgICAgICAgICAgIHJlbmRlcl90ZW1wbGF0ZSgKICAgICAg ICAgICAgICAgICAiLyIuam9pbihbc2VsZi50ZW1wbGF0ZV9wYXRoLCBzZWxmLl9OT0RFU19TUUxd KSwKLSAgICAgICAgICAgICAgICBkaWQ9ZGlkLCBjb25uPXNlbGYuY29ubiwgbGFzdF9zeXN0ZW1f b2lkPTAKKyAgICAgICAgICAgICAgICBkaWQ9ZGlkLCBjb25uPXNlbGYuY29ubiwgbGFzdF9zeXN0 ZW1fb2lkPTAsCisgICAgICAgICAgICAgICAgc2hvd19zeXN0ZW1fb2JqZWN0cz1zZWxmLmJsdWVw cmludC5zaG93X3N5c3RlbV9vYmplY3RzLAogICAgICAgICAgICAgKQogICAgICAgICApCiAgICAg ICAgIGlmIG5vdCBzdGF0dXM6CkBAIC05NjIsNyArOTc2LDggQEAgY2xhc3MgRGF0YWJhc2VWaWV3 KFBHQ2hpbGROb2RlVmlldyk6CiAgICAgICAgICAgICBzdGF0dXMsIHJzZXQgPSBjb25uLmV4ZWN1 dGVfZGljdCgKICAgICAgICAgICAgICAgICByZW5kZXJfdGVtcGxhdGUoCiAgICAgICAgICAgICAg ICAgICAgICIvIi5qb2luKFtzZWxmLnRlbXBsYXRlX3BhdGgsIHNlbGYuX05PREVTX1NRTF0pLAot ICAgICAgICAgICAgICAgICAgICBkaWQ9ZGlkLCBjb25uPWNvbm4sIGxhc3Rfc3lzdGVtX29pZD0w CisgICAgICAgICAgICAgICAgICAgIGRpZD1kaWQsIGNvbm49Y29ubiwgbGFzdF9zeXN0ZW1fb2lk PTAsCisgICAgICAgICAgICAgICAgICAgIHNob3dfc3lzdGVtX29iamVjdHM9c2VsZi5ibHVlcHJp bnQuc2hvd19zeXN0ZW1fb2JqZWN0cywKICAgICAgICAgICAgICAgICApCiAgICAgICAgICAgICAp CiAgICAgICAgICAgICBpZiBub3Qgc3RhdHVzOgpAQCAtMTEzMiw3ICsxMTQ3LDggQEAgY2xhc3Mg RGF0YWJhc2VWaWV3KFBHQ2hpbGROb2RlVmlldyk6CiAgICAgICAgIGNvbm4gPSBzZWxmLm1hbmFn ZXIuY29ubmVjdGlvbigpCiAgICAgICAgIFNRTCA9IHJlbmRlcl90ZW1wbGF0ZSgKICAgICAgICAg ICAgICIvIi5qb2luKFtzZWxmLnRlbXBsYXRlX3BhdGgsIHNlbGYuX1BST1BFUlRJRVNfU1FMXSks Ci0gICAgICAgICAgICBkaWQ9ZGlkLCBjb25uPWNvbm4sIGxhc3Rfc3lzdGVtX29pZD0wCisgICAg ICAgICAgICBkaWQ9ZGlkLCBjb25uPWNvbm4sIGxhc3Rfc3lzdGVtX29pZD0wLAorICAgICAgICAg ICAgc2hvd19zeXN0ZW1fb2JqZWN0cz1GYWxzZSwKICAgICAgICAgKQogICAgICAgICBzdGF0dXMs IHJlcyA9IGNvbm4uZXhlY3V0ZV9kaWN0KFNRTCkKIApkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4v YnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL2V2ZW50X3RyaWdnZXJzL19f aW5pdF9fLnB5IGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0 YWJhc2VzL2V2ZW50X3RyaWdnZXJzL19faW5pdF9fLnB5CmluZGV4IDA3NzEyOGNjMC4uMmZjZGUy YTdkIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVy cy9kYXRhYmFzZXMvZXZlbnRfdHJpZ2dlcnMvX19pbml0X18ucHkKKysrIGIvd2ViL3BnYWRtaW4v YnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL2V2ZW50X3RyaWdnZXJzL19f aW5pdF9fLnB5CkBAIC0yMDEsNiArMjAxLDExIEBAIGNsYXNzIEV2ZW50VHJpZ2dlclZpZXcoUEdD aGlsZE5vZGVWaWV3LCBTY2hlbWFEaWZmT2JqZWN0Q29tcGFyZSk6CiAgICAgICAgICAgICAgICAg aWYgc2VsZi5tYW5hZ2VyLmRiX2luZm8gaXMgbm90IE5vbmUgYW5kIFwKICAgICAgICAgICAgICAg ICBrd2FyZ3NbJ2RpZCddIGluIHNlbGYubWFuYWdlci5kYl9pbmZvIGVsc2UgMAogCisgICAgICAg ICAgICBzZWxmLmRhdGlzdGVtcGxhdGUgPSBcCisgICAgICAgICAgICAgICAgc2VsZi5tYW5hZ2Vy LmRiX2luZm9ba3dhcmdzWydkaWQnXV1bJ2RhdGlzdGVtcGxhdGUnXVwKKyAgICAgICAgICAgICAg ICBpZiBzZWxmLm1hbmFnZXIuZGJfaW5mbyBpcyBub3QgTm9uZSBhbmQgXAorICAgICAgICAgICAg ICAgIGt3YXJnc1snZGlkJ10gaW4gc2VsZi5tYW5hZ2VyLmRiX2luZm8gZWxzZSBGYWxzZQorCiAg ICAgICAgICAgICByZXR1cm4gZigqYXJncywgKiprd2FyZ3MpCiAKICAgICAgICAgcmV0dXJuIHdy YXAKQEAgLTM2MCw3ICszNjUsOSBAQCBjbGFzcyBFdmVudFRyaWdnZXJWaWV3KFBHQ2hpbGROb2Rl VmlldywgU2NoZW1hRGlmZk9iamVjdENvbXBhcmUpOgogICAgICAgICAgICAgICAgIGdldHRleHQo IkNvdWxkIG5vdCBmaW5kIHRoZSBldmVudCB0cmlnZ2VyIGluZm9ybWF0aW9uLiIpKQogCiAgICAg ICAgIHJlc3VsdCA9IHJlc1sncm93cyddWzBdCi0gICAgICAgIHJlc3VsdFsnaXNfc3lzX29iaidd ID0gKHJlc3VsdFsnb2lkJ10gPD0gc2VsZi5kYXRsYXN0c3lzb2lkKQorICAgICAgICByZXN1bHRb J2lzX3N5c19vYmonXSA9ICgKKyAgICAgICAgICAgIHJlc3VsdFsnb2lkJ10gPD0gc2VsZi5kYXRs YXN0c3lzb2lkIG9yCisgICAgICAgICAgICBzZWxmLmRhdGlzdGVtcGxhdGUpCiAgICAgICAgIHJl c3VsdCA9IHNlbGYuX2Zvcm1hdHRlcihyZXN1bHQpCiAKICAgICAgICAgcmV0dXJuIFRydWUsIHJl c3VsdApkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZl cnMvZGF0YWJhc2VzL2V4dGVuc2lvbnMvX19pbml0X18ucHkgYi93ZWIvcGdhZG1pbi9icm93c2Vy L3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvZXh0ZW5zaW9ucy9fX2luaXRfXy5weQpp bmRleCBlMzkxNzJkMGIuLjEyZTA3OGY0NyAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vYnJvd3Nl ci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL2V4dGVuc2lvbnMvX19pbml0X18ucHkK KysrIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2Vz L2V4dGVuc2lvbnMvX19pbml0X18ucHkKQEAgLTE0Myw2ICsxNDMsMTEgQEAgY2xhc3MgRXh0ZW5z aW9uVmlldyhQR0NoaWxkTm9kZVZpZXcsIFNjaGVtYURpZmZPYmplY3RDb21wYXJlKToKICAgICAg ICAgICAgICAgICBpZiBzZWxmLm1hbmFnZXIuZGJfaW5mbyBpcyBub3QgTm9uZSBhbmQgXAogICAg ICAgICAgICAgICAgIGt3YXJnc1snZGlkJ10gaW4gc2VsZi5tYW5hZ2VyLmRiX2luZm8gZWxzZSAw CiAKKyAgICAgICAgICAgIHNlbGYuZGF0aXN0ZW1wbGF0ZSA9IFwKKyAgICAgICAgICAgICAgICBz ZWxmLm1hbmFnZXIuZGJfaW5mb1trd2FyZ3NbJ2RpZCddXVsnZGF0aXN0ZW1wbGF0ZSddIFwKKyAg ICAgICAgICAgICAgICBpZiBzZWxmLm1hbmFnZXIuZGJfaW5mbyBpcyBub3QgTm9uZSBhbmQgXAor ICAgICAgICAgICAgICAgIGt3YXJnc1snZGlkJ10gaW4gc2VsZi5tYW5hZ2VyLmRiX2luZm8gZWxz ZSBGYWxzZQorCiAgICAgICAgICAgICByZXR1cm4gZigqYXJncywgKiprd2FyZ3MpCiAKICAgICAg ICAgcmV0dXJuIHdyYXAKQEAgLTI0Nyw3ICsyNTIsNyBAQCBjbGFzcyBFeHRlbnNpb25WaWV3KFBH Q2hpbGROb2RlVmlldywgU2NoZW1hRGlmZk9iamVjdENvbXBhcmUpOgogICAgICAgICAgICAgKQog CiAgICAgICAgIHJlc1sncm93cyddWzBdWydpc19zeXNfb2JqJ10gPSAoCi0gICAgICAgICAgICBy ZXNbJ3Jvd3MnXVswXVsnb2lkJ10gPD0gc2VsZi5kYXRsYXN0c3lzb2lkKQorICAgICAgICAgICAg cmVzWydyb3dzJ11bMF1bJ29pZCddIDw9IHNlbGYuZGF0bGFzdHN5c29pZCBvciBzZWxmLmRhdGlz dGVtcGxhdGUpCiAKICAgICAgICAgcmV0dXJuIFRydWUsIHJlc1sncm93cyddWzBdCiAKZGlmZiAt LWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNl cy9mb3JlaWduX2RhdGFfd3JhcHBlcnMvX19pbml0X18ucHkgYi93ZWIvcGdhZG1pbi9icm93c2Vy L3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvZm9yZWlnbl9kYXRhX3dyYXBwZXJzL19f aW5pdF9fLnB5CmluZGV4IDk0ZTVlMGM0ZS4uNjMxZWE5ZDZkIDEwMDY0NAotLS0gYS93ZWIvcGdh ZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvZm9yZWlnbl9kYXRh X3dyYXBwZXJzL19faW5pdF9fLnB5CisrKyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dy b3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9mb3JlaWduX2RhdGFfd3JhcHBlcnMvX19pbml0X18ucHkK QEAgLTIyMiw2ICsyMjIsMTEgQEAgY2xhc3MgRm9yZWlnbkRhdGFXcmFwcGVyVmlldyhQR0NoaWxk Tm9kZVZpZXcsIFNjaGVtYURpZmZPYmplY3RDb21wYXJlKToKICAgICAgICAgICAgICAgICBpZiBz ZWxmLm1hbmFnZXIuZGJfaW5mbyBpcyBub3QgTm9uZSBhbmQgXAogICAgICAgICAgICAgICAgIGt3 YXJnc1snZGlkJ10gaW4gc2VsZi5tYW5hZ2VyLmRiX2luZm8gZWxzZSAwCiAKKyAgICAgICAgICAg IHNlbGYuZGF0aXN0ZW1wbGF0ZSA9IFwKKyAgICAgICAgICAgICAgICBzZWxmLm1hbmFnZXIuZGJf aW5mb1trd2FyZ3NbJ2RpZCddXVsnZGF0aXN0ZW1wbGF0ZSddIFwKKyAgICAgICAgICAgICAgICBp ZiBzZWxmLm1hbmFnZXIuZGJfaW5mbyBpcyBub3QgTm9uZSBhbmQgXAorICAgICAgICAgICAgICAg IGt3YXJnc1snZGlkJ10gaW4gc2VsZi5tYW5hZ2VyLmRiX2luZm8gZWxzZSBGYWxzZQorCiAgICAg ICAgICAgICAjIFNldCB0aGUgdGVtcGxhdGUgcGF0aCBmb3IgdGhlIFNRTCBzY3JpcHRzCiAgICAg ICAgICAgICBzZWxmLnRlbXBsYXRlX3BhdGggPSAnZm9yZWlnbl9kYXRhX3dyYXBwZXJzL3NxbC8j ezB9IycuZm9ybWF0KAogICAgICAgICAgICAgICAgIHNlbGYubWFuYWdlci52ZXJzaW9uCkBAIC0z NzIsNyArMzc3LDcgQEAgY2xhc3MgRm9yZWlnbkRhdGFXcmFwcGVyVmlldyhQR0NoaWxkTm9kZVZp ZXcsIFNjaGVtYURpZmZPYmplY3RDb21wYXJlKToKICAgICAgICAgICAgICkKIAogICAgICAgICBy ZXNbJ3Jvd3MnXVswXVsnaXNfc3lzX29iaiddID0gKAotICAgICAgICAgICAgcmVzWydyb3dzJ11b MF1bJ29pZCddIDw9IHNlbGYuZGF0bGFzdHN5c29pZCkKKyAgICAgICAgICAgIHJlc1sncm93cydd WzBdWydvaWQnXSA8PSBzZWxmLmRhdGxhc3RzeXNvaWQgb3Igc2VsZi5kYXRpc3RlbXBsYXRlKQog CiAgICAgICAgIGlmIHJlc1sncm93cyddWzBdWydmZHdvcHRpb25zJ10gaXMgbm90IE5vbmU6CiAg ICAgICAgICAgICByZXNbJ3Jvd3MnXVswXVsnZmR3b3B0aW9ucyddID0gdG9rZW5pemVfb3B0aW9u cygKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJz L2RhdGFiYXNlcy9mb3JlaWduX2RhdGFfd3JhcHBlcnMvZm9yZWlnbl9zZXJ2ZXJzL19faW5pdF9f LnB5IGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2Vz L2ZvcmVpZ25fZGF0YV93cmFwcGVycy9mb3JlaWduX3NlcnZlcnMvX19pbml0X18ucHkKaW5kZXgg N2YyYmFhZmIwLi42NjBhMjFhMmQgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2Vy dmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9mb3JlaWduX2RhdGFfd3JhcHBlcnMvZm9yZWln bl9zZXJ2ZXJzL19faW5pdF9fLnB5CisrKyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dy b3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9mb3JlaWduX2RhdGFfd3JhcHBlcnMvZm9yZWlnbl9zZXJ2 ZXJzL19faW5pdF9fLnB5CkBAIC0yMTIsNiArMjEyLDExIEBAIGNsYXNzIEZvcmVpZ25TZXJ2ZXJW aWV3KFBHQ2hpbGROb2RlVmlldywgU2NoZW1hRGlmZk9iamVjdENvbXBhcmUpOgogICAgICAgICAg ICAgICAgIGlmIHNlbGYubWFuYWdlci5kYl9pbmZvIGlzIG5vdCBOb25lIGFuZCBcCiAgICAgICAg ICAgICAgICAga3dhcmdzWydkaWQnXSBpbiBzZWxmLm1hbmFnZXIuZGJfaW5mbyBlbHNlIDAKIAor ICAgICAgICAgICAgc2VsZi5kYXRpc3RlbXBsYXRlID0gXAorICAgICAgICAgICAgICAgIHNlbGYu bWFuYWdlci5kYl9pbmZvW2t3YXJnc1snZGlkJ11dWydkYXRpc3RlbXBsYXRlJ10gXAorICAgICAg ICAgICAgICAgIGlmIHNlbGYubWFuYWdlci5kYl9pbmZvIGlzIG5vdCBOb25lIGFuZCBcCisgICAg ICAgICAgICAgICAga3dhcmdzWydkaWQnXSBpbiBzZWxmLm1hbmFnZXIuZGJfaW5mbyBlbHNlIEZh bHNlCisKICAgICAgICAgICAgICMgU2V0IHRoZSB0ZW1wbGF0ZSBwYXRoIGZvciB0aGUgU1FMIHNj cmlwdHMKICAgICAgICAgICAgIHNlbGYudGVtcGxhdGVfcGF0aCA9ICJmb3JlaWduX3NlcnZlcnMv c3FsLyN7MH0jIi5mb3JtYXQoCiAgICAgICAgICAgICAgICAgc2VsZi5tYW5hZ2VyLnZlcnNpb24K QEAgLTM2MCw3ICszNjUsNyBAQCBjbGFzcyBGb3JlaWduU2VydmVyVmlldyhQR0NoaWxkTm9kZVZp ZXcsIFNjaGVtYURpZmZPYmplY3RDb21wYXJlKToKICAgICAgICAgICAgIHJldHVybiBGYWxzZSwg Z29uZShzZWxmLm5vdF9mb3VuZF9lcnJvcl9tc2coKSkKIAogICAgICAgICByZXNbJ3Jvd3MnXVsw XVsnaXNfc3lzX29iaiddID0gKAotICAgICAgICAgICAgcmVzWydyb3dzJ11bMF1bJ29pZCddIDw9 IHNlbGYuZGF0bGFzdHN5c29pZCkKKyAgICAgICAgICAgIHJlc1sncm93cyddWzBdWydvaWQnXSA8 PSBzZWxmLmRhdGxhc3RzeXNvaWQgb3Igc2VsZi5kYXRpc3RlbXBsYXRlKQogCiAgICAgICAgIGlm IHJlc1sncm93cyddWzBdWydmc3J2b3B0aW9ucyddIGlzIG5vdCBOb25lOgogICAgICAgICAgICAg cmVzWydyb3dzJ11bMF1bJ2ZzcnZvcHRpb25zJ10gPSB0b2tlbml6ZV9vcHRpb25zKApkaWZmIC0t Z2l0IGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2Vz L2ZvcmVpZ25fZGF0YV93cmFwcGVycy9mb3JlaWduX3NlcnZlcnMvdXNlcl9tYXBwaW5ncy9fX2lu aXRfXy5weSBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFi YXNlcy9mb3JlaWduX2RhdGFfd3JhcHBlcnMvZm9yZWlnbl9zZXJ2ZXJzL3VzZXJfbWFwcGluZ3Mv X19pbml0X18ucHkKaW5kZXggNmNhOGNlNzllLi5hZGFmYzEyODMgMTAwNjQ0Ci0tLSBhL3dlYi9w Z2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9mb3JlaWduX2Rh dGFfd3JhcHBlcnMvZm9yZWlnbl9zZXJ2ZXJzL3VzZXJfbWFwcGluZ3MvX19pbml0X18ucHkKKysr IGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL2Zv cmVpZ25fZGF0YV93cmFwcGVycy9mb3JlaWduX3NlcnZlcnMvdXNlcl9tYXBwaW5ncy9fX2luaXRf Xy5weQpAQCAtMjI5LDYgKzIyOSwxMSBAQCBjbGFzcyBVc2VyTWFwcGluZ1ZpZXcoUEdDaGlsZE5v ZGVWaWV3LCBTY2hlbWFEaWZmT2JqZWN0Q29tcGFyZSk6CiAgICAgICAgICAgICAgICAgaWYgc2Vs Zi5tYW5hZ2VyLmRiX2luZm8gaXMgbm90IE5vbmUgYW5kIFwKICAgICAgICAgICAgICAgICBrd2Fy Z3NbJ2RpZCddIGluIHNlbGYubWFuYWdlci5kYl9pbmZvIGVsc2UgMAogCisgICAgICAgICAgICBz ZWxmLmRhdGlzdGVtcGxhdGUgPSBcCisgICAgICAgICAgICAgICAgc2VsZi5tYW5hZ2VyLmRiX2lu Zm9ba3dhcmdzWydkaWQnXV1bJ2RhdGlzdGVtcGxhdGUnXSBcCisgICAgICAgICAgICAgICAgaWYg c2VsZi5tYW5hZ2VyLmRiX2luZm8gaXMgbm90IE5vbmUgYW5kIFwKKyAgICAgICAgICAgICAgICBr d2FyZ3NbJ2RpZCddIGluIHNlbGYubWFuYWdlci5kYl9pbmZvIGVsc2UgRmFsc2UKKwogICAgICAg ICAgICAgIyBTZXQgdGhlIHRlbXBsYXRlIHBhdGggZm9yIHRoZSBTUUwgc2NyaXB0cwogICAgICAg ICAgICAgc2VsZi50ZW1wbGF0ZV9wYXRoID0gJ3VzZXJfbWFwcGluZ3Mvc3FsLyN7MH0jJy5mb3Jt YXQoCiAgICAgICAgICAgICAgICAgc2VsZi5tYW5hZ2VyLnZlcnNpb24KQEAgLTM3OCw3ICszODMs NyBAQCBjbGFzcyBVc2VyTWFwcGluZ1ZpZXcoUEdDaGlsZE5vZGVWaWV3LCBTY2hlbWFEaWZmT2Jq ZWN0Q29tcGFyZSk6CiAgICAgICAgICAgICByZXR1cm4gRmFsc2UsIGdvbmUoc2VsZi5ub3RfZm91 bmRfZXJyb3JfbXNnKCkpCiAKICAgICAgICAgcmVzWydyb3dzJ11bMF1bJ2lzX3N5c19vYmonXSA9 ICgKLSAgICAgICAgICAgIHJlc1sncm93cyddWzBdWydvaWQnXSA8PSBzZWxmLmRhdGxhc3RzeXNv aWQpCisgICAgICAgICAgICByZXNbJ3Jvd3MnXVswXVsnb2lkJ10gPD0gc2VsZi5kYXRsYXN0c3lz b2lkIG9yIHNlbGYuZGF0aXN0ZW1wbGF0ZSkKIAogICAgICAgICBpZiByZXNbJ3Jvd3MnXVswXVsn dW1vcHRpb25zJ10gaXMgbm90IE5vbmU6CiAgICAgICAgICAgICByZXNbJ3Jvd3MnXVswXVsndW1v cHRpb25zJ10gPSB0b2tlbml6ZV9vcHRpb25zKApkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vYnJv d3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL2xhbmd1YWdlcy9fX2luaXRfXy5w eSBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9s YW5ndWFnZXMvX19pbml0X18ucHkKaW5kZXggN2JlYTBiNGNjLi5lMDY1ZThlOGIgMTAwNjQ0Ci0t LSBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9s YW5ndWFnZXMvX19pbml0X18ucHkKKysrIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3Jv dXBzL3NlcnZlcnMvZGF0YWJhc2VzL2xhbmd1YWdlcy9fX2luaXRfXy5weQpAQCAtMjM0LDYgKzIz NCwxMCBAQCBjbGFzcyBMYW5ndWFnZVZpZXcoUEdDaGlsZE5vZGVWaWV3LCBTY2hlbWFEaWZmT2Jq ZWN0Q29tcGFyZSk6CiAgICAgICAgICAgICAgICAgc2VsZi5tYW5hZ2VyLmRiX2luZm9ba3dhcmdz WydkaWQnXV1bJ2RhdGxhc3RzeXNvaWQnXSBcCiAgICAgICAgICAgICAgICAgaWYgc2VsZi5tYW5h Z2VyLmRiX2luZm8gaXMgbm90IE5vbmUgYW5kIFwKICAgICAgICAgICAgICAgICBrd2FyZ3NbJ2Rp ZCddIGluIHNlbGYubWFuYWdlci5kYl9pbmZvIGVsc2UgMAorICAgICAgICAgICAgc2VsZi5kYXRp c3RlbXBsYXRlID0gXAorICAgICAgICAgICAgICAgIHNlbGYubWFuYWdlci5kYl9pbmZvW2t3YXJn c1snZGlkJ11dWydkYXRpc3RlbXBsYXRlJ10gXAorICAgICAgICAgICAgICAgIGlmIHNlbGYubWFu YWdlci5kYl9pbmZvIGlzIG5vdCBOb25lIGFuZCBcCisgICAgICAgICAgICAgICAga3dhcmdzWydk aWQnXSBpbiBzZWxmLm1hbmFnZXIuZGJfaW5mbyBlbHNlIEZhbHNlCiAKICAgICAgICAgICAgICMg U2V0IHRoZSB0ZW1wbGF0ZSBwYXRoIGZvciB0aGUgU1FMIHNjcmlwdHMKICAgICAgICAgICAgIHNl bGYudGVtcGxhdGVfcGF0aCA9ICgKQEAgLTM3MSw3ICszNzUsNyBAQCBjbGFzcyBMYW5ndWFnZVZp ZXcoUEdDaGlsZE5vZGVWaWV3LCBTY2hlbWFEaWZmT2JqZWN0Q29tcGFyZSk6CiAgICAgICAgICAg ICByZXR1cm4gRmFsc2UsIGdvbmUoc2VsZi5fTk9UX0ZPVU5EX0xBTkdfSU5GT1JNQVRJT04pCiAK ICAgICAgICAgcmVzWydyb3dzJ11bMF1bJ2lzX3N5c19vYmonXSA9ICgKLSAgICAgICAgICAgIHJl c1sncm93cyddWzBdWydvaWQnXSA8PSBzZWxmLmRhdGxhc3RzeXNvaWQpCisgICAgICAgICAgICBy ZXNbJ3Jvd3MnXVswXVsnb2lkJ10gPD0gc2VsZi5kYXRsYXN0c3lzb2lkIG9yIHNlbGYuZGF0aXN0 ZW1wbGF0ZSkKIAogICAgICAgICBzcWwgPSByZW5kZXJfdGVtcGxhdGUoCiAgICAgICAgICAgICAi LyIuam9pbihbc2VsZi50ZW1wbGF0ZV9wYXRoLCBzZWxmLl9BQ0xfU1FMXSksCmRpZmYgLS1naXQg YS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2No ZW1hcy9fX2luaXRfXy5weSBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2 ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL19faW5pdF9fLnB5CmluZGV4IDY5ZDkxN2QxOC4uZDdlM2Rh OWI2IDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVy cy9kYXRhYmFzZXMvc2NoZW1hcy9fX2luaXRfXy5weQorKysgYi93ZWIvcGdhZG1pbi9icm93c2Vy L3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy9fX2luaXRfXy5weQpAQCAt MTQ0LDYgKzE0NCwxMiBAQCBkZWYgY2hlY2tfcHJlY29uZGl0aW9uKGYpOgogICAgICAgICAgICAg c2VsZi5tYW5hZ2VyLmRiX2luZm9ba3dhcmdzWydkaWQnXV1bJ2RhdGxhc3RzeXNvaWQnXSBcCiAg ICAgICAgICAgICBpZiBzZWxmLm1hbmFnZXIuZGJfaW5mbyBpcyBub3QgTm9uZSBhbmQgXAogICAg ICAgICAgICAga3dhcmdzWydkaWQnXSBpbiBzZWxmLm1hbmFnZXIuZGJfaW5mbyBlbHNlIDAKKwor ICAgICAgICBzZWxmLmRhdGlzdGVtcGxhdGUgPSBcCisgICAgICAgICAgICBzZWxmLm1hbmFnZXIu ZGJfaW5mb1trd2FyZ3NbJ2RpZCddXVsnZGF0aXN0ZW1wbGF0ZSddIFwKKyAgICAgICAgICAgIGlm IHNlbGYubWFuYWdlci5kYl9pbmZvIGlzIG5vdCBOb25lIGFuZCBcCisgICAgICAgICAgICBrd2Fy Z3NbJ2RpZCddIGluIHNlbGYubWFuYWdlci5kYl9pbmZvIGVsc2UgRmFsc2UKKwogICAgICAgICAj IFNldCB0aGUgdGVtcGxhdGUgcGF0aCBmb3IgdGhlIFNRTCBzY3JpcHRzCiAgICAgICAgIGlmIHNl bGYubWFuYWdlci5zZXJ2ZXJfdHlwZSA9PSAnZ3BkYic6CiAgICAgICAgICAgICBfdGVtcCA9IHNl bGYuZ3BkYl90ZW1wbGF0ZV9wYXRoKHNlbGYubWFuYWdlci52ZXJzaW9uKQpAQCAtNTcxLDcgKzU3 Nyw3IEBAIEl0IG1heSBoYXZlIGJlZW4gcmVtb3ZlZCBieSBhbm90aGVyIHVzZXIuCiAgICAgICAg ICMgTWFraW5nIGNvcHkgb2Ygb3V0cHV0IGZvciBmdXR1cmUgdXNlCiAgICAgICAgIGNvcHlfZGF0 YSA9IGRpY3QocmVzWydyb3dzJ11bMF0pCiAgICAgICAgIGNvcHlfZGF0YVsnaXNfc3lzX29iaidd ID0gKAotICAgICAgICAgICAgY29weV9kYXRhWydvaWQnXSA8PSBzZWxmLmRhdGxhc3RzeXNvaWQp CisgICAgICAgICAgICBjb3B5X2RhdGFbJ29pZCddIDw9IHNlbGYuZGF0bGFzdHN5c29pZCBvciBz ZWxmLmRhdGlzdGVtcGxhdGUpCiAgICAgICAgIGNvcHlfZGF0YSA9IHNlbGYuX2Zvcm1hdHRlcihj b3B5X2RhdGEsIHNjaWQpCiAKICAgICAgICAgcmV0dXJuIGFqYXhfcmVzcG9uc2UoCmRpZmYgLS1n aXQgYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMv c2NoZW1hcy9jYXRhbG9nX29iamVjdHMvX19pbml0X18ucHkgYi93ZWIvcGdhZG1pbi9icm93c2Vy L3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy9jYXRhbG9nX29iamVjdHMv X19pbml0X18ucHkKaW5kZXggMjA3NDJiZjYzLi5kN2NhNDg1YjkgMTAwNjQ0Ci0tLSBhL3dlYi9w Z2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL2Nh dGFsb2dfb2JqZWN0cy9fX2luaXRfXy5weQorKysgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZl cl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy9jYXRhbG9nX29iamVjdHMvX19pbml0 X18ucHkKQEAgLTE1MCw2ICsxNTAsMTIgQEAgY2xhc3MgQ2F0YWxvZ09iamVjdFZpZXcoUEdDaGls ZE5vZGVWaWV3KToKICAgICAgICAgICAgICAgICBzZWxmLm1hbmFnZXIuZGJfaW5mb1trd2FyZ3Nb J2RpZCddXVsnZGF0bGFzdHN5c29pZCddIFwKICAgICAgICAgICAgICAgICBpZiBzZWxmLm1hbmFn ZXIuZGJfaW5mbyBpcyBub3QgTm9uZSBhbmQgXAogICAgICAgICAgICAgICAgIGt3YXJnc1snZGlk J10gaW4gc2VsZi5tYW5hZ2VyLmRiX2luZm8gZWxzZSAwCisKKyAgICAgICAgICAgIHNlbGYuZGF0 aXN0ZW1wbGF0ZSA9IFwKKyAgICAgICAgICAgICAgICBzZWxmLm1hbmFnZXIuZGJfaW5mb1trd2Fy Z3NbJ2RpZCddXVsnZGF0aXN0ZW1wbGF0ZSddIFwKKyAgICAgICAgICAgICAgICBpZiBzZWxmLm1h bmFnZXIuZGJfaW5mbyBpcyBub3QgTm9uZSBhbmQgXAorICAgICAgICAgICAgICAgIGt3YXJnc1sn ZGlkJ10gaW4gc2VsZi5tYW5hZ2VyLmRiX2luZm8gZWxzZSBGYWxzZQorCiAgICAgICAgICAgICBz ZWxmLnRlbXBsYXRlX3BhdGggPSAnY2F0YWxvZ19vYmplY3Qvc3FsL3swfS8jezF9IycuZm9ybWF0 KAogICAgICAgICAgICAgICAgICdwcGFzJyBpZiBzZWxmLm1hbmFnZXIuc2VydmVyX3R5cGUgPT0g J3BwYXMnIGVsc2UgJ3BnJywKICAgICAgICAgICAgICAgICBzZWxmLm1hbmFnZXIudmVyc2lvbgpA QCAtMjk2LDcgKzMwMiw3IEBAIGNsYXNzIENhdGFsb2dPYmplY3RWaWV3KFBHQ2hpbGROb2RlVmll dyk6CiAgICAgICAgICAgICAgICAgZ2V0dGV4dCgiIiJDb3VsZCBub3QgZmluZCB0aGUgc3BlY2lm aWVkIGNhdGFsb2cgb2JqZWN0LiIiIikpCiAKICAgICAgICAgcmVzWydyb3dzJ11bMF1bJ2lzX3N5 c19vYmonXSA9ICgKLSAgICAgICAgICAgIHJlc1sncm93cyddWzBdWydvaWQnXSA8PSBzZWxmLmRh dGxhc3RzeXNvaWQpCisgICAgICAgICAgICByZXNbJ3Jvd3MnXVswXVsnb2lkJ10gPD0gc2VsZi5k YXRsYXN0c3lzb2lkIG9yIHNlbGYuZGF0aXN0ZW1wbGF0ZSkKIAogICAgICAgICByZXR1cm4gYWph eF9yZXNwb25zZSgKICAgICAgICAgICAgIHJlc3BvbnNlPXJlc1sncm93cyddWzBdLApkaWZmIC0t Z2l0IGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2Vz L3NjaGVtYXMvY2F0YWxvZ19vYmplY3RzL2NvbHVtbnMvX19pbml0X18ucHkgYi93ZWIvcGdhZG1p bi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy9jYXRhbG9n X29iamVjdHMvY29sdW1ucy9fX2luaXRfXy5weQppbmRleCBjYWQyMDI0M2MuLjIwZDUxODc1MCAx MDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0 YWJhc2VzL3NjaGVtYXMvY2F0YWxvZ19vYmplY3RzL2NvbHVtbnMvX19pbml0X18ucHkKKysrIGIv d2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVt YXMvY2F0YWxvZ19vYmplY3RzL2NvbHVtbnMvX19pbml0X18ucHkKQEAgLTE3Nyw2ICsxNzcsMTIg QEAgY2xhc3MgQ2F0YWxvZ09iamVjdENvbHVtbnNWaWV3KFBHQ2hpbGROb2RlVmlldyk6CiAgICAg ICAgICAgICAgICAgc2VsZi5tYW5hZ2VyLmRiX2luZm9ba3dhcmdzWydkaWQnXV1bJ2RhdGxhc3Rz eXNvaWQnXSBcCiAgICAgICAgICAgICAgICAgaWYgc2VsZi5tYW5hZ2VyLmRiX2luZm8gaXMgbm90 IE5vbmUgYW5kIFwKICAgICAgICAgICAgICAgICBrd2FyZ3NbJ2RpZCddIGluIHNlbGYubWFuYWdl ci5kYl9pbmZvIGVsc2UgMAorCisgICAgICAgICAgICBzZWxmLmRhdGlzdGVtcGxhdGUgPSBcCisg ICAgICAgICAgICAgICAgc2VsZi5tYW5hZ2VyLmRiX2luZm9ba3dhcmdzWydkaWQnXV1bJ2RhdGlz dGVtcGxhdGUnXSBcCisgICAgICAgICAgICAgICAgaWYgc2VsZi5tYW5hZ2VyLmRiX2luZm8gaXMg bm90IE5vbmUgYW5kIFwKKyAgICAgICAgICAgICAgICBrd2FyZ3NbJ2RpZCddIGluIHNlbGYubWFu YWdlci5kYl9pbmZvIGVsc2UgRmFsc2UKKwogICAgICAgICAgICAgc2VsZi50ZW1wbGF0ZV9wYXRo ID0gJ2NhdGFsb2dfb2JqZWN0X2NvbHVtbi9zcWwvI3swfSMnLmZvcm1hdCgKICAgICAgICAgICAg ICAgICBzZWxmLm1hbmFnZXIudmVyc2lvbikKIApAQCAtMjc4LDcgKzI4NCw4IEBAIGNsYXNzIENh dGFsb2dPYmplY3RDb2x1bW5zVmlldyhQR0NoaWxkTm9kZVZpZXcpOgogICAgICAgICAgICAgcmV0 dXJuIGdvbmUoZ2V0dGV4dCgiIiJDb3VsZCBub3QgZmluZCB0aGUgc3BlY2lmaWVkIGNvbHVtbi4i IiIpKQogCiAgICAgICAgIHJlc1sncm93cyddWzBdWydpc19zeXNfb2JqJ10gPSAoCi0gICAgICAg ICAgICByZXNbJ3Jvd3MnXVswXVsnYXR0cmVsaWQnXSA8PSBzZWxmLmRhdGxhc3RzeXNvaWQpCisg ICAgICAgICAgICByZXNbJ3Jvd3MnXVswXVsnYXR0cmVsaWQnXSA8PSBzZWxmLmRhdGxhc3RzeXNv aWQgb3IKKyAgICAgICAgICAgIHNlbGYuZGF0aXN0ZW1wbGF0ZSkKIAogICAgICAgICByZXR1cm4g YWpheF9yZXNwb25zZSgKICAgICAgICAgICAgIHJlc3BvbnNlPXJlc1sncm93cyddWzBdLApkaWZm IC0tZ2l0IGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJh c2VzL3NjaGVtYXMvY29sbGF0aW9ucy9fX2luaXRfXy5weSBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIv c2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL2NvbGxhdGlvbnMvX19pbml0 X18ucHkKaW5kZXggMTM1MzVlZTUxLi4xNjA2Y2E0YzEgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWlu L2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL2NvbGxhdGlv bnMvX19pbml0X18ucHkKKysrIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3Nl cnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvY29sbGF0aW9ucy9fX2luaXRfXy5weQpAQCAtMTk4LDYg KzE5OCwxMSBAQCBjbGFzcyBDb2xsYXRpb25WaWV3KFBHQ2hpbGROb2RlVmlldywgU2NoZW1hRGlm Zk9iamVjdENvbXBhcmUpOgogICAgICAgICAgICAgICAgIGlmIHNlbGYubWFuYWdlci5kYl9pbmZv IGlzIG5vdCBOb25lIGFuZCBcCiAgICAgICAgICAgICAgICAga3dhcmdzWydkaWQnXSBpbiBzZWxm Lm1hbmFnZXIuZGJfaW5mbyBlbHNlIDAKIAorICAgICAgICAgICAgc2VsZi5kYXRpc3RlbXBsYXRl ID0gXAorICAgICAgICAgICAgICAgIHNlbGYubWFuYWdlci5kYl9pbmZvW2t3YXJnc1snZGlkJ11d WydkYXRpc3RlbXBsYXRlJ10gXAorICAgICAgICAgICAgICAgIGlmIHNlbGYubWFuYWdlci5kYl9p bmZvIGlzIG5vdCBOb25lIGFuZCBcCisgICAgICAgICAgICAgICAga3dhcmdzWydkaWQnXSBpbiBz ZWxmLm1hbmFnZXIuZGJfaW5mbyBlbHNlIEZhbHNlCisKICAgICAgICAgICAgICMgU2V0IHRoZSB0 ZW1wbGF0ZSBwYXRoIGZvciB0aGUgU1FMIHNjcmlwdHMKICAgICAgICAgICAgIHNlbGYudGVtcGxh dGVfcGF0aCA9IGNvbXBpbGVfdGVtcGxhdGVfcGF0aCgKICAgICAgICAgICAgICAgICAnY29sbGF0 aW9ucy9zcWwvJywKQEAgLTM1Niw3ICszNjEsNyBAQCBjbGFzcyBDb2xsYXRpb25WaWV3KFBHQ2hp bGROb2RlVmlldywgU2NoZW1hRGlmZk9iamVjdENvbXBhcmUpOgogICAgICAgICAgICAgcmV0dXJu IEZhbHNlLCBnb25lKHNlbGYubm90X2ZvdW5kX2Vycm9yX21zZygpKQogCiAgICAgICAgIHJlc1sn cm93cyddWzBdWydpc19zeXNfb2JqJ10gPSAoCi0gICAgICAgICAgICByZXNbJ3Jvd3MnXVswXVsn b2lkJ10gPD0gc2VsZi5kYXRsYXN0c3lzb2lkKQorICAgICAgICAgICAgcmVzWydyb3dzJ11bMF1b J29pZCddIDw9IHNlbGYuZGF0bGFzdHN5c29pZCBvciBzZWxmLmRhdGlzdGVtcGxhdGUpCiAKICAg ICAgICAgcmV0dXJuIFRydWUsIHJlc1sncm93cyddWzBdCiAKZGlmZiAtLWdpdCBhL3dlYi9wZ2Fk bWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL2RvbWFp bnMvZG9tYWluX2NvbnN0cmFpbnRzL19faW5pdF9fLnB5IGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9z ZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvZG9tYWlucy9kb21haW5fY29u c3RyYWludHMvX19pbml0X18ucHkKaW5kZXggMDcxODg1MzcyLi4xNWNjYmZhNTQgMTAwNjQ0Ci0t LSBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9z Y2hlbWFzL2RvbWFpbnMvZG9tYWluX2NvbnN0cmFpbnRzL19faW5pdF9fLnB5CisrKyBiL3dlYi9w Z2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL2Rv bWFpbnMvZG9tYWluX2NvbnN0cmFpbnRzL19faW5pdF9fLnB5CkBAIC0xLDMgKzEsNCBAQAorCiAj IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj IyMjIyMjIyMjIyMjIyMjIwogIwogIyBwZ0FkbWluIDQgLSBQb3N0Z3JlU1FMIFRvb2xzCkBAIC0y NjQsNiArMjY1LDExIEBAIGNsYXNzIERvbWFpbkNvbnN0cmFpbnRWaWV3KFBHQ2hpbGROb2RlVmll dyk6CiAgICAgICAgICAgICAgICAgaWYgc2VsZi5tYW5hZ2VyLmRiX2luZm8gaXMgbm90IE5vbmUg YW5kIFwKICAgICAgICAgICAgICAgICBrd2FyZ3NbJ2RpZCddIGluIHNlbGYubWFuYWdlci5kYl9p bmZvIGVsc2UgMAogCisgICAgICAgICAgICBzZWxmLmRhdGlzdGVtcGxhdGUgPSBcCisgICAgICAg ICAgICAgICAgc2VsZi5tYW5hZ2VyLmRiX2luZm9ba3dhcmdzWydkaWQnXV1bJ2RhdGlzdGVtcGxh dGUnXSBcCisgICAgICAgICAgICAgICAgaWYgc2VsZi5tYW5hZ2VyLmRiX2luZm8gaXMgbm90IE5v bmUgYW5kIFwKKyAgICAgICAgICAgICAgICBrd2FyZ3NbJ2RpZCddIGluIHNlbGYubWFuYWdlci5k Yl9pbmZvIGVsc2UgRmFsc2UKKwogICAgICAgICAgICAgIyBTZXQgdGhlIHRlbXBsYXRlIHBhdGgg Zm9yIHRoZSBTUUwgc2NyaXB0cwogICAgICAgICAgICAgc2VsZi50ZW1wbGF0ZV9wYXRoID0gJ2Rv bWFpbl9jb25zdHJhaW50cy9zcWwvI3swfSMnLmZvcm1hdCgKICAgICAgICAgICAgICAgICBzZWxm Lm1hbmFnZXIudmVyc2lvbikKQEAgLTQwMyw3ICs0MDksNyBAQCBjbGFzcyBEb21haW5Db25zdHJh aW50VmlldyhQR0NoaWxkTm9kZVZpZXcpOgogCiAgICAgICAgIGRhdGEgPSByZXNbJ3Jvd3MnXVsw XQogICAgICAgICBkYXRhWydpc19zeXNfb2JqJ10gPSAoCi0gICAgICAgICAgICBkYXRhWydvaWQn XSA8PSBzZWxmLmRhdGxhc3RzeXNvaWQpCisgICAgICAgICAgICBkYXRhWydvaWQnXSA8PSBzZWxm LmRhdGxhc3RzeXNvaWQgb3Igc2VsZi5kYXRpc3RlbXBsYXRlKQogICAgICAgICByZXR1cm4gYWph eF9yZXNwb25zZSgKICAgICAgICAgICAgIHJlc3BvbnNlPWRhdGEsCiAgICAgICAgICAgICBzdGF0 dXM9MjAwCmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2Vy dmVycy9kYXRhYmFzZXMvc2NoZW1hcy9mb3JlaWduX3RhYmxlcy9fX2luaXRfXy5weSBiL3dlYi9w Z2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL2Zv cmVpZ25fdGFibGVzL19faW5pdF9fLnB5CmluZGV4IDFhZmUzOGZhMy4uN2QwMDFiNTk2IDEwMDY0 NAotLS0gYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFz ZXMvc2NoZW1hcy9mb3JlaWduX3RhYmxlcy9fX2luaXRfXy5weQorKysgYi93ZWIvcGdhZG1pbi9i cm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy9mb3JlaWduX3Rh Ymxlcy9fX2luaXRfXy5weQpAQCAtMzQ0LDYgKzM0NCwxMSBAQCBjbGFzcyBGb3JlaWduVGFibGVW aWV3KFBHQ2hpbGROb2RlVmlldywgRGF0YVR5cGVSZWFkZXIsCiAgICAgICAgICAgICAgICAgaWYg c2VsZi5tYW5hZ2VyLmRiX2luZm8gaXMgbm90IE5vbmUgYW5kIFwKICAgICAgICAgICAgICAgICBr d2FyZ3NbJ2RpZCddIGluIHNlbGYubWFuYWdlci5kYl9pbmZvIGVsc2UgMAogCisgICAgICAgICAg ICBzZWxmLmRhdGlzdGVtcGxhdGUgPSBcCisgICAgICAgICAgICAgICAgc2VsZi5tYW5hZ2VyLmRi X2luZm9ba3dhcmdzWydkaWQnXV1bJ2RhdGlzdGVtcGxhdGUnXSBcCisgICAgICAgICAgICAgICAg aWYgc2VsZi5tYW5hZ2VyLmRiX2luZm8gaXMgbm90IE5vbmUgYW5kIFwKKyAgICAgICAgICAgICAg ICBrd2FyZ3NbJ2RpZCddIGluIHNlbGYubWFuYWdlci5kYl9pbmZvIGVsc2UgRmFsc2UKKwogICAg ICAgICAgICAgIyBTZXQgdGVtcGxhdGUgcGF0aCBmb3Igc3FsIHNjcmlwdHMgZGVwZW5kaW5nCiAg ICAgICAgICAgICAjIG9uIHRoZSBzZXJ2ZXIgdmVyc2lvbi4KICAgICAgICAgICAgIHNlbGYudGVt cGxhdGVfcGF0aCA9IGNvbXBpbGVfdGVtcGxhdGVfcGF0aCgKQEAgLTExNDAsNyArMTE0NSw3IEBA IGNsYXNzIEZvcmVpZ25UYWJsZVZpZXcoUEdDaGlsZE5vZGVWaWV3LCBEYXRhVHlwZVJlYWRlciwK IAogICAgICAgICBkYXRhID0gcmVzWydyb3dzJ11bMF0KICAgICAgICAgZGF0YVsnaXNfc3lzX29i aiddID0gKAotICAgICAgICAgICAgZGF0YVsnb2lkJ10gPD0gc2VsZi5kYXRsYXN0c3lzb2lkKQor ICAgICAgICAgICAgZGF0YVsnb2lkJ10gPD0gc2VsZi5kYXRsYXN0c3lzb2lkIG9yIHNlbGYuZGF0 aXN0ZW1wbGF0ZSkKIAogICAgICAgICBpZiBzZWxmLm1hbmFnZXIudmVyc2lvbiA+PSA5MDIwMDoK ICAgICAgICAgICAgICMgRmV0Y2ggcHJpdmlsZWdlcwpkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4v YnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvZnRzX2NvbmZp Z3VyYXRpb25zL19faW5pdF9fLnB5IGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBz L3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvZnRzX2NvbmZpZ3VyYXRpb25zL19faW5pdF9fLnB5 CmluZGV4IGJkNTljYWM1YS4uZjA3MTc5MjQxIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9icm93 c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy9mdHNfY29uZmlndXJh dGlvbnMvX19pbml0X18ucHkKKysrIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBz L3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvZnRzX2NvbmZpZ3VyYXRpb25zL19faW5pdF9fLnB5 CkBAIC0yMzEsNiArMjMxLDEyIEBAIGNsYXNzIEZ0c0NvbmZpZ3VyYXRpb25WaWV3KFBHQ2hpbGRO b2RlVmlldywgU2NoZW1hRGlmZk9iamVjdENvbXBhcmUpOgogICAgICAgICAgICAgICAgIHNlbGYu bWFuYWdlci5kYl9pbmZvW2t3YXJnc1snZGlkJ11dWydkYXRsYXN0c3lzb2lkJ10gXAogICAgICAg ICAgICAgICAgIGlmIHNlbGYubWFuYWdlci5kYl9pbmZvIGlzIG5vdCBOb25lIGFuZCBcCiAgICAg ICAgICAgICAgICAga3dhcmdzWydkaWQnXSBpbiBzZWxmLm1hbmFnZXIuZGJfaW5mbyBlbHNlIDAK KworICAgICAgICAgICAgc2VsZi5kYXRpc3RlbXBsYXRlID0gXAorICAgICAgICAgICAgICAgIHNl bGYubWFuYWdlci5kYl9pbmZvW2t3YXJnc1snZGlkJ11dWydkYXRpc3RlbXBsYXRlJ10gXAorICAg ICAgICAgICAgICAgIGlmIHNlbGYubWFuYWdlci5kYl9pbmZvIGlzIG5vdCBOb25lIGFuZCBcCisg ICAgICAgICAgICAgICAga3dhcmdzWydkaWQnXSBpbiBzZWxmLm1hbmFnZXIuZGJfaW5mbyBlbHNl IEZhbHNlCisKICAgICAgICAgICAgICMgU2V0IHRoZSB0ZW1wbGF0ZSBwYXRoIGZvciB0aGUgU1FM IHNjcmlwdHMKICAgICAgICAgICAgIHNlbGYudGVtcGxhdGVfcGF0aCA9ICdmdHNfY29uZmlndXJh dGlvbnMvc3FsLyN7MH0jJy5mb3JtYXQoCiAgICAgICAgICAgICAgICAgc2VsZi5tYW5hZ2VyLnZl cnNpb24pCkBAIC0zODQsNyArMzkwLDcgQEAgY2xhc3MgRnRzQ29uZmlndXJhdGlvblZpZXcoUEdD aGlsZE5vZGVWaWV3LCBTY2hlbWFEaWZmT2JqZWN0Q29tcGFyZSk6CiAgICAgICAgICAgICApCiAK ICAgICAgICAgcmVzWydyb3dzJ11bMF1bJ2lzX3N5c19vYmonXSA9ICgKLSAgICAgICAgICAgIHJl c1sncm93cyddWzBdWydvaWQnXSA8PSBzZWxmLmRhdGxhc3RzeXNvaWQpCisgICAgICAgICAgICBy ZXNbJ3Jvd3MnXVswXVsnb2lkJ10gPD0gc2VsZi5kYXRsYXN0c3lzb2lkIG9yIHNlbGYuZGF0aXN0 ZW1wbGF0ZSkKIAogICAgICAgICAjIEluIGVkaXQgbW9kZSBmZXRjaCB0b2tlbi9kaWN0aW9uYXJ5 IGxpc3QgYWxzbwogICAgICAgICBzcWwgPSByZW5kZXJfdGVtcGxhdGUoCmRpZmYgLS1naXQgYS93 ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1h cy9mdHNfZGljdGlvbmFyaWVzL19faW5pdF9fLnB5IGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2 ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvZnRzX2RpY3Rpb25hcmllcy9fX2lu aXRfXy5weQppbmRleCBiOTk5ODdiN2EuLjU0MmU2YjZlOCAxMDA2NDQKLS0tIGEvd2ViL3BnYWRt aW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvZnRzX2Rp Y3Rpb25hcmllcy9fX2luaXRfXy5weQorKysgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9n cm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy9mdHNfZGljdGlvbmFyaWVzL19faW5pdF9f LnB5CkBAIC0yMjAsNiArMjIwLDEwIEBAIGNsYXNzIEZ0c0RpY3Rpb25hcnlWaWV3KFBHQ2hpbGRO b2RlVmlldywgU2NoZW1hRGlmZk9iamVjdENvbXBhcmUpOgogICAgICAgICAgICAgICAgIHNlbGYu bWFuYWdlci5kYl9pbmZvW2t3YXJnc1snZGlkJ11dWydkYXRsYXN0c3lzb2lkJ10gXAogICAgICAg ICAgICAgICAgIGlmIHNlbGYubWFuYWdlci5kYl9pbmZvIGlzIG5vdCBOb25lIGFuZCBcCiAgICAg ICAgICAgICAgICAga3dhcmdzWydkaWQnXSBpbiBzZWxmLm1hbmFnZXIuZGJfaW5mbyBlbHNlIDAK KyAgICAgICAgICAgIHNlbGYuZGF0aXN0ZW1wbGF0ZSA9IFwKKyAgICAgICAgICAgICAgICBzZWxm Lm1hbmFnZXIuZGJfaW5mb1trd2FyZ3NbJ2RpZCddXVsnZGF0aXN0ZW1wbGF0ZSddIFwKKyAgICAg ICAgICAgICAgICBpZiBzZWxmLm1hbmFnZXIuZGJfaW5mbyBpcyBub3QgTm9uZSBhbmQgXAorICAg ICAgICAgICAgICAgIGt3YXJnc1snZGlkJ10gaW4gc2VsZi5tYW5hZ2VyLmRiX2luZm8gZWxzZSBG YWxzZQogCiAgICAgICAgICAgICAjIFNldCB0aGUgdGVtcGxhdGUgcGF0aCBmb3IgdGhlIFNRTCBz Y3JpcHRzCiAgICAgICAgICAgICBzZWxmLnRlbXBsYXRlX3BhdGggPSAnZnRzX2RpY3Rpb25hcmll cy9zcWwvI3swfSMnLmZvcm1hdCgKQEAgLTM5Myw3ICszOTcsNyBAQCBjbGFzcyBGdHNEaWN0aW9u YXJ5VmlldyhQR0NoaWxkTm9kZVZpZXcsIFNjaGVtYURpZmZPYmplY3RDb21wYXJlKToKICAgICAg ICAgICAgICkpCiAKICAgICAgICAgcmVzWydyb3dzJ11bMF1bJ2lzX3N5c19vYmonXSA9ICgKLSAg ICAgICAgICAgIHJlc1sncm93cyddWzBdWydvaWQnXSA8PSBzZWxmLmRhdGxhc3RzeXNvaWQpCisg ICAgICAgICAgICByZXNbJ3Jvd3MnXVswXVsnb2lkJ10gPD0gc2VsZi5kYXRsYXN0c3lzb2lkIG9y IHNlbGYuZGF0aXN0ZW1wbGF0ZSkKIAogICAgICAgICAjIEhhbmRsZSB0ZW1wbGF0ZXMgYW5kIGl0 cyBzY2hlbWEgbmFtZSBwcm9wZXJseQogICAgICAgICBpZiByZXNbJ3Jvd3MnXVswXVsndGVtcGxh dGVfc2NoZW1hJ10gaXMgbm90IE5vbmUgYW5kIFwKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jy b3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL2Z0c19wYXJzZXJz L19faW5pdF9fLnB5IGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMv ZGF0YWJhc2VzL3NjaGVtYXMvZnRzX3BhcnNlcnMvX19pbml0X18ucHkKaW5kZXggYjZiYzg4MTY2 Li5hMjJjM2M3NjYgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vw cy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL2Z0c19wYXJzZXJzL19faW5pdF9fLnB5CisrKyBi L3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hl bWFzL2Z0c19wYXJzZXJzL19faW5pdF9fLnB5CkBAIC0yMzQsNiArMjM0LDEwIEBAIGNsYXNzIEZ0 c1BhcnNlclZpZXcoUEdDaGlsZE5vZGVWaWV3LCBTY2hlbWFEaWZmT2JqZWN0Q29tcGFyZSk6CiAg ICAgICAgICAgICAgICAgc2VsZi5tYW5hZ2VyLmRiX2luZm9ba3dhcmdzWydkaWQnXV1bJ2RhdGxh c3RzeXNvaWQnXSBcCiAgICAgICAgICAgICAgICAgaWYgc2VsZi5tYW5hZ2VyLmRiX2luZm8gaXMg bm90IE5vbmUgYW5kIFwKICAgICAgICAgICAgICAgICBrd2FyZ3NbJ2RpZCddIGluIHNlbGYubWFu YWdlci5kYl9pbmZvIGVsc2UgMAorICAgICAgICAgICAgc2VsZi5kYXRpc3RlbXBsYXRlID0gXAor ICAgICAgICAgICAgICAgIHNlbGYubWFuYWdlci5kYl9pbmZvW2t3YXJnc1snZGlkJ11dWydkYXRp c3RlbXBsYXRlJ10gXAorICAgICAgICAgICAgICAgIGlmIHNlbGYubWFuYWdlci5kYl9pbmZvIGlz IG5vdCBOb25lIGFuZCBcCisgICAgICAgICAgICAgICAga3dhcmdzWydkaWQnXSBpbiBzZWxmLm1h bmFnZXIuZGJfaW5mbyBlbHNlIEZhbHNlCiAgICAgICAgICAgICAjIFNldCB0aGUgdGVtcGxhdGUg cGF0aCBmb3IgdGhlIFNRTCBzY3JpcHRzCiAgICAgICAgICAgICBzZWxmLnRlbXBsYXRlX3BhdGgg PSAnZnRzX3BhcnNlcnMvc3FsLyN7MH0jJy5mb3JtYXQoCiAgICAgICAgICAgICAgICAgc2VsZi5t YW5hZ2VyLnZlcnNpb24pCkBAIC0zNTAsNyArMzU0LDcgQEAgY2xhc3MgRnRzUGFyc2VyVmlldyhQ R0NoaWxkTm9kZVZpZXcsIFNjaGVtYURpZmZPYmplY3RDb21wYXJlKToKICAgICAgICAgICAgICAg ICBfKCJDb3VsZCBub3QgZmluZCB0aGUgRlRTIFBhcnNlciBub2RlIGluIHRoZSBkYXRhYmFzZSBu b2RlLiIpKQogCiAgICAgICAgIHJlc1sncm93cyddWzBdWydpc19zeXNfb2JqJ10gPSAoCi0gICAg ICAgICAgICByZXNbJ3Jvd3MnXVswXVsnb2lkJ10gPD0gc2VsZi5kYXRsYXN0c3lzb2lkKQorICAg ICAgICAgICAgcmVzWydyb3dzJ11bMF1bJ29pZCddIDw9IHNlbGYuZGF0bGFzdHN5c29pZCBvciBz ZWxmLmRhdGlzdGVtcGxhdGUpCiAgICAgICAgIHJldHVybiBUcnVlLCByZXNbJ3Jvd3MnXVswXQog CiAgICAgQGNoZWNrX3ByZWNvbmRpdGlvbgpkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vYnJvd3Nl ci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvZnRzX3RlbXBsYXRlcy9f X2luaXRfXy5weSBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2Rh dGFiYXNlcy9zY2hlbWFzL2Z0c190ZW1wbGF0ZXMvX19pbml0X18ucHkKaW5kZXggMGI4MzFlNzUz Li5mODNkNmI4Y2EgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vw cy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL2Z0c190ZW1wbGF0ZXMvX19pbml0X18ucHkKKysr IGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3Nj aGVtYXMvZnRzX3RlbXBsYXRlcy9fX2luaXRfXy5weQpAQCAtMjE0LDYgKzIxNCwxMCBAQCBjbGFz cyBGdHNUZW1wbGF0ZVZpZXcoUEdDaGlsZE5vZGVWaWV3LCBTY2hlbWFEaWZmT2JqZWN0Q29tcGFy ZSk6CiAgICAgICAgICAgICAgICAgc2VsZi5tYW5hZ2VyLmRiX2luZm9ba3dhcmdzWydkaWQnXV1b J2RhdGxhc3RzeXNvaWQnXSBcCiAgICAgICAgICAgICAgICAgaWYgc2VsZi5tYW5hZ2VyLmRiX2lu Zm8gaXMgbm90IE5vbmUgYW5kIFwKICAgICAgICAgICAgICAgICBrd2FyZ3NbJ2RpZCddIGluIHNl bGYubWFuYWdlci5kYl9pbmZvIGVsc2UgMAorICAgICAgICAgICAgc2VsZi5kYXRpc3RlbXBsYXRl ID0gXAorICAgICAgICAgICAgICAgIHNlbGYubWFuYWdlci5kYl9pbmZvW2t3YXJnc1snZGlkJ11d WydkYXRpc3RlbXBsYXRlJ10gXAorICAgICAgICAgICAgICAgIGlmIHNlbGYubWFuYWdlci5kYl9p bmZvIGlzIG5vdCBOb25lIGFuZCBcCisgICAgICAgICAgICAgICAga3dhcmdzWydkaWQnXSBpbiBz ZWxmLm1hbmFnZXIuZGJfaW5mbyBlbHNlIEZhbHNlCiAgICAgICAgICAgICBzZWxmLnRlbXBsYXRl X3BhdGggPSAnZnRzX3RlbXBsYXRlcy9zcWwvI3swfSMnLmZvcm1hdCgKICAgICAgICAgICAgICAg ICBzZWxmLm1hbmFnZXIudmVyc2lvbikKIApAQCAtMzI0LDcgKzMyOCw3IEBAIGNsYXNzIEZ0c1Rl bXBsYXRlVmlldyhQR0NoaWxkTm9kZVZpZXcsIFNjaGVtYURpZmZPYmplY3RDb21wYXJlKToKICAg ICAgICAgaWYgbGVuKHJlc1sncm93cyddKSA9PSAwOgogICAgICAgICAgICAgcmV0dXJuIEZhbHNl LCBnb25lKHNlbGYubm90X2ZvdW5kX2Vycm9yX21zZygpKQogICAgICAgICByZXNbJ3Jvd3MnXVsw XVsnaXNfc3lzX29iaiddID0gKAotICAgICAgICAgICAgcmVzWydyb3dzJ11bMF1bJ29pZCddIDw9 IHNlbGYuZGF0bGFzdHN5c29pZCkKKyAgICAgICAgICAgIHJlc1sncm93cyddWzBdWydvaWQnXSA8 PSBzZWxmLmRhdGxhc3RzeXNvaWQgb3Igc2VsZi5kYXRpc3RlbXBsYXRlKQogICAgICAgICByZXR1 cm4gVHJ1ZSwgcmVzWydyb3dzJ11bMF0KIAogICAgIEBjaGVja19wcmVjb25kaXRpb24KZGlmZiAt LWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNl cy9zY2hlbWFzL3NlcXVlbmNlcy9fX2luaXRfXy5weSBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2Vy dmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3NlcXVlbmNlcy9fX2luaXRfXy5w eQppbmRleCBlMmQ1NjIxMjUuLjU1ZDljZmJkMiAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vYnJv d3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvc2VxdWVuY2VzL19f aW5pdF9fLnB5CisrKyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJz L2RhdGFiYXNlcy9zY2hlbWFzL3NlcXVlbmNlcy9fX2luaXRfXy5weQpAQCAtMTQyLDYgKzE0Miwx MCBAQCBjbGFzcyBTZXF1ZW5jZVZpZXcoUEdDaGlsZE5vZGVWaWV3LCBTY2hlbWFEaWZmT2JqZWN0 Q29tcGFyZSk6CiAgICAgICAgICAgICAgICAgICAgIHNlbGYubWFuYWdlci5kYl9pbmZvW2t3YXJn c1snZGlkJ11dWydkYXRsYXN0c3lzb2lkJ10gXAogICAgICAgICAgICAgICAgICAgICBpZiBzZWxm Lm1hbmFnZXIuZGJfaW5mbyBpcyBub3QgTm9uZSBhbmQgXAogICAgICAgICAgICAgICAgICAgICBr d2FyZ3NbJ2RpZCddIGluIHNlbGYubWFuYWdlci5kYl9pbmZvIGVsc2UgMAorICAgICAgICAgICAg ICAgIHNlbGYuZGF0aXN0ZW1wbGF0ZSA9IFwKKyAgICAgICAgICAgICAgICAgICAgc2VsZi5tYW5h Z2VyLmRiX2luZm9ba3dhcmdzWydkaWQnXV1bJ2RhdGlzdGVtcGxhdGUnXSBcCisgICAgICAgICAg ICAgICAgICAgIGlmIHNlbGYubWFuYWdlci5kYl9pbmZvIGlzIG5vdCBOb25lIGFuZCBcCisgICAg ICAgICAgICAgICAgICAgIGt3YXJnc1snZGlkJ10gaW4gc2VsZi5tYW5hZ2VyLmRiX2luZm8gZWxz ZSBGYWxzZQogCiAgICAgICAgICAgICAgICAgc2VsZi50ZW1wbGF0ZV9wYXRoID0gJ3NlcXVlbmNl cy9zcWwvI3swfSMnLmZvcm1hdCgKICAgICAgICAgICAgICAgICAgICAgc2VsZi5tYW5hZ2VyLnZl cnNpb24KQEAgLTMwNiw3ICszMTAsNyBAQCBjbGFzcyBTZXF1ZW5jZVZpZXcoUEdDaGlsZE5vZGVW aWV3LCBTY2hlbWFEaWZmT2JqZWN0Q29tcGFyZSk6CiAgICAgICAgICAgICByZXR1cm4gRmFsc2Us IGdvbmUoc2VsZi5ub3RfZm91bmRfZXJyb3JfbXNnKCkpCiAKICAgICAgICAgcmVzWydyb3dzJ11b MF1bJ2lzX3N5c19vYmonXSA9ICgKLSAgICAgICAgICAgIHJlc1sncm93cyddWzBdWydvaWQnXSA8 PSBzZWxmLmRhdGxhc3RzeXNvaWQpCisgICAgICAgICAgICByZXNbJ3Jvd3MnXVswXVsnb2lkJ10g PD0gc2VsZi5kYXRsYXN0c3lzb2lkIG9yIHNlbGYuZGF0aXN0ZW1wbGF0ZSkKIAogICAgICAgICBm b3Igcm93IGluIHJlc1sncm93cyddOgogICAgICAgICAgICAgc3FsID0gcmVuZGVyX3RlbXBsYXRl KApkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMv ZGF0YWJhc2VzL3NjaGVtYXMvc3lub255bXMvX19pbml0X18ucHkgYi93ZWIvcGdhZG1pbi9icm93 c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy9zeW5vbnltcy9fX2lu aXRfXy5weQppbmRleCBkMGM5N2UxN2MuLjQ1MzlhZGY3NyAxMDA2NDQKLS0tIGEvd2ViL3BnYWRt aW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvc3lub255 bXMvX19pbml0X18ucHkKKysrIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3Nl cnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvc3lub255bXMvX19pbml0X18ucHkKQEAgLTIxMCw2ICsy MTAsMTAgQEAgY2xhc3MgU3lub255bVZpZXcoUEdDaGlsZE5vZGVWaWV3LCBTY2hlbWFEaWZmT2Jq ZWN0Q29tcGFyZSk6CiAgICAgICAgICAgICAgICAgc2VsZi5tYW5hZ2VyLmRiX2luZm9ba3dhcmdz WydkaWQnXV1bJ2RhdGxhc3RzeXNvaWQnXSBcCiAgICAgICAgICAgICAgICAgaWYgc2VsZi5tYW5h Z2VyLmRiX2luZm8gaXMgbm90IE5vbmUgYW5kIFwKICAgICAgICAgICAgICAgICBrd2FyZ3NbJ2Rp ZCddIGluIHNlbGYubWFuYWdlci5kYl9pbmZvIGVsc2UgMAorICAgICAgICAgICAgc2VsZi5kYXRp c3RlbXBsYXRlID0gXAorICAgICAgICAgICAgICAgIHNlbGYubWFuYWdlci5kYl9pbmZvW2t3YXJn c1snZGlkJ11dWydkYXRpc3RlbXBsYXRlJ10gXAorICAgICAgICAgICAgICAgIGlmIHNlbGYubWFu YWdlci5kYl9pbmZvIGlzIG5vdCBOb25lIGFuZCBcCisgICAgICAgICAgICAgICAga3dhcmdzWydk aWQnXSBpbiBzZWxmLm1hbmFnZXIuZGJfaW5mbyBlbHNlIEZhbHNlCiAKICAgICAgICAgICAgICMg d2Ugd2lsbCBzZXQgdGVtcGxhdGUgcGF0aCBmb3Igc3FsIHNjcmlwdHMKICAgICAgICAgICAgIHNl bGYudGVtcGxhdGVfcGF0aCA9ICdzeW5vbnltcy9zcWwvI3swfSMnLmZvcm1hdCgKQEAgLTQyMCw3 ICs0MjQsOCBAQCBjbGFzcyBTeW5vbnltVmlldyhQR0NoaWxkTm9kZVZpZXcsIFNjaGVtYURpZmZP YmplY3RDb21wYXJlKToKICAgICAgICAgICAgICAgICByZXR1cm4gRmFsc2UsIGdvbmUoc2VsZi5u b3RfZm91bmRfZXJyb3JfbXNnKCkpCiAKICAgICAgICAgICAgIHJlc1sncm93cyddWzBdWydpc19z eXNfb2JqJ10gPSAoCi0gICAgICAgICAgICAgICAgcmVzWydyb3dzJ11bMF1bJ29pZCddIDw9IHNl bGYuZGF0bGFzdHN5c29pZCkKKyAgICAgICAgICAgICAgICByZXNbJ3Jvd3MnXVswXVsnb2lkJ10g PD0gc2VsZi5kYXRsYXN0c3lzb2lkIG9yCisgICAgICAgICAgICAgICAgc2VsZi5kYXRpc3RlbXBs YXRlKQogICAgICAgICAgICAgcmV0dXJuIFRydWUsIHJlc1sncm93cyddWzBdCiAgICAgICAgIGV4 Y2VwdCBFeGNlcHRpb24gYXMgZToKICAgICAgICAgICAgIHJldHVybiBpbnRlcm5hbF9zZXJ2ZXJf ZXJyb3IoZXJyb3Jtc2c9c3RyKGUpKQpkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9z ZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3RlbXBsYXRlcy9kYXRhYmFzZXMvc3FsLzku MV9wbHVzL3Byb3BlcnRpZXMuc3FsIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBz L3NlcnZlcnMvZGF0YWJhc2VzL3RlbXBsYXRlcy9kYXRhYmFzZXMvc3FsLzkuMV9wbHVzL3Byb3Bl cnRpZXMuc3FsCmluZGV4IDU5NzQ2MmVkZC4uMzkyN2RmMzRjIDEwMDY0NAotLS0gYS93ZWIvcGdh ZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvdGVtcGxhdGVzL2Rh dGFiYXNlcy9zcWwvOS4xX3BsdXMvcHJvcGVydGllcy5zcWwKKysrIGIvd2ViL3BnYWRtaW4vYnJv d3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3RlbXBsYXRlcy9kYXRhYmFzZXMv c3FsLzkuMV9wbHVzL3Byb3BlcnRpZXMuc3FsCkBAIC00MCw0ICs0MCw2IEBAIEFORAogZGIuZGF0 bmFtZSBpbiAoe3tkYl9yZXN0cmljdGlvbnN9fSkKIHslIGVuZGlmICV9CiAKK0FORCBkYi5kYXRp c3RlbXBsYXRlIGluIChmYWxzZSwge3tzaG93X3N5c3RlbV9vYmplY3RzfX0pCisKIE9SREVSIEJZ IGRhdG5hbWU7CmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMv c2VydmVycy9kYXRhYmFzZXMvdGVtcGxhdGVzL2RhdGFiYXNlcy9zcWwvOS4yX3BsdXMvcHJvcGVy dGllcy5zcWwgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRh YmFzZXMvdGVtcGxhdGVzL2RhdGFiYXNlcy9zcWwvOS4yX3BsdXMvcHJvcGVydGllcy5zcWwKaW5k ZXggMjJmMGZjN2VjLi5iZjRlNTliMmUgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIv c2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy90ZW1wbGF0ZXMvZGF0YWJhc2VzL3NxbC85 LjJfcGx1cy9wcm9wZXJ0aWVzLnNxbAorKysgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9n cm91cHMvc2VydmVycy9kYXRhYmFzZXMvdGVtcGxhdGVzL2RhdGFiYXNlcy9zcWwvOS4yX3BsdXMv cHJvcGVydGllcy5zcWwKQEAgLTQ3LDQgKzQ3LDYgQEAgQU5ECiBkYi5kYXRuYW1lIGluICh7e2Ri X3Jlc3RyaWN0aW9uc319KQogeyUgZW5kaWYgJX0KIAorQU5EIGRiLmRhdGlzdGVtcGxhdGUgaW4g KGZhbHNlLCB7e3Nob3dfc3lzdGVtX29iamVjdHN9fSkKKwogT1JERVIgQlkgZGF0bmFtZTsKZGlm ZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFi YXNlcy90ZW1wbGF0ZXMvZGF0YWJhc2VzL3NxbC9kZWZhdWx0L25vZGVzLnNxbCBiL3dlYi9wZ2Fk bWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy90ZW1wbGF0ZXMvZGF0 YWJhc2VzL3NxbC9kZWZhdWx0L25vZGVzLnNxbAppbmRleCA4MmM1OGQwZTIuLjdkZDYzZmY3YSAx MDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0 YWJhc2VzL3RlbXBsYXRlcy9kYXRhYmFzZXMvc3FsL2RlZmF1bHQvbm9kZXMuc3FsCisrKyBiL3dl Yi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy90ZW1wbGF0 ZXMvZGF0YWJhc2VzL3NxbC9kZWZhdWx0L25vZGVzLnNxbApAQCAtMTQsNCArMTQsNiBAQCBBTkQK IGRiLmRhdG5hbWUgaW4gKHt7ZGJfcmVzdHJpY3Rpb25zfX0pCiB7JSBlbmRpZiAlfQogCitBTkQg ZGIuZGF0aXN0ZW1wbGF0ZSBpbiAoZmFsc2UsIHt7c2hvd19zeXN0ZW1fb2JqZWN0c319KQorCiBP UkRFUiBCWSBkYXRuYW1lOwpkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJf Z3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3RlbXBsYXRlcy9kYXRhYmFzZXMvc3FsL2RlZmF1bHQv cHJvcGVydGllcy5zcWwgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVy cy9kYXRhYmFzZXMvdGVtcGxhdGVzL2RhdGFiYXNlcy9zcWwvZGVmYXVsdC9wcm9wZXJ0aWVzLnNx bAppbmRleCBjOTM2ZjY0ZDYuLjU1ODQ5NTUxNCAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vYnJv d3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3RlbXBsYXRlcy9kYXRhYmFzZXMv c3FsL2RlZmF1bHQvcHJvcGVydGllcy5zcWwKKysrIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2 ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3RlbXBsYXRlcy9kYXRhYmFzZXMvc3FsL2RlZmF1 bHQvcHJvcGVydGllcy5zcWwKQEAgLTMxLDQgKzMxLDYgQEAgQU5ECiBkYi5kYXRuYW1lIGluICh7 e2RiX3Jlc3RyaWN0aW9uc319KQogeyUgZW5kaWYgJX0KIAorQU5EIGRiLmRhdGlzdGVtcGxhdGUg aW4gKGZhbHNlLCB7e3Nob3dfc3lzdGVtX29iamVjdHN9fSkKKwogT1JERVIgQlkgZGF0bmFtZTsK ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL3V0aWxzL2RyaXZlci9wc3ljb3BnMi9jb25uZWN0aW9u LnB5IGIvd2ViL3BnYWRtaW4vdXRpbHMvZHJpdmVyL3BzeWNvcGcyL2Nvbm5lY3Rpb24ucHkKaW5k ZXggNGY0MGU2NTJiLi5mMTliYjIwZTMgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL3V0aWxzL2Ry aXZlci9wc3ljb3BnMi9jb25uZWN0aW9uLnB5CisrKyBiL3dlYi9wZ2FkbWluL3V0aWxzL2RyaXZl ci9wc3ljb3BnMi9jb25uZWN0aW9uLnB5CkBAIC01MTksNyArNTE5LDggQEAgY2xhc3MgQ29ubmVj dGlvbihCYXNlQ29ubmVjdGlvbik6CiBTRUxFQ1QKICAgICBkYi5vaWQgYXMgZGlkLCBkYi5kYXRu YW1lLCBkYi5kYXRhbGxvd2Nvbm4sCiAgICAgcGdfZW5jb2RpbmdfdG9fY2hhcihkYi5lbmNvZGlu ZykgQVMgc2VydmVyZW5jb2RpbmcsCi0gICAgaGFzX2RhdGFiYXNlX3ByaXZpbGVnZShkYi5vaWQs ICdDUkVBVEUnKSBhcyBjYW5jcmVhdGUsIGRhdGxhc3RzeXNvaWQKKyAgICBoYXNfZGF0YWJhc2Vf cHJpdmlsZWdlKGRiLm9pZCwgJ0NSRUFURScpIGFzIGNhbmNyZWF0ZSwgZGF0bGFzdHN5c29pZCwK KyAgICBkYXRpc3RlbXBsYXRlCiBGUk9NCiAgICAgcGdfZGF0YWJhc2UgZGIKIFdIRVJFIGRiLmRh dG5hbWUgPSBjdXJyZW50X2RhdGFiYXNlKCkiIiIpCg== --000000000000e88b6105b67d3711--