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.96) (envelope-from ) id 1x6UjB-000GnS-2j for pgsql-hackers@arkaria.postgresql.org; Tue, 15 Sep 2026 15:05:46 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.96) (envelope-from ) id 1x6UjA-002MMH-30 for pgsql-hackers@arkaria.postgresql.org; Tue, 15 Sep 2026 15:05:44 +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.96) (envelope-from ) id 1x6UjA-002MM8-0f for pgsql-hackers@lists.postgresql.org; Tue, 15 Sep 2026 15:05:44 +0000 Received: from flamingo.larch.relay.mailchannels.net ([23.83.213.60]) by makus.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.98.2) (envelope-from ) id 1x6Uj2-00000000CsX-3d10 for pgsql-hackers@postgresql.org; Tue, 15 Sep 2026 15:05:42 +0000 X-Sender-Id: hostingeremail|x-authuser|david@pgbackrest.org Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id C39F942615; Tue, 15 Sep 2026 15:05:34 +0000 (UTC) Received: from fr-int-smtpout21.hostinger.io (100-99-48-91.trex-nlb.outbound.svc.cluster.local [100.99.48.91]) (Authenticated sender: hostingeremail) by relay.mailchannels.net (Postfix) with ESMTPA id 11E8841491; Tue, 15 Sep 2026 15:05:31 +0000 (UTC) X-Sender-Id: hostingeremail|x-authuser|david@pgbackrest.org X-MC-Relay: Junk X-MailChannels-SenderId: hostingeremail|x-authuser|david@pgbackrest.org X-MailChannels-Auth-Id: hostingeremail X-Sponge-Harmony: 6995c4043f5057d7_1789484734572_911895719 X-MC-Loop-Signature: 1789484734572:3119229966 X-MC-Ingress-Time: 1789484734572 Received: from fr-int-smtpout21.hostinger.io (fr-int-smtpout21.hostinger.io [148.222.54.33]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.99.48.91 (trex/8.0.2); Tue, 15 Sep 2026 15:05:34 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pgbackrest.org; s=hostingermail1; t=1789484728; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=+lcLeWXmF4kSQAVjzE9abATetWaMQCnz551vI6tA75g=; b=uqhECrE/DnNKyDOomlW1npncd1EH3Bd3EgpFWaRqP905kmr7XyzyqRDqhUAKU+K9aGuWdO 9eYa5MqXNnRrRsynqaj98HitO/btQdt+G2kouDFp6A9FEFSQ1YwLX6KaSdydzbCIJlbd28 k57bmWayDdbWCQ16Lizweeaf6jSIR1kRmMTFzoh1EFYCcl3p+jVP9p/4CISKTpAbv9y7Ml Vikp3lFmZi6IwcDABSYNDQ2MikE6qh7/IbmFki/3O+flF2uP7Uax0n/sa6iCY26MbVqzOx qHWb8eb1EuTa1dm8Mm1nWB4zuJ/eLg6ialgssFdlbmDI/5n5dU6IaglvRK44zQ== Received: from [10.3.0.2] (unknown [37.19.196.206]) (Authenticated sender: david@pgbackrest.org) by smtp.hostinger.com (smtp.hostinger.com) with ESMTPSA id 4hklgl0S5mz20c5; Tue, 15 Sep 2026 15:05:22 +0000 (UTC) Content-Type: multipart/mixed; boundary="------------mfZNNh0YnC6IBtB2QJIJYyvh" Message-ID: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: Return pg_control from pg_backup_stop(). To: shihao zhong Cc: Andy Pogrebnoi , Michael Paquier , Haibo Yan , Pg Hackers , Heikki Linnakangas , Robert Haas , Andres Freund , Fujii Masao , Shaun Thomas References: <8b8aa673-fcef-4e14-a05d-0885283ef1b8@pgbackrest.org> <17DC1346-0CDE-4E39-B110-3D6FB0797AC6@gmail.com> <7F7B289B-F94F-42C2-9E54-6A689C0D64BB@gmail.com> <1800c83c-264a-4183-9da5-ac78e25849a8@pgbackrest.org> <3b23e3b7-53d2-4784-b482-05cca3327acb@pgbackrest.org> Content-Language: en-US From: David Steele In-Reply-To: Date: Tue, 15 Sep 2026 15:05:22 +0000 (UTC) X-CM-Envelope: MS4xfAk52peVUAVDKAYfsDHp9qdisJnxlaEGmDwxifXAjIEAqiz8xZI9cG+ou72u7eIUp255xzgoSVxuU6nN8KDcZHaktn43TFsfRacGtEsLMV6hymGL8z7/ 0tQSy9i4iKnjgTTh1VqCX/ZrK8znGr3S0jek1zrwl4645BSGH3SqVjyHiNkxHi1EXCdwRUqJX1iu0r1bcnuT9YdhkRBiVY37ITsrvs1KCMHP+tqHFpJYYOv9 C/pNE/0iqObt9dekm4nTtPydfcgbPod4ob3MfQKwwachFEqJJhgSB9BSFn1eaOVmjA6GjQVBTpWIhIlSxjldIqocBc6zxeV1rVmVNF7+1x4nntcguT1EkSg/ 6lBlxvKCIMPiZasc14OghtMuxtVv3uopzLX5BDDRM4WjDxxSakLs3ILU6tyK7s+Dv/6LpoFoFsEPL5xX+2e+wPUkwVG2bksvGASPzO5gsMNU8xIsIriK+Dqk ltiQa9iIKsMLnADd X-CM-Analysis: v=2.4 cv=V5Av0vni c=1 sm=1 tr=0 ts=6aa95eb9 a=ok4o3DUlSCtDdpfTDZqZ5A==:117 a=ok4o3DUlSCtDdpfTDZqZ5A==:17 a=r77TgQKjGQsHNAKrUKIA:9 a=GECa0vXFYAXtemeC5VwA:9 a=QEXdDO2ut3YA:10 a=jixU_1hUAAAA:8 a=9eJvyTxnBusecsw16g4A:9 a=B2y7HmGcmWMA:10 a=q5YM_uMBw6irhRasv8ad:22 X-AuthUser: david@pgbackrest.org 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. --------------mfZNNh0YnC6IBtB2QJIJYyvh Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Hi Shihao, On 8/28/26 05:34, shihao zhong wrote: > > Thanks for working on this -- it fills a gap that I think Postgres has > needed for a long time. > I reviewed and tested v11 on master and it looks all good. Thank you for having a look at the patch. > One thing I think needs a decision, which I left alone. xlogrecovery.c > still suggests removing backup_label in two places. Restore a > "pg_basebackup -X none" backup without recovery.signal and you get > "could not locate required checkpoint record", hinting "try removing the > file backup_label". Do that, and you get "could not find backup_label > required for recovery" telling you to put it back. Agreed, and I have addressed it in v13 by adding a conditional to the relevant errors with a alternate message: ControlFile->backupLabelRequired ? errhint("Touch \"%s/recovery.signal\" or \"%s/standby.signal\" and add required recovery options.\n" "Do not remove \"%s/backup_label\"; it is required to recover this backup.", DataDir, DataDir, DataDir) : > Smaller things: > 1. errhint() should start with a capital letter ("Restore the ..."). > Fixed in v12, along with "(char *)controlFile" -> "(char *) controlFile". pg_indent would catch this, but always better to have to source as clean as possible. Added into v13. > 2. The commit message says "limited to pg_basebackup", but the patch also > sets the flag in pg_rewind. The logic is fine; v12 just says so, and > it probably deserves a line in pg_rewind.sgml. Changes to the commit message preserved in v13. Docs updated per below. > 3. Assert(crc_ok && memcmp(...) == 0) combines two conditions; splitting > them would say which one failed. I left this as is from v11. I think it's a pretty normal thing to do. If you are running with asserts then you are debugging anyway so resolving the missed condition is pretty trivial, IMO. > 4. v12 moves the test out of 002_archiving.pl, which is about > archive_cleanup_command, into 057_backup_label_required.pl. Your > assertions are kept, plus checks that the flag is set in the backup, > cleared after recovery, and the same for a backup from a standby. Yes, I think a dedicated test module makes sense here, so I kept that in v13. > 5. Docs are untouched beyond the pg_control_recovery() table. At least > pg_basebackup.sgml needs a mention, and something in backup.sgml about > low-level backups not getting this protection now that the SQL part is > dropped. Worth saying that pg_resetwal is the only way to clear the > flag, too. Docs have been updated with each of these suggestions. I also added a few additional tests to flesh out the coverage. Regards, -David --------------mfZNNh0YnC6IBtB2QJIJYyvh Content-Type: text/plain; charset=UTF-8; name="pgcontrol-basebackup-flag-v13.patch" Content-Disposition: attachment; filename="pgcontrol-basebackup-flag-v13.patch" Content-Transfer-Encoding: base64 RnJvbSA1M2MwODdjNGRhYWRjMWQ4OGZjYWQ2OGJjMzA0NWJhMDFiOWE2YzZlIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBEYXZpZCBTdGVlbGUgPGRhdmlkQHBnYmFja3Jlc3Qu b3JnPgpEYXRlOiBUdWUsIDE1IFNlcCAyMDI2IDEyOjQ4OjMzICswMDAwClN1YmplY3Q6IEFk ZCBwZ19jb250cm9sIGZsYWcgdG8gcHJldmVudCByZWNvdmVyeSB3aXRob3V0IGJhY2t1cF9s YWJlbC4KCkhhcmRlbiByZWNvdmVyeSBieSBhZGRpbmcgYSBmbGFnIHRvIHBnX2NvbnRyb2wg dG8gaW5kaWNhdGUgdGhhdCBiYWNrdXBfbGFiZWwgaXMKcmVxdWlyZWQuIFRoaXMgcHJldmVu dHMgdGhlIHVzZXIgZnJvbSBkZWxldGluZyBiYWNrdXBfbGFiZWwgcmVzdWx0aW5nIGluIGFu CmluY29uc2lzdGVudCByZWNvdmVyeS4KClJlY292ZXJ5IGhpbnRzIHRoYXQgc3VnZ2VzdCBy ZW1vdmluZyBiYWNrdXBfbGFiZWwgYXJlIG9taXR0ZWQgd2hlbiB0aGUgZmxhZyBpcwpzZXQs IHNpbmNlIGluIHRoYXQgY2FzZSBwZ19jb250cm9sIHNob3dzIHRoYXQgdGhlIGRhdGEgZGly ZWN0b3J5IGNhbWUgZnJvbSBhCmJhY2t1cCBhbmQgcmVtb3ZpbmcgYmFja3VwX2xhYmVsIHdv dWxkIGxlYXZlIGl0IHVuYWJsZSB0byBzdGFydCBhdCBhbGwuCgpBbm90aGVyIGFkdmFudGFn ZSBpcyB0aGF0IHRoZSBjb3B5IG9mIHBnX2NvbnRyb2wgdXNlZCBieSBwZ19iYXNlYmFja3Vw IGlzCmd1YXJhbnRlZWQgbm90IHRvIGJlIHRvcm4uCgpUaGlzIGZ1bmN0aW9uYWxpdHkgaXMg bGltaXRlZCB0byBwZ19iYXNlYmFja3VwIGFuZCBwZ19yZXdpbmQgKG9yIGFueSBzb2Z0d2Fy ZQpjb21mb3J0YWJsZSB3aXRoIG1vZGlmeWluZyBwZ19jb250cm9sKS4gcGdfcmV3aW5kIGNy ZWF0ZXMgYSBiYWNrdXBfbGFiZWwgb2YgaXRzCm93biwgc28gdGhlIGZsYWcgaXMgc2V0IHRo ZXJlIGFzIHdlbGwsIHdoaWNoIG1lYW5zIHRoYXQgcmVtb3ZpbmcgYmFja3VwX2xhYmVsCmFm dGVyIGEgcmV3aW5kIG5vIGxvbmdlciBhbGxvd3MgdGhlIGNsdXN0ZXIgdG8gc3RhcnQuCgpD b250cm9sIGFuZCBjYXRhbG9nIHZlcnNpb24gYnVtcHMgYXJlIHJlcXVpcmVkLgotLS0KIGRv Yy9zcmMvc2dtbC9iYWNrdXAuc2dtbCAgICAgICAgICAgICAgICAgICAgICB8ICAxMyArKwog ZG9jL3NyYy9zZ21sL2Z1bmMvZnVuYy1pbmZvLnNnbWwgICAgICAgICAgICAgIHwgICA1ICsK IGRvYy9zcmMvc2dtbC9yZWYvcGdfYmFzZWJhY2t1cC5zZ21sICAgICAgICAgICB8ICAxMCAr KwogZG9jL3NyYy9zZ21sL3JlZi9wZ19yZXdpbmQuc2dtbCAgICAgICAgICAgICAgIHwgICA0 ICsKIHNyYy9iYWNrZW5kL2FjY2Vzcy90cmFuc2FtL3hsb2cuYyAgICAgICAgICAgICB8ICA0 NyArKysrKwogc3JjL2JhY2tlbmQvYWNjZXNzL3RyYW5zYW0veGxvZ3JlY292ZXJ5LmMgICAg IHwgIDI3ICsrLQogc3JjL2JhY2tlbmQvYmFja3VwL2Jhc2ViYWNrdXAuYyAgICAgICAgICAg ICAgIHwgIDE1ICstCiBzcmMvYmFja2VuZC91dGlscy9taXNjL3BnX2NvbnRyb2xkYXRhLmMg ICAgICAgfCAgIDcgKy0KIHNyYy9iaW4vcGdfY29udHJvbGRhdGEvcGdfY29udHJvbGRhdGEu YyAgICAgICB8ICAgMiArCiBzcmMvYmluL3BnX3Jlc2V0d2FsL3BnX3Jlc2V0d2FsLmMgICAg ICAgICAgICAgfCAgIDEgKwogc3JjL2Jpbi9wZ19yZXdpbmQvcGdfcmV3aW5kLmMgICAgICAg ICAgICAgICAgIHwgICAxICsKIHNyYy9iaW4vcGdfcmV3aW5kL3QvUmV3aW5kVGVzdC5wbSAg ICAgICAgICAgICB8ICAxMiArKwogc3JjL2luY2x1ZGUvYWNjZXNzL3hsb2cuaCAgICAgICAg ICAgICAgICAgICAgIHwgICAxICsKIHNyYy9pbmNsdWRlL2NhdGFsb2cvcGdfY29udHJvbC5o ICAgICAgICAgICAgICB8ICAgNCArCiBzcmMvaW5jbHVkZS9jYXRhbG9nL3BnX3Byb2MuZGF0 ICAgICAgICAgICAgICAgfCAgIDYgKy0KIHNyYy90ZXN0L3JlY292ZXJ5L21lc29uLmJ1aWxk ICAgICAgICAgICAgICAgICB8ICAgMSArCiBzcmMvdGVzdC9yZWNvdmVyeS90LzA0Ml9sb3df bGV2ZWxfYmFja3VwLnBsICAgfCAgIDggKwogLi4uL3JlY292ZXJ5L3QvMDU3X2JhY2t1cF9s YWJlbF9yZXF1aXJlZC5wbCAgIHwgMTY1ICsrKysrKysrKysrKysrKysrKwogMTggZmlsZXMg Y2hhbmdlZCwgMzE0IGluc2VydGlvbnMoKyksIDE1IGRlbGV0aW9ucygtKQogY3JlYXRlIG1v ZGUgMTAwNjQ0IHNyYy90ZXN0L3JlY292ZXJ5L3QvMDU3X2JhY2t1cF9sYWJlbF9yZXF1aXJl ZC5wbAoKZGlmZiAtLWdpdCBhL2RvYy9zcmMvc2dtbC9iYWNrdXAuc2dtbCBiL2RvYy9zcmMv c2dtbC9iYWNrdXAuc2dtbAppbmRleCAxNjg0NDRlY2NjNS4uOTg0OTg0Yjg5NTkgMTAwNjQ0 Ci0tLSBhL2RvYy9zcmMvc2dtbC9iYWNrdXAuc2dtbAorKysgYi9kb2Mvc3JjL3NnbWwvYmFj a3VwLnNnbWwKQEAgLTEwMzEsNiArMTAzMSwxOSBAQCBTRUxFQ1QgKiBGUk9NIHBnX2JhY2t1 cF9zdG9wKHdhaXRfZm9yX2FyY2hpdmUgPT4gdHJ1ZSk7CiAgICAgIHZpdGFsIHRvIHRoZSBi YWNrdXAgd29ya2luZyBhbmQgbXVzdCBiZSB3cml0dGVuIGJ5dGUgZm9yIGJ5dGUgd2l0aG91 dAogICAgICBtb2RpZmljYXRpb24sIHdoaWNoIG1heSByZXF1aXJlIG9wZW5pbmcgdGhlIGZp bGUgaW4gYmluYXJ5IG1vZGUuCiAgICAgPC9wYXJhPgorICAgIDxwYXJhPgorICAgICBOb3Rl IHRoYXQgYSBiYWNrdXAgbWFkZSB3aXRoIHRoZSBsb3ctbGV2ZWwgQVBJIGNvcGllcworICAg ICA8ZmlsZW5hbWU+cGdfY29udHJvbDwvZmlsZW5hbWU+IGZyb20gdGhlIHJ1bm5pbmcgY2x1 c3Rlciwgc28gaXQgZG9lcyBub3QKKyAgICAgY29udGFpbiB0aGUgZmxhZyB0aGF0IDx4cmVm IGxpbmtlbmQ9ImFwcC1wZ2Jhc2ViYWNrdXAiLz4gc2V0cyB0byBtYWtlCisgICAgIDxmaWxl bmFtZT5iYWNrdXBfbGFiZWw8L2ZpbGVuYW1lPiBtYW5kYXRvcnkgZm9yIHJlY292ZXJ5LiBS ZW1vdmluZworICAgICA8ZmlsZW5hbWU+YmFja3VwX2xhYmVsPC9maWxlbmFtZT4gZnJvbSBz dWNoIGEgYmFja3VwIHdpbGwgbm90IHByZXZlbnQgdGhlCisgICAgIGNsdXN0ZXIgZnJvbSBz dGFydGluZzsgaXQgd2lsbCBpbnN0ZWFkIHJlY292ZXIgZnJvbSB0aGUgY2hlY2twb2ludAor ICAgICByZWNvcmRlZCBpbiA8ZmlsZW5hbWU+cGdfY29udHJvbDwvZmlsZW5hbWU+LiBVbmxl c3MgdGhhdCBoYXBwZW5zIHRvIGJlIHRoZQorICAgICBjaGVja3BvaW50IHRoZSBiYWNrdXAg c3RhcnRlZCBmcm9tLCByZWNvdmVyeSB3aWxsIGJlZ2luIHRvbyBsYXRlIGFuZAorICAgICBz aWxlbnRseSBwcm9kdWNlIGFuIGluY29uc2lzdGVudCBjbHVzdGVyLgorICAgICBCYWNrdXAg c29mdHdhcmUgdXNpbmcgdGhpcyBBUEkgc2hvdWxkIHNldCB0aGUgZmxhZyBpdHNlbGYgaWYg aXQgaXMgYWJsZSB0bworICAgICBtb2RpZnkgPGZpbGVuYW1lPnBnX2NvbnRyb2w8L2ZpbGVu YW1lPi4KKyAgICA8L3BhcmE+CiAgICA8L2xpc3RpdGVtPgogICAgPGxpc3RpdGVtPgogICAg IDxwYXJhPgpkaWZmIC0tZ2l0IGEvZG9jL3NyYy9zZ21sL2Z1bmMvZnVuYy1pbmZvLnNnbWwg Yi9kb2Mvc3JjL3NnbWwvZnVuYy9mdW5jLWluZm8uc2dtbAppbmRleCBlNTZjOWEyMmM0Mi4u ZjdjZTU4NDc5YTkgMTAwNjQ0Ci0tLSBhL2RvYy9zcmMvc2dtbC9mdW5jL2Z1bmMtaW5mby5z Z21sCisrKyBiL2RvYy9zcmMvc2dtbC9mdW5jL2Z1bmMtaW5mby5zZ21sCkBAIC0zNjQ0LDYg KzM2NDQsMTEgQEAgYWNsICAgICAgfCB7cG9zdGdyZXM9YXJ3ZER4dG0vcG9zdGdyZXMsZm9v PXIvcG9zdGdyZXN9CiAgICAgICAgPGVudHJ5Pjx0eXBlPmJvb2xlYW48L3R5cGU+PC9lbnRy eT4KICAgICAgIDwvcm93PgogCisgICAgICA8cm93PgorICAgICAgIDxlbnRyeT48c3RydWN0 ZmllbGQ+YmFja3VwX2xhYmVsX3JlcXVpcmVkPC9zdHJ1Y3RmaWVsZD48L2VudHJ5PgorICAg ICAgIDxlbnRyeT48dHlwZT5ib29sZWFuPC90eXBlPjwvZW50cnk+CisgICAgICA8L3Jvdz4K KwogICAgICA8L3Rib2R5PgogICAgIDwvdGdyb3VwPgogICAgPC90YWJsZT4KZGlmZiAtLWdp dCBhL2RvYy9zcmMvc2dtbC9yZWYvcGdfYmFzZWJhY2t1cC5zZ21sIGIvZG9jL3NyYy9zZ21s L3JlZi9wZ19iYXNlYmFja3VwLnNnbWwKaW5kZXggMzExNzk2OGQxMjUuLjliYzYyMTBmZGUy IDEwMDY0NAotLS0gYS9kb2Mvc3JjL3NnbWwvcmVmL3BnX2Jhc2ViYWNrdXAuc2dtbAorKysg Yi9kb2Mvc3JjL3NnbWwvcmVmL3BnX2Jhc2ViYWNrdXAuc2dtbApAQCAtNjAsNiArNjAsMTYg QEAgUG9zdGdyZVNRTCBkb2N1bWVudGF0aW9uCiAgICA8eHJlZiBsaW5rZW5kPSJhcHAtcGdk dW1wIi8+IG11c3QgYmUgdXNlZC4KICAgPC9wYXJhPgogCisgIDxwYXJhPgorICAgVGhlIGNv cHkgb2YgPGZpbGVuYW1lPnBnX2NvbnRyb2w8L2ZpbGVuYW1lPiBzdG9yZWQgaW4gdGhlIGJh Y2t1cCBpcyBmbGFnZ2VkCisgICB0byByZXF1aXJlIHRoZSA8ZmlsZW5hbWU+YmFja3VwX2xh YmVsPC9maWxlbmFtZT4gZmlsZSBmb3IgcmVjb3ZlcnkuIElmCisgICA8ZmlsZW5hbWU+YmFj a3VwX2xhYmVsPC9maWxlbmFtZT4gaXMgcmVtb3ZlZCwgcmVjb3ZlcnkgcmVmdXNlcyB0byBz dGFydAorICAgcmF0aGVyIHRoYW4gc2lsZW50bHkgcHJvZHVjaW5nIGFuIGluY29uc2lzdGVu dCBjbHVzdGVyLiBUaGUgZmxhZyBpcyBjbGVhcmVkCisgICBhdXRvbWF0aWNhbGx5IG9uY2Ug cmVjb3ZlcnkgaGFzIHJlYWQgPGZpbGVuYW1lPmJhY2t1cF9sYWJlbDwvZmlsZW5hbWU+Owor ICAgPHhyZWYgbGlua2VuZD0iYXBwLXBncmVzZXR3YWwiLz4gaXMgdGhlIG9ubHkgd2F5IHRv IGNsZWFyIGl0IG90aGVyd2lzZSwgYW5kCisgICBkb2luZyBzbyBvbiBhIGJhY2t1cCB0aGF0 IGhhcyBub3QgYmVlbiByZWNvdmVyZWQgd2lsbCBjb3JydXB0IGl0LgorICA8L3BhcmE+CisK ICAgPHBhcmE+CiAgICBUaGUgYmFja3VwIGlzIG1hZGUgb3ZlciBhIHJlZ3VsYXIgPHByb2R1 Y3RuYW1lPlBvc3RncmVTUUw8L3Byb2R1Y3RuYW1lPgogICAgY29ubmVjdGlvbiB0aGF0IHVz ZXMgdGhlIHJlcGxpY2F0aW9uIHByb3RvY29sLiBUaGUgY29ubmVjdGlvbiBtdXN0IGJlIG1h ZGUKZGlmZiAtLWdpdCBhL2RvYy9zcmMvc2dtbC9yZWYvcGdfcmV3aW5kLnNnbWwgYi9kb2Mv c3JjL3NnbWwvcmVmL3BnX3Jld2luZC5zZ21sCmluZGV4IGFjM2QwYzkzMjhmLi5jNDg4OGMx ODNmYiAxMDA2NDQKLS0tIGEvZG9jL3NyYy9zZ21sL3JlZi9wZ19yZXdpbmQuc2dtbAorKysg Yi9kb2Mvc3JjL3NnbWwvcmVmL3BnX3Jld2luZC5zZ21sCkBAIC00NTUsNiArNDU1LDEwIEBA IEdSQU5UIEVYRUNVVEUgT04gRlVOQ1RJT04gcGdfY2F0YWxvZy5wZ19yZWFkX2JpbmFyeV9m aWxlKHRleHQsIGJpZ2ludCwgYmlnaW50LCBiCiAgICAgICBkZWZpbmVkIGFzIHRoZSByZXN1 bHQgb2YgPGxpdGVyYWw+cGdfY3VycmVudF93YWxfaW5zZXJ0X2xzbigpPC9saXRlcmFsPgog ICAgICAgd2hlbiByZXdpbmRpbmcgZnJvbSBhIGxpdmUgc291cmNlIG9yIHRoZSBsYXN0IGNo ZWNrcG9pbnQgTFNOIHdoZW4KICAgICAgIHJld2luZGluZyBmcm9tIGEgc3RvcHBlZCBzb3Vy Y2UuCisgICAgICA8ZmlsZW5hbWU+cGdfY29udHJvbDwvZmlsZW5hbWU+IGlzIGFsc28gZmxh Z2dlZCB0byByZXF1aXJlCisgICAgICA8ZmlsZW5hbWU+YmFja3VwX2xhYmVsPC9maWxlbmFt ZT4sIHNvIHRoYXQgcmVtb3ZpbmcgdGhhdCBmaWxlIGRvZXMgbm90CisgICAgICBhbGxvdyB0 aGUgdGFyZ2V0IHRvIHN0YXJ0IHVwIGluIGFuIGluY29uc2lzdGVudCBzdGF0ZS4gVGhlIGZs YWcgaXMKKyAgICAgIGNsZWFyZWQgb25jZSB0aGUgdGFyZ2V0IGhhcyBwcm9jZXNzZWQgPGZp bGVuYW1lPmJhY2t1cF9sYWJlbDwvZmlsZW5hbWU+LgogICAgICA8L3BhcmE+CiAgICAgPC9z dGVwPgogICAgIDxzdGVwPgpkaWZmIC0tZ2l0IGEvc3JjL2JhY2tlbmQvYWNjZXNzL3RyYW5z YW0veGxvZy5jIGIvc3JjL2JhY2tlbmQvYWNjZXNzL3RyYW5zYW0veGxvZy5jCmluZGV4IDll YzBiZTc3Y2EwLi5mNDQ2NTFkNWViNSAxMDA2NDQKLS0tIGEvc3JjL2JhY2tlbmQvYWNjZXNz L3RyYW5zYW0veGxvZy5jCisrKyBiL3NyYy9iYWNrZW5kL2FjY2Vzcy90cmFuc2FtL3hsb2cu YwpAQCAtMTA1ODksNiArMTA1ODksNTMgQEAgZG9fcGdfYWJvcnRfYmFja3VwKGludCBjb2Rl LCBEYXR1bSBhcmcpCiAJfQogfQogCisvKgorICogQ3JlYXRlIGEgY29uc2lzdGVudCBjb3B5 IG9mIGNvbnRyb2wgZGF0YSB0byBiZSB1c2VkIGZvciBiYWNrdXAgYW5kIHVwZGF0ZSBpdAor ICogdG8gcmVxdWlyZSBhIGJhY2t1cCBsYWJlbCBmb3IgcmVjb3ZlcnkuIEFsc28gcmVjYWxj dWxhdGUgdGhlIENSQy4KKyAqCisgKiBUaGUgY2FsbGVyJ3MgYnVmZmVyIG11c3QgYmUgYXQg bGVhc3QgUEdfQ09OVFJPTF9GSUxFX1NJWkUgYnl0ZXMgYW5kIGlzCisgKiB6ZXJvLXBhZGRl ZCB0byB0aGF0IHNpemUuCisgKgorICogQWxsIGZpZWxkIGFjY2VzcyBpcyBkb25lIHRocm91 Z2ggYSBsb2NhbCwgcHJvcGVybHktYWxpZ25lZCBDb250cm9sRmlsZURhdGE7CisgKiB0aGUg Y2FsbGVyJ3MgYnVmZmVyIGlzIG9ubHkgZXZlciB3cml0dGVuIHZpYSBtZW1jcHkoKSBhbmQg c28gbmVlZCBub3QgYmUKKyAqIHN1aXRhYmx5IGFsaWduZWQgZm9yIENvbnRyb2xGaWxlRGF0 YS4KKyAqLwordm9pZAorYmFja3VwX2NvbnRyb2xfZmlsZSh1aW50OCAqY29udHJvbEZpbGUp Cit7CisJQ29udHJvbEZpbGVEYXRhIGNvbnRyb2xEYXRhOworCisJTFdMb2NrQWNxdWlyZShD b250cm9sRmlsZUxvY2ssIExXX1NIQVJFRCk7CisJbWVtY3B5KCZjb250cm9sRGF0YSwgQ29u dHJvbEZpbGUsIHNpemVvZihDb250cm9sRmlsZURhdGEpKTsKKworI2lmZGVmIFVTRV9BU1NF UlRfQ0hFQ0tJTkcKKwkvKgorCSAqIFZlcmlmeSB0aGF0IHRoZSBjb250ZW50cyBvZiBwZ19j b250cm9sIGFyZSB0aGUgc2FtZSBpbiBtZW1vcnkgYXMgb24gZGlzaworCSAqLworCXsKKwkJ Ym9vbCBjcmNfb2s7CisJCUNvbnRyb2xGaWxlRGF0YSAqZGF0YURpc2sgPSBnZXRfY29udHJv bGZpbGUoRGF0YURpciwgJmNyY19vayk7CisKKwkJQXNzZXJ0KGNyY19vayAmJgorCQkJICAg bWVtY21wKGRhdGFEaXNrLCAmY29udHJvbERhdGEsIHNpemVvZihDb250cm9sRmlsZURhdGEp KSA9PSAwKTsKKworCQlwZnJlZShkYXRhRGlzayk7CisJfQorI2VuZGlmCisKKwlMV0xvY2tS ZWxlYXNlKENvbnRyb2xGaWxlTG9jayk7CisKKwljb250cm9sRGF0YS5iYWNrdXBMYWJlbFJl cXVpcmVkID0gdHJ1ZTsKKworCUlOSVRfQ1JDMzJDKGNvbnRyb2xEYXRhLmNyYyk7CisJQ09N UF9DUkMzMkMoY29udHJvbERhdGEuY3JjLCAmY29udHJvbERhdGEsIG9mZnNldG9mKENvbnRy b2xGaWxlRGF0YSwgY3JjKSk7CisJRklOX0NSQzMyQyhjb250cm9sRGF0YS5jcmMpOworCisJ LyogQ29weSBpbnRvIHRoZSBjYWxsZXIncyBidWZmZXIsIHplcm8tcGFkZGVkIHRvIHRoZSBm dWxsIGZpbGUgc2l6ZSAqLworCW1lbXNldChjb250cm9sRmlsZSwgMCwgUEdfQ09OVFJPTF9G SUxFX1NJWkUpOworCW1lbWNweShjb250cm9sRmlsZSwgJmNvbnRyb2xEYXRhLCBzaXplb2Yo Q29udHJvbEZpbGVEYXRhKSk7Cit9CisKIC8qCiAgKiBSZWdpc3RlciBhIGhhbmRsZXIgdGhh dCB3aWxsIHdhcm4gYWJvdXQgdW50ZXJtaW5hdGVkIGJhY2t1cHMgYXQgZW5kIG9mCiAgKiBz ZXNzaW9uLCB1bmxlc3MgdGhpcyBoYXMgYWxyZWFkeSBiZWVuIGRvbmUuCmRpZmYgLS1naXQg YS9zcmMvYmFja2VuZC9hY2Nlc3MvdHJhbnNhbS94bG9ncmVjb3ZlcnkuYyBiL3NyYy9iYWNr ZW5kL2FjY2Vzcy90cmFuc2FtL3hsb2dyZWNvdmVyeS5jCmluZGV4IGZmZjhkNTdhYzYxLi5m NjFlNGMwMTk5YiAxMDA2NDQKLS0tIGEvc3JjL2JhY2tlbmQvYWNjZXNzL3RyYW5zYW0veGxv Z3JlY292ZXJ5LmMKKysrIGIvc3JjL2JhY2tlbmQvYWNjZXNzL3RyYW5zYW0veGxvZ3JlY292 ZXJ5LmMKQEAgLTYwNCw2ICs2MDQsMTAgQEAgSW5pdFdhbFJlY292ZXJ5KENvbnRyb2xGaWxl RGF0YSAqQ29udHJvbEZpbGUsIGJvb2wgKndhc1NodXRkb3duX3B0ciwKIAkJCQkJZXJlcG9y dChGQVRBTCwKIAkJCQkJCQllcnJtc2coImNvdWxkIG5vdCBmaW5kIHJlZG8gbG9jYXRpb24g JVgvJTA4WCByZWZlcmVuY2VkIGJ5IGNoZWNrcG9pbnQgcmVjb3JkIGF0ICVYLyUwOFgiLAog CQkJCQkJCQkgICBMU05fRk9STUFUX0FSR1MoY2hlY2tQb2ludC5yZWRvKSwgTFNOX0ZPUk1B VF9BUkdTKENoZWNrUG9pbnRMb2MpKSwKKwkJCQkJCQlDb250cm9sRmlsZS0+YmFja3VwTGFi ZWxSZXF1aXJlZCA/CisJCQkJCQkJZXJyaGludCgiVG91Y2ggXCIlcy9yZWNvdmVyeS5zaWdu YWxcIiBvciBcIiVzL3N0YW5kYnkuc2lnbmFsXCIgYW5kIGFkZCByZXF1aXJlZCByZWNvdmVy eSBvcHRpb25zLlxuIgorCQkJCQkJCQkJIkRvIG5vdCByZW1vdmUgXCIlcy9iYWNrdXBfbGFi ZWxcIjsgaXQgaXMgcmVxdWlyZWQgdG8gcmVjb3ZlciB0aGlzIGJhY2t1cC4iLAorCQkJCQkJ CQkJRGF0YURpciwgRGF0YURpciwgRGF0YURpcikgOgogCQkJCQkJCWVycmhpbnQoIklmIHlv dSBhcmUgcmVzdG9yaW5nIGZyb20gYSBiYWNrdXAsIHRvdWNoIFwiJXMvcmVjb3Zlcnkuc2ln bmFsXCIgb3IgXCIlcy9zdGFuZGJ5LnNpZ25hbFwiIGFuZCBhZGQgcmVxdWlyZWQgcmVjb3Zl cnkgb3B0aW9ucy5cbiIKIAkJCQkJCQkJCSJJZiB5b3UgYXJlIG5vdCByZXN0b3JpbmcgZnJv bSBhIGJhY2t1cCwgdHJ5IHJlbW92aW5nIHRoZSBmaWxlIFwiJXMvYmFja3VwX2xhYmVsXCIu XG4iCiAJCQkJCQkJCQkiQmUgY2FyZWZ1bDogcmVtb3ZpbmcgXCIlcy9iYWNrdXBfbGFiZWxc IiB3aWxsIHJlc3VsdCBpbiBhIGNvcnJ1cHQgY2x1c3RlciBpZiByZXN0b3JpbmcgZnJvbSBh IGJhY2t1cC4iLApAQCAtNjE1LDYgKzYxOSwxMCBAQCBJbml0V2FsUmVjb3ZlcnkoQ29udHJv bEZpbGVEYXRhICpDb250cm9sRmlsZSwgYm9vbCAqd2FzU2h1dGRvd25fcHRyLAogCQkJZXJl cG9ydChGQVRBTCwKIAkJCQkJZXJybXNnKCJjb3VsZCBub3QgbG9jYXRlIHJlcXVpcmVkIGNo ZWNrcG9pbnQgcmVjb3JkIGF0ICVYLyUwOFgiLAogCQkJCQkJICAgTFNOX0ZPUk1BVF9BUkdT KENoZWNrUG9pbnRMb2MpKSwKKwkJCQkJQ29udHJvbEZpbGUtPmJhY2t1cExhYmVsUmVxdWly ZWQgPworCQkJCQllcnJoaW50KCJUb3VjaCBcIiVzL3JlY292ZXJ5LnNpZ25hbFwiIG9yIFwi JXMvc3RhbmRieS5zaWduYWxcIiBhbmQgYWRkIHJlcXVpcmVkIHJlY292ZXJ5IG9wdGlvbnMu XG4iCisJCQkJCQkJIkRvIG5vdCByZW1vdmUgXCIlcy9iYWNrdXBfbGFiZWxcIjsgaXQgaXMg cmVxdWlyZWQgdG8gcmVjb3ZlciB0aGlzIGJhY2t1cC4iLAorCQkJCQkJCURhdGFEaXIsIERh dGFEaXIsIERhdGFEaXIpIDoKIAkJCQkJZXJyaGludCgiSWYgeW91IGFyZSByZXN0b3Jpbmcg ZnJvbSBhIGJhY2t1cCwgdG91Y2ggXCIlcy9yZWNvdmVyeS5zaWduYWxcIiBvciBcIiVzL3N0 YW5kYnkuc2lnbmFsXCIgYW5kIGFkZCByZXF1aXJlZCByZWNvdmVyeSBvcHRpb25zLlxuIgog CQkJCQkJCSJJZiB5b3UgYXJlIG5vdCByZXN0b3JpbmcgZnJvbSBhIGJhY2t1cCwgdHJ5IHJl bW92aW5nIHRoZSBmaWxlIFwiJXMvYmFja3VwX2xhYmVsXCIuXG4iCiAJCQkJCQkJIkJlIGNh cmVmdWw6IHJlbW92aW5nIFwiJXMvYmFja3VwX2xhYmVsXCIgd2lsbCByZXN1bHQgaW4gYSBj b3JydXB0IGNsdXN0ZXIgaWYgcmVzdG9yaW5nIGZyb20gYSBiYWNrdXAuIiwKQEAgLTY1OSw3 ICs2NjcsMTQgQEAgSW5pdFdhbFJlY292ZXJ5KENvbnRyb2xGaWxlRGF0YSAqQ29udHJvbEZp bGUsIGJvb2wgKndhc1NodXRkb3duX3B0ciwKIAl9CiAJZWxzZQogCXsKLQkJLyogTm8gYmFj a3VwX2xhYmVsIGZpbGUgaGFzIGJlZW4gZm91bmQgaWYgd2UgYXJlIGhlcmUuICovCisJCS8q CisJCSAqIE5vIGJhY2t1cF9sYWJlbCBmaWxlIGhhcyBiZWVuIGZvdW5kIGlmIHdlIGFyZSBo ZXJlLiBFcnJvciBpZiB0aGUKKwkJICogY29udHJvbCBmaWxlIHJlcXVpcmVzIGJhY2t1cF9s YWJlbC4KKwkJICovCisJCWlmIChDb250cm9sRmlsZS0+YmFja3VwTGFiZWxSZXF1aXJlZCkK KwkJCWVyZXBvcnQoRkFUQUwsCisJCQkJCWVycm1zZygiY291bGQgbm90IGZpbmQgYmFja3Vw X2xhYmVsIHJlcXVpcmVkIGZvciByZWNvdmVyeSIpLAorCQkJCQllcnJoaW50KCJSZXN0b3Jl IHRoZSBiYWNrdXBfbGFiZWwgZmlsZSB0aGF0IHdhcyBjcmVhdGVkIGR1cmluZyB0aGUgYmFj a3VwLiIpKTsKIAogCQkvKgogCQkgKiBJZiB0YWJsZXNwYWNlX21hcCBmaWxlIGlzIHByZXNl bnQgd2l0aG91dCBiYWNrdXBfbGFiZWwgZmlsZSwgdGhlcmUKQEAgLTkzOSwxMSArOTU0LDIx IEBAIEluaXRXYWxSZWNvdmVyeShDb250cm9sRmlsZURhdGEgKkNvbnRyb2xGaWxlLCBib29s ICp3YXNTaHV0ZG93bl9wdHIsCiAJCSAqCiAJCSAqIEFueSBvdGhlciBzdGF0ZSBpbmRpY2F0 ZXMgdGhhdCB0aGUgYmFja3VwIHNvbWVob3cgYmVjYW1lIGNvcnJ1cHRlZAogCQkgKiBhbmQg d2UgY2FuJ3Qgc2Vuc2libHkgY29udGludWUgd2l0aCByZWNvdmVyeS4KKwkJICoKKwkJICog YmFja3VwTGFiZWxSZXF1aXJlZCBpcyBzZXQgdG8gZmFsc2Ugc2luY2UgYmFja3VwX2xhYmVs IGlzIG5vIGxvbmdlcgorCQkgKiByZXF1aXJlZCBvbmNlIHBnX2NvbnRyb2wgaGFzIGJlZW4g dXBkYXRlZCBvbiBkaXNrLiBJZiByZWNvdmVyeQorCQkgKiB0ZXJtaW5hdGVzIGFibm9ybWFs bHkgYmV0d2VlbiB3aGVuIHBnX2NvbnRyb2wgaXMgdXBkYXRlZCBhbmQKKwkJICogYmFja3Vw X2xhYmVsIGlzIHJlbmFtZWQgdGhlbiBvbiByZXN0YXJ0IHBnX2NvbnRyb2wgd2lsbCBiZQor CQkgKiByZWluaXRpYWxpemVkIGZyb20gYmFja3VwX2xhYmVsLiBJZiB0aGUgdXNlciBtYW51 YWxseSBkZWxldGVzCisJCSAqIGJhY2t1cF9sYWJlbCBiZWZvcmUgcmVzdGFydGluZyB0aGVu IHJlY292ZXJ5IHdpbGwgcHJvY2VlZCB3aXRoIHRoZQorCQkgKiBjb250ZW50cyBvZiBwZ19j b250cm9sIGp1c3QgYXMgaXQgd291bGQgaWYgdGhlIGNyYXNoIGhhZCBoYXBwZW5lZAorCQkg KiBkaXJlY3RseSBhZnRlciBiYWNrdXBfbGFiZWwgcmVuYW1lLgogCQkgKi8KIAkJaWYgKGhh dmVCYWNrdXBMYWJlbCkKIAkJewogCQkJQ29udHJvbEZpbGUtPmJhY2t1cFN0YXJ0UG9pbnQg PSBjaGVja1BvaW50LnJlZG87CiAJCQlDb250cm9sRmlsZS0+YmFja3VwRW5kUmVxdWlyZWQg PSBiYWNrdXBFbmRSZXF1aXJlZDsKKwkJCUNvbnRyb2xGaWxlLT5iYWNrdXBMYWJlbFJlcXVp cmVkID0gZmFsc2U7CiAKIAkJCWlmIChiYWNrdXBGcm9tU3RhbmRieSkKIAkJCXsKZGlmZiAt LWdpdCBhL3NyYy9iYWNrZW5kL2JhY2t1cC9iYXNlYmFja3VwLmMgYi9zcmMvYmFja2VuZC9i YWNrdXAvYmFzZWJhY2t1cC5jCmluZGV4IGUzYzA0ZWNkODEwLi43NGFiNzc4MTUxMiAxMDA2 NDQKLS0tIGEvc3JjL2JhY2tlbmQvYmFja3VwL2Jhc2ViYWNrdXAuYworKysgYi9zcmMvYmFj a2VuZC9iYWNrdXAvYmFzZWJhY2t1cC5jCkBAIC0yMyw2ICsyMyw3IEBACiAjaW5jbHVkZSAi YmFja3VwL2Jhc2ViYWNrdXBfaW5jcmVtZW50YWwuaCIKICNpbmNsdWRlICJiYWNrdXAvYmFz ZWJhY2t1cF9zaW5rLmgiCiAjaW5jbHVkZSAiYmFja3VwL2Jhc2ViYWNrdXBfdGFyZ2V0Lmgi CisjaW5jbHVkZSAiY2F0YWxvZy9wZ19jb250cm9sLmgiCiAjaW5jbHVkZSAiY2F0YWxvZy9w Z190YWJsZXNwYWNlX2QuaCIKICNpbmNsdWRlICJjb21tYW5kcy9kZWZyZW0uaCIKICNpbmNs dWRlICJjb21tb24vY29tcHJlc3Npb24uaCIKQEAgLTM0MCw5ICszNDEsOSBAQCBwZXJmb3Jt X2Jhc2VfYmFja3VwKGJhc2ViYWNrdXBfb3B0aW9ucyAqb3B0LCBiYnNpbmsgKnNpbmssCiAK IAkJCWlmICh0aS0+cGF0aCA9PSBOVUxMKQogCQkJewotCQkJCXN0cnVjdCBzdGF0IHN0YXRi dWY7CiAJCQkJYm9vbAkJc2VuZHRibHNwY2xpbmtzID0gdHJ1ZTsKIAkJCQljaGFyCSAgICpi YWNrdXBfbGFiZWw7CisJCQkJdWludDgJCWNvbnRyb2xGaWxlW1BHX0NPTlRST0xfRklMRV9T SVpFXTsKIAogCQkJCWJic2lua19iZWdpbl9hcmNoaXZlKHNpbmssICJiYXNlLnRhciIpOwog CkBAIC0zNjUsMTQgKzM2NiwxMCBAQCBwZXJmb3JtX2Jhc2VfYmFja3VwKGJhc2ViYWNrdXBf b3B0aW9ucyAqb3B0LCBiYnNpbmsgKnNpbmssCiAJCQkJCQlzZW5kdGJsc3BjbGlua3MsICZt YW5pZmVzdCwgSW52YWxpZE9pZCwgaWIpOwogCiAJCQkJLyogLi4uIGFuZCBwZ19jb250cm9s IGFmdGVyIGV2ZXJ5dGhpbmcgZWxzZS4gKi8KLQkJCQlpZiAobHN0YXQoWExPR19DT05UUk9M X0ZJTEUsICZzdGF0YnVmKSAhPSAwKQotCQkJCQllcmVwb3J0KEVSUk9SLAotCQkJCQkJCShl cnJjb2RlX2Zvcl9maWxlX2FjY2VzcygpLAotCQkJCQkJCSBlcnJtc2coImNvdWxkIG5vdCBz dGF0IGZpbGUgXCIlc1wiOiAlbSIsCi0JCQkJCQkJCQlYTE9HX0NPTlRST0xfRklMRSkpKTsK LQkJCQlzZW5kRmlsZShzaW5rLCBYTE9HX0NPTlRST0xfRklMRSwgWExPR19DT05UUk9MX0ZJ TEUsICZzdGF0YnVmLAotCQkJCQkJIGZhbHNlLCBJbnZhbGlkT2lkLCBJbnZhbGlkT2lkLAot CQkJCQkJIEludmFsaWRSZWxGaWxlTnVtYmVyLCAwLCAmbWFuaWZlc3QsIDAsIE5VTEwsIDAp OworCQkJCWJhY2t1cF9jb250cm9sX2ZpbGUoY29udHJvbEZpbGUpOworCQkJCXNlbmRGaWxl V2l0aENvbnRlbnQoc2luaywgWExPR19DT05UUk9MX0ZJTEUsCisJCQkJCQkJCQkoY2hhciAq KSBjb250cm9sRmlsZSwgUEdfQ09OVFJPTF9GSUxFX1NJWkUsCisJCQkJCQkJCQkmbWFuaWZl c3QpOwogCQkJfQogCQkJZWxzZQogCQkJewpkaWZmIC0tZ2l0IGEvc3JjL2JhY2tlbmQvdXRp bHMvbWlzYy9wZ19jb250cm9sZGF0YS5jIGIvc3JjL2JhY2tlbmQvdXRpbHMvbWlzYy9wZ19j b250cm9sZGF0YS5jCmluZGV4IDFmNDczMDJmZTJhLi4yMzJjODg4ZDU5NCAxMDA2NDQKLS0t IGEvc3JjL2JhY2tlbmQvdXRpbHMvbWlzYy9wZ19jb250cm9sZGF0YS5jCisrKyBiL3NyYy9i YWNrZW5kL3V0aWxzL21pc2MvcGdfY29udHJvbGRhdGEuYwpAQCAtMTY4LDggKzE2OCw4IEBA IHBnX2NvbnRyb2xfY2hlY2twb2ludChQR19GVU5DVElPTl9BUkdTKQogRGF0dW0KIHBnX2Nv bnRyb2xfcmVjb3ZlcnkoUEdfRlVOQ1RJT05fQVJHUykKIHsKLQlEYXR1bQkJdmFsdWVzWzVd OwotCWJvb2wJCW51bGxzWzVdOworCURhdHVtCQl2YWx1ZXNbNl07CisJYm9vbAkJbnVsbHNb Nl07CiAJVHVwbGVEZXNjCXR1cGRlc2M7CiAJSGVhcFR1cGxlCWh0dXA7CiAJQ29udHJvbEZp bGVEYXRhICpDb250cm9sRmlsZTsKQEAgLTIwMSw2ICsyMDEsOSBAQCBwZ19jb250cm9sX3Jl Y292ZXJ5KFBHX0ZVTkNUSU9OX0FSR1MpCiAJdmFsdWVzWzRdID0gQm9vbEdldERhdHVtKENv bnRyb2xGaWxlLT5iYWNrdXBFbmRSZXF1aXJlZCk7CiAJbnVsbHNbNF0gPSBmYWxzZTsKIAor CXZhbHVlc1s1XSA9IEJvb2xHZXREYXR1bShDb250cm9sRmlsZS0+YmFja3VwTGFiZWxSZXF1 aXJlZCk7CisJbnVsbHNbNV0gPSBmYWxzZTsKKwogCWh0dXAgPSBoZWFwX2Zvcm1fdHVwbGUo dHVwZGVzYywgdmFsdWVzLCBudWxscyk7CiAKIAlQR19SRVRVUk5fREFUVU0oSGVhcFR1cGxl R2V0RGF0dW0oaHR1cCkpOwpkaWZmIC0tZ2l0IGEvc3JjL2Jpbi9wZ19jb250cm9sZGF0YS9w Z19jb250cm9sZGF0YS5jIGIvc3JjL2Jpbi9wZ19jb250cm9sZGF0YS9wZ19jb250cm9sZGF0 YS5jCmluZGV4IDZhMGY4NDhkOGQwLi44YmNjYTg5NzMzYiAxMDA2NDQKLS0tIGEvc3JjL2Jp bi9wZ19jb250cm9sZGF0YS9wZ19jb250cm9sZGF0YS5jCisrKyBiL3NyYy9iaW4vcGdfY29u dHJvbGRhdGEvcGdfY29udHJvbGRhdGEuYwpAQCAtMzA1LDYgKzMwNSw4IEBAIG1haW4oaW50 IGFyZ2MsIGNoYXIgKmFyZ3ZbXSkKIAkJICAgTFNOX0ZPUk1BVF9BUkdTKENvbnRyb2xGaWxl LT5iYWNrdXBFbmRQb2ludCkpOwogCXByaW50ZihfKCJFbmQtb2YtYmFja3VwIHJlY29yZCBy ZXF1aXJlZDogICAgICAgICVzXG4iKSwKIAkJICAgQ29udHJvbEZpbGUtPmJhY2t1cEVuZFJl cXVpcmVkID8gXygieWVzIikgOiBfKCJubyIpKTsKKwlwcmludGYoXygiQmFja3VwIGxhYmVs IHJlcXVpcmVkOiAgICAgICAgICAgICAgICAlc1xuIiksCisJCSAgIENvbnRyb2xGaWxlLT5i YWNrdXBMYWJlbFJlcXVpcmVkID8gXygieWVzIikgOiBfKCJubyIpKTsKIAlwcmludGYoXygi d2FsX2xldmVsIHNldHRpbmc6ICAgICAgICAgICAgICAgICAgICAlc1xuIiksCiAJCSAgIHdh bF9sZXZlbF9zdHIoQ29udHJvbEZpbGUtPndhbF9sZXZlbCkpOwogCXByaW50ZihfKCJ3YWxf bG9nX2hpbnRzIHNldHRpbmc6ICAgICAgICAgICAgICAgICVzXG4iKSwKZGlmZiAtLWdpdCBh L3NyYy9iaW4vcGdfcmVzZXR3YWwvcGdfcmVzZXR3YWwuYyBiL3NyYy9iaW4vcGdfcmVzZXR3 YWwvcGdfcmVzZXR3YWwuYwppbmRleCA0MWFmYzRjMTMxNi4uOWQzNmM1YjRhODQgMTAwNjQ0 Ci0tLSBhL3NyYy9iaW4vcGdfcmVzZXR3YWwvcGdfcmVzZXR3YWwuYworKysgYi9zcmMvYmlu L3BnX3Jlc2V0d2FsL3BnX3Jlc2V0d2FsLmMKQEAgLTkyMiw2ICs5MjIsNyBAQCBSZXdyaXRl Q29udHJvbEZpbGUodm9pZCkKIAlDb250cm9sRmlsZS5iYWNrdXBTdGFydFBvaW50ID0gSW52 YWxpZFhMb2dSZWNQdHI7CiAJQ29udHJvbEZpbGUuYmFja3VwRW5kUG9pbnQgPSBJbnZhbGlk WExvZ1JlY1B0cjsKIAlDb250cm9sRmlsZS5iYWNrdXBFbmRSZXF1aXJlZCA9IGZhbHNlOwor CUNvbnRyb2xGaWxlLmJhY2t1cExhYmVsUmVxdWlyZWQgPSBmYWxzZTsKIAogCS8qCiAJICog VGhlIG9sZCBXQUwgaXMgZ29uZSBhbmQgdGhlIG5ldyBwb3NpdGlvbiBtYXkgbGllIGJlbG93 IHRoZSBvbGQKZGlmZiAtLWdpdCBhL3NyYy9iaW4vcGdfcmV3aW5kL3BnX3Jld2luZC5jIGIv c3JjL2Jpbi9wZ19yZXdpbmQvcGdfcmV3aW5kLmMKaW5kZXggZDI1MjFkYWIzMzMuLmExNjA4 MTY2OWUxIDEwMDY0NAotLS0gYS9zcmMvYmluL3BnX3Jld2luZC9wZ19yZXdpbmQuYworKysg Yi9zcmMvYmluL3BnX3Jld2luZC9wZ19yZXdpbmQuYwpAQCAtNzgzLDYgKzc4Myw3IEBAIHBl cmZvcm1fcmV3aW5kKGZpbGVtYXBfdCAqZmlsZW1hcCwgcmV3aW5kX3NvdXJjZSAqc291cmNl LAogCUNvbnRyb2xGaWxlX25ldy5taW5SZWNvdmVyeVBvaW50ID0gZW5kcmVjOwogCUNvbnRy b2xGaWxlX25ldy5taW5SZWNvdmVyeVBvaW50VExJID0gZW5kdGxpOwogCUNvbnRyb2xGaWxl X25ldy5zdGF0ZSA9IERCX0lOX0FSQ0hJVkVfUkVDT1ZFUlk7CisJQ29udHJvbEZpbGVfbmV3 LmJhY2t1cExhYmVsUmVxdWlyZWQgPSB0cnVlOwogCiAJLyoKIAkgKiBLZWVwIHRoZSB0YXJn ZXQncyBvd24gZGF0YSBjaGVja3N1bSBzdGF0ZS4gIE1vc3Qgb2YgdGhlIGRhdGEgZGlyZWN0 b3J5CmRpZmYgLS1naXQgYS9zcmMvYmluL3BnX3Jld2luZC90L1Jld2luZFRlc3QucG0gYi9z cmMvYmluL3BnX3Jld2luZC90L1Jld2luZFRlc3QucG0KaW5kZXggMzJhZWNhODBmMTMuLmIy YTdmY2E5ZDAyIDEwMDY0NAotLS0gYS9zcmMvYmluL3BnX3Jld2luZC90L1Jld2luZFRlc3Qu cG0KKysrIGIvc3JjL2Jpbi9wZ19yZXdpbmQvdC9SZXdpbmRUZXN0LnBtCkBAIC0zNTMsNiAr MzUzLDE4IEBAIHN1YiBydW5fcGdfcmV3aW5kCiAJCWNyb2FrKCJJbmNvcnJlY3QgdGVzdCBt b2RlIHNwZWNpZmllZCIpOwogCX0KIAorCSMgcGdfcmV3aW5kIHdyaXRlcyBhIGJhY2t1cF9s YWJlbCBvZiBpdHMgb3duIHdoZW4gaXQgcmV3aW5kcywgYW5kIHRoZQorCSMgdGFyZ2V0IG11 c3QgdGhlbiByZXF1aXJlIGl0IGZvciByZWNvdmVyeTsgdGhlIGZsYWcgaXMgY2xlYXJlZCBh Z2FpbiB3aGVuCisJIyB0aGUgdGFyZ2V0IGlzIHJlc3RhcnRlZCBiZWxvdyBhbmQgcmVjb3Zl cnkgY29uc3VtZXMgYmFja3VwX2xhYmVsLiAgV2hlbgorCSMgdGhlIHRhcmdldCBpcyBhbHJl YWR5IGFuIGFuY2VzdG9yIG9mIHRoZSBzb3VyY2Ugbm8gcmV3aW5kIHRha2VzIHBsYWNlLAor CSMgYW5kIHBnX2NvbnRyb2wgbXVzdCBiZSBsZWZ0IGFsb25lIHNvIHRoYXQgdGhlIHRhcmdl dCBzdGlsbCBzdGFydHMuCisJbXkgJGxhYmVsX3JlcXVpcmVkID0KKwkgIC1mICIkcHJpbWFy eV9wZ2RhdGEvYmFja3VwX2xhYmVsIiA/ICd5ZXMnIDogJ25vJzsKKwljb21tYW5kX2xpa2Uo CisJCVsgJ3BnX2NvbnRyb2xkYXRhJywgJy0tcGdkYXRhJyA9PiAkcHJpbWFyeV9wZ2RhdGEg XSwKKwkJcXIvQmFja3VwIGxhYmVsIHJlcXVpcmVkOiArJGxhYmVsX3JlcXVpcmVkLywKKwkJ J2JhY2t1cF9sYWJlbCByZXF1aXJlbWVudCBtYXRjaGVzIHdoZXRoZXIgYSByZXdpbmQgdG9v ayBwbGFjZScpOworCiAJIyBOb3cgbW92ZSBiYWNrIHBvc3RncmVzcWwuY29uZiB3aXRoIG9s ZCBzZXR0aW5ncwogCW1vdmUoCiAJCSIkdG1wX2ZvbGRlci9wcmltYXJ5LXBvc3RncmVzcWwu Y29uZi50bXAiLApkaWZmIC0tZ2l0IGEvc3JjL2luY2x1ZGUvYWNjZXNzL3hsb2cuaCBiL3Ny Yy9pbmNsdWRlL2FjY2Vzcy94bG9nLmgKaW5kZXggN2E1OTBiN2UxZWEuLjIzZjQyYmM3NjAy IDEwMDY0NAotLS0gYS9zcmMvaW5jbHVkZS9hY2Nlc3MveGxvZy5oCisrKyBiL3NyYy9pbmNs dWRlL2FjY2Vzcy94bG9nLmgKQEAgLTM0MCw2ICszNDAsNyBAQCBleHRlcm4gdm9pZCBkb19w Z19iYWNrdXBfc3RhcnQoY29uc3QgY2hhciAqYmFja3VwaWRzdHIsIGJvb2wgZmFzdCwKIAkJ CQkJCQkgICBTdHJpbmdJbmZvIHRibHNwY21hcGZpbGUpOwogZXh0ZXJuIHZvaWQgZG9fcGdf YmFja3VwX3N0b3AoQmFja3VwU3RhdGUgKnN0YXRlLCBib29sIHdhaXRmb3JhcmNoaXZlKTsK IGV4dGVybiB2b2lkIGRvX3BnX2Fib3J0X2JhY2t1cChpbnQgY29kZSwgRGF0dW0gYXJnKTsK K2V4dGVybiB2b2lkIGJhY2t1cF9jb250cm9sX2ZpbGUodWludDggKmNvbnRyb2xGaWxlKTsK IGV4dGVybiB2b2lkIHJlZ2lzdGVyX3BlcnNpc3RlbnRfYWJvcnRfYmFja3VwX2hhbmRsZXIo dm9pZCk7CiBleHRlcm4gU2Vzc2lvbkJhY2t1cFN0YXRlIGdldF9iYWNrdXBfc3RhdHVzKHZv aWQpOwogCmRpZmYgLS1naXQgYS9zcmMvaW5jbHVkZS9jYXRhbG9nL3BnX2NvbnRyb2wuaCBi L3NyYy9pbmNsdWRlL2NhdGFsb2cvcGdfY29udHJvbC5oCmluZGV4IGMzYzkzNGQwMDEyLi5m ODM5MjhlMmNhMyAxMDA2NDQKLS0tIGEvc3JjL2luY2x1ZGUvY2F0YWxvZy9wZ19jb250cm9s LmgKKysrIGIvc3JjL2luY2x1ZGUvY2F0YWxvZy9wZ19jb250cm9sLmgKQEAgLTE3MiwxMiAr MTcyLDE2IEBAIHR5cGVkZWYgc3RydWN0IENvbnRyb2xGaWxlRGF0YQogCSAqIElmIGJhY2t1 cEVuZFJlcXVpcmVkIGlzIHRydWUsIHdlIGtub3cgZm9yIHN1cmUgdGhhdCB3ZSdyZSByZXN0 b3JpbmcKIAkgKiBmcm9tIGEgYmFja3VwLCBhbmQgbXVzdCBzZWUgYSBiYWNrdXAtZW5kIHJl Y29yZCBiZWZvcmUgd2UgY2FuIHNhZmVseQogCSAqIHN0YXJ0IHVwLgorCSAqCisJICogSWYg YmFja3VwTGFiZWxSZXF1aXJlZCBpcyB0cnVlLCB0aGVuIGEgYmFja3VwX2xhYmVsIGZpbGUg bXVzdCBiZQorCSAqIHByZXNlbnQgaW4gb3JkZXIgZm9yIHJlY292ZXJ5IHRvIHByb2NlZWQu CiAJICovCiAJWExvZ1JlY1B0cgltaW5SZWNvdmVyeVBvaW50OwogCVRpbWVMaW5lSUQJbWlu UmVjb3ZlcnlQb2ludFRMSTsKIAlYTG9nUmVjUHRyCWJhY2t1cFN0YXJ0UG9pbnQ7CiAJWExv Z1JlY1B0cgliYWNrdXBFbmRQb2ludDsKIAlib29sCQliYWNrdXBFbmRSZXF1aXJlZDsKKwli b29sCQliYWNrdXBMYWJlbFJlcXVpcmVkOwogCiAJLyoKIAkgKiBQYXJhbWV0ZXIgc2V0dGlu Z3MgdGhhdCBkZXRlcm1pbmUgaWYgdGhlIFdBTCBjYW4gYmUgdXNlZCBmb3IgYXJjaGl2YWwK ZGlmZiAtLWdpdCBhL3NyYy9pbmNsdWRlL2NhdGFsb2cvcGdfcHJvYy5kYXQgYi9zcmMvaW5j bHVkZS9jYXRhbG9nL3BnX3Byb2MuZGF0CmluZGV4IGY0NjQyNzI1OGUzLi4xOTUyM2JjODgy ZSAxMDA2NDQKLS0tIGEvc3JjL2luY2x1ZGUvY2F0YWxvZy9wZ19wcm9jLmRhdAorKysgYi9z cmMvaW5jbHVkZS9jYXRhbG9nL3BnX3Byb2MuZGF0CkBAIC0xMjQ0Miw5ICsxMjQ0Miw5IEBA CiB7IG9pZCA9PiAnMzQ0MycsCiAgIGRlc2NyID0+ICdwZ19jb250cm9sZGF0YSByZWNvdmVy eSBzdGF0ZSBpbmZvcm1hdGlvbiBhcyBhIGZ1bmN0aW9uJywKICAgcHJvbmFtZSA9PiAncGdf Y29udHJvbF9yZWNvdmVyeScsIHByb3ZvbGF0aWxlID0+ICd2JywgcHJvcmV0dHlwZSA9PiAn cmVjb3JkJywKLSAgcHJvYXJndHlwZXMgPT4gJycsIHByb2FsbGFyZ3R5cGVzID0+ICd7cGdf bHNuLGludDQscGdfbHNuLHBnX2xzbixib29sfScsCi0gIHByb2FyZ21vZGVzID0+ICd7byxv LG8sbyxvfScsCi0gIHByb2FyZ25hbWVzID0+ICd7bWluX3JlY292ZXJ5X2VuZF9sc24sbWlu X3JlY292ZXJ5X2VuZF90aW1lbGluZSxiYWNrdXBfc3RhcnRfbHNuLGJhY2t1cF9lbmRfbHNu LGVuZF9vZl9iYWNrdXBfcmVjb3JkX3JlcXVpcmVkfScsCisgIHByb2FyZ3R5cGVzID0+ICcn LCBwcm9hbGxhcmd0eXBlcyA9PiAne3BnX2xzbixpbnQ0LHBnX2xzbixwZ19sc24sYm9vbCxi b29sfScsCisgIHByb2FyZ21vZGVzID0+ICd7byxvLG8sbyxvLG99JywKKyAgcHJvYXJnbmFt ZXMgPT4gJ3ttaW5fcmVjb3ZlcnlfZW5kX2xzbixtaW5fcmVjb3ZlcnlfZW5kX3RpbWVsaW5l LGJhY2t1cF9zdGFydF9sc24sYmFja3VwX2VuZF9sc24sZW5kX29mX2JhY2t1cF9yZWNvcmRf cmVxdWlyZWQsYmFja3VwX2xhYmVsX3JlcXVpcmVkfScsCiAgIHByb3NyYyA9PiAncGdfY29u dHJvbF9yZWNvdmVyeScgfSwKIAogeyBvaWQgPT4gJzM0NDQnLApkaWZmIC0tZ2l0IGEvc3Jj L3Rlc3QvcmVjb3ZlcnkvbWVzb24uYnVpbGQgYi9zcmMvdGVzdC9yZWNvdmVyeS9tZXNvbi5i dWlsZAppbmRleCA3MjExM2M1YWM2ZS4uMDgyZGZiMTdjMDAgMTAwNjQ0Ci0tLSBhL3NyYy90 ZXN0L3JlY292ZXJ5L21lc29uLmJ1aWxkCisrKyBiL3NyYy90ZXN0L3JlY292ZXJ5L21lc29u LmJ1aWxkCkBAIC02NSw2ICs2NSw3IEBAIHRlc3RzICs9IHsKICAgICAgICd0LzA1NF91bmxv Z2dlZF9zZXF1ZW5jZV9wcm9tb3Rpb24ucGwnLAogICAgICAgJ3QvMDU1X2Nhc2NhZGVfcmVj b25uZWN0LnBsJywKICAgICAgICd0LzA1Nl9zdGFuZGJ5X3NuYXBzaG90X2V4cG9ydC5wbCcs CisgICAgICAndC8wNTdfYmFja3VwX2xhYmVsX3JlcXVpcmVkLnBsJywKICAgICBdLAogICB9 LAogfQpkaWZmIC0tZ2l0IGEvc3JjL3Rlc3QvcmVjb3ZlcnkvdC8wNDJfbG93X2xldmVsX2Jh Y2t1cC5wbCBiL3NyYy90ZXN0L3JlY292ZXJ5L3QvMDQyX2xvd19sZXZlbF9iYWNrdXAucGwK aW5kZXggN2VkNTRlNjExZWIuLjBlMmNjN2VlOGFjIDEwMDY0NAotLS0gYS9zcmMvdGVzdC9y ZWNvdmVyeS90LzA0Ml9sb3dfbGV2ZWxfYmFja3VwLnBsCisrKyBiL3NyYy90ZXN0L3JlY292 ZXJ5L3QvMDQyX2xvd19sZXZlbF9iYWNrdXAucGwKQEAgLTE2NSw0ICsxNjUsMTIgQEAgb2so ICRub2RlX3JlcGxpY2EtPmxvZ19jb250YWlucygKIAkJJ0ZBVEFMOiAuKmNvdWxkIG5vdCBs b2NhdGUgcmVxdWlyZWQgY2hlY2twb2ludCByZWNvcmQgYXQnKSwKIAknZW5kcyB3aXRoIEZB VEFMIGZvciBtaXNzaW5nIHJlcXVpcmVkIGNoZWNrcG9pbnQgcmVjb3JkJyk7CiAKKyMgQSBs b3ctbGV2ZWwgYmFja3VwIGNvcGllcyBwZ19jb250cm9sIGZyb20gdGhlIHJ1bm5pbmcgY2x1 c3Rlciwgc28gaXQgZG9lcyBub3QKKyMgcmVxdWlyZSBiYWNrdXBfbGFiZWwgYW5kIHRoZSBo aW50IHN0aWxsIG9mZmVycyByZW1vdmluZyB0aGUgZmlsZSBhcyBhIHdheSB0bworIyByZWNv dmVyIGEgY2x1c3RlciB0aGF0IGlzIG5vdCBiZWluZyByZXN0b3JlZCBmcm9tIGEgYmFja3Vw LiAgQmFja3VwcyBtYWRlCisjIHdpdGggcGdfYmFzZWJhY2t1cCBkbyByZXF1aXJlIGl0IGFu ZCBnZXQgYSBkaWZmZXJlbnQgaGludDsgc2VlCisjIDA1N19iYWNrdXBfbGFiZWxfcmVxdWly ZWQucGwuCitvaygkbm9kZV9yZXBsaWNhLT5sb2dfY29udGFpbnMoJ3RyeSByZW1vdmluZyB0 aGUgZmlsZSAuKmJhY2t1cF9sYWJlbCcpLAorCSdoaW50IG9mZmVycyByZW1vdmluZyBiYWNr dXBfbGFiZWwgd2hlbiBpdCBpcyBub3QgcmVxdWlyZWQnKTsKKwogZG9uZV90ZXN0aW5nKCk7 CmRpZmYgLS1naXQgYS9zcmMvdGVzdC9yZWNvdmVyeS90LzA1N19iYWNrdXBfbGFiZWxfcmVx dWlyZWQucGwgYi9zcmMvdGVzdC9yZWNvdmVyeS90LzA1N19iYWNrdXBfbGFiZWxfcmVxdWly ZWQucGwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAuLmNkZjkyN2Fm NTk2Ci0tLSAvZGV2L251bGwKKysrIGIvc3JjL3Rlc3QvcmVjb3ZlcnkvdC8wNTdfYmFja3Vw X2xhYmVsX3JlcXVpcmVkLnBsCkBAIC0wLDAgKzEsMTY1IEBACisjIENvcHlyaWdodCAoYykg MjAyMS0yMDI2LCBQb3N0Z3JlU1FMIEdsb2JhbCBEZXZlbG9wbWVudCBHcm91cAorCisjIFRl c3QgdGhlIHBnX2NvbnRyb2wgZmxhZyB0aGF0IG1ha2VzIGJhY2t1cF9sYWJlbCBtYW5kYXRv cnkgZm9yIHJlY292ZXJ5LgorIworIyBwZ19iYXNlYmFja3VwIHN0b3JlcyBhIG1vZGlmaWVk IGNvcHkgb2YgcGdfY29udHJvbCBpbiB0aGUgYmFja3VwLCB3aXRoIGEgZmxhZworIyBzZXQg dGhhdCBtYWtlcyByZWNvdmVyeSByZWZ1c2UgdG8gc3RhcnQgaWYgYmFja3VwX2xhYmVsIGlz IG1pc3NpbmcuICBUaGlzCisjIHByZXZlbnRzIHRoZSBzaWxlbnQgY29ycnVwdGlvbiB0aGF0 IHJlc3VsdHMgZnJvbSByZW1vdmluZyB0aGUgZmlsZSwgYm90aCBmb3IKKyMgYmFja3VwcyB0 YWtlbiBmcm9tIGEgcHJpbWFyeSBhbmQgZnJvbSBhIHN0YW5kYnkuCisKK3VzZSBzdHJpY3Q7 Cit1c2Ugd2FybmluZ3MgRkFUQUwgPT4gJ2FsbCc7Cit1c2UgUG9zdGdyZVNRTDo6VGVzdDo6 Q2x1c3RlcjsKK3VzZSBQb3N0Z3JlU1FMOjpUZXN0OjpSZWN1cnNpdmVDb3B5OwordXNlIFBv c3RncmVTUUw6OlRlc3Q6OlV0aWxzOwordXNlIFRlc3Q6Ok1vcmU7CisKKyMgUmVuYW1lIGJh Y2t1cF9sYWJlbCBpbiB0aGUgZGF0YSBkaXJlY3Rvcnkgb2YgdGhlIGdpdmVuIG5vZGUsIHN0 YXJ0IGl0LCBhbmQKKyMgY2hlY2sgdGhhdCByZWNvdmVyeSByZWZ1c2VzIHRvIHByb2NlZWQu ICBUaGVuIHB1dCB0aGUgZmlsZSBiYWNrLgorc3ViIGNoZWNrX3N0YXJ0dXBfd2l0aG91dF9i YWNrdXBfbGFiZWwKK3sKKwlteSAoJG5vZGUsICR0ZXN0X25hbWUpID0gQF87CisJbXkgJGRh dGFfZGlyID0gJG5vZGUtPmRhdGFfZGlyOworCW15ICRsb2dfb2Zmc2V0ID0gLXMgJG5vZGUt PmxvZ2ZpbGU7CisKKwlyZW5hbWUoIiRkYXRhX2Rpci9iYWNrdXBfbGFiZWwiLCAiJGRhdGFf ZGlyL2JhY2t1cF9sYWJlbC50bXAiKQorCSAgb3IgQkFJTF9PVVQoImNvdWxkIG5vdCByZW5h bWUgJGRhdGFfZGlyL2JhY2t1cF9sYWJlbCIpOworCisJaXMoJG5vZGUtPnN0YXJ0KGZhaWxf b2sgPT4gMSksIDAsICIkdGVzdF9uYW1lOiBzdGFydHVwIGZhaWxzIik7CisJb2soICRub2Rl LT5sb2dfY29udGFpbnMoCisJCQknRkFUQUw6IC4qY291bGQgbm90IGZpbmQgYmFja3VwX2xh YmVsIHJlcXVpcmVkIGZvciByZWNvdmVyeScsCisJCQkkbG9nX29mZnNldCksCisJCSIkdGVz dF9uYW1lOiBlbmRzIHdpdGggRkFUQUwgZm9yIG1pc3NpbmcgYmFja3VwX2xhYmVsIik7CisK KwlyZW5hbWUoIiRkYXRhX2Rpci9iYWNrdXBfbGFiZWwudG1wIiwgIiRkYXRhX2Rpci9iYWNr dXBfbGFiZWwiKQorCSAgb3IgQkFJTF9PVVQoImNvdWxkIG5vdCByZW5hbWUgJGRhdGFfZGly L2JhY2t1cF9sYWJlbC50bXAiKTsKKwlyZXR1cm47Cit9CisKK215ICRub2RlX3ByaW1hcnkg PSBQb3N0Z3JlU1FMOjpUZXN0OjpDbHVzdGVyLT5uZXcoJ3ByaW1hcnknKTsKKyRub2RlX3By aW1hcnktPmluaXQoYWxsb3dzX3N0cmVhbWluZyA9PiAxKTsKKworIyBTZXQgd2FsX2tlZXBf c2l6ZSB0byBwcmV2ZW50IFdBTCBzZWdtZW50IHJlY3ljbGluZyBhZnRlciB0aGUgY2hlY2tw b2ludHMKKyMgZW5mb3JjZWQgYnkgdGhlIGJhY2t1cHMgYmVsb3cuICBUaGUgc3RhbmRieSBp cyBjcmVhdGVkIGZyb20gdGhlIGZpcnN0IGJhY2t1cAorIyBidXQgc3RhcnRlZCBvbmx5IGFm dGVyIGxhdGVyIGJhY2t1cHMgaGF2ZSBhZHZhbmNlZCB0aGUgcHJpbWFyeSwgc28gaXQgbXVz dAorIyBzdGlsbCBiZSBhYmxlIHRvIHN0cmVhbSB0aGUgc2VnbWVudHMgaW4gYmV0d2Vlbi4g IFRoaXMgaXMgc2V0IGJlZm9yZSB0aGUKKyMgZmlyc3QgYmFja3VwIHNvIHRoYXQgaXQgaXMg aW5oZXJpdGVkIGJ5IHRoZSBzdGFuZGJ5cy4KKyRub2RlX3ByaW1hcnktPmFwcGVuZF9jb25m KCdwb3N0Z3Jlc3FsLmNvbmYnLCAnd2FsX2tlZXBfc2l6ZSA9IDY0TUInKTsKKyRub2RlX3By aW1hcnktPnN0YXJ0OworCiskbm9kZV9wcmltYXJ5LT5zYWZlX3BzcWwoJ3Bvc3RncmVzJywK KwknQ1JFQVRFIFRBQkxFIHRhYl9pbnQgQVMgU0VMRUNUIGdlbmVyYXRlX3NlcmllcygxLCAx MDAwKSBBUyBhJyk7CisKKyMgVGFrZSBhIGJhY2t1cCBmcm9tIHRoZSBwcmltYXJ5LiAgVGhl IGNvcHkgb2YgcGdfY29udHJvbCBzdG9yZWQgaW4gdGhlIGJhY2t1cAorIyBtdXN0IHJlcXVp cmUgYmFja3VwX2xhYmVsLCB3aGlsZSB0aGUgY29udHJvbCBmaWxlIG9mIHRoZSBydW5uaW5n IGNsdXN0ZXIgaXMKKyMgbGVmdCBhbG9uZS4KK215ICRiYWNrdXBfbmFtZSA9ICdiYWNrdXBf cHJpbWFyeSc7Ciskbm9kZV9wcmltYXJ5LT5iYWNrdXAoJGJhY2t1cF9uYW1lKTsKKworY29t bWFuZF9saWtlKAorCVsKKwkJJ3BnX2NvbnRyb2xkYXRhJywKKwkJJy0tcGdkYXRhJyA9PiAk bm9kZV9wcmltYXJ5LT5iYWNrdXBfZGlyIC4gJy8nIC4gJGJhY2t1cF9uYW1lCisJXSwKKwlx ci9CYWNrdXAgbGFiZWwgcmVxdWlyZWQ6ICt5ZXMvLAorCSdiYWNrdXAgdGFrZW4gZnJvbSBh IHByaW1hcnkgcmVxdWlyZXMgYmFja3VwX2xhYmVsJyk7Citjb21tYW5kX2xpa2UoCisJWyAn cGdfY29udHJvbGRhdGEnLCAnLS1wZ2RhdGEnID0+ICRub2RlX3ByaW1hcnktPmRhdGFfZGly IF0sCisJcXIvQmFja3VwIGxhYmVsIHJlcXVpcmVkOiArbm8vLAorCSdjb250cm9sIGZpbGUg b2YgdGhlIHNvdXJjZSBjbHVzdGVyIGlzIHVuY2hhbmdlZCcpOworaXMoICRub2RlX3ByaW1h cnktPnNhZmVfcHNxbCgKKwkJJ3Bvc3RncmVzJywgJ1NFTEVDVCBiYWNrdXBfbGFiZWxfcmVx dWlyZWQgRlJPTSBwZ19jb250cm9sX3JlY292ZXJ5KCknKSwKKwknZicsCisJJ3BnX2NvbnRy b2xfcmVjb3ZlcnkoKSByZXBvcnRzIHRoZSBmbGFnIG5vdCBzZXQgb24gdGhlIHNvdXJjZSBj bHVzdGVyJyk7CisKKyMgcGdfcmVzZXR3YWwgaXMgdGhlIG9ubHkgc3VwcG9ydGVkIHdheSB0 byBjbGVhciB0aGUgZmxhZyB3aXRob3V0IHJlY292ZXJpbmcuCisjIFVzZSBhIGNvcHkgc28g dGhlIG9yaWdpbmFsIGJhY2t1cCBpcyBsZWZ0IGludGFjdCBmb3IgdGhlIHJlc3RvcmUgdGVz dHMgYmVsb3cuCitteSAkcmVzZXRfZGlyID0gJG5vZGVfcHJpbWFyeS0+YmFja3VwX2RpciAu ICcvJyAuICRiYWNrdXBfbmFtZSAuICdfcmVzZXQnOworUG9zdGdyZVNRTDo6VGVzdDo6UmVj dXJzaXZlQ29weTo6Y29weXBhdGgoCisJJG5vZGVfcHJpbWFyeS0+YmFja3VwX2RpciAuICcv JyAuICRiYWNrdXBfbmFtZSwgJHJlc2V0X2Rpcik7CitjaG1vZCgwNzAwLCAkcmVzZXRfZGly KSBvciBCQUlMX09VVCgiY291bGQgbm90IGNobW9kICRyZXNldF9kaXIiKTsKKworY29tbWFu ZF9vayhbICdwZ19yZXNldHdhbCcsICctLWZvcmNlJywgJy0tcGdkYXRhJyA9PiAkcmVzZXRf ZGlyIF0sCisJJ3BnX3Jlc2V0d2FsIHJ1bnMgb24gYSBiYWNrdXAgdGhhdCByZXF1aXJlcyBi YWNrdXBfbGFiZWwnKTsKK2NvbW1hbmRfbGlrZSgKKwlbICdwZ19jb250cm9sZGF0YScsICct LXBnZGF0YScgPT4gJHJlc2V0X2RpciBdLAorCXFyL0JhY2t1cCBsYWJlbCByZXF1aXJlZDog K25vLywKKwkncGdfcmVzZXR3YWwgY2xlYXJzIHRoZSBmbGFnJyk7CisKKyMgUmVzdG9yaW5n IHRoYXQgYmFja3VwIHdpdGhvdXQgYmFja3VwX2xhYmVsIG11c3Qgbm90IHN0YXJ0LgorbXkg JG5vZGVfcmVzdG9yZWQgPSBQb3N0Z3JlU1FMOjpUZXN0OjpDbHVzdGVyLT5uZXcoJ3Jlc3Rv cmVkJyk7Ciskbm9kZV9yZXN0b3JlZC0+aW5pdF9mcm9tX2JhY2t1cCgkbm9kZV9wcmltYXJ5 LCAkYmFja3VwX25hbWUpOworCitjaGVja19zdGFydHVwX3dpdGhvdXRfYmFja3VwX2xhYmVs KCRub2RlX3Jlc3RvcmVkLCAnYmFja3VwIGZyb20gcHJpbWFyeScpOworCisjIFdpdGggYmFj a3VwX2xhYmVsIGJhY2sgaW4gcGxhY2UgcmVjb3ZlcnkgY29tcGxldGVzLCBhbmQgdGhlIGZs YWcgaXMgY2xlYXJlZAorIyBzbyB0aGF0IHN1YnNlcXVlbnQgcmVzdGFydHMgbm8gbG9uZ2Vy IG5lZWQgdGhlIGZpbGUuCiskbm9kZV9yZXN0b3JlZC0+c3RhcnQ7Citpcygkbm9kZV9yZXN0 b3JlZC0+c2FmZV9wc3FsKCdwb3N0Z3JlcycsICdTRUxFQ1QgY291bnQoKikgRlJPTSB0YWJf aW50JyksCisJMTAwMCwgJ3Jlc3RvcmVkIGNsdXN0ZXIgaGFzIHRoZSBleHBlY3RlZCBjb250 ZW50cycpOworaXMoICRub2RlX3Jlc3RvcmVkLT5zYWZlX3BzcWwoCisJCSdwb3N0Z3Jlcycs ICdTRUxFQ1QgYmFja3VwX2xhYmVsX3JlcXVpcmVkIEZST00gcGdfY29udHJvbF9yZWNvdmVy eSgpJyksCisJJ2YnLAorCSdmbGFnIGlzIGNsZWFyZWQgb25jZSByZWNvdmVyeSBoYXMgY29t cGxldGVkJyk7Ciskbm9kZV9yZXN0b3JlZC0+c3RvcDsKKworY29tbWFuZF9saWtlKAorCVsg J3BnX2NvbnRyb2xkYXRhJywgJy0tcGdkYXRhJyA9PiAkbm9kZV9yZXN0b3JlZC0+ZGF0YV9k aXIgXSwKKwlxci9CYWNrdXAgbGFiZWwgcmVxdWlyZWQ6ICtuby8sCisJJ2NvbnRyb2wgZmls ZSBubyBsb25nZXIgcmVxdWlyZXMgYmFja3VwX2xhYmVsIGFmdGVyIHJlY292ZXJ5Jyk7CisK KyMgQSBiYWNrdXAgbWFkZSB3aXRob3V0IFdBTCBjYW5ub3QgcmVhY2ggYSBjb25zaXN0ZW50 IHN0YXRlIG9uIGl0cyBvd24sIGFuZAorIyByZWNvdmVyeSByZXBvcnRzIHRoYXQgaXQgY291 bGQgbm90IGxvY2F0ZSB0aGUgY2hlY2twb2ludCByZWNvcmQuICBTaW5jZQorIyBwZ19jb250 cm9sIHJlcXVpcmVzIGJhY2t1cF9sYWJlbCwgdGhlIGhpbnQgZm9yIHRoYXQgZXJyb3IgbXVz dCBub3QgcmVwZWF0IHRoZQorIyB1c3VhbCBhZHZpY2UgdG8gcmVtb3ZlIHRoZSBmaWxlLgor bXkgJG5vd2FsX2JhY2t1cCA9ICdiYWNrdXBfbm93YWwnOworJG5vZGVfcHJpbWFyeS0+YmFj a3VwKCRub3dhbF9iYWNrdXAsCisJYmFja3VwX29wdGlvbnMgPT4gWyAnLS13YWwtbWV0aG9k JyA9PiAnbm9uZScgXSk7CisKK215ICRub2RlX25vd2FsID0gUG9zdGdyZVNRTDo6VGVzdDo6 Q2x1c3Rlci0+bmV3KCdub3dhbCcpOworJG5vZGVfbm93YWwtPmluaXRfZnJvbV9iYWNrdXAo JG5vZGVfcHJpbWFyeSwgJG5vd2FsX2JhY2t1cCk7CisKK215ICRub3dhbF9vZmZzZXQgPSAt cyAkbm9kZV9ub3dhbC0+bG9nZmlsZTsKK2lzKCRub2RlX25vd2FsLT5zdGFydChmYWlsX29r ID0+IDEpLCAwLAorCSdiYWNrdXAgd2l0aG91dCBXQUwgZmFpbHMgdG8gc3RhcnQgd2hlbiBu byByZWNvdmVyeSBvcHRpb25zIGFyZSBzZXQnKTsKK29rKCAkbm9kZV9ub3dhbC0+bG9nX2Nv bnRhaW5zKAorCQknRkFUQUw6IC4qY291bGQgbm90IGxvY2F0ZSByZXF1aXJlZCBjaGVja3Bv aW50IHJlY29yZCcsICRub3dhbF9vZmZzZXQpLAorCSdtaXNzaW5nIGNoZWNrcG9pbnQgcmVj b3JkIGlzIHJlcG9ydGVkJyk7CitvayggJG5vZGVfbm93YWwtPmxvZ19jb250YWlucygnSElO VDogLipyZWNvdmVyeVwuc2lnbmFsJywgJG5vd2FsX29mZnNldCksCisJJ2hpbnQgcG9pbnRz IGF0IHRoZSByZWNvdmVyeSBzaWduYWwgZmlsZXMnKTsKK29rKCAkbm9kZV9ub3dhbC0+bG9n X2NvbnRhaW5zKCdEbyBub3QgcmVtb3ZlIC4qYmFja3VwX2xhYmVsJywgJG5vd2FsX29mZnNl dCksCisJJ2hpbnQgdGVsbHMgdGhlIHVzZXIgdG8ga2VlcCBiYWNrdXBfbGFiZWwnKTsKK29r KCAhJG5vZGVfbm93YWwtPmxvZ19jb250YWlucygndHJ5IHJlbW92aW5nIHRoZSBmaWxlJywg JG5vd2FsX29mZnNldCksCisJJ2hpbnQgZG9lcyBub3Qgc3VnZ2VzdCByZW1vdmluZyBiYWNr dXBfbGFiZWwnKTsKKworIyBBIGJhY2t1cCB0YWtlbiBmcm9tIGEgc3RhbmRieSBnZXRzIHRo ZSBzYW1lIHRyZWF0bWVudC4gIFRoaXMgaXMgdGhlIGNhc2UgdGhhdAorIyBwcmV2aW91c2x5 IHJlcXVpcmVkIGJhY2t1cCBzb2Z0d2FyZSB0byBjb3B5IHBnX2NvbnRyb2wgbGFzdC4KK215 ICRub2RlX3N0YW5kYnkgPSBQb3N0Z3JlU1FMOjpUZXN0OjpDbHVzdGVyLT5uZXcoJ3N0YW5k YnknKTsKKyRub2RlX3N0YW5kYnktPmluaXRfZnJvbV9iYWNrdXAoJG5vZGVfcHJpbWFyeSwg JGJhY2t1cF9uYW1lLAorCWhhc19zdHJlYW1pbmcgPT4gMSk7Ciskbm9kZV9zdGFuZGJ5LT5z dGFydDsKKyRub2RlX3ByaW1hcnktPndhaXRfZm9yX3JlcGxheV9jYXRjaHVwKCRub2RlX3N0 YW5kYnkpOworCitteSAkc3RhbmRieV9iYWNrdXAgPSAnYmFja3VwX3N0YW5kYnknOworJG5v ZGVfc3RhbmRieS0+YmFja3VwKCRzdGFuZGJ5X2JhY2t1cCk7CisKK2NvbW1hbmRfbGlrZSgK KwlbCisJCSdwZ19jb250cm9sZGF0YScsCisJCSctLXBnZGF0YScgPT4gJG5vZGVfc3RhbmRi eS0+YmFja3VwX2RpciAuICcvJyAuICRzdGFuZGJ5X2JhY2t1cAorCV0sCisJcXIvQmFja3Vw IGxhYmVsIHJlcXVpcmVkOiAreWVzLywKKwknYmFja3VwIHRha2VuIGZyb20gYSBzdGFuZGJ5 IHJlcXVpcmVzIGJhY2t1cF9sYWJlbCcpOworCitteSAkbm9kZV9zdGFuZGJ5MiA9IFBvc3Rn cmVTUUw6OlRlc3Q6OkNsdXN0ZXItPm5ldygnc3RhbmRieTInKTsKKyRub2RlX3N0YW5kYnky LT5pbml0X2Zyb21fYmFja3VwKCRub2RlX3N0YW5kYnksICRzdGFuZGJ5X2JhY2t1cCwKKwlo YXNfc3RyZWFtaW5nID0+IDEpOworCitjaGVja19zdGFydHVwX3dpdGhvdXRfYmFja3VwX2xh YmVsKCRub2RlX3N0YW5kYnkyLCAnYmFja3VwIGZyb20gc3RhbmRieScpOworCiskbm9kZV9z dGFuZGJ5Mi0+c3RhcnQ7Ciskbm9kZV9zdGFuZGJ5LT53YWl0X2Zvcl9yZXBsYXlfY2F0Y2h1 cCgkbm9kZV9zdGFuZGJ5MiwgJG5vZGVfcHJpbWFyeSk7Citpcygkbm9kZV9zdGFuZGJ5Mi0+ c2FmZV9wc3FsKCdwb3N0Z3JlcycsICdTRUxFQ1QgY291bnQoKikgRlJPTSB0YWJfaW50Jyks CisJMTAwMCwgJ2Nhc2NhZGluZyBzdGFuZGJ5IGZyb20gYSBzdGFuZGJ5IGJhY2t1cCBpcyBj YXVnaHQgdXAnKTsKKworZG9uZV90ZXN0aW5nKCk7Ci0tIAoyLjM0LjEKCg== --------------mfZNNh0YnC6IBtB2QJIJYyvh--