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 1qnDre-00AADE-Az for pgsql-hackers@arkaria.postgresql.org; Mon, 02 Oct 2023 08:01:14 +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 1qnDrc-00HQmd-Sj for pgsql-hackers@arkaria.postgresql.org; Mon, 02 Oct 2023 08:01:12 +0000 Received: from makus.postgresql.org ([2001:4800:3e1:1::229]) by malur.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1qnDrc-00HQmM-9k for pgsql-hackers@lists.postgresql.org; Mon, 02 Oct 2023 08:01:12 +0000 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by makus.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.94.2) (envelope-from ) id 1qnDrY-007kKE-BJ for pgsql-hackers@lists.postgresql.org; Mon, 02 Oct 2023 08:01:11 +0000 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-40666aa674fso14989975e9.0 for ; Mon, 02 Oct 2023 01:01:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696233666; x=1696838466; 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=zcMRQYyGOsBySvQgXVDZh8AbBm3uqpMqHrGWxaOE1Rc=; b=b09VQHawE1clRbS60xYiUOBpNA2Fpb8Mti9GEdNwhXsCs8lCyJMRcownvnyY9WdXdo O0yFk79Gw5FCSa4vIp17O7UG5zpNHRqko8fdfe/qk7FJaNoX2pEEvZUjK8ATcZLn5klx ko9Vr4T6VoIsg8uR4ZLE4BvfgScBMe20fw09doN8OeCHuVhf8HhVy+V5KCFpc160tvPh 7NIUYLSjXE5v4/kgCc0Xu7gcM7F8vX51g3AcqyPio59JJ6nob/ERnxaqu+CGUKCEo15g K32AyzUh9x4o7UaucmKPM05sR+WyNHDc1BA0J5Gv1922pSVVaJqepFXwhf1wcgeJ/I0G C5mw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696233666; x=1696838466; 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=zcMRQYyGOsBySvQgXVDZh8AbBm3uqpMqHrGWxaOE1Rc=; b=wfDOM/OdInoKrth+zIji2RAzH3/fFCUEagPCTJCBCG81Iow5c6qhYDtDPQDn+6nu0k Iq6uZ1pZtpxCmraNTxOnU8cJDH/XuvFdwydmf5QB1leWvygbKHV/JQh1/q16BxgcHM+c AelY9zYBDQmfeYRWB3QfHTnli1Eq7VzmMF5T5dRMI2evau8lA8iANmSKarhnpZTmP8LA HMFmlUgp8fFKc1C9RUB7hKhmoDwuL4d5hTReSXUXvgH4wVPHjdLAjcRIMdlEfXRYxw4a zwbgf3AHkMLZKFoYmzu+OPOqhi1Y4xI3fs0fEPbvZlHUitHkxSa4mLCWSMPZ6ixcMaq0 Xq0g== X-Gm-Message-State: AOJu0Yx4ZDTcFZ5XzydcdqoZiDH+8nLtEtOv2Sxib2cr/BizNgYlKO8m imYshsYkQLDI43MGCsCPzBs= X-Google-Smtp-Source: AGHT+IEI9GG1b++QT/sB7k8zMr5i01n8jpMvEKr0nwIOJrDobw92OGhkGDmV2A2w7WHxvbE92RjD9A== X-Received: by 2002:a05:600c:20d4:b0:402:ee9e:ed98 with SMTP id y20-20020a05600c20d400b00402ee9eed98mr10738815wmm.34.1696233665902; Mon, 02 Oct 2023 01:01:05 -0700 (PDT) Received: from ?IPV6:2a01:cb11:55e:1700:fdfb:2c20:5a8d:9c46? ([2a01:cb11:55e:1700:fdfb:2c20:5a8d:9c46]) by smtp.gmail.com with ESMTPSA id b8-20020a5d4d88000000b0032769103ae9sm4340451wru.69.2023.10.02.01.01.05 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 02 Oct 2023 01:01:05 -0700 (PDT) Content-Type: multipart/mixed; boundary="------------7NBqX8V3neziH8siV4kcgeKX" Message-ID: Date: Mon, 2 Oct 2023 10:01:04 +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: 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. --------------7NBqX8V3neziH8siV4kcgeKX Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Hi, On 9/29/23 8:19 AM, Michael Paquier wrote: > On Thu, Sep 28, 2023 at 02:37:02PM +0200, Drouvot, Bertrand wrote: >> This patch allows the role provided in BackgroundWorkerInitializeConnection() >> and BackgroundWorkerInitializeConnectionByOid() to lack login authorization. > > Interesting. Yes, there would be use cases for that, I suppose. Thanks for looking at it! > >> + uint32 flags, >> char *out_dbname) >> { > > This may be more adapted with a bits32 for the flags. Done that way in v2 attached. > >> +# Ask the background workers to connect with this role with the flag in place. >> +$node->append_conf( >> + 'postgresql.conf', q{ >> +worker_spi.role = 'nologrole' >> +worker_spi.bypass_login_check = true >> +}); >> +$node->restart; >> + >> +# An error message should not be issued. >> +ok( !$node->log_contains( >> + "role \"nologrole\" is not permitted to log in", $log_start), >> + "nologrole allowed to connect if BGWORKER_BYPASS_ROLELOGINCHECK is set"); >> + >> done_testing(); > > It would be cheaper to use a dynamic background worker for such tests. > Something that I've been tempted to do in this module is to extend the > amount of data that's given to bgw_main_arg when launching a worker > with worker_spi_launch(). How about extending the SQL function so as > it is possible to give in input a role name (or a regrole), a database > name (or a database OID) and a text[] for the flags? This would > require a bit more refactoring, but this would be benefitial to show > or one can pass down a full structure from the registration to the > main() routine. On top of that, it would make the addition of the new > GUCs worker_spi.bypass_login_check and worker_spi.role unnecessary. > 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? >> +# return the size of logfile of $node in bytes >> +sub get_log_size >> +{ >> + my ($node) = @_; >> + >> + return (stat $node->logfile)[7]; >> +} > > Just use -s here. Done in v2 attached. > See other tests that want to check the contents of > the logs from an offset. > Oh right, worth to modify 019_replslot_limit.pl, 002_corrupted.pl and 001_pg_controldata.pl in a separate patch for consistency? (they are using "(stat $node->logfile)[7]" or "(stat($pg_control))[7]"). >> - * Allow bypassing datallowconn restrictions when connecting to database >> + * Allow bypassing datallowconn restrictions and login check when connecting >> + * to database >> */ >> -#define BGWORKER_BYPASS_ALLOWCONN 1 >> +#define BGWORKER_BYPASS_ALLOWCONN 0x0001 >> +#define BGWORKER_BYPASS_ROLELOGINCHECK 0x0002 > > The structure of the patch is inconsistent. These flags are in > bgworker.h, but they are used also by InitPostgres(). Perhaps a > second boolean flag would be OK rather than a second set of flags for > InitPostgres() mapping with the bgworker set. I did not want initially to add an extra parameter to InitPostgres() but I agree it would make more sense. So done that way in v2. Regards, -- Bertrand Drouvot PostgreSQL Contributors Team RDS Open Source Databases Amazon Web Services: https://aws.amazon.com --------------7NBqX8V3neziH8siV4kcgeKX Content-Type: text/plain; charset=UTF-8; name="v2-0001-Allow-background-workers-to-bypass-login-check.patch" Content-Disposition: attachment; filename*0="v2-0001-Allow-background-workers-to-bypass-login-check.patch" Content-Transfer-Encoding: base64 RnJvbSA1OWRlNDFmM2MzMDViMDA5YmFiZmE2ZDA1YzA1NGQ4YWU5ZTRkNzMwIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBCZXJ0cmFuZCBEcm91dm90IDxiZXJ0cmFuZGRyb3V2 b3QucGdAZ21haWwuY29tPgpEYXRlOiBXZWQsIDIwIFNlcCAyMDIzIDA4OjI4OjU5ICswMDAw ClN1YmplY3Q6IFtQQVRDSCB2Ml0gQWxsb3cgYmFja2dyb3VuZCB3b3JrZXJzIHRvIGJ5cGFz cyBsb2dpbiBjaGVjawoKVGhpcyBhZGRzIGEgbmV3IGZsYWcgdmFsdWUgKEJHV09SS0VSX0JZ UEFTU19ST0xFTE9HSU5DSEVDSykgdG8gdGhlIGZsYWdzIGJlaW5nCnVzZWQgaW4gQmFja2dy b3VuZFdvcmtlckluaXRpYWxpemVDb25uZWN0aW9uKCkgYW5kIEJhY2tncm91bmRXb3JrZXJJ bml0aWFsaXplQ29ubmVjdGlvbkJ5T2lkKCkuCgpUaGlzIGZsYWcgYWxsb3dzIHRoZSBiYWNr Z3JvdW5kIHdvcmtlcnMgdG8gYnlwYXNzIHRoZSBsb2dpbiBjaGVjayBkb25lIGluIEluaXRp YWxpemVTZXNzaW9uVXNlcklkKCkuCi0tLQogZG9jL3NyYy9zZ21sL2Jnd29ya2VyLnNnbWwg ICAgICAgICAgICAgICAgICAgIHwgIDMgKy0KIHNyYy9iYWNrZW5kL2Jvb3RzdHJhcC9ib290 c3RyYXAuYyAgICAgICAgICAgICB8ICAyICstCiBzcmMvYmFja2VuZC9wb3N0bWFzdGVyL2F1 dG92YWN1dW0uYyAgICAgICAgICAgfCAgNSArLS0KIHNyYy9iYWNrZW5kL3Bvc3RtYXN0ZXIv cG9zdG1hc3Rlci5jICAgICAgICAgICB8ICA2ICsrLQogc3JjL2JhY2tlbmQvdGNvcC9wb3N0 Z3Jlcy5jICAgICAgICAgICAgICAgICAgIHwgIDEgKwogc3JjL2JhY2tlbmQvdXRpbHMvaW5p dC9taXNjaW5pdC5jICAgICAgICAgICAgIHwgIDQgKy0KIHNyYy9iYWNrZW5kL3V0aWxzL2lu aXQvcG9zdGluaXQuYyAgICAgICAgICAgICB8ICA1ICsrLQogc3JjL2luY2x1ZGUvbWlzY2Fk bWluLmggICAgICAgICAgICAgICAgICAgICAgIHwgIDQgKy0KIHNyYy9pbmNsdWRlL3Bvc3Rt YXN0ZXIvYmd3b3JrZXIuaCAgICAgICAgICAgICB8IDEwICsrKy0tCiAuLi4vbW9kdWxlcy93 b3JrZXJfc3BpL3QvMDAxX3dvcmtlcl9zcGkucGwgICAgfCA0MCArKysrKysrKysrKysrKysr KysrCiBzcmMvdGVzdC9tb2R1bGVzL3dvcmtlcl9zcGkvd29ya2VyX3NwaS5jICAgICAgfCAy NSArKysrKysrKysrKy0KIDExIGZpbGVzIGNoYW5nZWQsIDg4IGluc2VydGlvbnMoKyksIDE3 IGRlbGV0aW9ucygtKQogICA3LjYlIGRvYy9zcmMvc2dtbC8KICAxMS40JSBzcmMvYmFja2Vu ZC9wb3N0bWFzdGVyLwogIDEyLjYlIHNyYy9iYWNrZW5kL3V0aWxzL2luaXQvCiAgMTEuOCUg c3JjL2luY2x1ZGUvcG9zdG1hc3Rlci8KICAyOS4yJSBzcmMvdGVzdC9tb2R1bGVzL3dvcmtl cl9zcGkvdC8KICAyMy4yJSBzcmMvdGVzdC9tb2R1bGVzL3dvcmtlcl9zcGkvCiAgIDQuMCUg c3JjLwoKZGlmZiAtLWdpdCBhL2RvYy9zcmMvc2dtbC9iZ3dvcmtlci5zZ21sIGIvZG9jL3Ny Yy9zZ21sL2Jnd29ya2VyLnNnbWwKaW5kZXggOWFkMTE0NmJhMC4uNzMzNWMwMmVkOCAxMDA2 NDQKLS0tIGEvZG9jL3NyYy9zZ21sL2Jnd29ya2VyLnNnbWwKKysrIGIvZG9jL3NyYy9zZ21s L2Jnd29ya2VyLnNnbWwKQEAgLTIwMCw3ICsyMDAsOCBAQCB0eXBlZGVmIHN0cnVjdCBCYWNr Z3JvdW5kV29ya2VyCiAgICA8bGl0ZXJhbD5JbnZhbGlkT2lkPC9saXRlcmFsPiwgdGhlIHBy b2Nlc3Mgd2lsbCBydW4gYXMgdGhlIHN1cGVydXNlciBjcmVhdGVkCiAgICBkdXJpbmcgPGNv bW1hbmQ+aW5pdGRiPC9jb21tYW5kPi4gSWYgPGxpdGVyYWw+QkdXT1JLRVJfQllQQVNTX0FM TE9XQ09OTjwvbGl0ZXJhbD4KICAgIGlzIHNwZWNpZmllZCBhcyA8dmFybmFtZT5mbGFnczwv dmFybmFtZT4gaXQgaXMgcG9zc2libGUgdG8gYnlwYXNzIHRoZSByZXN0cmljdGlvbgotICAg dG8gY29ubmVjdCB0byBkYXRhYmFzZXMgbm90IGFsbG93aW5nIHVzZXIgY29ubmVjdGlvbnMu CisgICB0byBjb25uZWN0IHRvIGRhdGFiYXNlcyBub3QgYWxsb3dpbmcgdXNlciBjb25uZWN0 aW9ucy4gSWYgPGxpdGVyYWw+QkdXT1JLRVJfQllQQVNTX1JPTEVMT0dJTkNIRUNLPC9saXRl cmFsPgorICAgaXMgc3BlY2lmaWVkIGFzIDx2YXJuYW1lPmZsYWdzPC92YXJuYW1lPiBpdCBp cyBwb3NzaWJsZSB0byBieXBhc3MgdGhlIGxvZ2luIGNoZWNrIHRvIGNvbm5lY3QgdG8gZGF0 YWJhc2VzLgogICAgQSBiYWNrZ3JvdW5kIHdvcmtlciBjYW4gb25seSBjYWxsIG9uZSBvZiB0 aGVzZSB0d28gZnVuY3Rpb25zLCBhbmQgb25seQogICAgb25jZS4gIEl0IGlzIG5vdCBwb3Nz aWJsZSB0byBzd2l0Y2ggZGF0YWJhc2VzLgogICA8L3BhcmE+CmRpZmYgLS1naXQgYS9zcmMv YmFja2VuZC9ib290c3RyYXAvYm9vdHN0cmFwLmMgYi9zcmMvYmFja2VuZC9ib290c3RyYXAv Ym9vdHN0cmFwLmMKaW5kZXggNTgxMGY4ODI1ZS4uYmRkMDA1YjY2YSAxMDA2NDQKLS0tIGEv c3JjL2JhY2tlbmQvYm9vdHN0cmFwL2Jvb3RzdHJhcC5jCisrKyBiL3NyYy9iYWNrZW5kL2Jv b3RzdHJhcC9ib290c3RyYXAuYwpAQCAtMzQ1LDcgKzM0NSw3IEBAIEJvb3RzdHJhcE1vZGVN YWluKGludCBhcmdjLCBjaGFyICphcmd2W10sIGJvb2wgY2hlY2tfb25seSkKIAlpZiAocGdf bGlua19jYW5hcnlfaXNfZnJvbnRlbmQoKSkKIAkJZWxvZyhFUlJPUiwgImJhY2tlbmQgaXMg aW5jb3JyZWN0bHkgbGlua2VkIHRvIGZyb250ZW5kIGZ1bmN0aW9ucyIpOwogCi0JSW5pdFBv c3RncmVzKE5VTEwsIEludmFsaWRPaWQsIE5VTEwsIEludmFsaWRPaWQsIGZhbHNlLCBmYWxz ZSwgTlVMTCk7CisJSW5pdFBvc3RncmVzKE5VTEwsIEludmFsaWRPaWQsIE5VTEwsIEludmFs aWRPaWQsIGZhbHNlLCBmYWxzZSwgZmFsc2UsIE5VTEwpOwogCiAJLyogSW5pdGlhbGl6ZSBz dHVmZiBmb3IgYm9vdHN0cmFwLWZpbGUgcHJvY2Vzc2luZyAqLwogCWZvciAoaSA9IDA7IGkg PCBNQVhBVFRSOyBpKyspCmRpZmYgLS1naXQgYS9zcmMvYmFja2VuZC9wb3N0bWFzdGVyL2F1 dG92YWN1dW0uYyBiL3NyYy9iYWNrZW5kL3Bvc3RtYXN0ZXIvYXV0b3ZhY3V1bS5jCmluZGV4 IGFlOWJlOWI5MTEuLjQ2ODZiODFmNjggMTAwNjQ0Ci0tLSBhL3NyYy9iYWNrZW5kL3Bvc3Rt YXN0ZXIvYXV0b3ZhY3V1bS5jCisrKyBiL3NyYy9iYWNrZW5kL3Bvc3RtYXN0ZXIvYXV0b3Zh Y3V1bS5jCkBAIC00ODgsNyArNDg4LDcgQEAgQXV0b1ZhY0xhdW5jaGVyTWFpbihpbnQgYXJn YywgY2hhciAqYXJndltdKQogCS8qIEVhcmx5IGluaXRpYWxpemF0aW9uICovCiAJQmFzZUlu aXQoKTsKIAotCUluaXRQb3N0Z3JlcyhOVUxMLCBJbnZhbGlkT2lkLCBOVUxMLCBJbnZhbGlk T2lkLCBmYWxzZSwgZmFsc2UsIE5VTEwpOworCUluaXRQb3N0Z3JlcyhOVUxMLCBJbnZhbGlk T2lkLCBOVUxMLCBJbnZhbGlkT2lkLCBmYWxzZSwgZmFsc2UsIGZhbHNlLCBOVUxMKTsKIAog CVNldFByb2Nlc3NpbmdNb2RlKE5vcm1hbFByb2Nlc3NpbmcpOwogCkBAIC0xNzA2LDggKzE3 MDYsNyBAQCBBdXRvVmFjV29ya2VyTWFpbihpbnQgYXJnYywgY2hhciAqYXJndltdKQogCQkg KiBOb3RlOiBpZiB3ZSBoYXZlIHNlbGVjdGVkIGEganVzdC1kZWxldGVkIGRhdGFiYXNlIChk dWUgdG8gdXNpbmcKIAkJICogc3RhbGUgc3RhdHMgaW5mbyksIHdlJ2xsIGZhaWwgYW5kIGV4 aXQgaGVyZS4KIAkJICovCi0JCUluaXRQb3N0Z3JlcyhOVUxMLCBkYmlkLCBOVUxMLCBJbnZh bGlkT2lkLCBmYWxzZSwgZmFsc2UsCi0JCQkJCSBkYm5hbWUpOworCQlJbml0UG9zdGdyZXMo TlVMTCwgZGJpZCwgTlVMTCwgSW52YWxpZE9pZCwgZmFsc2UsIGZhbHNlLCBmYWxzZSwgZGJu YW1lKTsKIAkJU2V0UHJvY2Vzc2luZ01vZGUoTm9ybWFsUHJvY2Vzc2luZyk7CiAJCXNldF9w c19kaXNwbGF5KGRibmFtZSk7CiAJCWVyZXBvcnQoREVCVUcxLApkaWZmIC0tZ2l0IGEvc3Jj L2JhY2tlbmQvcG9zdG1hc3Rlci9wb3N0bWFzdGVyLmMgYi9zcmMvYmFja2VuZC9wb3N0bWFz dGVyL3Bvc3RtYXN0ZXIuYwppbmRleCA1NGU5YmZiOGM0Li4zN2Y1Yjk0NDY5IDEwMDY0NAot LS0gYS9zcmMvYmFja2VuZC9wb3N0bWFzdGVyL3Bvc3RtYXN0ZXIuYworKysgYi9zcmMvYmFj a2VuZC9wb3N0bWFzdGVyL3Bvc3RtYXN0ZXIuYwpAQCAtNTU3NSw3ICs1NTc1LDcgQEAgTWF4 TGl2ZVBvc3RtYXN0ZXJDaGlsZHJlbih2b2lkKQogICogQ29ubmVjdCBiYWNrZ3JvdW5kIHdv cmtlciB0byBhIGRhdGFiYXNlLgogICovCiB2b2lkCi1CYWNrZ3JvdW5kV29ya2VySW5pdGlh bGl6ZUNvbm5lY3Rpb24oY29uc3QgY2hhciAqZGJuYW1lLCBjb25zdCBjaGFyICp1c2VybmFt ZSwgdWludDMyIGZsYWdzKQorQmFja2dyb3VuZFdvcmtlckluaXRpYWxpemVDb25uZWN0aW9u KGNvbnN0IGNoYXIgKmRibmFtZSwgY29uc3QgY2hhciAqdXNlcm5hbWUsIGJpdHMzMiBmbGFn cykKIHsKIAlCYWNrZ3JvdW5kV29ya2VyICp3b3JrZXIgPSBNeUJnd29ya2VyRW50cnk7CiAK QEAgLTU1ODksNiArNTU4OSw3IEBAIEJhY2tncm91bmRXb3JrZXJJbml0aWFsaXplQ29ubmVj dGlvbihjb25zdCBjaGFyICpkYm5hbWUsIGNvbnN0IGNoYXIgKnVzZXJuYW1lLCB1CiAJCQkJ IHVzZXJuYW1lLCBJbnZhbGlkT2lkLAkvKiByb2xlIHRvIGNvbm5lY3QgYXMgKi8KIAkJCQkg ZmFsc2UsCQkJLyogbmV2ZXIgaG9ub3Igc2Vzc2lvbl9wcmVsb2FkX2xpYnJhcmllcyAqLwog CQkJCSAoZmxhZ3MgJiBCR1dPUktFUl9CWVBBU1NfQUxMT1dDT05OKSAhPSAwLAkvKiBpZ25v cmUgZGF0YWxsb3djb25uPyAqLworCQkJCSAoZmxhZ3MgJiBCR1dPUktFUl9CWVBBU1NfUk9M RUxPR0lOQ0hFQ0spICE9IDAsIC8qIGJ5cGFzcyBsb2dpbiBjaGVjaz8gKi8KIAkJCQkgTlVM TCk7CQkJLyogbm8gb3V0X2RibmFtZSAqLwogCiAJLyogaXQgaGFkIGJldHRlciBub3QgZ290 dGVuIG91dCBvZiAiaW5pdCIgbW9kZSB5ZXQgKi8KQEAgLTU2MDIsNyArNTYwMyw3IEBAIEJh Y2tncm91bmRXb3JrZXJJbml0aWFsaXplQ29ubmVjdGlvbihjb25zdCBjaGFyICpkYm5hbWUs IGNvbnN0IGNoYXIgKnVzZXJuYW1lLCB1CiAgKiBDb25uZWN0IGJhY2tncm91bmQgd29ya2Vy IHRvIGEgZGF0YWJhc2UgdXNpbmcgT0lEcy4KICAqLwogdm9pZAotQmFja2dyb3VuZFdvcmtl ckluaXRpYWxpemVDb25uZWN0aW9uQnlPaWQoT2lkIGRib2lkLCBPaWQgdXNlcm9pZCwgdWlu dDMyIGZsYWdzKQorQmFja2dyb3VuZFdvcmtlckluaXRpYWxpemVDb25uZWN0aW9uQnlPaWQo T2lkIGRib2lkLCBPaWQgdXNlcm9pZCwgYml0czMyIGZsYWdzKQogewogCUJhY2tncm91bmRX b3JrZXIgKndvcmtlciA9IE15Qmd3b3JrZXJFbnRyeTsKIApAQCAtNTYxNiw2ICs1NjE3LDcg QEAgQmFja2dyb3VuZFdvcmtlckluaXRpYWxpemVDb25uZWN0aW9uQnlPaWQoT2lkIGRib2lk LCBPaWQgdXNlcm9pZCwgdWludDMyIGZsYWdzKQogCQkJCSBOVUxMLCB1c2Vyb2lkLCAvKiBy b2xlIHRvIGNvbm5lY3QgYXMgKi8KIAkJCQkgZmFsc2UsCQkJLyogbmV2ZXIgaG9ub3Igc2Vz c2lvbl9wcmVsb2FkX2xpYnJhcmllcyAqLwogCQkJCSAoZmxhZ3MgJiBCR1dPUktFUl9CWVBB U1NfQUxMT1dDT05OKSAhPSAwLAkvKiBpZ25vcmUgZGF0YWxsb3djb25uPyAqLworCQkJCSAo ZmxhZ3MgJiBCR1dPUktFUl9CWVBBU1NfUk9MRUxPR0lOQ0hFQ0spICE9IDAsIC8qIGJ5cGFz cyBsb2dpbiBjaGVjaz8gKi8KIAkJCQkgTlVMTCk7CQkJLyogbm8gb3V0X2RibmFtZSAqLwog CiAJLyogaXQgaGFkIGJldHRlciBub3QgZ290dGVuIG91dCBvZiAiaW5pdCIgbW9kZSB5ZXQg Ki8KZGlmZiAtLWdpdCBhL3NyYy9iYWNrZW5kL3Rjb3AvcG9zdGdyZXMuYyBiL3NyYy9iYWNr ZW5kL3Rjb3AvcG9zdGdyZXMuYwppbmRleCAyMWI5NzYzMTgzLi41YzFlMjFiOTlkIDEwMDY0 NAotLS0gYS9zcmMvYmFja2VuZC90Y29wL3Bvc3RncmVzLmMKKysrIGIvc3JjL2JhY2tlbmQv dGNvcC9wb3N0Z3Jlcy5jCkBAIC00MjExLDYgKzQyMTEsNyBAQCBQb3N0Z3Jlc01haW4oY29u c3QgY2hhciAqZGJuYW1lLCBjb25zdCBjaGFyICp1c2VybmFtZSkKIAkJCQkgdXNlcm5hbWUs IEludmFsaWRPaWQsCS8qIHJvbGUgdG8gY29ubmVjdCBhcyAqLwogCQkJCSAhYW1fd2Fsc2Vu ZGVyLCAvKiBob25vciBzZXNzaW9uX3ByZWxvYWRfbGlicmFyaWVzPyAqLwogCQkJCSBmYWxz ZSwJCQkvKiBkb24ndCBpZ25vcmUgZGF0YWxsb3djb25uICovCisJCQkJIGZhbHNlLAkJCS8q IGRvbid0IGJ5cGFzcyBsb2dpbiBjaGVjayAqLwogCQkJCSBOVUxMKTsJCQkvKiBubyBvdXRf ZGJuYW1lICovCiAKIAkvKgpkaWZmIC0tZ2l0IGEvc3JjL2JhY2tlbmQvdXRpbHMvaW5pdC9t aXNjaW5pdC5jIGIvc3JjL2JhY2tlbmQvdXRpbHMvaW5pdC9taXNjaW5pdC5jCmluZGV4IDFl NjcxYzU2MGMuLjE4MmQ2NjY4NTIgMTAwNjQ0Ci0tLSBhL3NyYy9iYWNrZW5kL3V0aWxzL2lu aXQvbWlzY2luaXQuYworKysgYi9zcmMvYmFja2VuZC91dGlscy9pbml0L21pc2Npbml0LmMK QEAgLTcyNSw3ICs3MjUsNyBAQCBoYXNfcm9scmVwbGljYXRpb24oT2lkIHJvbGVpZCkKICAq IEluaXRpYWxpemUgdXNlciBpZGVudGl0eSBkdXJpbmcgbm9ybWFsIGJhY2tlbmQgc3RhcnR1 cAogICovCiB2b2lkCi1Jbml0aWFsaXplU2Vzc2lvblVzZXJJZChjb25zdCBjaGFyICpyb2xl bmFtZSwgT2lkIHJvbGVpZCkKK0luaXRpYWxpemVTZXNzaW9uVXNlcklkKGNvbnN0IGNoYXIg KnJvbGVuYW1lLCBPaWQgcm9sZWlkLCBib29sIGJ5cGFzc19sb2dpbl9jaGVjaykKIHsKIAlI ZWFwVHVwbGUJcm9sZVR1cDsKIAlGb3JtX3BnX2F1dGhpZCByZm9ybTsKQEAgLTc4OSw3ICs3 ODksNyBAQCBJbml0aWFsaXplU2Vzc2lvblVzZXJJZChjb25zdCBjaGFyICpyb2xlbmFtZSwg T2lkIHJvbGVpZCkKIAkJLyoKIAkJICogSXMgcm9sZSBhbGxvd2VkIHRvIGxvZ2luIGF0IGFs bD8KIAkJICovCi0JCWlmICghcmZvcm0tPnJvbGNhbmxvZ2luKQorCQlpZiAoIWJ5cGFzc19s b2dpbl9jaGVjayAmJiAhcmZvcm0tPnJvbGNhbmxvZ2luKQogCQkJZXJlcG9ydChGQVRBTCwK IAkJCQkJKGVycmNvZGUoRVJSQ09ERV9JTlZBTElEX0FVVEhPUklaQVRJT05fU1BFQ0lGSUNB VElPTiksCiAJCQkJCSBlcnJtc2coInJvbGUgXCIlc1wiIGlzIG5vdCBwZXJtaXR0ZWQgdG8g bG9nIGluIiwKZGlmZiAtLWdpdCBhL3NyYy9iYWNrZW5kL3V0aWxzL2luaXQvcG9zdGluaXQu YyBiL3NyYy9iYWNrZW5kL3V0aWxzL2luaXQvcG9zdGluaXQuYwppbmRleCBkZjRkMTVhNTBm Li5kY2ZlYjMwODMyIDEwMDY0NAotLS0gYS9zcmMvYmFja2VuZC91dGlscy9pbml0L3Bvc3Rp bml0LmMKKysrIGIvc3JjL2JhY2tlbmQvdXRpbHMvaW5pdC9wb3N0aW5pdC5jCkBAIC03MTks NiArNzE5LDcgQEAgSW5pdFBvc3RncmVzKGNvbnN0IGNoYXIgKmluX2RibmFtZSwgT2lkIGRi b2lkLAogCQkJIGNvbnN0IGNoYXIgKnVzZXJuYW1lLCBPaWQgdXNlcm9pZCwKIAkJCSBib29s IGxvYWRfc2Vzc2lvbl9saWJyYXJpZXMsCiAJCQkgYm9vbCBvdmVycmlkZV9hbGxvd19jb25u ZWN0aW9ucywKKwkJCSBib29sIGJ5cGFzc19sb2dpbl9jaGVjaywKIAkJCSBjaGFyICpvdXRf ZGJuYW1lKQogewogCWJvb2wJCWJvb3RzdHJhcCA9IElzQm9vdHN0cmFwUHJvY2Vzc2luZ01v ZGUoKTsKQEAgLTkwMSw3ICs5MDIsNyBAQCBJbml0UG9zdGdyZXMoY29uc3QgY2hhciAqaW5f ZGJuYW1lLCBPaWQgZGJvaWQsCiAJCX0KIAkJZWxzZQogCQl7Ci0JCQlJbml0aWFsaXplU2Vz c2lvblVzZXJJZCh1c2VybmFtZSwgdXNlcm9pZCk7CisJCQlJbml0aWFsaXplU2Vzc2lvblVz ZXJJZCh1c2VybmFtZSwgdXNlcm9pZCwgYnlwYXNzX2xvZ2luX2NoZWNrKTsKIAkJCWFtX3N1 cGVydXNlciA9IHN1cGVydXNlcigpOwogCQl9CiAJfQpAQCAtOTEwLDcgKzkxMSw3IEBAIElu aXRQb3N0Z3Jlcyhjb25zdCBjaGFyICppbl9kYm5hbWUsIE9pZCBkYm9pZCwKIAkJLyogbm9y bWFsIG11bHRpdXNlciBjYXNlICovCiAJCUFzc2VydChNeVByb2NQb3J0ICE9IE5VTEwpOwog CQlQZXJmb3JtQXV0aGVudGljYXRpb24oTXlQcm9jUG9ydCk7Ci0JCUluaXRpYWxpemVTZXNz aW9uVXNlcklkKHVzZXJuYW1lLCB1c2Vyb2lkKTsKKwkJSW5pdGlhbGl6ZVNlc3Npb25Vc2Vy SWQodXNlcm5hbWUsIHVzZXJvaWQsIGZhbHNlKTsKIAkJLyogZW5zdXJlIHRoYXQgYXV0aF9t ZXRob2QgaXMgYWN0dWFsbHkgdmFsaWQsIGFrYSBhdXRobl9pZCBpcyBub3QgTlVMTCAqLwog CQlpZiAoTXlDbGllbnRDb25uZWN0aW9uSW5mby5hdXRobl9pZCkKIAkJCUluaXRpYWxpemVT eXN0ZW1Vc2VyKE15Q2xpZW50Q29ubmVjdGlvbkluZm8uYXV0aG5faWQsCmRpZmYgLS1naXQg YS9zcmMvaW5jbHVkZS9taXNjYWRtaW4uaCBiL3NyYy9pbmNsdWRlL21pc2NhZG1pbi5oCmlu ZGV4IDE0YmQ1NzRmYzIuLmYxZDAzZjJkZjggMTAwNjQ0Ci0tLSBhL3NyYy9pbmNsdWRlL21p c2NhZG1pbi5oCisrKyBiL3NyYy9pbmNsdWRlL21pc2NhZG1pbi5oCkBAIC0zNjQsNyArMzY0 LDggQEAgZXh0ZXJuIGJvb2wgSW5TZWN1cml0eVJlc3RyaWN0ZWRPcGVyYXRpb24odm9pZCk7 CiBleHRlcm4gYm9vbCBJbk5vRm9yY2VSTFNPcGVyYXRpb24odm9pZCk7CiBleHRlcm4gdm9p ZCBHZXRVc2VySWRBbmRDb250ZXh0KE9pZCAqdXNlcmlkLCBib29sICpzZWNfZGVmX2NvbnRl eHQpOwogZXh0ZXJuIHZvaWQgU2V0VXNlcklkQW5kQ29udGV4dChPaWQgdXNlcmlkLCBib29s IHNlY19kZWZfY29udGV4dCk7Ci1leHRlcm4gdm9pZCBJbml0aWFsaXplU2Vzc2lvblVzZXJJ ZChjb25zdCBjaGFyICpyb2xlbmFtZSwgT2lkIHJvbGVpZCk7CitleHRlcm4gdm9pZCBJbml0 aWFsaXplU2Vzc2lvblVzZXJJZChjb25zdCBjaGFyICpyb2xlbmFtZSwgT2lkIHJvbGVpZCwK KwkJCQkJCQkJCWJvb2wgYnlwYXNzX2xvZ2luX2NoZWNrKTsKIGV4dGVybiB2b2lkIEluaXRp YWxpemVTZXNzaW9uVXNlcklkU3RhbmRhbG9uZSh2b2lkKTsKIGV4dGVybiB2b2lkIFNldFNl c3Npb25BdXRob3JpemF0aW9uKE9pZCB1c2VyaWQsIGJvb2wgaXNfc3VwZXJ1c2VyKTsKIGV4 dGVybiBPaWQJR2V0Q3VycmVudFJvbGVJZCh2b2lkKTsKQEAgLTQ2OSw2ICs0NzAsNyBAQCBl eHRlcm4gdm9pZCBJbml0UG9zdGdyZXMoY29uc3QgY2hhciAqaW5fZGJuYW1lLCBPaWQgZGJv aWQsCiAJCQkJCQkgY29uc3QgY2hhciAqdXNlcm5hbWUsIE9pZCB1c2Vyb2lkLAogCQkJCQkJ IGJvb2wgbG9hZF9zZXNzaW9uX2xpYnJhcmllcywKIAkJCQkJCSBib29sIG92ZXJyaWRlX2Fs bG93X2Nvbm5lY3Rpb25zLAorCQkJCQkJIGJvb2wgYnlwYXNzX2xvZ2luX2NoZWNrLAogCQkJ CQkJIGNoYXIgKm91dF9kYm5hbWUpOwogZXh0ZXJuIHZvaWQgQmFzZUluaXQodm9pZCk7CiAK ZGlmZiAtLWdpdCBhL3NyYy9pbmNsdWRlL3Bvc3RtYXN0ZXIvYmd3b3JrZXIuaCBiL3NyYy9p bmNsdWRlL3Bvc3RtYXN0ZXIvYmd3b3JrZXIuaAppbmRleCA3ODE1NTA3ZTNkLi4wZmRiZmFm NDMxIDEwMDY0NAotLS0gYS9zcmMvaW5jbHVkZS9wb3N0bWFzdGVyL2Jnd29ya2VyLmgKKysr IGIvc3JjL2luY2x1ZGUvcG9zdG1hc3Rlci9iZ3dvcmtlci5oCkBAIC0xNDEsMTggKzE0MSwy MCBAQCBleHRlcm4gUEdETExJTVBPUlQgQmFja2dyb3VuZFdvcmtlciAqTXlCZ3dvcmtlckVu dHJ5OwogICogSWYgZGJuYW1lIGlzIE5VTEwsIGNvbm5lY3Rpb24gaXMgbWFkZSB0byBubyBz cGVjaWZpYyBkYXRhYmFzZTsKICAqIG9ubHkgc2hhcmVkIGNhdGFsb2dzIGNhbiBiZSBhY2Nl c3NlZC4KICAqLwotZXh0ZXJuIHZvaWQgQmFja2dyb3VuZFdvcmtlckluaXRpYWxpemVDb25u ZWN0aW9uKGNvbnN0IGNoYXIgKmRibmFtZSwgY29uc3QgY2hhciAqdXNlcm5hbWUsIHVpbnQz MiBmbGFncyk7CitleHRlcm4gdm9pZCBCYWNrZ3JvdW5kV29ya2VySW5pdGlhbGl6ZUNvbm5l Y3Rpb24oY29uc3QgY2hhciAqZGJuYW1lLCBjb25zdCBjaGFyICp1c2VybmFtZSwgYml0czMy IGZsYWdzKTsKIAogLyogSnVzdCBsaWtlIHRoZSBhYm92ZSwgYnV0IHNwZWNpZnlpbmcgZGF0 YWJhc2UgYW5kIHVzZXIgYnkgT0lELiAqLwotZXh0ZXJuIHZvaWQgQmFja2dyb3VuZFdvcmtl ckluaXRpYWxpemVDb25uZWN0aW9uQnlPaWQoT2lkIGRib2lkLCBPaWQgdXNlcm9pZCwgdWlu dDMyIGZsYWdzKTsKK2V4dGVybiB2b2lkIEJhY2tncm91bmRXb3JrZXJJbml0aWFsaXplQ29u bmVjdGlvbkJ5T2lkKE9pZCBkYm9pZCwgT2lkIHVzZXJvaWQsIGJpdHMzMiBmbGFncyk7CiAK IC8qCiAgKiBGbGFncyB0byBCYWNrZ3JvdW5kV29ya2VySW5pdGlhbGl6ZUNvbm5lY3Rpb24g ZXQgYWwKICAqCiAgKgotICogQWxsb3cgYnlwYXNzaW5nIGRhdGFsbG93Y29ubiByZXN0cmlj dGlvbnMgd2hlbiBjb25uZWN0aW5nIHRvIGRhdGFiYXNlCisgKiBBbGxvdyBieXBhc3Npbmcg ZGF0YWxsb3djb25uIHJlc3RyaWN0aW9ucyBhbmQgbG9naW4gY2hlY2sgd2hlbiBjb25uZWN0 aW5nCisgKiB0byBkYXRhYmFzZQogICovCi0jZGVmaW5lIEJHV09SS0VSX0JZUEFTU19BTExP V0NPTk4gMQorI2RlZmluZSBCR1dPUktFUl9CWVBBU1NfQUxMT1dDT05OIDB4MDAwMQorI2Rl ZmluZSBCR1dPUktFUl9CWVBBU1NfUk9MRUxPR0lOQ0hFQ0sgMHgwMDAyCiAKIAogLyogQmxv Y2svdW5ibG9jayBzaWduYWxzIGluIGEgYmFja2dyb3VuZCB3b3JrZXIgcHJvY2VzcyAqLwpk aWZmIC0tZ2l0IGEvc3JjL3Rlc3QvbW9kdWxlcy93b3JrZXJfc3BpL3QvMDAxX3dvcmtlcl9z cGkucGwgYi9zcmMvdGVzdC9tb2R1bGVzL3dvcmtlcl9zcGkvdC8wMDFfd29ya2VyX3NwaS5w bAppbmRleCAyOTY1YWNkNzg5Li5kY2YzNzYwNmE0IDEwMDY0NAotLS0gYS9zcmMvdGVzdC9t b2R1bGVzL3dvcmtlcl9zcGkvdC8wMDFfd29ya2VyX3NwaS5wbAorKysgYi9zcmMvdGVzdC9t b2R1bGVzL3dvcmtlcl9zcGkvdC8wMDFfd29ya2VyX3NwaS5wbApAQCAtOTMsNCArOTMsNDQg QEAgb2soICRub2RlLT5wb2xsX3F1ZXJ5X3VudGlsKAogCSdkeW5hbWljIGJnd29ya2VycyBh bGwgbGF1bmNoZWQnCiApIG9yIGRpZSAiVGltZWQgb3V0IHdoaWxlIHdhaXRpbmcgZm9yIGR5 bmFtaWMgYmd3b3JrZXJzIHRvIGJlIGxhdW5jaGVkIjsKIAorIyBDaGVjayBCR1dPUktFUl9C WVBBU1NfUk9MRUxPR0lOQ0hFQ0sgYmVoYXZlcyBhcyBleHBlY3RlZC4KKworIyBGaXJzdCBj cmVhdGUgYSByb2xlIHdpdGhvdXQgbG9naW4uCiskbm9kZS0+c2FmZV9wc3FsKAorCSdwb3N0 Z3JlcycsIHFxWworICBDUkVBVEUgUk9MRSBub2xvZ3JvbGUgd2l0aCBub2xvZ2luOworICBB TFRFUiBST0xFIG5vbG9ncm9sZSB3aXRoIHN1cGVydXNlcjsKK10pOworCitteSAkbG9nX3N0 YXJ0ID0gLXMgJG5vZGUtPmxvZ2ZpbGU7CisKKyMgQXNrIHRoZSBiYWNrZ3JvdW5kIHdvcmtl cnMgdG8gY29ubmVjdCB3aXRoIHRoaXMgcm9sZS4KKyRub2RlLT5hcHBlbmRfY29uZigKKwkn cG9zdGdyZXNxbC5jb25mJywgcXsKK3dvcmtlcl9zcGkucm9sZSA9ICdub2xvZ3JvbGUnCit9 KTsKKyRub2RlLT5yZXN0YXJ0OworCisjIEFuIGVycm9yIG1lc3NhZ2Ugc2hvdWxkIGJlIGlz c3VlZC4KK29rKCAkbm9kZS0+bG9nX2NvbnRhaW5zKAorCQkicm9sZSBcIm5vbG9ncm9sZVwi IGlzIG5vdCBwZXJtaXR0ZWQgdG8gbG9nIGluIiwgJGxvZ19zdGFydCksCisJIm5vbG9ncm9s ZSBub3QgYWxsb3dlZCB0byBjb25uZWN0IGlmIEJHV09SS0VSX0JZUEFTU19ST0xFTE9HSU5D SEVDSyBpcyBub3Qgc2V0IgorKTsKKworCiskbG9nX3N0YXJ0ID0gLXMgJG5vZGUtPmxvZ2Zp bGU7CisKKyMgQXNrIHRoZSBiYWNrZ3JvdW5kIHdvcmtlcnMgdG8gY29ubmVjdCB3aXRoIHRo aXMgcm9sZSB3aXRoIHRoZSBmbGFnIGluIHBsYWNlLgorJG5vZGUtPmFwcGVuZF9jb25mKAor CSdwb3N0Z3Jlc3FsLmNvbmYnLCBxeword29ya2VyX3NwaS5yb2xlID0gJ25vbG9ncm9sZScK K3dvcmtlcl9zcGkuYnlwYXNzX2xvZ2luX2NoZWNrID0gdHJ1ZQorfSk7Ciskbm9kZS0+cmVz dGFydDsKKworIyBBbiBlcnJvciBtZXNzYWdlIHNob3VsZCBub3QgYmUgaXNzdWVkLgorb2so ICEkbm9kZS0+bG9nX2NvbnRhaW5zKAorCQkicm9sZSBcIm5vbG9ncm9sZVwiIGlzIG5vdCBw ZXJtaXR0ZWQgdG8gbG9nIGluIiwgJGxvZ19zdGFydCksCisJIm5vbG9ncm9sZSBhbGxvd2Vk IHRvIGNvbm5lY3QgaWYgQkdXT1JLRVJfQllQQVNTX1JPTEVMT0dJTkNIRUNLIGlzIHNldCIp OworCiBkb25lX3Rlc3RpbmcoKTsKZGlmZiAtLWdpdCBhL3NyYy90ZXN0L21vZHVsZXMvd29y a2VyX3NwaS93b3JrZXJfc3BpLmMgYi9zcmMvdGVzdC9tb2R1bGVzL3dvcmtlcl9zcGkvd29y a2VyX3NwaS5jCmluZGV4IDk4ZjhkNDE5NGIuLmQyY2E5OWYyYzUgMTAwNjQ0Ci0tLSBhL3Ny Yy90ZXN0L21vZHVsZXMvd29ya2VyX3NwaS93b3JrZXJfc3BpLmMKKysrIGIvc3JjL3Rlc3Qv bW9kdWxlcy93b3JrZXJfc3BpL3dvcmtlcl9zcGkuYwpAQCAtNTIsNiArNTIsOCBAQCBQR0RM TEVYUE9SVCB2b2lkIHdvcmtlcl9zcGlfbWFpbihEYXR1bSBtYWluX2FyZykgcGdfYXR0cmli dXRlX25vcmV0dXJuKCk7CiBzdGF0aWMgaW50CXdvcmtlcl9zcGlfbmFwdGltZSA9IDEwOwog c3RhdGljIGludAl3b3JrZXJfc3BpX3RvdGFsX3dvcmtlcnMgPSAyOwogc3RhdGljIGNoYXIg Kndvcmtlcl9zcGlfZGF0YWJhc2UgPSBOVUxMOworc3RhdGljIGNoYXIgKndvcmtlcl9zcGlf cm9sZSA9IE5VTEw7CitzdGF0aWMgYm9vbCB3b3JrZXJfc3BpX2J5cGFzc19sb2dpbl9jaGVj ayA9IGZhbHNlOwogCiAvKiB2YWx1ZSBjYWNoZWQsIGZldGNoZWQgZnJvbSBzaGFyZWQgbWVt b3J5ICovCiBzdGF0aWMgdWludDMyIHdvcmtlcl9zcGlfd2FpdF9ldmVudF9tYWluID0gMDsK QEAgLTE1Miw3ICsxNTQsMTAgQEAgd29ya2VyX3NwaV9tYWluKERhdHVtIG1haW5fYXJnKQog CUJhY2tncm91bmRXb3JrZXJVbmJsb2NrU2lnbmFscygpOwogCiAJLyogQ29ubmVjdCB0byBv dXIgZGF0YWJhc2UgKi8KLQlCYWNrZ3JvdW5kV29ya2VySW5pdGlhbGl6ZUNvbm5lY3Rpb24o d29ya2VyX3NwaV9kYXRhYmFzZSwgTlVMTCwgMCk7CisJaWYgKHdvcmtlcl9zcGlfYnlwYXNz X2xvZ2luX2NoZWNrKQorCQlCYWNrZ3JvdW5kV29ya2VySW5pdGlhbGl6ZUNvbm5lY3Rpb24o d29ya2VyX3NwaV9kYXRhYmFzZSwgd29ya2VyX3NwaV9yb2xlLCBCR1dPUktFUl9CWVBBU1Nf Uk9MRUxPR0lOQ0hFQ0spOworCWVsc2UKKwkJQmFja2dyb3VuZFdvcmtlckluaXRpYWxpemVD b25uZWN0aW9uKHdvcmtlcl9zcGlfZGF0YWJhc2UsIHdvcmtlcl9zcGlfcm9sZSwgMCk7CiAK IAllbG9nKExPRywgIiVzIGluaXRpYWxpemVkIHdpdGggJXMuJXMiLAogCQkgTXlCZ3dvcmtl ckVudHJ5LT5iZ3dfbmFtZSwgdGFibGUtPnNjaGVtYSwgdGFibGUtPm5hbWUpOwpAQCAtMzE2 LDYgKzMyMSwyNCBAQCBfUEdfaW5pdCh2b2lkKQogCQkJCQkJCSAgIDAsCiAJCQkJCQkJICAg TlVMTCwgTlVMTCwgTlVMTCk7CiAKKwlEZWZpbmVDdXN0b21TdHJpbmdWYXJpYWJsZSgid29y a2VyX3NwaS5yb2xlIiwKKwkJCQkJCQkgICAiUm9sZSB0byBjb25uZWN0IHdpdGguIiwKKwkJ CQkJCQkgICBOVUxMLAorCQkJCQkJCSAgICZ3b3JrZXJfc3BpX3JvbGUsCisJCQkJCQkJICAg TlVMTCwKKwkJCQkJCQkgICBQR0NfU0lHSFVQLAorCQkJCQkJCSAgIDAsCisJCQkJCQkJICAg TlVMTCwgTlVMTCwgTlVMTCk7CisKKwlEZWZpbmVDdXN0b21Cb29sVmFyaWFibGUoIndvcmtl cl9zcGkuYnlwYXNzX2xvZ2luX2NoZWNrIiwKKwkJCQkJCQkgIlNob3VsZCBCR1cgYWxsb3dz IHRvIGNvbm5lY3Qgd2l0aCBub24gbG9naW4gcm9sZS4iLAorCQkJCQkJCSBOVUxMLAorCQkJ CQkJCSAmd29ya2VyX3NwaV9ieXBhc3NfbG9naW5fY2hlY2ssCisJCQkJCQkJIGZhbHNlLAor CQkJCQkJCSBQR0NfU0lHSFVQLAorCQkJCQkJCSAwLAorCQkJCQkJCSBOVUxMLCBOVUxMLCBO VUxMKTsKKwogCWlmICghcHJvY2Vzc19zaGFyZWRfcHJlbG9hZF9saWJyYXJpZXNfaW5fcHJv Z3Jlc3MpCiAJCXJldHVybjsKIAotLSAKMi4zNC4xCgo= --------------7NBqX8V3neziH8siV4kcgeKX--