Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1qnzWZ-00CgW1-Dp for pgsql-hackers@arkaria.postgresql.org; Wed, 04 Oct 2023 10:54:39 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.94.2) (envelope-from ) id 1qnzWW-00E3vQ-Ld for pgsql-hackers@arkaria.postgresql.org; Wed, 04 Oct 2023 10:54:36 +0000 Received: from magus.postgresql.org ([2a02:c0:301:0:ffff::29]) by malur.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1qnzWW-00E3vH-8u for pgsql-hackers@lists.postgresql.org; Wed, 04 Oct 2023 10:54:36 +0000 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by magus.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.94.2) (envelope-from ) id 1qnzWO-0090n3-Ld for pgsql-hackers@lists.postgresql.org; Wed, 04 Oct 2023 10:54:35 +0000 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-3226cc3e324so1926675f8f.3 for ; Wed, 04 Oct 2023 03:54:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696416866; x=1697021666; darn=lists.postgresql.org; h=in-reply-to:from:references:cc:to:content-language:subject :user-agent:mime-version:date:message-id:from:to:cc:subject:date :message-id:reply-to; bh=VnBUsjzG7SIOqYxg7tECuS2AYJBvcgm6jv6GuKXeeHs=; b=hdVw15Au3InNAjd6q3uCro3oKaly1AwvxDuNKmq/O9l3RLHn/8rxi4Y3oF1gDwM75r /6ObuMOtlvGi0XZnNE12ThCu+quSPaAMH6NOemgNTsADga9lMBhVtm35M4upSzR72Jxf wfwI1kteigwqX07fbzB23atkBLID9hZmXWjEVUcMq+b2EYGAgzpF1aZYwOmlBpFktJwG LN6hGfN5WVMkO7WSzVU1q4iLx6bhG//vxe8xkTJhnO5OyvjhUE8f494cb7IBHiU9vqLu JA8FqxPARgVn9/xiHsH5OehVBQ1/1qgjrdEQbqrfGn6OUU2a6roXu+zCGnvxMoow2pBy JhFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696416866; x=1697021666; h=in-reply-to:from:references:cc:to:content-language:subject :user-agent:mime-version:date:message-id:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=VnBUsjzG7SIOqYxg7tECuS2AYJBvcgm6jv6GuKXeeHs=; b=KIY4r56fhYfMXA1I43VIkin3XW8F7nH89oFJiCBUEu3SVVfkPd1gr/HxTEuRtEhud/ zqWU/3haLMnqaY11VNQPxiM44G6To+YBo+rUB8aKTj1cre3i7cz6cNK4hiI4aPcqhalG TX7liCBbzbXzrJiwhJZKB0xwMACy9st9my4oo68kO2Fsl8Ae+449U+FeCiS9PsziEd3e weM/bgStPh1ZyrBKgk4U5e8fqN1ySj2+Y6x7WpXUS81jIPehYO+LY9+DAQonoo1HQ0+0 ILUE2cJpo/ByXlBWPnpuFSQmRr1zjN01VF05aeJ8YzzPlgeP2XEmKqluvmKwFXQ69vAF Z86g== X-Gm-Message-State: AOJu0YyJeDVCasp2Kkn2JYCrEEHv9C774tpS+hP95vv2ZUsxSnrLVD7P UXna+xC2/jDfYuVvLPeO7n8= X-Google-Smtp-Source: AGHT+IEEIFoGnw4UBX1JzNiKr/5eAu6Ze8M+8dDkMOkQw01N9NlUtxdX7G9MHD+KCl6tK6QwsZCEBw== X-Received: by 2002:adf:d4d2:0:b0:317:ef76:b778 with SMTP id w18-20020adfd4d2000000b00317ef76b778mr1831916wrk.63.1696416865941; Wed, 04 Oct 2023 03:54:25 -0700 (PDT) Received: from ?IPV6:2a01:cb11:55e:1700:c8fe:e00a:26d9:adb0? ([2a01:cb11:55e:1700:c8fe:e00a:26d9:adb0]) by smtp.gmail.com with ESMTPSA id r2-20020a5d4982000000b00323330edbc7sm3734894wrq.20.2023.10.04.03.54.25 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 04 Oct 2023 03:54:25 -0700 (PDT) Content-Type: multipart/mixed; boundary="------------W1EJlzdIsk0ab2Xj7f5pV00f" Message-ID: <83f72bb9-f3cf-4344-8d4d-45e128813d58@gmail.com> Date: Wed, 4 Oct 2023 12:54:24 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: Add a new BGWORKER_BYPASS_ROLELOGINCHECK flag Content-Language: en-US To: Michael Paquier Cc: PostgreSQL Hackers References: <566c1686-c80b-4d4a-b496-b00ac428a095@gmail.com> From: "Drouvot, Bertrand" In-Reply-To: List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Archived-At: Precedence: bulk This is a multi-part message in MIME format. --------------W1EJlzdIsk0ab2Xj7f5pV00f Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Hi, On 10/4/23 8:20 AM, Michael Paquier wrote: > On Mon, Oct 02, 2023 at 10:53:22AM +0200, Drouvot, Bertrand wrote: >> On 10/2/23 10:17 AM, Michael Paquier wrote: >>> On Mon, Oct 02, 2023 at 10:01:04AM +0200, Drouvot, Bertrand wrote: >>>> I think that would make sense to have more flexibility in the worker_spi >>>> module. I think that could be done in a dedicated patch though. I >>>> think it makes more sense to have the current patch "focusing" on >>>> this new flag (while adding a test about it without too much >>>> refactoring). What about doing the worker_spi module re-factoring >>>> as a follow up of this one? >>> >>> I would do that first, as that's what I usually do, >> >> The reason I was thinking not doing that first is that there is no real use >> case in the current worker_spi module test. > > As a template, improving and extending it seems worth it to me as long > as it can also improve tests. > >>> but I see also >>> your point that this is not mandatory. If you want, I could give it a >>> shot tomorrow to see where it leads. >> >> Oh yeah that would be great (and maybe you already see a use case in the >> current test). Thanks! > > Yes, while it shows a bit more what one can achieve with bgw_extra, it > also helps in improving the test coverage with starting dynamic > workers across defined databases and roles through a SQL function. > Yeah right. > It took me a bit longer than I expected, Thanks for having looked at it! > but here is what I finish > with: > - 0001 extends worker_spi to be able to pass down database and role > IDs for the workers to start, through MyBgworkerEntry->bgw_extra. > Perhaps the two new arguments of worker_spi_launch() should use > InvalidOid as default, actually, to fall back to the database and > roles defined by the GUCs in these cases. I'm fine with the way it's currently done in 0001 and that sounds more logical to me. I mean we don't "really" want InvalidOid but to fall back to the GUCs. Just a remark here: + if (!OidIsValid(roleoid)) + { + /* + * worker_spi_role is NULL by default, so just pass down an invalid + * OID to let the main() routine do its connection work. + */ + if (worker_spi_role) + roleoid = get_role_oid(worker_spi_role, false); + else + roleoid = InvalidOid; the + else + roleoid = InvalidOid; I think it is not needed as we're already in "!OidIsValid(roleoid)". > - 0002 is your patch, on top of which I have added handling for the > flags in the launch() function with a text[]. The tests get much > simpler, and don't need restarts. > Yeah, agree that's better. > By the way, I am pretty sure that we are going to need a wait phase > after the startup of the worker in the case where "nologrole" is not > allowed to log in even with the original patch: the worker may not > have started at the point where we check the logs. I agree and it's now failing on my side. I added this "wait" in v4-0002 attach and it's now working fine. Please note there is more changes than adding this wait in 001_worker_spi.pl (as compare to v3-0002) as I ran pgperltidy on it. FWIW, the new "wait" is just the part related to "nb_errors". > What do you think? Except the Nit that I mentioned in 0001, that looks all good to me (with the new wait in 001_worker_spi.pl). Regards, -- Bertrand Drouvot PostgreSQL Contributors Team RDS Open Source Databases Amazon Web Services: https://aws.amazon.com --------------W1EJlzdIsk0ab2Xj7f5pV00f Content-Type: text/plain; charset=UTF-8; name="v4-0002-Allow-background-workers-to-bypass-login-check.patch" Content-Disposition: attachment; filename*0="v4-0002-Allow-background-workers-to-bypass-login-check.patch" Content-Transfer-Encoding: base64 RnJvbSA2NDQ2NWMyYjJkNTRiYTFjMzE2ZWZlMzQ3ZjM0NjY4NzQxNWQwMWUwIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBNaWNoYWVsIFBhcXVpZXIgPG1pY2hhZWxAcGFxdWll ci54eXo+CkRhdGU6IFdlZCwgNCBPY3QgMjAyMyAxNTowNjoyNSArMDkwMApTdWJqZWN0OiBb UEFUQ0ggdjQgMi8yXSBBbGxvdyBiYWNrZ3JvdW5kIHdvcmtlcnMgdG8gYnlwYXNzIGxvZ2lu IGNoZWNrCgpUaGlzIGFkZHMgYSBuZXcgZmxhZyB2YWx1ZSAoQkdXT1JLRVJfQllQQVNTX1JP TEVMT0dJTkNIRUNLKSB0byB0aGUgZmxhZ3MKYmVpbmcgdXNlZCBpbiBCYWNrZ3JvdW5kV29y a2VySW5pdGlhbGl6ZUNvbm5lY3Rpb24oKSBhbmQKQmFja2dyb3VuZFdvcmtlckluaXRpYWxp emVDb25uZWN0aW9uQnlPaWQoKS4gIFRoaXMgZmxhZyBhbGxvd3MgdGhlCmJhY2tncm91bmQg d29ya2VycyB0byBieXBhc3MgdGhlIGxvZ2luIGNoZWNrIGRvbmUgaW4KSW5pdGlhbGl6ZVNl c3Npb25Vc2VySWQoKS4KLS0tCiBkb2Mvc3JjL3NnbWwvYmd3b3JrZXIuc2dtbCAgICAgICAg ICAgICAgICAgICAgfCAgMyArLQogc3JjL2JhY2tlbmQvYm9vdHN0cmFwL2Jvb3RzdHJhcC5j ICAgICAgICAgICAgIHwgIDIgKy0KIHNyYy9iYWNrZW5kL3Bvc3RtYXN0ZXIvYXV0b3ZhY3V1 bS5jICAgICAgICAgICB8ICA1ICstCiBzcmMvYmFja2VuZC9wb3N0bWFzdGVyL3Bvc3RtYXN0 ZXIuYyAgICAgICAgICAgfCAgNiArLQogc3JjL2JhY2tlbmQvdGNvcC9wb3N0Z3Jlcy5jICAg ICAgICAgICAgICAgICAgIHwgIDEgKwogc3JjL2JhY2tlbmQvdXRpbHMvaW5pdC9taXNjaW5p dC5jICAgICAgICAgICAgIHwgIDQgKy0KIHNyYy9iYWNrZW5kL3V0aWxzL2luaXQvcG9zdGlu aXQuYyAgICAgICAgICAgICB8ICA1ICstCiBzcmMvaW5jbHVkZS9taXNjYWRtaW4uaCAgICAg ICAgICAgICAgICAgICAgICAgfCAgNCArLQogc3JjL2luY2x1ZGUvcG9zdG1hc3Rlci9iZ3dv cmtlci5oICAgICAgICAgICAgIHwgMTAgKy0tCiAuLi4vbW9kdWxlcy93b3JrZXJfc3BpL3Qv MDAxX3dvcmtlcl9zcGkucGwgICAgfCA2OCArKysrKysrKysrKysrKysrKy0tCiAuLi4vbW9k dWxlcy93b3JrZXJfc3BpL3dvcmtlcl9zcGktLTEuMC5zcWwgICAgfCAgMyArLQogc3JjL3Rl c3QvbW9kdWxlcy93b3JrZXJfc3BpL3dvcmtlcl9zcGkuYyAgICAgIHwgNDkgKysrKysrKysr KystLQogMTIgZmlsZXMgY2hhbmdlZCwgMTM0IGluc2VydGlvbnMoKyksIDI2IGRlbGV0aW9u cygtKQogICA0LjYlIGRvYy9zcmMvc2dtbC8KICAgNi44JSBzcmMvYmFja2VuZC9wb3N0bWFz dGVyLwogICA3LjYlIHNyYy9iYWNrZW5kL3V0aWxzL2luaXQvCiAgIDcuMSUgc3JjL2luY2x1 ZGUvcG9zdG1hc3Rlci8KICA0MS40JSBzcmMvdGVzdC9tb2R1bGVzL3dvcmtlcl9zcGkvdC8K ICAyOS44JSBzcmMvdGVzdC9tb2R1bGVzL3dvcmtlcl9zcGkvCgpkaWZmIC0tZ2l0IGEvZG9j L3NyYy9zZ21sL2Jnd29ya2VyLnNnbWwgYi9kb2Mvc3JjL3NnbWwvYmd3b3JrZXIuc2dtbApp bmRleCA5YWQxMTQ2YmEwLi43MzM1YzAyZWQ4IDEwMDY0NAotLS0gYS9kb2Mvc3JjL3NnbWwv Ymd3b3JrZXIuc2dtbAorKysgYi9kb2Mvc3JjL3NnbWwvYmd3b3JrZXIuc2dtbApAQCAtMjAw LDcgKzIwMCw4IEBAIHR5cGVkZWYgc3RydWN0IEJhY2tncm91bmRXb3JrZXIKICAgIDxsaXRl cmFsPkludmFsaWRPaWQ8L2xpdGVyYWw+LCB0aGUgcHJvY2VzcyB3aWxsIHJ1biBhcyB0aGUg c3VwZXJ1c2VyIGNyZWF0ZWQKICAgIGR1cmluZyA8Y29tbWFuZD5pbml0ZGI8L2NvbW1hbmQ+ LiBJZiA8bGl0ZXJhbD5CR1dPUktFUl9CWVBBU1NfQUxMT1dDT05OPC9saXRlcmFsPgogICAg aXMgc3BlY2lmaWVkIGFzIDx2YXJuYW1lPmZsYWdzPC92YXJuYW1lPiBpdCBpcyBwb3NzaWJs ZSB0byBieXBhc3MgdGhlIHJlc3RyaWN0aW9uCi0gICB0byBjb25uZWN0IHRvIGRhdGFiYXNl cyBub3QgYWxsb3dpbmcgdXNlciBjb25uZWN0aW9ucy4KKyAgIHRvIGNvbm5lY3QgdG8gZGF0 YWJhc2VzIG5vdCBhbGxvd2luZyB1c2VyIGNvbm5lY3Rpb25zLiBJZiA8bGl0ZXJhbD5CR1dP UktFUl9CWVBBU1NfUk9MRUxPR0lOQ0hFQ0s8L2xpdGVyYWw+CisgICBpcyBzcGVjaWZpZWQg YXMgPHZhcm5hbWU+ZmxhZ3M8L3Zhcm5hbWU+IGl0IGlzIHBvc3NpYmxlIHRvIGJ5cGFzcyB0 aGUgbG9naW4gY2hlY2sgdG8gY29ubmVjdCB0byBkYXRhYmFzZXMuCiAgICBBIGJhY2tncm91 bmQgd29ya2VyIGNhbiBvbmx5IGNhbGwgb25lIG9mIHRoZXNlIHR3byBmdW5jdGlvbnMsIGFu ZCBvbmx5CiAgICBvbmNlLiAgSXQgaXMgbm90IHBvc3NpYmxlIHRvIHN3aXRjaCBkYXRhYmFz ZXMuCiAgIDwvcGFyYT4KZGlmZiAtLWdpdCBhL3NyYy9iYWNrZW5kL2Jvb3RzdHJhcC9ib290 c3RyYXAuYyBiL3NyYy9iYWNrZW5kL2Jvb3RzdHJhcC9ib290c3RyYXAuYwppbmRleCA1ODEw Zjg4MjVlLi5iZGQwMDViNjZhIDEwMDY0NAotLS0gYS9zcmMvYmFja2VuZC9ib290c3RyYXAv Ym9vdHN0cmFwLmMKKysrIGIvc3JjL2JhY2tlbmQvYm9vdHN0cmFwL2Jvb3RzdHJhcC5jCkBA IC0zNDUsNyArMzQ1LDcgQEAgQm9vdHN0cmFwTW9kZU1haW4oaW50IGFyZ2MsIGNoYXIgKmFy Z3ZbXSwgYm9vbCBjaGVja19vbmx5KQogCWlmIChwZ19saW5rX2NhbmFyeV9pc19mcm9udGVu ZCgpKQogCQllbG9nKEVSUk9SLCAiYmFja2VuZCBpcyBpbmNvcnJlY3RseSBsaW5rZWQgdG8g ZnJvbnRlbmQgZnVuY3Rpb25zIik7CiAKLQlJbml0UG9zdGdyZXMoTlVMTCwgSW52YWxpZE9p ZCwgTlVMTCwgSW52YWxpZE9pZCwgZmFsc2UsIGZhbHNlLCBOVUxMKTsKKwlJbml0UG9zdGdy ZXMoTlVMTCwgSW52YWxpZE9pZCwgTlVMTCwgSW52YWxpZE9pZCwgZmFsc2UsIGZhbHNlLCBm YWxzZSwgTlVMTCk7CiAKIAkvKiBJbml0aWFsaXplIHN0dWZmIGZvciBib290c3RyYXAtZmls ZSBwcm9jZXNzaW5nICovCiAJZm9yIChpID0gMDsgaSA8IE1BWEFUVFI7IGkrKykKZGlmZiAt LWdpdCBhL3NyYy9iYWNrZW5kL3Bvc3RtYXN0ZXIvYXV0b3ZhY3V1bS5jIGIvc3JjL2JhY2tl bmQvcG9zdG1hc3Rlci9hdXRvdmFjdXVtLmMKaW5kZXggYWU5YmU5YjkxMS4uNDY4NmI4MWY2 OCAxMDA2NDQKLS0tIGEvc3JjL2JhY2tlbmQvcG9zdG1hc3Rlci9hdXRvdmFjdXVtLmMKKysr IGIvc3JjL2JhY2tlbmQvcG9zdG1hc3Rlci9hdXRvdmFjdXVtLmMKQEAgLTQ4OCw3ICs0ODgs NyBAQCBBdXRvVmFjTGF1bmNoZXJNYWluKGludCBhcmdjLCBjaGFyICphcmd2W10pCiAJLyog RWFybHkgaW5pdGlhbGl6YXRpb24gKi8KIAlCYXNlSW5pdCgpOwogCi0JSW5pdFBvc3RncmVz KE5VTEwsIEludmFsaWRPaWQsIE5VTEwsIEludmFsaWRPaWQsIGZhbHNlLCBmYWxzZSwgTlVM TCk7CisJSW5pdFBvc3RncmVzKE5VTEwsIEludmFsaWRPaWQsIE5VTEwsIEludmFsaWRPaWQs IGZhbHNlLCBmYWxzZSwgZmFsc2UsIE5VTEwpOwogCiAJU2V0UHJvY2Vzc2luZ01vZGUoTm9y bWFsUHJvY2Vzc2luZyk7CiAKQEAgLTE3MDYsOCArMTcwNiw3IEBAIEF1dG9WYWNXb3JrZXJN YWluKGludCBhcmdjLCBjaGFyICphcmd2W10pCiAJCSAqIE5vdGU6IGlmIHdlIGhhdmUgc2Vs ZWN0ZWQgYSBqdXN0LWRlbGV0ZWQgZGF0YWJhc2UgKGR1ZSB0byB1c2luZwogCQkgKiBzdGFs ZSBzdGF0cyBpbmZvKSwgd2UnbGwgZmFpbCBhbmQgZXhpdCBoZXJlLgogCQkgKi8KLQkJSW5p dFBvc3RncmVzKE5VTEwsIGRiaWQsIE5VTEwsIEludmFsaWRPaWQsIGZhbHNlLCBmYWxzZSwK LQkJCQkJIGRibmFtZSk7CisJCUluaXRQb3N0Z3JlcyhOVUxMLCBkYmlkLCBOVUxMLCBJbnZh bGlkT2lkLCBmYWxzZSwgZmFsc2UsIGZhbHNlLCBkYm5hbWUpOwogCQlTZXRQcm9jZXNzaW5n TW9kZShOb3JtYWxQcm9jZXNzaW5nKTsKIAkJc2V0X3BzX2Rpc3BsYXkoZGJuYW1lKTsKIAkJ ZXJlcG9ydChERUJVRzEsCmRpZmYgLS1naXQgYS9zcmMvYmFja2VuZC9wb3N0bWFzdGVyL3Bv c3RtYXN0ZXIuYyBiL3NyYy9iYWNrZW5kL3Bvc3RtYXN0ZXIvcG9zdG1hc3Rlci5jCmluZGV4 IDU0ZTliZmI4YzQuLjM3ZjViOTQ0NjkgMTAwNjQ0Ci0tLSBhL3NyYy9iYWNrZW5kL3Bvc3Rt YXN0ZXIvcG9zdG1hc3Rlci5jCisrKyBiL3NyYy9iYWNrZW5kL3Bvc3RtYXN0ZXIvcG9zdG1h c3Rlci5jCkBAIC01NTc1LDcgKzU1NzUsNyBAQCBNYXhMaXZlUG9zdG1hc3RlckNoaWxkcmVu KHZvaWQpCiAgKiBDb25uZWN0IGJhY2tncm91bmQgd29ya2VyIHRvIGEgZGF0YWJhc2UuCiAg Ki8KIHZvaWQKLUJhY2tncm91bmRXb3JrZXJJbml0aWFsaXplQ29ubmVjdGlvbihjb25zdCBj aGFyICpkYm5hbWUsIGNvbnN0IGNoYXIgKnVzZXJuYW1lLCB1aW50MzIgZmxhZ3MpCitCYWNr Z3JvdW5kV29ya2VySW5pdGlhbGl6ZUNvbm5lY3Rpb24oY29uc3QgY2hhciAqZGJuYW1lLCBj b25zdCBjaGFyICp1c2VybmFtZSwgYml0czMyIGZsYWdzKQogewogCUJhY2tncm91bmRXb3Jr ZXIgKndvcmtlciA9IE15Qmd3b3JrZXJFbnRyeTsKIApAQCAtNTU4OSw2ICs1NTg5LDcgQEAg QmFja2dyb3VuZFdvcmtlckluaXRpYWxpemVDb25uZWN0aW9uKGNvbnN0IGNoYXIgKmRibmFt ZSwgY29uc3QgY2hhciAqdXNlcm5hbWUsIHUKIAkJCQkgdXNlcm5hbWUsIEludmFsaWRPaWQs CS8qIHJvbGUgdG8gY29ubmVjdCBhcyAqLwogCQkJCSBmYWxzZSwJCQkvKiBuZXZlciBob25v ciBzZXNzaW9uX3ByZWxvYWRfbGlicmFyaWVzICovCiAJCQkJIChmbGFncyAmIEJHV09SS0VS X0JZUEFTU19BTExPV0NPTk4pICE9IDAsCS8qIGlnbm9yZSBkYXRhbGxvd2Nvbm4/ICovCisJ CQkJIChmbGFncyAmIEJHV09SS0VSX0JZUEFTU19ST0xFTE9HSU5DSEVDSykgIT0gMCwgLyog YnlwYXNzIGxvZ2luIGNoZWNrPyAqLwogCQkJCSBOVUxMKTsJCQkvKiBubyBvdXRfZGJuYW1l ICovCiAKIAkvKiBpdCBoYWQgYmV0dGVyIG5vdCBnb3R0ZW4gb3V0IG9mICJpbml0IiBtb2Rl IHlldCAqLwpAQCAtNTYwMiw3ICs1NjAzLDcgQEAgQmFja2dyb3VuZFdvcmtlckluaXRpYWxp emVDb25uZWN0aW9uKGNvbnN0IGNoYXIgKmRibmFtZSwgY29uc3QgY2hhciAqdXNlcm5hbWUs IHUKICAqIENvbm5lY3QgYmFja2dyb3VuZCB3b3JrZXIgdG8gYSBkYXRhYmFzZSB1c2luZyBP SURzLgogICovCiB2b2lkCi1CYWNrZ3JvdW5kV29ya2VySW5pdGlhbGl6ZUNvbm5lY3Rpb25C eU9pZChPaWQgZGJvaWQsIE9pZCB1c2Vyb2lkLCB1aW50MzIgZmxhZ3MpCitCYWNrZ3JvdW5k V29ya2VySW5pdGlhbGl6ZUNvbm5lY3Rpb25CeU9pZChPaWQgZGJvaWQsIE9pZCB1c2Vyb2lk LCBiaXRzMzIgZmxhZ3MpCiB7CiAJQmFja2dyb3VuZFdvcmtlciAqd29ya2VyID0gTXlCZ3dv cmtlckVudHJ5OwogCkBAIC01NjE2LDYgKzU2MTcsNyBAQCBCYWNrZ3JvdW5kV29ya2VySW5p dGlhbGl6ZUNvbm5lY3Rpb25CeU9pZChPaWQgZGJvaWQsIE9pZCB1c2Vyb2lkLCB1aW50MzIg ZmxhZ3MpCiAJCQkJIE5VTEwsIHVzZXJvaWQsIC8qIHJvbGUgdG8gY29ubmVjdCBhcyAqLwog CQkJCSBmYWxzZSwJCQkvKiBuZXZlciBob25vciBzZXNzaW9uX3ByZWxvYWRfbGlicmFyaWVz ICovCiAJCQkJIChmbGFncyAmIEJHV09SS0VSX0JZUEFTU19BTExPV0NPTk4pICE9IDAsCS8q IGlnbm9yZSBkYXRhbGxvd2Nvbm4/ICovCisJCQkJIChmbGFncyAmIEJHV09SS0VSX0JZUEFT U19ST0xFTE9HSU5DSEVDSykgIT0gMCwgLyogYnlwYXNzIGxvZ2luIGNoZWNrPyAqLwogCQkJ CSBOVUxMKTsJCQkvKiBubyBvdXRfZGJuYW1lICovCiAKIAkvKiBpdCBoYWQgYmV0dGVyIG5v dCBnb3R0ZW4gb3V0IG9mICJpbml0IiBtb2RlIHlldCAqLwpkaWZmIC0tZ2l0IGEvc3JjL2Jh Y2tlbmQvdGNvcC9wb3N0Z3Jlcy5jIGIvc3JjL2JhY2tlbmQvdGNvcC9wb3N0Z3Jlcy5jCmlu ZGV4IDIxYjk3NjMxODMuLjVjMWUyMWI5OWQgMTAwNjQ0Ci0tLSBhL3NyYy9iYWNrZW5kL3Rj b3AvcG9zdGdyZXMuYworKysgYi9zcmMvYmFja2VuZC90Y29wL3Bvc3RncmVzLmMKQEAgLTQy MTEsNiArNDIxMSw3IEBAIFBvc3RncmVzTWFpbihjb25zdCBjaGFyICpkYm5hbWUsIGNvbnN0 IGNoYXIgKnVzZXJuYW1lKQogCQkJCSB1c2VybmFtZSwgSW52YWxpZE9pZCwJLyogcm9sZSB0 byBjb25uZWN0IGFzICovCiAJCQkJICFhbV93YWxzZW5kZXIsIC8qIGhvbm9yIHNlc3Npb25f cHJlbG9hZF9saWJyYXJpZXM/ICovCiAJCQkJIGZhbHNlLAkJCS8qIGRvbid0IGlnbm9yZSBk YXRhbGxvd2Nvbm4gKi8KKwkJCQkgZmFsc2UsCQkJLyogZG9uJ3QgYnlwYXNzIGxvZ2luIGNo ZWNrICovCiAJCQkJIE5VTEwpOwkJCS8qIG5vIG91dF9kYm5hbWUgKi8KIAogCS8qCmRpZmYg LS1naXQgYS9zcmMvYmFja2VuZC91dGlscy9pbml0L21pc2Npbml0LmMgYi9zcmMvYmFja2Vu ZC91dGlscy9pbml0L21pc2Npbml0LmMKaW5kZXggMWU2NzFjNTYwYy4uMTgyZDY2Njg1MiAx MDA2NDQKLS0tIGEvc3JjL2JhY2tlbmQvdXRpbHMvaW5pdC9taXNjaW5pdC5jCisrKyBiL3Ny Yy9iYWNrZW5kL3V0aWxzL2luaXQvbWlzY2luaXQuYwpAQCAtNzI1LDcgKzcyNSw3IEBAIGhh c19yb2xyZXBsaWNhdGlvbihPaWQgcm9sZWlkKQogICogSW5pdGlhbGl6ZSB1c2VyIGlkZW50 aXR5IGR1cmluZyBub3JtYWwgYmFja2VuZCBzdGFydHVwCiAgKi8KIHZvaWQKLUluaXRpYWxp emVTZXNzaW9uVXNlcklkKGNvbnN0IGNoYXIgKnJvbGVuYW1lLCBPaWQgcm9sZWlkKQorSW5p dGlhbGl6ZVNlc3Npb25Vc2VySWQoY29uc3QgY2hhciAqcm9sZW5hbWUsIE9pZCByb2xlaWQs IGJvb2wgYnlwYXNzX2xvZ2luX2NoZWNrKQogewogCUhlYXBUdXBsZQlyb2xlVHVwOwogCUZv cm1fcGdfYXV0aGlkIHJmb3JtOwpAQCAtNzg5LDcgKzc4OSw3IEBAIEluaXRpYWxpemVTZXNz aW9uVXNlcklkKGNvbnN0IGNoYXIgKnJvbGVuYW1lLCBPaWQgcm9sZWlkKQogCQkvKgogCQkg KiBJcyByb2xlIGFsbG93ZWQgdG8gbG9naW4gYXQgYWxsPwogCQkgKi8KLQkJaWYgKCFyZm9y bS0+cm9sY2FubG9naW4pCisJCWlmICghYnlwYXNzX2xvZ2luX2NoZWNrICYmICFyZm9ybS0+ cm9sY2FubG9naW4pCiAJCQllcmVwb3J0KEZBVEFMLAogCQkJCQkoZXJyY29kZShFUlJDT0RF X0lOVkFMSURfQVVUSE9SSVpBVElPTl9TUEVDSUZJQ0FUSU9OKSwKIAkJCQkJIGVycm1zZygi cm9sZSBcIiVzXCIgaXMgbm90IHBlcm1pdHRlZCB0byBsb2cgaW4iLApkaWZmIC0tZ2l0IGEv c3JjL2JhY2tlbmQvdXRpbHMvaW5pdC9wb3N0aW5pdC5jIGIvc3JjL2JhY2tlbmQvdXRpbHMv aW5pdC9wb3N0aW5pdC5jCmluZGV4IGRmNGQxNWE1MGYuLmRjZmViMzA4MzIgMTAwNjQ0Ci0t LSBhL3NyYy9iYWNrZW5kL3V0aWxzL2luaXQvcG9zdGluaXQuYworKysgYi9zcmMvYmFja2Vu ZC91dGlscy9pbml0L3Bvc3Rpbml0LmMKQEAgLTcxOSw2ICs3MTksNyBAQCBJbml0UG9zdGdy ZXMoY29uc3QgY2hhciAqaW5fZGJuYW1lLCBPaWQgZGJvaWQsCiAJCQkgY29uc3QgY2hhciAq dXNlcm5hbWUsIE9pZCB1c2Vyb2lkLAogCQkJIGJvb2wgbG9hZF9zZXNzaW9uX2xpYnJhcmll cywKIAkJCSBib29sIG92ZXJyaWRlX2FsbG93X2Nvbm5lY3Rpb25zLAorCQkJIGJvb2wgYnlw YXNzX2xvZ2luX2NoZWNrLAogCQkJIGNoYXIgKm91dF9kYm5hbWUpCiB7CiAJYm9vbAkJYm9v dHN0cmFwID0gSXNCb290c3RyYXBQcm9jZXNzaW5nTW9kZSgpOwpAQCAtOTAxLDcgKzkwMiw3 IEBAIEluaXRQb3N0Z3Jlcyhjb25zdCBjaGFyICppbl9kYm5hbWUsIE9pZCBkYm9pZCwKIAkJ fQogCQllbHNlCiAJCXsKLQkJCUluaXRpYWxpemVTZXNzaW9uVXNlcklkKHVzZXJuYW1lLCB1 c2Vyb2lkKTsKKwkJCUluaXRpYWxpemVTZXNzaW9uVXNlcklkKHVzZXJuYW1lLCB1c2Vyb2lk LCBieXBhc3NfbG9naW5fY2hlY2spOwogCQkJYW1fc3VwZXJ1c2VyID0gc3VwZXJ1c2VyKCk7 CiAJCX0KIAl9CkBAIC05MTAsNyArOTExLDcgQEAgSW5pdFBvc3RncmVzKGNvbnN0IGNoYXIg KmluX2RibmFtZSwgT2lkIGRib2lkLAogCQkvKiBub3JtYWwgbXVsdGl1c2VyIGNhc2UgKi8K IAkJQXNzZXJ0KE15UHJvY1BvcnQgIT0gTlVMTCk7CiAJCVBlcmZvcm1BdXRoZW50aWNhdGlv bihNeVByb2NQb3J0KTsKLQkJSW5pdGlhbGl6ZVNlc3Npb25Vc2VySWQodXNlcm5hbWUsIHVz ZXJvaWQpOworCQlJbml0aWFsaXplU2Vzc2lvblVzZXJJZCh1c2VybmFtZSwgdXNlcm9pZCwg ZmFsc2UpOwogCQkvKiBlbnN1cmUgdGhhdCBhdXRoX21ldGhvZCBpcyBhY3R1YWxseSB2YWxp ZCwgYWthIGF1dGhuX2lkIGlzIG5vdCBOVUxMICovCiAJCWlmIChNeUNsaWVudENvbm5lY3Rp b25JbmZvLmF1dGhuX2lkKQogCQkJSW5pdGlhbGl6ZVN5c3RlbVVzZXIoTXlDbGllbnRDb25u ZWN0aW9uSW5mby5hdXRobl9pZCwKZGlmZiAtLWdpdCBhL3NyYy9pbmNsdWRlL21pc2NhZG1p bi5oIGIvc3JjL2luY2x1ZGUvbWlzY2FkbWluLmgKaW5kZXggMTRiZDU3NGZjMi4uZjFkMDNm MmRmOCAxMDA2NDQKLS0tIGEvc3JjL2luY2x1ZGUvbWlzY2FkbWluLmgKKysrIGIvc3JjL2lu Y2x1ZGUvbWlzY2FkbWluLmgKQEAgLTM2NCw3ICszNjQsOCBAQCBleHRlcm4gYm9vbCBJblNl Y3VyaXR5UmVzdHJpY3RlZE9wZXJhdGlvbih2b2lkKTsKIGV4dGVybiBib29sIEluTm9Gb3Jj ZVJMU09wZXJhdGlvbih2b2lkKTsKIGV4dGVybiB2b2lkIEdldFVzZXJJZEFuZENvbnRleHQo T2lkICp1c2VyaWQsIGJvb2wgKnNlY19kZWZfY29udGV4dCk7CiBleHRlcm4gdm9pZCBTZXRV c2VySWRBbmRDb250ZXh0KE9pZCB1c2VyaWQsIGJvb2wgc2VjX2RlZl9jb250ZXh0KTsKLWV4 dGVybiB2b2lkIEluaXRpYWxpemVTZXNzaW9uVXNlcklkKGNvbnN0IGNoYXIgKnJvbGVuYW1l LCBPaWQgcm9sZWlkKTsKK2V4dGVybiB2b2lkIEluaXRpYWxpemVTZXNzaW9uVXNlcklkKGNv bnN0IGNoYXIgKnJvbGVuYW1lLCBPaWQgcm9sZWlkLAorCQkJCQkJCQkJYm9vbCBieXBhc3Nf bG9naW5fY2hlY2spOwogZXh0ZXJuIHZvaWQgSW5pdGlhbGl6ZVNlc3Npb25Vc2VySWRTdGFu ZGFsb25lKHZvaWQpOwogZXh0ZXJuIHZvaWQgU2V0U2Vzc2lvbkF1dGhvcml6YXRpb24oT2lk IHVzZXJpZCwgYm9vbCBpc19zdXBlcnVzZXIpOwogZXh0ZXJuIE9pZAlHZXRDdXJyZW50Um9s ZUlkKHZvaWQpOwpAQCAtNDY5LDYgKzQ3MCw3IEBAIGV4dGVybiB2b2lkIEluaXRQb3N0Z3Jl cyhjb25zdCBjaGFyICppbl9kYm5hbWUsIE9pZCBkYm9pZCwKIAkJCQkJCSBjb25zdCBjaGFy ICp1c2VybmFtZSwgT2lkIHVzZXJvaWQsCiAJCQkJCQkgYm9vbCBsb2FkX3Nlc3Npb25fbGli cmFyaWVzLAogCQkJCQkJIGJvb2wgb3ZlcnJpZGVfYWxsb3dfY29ubmVjdGlvbnMsCisJCQkJ CQkgYm9vbCBieXBhc3NfbG9naW5fY2hlY2ssCiAJCQkJCQkgY2hhciAqb3V0X2RibmFtZSk7 CiBleHRlcm4gdm9pZCBCYXNlSW5pdCh2b2lkKTsKIApkaWZmIC0tZ2l0IGEvc3JjL2luY2x1 ZGUvcG9zdG1hc3Rlci9iZ3dvcmtlci5oIGIvc3JjL2luY2x1ZGUvcG9zdG1hc3Rlci9iZ3dv cmtlci5oCmluZGV4IDc4MTU1MDdlM2QuLjBmZGJmYWY0MzEgMTAwNjQ0Ci0tLSBhL3NyYy9p bmNsdWRlL3Bvc3RtYXN0ZXIvYmd3b3JrZXIuaAorKysgYi9zcmMvaW5jbHVkZS9wb3N0bWFz dGVyL2Jnd29ya2VyLmgKQEAgLTE0MSwxOCArMTQxLDIwIEBAIGV4dGVybiBQR0RMTElNUE9S VCBCYWNrZ3JvdW5kV29ya2VyICpNeUJnd29ya2VyRW50cnk7CiAgKiBJZiBkYm5hbWUgaXMg TlVMTCwgY29ubmVjdGlvbiBpcyBtYWRlIHRvIG5vIHNwZWNpZmljIGRhdGFiYXNlOwogICog b25seSBzaGFyZWQgY2F0YWxvZ3MgY2FuIGJlIGFjY2Vzc2VkLgogICovCi1leHRlcm4gdm9p ZCBCYWNrZ3JvdW5kV29ya2VySW5pdGlhbGl6ZUNvbm5lY3Rpb24oY29uc3QgY2hhciAqZGJu YW1lLCBjb25zdCBjaGFyICp1c2VybmFtZSwgdWludDMyIGZsYWdzKTsKK2V4dGVybiB2b2lk IEJhY2tncm91bmRXb3JrZXJJbml0aWFsaXplQ29ubmVjdGlvbihjb25zdCBjaGFyICpkYm5h bWUsIGNvbnN0IGNoYXIgKnVzZXJuYW1lLCBiaXRzMzIgZmxhZ3MpOwogCiAvKiBKdXN0IGxp a2UgdGhlIGFib3ZlLCBidXQgc3BlY2lmeWluZyBkYXRhYmFzZSBhbmQgdXNlciBieSBPSUQu ICovCi1leHRlcm4gdm9pZCBCYWNrZ3JvdW5kV29ya2VySW5pdGlhbGl6ZUNvbm5lY3Rpb25C eU9pZChPaWQgZGJvaWQsIE9pZCB1c2Vyb2lkLCB1aW50MzIgZmxhZ3MpOworZXh0ZXJuIHZv aWQgQmFja2dyb3VuZFdvcmtlckluaXRpYWxpemVDb25uZWN0aW9uQnlPaWQoT2lkIGRib2lk LCBPaWQgdXNlcm9pZCwgYml0czMyIGZsYWdzKTsKIAogLyoKICAqIEZsYWdzIHRvIEJhY2tn cm91bmRXb3JrZXJJbml0aWFsaXplQ29ubmVjdGlvbiBldCBhbAogICoKICAqCi0gKiBBbGxv dyBieXBhc3NpbmcgZGF0YWxsb3djb25uIHJlc3RyaWN0aW9ucyB3aGVuIGNvbm5lY3Rpbmcg dG8gZGF0YWJhc2UKKyAqIEFsbG93IGJ5cGFzc2luZyBkYXRhbGxvd2Nvbm4gcmVzdHJpY3Rp b25zIGFuZCBsb2dpbiBjaGVjayB3aGVuIGNvbm5lY3RpbmcKKyAqIHRvIGRhdGFiYXNlCiAg Ki8KLSNkZWZpbmUgQkdXT1JLRVJfQllQQVNTX0FMTE9XQ09OTiAxCisjZGVmaW5lIEJHV09S S0VSX0JZUEFTU19BTExPV0NPTk4gMHgwMDAxCisjZGVmaW5lIEJHV09SS0VSX0JZUEFTU19S T0xFTE9HSU5DSEVDSyAweDAwMDIKIAogCiAvKiBCbG9jay91bmJsb2NrIHNpZ25hbHMgaW4g YSBiYWNrZ3JvdW5kIHdvcmtlciBwcm9jZXNzICovCmRpZmYgLS1naXQgYS9zcmMvdGVzdC9t b2R1bGVzL3dvcmtlcl9zcGkvdC8wMDFfd29ya2VyX3NwaS5wbCBiL3NyYy90ZXN0L21vZHVs ZXMvd29ya2VyX3NwaS90LzAwMV93b3JrZXJfc3BpLnBsCmluZGV4IGEwMjYwNDJjNjUuLjY0 ZjExOTdhMzIgMTAwNjQ0Ci0tLSBhL3NyYy90ZXN0L21vZHVsZXMvd29ya2VyX3NwaS90LzAw MV93b3JrZXJfc3BpLnBsCisrKyBiL3NyYy90ZXN0L21vZHVsZXMvd29ya2VyX3NwaS90LzAw MV93b3JrZXJfc3BpLnBsCkBAIC03LDYgKzcsNyBAQCB1c2Ugd2FybmluZ3M7CiB1c2UgUG9z dGdyZVNRTDo6VGVzdDo6Q2x1c3RlcjsKIHVzZSBQb3N0Z3JlU1FMOjpUZXN0OjpVdGlsczsK IHVzZSBUZXN0OjpNb3JlOwordXNlIFRpbWU6OkhpUmVzIHF3KHVzbGVlcCk7CiAKIG15ICRu b2RlID0gUG9zdGdyZVNRTDo6VGVzdDo6Q2x1c3Rlci0+bmV3KCdteW5vZGUnKTsKICRub2Rl LT5pbml0OwpAQCAtMjQsNyArMjUsOCBAQCAkbm9kZS0+c2FmZV9wc3FsKCdwb3N0Z3Jlcycs ICdDUkVBVEUgRVhURU5TSU9OIHdvcmtlcl9zcGk7Jyk7CiAjIGFuIHVuZGVmaW5lZCByb2xl LCBmYWxsaW5nIGJhY2sgdG8gdGhlIEdVQyBkZWZhdWx0cyAoSW52YWxpZE9pZCBmb3IKICMg d29ya2VyX3NwaV9sYXVuY2gpLgogbXkgJHJlc3VsdCA9Ci0gICRub2RlLT5zYWZlX3BzcWwo J3Bvc3RncmVzJywgJ1NFTEVDVCB3b3JrZXJfc3BpX2xhdW5jaCg0LCAwLCAwKSBJUyBOT1Qg TlVMTDsnKTsKKyAgJG5vZGUtPnNhZmVfcHNxbCgncG9zdGdyZXMnLAorCSdTRUxFQ1Qgd29y a2VyX3NwaV9sYXVuY2goNCwgMCwgMCkgSVMgTk9UIE5VTEw7Jyk7CiBpcygkcmVzdWx0LCAn dCcsICJkeW5hbWljIGJnd29ya2VyIGxhdW5jaGVkIik7CiAkbm9kZS0+cG9sbF9xdWVyeV91 bnRpbCgKIAkncG9zdGdyZXMnLApAQCAtODQsMTAgKzg2LDE0IEBAIG9rKCAkbm9kZS0+cG9s bF9xdWVyeV91bnRpbCgKICMgQXNrIHdvcmtlcl9zcGkgdG8gbGF1bmNoIGR5bmFtaWMgYmd3 b3JrZXJzIHdpdGggdGhlIGxpYnJhcnkgbG9hZGVkLCB0aGVuCiAjIGNoZWNrIHRoZWlyIGV4 aXN0ZW5jZS4gIFVzZSBJRHMgdGhhdCBkbyBub3Qgb3ZlcmxhcCB3aXRoIHRoZSBzY2hlbWFz IGNyZWF0ZWQKICMgYnkgdGhlIHByZXZpb3VzIHdvcmtlcnMuICBUaGVzZSB1c2UgYSBzcGVj aWZpYyByb2xlLgotbXkgJG15cm9sZV9pZCA9ICRub2RlLT5zYWZlX3BzcWwoJ215ZGInLCAi U0VMRUNUIG9pZCBGUk9NIHBnX3JvbGVzIHdoZXJlIHJvbG5hbWUgPSAnbXlyb2xlJzsiKTsK LW15ICRteWRiX2lkID0gJG5vZGUtPnNhZmVfcHNxbCgnbXlkYicsICJTRUxFQ1Qgb2lkIEZS T00gcGdfZGF0YWJhc2Ugd2hlcmUgZGF0bmFtZSA9ICdteWRiJzsiKTsKLW15ICR3b3JrZXIx X3BpZCA9ICRub2RlLT5zYWZlX3BzcWwoJ215ZGInLCAiU0VMRUNUIHdvcmtlcl9zcGlfbGF1 bmNoKDEwLCAkbXlkYl9pZCwgJG15cm9sZV9pZCk7Iik7Ci1teSAkd29ya2VyMl9waWQgPSAk bm9kZS0+c2FmZV9wc3FsKCdteWRiJywgIlNFTEVDVCB3b3JrZXJfc3BpX2xhdW5jaCgxMSwg JG15ZGJfaWQsICRteXJvbGVfaWQpOyIpOworbXkgJG15cm9sZV9pZCA9ICRub2RlLT5zYWZl X3BzcWwoJ215ZGInLAorCSJTRUxFQ1Qgb2lkIEZST00gcGdfcm9sZXMgd2hlcmUgcm9sbmFt ZSA9ICdteXJvbGUnOyIpOworbXkgJG15ZGJfaWQgPSAkbm9kZS0+c2FmZV9wc3FsKCdteWRi JywKKwkiU0VMRUNUIG9pZCBGUk9NIHBnX2RhdGFiYXNlIHdoZXJlIGRhdG5hbWUgPSAnbXlk Yic7Iik7CitteSAkd29ya2VyMV9waWQgPSAkbm9kZS0+c2FmZV9wc3FsKCdteWRiJywKKwki U0VMRUNUIHdvcmtlcl9zcGlfbGF1bmNoKDEwLCAkbXlkYl9pZCwgJG15cm9sZV9pZCk7Iik7 CitteSAkd29ya2VyMl9waWQgPSAkbm9kZS0+c2FmZV9wc3FsKCdteWRiJywKKwkiU0VMRUNU IHdvcmtlcl9zcGlfbGF1bmNoKDExLCAkbXlkYl9pZCwgJG15cm9sZV9pZCk7Iik7CiAKIG9r KCAkbm9kZS0+cG9sbF9xdWVyeV91bnRpbCgKIAkJJ215ZGInLApAQCAtOTgsNCArMTA0LDU2 IEBAIG9rKCAkbm9kZS0+cG9sbF9xdWVyeV91bnRpbCgKIAknZHluYW1pYyBiZ3dvcmtlcnMg YWxsIGxhdW5jaGVkJwogKSBvciBkaWUgIlRpbWVkIG91dCB3aGlsZSB3YWl0aW5nIGZvciBk eW5hbWljIGJnd29ya2VycyB0byBiZSBsYXVuY2hlZCI7CiAKKyMgQ2hlY2sgQkdXT1JLRVJf QllQQVNTX1JPTEVMT0dJTkNIRUNLLgorIyBGaXJzdCBjcmVhdGUgYSByb2xlIHdpdGhvdXQg bG9naW4gYWNjZXNzLgorJG5vZGUtPnNhZmVfcHNxbCgKKwkncG9zdGdyZXMnLCBxcVsKKyAg Q1JFQVRFIFJPTEUgbm9sb2dyb2xlIHdpdGggbm9sb2dpbjsKKyAgQUxURVIgUk9MRSBub2xv Z3JvbGUgd2l0aCBzdXBlcnVzZXI7CitdKTsKK215ICRub2xvZ3JvbGVfaWQgPSAkbm9kZS0+ c2FmZV9wc3FsKCdteWRiJywKKwkiU0VMRUNUIG9pZCBGUk9NIHBnX3JvbGVzIHdoZXJlIHJv bG5hbWUgPSAnbm9sb2dyb2xlJzsiKTsKKworbXkgJGxvZ19zdGFydCA9IC1zICRub2RlLT5s b2dmaWxlOworCisjIEFzayB0aGUgYmFja2dyb3VuZCB3b3JrZXJzIHRvIGNvbm5lY3Qgd2l0 aCB0aGlzIHJvbGUsIGZhaWxpbmcuCiskbm9kZS0+c2FmZV9wc3FsKCdteWRiJywKKwkiU0VM RUNUIHdvcmtlcl9zcGlfbGF1bmNoKDEyLCAkbXlkYl9pZCwgJG5vbG9ncm9sZV9pZCk7Iik7 CisKKyMgQW4gZXJyb3IgbWVzc2FnZSBzaG91bGQgYmUgaXNzdWVkLgorbXkgJG5iX2Vycm9y cyA9IDA7Citmb3IgKG15ICRpID0gMDsgJGkgPCAxMCAqICRQb3N0Z3JlU1FMOjpUZXN0OjpV dGlsczo6dGltZW91dF9kZWZhdWx0OyAkaSsrKQoreworCWlmICgkbm9kZS0+bG9nX2NvbnRh aW5zKAorCQkJInJvbGUgXCJub2xvZ3JvbGVcIiBpcyBub3QgcGVybWl0dGVkIHRvIGxvZyBp biIsICRsb2dfc3RhcnQpKQorCXsKKwkJJG5iX2Vycm9ycyA9IDE7CisJCWxhc3Q7CisJfQor CXVzbGVlcCgxMDBfMDAwKTsKK30KKworb2soJG5iX2Vycm9ycywKKwknbm9sb2dyb2xlIG5v dCBhbGxvd2VkIHRvIGNvbm5lY3QgaWYgUk9MRUxPR0lOQ0hFQ0sgaXMgbm90IHNldCcpOwor CiskbG9nX3N0YXJ0ID0gLXMgJG5vZGUtPmxvZ2ZpbGU7CisKK215ICR3b3JrZXIzX3BpZCA9 ICRub2RlLT5zYWZlX3BzcWwoJ215ZGInLAorCXFxKFNFTEVDVCB3b3JrZXJfc3BpX2xhdW5j aCgxMywgJG15ZGJfaWQsICRub2xvZ3JvbGVfaWQsICd7IlJPTEVMT0dJTkNIRUNLIn0nKTsp CispOworCitvayggJG5vZGUtPnBvbGxfcXVlcnlfdW50aWwoCisJCSdteWRiJywKKwkJcXFb U0VMRUNUIGRhdG5hbWUsIHVzZW5hbWUsIHdhaXRfZXZlbnQgRlJPTSBwZ19zdGF0X2FjdGl2 aXR5CisgICAgICAgICAgICBXSEVSRSBiYWNrZW5kX3R5cGUgPSAnd29ya2VyX3NwaSBkeW5h bWljJyBBTkQKKyAgICAgICAgICAgIHBpZCA9ICR3b3JrZXIzX3BpZDtdLAorCQknbXlkYnxu b2xvZ3JvbGV8d29ya2VyX3NwaV9tYWluJyksCisJJ2R5bmFtaWMgYmd3b3JrZXJzICcKKykg b3IgZGllICJUaW1lZCBvdXQgd2hpbGUgd2FpdGluZyBmb3IgZHluYW1pYyBiZ3dvcmtlcnMg dG8gYmUgbGF1bmNoZWQiOworCisjIEFuIGVycm9yIG1lc3NhZ2Ugc2hvdWxkIG5vdCBiZSBp c3N1ZWQuCitvayggISRub2RlLT5sb2dfY29udGFpbnMoCisJCSJyb2xlIFwibm9sb2dyb2xl XCIgaXMgbm90IHBlcm1pdHRlZCB0byBsb2cgaW4iLCAkbG9nX3N0YXJ0KSwKKwkibm9sb2dy b2xlIGFsbG93ZWQgdG8gY29ubmVjdCBpZiBST0xFTE9HSU5DSEVDSyBpcyBzZXQiKTsKKwog ZG9uZV90ZXN0aW5nKCk7CmRpZmYgLS1naXQgYS9zcmMvdGVzdC9tb2R1bGVzL3dvcmtlcl9z cGkvd29ya2VyX3NwaS0tMS4wLnNxbCBiL3NyYy90ZXN0L21vZHVsZXMvd29ya2VyX3NwaS93 b3JrZXJfc3BpLS0xLjAuc3FsCmluZGV4IGY1YjkxMTI4ZmYuLjU5YzBjNjg2ZjMgMTAwNjQ0 Ci0tLSBhL3NyYy90ZXN0L21vZHVsZXMvd29ya2VyX3NwaS93b3JrZXJfc3BpLS0xLjAuc3Fs CisrKyBiL3NyYy90ZXN0L21vZHVsZXMvd29ya2VyX3NwaS93b3JrZXJfc3BpLS0xLjAuc3Fs CkBAIC0zLDcgKzMsOCBAQAogLS0gY29tcGxhaW4gaWYgc2NyaXB0IGlzIHNvdXJjZWQgaW4g cHNxbCwgcmF0aGVyIHRoYW4gdmlhIENSRUFURSBFWFRFTlNJT04KIFxlY2hvIFVzZSAiQ1JF QVRFIEVYVEVOU0lPTiB3b3JrZXJfc3BpIiB0byBsb2FkIHRoaXMgZmlsZS4gXHF1aXQKIAot Q1JFQVRFIEZVTkNUSU9OIHdvcmtlcl9zcGlfbGF1bmNoKHBnX2NhdGFsb2cuaW50NCwgcGdf Y2F0YWxvZy5vaWQsIHBnX2NhdGFsb2cub2lkKQorQ1JFQVRFIEZVTkNUSU9OIHdvcmtlcl9z cGlfbGF1bmNoKHBnX2NhdGFsb2cuaW50NCwgcGdfY2F0YWxvZy5vaWQsCisJCQkJICBwZ19j YXRhbG9nLm9pZCwgcGdfY2F0YWxvZy50ZXh0W10gREVGQVVMVCAne30nKQogUkVUVVJOUyBw Z19jYXRhbG9nLmludDQgU1RSSUNUCiBBUyAnTU9EVUxFX1BBVEhOQU1FJwogTEFOR1VBR0Ug QzsKZGlmZiAtLWdpdCBhL3NyYy90ZXN0L21vZHVsZXMvd29ya2VyX3NwaS93b3JrZXJfc3Bp LmMgYi9zcmMvdGVzdC9tb2R1bGVzL3dvcmtlcl9zcGkvd29ya2VyX3NwaS5jCmluZGV4IGYz NTg5N2RkYWMuLjA3ZDhiYWI3MjEgMTAwNjQ0Ci0tLSBhL3NyYy90ZXN0L21vZHVsZXMvd29y a2VyX3NwaS93b3JrZXJfc3BpLmMKKysrIGIvc3JjL3Rlc3QvbW9kdWxlcy93b3JrZXJfc3Bp L3dvcmtlcl9zcGkuYwpAQCAtMTQ0LDYgKzE0NCw3IEBAIHdvcmtlcl9zcGlfbWFpbihEYXR1 bSBtYWluX2FyZykKIAlPaWQJCQlkYm9pZDsKIAlPaWQJCQlyb2xlb2lkOwogCWNoYXIJICAg KnA7CisJYml0czMyCQlmbGFncyA9IDA7CiAKIAl0YWJsZSA9IHBhbGxvYyhzaXplb2Yod29y a3RhYmxlKSk7CiAJc3ByaW50ZihuYW1lLCAic2NoZW1hJWQiLCBpbmRleCk7CkBAIC0xNTUs NiArMTU2LDggQEAgd29ya2VyX3NwaV9tYWluKERhdHVtIG1haW5fYXJnKQogCW1lbWNweSgm ZGJvaWQsIHAsIHNpemVvZihPaWQpKTsKIAlwICs9IHNpemVvZihPaWQpOwogCW1lbWNweSgm cm9sZW9pZCwgcCwgc2l6ZW9mKE9pZCkpOworCXAgKz0gc2l6ZW9mKGJpdHMzMik7CisJbWVt Y3B5KCZmbGFncywgcCwgc2l6ZW9mKGJpdHMzMikpOwogCiAJLyogRXN0YWJsaXNoIHNpZ25h bCBoYW5kbGVycyBiZWZvcmUgdW5ibG9ja2luZyBzaWduYWxzLiAqLwogCXBxc2lnbmFsKFNJ R0hVUCwgU2lnbmFsSGFuZGxlckZvckNvbmZpZ1JlbG9hZCk7CkBAIC0xNjUsOSArMTY4LDEw IEBAIHdvcmtlcl9zcGlfbWFpbihEYXR1bSBtYWluX2FyZykKIAogCS8qIENvbm5lY3QgdG8g b3VyIGRhdGFiYXNlICovCiAJaWYgKE9pZElzVmFsaWQoZGJvaWQpKQotCQlCYWNrZ3JvdW5k V29ya2VySW5pdGlhbGl6ZUNvbm5lY3Rpb25CeU9pZChkYm9pZCwgcm9sZW9pZCwgMCk7CisJ CUJhY2tncm91bmRXb3JrZXJJbml0aWFsaXplQ29ubmVjdGlvbkJ5T2lkKGRib2lkLCByb2xl b2lkLCBmbGFncyk7CiAJZWxzZQotCQlCYWNrZ3JvdW5kV29ya2VySW5pdGlhbGl6ZUNvbm5l Y3Rpb24od29ya2VyX3NwaV9kYXRhYmFzZSwgd29ya2VyX3NwaV9yb2xlLCAwKTsKKwkJQmFj a2dyb3VuZFdvcmtlckluaXRpYWxpemVDb25uZWN0aW9uKHdvcmtlcl9zcGlfZGF0YWJhc2Us CisJCQkJCQkJCQkJCSB3b3JrZXJfc3BpX3JvbGUsIGZsYWdzKTsKIAogCWVsb2coTE9HLCAi JXMgaW5pdGlhbGl6ZWQgd2l0aCAlcy4lcyIsCiAJCSBNeUJnd29ya2VyRW50cnktPmJnd19u YW1lLCB0YWJsZS0+c2NoZW1hLCB0YWJsZS0+bmFtZSk7CkBAIC0zNzEsOCArMzc1LDkgQEAg X1BHX2luaXQodm9pZCkKIAkvKgogCSAqIE5vdyBmaWxsIGluIHdvcmtlci1zcGVjaWZpYyBk YXRhLCBhbmQgZG8gdGhlIGFjdHVhbCByZWdpc3RyYXRpb25zLgogCSAqCi0JICogYmd3X2V4 dHJhIGNhbiBvcHRpb25hbGx5IGluY2x1ZGUgYSBkYWJhdGFzZSBPSUQgYW5kIGEgcm9sZSBP SUQuICBUaGlzCi0JICogaXMgbGVmdCBlbXB0eSBoZXJlIHRvIGZhbGxiYWNrIHRvIHRoZSBy ZWxhdGVkIEdVQ3MgYXQgc3RhcnR1cC4KKwkgKiBiZ3dfZXh0cmEgY2FuIG9wdGlvbmFsbHkg aW5jbHVkZSBhIGRhYmF0YXNlIE9JRCwgYSByb2xlIE9JRCBhbmQgYSBzZXQKKwkgKiBvZiBm bGFncy4gIFRoaXMgaXMgbGVmdCBlbXB0eSBoZXJlIHRvIGZhbGxiYWNrIHRvIHRoZSByZWxh dGVkIEdVQ3MgYXQKKwkgKiBzdGFydHVwIChvciAwIGZvciB0aGUgZmxhZ3MpLgogCSAqLwog CWZvciAoaW50IGkgPSAxOyBpIDw9IHdvcmtlcl9zcGlfdG90YWxfd29ya2VyczsgaSsrKQog CXsKQEAgLTM5OCw2ICs0MDMsMTEgQEAgd29ya2VyX3NwaV9sYXVuY2goUEdfRlVOQ1RJT05f QVJHUykKIAlCZ3dIYW5kbGVTdGF0dXMgc3RhdHVzOwogCXBpZF90CQlwaWQ7CiAJY2hhcgkg ICAqcDsKKwliaXRzMzIJCWZsYWdzID0gMDsKKwlBcnJheVR5cGUgICphcnIgPSBQR19HRVRB UkdfQVJSQVlUWVBFX1AoMyk7CisJU2l6ZQkJbmRpbTsKKwlpbnQJCQluZWxlbXM7CisJRGF0 dW0JICAgKmRhdHVtX2ZsYWdzOwogCiAJbWVtc2V0KCZ3b3JrZXIsIDAsIHNpemVvZih3b3Jr ZXIpKTsKIAl3b3JrZXIuYmd3X2ZsYWdzID0gQkdXT1JLRVJfU0hNRU1fQUNDRVNTIHwKQEAg LTQxMiw2ICs0MjIsMzUgQEAgd29ya2VyX3NwaV9sYXVuY2goUEdfRlVOQ1RJT05fQVJHUykK IAkvKiBzZXQgYmd3X25vdGlmeV9waWQgc28gdGhhdCB3ZSBjYW4gdXNlIFdhaXRGb3JCYWNr Z3JvdW5kV29ya2VyU3RhcnR1cCAqLwogCXdvcmtlci5iZ3dfbm90aWZ5X3BpZCA9IE15UHJv Y1BpZDsKIAorCS8qIGV4dHJhY3QgZmxhZ3MsIGlmIGFueSAqLworCW5kaW0gPSBBUlJfTkRJ TShhcnIpOworCWlmIChuZGltID4gMSkKKwkJZXJlcG9ydChFUlJPUiwKKwkJCQkoZXJyY29k ZShFUlJDT0RFX0ZFQVRVUkVfTk9UX1NVUFBPUlRFRCksCisJCQkJIGVycm1zZygiZmxhZ3Mg YXJyYXkgbXVzdCBiZSBvbmUtZGltZW5zaW9uYWwiKSkpOworCisJaWYgKGFycmF5X2NvbnRh aW5zX251bGxzKGFycikpCisJCWVyZXBvcnQoRVJST1IsCisJCQkJKGVycmNvZGUoRVJSQ09E RV9GRUFUVVJFX05PVF9TVVBQT1JURUQpLAorCQkJCSBlcnJtc2coImZsYWdzIGFycmF5IG11 c3Qgbm90IGNvbnRhaW4gbnVsbHMiKSkpOworCisJQXNzZXJ0KEFSUl9FTEVNVFlQRShhcnIp ID09IFRFWFRPSUQpOworCWRlY29uc3RydWN0X2FycmF5X2J1aWx0aW4oYXJyLCBURVhUT0lE LCAmZGF0dW1fZmxhZ3MsIE5VTEwsICZuZWxlbXMpOworCisJZm9yIChpID0gMDsgaSA8IG5l bGVtczsgaSsrKQorCXsKKwkJY2hhcgkgICAqb3B0bmFtZSA9IFRleHREYXR1bUdldENTdHJp bmcoZGF0dW1fZmxhZ3NbaV0pOworCisJCWlmIChzdHJjbXAob3B0bmFtZSwgIlJPTEVMT0dJ TkNIRUNLIikgPT0gMCkKKwkJCWZsYWdzIHw9IEJHV09SS0VSX0JZUEFTU19ST0xFTE9HSU5D SEVDSzsKKwkJZWxzZSBpZiAoc3RyY21wKG9wdG5hbWUsICJBTExPV0NPTk4iKSA9PSAwKQor CQkJZmxhZ3MgfD0gQkdXT1JLRVJfQllQQVNTX0FMTE9XQ09OTjsKKwkJZWxzZQorCQkJZXJl cG9ydChFUlJPUiwKKwkJCQkJKGVycmNvZGUoRVJSQ09ERV9GRUFUVVJFX05PVF9TVVBQT1JU RUQpLAorCQkJCQkgZXJybXNnKCJpbmNvcnJlY3QgZmxhZyB2YWx1ZSBmb3VuZCBpbiBhcnJh eSIpKSk7CisJfQorCiAJLyoKIAkgKiBSZWdpc3RlciBkYXRhYmFzZSBhbmQgcm9sZSB0byB1 c2UgZm9yIHRoZSB3b3JrZXIgc3RhcnRlZCBpbiBiZ3dfZXh0cmEuCiAJICogSWYgbm9uZSBo YXZlIGJlZW4gcHJvdmlkZWQsIGZhbGxiYWNrIHRvIHRoZSBHVUNzLgpAQCAtNDMzLDYgKzQ3 Miw4IEBAIHdvcmtlcl9zcGlfbGF1bmNoKFBHX0ZVTkNUSU9OX0FSR1MpCiAJbWVtY3B5KHAs ICZkYm9pZCwgc2l6ZW9mKE9pZCkpOwogCXAgKz0gc2l6ZW9mKE9pZCk7CiAJbWVtY3B5KHAs ICZyb2xlb2lkLCBzaXplb2YoT2lkKSk7CisJcCArPSBzaXplb2YoYml0czMyKTsKKwltZW1j cHkocCwgJmZsYWdzLCBzaXplb2YoYml0czMyKSk7CiAKIAlpZiAoIVJlZ2lzdGVyRHluYW1p Y0JhY2tncm91bmRXb3JrZXIoJndvcmtlciwgJmhhbmRsZSkpCiAJCVBHX1JFVFVSTl9OVUxM KCk7Ci0tIAoyLjM0LjEKCg== --------------W1EJlzdIsk0ab2Xj7f5pV00f--