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 1lZVJC-0002O1-QU for pgadmin-hackers@arkaria.postgresql.org; Thu, 22 Apr 2021 09:07:39 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.92) (envelope-from ) id 1lZVJB-0000Br-Hj for pgadmin-hackers@arkaria.postgresql.org; Thu, 22 Apr 2021 09:07:37 +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 1lZVJB-0000Bk-69 for pgadmin-hackers@lists.postgresql.org; Thu, 22 Apr 2021 09:07:37 +0000 Received: from mail-pj1-x102c.google.com ([2607:f8b0:4864:20::102c]) by magus.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1lZVJ7-00081k-9b for pgadmin-hackers@postgresql.org; Thu, 22 Apr 2021 09:07:36 +0000 Received: by mail-pj1-x102c.google.com with SMTP id y22-20020a17090a8b16b0290150ae1a6d2bso598865pjn.0 for ; Thu, 22 Apr 2021 02:07:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=enterprisedb-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=lKT7G4o5IrHorC2R+XBPytz1iLT6QlbF7gye1dVyE5c=; b=Q7iwFJTqhQwoO7YVC63m2dMQjBzCTp2dODKZUx2Mv7P+UM6g36XEBwoSL2aiimNz7z 5UTMGx2+ZFMXGuaivZ744jGsx48gKLBe6W5tDyXe5rFl7VH1YGiKmqvm2QTXWUIakYRF XqFtl+U3+SZtGfPluup2UgCzvV/kNFdz9GgBvo/eQ640jzY91GB191vIjYnEYAKJ8P8r OdPxUp457mE5dICttmd2W/GvRqzGwgPrYvLn/uYHmzGfPUnEqjggWm1TeuTC+RXvYGg7 0q4RhSBuMNHsNj6NlxqDMWOclS4dpuqU00ffiDZskuWv89ZaNtik1WKN2+V9O3FyAvBt 62uQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=lKT7G4o5IrHorC2R+XBPytz1iLT6QlbF7gye1dVyE5c=; b=iArcSxT1HS8POWQ9ICd6lWCs4j+4u0wuHj1sWFAV5q9UdInJ1I8d5z9ZoU4jm/Qk4g dDBiWLlDd1TtuUlAre4GfeUBMs1mGWGrRo6tbZUG5h8WAM/zo8cXHV/6evUHQdmux34s HvlWl2E9oyMrIA11qAWRWYJ5G0kDGxrmeyssg+Xj0XtdGIk4TULYjaLOtl30dQOiAk2U DvYYcfG0R4k2rLcVHxyutcbZb7ySjU8xCkO8IowLDXujfLk0q+JtBm26kRTTMGj9N4CS b1OPBLkMbzZZ16R/vjRGAW1DmZ0wC71/u9+zpUmmTYQmQaPB3qOH5I+RTigmW8jJCv5c hn7g== X-Gm-Message-State: AOAM533oK5xxelxOzfK8aBm99RkTNBNGOVqWiNxFGF5qkn1TczPpC6/n lSRDKysddFNIJLrnPQZVwdSJaFR5DtIlcMxPpP0wK8/5p7L24cPofBfD06Dynz1s1RnjqhI+A6u B+QZ5w4/6GsJf8vpMpJku9wVHyW+8ABXICSMI+OUI6JUE8kpbKTimoHlct7mCAzmlEmNCNFZ7+p PR1LAuIATmZxERaX8pFjExLwij6qJM1hn5ITPTAcAP9WDzOMM5M21ieTjGxA== X-Google-Smtp-Source: ABdhPJzO0DMZPg7fY5SP9ELLox8IJ9b+1mUjyGXOY5GXn9za5QJP7j4UPQf4c6Aszj/nCaPhU69HWGoiNdVktB6PoOI= X-Received: by 2002:a17:902:e313:b029:ec:9ca9:ff69 with SMTP id q19-20020a170902e313b02900ec9ca9ff69mr2659802plc.54.1619082450559; Thu, 22 Apr 2021 02:07:30 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Pradip Parkale Date: Thu, 22 Apr 2021 14:37:19 +0530 Message-ID: Subject: Re: [pgAdmin][RM6385]: Backup on a shared server doesn't seem to work To: Akshay Joshi Cc: pgadmin-hackers Content-Type: multipart/mixed; boundary="0000000000005413c605c08c02f1" 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 --0000000000005413c605c08c02f1 Content-Type: multipart/alternative; boundary="0000000000005413c305c08c02ef" --0000000000005413c305c08c02ef Content-Type: text/plain; charset="UTF-8" Hi Akshay, Please find the updated patch. I did some modifications as some cases were failing due to my initial changes. Sorry for the inconvenience. On Wed, Apr 14, 2021 at 12:13 PM Akshay Joshi wrote: > Thanks, patch applied. > > On Tue, Apr 13, 2021 at 10:35 PM Pradip Parkale < > pradip.parkale@enterprisedb.com> wrote: > >> Hi Hackers, >> >> Please find the attached patch for #6385 Backup on a shared server >> doesn't seem to work. >> >> >> >> -- >> Thanks & Regards, >> Pradip Parkale >> Software Engineer | EnterpriseDB Corporation >> > > > -- > *Thanks & Regards* > *Akshay Joshi* > *pgAdmin Hacker | Principal Software Architect* > *EDB Postgres * > > *Mobile: +91 976-788-8246* > -- Thanks & Regards, Pradip Parkale Software Engineer | EnterpriseDB Corporation --0000000000005413c305c08c02ef Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi Akshay,

Please find the updated patc= h. I did some modifications as some cases were failing due to my initial=C2= =A0changes.
Sorry for the inconvenience.

On Wed, Apr 14, 202= 1 at 12:13 PM Akshay Joshi <akshay.joshi@enterprisedb.com> wrote:
Thanks, patch applied.

On Tue, Apr 13, 2= 021 at 10:35 PM Pradip Parkale <pradip.parkale@enterprisedb.com> wrote:=
Hi Hackers,
Please find the attached patch for #6385=C2=A0Backup on a = shared server doesn't seem to work.



--
Thanks & Regards,
Pradip Parkale
Software Engineer | EnterpriseDB Corporation


--
Thank= s & Regards
Akshay Joshi
pgAdmin Hacker | Principal Softw= are Architect
EDB Po= stgres
Mobile: +91 976-788-8246



--
Thanks & Regards,
=
Pradip Parkale
Software Engineer |= EnterpriseDB Corporation
--0000000000005413c305c08c02ef-- --0000000000005413c605c08c02f1 Content-Type: application/x-patch; name="RM6385_v2.patch" Content-Disposition: attachment; filename="RM6385_v2.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_knsn2sgq0 ZGlmZiAtLWdpdCBhL3dlYi9taWdyYXRpb25zL3ZlcnNpb25zL2M2OTc0ZjY0ZGYwOF8ucHkgYi93 ZWIvbWlncmF0aW9ucy92ZXJzaW9ucy9jNjk3NGY2NGRmMDhfLnB5Cm5ldyBmaWxlIG1vZGUgMTAw NjQ0CmluZGV4IDAwMDAwMDAwMC4uMjc3ODUzNjMxCi0tLSAvZGV2L251bGwKKysrIGIvd2ViL21p Z3JhdGlvbnMvdmVyc2lvbnMvYzY5NzRmNjRkZjA4Xy5weQpAQCAtMCwwICsxLDI4IEBACisKKyIi ImVtcHR5IG1lc3NhZ2UKKworUmV2aXNpb24gSUQ6IGM2OTc0ZjY0ZGYwOAorUmV2aXNlczogYTM5 YmQwMTViNjQ0CitDcmVhdGUgRGF0ZTogMjAyMS0wNC0yMiAxMDowNjoyMS4yODI3NzAKKworIiIi Citmcm9tIHBnYWRtaW4ubW9kZWwgaW1wb3J0IGRiCisKKworCisjIHJldmlzaW9uIGlkZW50aWZp ZXJzLCB1c2VkIGJ5IEFsZW1iaWMuCityZXZpc2lvbiA9ICdjNjk3NGY2NGRmMDgnCitkb3duX3Jl dmlzaW9uID0gJ2EzOWJkMDE1YjY0NCcKK2JyYW5jaF9sYWJlbHMgPSBOb25lCitkZXBlbmRzX29u ID0gTm9uZQorCisKK2RlZiB1cGdyYWRlKCk6CisgICAgZGIuZW5naW5lLmV4ZWN1dGUoCisgICAg ICAgICdBTFRFUiBUQUJMRSBzaGFyZWRzZXJ2ZXIgQUREIENPTFVNTiBvc2lkIElOVEVHRVInCisg ICAgKQorCisKK2RlZiBkb3duZ3JhZGUoKToKKyAgICAjIHBnQWRtaW4gb25seSB1cGdyYWRlcywg ZG93bmdyYWRlIG5vdCBpbXBsZW1lbnRlZC4KKyAgICBwYXNzCmRpZmYgLS1naXQgYS93ZWIvcGdh ZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9fX2luaXRfXy5weSBiL3dlYi9wZ2Fk bWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL19faW5pdF9fLnB5CmluZGV4IDAwMDI1 MTk2Yi4uMjMzZWEwN2Y4IDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9n cm91cHMvc2VydmVycy9fX2luaXRfXy5weQorKysgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZl cl9ncm91cHMvc2VydmVycy9fX2luaXRfXy5weQpAQCAtMzM5LDYgKzMzOSw3IEBAIGNsYXNzIFNl cnZlck1vZHVsZShzZy5TZXJ2ZXJHcm91cFBsdWdpbk1vZHVsZSk6CiAgICAgICAgICAgICBkYi5z ZXNzaW9uLnJvbGxiYWNrKCkKICAgICAgICAgICAgIHVzZXIgPSBVc2VyLnF1ZXJ5LmZpbHRlcl9i eShpZD1kYXRhLnVzZXJfaWQpLmZpcnN0KCkKICAgICAgICAgICAgIHNoYXJlZF9zZXJ2ZXIgPSBT aGFyZWRTZXJ2ZXIoCisgICAgICAgICAgICAgICAgb3NpZD1kYXRhLmlkLAogICAgICAgICAgICAg ICAgIHVzZXJfaWQ9Y3VycmVudF91c2VyLmlkLAogICAgICAgICAgICAgICAgIHNlcnZlcl9vd25l cj11c2VyLnVzZXJuYW1lLAogICAgICAgICAgICAgICAgIHNlcnZlcmdyb3VwX2lkPWdpZCwKQEAg LTM4OCwxNCArMzg5LDE0IEBAIGNsYXNzIFNlcnZlck1vZHVsZShzZy5TZXJ2ZXJHcm91cFBsdWdp bk1vZHVsZSk6CiAgICAgICAgICIiIgogICAgICAgICBzaGFyZWRfc2VydmVyID0gU2hhcmVkU2Vy dmVyLnF1ZXJ5LmZpbHRlcl9ieSgKICAgICAgICAgICAgIG5hbWU9c2VydmVyLm5hbWUsIHVzZXJf aWQ9Y3VycmVudF91c2VyLmlkLAotICAgICAgICAgICAgc2VydmVyZ3JvdXBfaWQ9Z2lkKS5maXJz dCgpCisgICAgICAgICAgICBzZXJ2ZXJncm91cF9pZD1naWQsIG9zaWQ9c2VydmVyLmlkKS5maXJz dCgpCiAKICAgICAgICAgaWYgc2hhcmVkX3NlcnZlciBpcyBOb25lOgogICAgICAgICAgICAgU2Vy dmVyTW9kdWxlLmNyZWF0ZV9zaGFyZWRfc2VydmVyKHNlcnZlciwgZ2lkKQogCiAgICAgICAgICAg ICBzaGFyZWRfc2VydmVyID0gU2hhcmVkU2VydmVyLnF1ZXJ5LmZpbHRlcl9ieSgKICAgICAgICAg ICAgICAgICBuYW1lPXNlcnZlci5uYW1lLCB1c2VyX2lkPWN1cnJlbnRfdXNlci5pZCwKLSAgICAg ICAgICAgICAgICBzZXJ2ZXJncm91cF9pZD1naWQpLmZpcnN0KCkKKyAgICAgICAgICAgICAgICBz ZXJ2ZXJncm91cF9pZD1naWQsIG9zaWQ9c2VydmVyLmlkKS5maXJzdCgpCiAKICAgICAgICAgcmV0 dXJuIHNoYXJlZF9zZXJ2ZXIKIApkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vbW9kZWwvX19pbml0 X18ucHkgYi93ZWIvcGdhZG1pbi9tb2RlbC9fX2luaXRfXy5weQppbmRleCBkMWY0OTgxODEuLmQ4 NDliOGMyNiAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vbW9kZWwvX19pbml0X18ucHkKKysrIGIv d2ViL3BnYWRtaW4vbW9kZWwvX19pbml0X18ucHkKQEAgLTI5LDcgKzI5LDcgQEAgZnJvbSBmbGFz a19zcWxhbGNoZW15IGltcG9ydCBTUUxBbGNoZW15CiAjCiAjIyMjIyMjIyMjIyMjIyMjIyMjIyMj IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIwogCi1T Q0hFTUFfVkVSU0lPTiA9IDI3CitTQ0hFTUFfVkVSU0lPTiA9IDI4CiAKICMjIyMjIyMjIyMjIyMj IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj IyMjCiAjCkBAIC0zNjEsNiArMzYxLDExIEBAIGNsYXNzIFNoYXJlZFNlcnZlcihkYi5Nb2RlbCk6 CiAKICAgICBfX3RhYmxlbmFtZV9fID0gJ3NoYXJlZHNlcnZlcicKICAgICBpZCA9IGRiLkNvbHVt bihkYi5JbnRlZ2VyLCBwcmltYXJ5X2tleT1UcnVlKQorICAgIG9zaWQgPSBkYi5Db2x1bW4oCisg ICAgICAgIGRiLkludGVnZXIsCisgICAgICAgIGRiLkZvcmVpZ25LZXkoJ3NlcnZlci5pZCcpLAor ICAgICAgICBudWxsYWJsZT1GYWxzZQorICAgICkKICAgICB1c2VyX2lkID0gZGIuQ29sdW1uKAog ICAgICAgICBkYi5JbnRlZ2VyLAogICAgICAgICBkYi5Gb3JlaWduS2V5KFVTRVJfSUQpCmRpZmYg LS1naXQgYS93ZWIvcGdhZG1pbi90b29scy9iYWNrdXAvX19pbml0X18ucHkgYi93ZWIvcGdhZG1p bi90b29scy9iYWNrdXAvX19pbml0X18ucHkKaW5kZXggYWFjYjJlNWQ0Li4yZTE2NmI1YjQgMTAw NjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL3Rvb2xzL2JhY2t1cC9fX2luaXRfXy5weQorKysgYi93ZWIv cGdhZG1pbi90b29scy9iYWNrdXAvX19pbml0X18ucHkKQEAgLTIwLDcgKzIwLDcgQEAgZnJvbSBm bGFza19iYWJlbGV4IGltcG9ydCBnZXR0ZXh0IGFzIF8KIGZyb20gZmxhc2tfc2VjdXJpdHkgaW1w b3J0IGxvZ2luX3JlcXVpcmVkLCBjdXJyZW50X3VzZXIKIGZyb20gcGdhZG1pbi5taXNjLmJncHJv Y2Vzcy5wcm9jZXNzZXMgaW1wb3J0IEJhdGNoUHJvY2VzcywgSVByb2Nlc3NEZXNjCiBmcm9tIHBn YWRtaW4udXRpbHMgaW1wb3J0IFBnQWRtaW5Nb2R1bGUsIGdldF9zdG9yYWdlX2RpcmVjdG9yeSwg aHRtbCwgXAotICAgIGZzX3Nob3J0X3BhdGgsIGRvY3VtZW50X2RpciwgZG9lc191dGlsaXR5X2V4 aXN0CisgICAgZnNfc2hvcnRfcGF0aCwgZG9jdW1lbnRfZGlyLCBkb2VzX3V0aWxpdHlfZXhpc3Qs IGdldF9zZXJ2ZXIKIGZyb20gcGdhZG1pbi51dGlscy5hamF4IGltcG9ydCBtYWtlX2pzb25fcmVz cG9uc2UsIGJhZF9yZXF1ZXN0CiAKIGZyb20gY29uZmlnIGltcG9ydCBQR19ERUZBVUxUX0RSSVZF UgpAQCAtMTE1LDE1ICsxMTUsNyBAQCBjbGFzcyBCYWNrdXBNZXNzYWdlKElQcm9jZXNzRGVzYyk6 CiAgICAgICAgICAgICAgICAgc2VsZi5jbWQgKz0gY21kX2FyZyhhcmcpCiAKICAgICBkZWYgZ2V0 X3NlcnZlcl9kZXRhaWxzKHNlbGYpOgotICAgICAgICBpZiBTZXJ2ZXIucXVlcnkuZmlsdGVyX2J5 KGlkPXNlbGYuc2lkLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVzZXJfaWQ9 Y3VycmVudF91c2VyLmlkKS5maXJzdCgpOgotICAgICAgICAgICAgcyA9IFNlcnZlci5xdWVyeS5m aWx0ZXJfYnkoCi0gICAgICAgICAgICAgICAgaWQ9c2VsZi5zaWQsIHVzZXJfaWQ9Y3VycmVudF91 c2VyLmlkCi0gICAgICAgICAgICApLmZpcnN0KCkKLSAgICAgICAgZWxzZToKLSAgICAgICAgICAg IHMgPSBTaGFyZWRTZXJ2ZXIucXVlcnkuZmlsdGVyX2J5KAotICAgICAgICAgICAgICAgIGlkPXNl bGYuc2lkLCB1c2VyX2lkPWN1cnJlbnRfdXNlci5pZAotICAgICAgICAgICAgKS5maXJzdCgpCisg ICAgICAgIHMgPSBnZXRfc2VydmVyKHNlbGYuc2lkKQogCiAgICAgICAgIGZyb20gcGdhZG1pbi51 dGlscy5kcml2ZXIgaW1wb3J0IGdldF9kcml2ZXIKICAgICAgICAgZHJpdmVyID0gZ2V0X2RyaXZl cihQR19ERUZBVUxUX0RSSVZFUikKQEAgLTQyMiwxNCArNDE0LDcgQEAgZGVmIGNyZWF0ZV9iYWNr dXBfb2JqZWN0c19qb2Ioc2lkKToKICAgICAgICAgcmV0dXJuIGJhZF9yZXF1ZXN0KGVycm9ybXNn PXN0cihlKSkKIAogICAgICMgRmV0Y2ggdGhlIHNlcnZlciBkZXRhaWxzIGxpa2UgaG9zdG5hbWUs IHBvcnQsIHJvbGVzIGV0YwotICAgIGlmIFNlcnZlci5xdWVyeS5maWx0ZXJfYnkoaWQ9c2lkLCB1 c2VyX2lkPWN1cnJlbnRfdXNlci5pZCkuZmlyc3QoKToKLSAgICAgICAgc2VydmVyID0gU2VydmVy LnF1ZXJ5LmZpbHRlcl9ieSgKLSAgICAgICAgICAgIGlkPXNpZCwgdXNlcl9pZD1jdXJyZW50X3Vz ZXIuaWQKLSAgICAgICAgKS5maXJzdCgpCi0gICAgZWxzZToKLSAgICAgICAgc2VydmVyID0gU2hh cmVkU2VydmVyLnF1ZXJ5LmZpbHRlcl9ieSgKLSAgICAgICAgICAgIGlkPXNpZCwgdXNlcl9pZD1j dXJyZW50X3VzZXIuaWQKLSAgICAgICAgKS5maXJzdCgpCisgICAgc2VydmVyID0gZ2V0X3NlcnZl cihzaWQpCiAKICAgICBpZiBzZXJ2ZXIgaXMgTm9uZToKICAgICAgICAgcmV0dXJuIG1ha2VfanNv bl9yZXNwb25zZSgKQEAgLTQ3NCw3ICs0NTksNyBAQCBkZWYgY3JlYXRlX2JhY2t1cF9vYmplY3Rz X2pvYihzaWQpOgogICAgICAgICAgICAgZXNjYXBlZF9hcmdzLmFwcGVuZChkYXRhWydkYXRhYmFz ZSddKQogICAgICAgICAgICAgcCA9IEJhdGNoUHJvY2VzcygKICAgICAgICAgICAgICAgICBkZXNj PUJhY2t1cE1lc3NhZ2UoCi0gICAgICAgICAgICAgICAgICAgIEJBQ0tVUC5PQkpFQ1QsIHNpZCwg YmZpbGUsCisgICAgICAgICAgICAgICAgICAgIEJBQ0tVUC5PQkpFQ1QsIHNlcnZlci5pZCwgYmZp bGUsCiAgICAgICAgICAgICAgICAgICAgICphcmdzLAogICAgICAgICAgICAgICAgICAgICBkYXRh YmFzZT1kYXRhWydkYXRhYmFzZSddCiAgICAgICAgICAgICAgICAgKSwKQEAgLTQ4NSw3ICs0NzAs NyBAQCBkZWYgY3JlYXRlX2JhY2t1cF9vYmplY3RzX2pvYihzaWQpOgogICAgICAgICAgICAgICAg IGRlc2M9QmFja3VwTWVzc2FnZSgKICAgICAgICAgICAgICAgICAgICAgQkFDS1VQLlNFUlZFUiBp ZiBiYWNrdXBfb2JqX3R5cGUgIT0gJ2dsb2JhbHMnCiAgICAgICAgICAgICAgICAgICAgIGVsc2Ug QkFDS1VQLkdMT0JBTFMsCi0gICAgICAgICAgICAgICAgICAgIHNpZCwgYmZpbGUsCisgICAgICAg ICAgICAgICAgICAgIHNlcnZlci5pZCwgYmZpbGUsCiAgICAgICAgICAgICAgICAgICAgICphcmdz CiAgICAgICAgICAgICAgICAgKSwKICAgICAgICAgICAgICAgICBjbWQ9dXRpbGl0eSwgYXJncz1l c2NhcGVkX2FyZ3MKQEAgLTUzMSwxNCArNTE2LDcgQEAgZGVmIGNoZWNrX3V0aWxpdHlfZXhpc3Rz KHNpZCwgYmFja3VwX29ial90eXBlKToKICAgICBSZXR1cm5zOgogICAgICAgICBOb25lCiAgICAg IiIiCi0gICAgaWYgU2VydmVyLnF1ZXJ5LmZpbHRlcl9ieShpZD1zaWQsIHVzZXJfaWQ9Y3VycmVu dF91c2VyLmlkKS5maXJzdCgpOgotICAgICAgICBzZXJ2ZXIgPSBTZXJ2ZXIucXVlcnkuZmlsdGVy X2J5KAotICAgICAgICAgICAgaWQ9c2lkLCB1c2VyX2lkPWN1cnJlbnRfdXNlci5pZAotICAgICAg ICApLmZpcnN0KCkKLSAgICBlbHNlOgotICAgICAgICBzZXJ2ZXIgPSBTaGFyZWRTZXJ2ZXIucXVl cnkuZmlsdGVyX2J5KAotICAgICAgICAgICAgaWQ9c2lkLCB1c2VyX2lkPWN1cnJlbnRfdXNlci5p ZAotICAgICAgICApLmZpcnN0KCkKKyAgICBzZXJ2ZXIgPSBnZXRfc2VydmVyKHNpZCkKIAogICAg IGlmIHNlcnZlciBpcyBOb25lOgogICAgICAgICByZXR1cm4gbWFrZV9qc29uX3Jlc3BvbnNlKApk aWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vdG9vbHMvbWFpbnRlbmFuY2UvX19pbml0X18ucHkgYi93 ZWIvcGdhZG1pbi90b29scy9tYWludGVuYW5jZS9fX2luaXRfXy5weQppbmRleCAxNjA1NzNhMWMu LjM3OGIwMDAyMCAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vdG9vbHMvbWFpbnRlbmFuY2UvX19p bml0X18ucHkKKysrIGIvd2ViL3BnYWRtaW4vdG9vbHMvbWFpbnRlbmFuY2UvX19pbml0X18ucHkK QEAgLTE1LDcgKzE1LDcgQEAgZnJvbSBmbGFzayBpbXBvcnQgdXJsX2ZvciwgUmVzcG9uc2UsIHJl bmRlcl90ZW1wbGF0ZSwgcmVxdWVzdCwgY3VycmVudF9hcHAKIGZyb20gZmxhc2tfYmFiZWxleCBp bXBvcnQgZ2V0dGV4dCBhcyBfCiBmcm9tIGZsYXNrX3NlY3VyaXR5IGltcG9ydCBsb2dpbl9yZXF1 aXJlZCwgY3VycmVudF91c2VyCiBmcm9tIHBnYWRtaW4ubWlzYy5iZ3Byb2Nlc3MucHJvY2Vzc2Vz IGltcG9ydCBCYXRjaFByb2Nlc3MsIElQcm9jZXNzRGVzYwotZnJvbSBwZ2FkbWluLnV0aWxzIGlt cG9ydCBQZ0FkbWluTW9kdWxlLCBodG1sLCBkb2VzX3V0aWxpdHlfZXhpc3QKK2Zyb20gcGdhZG1p bi51dGlscyBpbXBvcnQgUGdBZG1pbk1vZHVsZSwgaHRtbCwgZG9lc191dGlsaXR5X2V4aXN0LCBn ZXRfc2VydmVyCiBmcm9tIHBnYWRtaW4udXRpbHMuYWpheCBpbXBvcnQgYmFkX3JlcXVlc3QsIG1h a2VfanNvbl9yZXNwb25zZQogZnJvbSBwZ2FkbWluLnV0aWxzLmRyaXZlciBpbXBvcnQgZ2V0X2Ry aXZlcgogCkBAIC0yMDksMTQgKzIwOSw4IEBAIGRlZiBjcmVhdGVfbWFpbnRlbmFuY2Vfam9iKHNp ZCwgZGlkKToKICAgICBpbmRleF9uYW1lID0gZ2V0X2luZGV4X25hbWUoZGF0YSkKIAogICAgICMg RmV0Y2ggdGhlIHNlcnZlciBkZXRhaWxzIGxpa2UgaG9zdG5hbWUsIHBvcnQsIHJvbGVzIGV0Ywot ICAgIGlmIFNlcnZlci5xdWVyeS5maWx0ZXJfYnkoaWQ9c2lkLCB1c2VyX2lkPWN1cnJlbnRfdXNl ci5pZCkuZmlyc3QoKToKLSAgICAgICAgc2VydmVyID0gU2VydmVyLnF1ZXJ5LmZpbHRlcl9ieSgK LSAgICAgICAgICAgIGlkPXNpZCwgdXNlcl9pZD1jdXJyZW50X3VzZXIuaWQKLSAgICAgICAgKS5m aXJzdCgpCi0gICAgZWxzZToKLSAgICAgICAgc2VydmVyID0gU2hhcmVkU2VydmVyLnF1ZXJ5LmZp bHRlcl9ieSgKLSAgICAgICAgICAgIGlkPXNpZCwgdXNlcl9pZD1jdXJyZW50X3VzZXIuaWQKLSAg ICAgICAgKS5maXJzdCgpCisKKyAgICBzZXJ2ZXIgPSBnZXRfc2VydmVyKHNpZCkKIAogICAgIGlm IHNlcnZlciBpcyBOb25lOgogICAgICAgICByZXR1cm4gbWFrZV9qc29uX3Jlc3BvbnNlKApAQCAt MjYzLDcgKzI1Nyw3IEBAIGRlZiBjcmVhdGVfbWFpbnRlbmFuY2Vfam9iKHNpZCwgZGlkKToKIAog ICAgIHRyeToKICAgICAgICAgcCA9IEJhdGNoUHJvY2VzcygKLSAgICAgICAgICAgIGRlc2M9TWVz c2FnZShzaWQsIGRhdGEsIHF1ZXJ5KSwKKyAgICAgICAgICAgIGRlc2M9TWVzc2FnZShzZXJ2ZXIu aWQsIGRhdGEsIHF1ZXJ5KSwKICAgICAgICAgICAgIGNtZD11dGlsaXR5LCBhcmdzPWFyZ3MKICAg ICAgICAgKQogICAgICAgICBtYW5hZ2VyLmV4cG9ydF9wYXNzd29yZF9lbnYocC5pZCkKQEAgLTMw NiwxOCArMzAwLDggQEAgZGVmIGNoZWNrX3V0aWxpdHlfZXhpc3RzKHNpZCk6CiAgICAgUmV0dXJu czoKICAgICAgICAgTm9uZQogICAgICIiIgotICAgICMgc2VydmVyID0gU2VydmVyLnF1ZXJ5LmZp bHRlcl9ieSgKLSAgICAjICAgICBpZD1zaWQsIHVzZXJfaWQ9Y3VycmVudF91c2VyLmlkCi0gICAg IyApLmZpcnN0KCkKLQotICAgIGlmIFNlcnZlci5xdWVyeS5maWx0ZXJfYnkoaWQ9c2lkLCB1c2Vy X2lkPWN1cnJlbnRfdXNlci5pZCkuZmlyc3QoKToKLSAgICAgICAgc2VydmVyID0gU2VydmVyLnF1 ZXJ5LmZpbHRlcl9ieSgKLSAgICAgICAgICAgIGlkPXNpZCwgdXNlcl9pZD1jdXJyZW50X3VzZXIu aWQKLSAgICAgICAgKS5maXJzdCgpCi0gICAgZWxzZToKLSAgICAgICAgc2VydmVyID0gU2hhcmVk U2VydmVyLnF1ZXJ5LmZpbHRlcl9ieSgKLSAgICAgICAgICAgIGlkPXNpZCwgdXNlcl9pZD1jdXJy ZW50X3VzZXIuaWQKLSAgICAgICAgKS5maXJzdCgpCisKKyAgICBzZXJ2ZXIgPSBnZXRfc2VydmVy KHNpZCkKIAogICAgIGlmIHNlcnZlciBpcyBOb25lOgogICAgICAgICByZXR1cm4gbWFrZV9qc29u X3Jlc3BvbnNlKApkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vdG9vbHMvcmVzdG9yZS9fX2luaXRf Xy5weSBiL3dlYi9wZ2FkbWluL3Rvb2xzL3Jlc3RvcmUvX19pbml0X18ucHkKaW5kZXggM2JiOWE5 YzVkLi45NGZhYzgwNDYgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL3Rvb2xzL3Jlc3RvcmUvX19p bml0X18ucHkKKysrIGIvd2ViL3BnYWRtaW4vdG9vbHMvcmVzdG9yZS9fX2luaXRfXy5weQpAQCAt MTgsNyArMTgsNyBAQCBmcm9tIGZsYXNrX2JhYmVsZXggaW1wb3J0IGdldHRleHQgYXMgXwogZnJv bSBmbGFza19zZWN1cml0eSBpbXBvcnQgbG9naW5fcmVxdWlyZWQsIGN1cnJlbnRfdXNlcgogZnJv bSBwZ2FkbWluLm1pc2MuYmdwcm9jZXNzLnByb2Nlc3NlcyBpbXBvcnQgQmF0Y2hQcm9jZXNzLCBJ UHJvY2Vzc0Rlc2MKIGZyb20gcGdhZG1pbi51dGlscyBpbXBvcnQgUGdBZG1pbk1vZHVsZSwgZ2V0 X3N0b3JhZ2VfZGlyZWN0b3J5LCBodG1sLCBcCi0gICAgZnNfc2hvcnRfcGF0aCwgZG9jdW1lbnRf ZGlyLCBkb2VzX3V0aWxpdHlfZXhpc3QKKyAgICBmc19zaG9ydF9wYXRoLCBkb2N1bWVudF9kaXIs IGRvZXNfdXRpbGl0eV9leGlzdCwgZ2V0X3NlcnZlcgogZnJvbSBwZ2FkbWluLnV0aWxzLmFqYXgg aW1wb3J0IG1ha2VfanNvbl9yZXNwb25zZSwgYmFkX3JlcXVlc3QKIAogZnJvbSBjb25maWcgaW1w b3J0IFBHX0RFRkFVTFRfRFJJVkVSCkBAIC04NywxNiArODcsOSBAQCBjbGFzcyBSZXN0b3JlTWVz c2FnZShJUHJvY2Vzc0Rlc2MpOgogICAgICAgICAgICAgICAgIHNlbGYuY21kICs9IGNtZF9hcmco YXJnKQogCiAgICAgZGVmIGdldF9zZXJ2ZXJfZGV0YWlscyhzZWxmKToKKwogICAgICAgICAjIEZl dGNoIHRoZSBzZXJ2ZXIgZGV0YWlscyBsaWtlIGhvc3RuYW1lLCBwb3J0LCByb2xlcyBldGMKLSAg ICAgICAgaWYgU2VydmVyLnF1ZXJ5LmZpbHRlcl9ieShpZD1zZWxmLnNpZCwKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICB1c2VyX2lkPWN1cnJlbnRfdXNlci5pZCkuZmlyc3QoKToK LSAgICAgICAgICAgIHMgPSBTZXJ2ZXIucXVlcnkuZmlsdGVyX2J5KAotICAgICAgICAgICAgICAg IGlkPXNlbGYuc2lkLCB1c2VyX2lkPWN1cnJlbnRfdXNlci5pZAotICAgICAgICAgICAgKS5maXJz dCgpCi0gICAgICAgIGVsc2U6Ci0gICAgICAgICAgICBzID0gU2hhcmVkU2VydmVyLnF1ZXJ5LmZp bHRlcl9ieSgKLSAgICAgICAgICAgICAgICBpZD1zZWxmLnNpZCwgdXNlcl9pZD1jdXJyZW50X3Vz ZXIuaWQKLSAgICAgICAgICAgICkuZmlyc3QoKQorICAgICAgICBzID0gZ2V0X3NlcnZlcihzZWxm LnNpZCkKIAogICAgICAgICBmcm9tIHBnYWRtaW4udXRpbHMuZHJpdmVyIGltcG9ydCBnZXRfZHJp dmVyCiAgICAgICAgIGRyaXZlciA9IGdldF9kcml2ZXIoUEdfREVGQVVMVF9EUklWRVIpCkBAIC0y MTUsMTQgKzIwOCw3IEBAIGRlZiBfY29ubmVjdF9zZXJ2ZXIoc2lkKToKICAgICA6cGFyYW0gc2lk OiBTZXJ2ZXIgSUQuCiAgICAgOnJldHVybjogaWYgbm90IGVycm9yIG9jY3VycmVkIHRoZW4gcmV0 dXJuIGNvbm5lY3Rpb24gZGF0YS4KICAgICAiIiIKLSAgICBpZiBTZXJ2ZXIucXVlcnkuZmlsdGVy X2J5KGlkPXNpZCwgdXNlcl9pZD1jdXJyZW50X3VzZXIuaWQpLmZpcnN0KCk6Ci0gICAgICAgIHNl cnZlciA9IFNlcnZlci5xdWVyeS5maWx0ZXJfYnkoCi0gICAgICAgICAgICBpZD1zaWQsIHVzZXJf aWQ9Y3VycmVudF91c2VyLmlkCi0gICAgICAgICkuZmlyc3QoKQotICAgIGVsc2U6Ci0gICAgICAg IHNlcnZlciA9IFNoYXJlZFNlcnZlci5xdWVyeS5maWx0ZXJfYnkoCi0gICAgICAgICAgICBpZD1z aWQsIHVzZXJfaWQ9Y3VycmVudF91c2VyLmlkCi0gICAgICAgICkuZmlyc3QoKQorICAgIHNlcnZl ciA9IGdldF9zZXJ2ZXIoc2lkKQogCiAgICAgaWYgc2VydmVyIGlzIE5vbmU6CiAgICAgICAgIHJl dHVybiBtYWtlX2pzb25fcmVzcG9uc2UoCkBAIC00MzAsNyArNDE2LDcgQEAgZGVmIGNyZWF0ZV9y ZXN0b3JlX2pvYihzaWQpOgogICAgIHRyeToKICAgICAgICAgcCA9IEJhdGNoUHJvY2VzcygKICAg ICAgICAgICAgIGRlc2M9UmVzdG9yZU1lc3NhZ2UoCi0gICAgICAgICAgICAgICAgc2lkLAorICAg ICAgICAgICAgICAgIHNlcnZlci5pZCwKICAgICAgICAgICAgICAgICBkYXRhWydmaWxlJ10uZW5j b2RlKCd1dGYtOCcpIGlmIGhhc2F0dHIoCiAgICAgICAgICAgICAgICAgICAgIGRhdGFbJ2ZpbGUn XSwgJ2VuY29kZScKICAgICAgICAgICAgICAgICApIGVsc2UgZGF0YVsnZmlsZSddLApAQCAtNDc3 LDE0ICs0NjMsNyBAQCBkZWYgY2hlY2tfdXRpbGl0eV9leGlzdHMoc2lkKToKICAgICAgICAgTm9u ZQogICAgICIiIgogICAgICMgRmV0Y2ggdGhlIHNlcnZlciBkZXRhaWxzIGxpa2UgaG9zdG5hbWUs IHBvcnQsIHJvbGVzIGV0YwotICAgIGlmIFNlcnZlci5xdWVyeS5maWx0ZXJfYnkoaWQ9c2lkLCB1 c2VyX2lkPWN1cnJlbnRfdXNlci5pZCkuZmlyc3QoKToKLSAgICAgICAgc2VydmVyID0gU2VydmVy LnF1ZXJ5LmZpbHRlcl9ieSgKLSAgICAgICAgICAgIGlkPXNpZCwgdXNlcl9pZD1jdXJyZW50X3Vz ZXIuaWQKLSAgICAgICAgKS5maXJzdCgpCi0gICAgZWxzZToKLSAgICAgICAgc2VydmVyID0gU2hh cmVkU2VydmVyLnF1ZXJ5LmZpbHRlcl9ieSgKLSAgICAgICAgICAgIGlkPXNpZCwgdXNlcl9pZD1j dXJyZW50X3VzZXIuaWQKLSAgICAgICAgKS5maXJzdCgpCisgICAgc2VydmVyID0gZ2V0X3NlcnZl cihzaWQpCiAKICAgICBpZiBzZXJ2ZXIgaXMgTm9uZToKICAgICAgICAgcmV0dXJuIG1ha2VfanNv bl9yZXNwb25zZSgKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL3V0aWxzL19faW5pdF9fLnB5IGIv d2ViL3BnYWRtaW4vdXRpbHMvX19pbml0X18ucHkKaW5kZXggODM2NTlhNjUzLi43MDVlN2Q5OTEg MTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL3V0aWxzL19faW5pdF9fLnB5CisrKyBiL3dlYi9wZ2Fk bWluL3V0aWxzL19faW5pdF9fLnB5CkBAIC0xOSw2ICsxOSw3IEBAIGZyb20gdGhyZWFkaW5nIGlt cG9ydCBMb2NrCiAKIGZyb20gLnBhdGhzIGltcG9ydCBnZXRfc3RvcmFnZV9kaXJlY3RvcnkKIGZy b20gLnByZWZlcmVuY2VzIGltcG9ydCBQcmVmZXJlbmNlcworZnJvbSBwZ2FkbWluLm1vZGVsIGlt cG9ydCBTZXJ2ZXIsIFNoYXJlZFNlcnZlcgogCiAKIGNsYXNzIFBnQWRtaW5Nb2R1bGUoQmx1ZXBy aW50KToKQEAgLTI3OCw2ICsyNzksMTYgQEAgZGVmIGRvZXNfdXRpbGl0eV9leGlzdChmaWxlKToK ICAgICByZXR1cm4gZXJyb3JfbXNnCiAKIAorZGVmIGdldF9zZXJ2ZXIoc2lkKToKKyAgICAiIiIK KyAgICAjIEZldGNoIHRoZSBzZXJ2ZXIgIGV0YworICAgIDpwYXJhbSBzaWQ6CisgICAgOnJldHVy bjogc2VydmVyCisgICAgIiIiCisgICAgc2VydmVyID0gU2VydmVyLnF1ZXJ5LmZpbHRlcl9ieShp ZD1zaWQpLmZpcnN0KCkKKyAgICByZXR1cm4gc2VydmVyCisKKwogIyBTaG9ydGN1dCBjb25maWd1 cmF0aW9uIGZvciBBY2Nlc3NrZXkKIEFDQ0VTU0tFWV9GSUVMRFMgPSBbCiAgICAgewo= --0000000000005413c605c08c02f1--