68342 2011-09-19 02:09:46 -0700 Web Inspector: streamline Console's MessageType and MessageSource semantics. 2011-09-20 06:45:17 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy vsevik yurys oldest_to_newest 469289 0 pfeldman 2011-09-19 02:09:46 -0700 This change fixes semantics of the MessageSource and MessageType: MessageSource is now the source of the message (be it Network, HTML parser or Console API) MessageType is only defined for the Console API messages and contains the name of the API call (log, dir, dirxml, etc.). Subsequent https://bugs.webkit.org/show_bug.cgi?id=66371 will make MessageType private to the inspector. 469305 1 107825 pfeldman 2011-09-19 02:56:10 -0700 Created attachment 107825 Patch 469385 2 107825 webkit.review.bot 2011-09-19 07:51:15 -0700 Comment on attachment 107825 Patch Attachment 107825 did not pass mac-ews (mac): Output: http://queues.webkit.org/results/9744296 469405 3 107858 pfeldman 2011-09-19 08:28:25 -0700 Created attachment 107858 [Path] Mac bot fixed. 469457 4 107858 vsevik 2011-09-19 09:46:21 -0700 Comment on attachment 107858 [Path] Mac bot fixed. View in context: https://bugs.webkit.org/attachment.cgi?id=107858&action=review > Source/WebCore/inspector/front-end/ConsoleMessage.js:98 > + case WebInspector.ConsoleMessage.MessageType.Dir: We should not switch between MessageTypes unless MessageSource is ConsoleAPI. Please put switch behind a conditional operator and make MessageType optional in protocol. Otherwise looks good. 469497 5 107879 pfeldman 2011-09-19 10:39:36 -0700 Created attachment 107879 [Patch] Review comments addressed 469517 6 107884 pfeldman 2011-09-19 10:53:34 -0700 Created attachment 107884 [Patch] rebaselined 2. 469523 7 107886 pfeldman 2011-09-19 10:55:25 -0700 Created attachment 107886 [Patch] rebaselined 3. 469986 8 vsevik 2011-09-20 04:52:18 -0700 LGTM 469999 9 107886 tonyg 2011-09-20 05:42:22 -0700 Comment on attachment 107886 [Patch] rebaselined 3. View in context: https://bugs.webkit.org/attachment.cgi?id=107886&action=review > Source/WebCore/inspector/Inspector.json:335 > + "description": "Console domain defines methods and events for interaction with the JavaScript console. Console collects messages created by means of the <a href='http://getfirebug.com/wiki/index.php/Console_API'>JavaScript Console API</a>. One needs to enable this domain using <code>enable</code> command in order to start receiving the console messages. Browser collects messages issued while console domain is not enabled as well and reports them using <code>messageAdded</code> notification upon enabling.", I take it these strings are localized so it is fine to change them in place? 470005 10 107886 pfeldman 2011-09-20 05:56:09 -0700 Comment on attachment 107886 [Patch] rebaselined 3. View in context: https://bugs.webkit.org/attachment.cgi?id=107886&action=review >> Source/WebCore/inspector/Inspector.json:335 >> + "description": "Console domain defines methods and events for interaction with the JavaScript console. Console collects messages created by means of the <a href='http://getfirebug.com/wiki/index.php/Console_API'>JavaScript Console API</a>. One needs to enable this domain using <code>enable</code> command in order to start receiving the console messages. Browser collects messages issued while console domain is not enabled as well and reports them using <code>messageAdded</code> notification upon enabling.", > > I take it these strings are localized so it is fine to change them in place? Protocol description is not localized. 470028 11 pfeldman 2011-09-20 06:45:17 -0700 Committed r95535: <http://trac.webkit.org/changeset/95535> 107825 2011-09-19 02:56:10 -0700 2011-09-19 08:28:16 -0700 Patch bug-68342-20110919135607.patch text/plain 35921 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogOTU0MDQKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA3NjhjNDRhNDE2Nzc4YTFiNGMyNGE3 MzkwNTQwNjgzNDg1YWNiYmE5Li5kMDA1NTZjMWRkNzQ2ZWRlOWJiZDhiYmI5MjljNzY4MTI4OTAw NGM5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDktMTkgIFBhdmVsIEZlbGRtYW4gIDxw ZmVsZG1hbkBnb29nbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IHN0cmVhbWxpbmUg Q29uc29sZSdzIE1lc3NhZ2VUeXBlIGFuZCBNZXNzYWdlU291cmNlIHNlbWFudGljcy4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY4MzQyCisKKyAgICAg ICAgVGhpcyBjaGFuZ2UgZml4ZXMgc2VtYW50aWNzIG9mIHRoZSBNZXNzYWdlU291cmNlIGFuZCBN ZXNzYWdlVHlwZToKKyAgICAgICAgTWVzc2FnZVNvdXJjZSBpcyBub3cgdGhlIHNvdXJjZSBvZiB0 aGUgbWVzc2FnZSAoYmUgaXQgTmV0d29yaywgSFRNTAorICAgICAgICBwYXJzZXIgb3IgQ29uc29s ZSBBUEkpLiBNZXNzYWdlVHlwZSBpcyBvbmx5IGRlZmluZWQgZm9yIHRoZSBDb25zb2xlIEFQSQor ICAgICAgICBtZXNzYWdlcyBhbmQgY29udGFpbnMgdGhlIG5hbWUgb2YgdGhlIEFQSSBjYWxsIChs b2csIGRpciwgZGlyeG1sLCBldGMuKS4KKyAgICAgICAgU3Vic2VxdWVudCBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjYzNzEgd2lsbCBtYWtlIE1lc3NhZ2VUeXBlCisg ICAgICAgIHByaXZhdGUgdG8gdGhlIGluc3BlY3Rvci4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9wcm90b2NvbC9jb25zb2xlLWFn ZW50LWV4cGVjdGVkLnR4dDoKKwogMjAxMS0wOS0xOCAgSWx5YSBUaWtob25vdnNreSAgPGxvaXNs b0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogcmVxdWVzdEFuaW1hdGlv bkZyYW1lIGNhbGxiYWNrcyBkb24ndCBzaG93IHVwIGluIHRoZSB0aW1lbGluZSBwYW5lbC4KZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9wcm90b2NvbC9jb25zb2xlLWFnZW50LWV4 cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9wcm90b2NvbC9jb25zb2xlLWFnZW50 LWV4cGVjdGVkLnR4dAppbmRleCBlMDNjY2UyYmVmYjQwYjYwOTBiMzY0ZGYyZDgzMTBlZTAxNWFk NDYwLi44ZTA4Y2MwMmIyMDRhY2VhMDIyOTUxOWEyMDdhY2MyYjljYTg3ZThkIDEwMDY0NAotLS0g YS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvcHJvdG9jb2wvY29uc29sZS1hZ2VudC1leHBlY3RlZC50 eHQKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3Byb3RvY29sL2NvbnNvbGUtYWdlbnQtZXhw ZWN0ZWQudHh0CkBAIC01Myw4ICs1Myw4IEBAIGV2ZW50IENvbnNvbGVBZ2VudC5tZXNzYWdlQWRk ZWQKIHsKICAgICBtZXRob2QgOiAiQ29uc29sZS5tZXNzYWdlQWRkZWQiCiAgICAgcGFyYW1zIDog ewotICAgICAgICBtZXNzYWdlT2JqIDogewotICAgICAgICAgICAgc291cmNlIDogImphdmFzY3Jp cHQiCisgICAgICAgIG1lc3NhZ2UgOiB7CisgICAgICAgICAgICBzb3VyY2UgOiAiY29uc29sZS1h cGkiCiAgICAgICAgICAgICB0eXBlIDogImxvZyIKICAgICAgICAgICAgIGxldmVsIDogImxvZyIK ICAgICAgICAgICAgIGxpbmUgOiAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VM b2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDBiYmY2MDYwMGQxMmUxNTY5MGRh MWY2YzY4MmI2NDljODZlMzkyMy4uMmJlNzYzMzkyMTcxYzAzMDE5NGM2MmE1ODE2ZGViMDgwYzJl NjU4ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X ZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQzIEBACisyMDExLTA5LTE5ICBQYXZlbCBGZWxk bWFuICA8cGZlbGRtYW5AZ29vZ2xlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBzdHJl YW1saW5lIENvbnNvbGUncyBNZXNzYWdlVHlwZSBhbmQgTWVzc2FnZVNvdXJjZSBzZW1hbnRpY3Mu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02ODM0Mgor CisgICAgICAgIFRoaXMgY2hhbmdlIGZpeGVzIHNlbWFudGljcyBvZiB0aGUgTWVzc2FnZVNvdXJj ZSBhbmQgTWVzc2FnZVR5cGU6CisgICAgICAgIE1lc3NhZ2VTb3VyY2UgaXMgbm93IHRoZSBzb3Vy Y2Ugb2YgdGhlIG1lc3NhZ2UgKGJlIGl0IE5ldHdvcmssIEhUTUwKKyAgICAgICAgcGFyc2VyIG9y IENvbnNvbGUgQVBJKS4gTWVzc2FnZVR5cGUgaXMgb25seSBkZWZpbmVkIGZvciB0aGUgQ29uc29s ZSBBUEkKKyAgICAgICAgbWVzc2FnZXMgYW5kIGNvbnRhaW5zIHRoZSBuYW1lIG9mIHRoZSBBUEkg Y2FsbCAobG9nLCBkaXIsIGRpcnhtbCwgZXRjLikuCisgICAgICAgIFN1YnNlcXVlbnQgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY2MzcxIHdpbGwgbWFrZSBNZXNzYWdl VHlwZQorICAgICAgICBwcml2YXRlIHRvIHRoZSBpbnNwZWN0b3IuCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBkb20vRG9jdW1lbnQuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OmxvZ0V4Y2VwdGlvblRvQ29uc29sZSk6CisgICAgICAg ICogaW5zcGVjdG9yL0NvbnNvbGVNZXNzYWdlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Om1lc3Nh Z2VTb3VyY2VWYWx1ZSk6CisgICAgICAgIChXZWJDb3JlOjptZXNzYWdlVHlwZVZhbHVlKToKKyAg ICAgICAgKFdlYkNvcmU6OkNvbnNvbGVNZXNzYWdlOjphZGRUb0Zyb250ZW5kKToKKyAgICAgICAg KiBpbnNwZWN0b3IvSW5zcGVjdG9yLmpzb246CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3Rv ckNvbnNvbGVBZ2VudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDb25zb2xlQWdl bnQ6OmRpZFJlY2VpdmVSZXNwb25zZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDb25z b2xlQWdlbnQ6OmRpZEZhaWxMb2FkaW5nKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5k L0NvbnNvbGVNZXNzYWdlLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdl LmNyZWF0ZVRleHRNZXNzYWdlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2Fn ZS5wcm90b3R5cGUuX2Zvcm1hdE1lc3NhZ2UpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnNv bGVNZXNzYWdlLnByb3RvdHlwZS50b1N0cmluZyk6CisgICAgICAgICogcGFnZS9Db25zb2xlLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OnByaW50TWVzc2FnZVNvdXJjZUFuZExldmVsUHJlZml4KToK KyAgICAgICAgKFdlYkNvcmU6OkNvbnNvbGU6OmFkZE1lc3NhZ2UpOgorICAgICAgICAoV2ViQ29y ZTo6Q29uc29sZTo6ZGlyKToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnNvbGU6OmRpcnhtbCk6Cisg ICAgICAgIChXZWJDb3JlOjpDb25zb2xlOjpncm91cCk6CisgICAgICAgIChXZWJDb3JlOjpDb25z b2xlOjpncm91cENvbGxhcHNlZCk6CisgICAgICAgIChXZWJDb3JlOjpDb25zb2xlOjpncm91cEVu ZCk6CisgICAgICAgICogcGFnZS9Db25zb2xlVHlwZXMuaDoKKyAgICAgICAgKiB3ZWJzb2NrZXRz L1dlYlNvY2tldENoYW5uZWwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6V2ViU29ja2V0Q2hhbm5l bDo6ZGlkRmFpbFNvY2tldFN0cmVhbSk6CisKIDIwMTEtMDktMTggIElseWEgVGlraG9ub3Zza3kg IDxsb2lzbG9AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IHJlcXVlc3RB bmltYXRpb25GcmFtZSBjYWxsYmFja3MgZG9uJ3Qgc2hvdyB1cCBpbiB0aGUgdGltZWxpbmUgcGFu ZWwuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwIGIvU291cmNl L1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAppbmRleCAxOTQzZmFlNzgyZjQzY2MxNzI4YzM3MzZi NWEyNGViOTNjNzFjM2MyLi41Mjc2OTIwZTk2Y2Y1NDY3OWI5MWRmNjRlZWQyZTlmZDNlOGYwMTM0 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKQEAgLTIzNTcsOCArMjM1Nyw3IEBAIEV2ZW50VGFy Z2V0KiBEb2N1bWVudDo6ZXJyb3JFdmVudFRhcmdldCgpCiAKIHZvaWQgRG9jdW1lbnQ6OmxvZ0V4 Y2VwdGlvblRvQ29uc29sZShjb25zdCBTdHJpbmcmIGVycm9yTWVzc2FnZSwgaW50IGxpbmVOdW1i ZXIsIGNvbnN0IFN0cmluZyYgc291cmNlVVJMLCBQYXNzUmVmUHRyPFNjcmlwdENhbGxTdGFjaz4g Y2FsbFN0YWNrKQogewotICAgIE1lc3NhZ2VUeXBlIG1lc3NhZ2VUeXBlID0gY2FsbFN0YWNrID8g VW5jYXVnaHRFeGNlcHRpb25NZXNzYWdlVHlwZSA6IExvZ01lc3NhZ2VUeXBlOwotICAgIGFkZE1l c3NhZ2UoSlNNZXNzYWdlU291cmNlLCBtZXNzYWdlVHlwZSwgRXJyb3JNZXNzYWdlTGV2ZWwsIGVy cm9yTWVzc2FnZSwgbGluZU51bWJlciwgc291cmNlVVJMLCBjYWxsU3RhY2spOworICAgIGFkZE1l c3NhZ2UoSlNNZXNzYWdlU291cmNlLCBMb2dNZXNzYWdlVHlwZSwgRXJyb3JNZXNzYWdlTGV2ZWws IGVycm9yTWVzc2FnZSwgbGluZU51bWJlciwgc291cmNlVVJMLCBjYWxsU3RhY2spOwogfQogCiB2 b2lkIERvY3VtZW50OjpzZXRVUkwoY29uc3QgS1VSTCYgdXJsKQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0NvbnNvbGVNZXNzYWdlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9Db25zb2xlTWVzc2FnZS5jcHAKaW5kZXggMGJjNGJhMTdlNGRhMGM1ZDQyMmRjZjkx NjQ0MDM5NWEwYTgzNWUzNC4uNDg2MjYxOThmYjY3NzM0YTdjNTJiMzQ3MmM3ZTRkY2M1NDFkNzc3 ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0NvbnNvbGVNZXNzYWdlLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvQ29uc29sZU1lc3NhZ2UuY3BwCkBAIC05 MSw3ICs5MSw4IEBAIHN0YXRpYyBTdHJpbmcgbWVzc2FnZVNvdXJjZVZhbHVlKE1lc3NhZ2VTb3Vy Y2Ugc291cmNlKQogICAgIGNhc2UgSFRNTE1lc3NhZ2VTb3VyY2U6IHJldHVybiAiaHRtbCI7CiAg ICAgY2FzZSBYTUxNZXNzYWdlU291cmNlOiByZXR1cm4gInhtbCI7CiAgICAgY2FzZSBKU01lc3Nh Z2VTb3VyY2U6IHJldHVybiAiamF2YXNjcmlwdCI7Ci0gICAgY2FzZSBDU1NNZXNzYWdlU291cmNl OiByZXR1cm4gImNzcyI7CisgICAgY2FzZSBOZXR3b3JrTWVzc2FnZVNvdXJjZTogcmV0dXJuICJu ZXR3b3JrIjsKKyAgICBjYXNlIENvbnNvbGVBUElNZXNzYWdlU291cmNlOiByZXR1cm4gImNvbnNv bGUtYXBpIjsKICAgICBjYXNlIE90aGVyTWVzc2FnZVNvdXJjZTogcmV0dXJuICJvdGhlciI7CiAg ICAgfQogICAgIHJldHVybiAib3RoZXIiOwpAQCAtMTAxLDE0ICsxMDIsMTMgQEAgc3RhdGljIFN0 cmluZyBtZXNzYWdlVHlwZVZhbHVlKE1lc3NhZ2VUeXBlIHR5cGUpCiB7CiAgICAgc3dpdGNoICh0 eXBlKSB7CiAgICAgY2FzZSBMb2dNZXNzYWdlVHlwZTogcmV0dXJuICJsb2ciOwotICAgIGNhc2Ug T2JqZWN0TWVzc2FnZVR5cGU6IHJldHVybiAib3RoZXIiOworICAgIGNhc2UgRGlyTWVzc2FnZVR5 cGU6IHJldHVybiAiZGlyIjsKKyAgICBjYXNlIERpclhNTE1lc3NhZ2VUeXBlOiByZXR1cm4gImRp clhNTCI7CiAgICAgY2FzZSBUcmFjZU1lc3NhZ2VUeXBlOiByZXR1cm4gInRyYWNlIjsKICAgICBj YXNlIFN0YXJ0R3JvdXBNZXNzYWdlVHlwZTogcmV0dXJuICJzdGFydEdyb3VwIjsKICAgICBjYXNl IFN0YXJ0R3JvdXBDb2xsYXBzZWRNZXNzYWdlVHlwZTogcmV0dXJuICJzdGFydEdyb3VwQ29sbGFw c2VkIjsKICAgICBjYXNlIEVuZEdyb3VwTWVzc2FnZVR5cGU6IHJldHVybiAiZW5kR3JvdXAiOwog ICAgIGNhc2UgQXNzZXJ0TWVzc2FnZVR5cGU6IHJldHVybiAiYXNzZXJ0IjsKLSAgICBjYXNlIFVu Y2F1Z2h0RXhjZXB0aW9uTWVzc2FnZVR5cGU6IHJldHVybiAidW5jYXVnaHRFeGNlcHRpb24iOwot ICAgIGNhc2UgTmV0d29ya0Vycm9yTWVzc2FnZVR5cGU6IHJldHVybiAibmV0d29ya0Vycm9yIjsK ICAgICB9CiAgICAgcmV0dXJuICJvdGhlciI7CiB9CkBAIC0xMzUsNyArMTM1LDcgQEAgdm9pZCBD b25zb2xlTWVzc2FnZTo6YWRkVG9Gcm9udGVuZChJbnNwZWN0b3JGcm9udGVuZDo6Q29uc29sZSog ZnJvbnRlbmQsIEluamVjdGUKICAgICBqc29uT2JqLT5zZXRTdHJpbmcoInVybCIsIG1fdXJsKTsK ICAgICBqc29uT2JqLT5zZXROdW1iZXIoInJlcGVhdENvdW50Iiwgc3RhdGljX2Nhc3Q8aW50Piht X3JlcGVhdENvdW50KSk7CiAgICAganNvbk9iai0+c2V0U3RyaW5nKCJ0ZXh0IiwgbV9tZXNzYWdl KTsKLSAgICBpZiAobV90eXBlID09IE5ldHdvcmtFcnJvck1lc3NhZ2VUeXBlKSAKKyAgICBpZiAo bV9zb3VyY2UgPT0gTmV0d29ya01lc3NhZ2VTb3VyY2UgJiYgIW1fcmVxdWVzdElkLmlzRW1wdHko KSkKICAgICAgICAganNvbk9iai0+c2V0U3RyaW5nKCJuZXR3b3JrUmVxdWVzdElkIiwgbV9yZXF1 ZXN0SWQpOwogICAgIGlmIChtX2FyZ3VtZW50cyAmJiBtX2FyZ3VtZW50cy0+YXJndW1lbnRDb3Vu dCgpKSB7CiAgICAgICAgIEluamVjdGVkU2NyaXB0IGluamVjdGVkU2NyaXB0ID0gaW5qZWN0ZWRT Y3JpcHRNYW5hZ2VyLT5pbmplY3RlZFNjcmlwdEZvcihtX2FyZ3VtZW50cy0+Z2xvYmFsU3RhdGUo KSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24g Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24KaW5kZXggYTkzNzc1MTQ5 NWEyNDE2MjEzMDM3YmZkMzA5YTUxYjZmODA3M2FmYy4uNTAyOGQ0YmE2YThmODJjNGQxOWExOWMw MjllMWYzOTY5YWYwNmRjOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3Rvci5qc29uCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNv bgpAQCAtMzMyLDIyICszMzIsMjIgQEAKICAgICB9LAogICAgIHsKICAgICAgICAgImRvbWFpbiI6 ICJDb25zb2xlIiwKLSAgICAgICAgImRlc2NyaXB0aW9uIjogIkNvbnNvbGUgZG9tYWluIGRlZmlu ZXMgbWV0aG9kcyBhbmQgZXZlbnRzIGZvciBpbnRlcmFjdGlvbiB3aXRoIHRoZSBKYXZhU2NyaXB0 IGNvbnNvbGUuIENvbnNvbGUgY29sbGVjdHMgbWVzc2FnZXMgY3JlYXRlZCBieSBtZWFucyBvZiB0 aGUgPGEgaHJlZj0naHR0cDovL2dldGZpcmVidWcuY29tL3dpa2kvaW5kZXgucGhwL0NvbnNvbGVf QVBJJz5KYXZhU2NyaXB0IENvbnNvbGUgQVBJPC9hPi4gT25lIG5lZWRzIHRvIGVuYWJsZSB0aGlz IGRvbWFpbiB1c2luZyA8Y29kZT5lbmFibGU8L2NvZGU+IGZ1bmN0aW9uIGluIG9yZGVyIHRvIHN0 YXJ0IHJlY2VpdmluZyB0aGUgY29uc29sZSBtZXNzYWdlcy4gQnJvd3NlciB3aWxsIGNvbGxlY3Qg bWVzc2FnZXMgaXNzdWVkIHdoaWxlIGNvbnNvbGUgZG9tYWluIGlzIG5vdCBlbmFibGVkIGFuZCB3 aWxsIHJlcG9ydCB0aGVtIHVzaW5nIDxjb2RlPm1lc3NhZ2VBZGRlZDwvY29kZT4gbm90aWZpY2F0 aW9uIHVwb24gZW5hYmxpbmcuIiwKKyAgICAgICAgImRlc2NyaXB0aW9uIjogIkNvbnNvbGUgZG9t YWluIGRlZmluZXMgbWV0aG9kcyBhbmQgZXZlbnRzIGZvciBpbnRlcmFjdGlvbiB3aXRoIHRoZSBK YXZhU2NyaXB0IGNvbnNvbGUuIENvbnNvbGUgY29sbGVjdHMgbWVzc2FnZXMgY3JlYXRlZCBieSBt ZWFucyBvZiB0aGUgPGEgaHJlZj0naHR0cDovL2dldGZpcmVidWcuY29tL3dpa2kvaW5kZXgucGhw L0NvbnNvbGVfQVBJJz5KYXZhU2NyaXB0IENvbnNvbGUgQVBJPC9hPi4gT25lIG5lZWRzIHRvIGVu YWJsZSB0aGlzIGRvbWFpbiB1c2luZyA8Y29kZT5lbmFibGU8L2NvZGU+IGNvbW1hbmQgaW4gb3Jk ZXIgdG8gc3RhcnQgcmVjZWl2aW5nIHRoZSBjb25zb2xlIG1lc3NhZ2VzLiBCcm93c2VyIGNvbGxl Y3RzIG1lc3NhZ2VzIGlzc3VlZCB3aGlsZSBjb25zb2xlIGRvbWFpbiBpcyBub3QgZW5hYmxlZCBh cyB3ZWxsIGFuZCByZXBvcnRzIHRoZW0gdXNpbmcgPGNvZGU+bWVzc2FnZUFkZGVkPC9jb2RlPiBu b3RpZmljYXRpb24gdXBvbiBlbmFibGluZy4iLAogICAgICAgICAidHlwZXMiOiBbCiAgICAgICAg ICAgICB7CiAgICAgICAgICAgICAgICAgImlkIjogIkNvbnNvbGVNZXNzYWdlIiwKICAgICAgICAg ICAgICAgICAidHlwZSI6ICJvYmplY3QiLAogICAgICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6 ICJDb25zb2xlIG1lc3NhZ2UuIiwKICAgICAgICAgICAgICAgICAicHJvcGVydGllcyI6IFsKLSAg ICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJzb3VyY2UiLCAidHlwZSI6ICJzdHJpbmciLCAi ZW51bSI6IFsiaHRtbCIsICJ3bWwiLCAieG1sIiwgImphdmFzY3JpcHQiLCAiY3NzIiwgIm90aGVy Il0sICJkZXNjcmlwdGlvbiI6ICJNZXNzYWdlIHNvdXJjZS4iIH0sCi0gICAgICAgICAgICAgICAg ICAgIHsgIm5hbWUiOiAidHlwZSIsICJ0eXBlIjogInN0cmluZyIsICJlbnVtIjogWyJsb2ciLCAi b3RoZXIiLCAidHJhY2UiLCAic3RhcnRHcm91cCIsICJzdGFydEdyb3VwQ29sbGFwc2VkIiwgImVu ZEdyb3VwIiwgImFzc2VydCIsICJ1bmNhdWdodEV4Y2VwdGlvbiIsICJuZXR3b3JrRXJyb3IiLCAi cmVzdWx0Il0sICJkZXNjcmlwdGlvbiI6ICJNZXNzYWdlIHR5cGUuIiB9LAorICAgICAgICAgICAg ICAgICAgICB7ICJuYW1lIjogInNvdXJjZSIsICJ0eXBlIjogInN0cmluZyIsICJlbnVtIjogWyJo dG1sIiwgIndtbCIsICJ4bWwiLCAiamF2YXNjcmlwdCIsICJuZXR3b3JrIiwgImNvbnNvbGUtYXBp IiwgIm90aGVyIl0sICJkZXNjcmlwdGlvbiI6ICJNZXNzYWdlIHNvdXJjZS4iIH0sCisgICAgICAg ICAgICAgICAgICAgIHsgIm5hbWUiOiAidHlwZSIsICJ0eXBlIjogInN0cmluZyIsICJlbnVtIjog WyJsb2ciLCAiZGlyIiwgImRpcnhtbCIsICJ0cmFjZSIsICJzdGFydEdyb3VwIiwgInN0YXJ0R3Jv dXBDb2xsYXBzZWQiLCAiZW5kR3JvdXAiLCAiYXNzZXJ0Il0sICJkZXNjcmlwdGlvbiI6ICJDb25z b2xlIG1lc3NhZ2UgdHlwZS4iIH0sCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAibGV2 ZWwiLCAidHlwZSI6ICJzdHJpbmciLCAiZW51bSI6IFsidGlwIiwgImxvZyIsICJ3YXJuaW5nIiwg ImVycm9yIiwgImRlYnVnIl0sICJkZXNjcmlwdGlvbiI6ICJNZXNzYWdlIHNldmVyaXR5LiIgfSwK LSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJsaW5lIiwgInR5cGUiOiAiaW50ZWdlciIs ICJkZXNjcmlwdGlvbiI6ICJMaW5lIG51bWJlciBpbiB0aGUgbWVzc2FnZSBvcmlnaW4gcmVzb3Vy Y2UuIiB9LAorICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImxpbmUiLCAidHlwZSI6ICJp bnRlZ2VyIiwgImRlc2NyaXB0aW9uIjogIkxpbmUgbnVtYmVyIGluIHRoZSByZXNvdXJjZSB0aGF0 IGdlbmVyYXRlZCB0aGlzIG1lc3NhZ2UuIiB9LAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1l IjogInVybCIsICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJVUkwgb2YgdGhlIG1l c3NhZ2Ugb3JpZ2luLiIgfSwKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJyZXBlYXRD b3VudCIsICJ0eXBlIjogImludGVnZXIiLCAiZGVzY3JpcHRpb24iOiAiUmVwZWF0IGNvdW50IGZv ciByZXBlYXRlZCBtZXNzYWdlcy4iIH0sCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAi dGV4dCIsICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJNZXNzYWdlIHRleHQuIiB9 LAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogIm5ldHdvcmtSZXF1ZXN0SWQiLCAiJHJl ZiI6ICJOZXR3b3JrLlJlcXVlc3RJZCIsICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6 ICJJZGVudGlmaWVyIG9mIHRoZSBuZXR3b3JrIHJlcXVlc3QgYXNzb2NpYXRlZCB3aXRoIHRoaXMg bWVzc2FnZS4iIH0sCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAicGFyYW1ldGVycyIs ICJ0eXBlIjogImFycmF5IiwgIml0ZW1zIjogeyAiJHJlZiI6ICJSdW50aW1lLlJlbW90ZU9iamVj dCIgfSwgImRlc2NyaXB0aW9uIjogIk1lc3NhZ2UgcGFyYW1ldGVycyBpbiBjYXNlIG9mIHRoZSBm b3JtYXR0ZWQgbWVzc2FnZS4iIH0sCisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAicGFy YW1ldGVycyIsICJ0eXBlIjogImFycmF5IiwgIml0ZW1zIjogeyAiJHJlZiI6ICJSdW50aW1lLlJl bW90ZU9iamVjdCIgfSwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIk1lc3NhZ2Ug cGFyYW1ldGVycyBpbiBjYXNlIG9mIHRoZSBmb3JtYXR0ZWQgbWVzc2FnZS4iIH0sCiAgICAgICAg ICAgICAgICAgICAgIHsgIm5hbWUiOiAic3RhY2tUcmFjZSIsICIkcmVmIjogIlN0YWNrVHJhY2Ui LCAiZGVzY3JpcHRpb24iOiAiSmF2YVNjcmlwdCBzdGFjayB0cmFjZSBmb3IgYXNzZXJ0aW9ucyBh bmQgZXJyb3IgbWVzc2FnZXMuIiB9CiAgICAgICAgICAgICAgICAgXQogICAgICAgICAgICAgfSwK QEAgLTM3MywxMyArMzczLDEzIEBACiAgICAgICAgICAgICB7CiAgICAgICAgICAgICAgICAgIm5h bWUiOiAiZW5hYmxlIiwKICAgICAgICAgICAgICAgICAicmV0dXJucyI6IFsKLSAgICAgICAgICAg ICAgICAgICAgeyAibmFtZSI6ICJleHBpcmVkTWVzc2FnZXNDb3VudCIsICJ0eXBlIjogImludGVn ZXIiLCAiZGVzY3JpcHRpb24iOiAiTnVtYmVyIG9mIG1lc3NhZ2VzIGNvbGxlY3RlZCBkdWUgdG8g bWVzc2FnZSB0aHJlYXNob2xkIG92ZXJmbG93LiIgfQorICAgICAgICAgICAgICAgICAgICB7ICJu YW1lIjogImV4cGlyZWRNZXNzYWdlc0NvdW50IiwgInR5cGUiOiAiaW50ZWdlciIsICJkZXNjcmlw dGlvbiI6ICJOdW1iZXIgb2YgbWVzc2FnZXMgZHJvcHBlZCBkdWUgdG8gbWVzc2FnZSB0aHJlYXNo b2xkIG92ZXJmbG93LiIgfQogICAgICAgICAgICAgICAgIF0sCiAgICAgICAgICAgICAgICAgImRl c2NyaXB0aW9uIjogIkVuYWJsZXMgY29uc29sZSBkb21haW4sIHNlbmRzIHRoZSBtZXNzYWdlcyBj b2xsZWN0ZWQgc28gZmFyIHRvIHRoZSBjbGllbnQgYnkgbWVhbnMgb2YgdGhlIDxjb2RlPm1lc3Nh Z2VBZGRlZDwvY29kZT4gbm90aWZpY2F0aW9uLiIgCiAgICAgICAgICAgICB9LAogICAgICAgICAg ICAgewogICAgICAgICAgICAgICAgICJuYW1lIjogImRpc2FibGUiLAotICAgICAgICAgICAgICAg ICJkZXNjcmlwdGlvbiI6ICJEaXNhYmxlcyBjb25zb2xlIGRvbWFpbiwgcHJldmVudHMgZnVydGhl ciBjb25zb2xlIG1lc3NhZ2VzIGZyb20gYmVpbmcgc2VudCB0byB0aGUgY2xpZW50LiIgCisgICAg ICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIkRpc2FibGVzIGNvbnNvbGUgZG9tYWluLCBwcmV2 ZW50cyBmdXJ0aGVyIGNvbnNvbGUgbWVzc2FnZXMgZnJvbSBiZWluZyByZXBvcnRlZCB0byB0aGUg Y2xpZW50LiIgCiAgICAgICAgICAgICB9LAogICAgICAgICAgICAgewogICAgICAgICAgICAgICAg ICJuYW1lIjogImNsZWFyTWVzc2FnZXMiLApAQCAtNDA2LDcgKzQwNiw3IEBACiAgICAgICAgICAg ICB7CiAgICAgICAgICAgICAgICAgIm5hbWUiOiAibWVzc2FnZUFkZGVkIiwKICAgICAgICAgICAg ICAgICAicGFyYW1ldGVycyI6IFsKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJtZXNz YWdlT2JqIiwgIiRyZWYiOiAiQ29uc29sZU1lc3NhZ2UiLCAiZGVzY3JpcHRpb24iOiAiQ29uc29s ZSBtZXNzYWdlIHRoYXQgaGFzIGJlZW4gYWRkZWQuIiB9CisgICAgICAgICAgICAgICAgICAgIHsg Im5hbWUiOiAibWVzc2FnZSIsICIkcmVmIjogIkNvbnNvbGVNZXNzYWdlIiwgImRlc2NyaXB0aW9u IjogIkNvbnNvbGUgbWVzc2FnZSB0aGF0IGhhcyBiZWVuIGFkZGVkLiIgfQogICAgICAgICAgICAg ICAgIF0sCiAgICAgICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIklzc3VlZCB3aGVuIG5ldyBj b25zb2xlIG1lc3NhZ2UgaXMgYWRkZWQuIgogICAgICAgICAgICAgfSwKQEAgLTQxNSwxMSArNDE1 LDExIEBACiAgICAgICAgICAgICAgICAgInBhcmFtZXRlcnMiOiBbCiAgICAgICAgICAgICAgICAg ICAgIHsgIm5hbWUiOiAiY291bnQiLCAidHlwZSI6ICJpbnRlZ2VyIiwgImRlc2NyaXB0aW9uIjog Ik5ldyByZXBlYXQgY291bnQgdmFsdWUuIiB9CiAgICAgICAgICAgICAgICAgXSwKLSAgICAgICAg ICAgICAgICAiZGVzY3JpcHRpb24iOiAiSXNzdWVkIHdoZW4gc3Vic2VxdWVudCBtZXNzYWdlKHMp IGFyZSBlcXVhbCB0byB0aGUgcHJldmlvdXMgb25lLiIKKyAgICAgICAgICAgICAgICAiZGVzY3Jp cHRpb24iOiAiSXNzdWVkIHdoZW4gc3Vic2VxdWVudCBtZXNzYWdlKHMpIGFyZSBlcXVhbCB0byB0 aGUgcHJldmlvdXMgb25lKHMpLiIKICAgICAgICAgICAgIH0sCiAgICAgICAgICAgICB7CiAgICAg ICAgICAgICAgICAgIm5hbWUiOiAibWVzc2FnZXNDbGVhcmVkIiwKLSAgICAgICAgICAgICAgICAi ZGVzY3JpcHRpb24iOiAiSXNzdWVkIHdoZW4gY29uc29sZSBpcyBjbGVhcmVkLiIKKyAgICAgICAg ICAgICAgICAiZGVzY3JpcHRpb24iOiAiSXNzdWVkIHdoZW4gY29uc29sZSBpcyBjbGVhcmVkLiBU aGlzIGhhcHBlbnMgZWl0aGVyIHVwb24gPGNvZGU+Y2xlYXJNZXNzYWdlczwvY29kZT4gY29tbWFu ZCBvciBhZnRlciBwYWdlIG5hdmlnYXRpb24uIgogICAgICAgICAgICAgfQogICAgICAgICBdCiAg ICAgfSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb25z b2xlQWdlbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnNvbGVB Z2VudC5jcHAKaW5kZXggZDZiMzI2ODk1MzViM2QwYWQyODNlNTg1YmQ1ZThmMDA2NDIzZDgzYS4u OTFlNDAyN2Y3YjUzOWE3ZjRkZTcwMWZjYWU1MzQ1YWRjNDhjODMwNiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnNvbGVBZ2VudC5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnNvbGVBZ2VudC5jcHAKQEAgLTIyNyw3 ICsyMjcsNyBAQCB2b2lkIEluc3BlY3RvckNvbnNvbGVBZ2VudDo6ZGlkUmVjZWl2ZVJlc3BvbnNl KHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgY29uc3QgUgogICAgIGlmIChyZXNwb25zZS5odHRw U3RhdHVzQ29kZSgpID49IDQwMCkgewogICAgICAgICBTdHJpbmcgbWVzc2FnZSA9ICJGYWlsZWQg dG8gbG9hZCByZXNvdXJjZTogdGhlIHNlcnZlciByZXNwb25kZWQgd2l0aCBhIHN0YXR1cyBvZiAi ICsgU3RyaW5nOjpudW1iZXIocmVzcG9uc2UuaHR0cFN0YXR1c0NvZGUoKSkgKyAiICgiICsgcmVz cG9uc2UuaHR0cFN0YXR1c1RleHQoKSArICcpJzsKICAgICAgICAgU3RyaW5nIHJlcXVlc3RJZCA9 IElkZW50aWZpZXJzRmFjdG9yeTo6cmVxdWVzdElkKGlkZW50aWZpZXIpOwotICAgICAgICBhZGRD b25zb2xlTWVzc2FnZShhZG9wdFB0cihuZXcgQ29uc29sZU1lc3NhZ2UoT3RoZXJNZXNzYWdlU291 cmNlLCBOZXR3b3JrRXJyb3JNZXNzYWdlVHlwZSwgRXJyb3JNZXNzYWdlTGV2ZWwsIG1lc3NhZ2Us IHJlc3BvbnNlLnVybCgpLnN0cmluZygpLCByZXF1ZXN0SWQpKSk7CisgICAgICAgIGFkZENvbnNv bGVNZXNzYWdlKGFkb3B0UHRyKG5ldyBDb25zb2xlTWVzc2FnZShOZXR3b3JrTWVzc2FnZVNvdXJj ZSwgTG9nTWVzc2FnZVR5cGUsIEVycm9yTWVzc2FnZUxldmVsLCBtZXNzYWdlLCByZXNwb25zZS51 cmwoKS5zdHJpbmcoKSwgcmVxdWVzdElkKSkpOwogICAgIH0KIH0KIApAQCAtMjQxLDcgKzI0MSw3 IEBAIHZvaWQgSW5zcGVjdG9yQ29uc29sZUFnZW50OjpkaWRGYWlsTG9hZGluZyh1bnNpZ25lZCBs b25nIGlkZW50aWZpZXIsIGNvbnN0IFJlc291CiAgICAgaWYgKCFlcnJvci5sb2NhbGl6ZWREZXNj cmlwdGlvbigpLmlzRW1wdHkoKSkKICAgICAgICAgbWVzc2FnZSArPSAiOiAiICsgZXJyb3IubG9j YWxpemVkRGVzY3JpcHRpb24oKTsKICAgICBTdHJpbmcgcmVxdWVzdElkID0gSWRlbnRpZmllcnNG YWN0b3J5OjpyZXF1ZXN0SWQoaWRlbnRpZmllcik7Ci0gICAgYWRkQ29uc29sZU1lc3NhZ2UoYWRv cHRQdHIobmV3IENvbnNvbGVNZXNzYWdlKE90aGVyTWVzc2FnZVNvdXJjZSwgTmV0d29ya0Vycm9y TWVzc2FnZVR5cGUsIEVycm9yTWVzc2FnZUxldmVsLCBtZXNzYWdlLCBlcnJvci5mYWlsaW5nVVJM KCksIHJlcXVlc3RJZCkpKTsKKyAgICBhZGRDb25zb2xlTWVzc2FnZShhZG9wdFB0cihuZXcgQ29u c29sZU1lc3NhZ2UoTmV0d29ya01lc3NhZ2VTb3VyY2UsIExvZ01lc3NhZ2VUeXBlLCBFcnJvck1l c3NhZ2VMZXZlbCwgbWVzc2FnZSwgZXJyb3IuZmFpbGluZ1VSTCgpLCByZXF1ZXN0SWQpKSk7CiB9 CiAKIHZvaWQgSW5zcGVjdG9yQ29uc29sZUFnZW50OjpzZXRNb25pdG9yaW5nWEhSRW5hYmxlZChF cnJvclN0cmluZyosIGJvb2wgZW5hYmxlZCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZU1lc3NhZ2UuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVNZXNzYWdlLmpzCmluZGV4IGExZDRjOGM5NGI1NDUyZWMx YWUyZmMzM2RlNDEzMmExM2I5M2YxOTIuLjdjZGQzNThjMzIyNTJmZjFkYzJlYTJhZDFkMDk4ZDBm ODIxZDk5MzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv Q29uc29sZU1lc3NhZ2UuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9Db25zb2xlTWVzc2FnZS5qcwpAQCAtNzMsNyArNzMsNyBAQCBXZWJJbnNwZWN0b3IuQ29uc29s ZU1lc3NhZ2UgPSBmdW5jdGlvbihzb3VyY2UsIHR5cGUsIGxldmVsLCBsaW5lLCB1cmwsIHJlcGVh dENvdQogV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLmNyZWF0ZVRleHRNZXNzYWdlID0gZnVu Y3Rpb24odGV4dCwgbGV2ZWwpCiB7CiAgICAgbGV2ZWwgPSBsZXZlbCB8fCBXZWJJbnNwZWN0b3Iu Q29uc29sZU1lc3NhZ2UuTWVzc2FnZUxldmVsLkxvZzsKLSAgICByZXR1cm4gbmV3IFdlYkluc3Bl Y3Rvci5Db25zb2xlTWVzc2FnZShXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZVNv dXJjZS5KUywgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLk1lc3NhZ2VUeXBlLkxvZywgbGV2 ZWwsIDAsIG51bGwsIDEsIG51bGwsIFt0ZXh0XSwgbnVsbCk7CisgICAgcmV0dXJuIG5ldyBXZWJJ bnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UoV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLk1lc3Nh Z2VTb3VyY2UuQ29uc29sZUFQSSwgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLk1lc3NhZ2VU eXBlLkxvZywgbGV2ZWwsIDAsIG51bGwsIDEsIG51bGwsIFt0ZXh0XSwgbnVsbCk7CiB9CiAKIFdl Ykluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5wcm90b3R5cGUgPSB7CkBAIC04OSwzNyArODksMTMg QEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAg IGNhc2UgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLk1lc3NhZ2VUeXBlLlRyYWNlOgogICAg ICAgICAgICAgICAgIG1lc3NhZ2VUZXh0ID0gZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUoImNvbnNv bGUudHJhY2UoKSIpOwogICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgY2FzZSBX ZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZVR5cGUuVW5jYXVnaHRFeGNlcHRpb246 Ci0gICAgICAgICAgICAgICAgbWVzc2FnZVRleHQgPSBkb2N1bWVudC5jcmVhdGVUZXh0Tm9kZSh0 aGlzLl9tZXNzYWdlVGV4dCk7Ci0gICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICBj YXNlIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlVHlwZS5OZXR3b3JrRXJyb3I6 Ci0gICAgICAgICAgICAgICAgaWYgKHRoaXMuX3JlcXVlc3QpIHsKLSAgICAgICAgICAgICAgICAg ICAgc3RhY2tUcmFjZSA9IHRoaXMuX3JlcXVlc3Quc3RhY2tUcmFjZTsKLQotICAgICAgICAgICAg ICAgICAgICBtZXNzYWdlVGV4dCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoInNwYW4iKTsKLSAg ICAgICAgICAgICAgICAgICAgbWVzc2FnZVRleHQuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRl VGV4dE5vZGUodGhpcy5fcmVxdWVzdC5yZXF1ZXN0TWV0aG9kICsgIiAiKSk7Ci0gICAgICAgICAg ICAgICAgICAgIHZhciBhbmNob3IgPSBXZWJJbnNwZWN0b3IubGlua2lmeVVSTEFzTm9kZSh0aGlz Ll9yZXF1ZXN0LnVybCk7Ci0gICAgICAgICAgICAgICAgICAgIGFuY2hvci5zZXRBdHRyaWJ1dGUo InJlcXVlc3RfaWQiLCB0aGlzLl9yZXF1ZXN0LnJlcXVlc3RJZCk7Ci0gICAgICAgICAgICAgICAg ICAgIGFuY2hvci5zZXRBdHRyaWJ1dGUoInByZWZlcnJlZF9wYW5lbCIsICJuZXR3b3JrIik7Ci0g ICAgICAgICAgICAgICAgICAgIG1lc3NhZ2VUZXh0LmFwcGVuZENoaWxkKGFuY2hvcik7Ci0gICAg ICAgICAgICAgICAgICAgIGlmICh0aGlzLl9yZXF1ZXN0LmZhaWxlZCkKLSAgICAgICAgICAgICAg ICAgICAgICAgIG1lc3NhZ2VUZXh0LmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZVRleHROb2Rl KCIgIiArIHRoaXMuX3JlcXVlc3QubG9jYWxpemVkRmFpbERlc2NyaXB0aW9uKSk7Ci0gICAgICAg ICAgICAgICAgICAgIGVsc2UKLSAgICAgICAgICAgICAgICAgICAgICAgIG1lc3NhZ2VUZXh0LmFw cGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZVRleHROb2RlKCIgIiArIHRoaXMuX3JlcXVlc3Quc3Rh dHVzQ29kZSArICIgKCIgKyB0aGlzLl9yZXF1ZXN0LnN0YXR1c1RleHQgKyAiKSIpKTsKLSAgICAg ICAgICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgICAgICAgICB2YXIgaXNFeHRlcm5hbCA9 ICFXZWJJbnNwZWN0b3IucmVzb3VyY2VGb3JVUkwodGhpcy51cmwpOwotICAgICAgICAgICAgICAg ICAgICB2YXIgYW5jaG9yID0gV2ViSW5zcGVjdG9yLmxpbmtpZnlVUkxBc05vZGUodGhpcy51cmws IHRoaXMudXJsLCAiY29uc29sZS1tZXNzYWdlLXVybCIsIGlzRXh0ZXJuYWwpOwotICAgICAgICAg ICAgICAgICAgICB0aGlzLl9mb3JtYXR0ZWRNZXNzYWdlLmFwcGVuZENoaWxkKGFuY2hvcik7Ci0g ICAgICAgICAgICAgICAgICAgIG1lc3NhZ2VUZXh0ID0gdGhpcy5fZm9ybWF0KFt0aGlzLl9tZXNz YWdlVGV4dF0pOwotICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgICAgICBicmVhazsKICAg ICAgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLk1lc3NhZ2VUeXBlLkFz c2VydDoKICAgICAgICAgICAgICAgICB2YXIgYXJncyA9IFtXZWJJbnNwZWN0b3IuVUlTdHJpbmco IkFzc2VydGlvbiBmYWlsZWQ6IildOwogICAgICAgICAgICAgICAgIGlmICh0aGlzLl9wYXJhbWV0 ZXJzKQogICAgICAgICAgICAgICAgICAgICBhcmdzID0gYXJncy5jb25jYXQodGhpcy5fcGFyYW1l dGVycyk7CiAgICAgICAgICAgICAgICAgbWVzc2FnZVRleHQgPSB0aGlzLl9mb3JtYXQoYXJncyk7 CiAgICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5D b25zb2xlTWVzc2FnZS5NZXNzYWdlVHlwZS5PYmplY3Q6CisgICAgICAgICAgICBjYXNlIFdlYklu c3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlVHlwZS5EaXI6CiAgICAgICAgICAgICAgICAg dmFyIG9iaiA9IHRoaXMuX3BhcmFtZXRlcnMgPyB0aGlzLl9wYXJhbWV0ZXJzWzBdIDogdW5kZWZp bmVkOwogICAgICAgICAgICAgICAgIHZhciBhcmdzID0gWyIlTyIsIG9ial07CiAgICAgICAgICAg ICAgICAgbWVzc2FnZVRleHQgPSB0aGlzLl9mb3JtYXQoYXJncyk7CkBAIC0xMzAsNyArMTA2LDI3 IEBAIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5wcm90b3R5cGUgPSB7CiAgICAgICAgICAg ICAgICAgYnJlYWs7CiAgICAgICAgIH0KIAotICAgICAgICBpZiAodGhpcy50eXBlICE9PSBXZWJJ bnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZVR5cGUuTmV0d29ya0Vycm9yKSB7CisgICAg ICAgIGlmICh0aGlzLnNvdXJjZSA9PT0gV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLk1lc3Nh Z2VTb3VyY2UuTmV0d29yaykgeworICAgICAgICAgICAgaWYgKHRoaXMuX3JlcXVlc3QpIHsKKyAg ICAgICAgICAgICAgICBzdGFja1RyYWNlID0gdGhpcy5fcmVxdWVzdC5zdGFja1RyYWNlOworCisg ICAgICAgICAgICAgICAgbWVzc2FnZVRleHQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJzcGFu Iik7CisgICAgICAgICAgICAgICAgbWVzc2FnZVRleHQuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3Jl YXRlVGV4dE5vZGUodGhpcy5fcmVxdWVzdC5yZXF1ZXN0TWV0aG9kICsgIiAiKSk7CisgICAgICAg ICAgICAgICAgdmFyIGFuY2hvciA9IFdlYkluc3BlY3Rvci5saW5raWZ5VVJMQXNOb2RlKHRoaXMu X3JlcXVlc3QudXJsKTsKKyAgICAgICAgICAgICAgICBhbmNob3Iuc2V0QXR0cmlidXRlKCJyZXF1 ZXN0X2lkIiwgdGhpcy5fcmVxdWVzdC5yZXF1ZXN0SWQpOworICAgICAgICAgICAgICAgIGFuY2hv ci5zZXRBdHRyaWJ1dGUoInByZWZlcnJlZF9wYW5lbCIsICJuZXR3b3JrIik7CisgICAgICAgICAg ICAgICAgbWVzc2FnZVRleHQuYXBwZW5kQ2hpbGQoYW5jaG9yKTsKKyAgICAgICAgICAgICAgICBp ZiAodGhpcy5fcmVxdWVzdC5mYWlsZWQpCisgICAgICAgICAgICAgICAgICAgIG1lc3NhZ2VUZXh0 LmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZVRleHROb2RlKCIgIiArIHRoaXMuX3JlcXVlc3Qu bG9jYWxpemVkRmFpbERlc2NyaXB0aW9uKSk7CisgICAgICAgICAgICAgICAgZWxzZQorICAgICAg ICAgICAgICAgICAgICBtZXNzYWdlVGV4dC5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVUZXh0 Tm9kZSgiICIgKyB0aGlzLl9yZXF1ZXN0LnN0YXR1c0NvZGUgKyAiICgiICsgdGhpcy5fcmVxdWVz dC5zdGF0dXNUZXh0ICsgIikiKSk7CisgICAgICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAg ICAgIHZhciBpc0V4dGVybmFsID0gIVdlYkluc3BlY3Rvci5yZXNvdXJjZUZvclVSTCh0aGlzLnVy bCk7CisgICAgICAgICAgICAgICAgdmFyIGFuY2hvciA9IFdlYkluc3BlY3Rvci5saW5raWZ5VVJM QXNOb2RlKHRoaXMudXJsLCB0aGlzLnVybCwgImNvbnNvbGUtbWVzc2FnZS11cmwiLCBpc0V4dGVy bmFsKTsKKyAgICAgICAgICAgICAgICB0aGlzLl9mb3JtYXR0ZWRNZXNzYWdlLmFwcGVuZENoaWxk KGFuY2hvcik7CisgICAgICAgICAgICAgICAgbWVzc2FnZVRleHQgPSB0aGlzLl9mb3JtYXQoW3Ro aXMuX21lc3NhZ2VUZXh0XSk7CisgICAgICAgICAgICB9CisgICAgICAgIH0gZWxzZSB7CiAgICAg ICAgICAgICBpZiAodGhpcy5fc3RhY2tUcmFjZSAmJiB0aGlzLl9zdGFja1RyYWNlLmxlbmd0aCAm JiB0aGlzLl9zdGFja1RyYWNlWzBdLnVybCkgewogICAgICAgICAgICAgICAgIHZhciB1cmxFbGVt ZW50ID0gdGhpcy5fbGlua2lmeUNhbGxGcmFtZSh0aGlzLl9zdGFja1RyYWNlWzBdKTsKICAgICAg ICAgICAgICAgICB0aGlzLl9mb3JtYXR0ZWRNZXNzYWdlLmFwcGVuZENoaWxkKHVybEVsZW1lbnQp OwpAQCAtMTQyLDI3ICsxMzgsMjEgQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLnByb3Rv dHlwZSA9IHsKIAogICAgICAgICB0aGlzLl9mb3JtYXR0ZWRNZXNzYWdlLmFwcGVuZENoaWxkKG1l c3NhZ2VUZXh0KTsKIAotICAgICAgICBpZiAodGhpcy5fc3RhY2tUcmFjZSkgewotICAgICAgICAg ICAgc3dpdGNoICh0aGlzLnR5cGUpIHsKLSAgICAgICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rv ci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlVHlwZS5UcmFjZToKLSAgICAgICAgICAgICAgICBjYXNl IFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlVHlwZS5VbmNhdWdodEV4Y2VwdGlv bjoKLSAgICAgICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNz YWdlVHlwZS5OZXR3b3JrRXJyb3I6Ci0gICAgICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3Iu Q29uc29sZU1lc3NhZ2UuTWVzc2FnZVR5cGUuQXNzZXJ0OiB7Ci0gICAgICAgICAgICAgICAgICAg IHZhciBvbCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoIm9sIik7Ci0gICAgICAgICAgICAgICAg ICAgIG9sLmNsYXNzTmFtZSA9ICJvdXRsaW5lLWRpc2Nsb3N1cmUiOwotICAgICAgICAgICAgICAg ICAgICB2YXIgdHJlZU91dGxpbmUgPSBuZXcgVHJlZU91dGxpbmUob2wpOwotCi0gICAgICAgICAg ICAgICAgICAgIHZhciBjb250ZW50ID0gdGhpcy5fZm9ybWF0dGVkTWVzc2FnZTsKLSAgICAgICAg ICAgICAgICAgICAgdmFyIHJvb3QgPSBuZXcgVHJlZUVsZW1lbnQoY29udGVudCwgbnVsbCwgdHJ1 ZSk7Ci0gICAgICAgICAgICAgICAgICAgIGNvbnRlbnQudHJlZUVsZW1lbnRGb3JUZXN0ID0gcm9v dDsKLSAgICAgICAgICAgICAgICAgICAgdHJlZU91dGxpbmUuYXBwZW5kQ2hpbGQocm9vdCk7Ci0g ICAgICAgICAgICAgICAgICAgIGlmICh0aGlzLnR5cGUgPT09IFdlYkluc3BlY3Rvci5Db25zb2xl TWVzc2FnZS5NZXNzYWdlVHlwZS5UcmFjZSkKLSAgICAgICAgICAgICAgICAgICAgICAgIHJvb3Qu ZXhwYW5kKCk7Ci0KLSAgICAgICAgICAgICAgICAgICAgdGhpcy5fcG9wdWxhdGVTdGFja1RyYWNl VHJlZUVsZW1lbnQocm9vdCk7Ci0gICAgICAgICAgICAgICAgICAgIHRoaXMuX2Zvcm1hdHRlZE1l c3NhZ2UgPSBvbDsKLSAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICB9CisgICAgICAgIHZh ciBkdW1wU3RhY2tUcmFjZSA9ICEhdGhpcy5fc3RhY2tUcmFjZSAmJiAodGhpcy5sZXZlbCA9PT0g V2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLk1lc3NhZ2VMZXZlbC5FcnJvciB8fCB0aGlzLnR5 cGUgPT09IFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlVHlwZS5UcmFjZSk7Cisg ICAgICAgIGlmIChkdW1wU3RhY2tUcmFjZSkgeworICAgICAgICAgICAgdmFyIG9sID0gZG9jdW1l bnQuY3JlYXRlRWxlbWVudCgib2wiKTsKKyAgICAgICAgICAgIG9sLmNsYXNzTmFtZSA9ICJvdXRs aW5lLWRpc2Nsb3N1cmUiOworICAgICAgICAgICAgdmFyIHRyZWVPdXRsaW5lID0gbmV3IFRyZWVP dXRsaW5lKG9sKTsKKworICAgICAgICAgICAgdmFyIGNvbnRlbnQgPSB0aGlzLl9mb3JtYXR0ZWRN ZXNzYWdlOworICAgICAgICAgICAgdmFyIHJvb3QgPSBuZXcgVHJlZUVsZW1lbnQoY29udGVudCwg bnVsbCwgdHJ1ZSk7CisgICAgICAgICAgICBjb250ZW50LnRyZWVFbGVtZW50Rm9yVGVzdCA9IHJv b3Q7CisgICAgICAgICAgICB0cmVlT3V0bGluZS5hcHBlbmRDaGlsZChyb290KTsKKyAgICAgICAg ICAgIGlmICh0aGlzLnR5cGUgPT09IFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdl VHlwZS5UcmFjZSkKKyAgICAgICAgICAgICAgICByb290LmV4cGFuZCgpOworCisgICAgICAgICAg ICB0aGlzLl9wb3B1bGF0ZVN0YWNrVHJhY2VUcmVlRWxlbWVudChyb290KTsKKyAgICAgICAgICAg IHRoaXMuX2Zvcm1hdHRlZE1lc3NhZ2UgPSBvbDsKICAgICAgICAgfQogCiAgICAgICAgIC8vIFRo aXMgaXMgdXNlZCBmb3IgaW5saW5lIG1lc3NhZ2UgYnViYmxlcyBpbiBTb3VyY2VGcmFtZXMsIG9y IG90aGVyIHBsYWluLXRleHQgcmVwcmVzZW50YXRpb25zLgpAQCAtMzg2LDggKzM3NiwxMSBAQCBX ZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UucHJvdG90eXBlID0gewogICAgICAgICAgICAgY2Fz ZSBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZVNvdXJjZS5KUzoKICAgICAgICAg ICAgICAgICBzb3VyY2VTdHJpbmcgPSAiSlMiOwogICAgICAgICAgICAgICAgIGJyZWFrOwotICAg ICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZVNvdXJjZS5D U1M6Ci0gICAgICAgICAgICAgICAgc291cmNlU3RyaW5nID0gIkNTUyI7CisgICAgICAgICAgICBj YXNlIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlU291cmNlLk5ldHdvcms6Cisg ICAgICAgICAgICAgICAgc291cmNlU3RyaW5nID0gIk5ldHdvcmsiOworICAgICAgICAgICAgICAg IGJyZWFrOworICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVz c2FnZVNvdXJjZS5Db25zb2xlQVBJOgorICAgICAgICAgICAgICAgIHNvdXJjZVN0cmluZyA9ICJD b25zb2xlQVBJIjsKICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIGNhc2UgV2Vi SW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLk1lc3NhZ2VTb3VyY2UuT3RoZXI6CiAgICAgICAgICAg ICAgICAgc291cmNlU3RyaW5nID0gIk90aGVyIjsKQEAgLTM5NywxMiArMzkwLDEzIEBAIFdlYklu c3BlY3Rvci5Db25zb2xlTWVzc2FnZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIHZhciB0eXBlU3Ry aW5nOwogICAgICAgICBzd2l0Y2ggKHRoaXMudHlwZSkgewogICAgICAgICAgICAgY2FzZSBXZWJJ bnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZVR5cGUuTG9nOgotICAgICAgICAgICAgY2Fz ZSBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZVR5cGUuVW5jYXVnaHRFeGNlcHRp b246Ci0gICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdl VHlwZS5OZXR3b3JrRXJyb3I6CiAgICAgICAgICAgICAgICAgdHlwZVN0cmluZyA9ICJMb2ciOwog ICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuQ29u c29sZU1lc3NhZ2UuTWVzc2FnZVR5cGUuT2JqZWN0OgotICAgICAgICAgICAgICAgIHR5cGVTdHJp bmcgPSAiT2JqZWN0IjsKKyAgICAgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNz YWdlLk1lc3NhZ2VUeXBlLkRpcjoKKyAgICAgICAgICAgICAgICB0eXBlU3RyaW5nID0gIkRpciI7 CisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5D b25zb2xlTWVzc2FnZS5NZXNzYWdlVHlwZS5EaXJYTUw6CisgICAgICAgICAgICAgICAgdHlwZVN0 cmluZyA9ICJEaXIgWE1MIjsKICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIGNh c2UgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLk1lc3NhZ2VUeXBlLlRyYWNlOgogICAgICAg ICAgICAgICAgIHR5cGVTdHJpbmcgPSAiVHJhY2UiOwpAQCAtNDg4LDIwICs0ODIsMjAgQEAgV2Vi SW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLk1lc3NhZ2VTb3VyY2UgPSB7CiAgICAgSFRNTDogImh0 bWwiLAogICAgIFhNTDogInhtbCIsCiAgICAgSlM6ICJqYXZhc2NyaXB0IiwKLSAgICBDU1M6ICJj c3MiLAorICAgIE5ldHdvcms6ICJuZXR3b3JrIiwKKyAgICBDb25zb2xlQVBJOiAiY29uc29sZS1h cGkiLAogICAgIE90aGVyOiAib3RoZXIiCiB9CiAKIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2Fn ZS5NZXNzYWdlVHlwZSA9IHsKICAgICBMb2c6ICJsb2ciLAotICAgIE9iamVjdDogIm90aGVyIiwK KyAgICBEaXI6ICJkaXIiLAorICAgIERpclhNTDogImRpcnhtbCIsCiAgICAgVHJhY2U6ICJ0cmFj ZSIsCiAgICAgU3RhcnRHcm91cDogInN0YXJ0R3JvdXAiLAogICAgIFN0YXJ0R3JvdXBDb2xsYXBz ZWQ6ICJzdGFydEdyb3VwQ29sbGFwc2VkIiwKICAgICBFbmRHcm91cDogImVuZEdyb3VwIiwKICAg ICBBc3NlcnQ6ICJhc3NlcnQiLAotICAgIFVuY2F1Z2h0RXhjZXB0aW9uOiAidW5jYXVnaHRFeGNl cHRpb24iLAotICAgIE5ldHdvcmtFcnJvcjogIm5ldHdvcmtFcnJvciIsCiAgICAgUmVzdWx0OiAi cmVzdWx0IgogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnNvbGUuY3Bw IGIvU291cmNlL1dlYkNvcmUvcGFnZS9Db25zb2xlLmNwcAppbmRleCA5NWZkYjM5OTA0ZTE0MTdm NjQ1NTFmYTE1ZDBiMGJjNzA0YzRkZTJmLi43NGRmZTc0YWIyNDI5NGJlM2I1ZTdkY2I3ZWZhOGZj YmUzNDI5MWJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnNvbGUuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ29uc29sZS5jcHAKQEAgLTk1LDggKzk1LDExIEBAIHN0 YXRpYyB2b2lkIHByaW50TWVzc2FnZVNvdXJjZUFuZExldmVsUHJlZml4KE1lc3NhZ2VTb3VyY2Ug c291cmNlLCBNZXNzYWdlTGV2ZWwKICAgICBjYXNlIEpTTWVzc2FnZVNvdXJjZToKICAgICAgICAg c291cmNlU3RyaW5nID0gIkpTIjsKICAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBDU1NNZXNzYWdl U291cmNlOgotICAgICAgICBzb3VyY2VTdHJpbmcgPSAiQ1NTIjsKKyAgICBjYXNlIE5ldHdvcmtN ZXNzYWdlU291cmNlOgorICAgICAgICBzb3VyY2VTdHJpbmcgPSAiTkVUV09SSyI7CisgICAgICAg IGJyZWFrOworICAgIGNhc2UgQ29uc29sZUFQSU1lc3NhZ2VTb3VyY2U6CisgICAgICAgIHNvdXJj ZVN0cmluZyA9ICJDT05TT0xFQVBJIjsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBPdGhlck1l c3NhZ2VTb3VyY2U6CiAgICAgICAgIHNvdXJjZVN0cmluZyA9ICJPVEhFUiI7CkBAIC0xNzYsNyAr MTc5LDcgQEAgdm9pZCBDb25zb2xlOjphZGRNZXNzYWdlKE1lc3NhZ2VUeXBlIHR5cGUsIE1lc3Nh Z2VMZXZlbCBsZXZlbCwgUGFzc1JlZlB0cjxTY3JpcHQKIAogICAgIGlmIChDb25zb2xlOjpzaG91 bGRQcmludEV4Y2VwdGlvbnMoKSkgewogICAgICAgICBwcmludFNvdXJjZVVSTEFuZExpbmUobGFz dENhbGxlci5zb3VyY2VVUkwoKSwgMCk7Ci0gICAgICAgIHByaW50TWVzc2FnZVNvdXJjZUFuZExl dmVsUHJlZml4KEpTTWVzc2FnZVNvdXJjZSwgbGV2ZWwpOworICAgICAgICBwcmludE1lc3NhZ2VT b3VyY2VBbmRMZXZlbFByZWZpeChDb25zb2xlQVBJTWVzc2FnZVNvdXJjZSwgbGV2ZWwpOwogCiAg ICAgICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBhcmd1bWVudHMtPmFyZ3VtZW50Q291bnQo KTsgKytpKSB7CiAgICAgICAgICAgICBTdHJpbmcgYXJnQXNTdHJpbmc7CkBAIC0xODgsOSArMTkx LDkgQEAgdm9pZCBDb25zb2xlOjphZGRNZXNzYWdlKE1lc3NhZ2VUeXBlIHR5cGUsIE1lc3NhZ2VM ZXZlbCBsZXZlbCwgUGFzc1JlZlB0cjxTY3JpcHQKIAogICAgIFN0cmluZyBtZXNzYWdlOwogICAg IGlmIChhcmd1bWVudHMtPmdldEZpcnN0QXJndW1lbnRBc1N0cmluZyhtZXNzYWdlKSkKLSAgICAg ICAgcGFnZS0+Y2hyb21lKCktPmNsaWVudCgpLT5hZGRNZXNzYWdlVG9Db25zb2xlKEpTTWVzc2Fn ZVNvdXJjZSwgdHlwZSwgbGV2ZWwsIG1lc3NhZ2UsIGxhc3RDYWxsZXIubGluZU51bWJlcigpLCBs YXN0Q2FsbGVyLnNvdXJjZVVSTCgpKTsKKyAgICAgICAgcGFnZS0+Y2hyb21lKCktPmNsaWVudCgp LT5hZGRNZXNzYWdlVG9Db25zb2xlKENvbnNvbGVBUElNZXNzYWdlU291cmNlLCB0eXBlLCBsZXZl bCwgbWVzc2FnZSwgbGFzdENhbGxlci5saW5lTnVtYmVyKCksIGxhc3RDYWxsZXIuc291cmNlVVJM KCkpOwogCi0gICAgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjphZGRNZXNzYWdlVG9Db25zb2xl KHBhZ2UsIEpTTWVzc2FnZVNvdXJjZSwgdHlwZSwgbGV2ZWwsIG1lc3NhZ2UsIGFyZ3VtZW50cywg Y2FsbFN0YWNrKTsKKyAgICBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmFkZE1lc3NhZ2VUb0Nv bnNvbGUocGFnZSwgQ29uc29sZUFQSU1lc3NhZ2VTb3VyY2UsIHR5cGUsIGxldmVsLCBtZXNzYWdl LCBhcmd1bWVudHMsIGNhbGxTdGFjayk7CiB9CiAKIHZvaWQgQ29uc29sZTo6ZGVidWcoUGFzc1Jl ZlB0cjxTY3JpcHRBcmd1bWVudHM+IGFyZ3VtZW50cywgUGFzc1JlZlB0cjxTY3JpcHRDYWxsU3Rh Y2s+IGNhbGxTdGFjaykKQEAgLTIxNiwxMyArMjE5LDEyIEBAIHZvaWQgQ29uc29sZTo6bG9nKFBh c3NSZWZQdHI8U2NyaXB0QXJndW1lbnRzPiBhcmd1bWVudHMsIFBhc3NSZWZQdHI8U2NyaXB0Q2Fs bFN0CiAKIHZvaWQgQ29uc29sZTo6ZGlyKFBhc3NSZWZQdHI8U2NyaXB0QXJndW1lbnRzPiBhcmd1 bWVudHMsIFBhc3NSZWZQdHI8U2NyaXB0Q2FsbFN0YWNrPiBjYWxsU3RhY2spCiB7Ci0gICAgYWRk TWVzc2FnZShPYmplY3RNZXNzYWdlVHlwZSwgTG9nTWVzc2FnZUxldmVsLCBhcmd1bWVudHMsIGNh bGxTdGFjayk7CisgICAgYWRkTWVzc2FnZShEaXJNZXNzYWdlVHlwZSwgTG9nTWVzc2FnZUxldmVs LCBhcmd1bWVudHMsIGNhbGxTdGFjayk7CiB9CiAKIHZvaWQgQ29uc29sZTo6ZGlyeG1sKFBhc3NS ZWZQdHI8U2NyaXB0QXJndW1lbnRzPiBhcmd1bWVudHMsIFBhc3NSZWZQdHI8U2NyaXB0Q2FsbFN0 YWNrPiBjYWxsU3RhY2spCiB7Ci0gICAgLy8gVGhlIHN0YW5kYXJkIGJlaGF2aW9yIG9mIG91ciBj b25zb2xlLmxvZyB3aWxsIHByaW50IHRoZSBET00gdHJlZSBmb3Igbm9kZXMuCi0gICAgbG9nKGFy Z3VtZW50cywgY2FsbFN0YWNrKTsKKyAgICBhZGRNZXNzYWdlKERpclhNTE1lc3NhZ2VUeXBlLCBM b2dNZXNzYWdlTGV2ZWwsIGFyZ3VtZW50cywgY2FsbFN0YWNrKTsKIH0KIAogdm9pZCBDb25zb2xl Ojp0cmFjZShQYXNzUmVmUHRyPFNjcmlwdEFyZ3VtZW50cz4gYXJndW1lbnRzLCBQYXNzUmVmUHRy PFNjcmlwdENhbGxTdGFjaz4gcHJwQ2FsbFN0YWNrKQpAQCAtMzE2LDE3ICszMTgsMTcgQEAgdm9p ZCBDb25zb2xlOjp0aW1lU3RhbXAoUGFzc1JlZlB0cjxTY3JpcHRBcmd1bWVudHM+IGFyZ3VtZW50 cywgUGFzc1JlZlB0cjxTY3JpcHQKIAogdm9pZCBDb25zb2xlOjpncm91cChQYXNzUmVmUHRyPFNj cmlwdEFyZ3VtZW50cz4gYXJndW1lbnRzLCBQYXNzUmVmUHRyPFNjcmlwdENhbGxTdGFjaz4gY2Fs bFN0YWNrKQogewotICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6YWRkTWVzc2FnZVRvQ29u c29sZShwYWdlKCksIEpTTWVzc2FnZVNvdXJjZSwgU3RhcnRHcm91cE1lc3NhZ2VUeXBlLCBMb2dN ZXNzYWdlTGV2ZWwsIFN0cmluZygpLCBhcmd1bWVudHMsIGNhbGxTdGFjayk7CisgICAgSW5zcGVj dG9ySW5zdHJ1bWVudGF0aW9uOjphZGRNZXNzYWdlVG9Db25zb2xlKHBhZ2UoKSwgQ29uc29sZUFQ SU1lc3NhZ2VTb3VyY2UsIFN0YXJ0R3JvdXBNZXNzYWdlVHlwZSwgTG9nTWVzc2FnZUxldmVsLCBT dHJpbmcoKSwgYXJndW1lbnRzLCBjYWxsU3RhY2spOwogfQogCiB2b2lkIENvbnNvbGU6Omdyb3Vw Q29sbGFwc2VkKFBhc3NSZWZQdHI8U2NyaXB0QXJndW1lbnRzPiBhcmd1bWVudHMsIFBhc3NSZWZQ dHI8U2NyaXB0Q2FsbFN0YWNrPiBjYWxsU3RhY2spCiB7Ci0gICAgSW5zcGVjdG9ySW5zdHJ1bWVu dGF0aW9uOjphZGRNZXNzYWdlVG9Db25zb2xlKHBhZ2UoKSwgSlNNZXNzYWdlU291cmNlLCBTdGFy dEdyb3VwQ29sbGFwc2VkTWVzc2FnZVR5cGUsIExvZ01lc3NhZ2VMZXZlbCwgU3RyaW5nKCksIGFy Z3VtZW50cywgY2FsbFN0YWNrKTsKKyAgICBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmFkZE1l c3NhZ2VUb0NvbnNvbGUocGFnZSgpLCBDb25zb2xlQVBJTWVzc2FnZVNvdXJjZSwgU3RhcnRHcm91 cENvbGxhcHNlZE1lc3NhZ2VUeXBlLCBMb2dNZXNzYWdlTGV2ZWwsIFN0cmluZygpLCBhcmd1bWVu dHMsIGNhbGxTdGFjayk7CiB9CiAKIHZvaWQgQ29uc29sZTo6Z3JvdXBFbmQoKQogewotICAgIElu c3BlY3Rvckluc3RydW1lbnRhdGlvbjo6YWRkTWVzc2FnZVRvQ29uc29sZShwYWdlKCksIEpTTWVz c2FnZVNvdXJjZSwgRW5kR3JvdXBNZXNzYWdlVHlwZSwgTG9nTWVzc2FnZUxldmVsLCBTdHJpbmco KSwgMCwgU3RyaW5nKCkpOworICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6YWRkTWVzc2Fn ZVRvQ29uc29sZShwYWdlKCksIENvbnNvbGVBUElNZXNzYWdlU291cmNlLCBFbmRHcm91cE1lc3Nh Z2VUeXBlLCBMb2dNZXNzYWdlTGV2ZWwsIFN0cmluZygpLCAwLCBTdHJpbmcoKSk7CiB9CiAKIGJv b2wgQ29uc29sZTo6c2hvdWxkQ2FwdHVyZUZ1bGxTdGFja1RyYWNlKCkgY29uc3QKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ29uc29sZVR5cGVzLmggYi9Tb3VyY2UvV2ViQ29yZS9w YWdlL0NvbnNvbGVUeXBlcy5oCmluZGV4IDA3MjFiMzZmMmFiODE0NDAzYTlhN2I5MGMwOTQxNjNi OWRjMjE5ZTYuLjhiNDQwMzBjNjkzNmE3Y2U5MDQ2N2Y0ZmRkOTJmYjFjZWQ0ZTNlNDggMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ29uc29sZVR5cGVzLmgKKysrIGIvU291cmNlL1dl YkNvcmUvcGFnZS9Db25zb2xlVHlwZXMuaApAQCAtMzIsMjAgKzMyLDIyIEBAIGVudW0gTWVzc2Fn ZVNvdXJjZSB7CiAgICAgSFRNTE1lc3NhZ2VTb3VyY2UsCiAgICAgWE1MTWVzc2FnZVNvdXJjZSwK ICAgICBKU01lc3NhZ2VTb3VyY2UsCi0gICAgQ1NTTWVzc2FnZVNvdXJjZSwKLSAgICBPdGhlck1l c3NhZ2VTb3VyY2UKKyAgICBOZXR3b3JrTWVzc2FnZVNvdXJjZSwKKyAgICBDb25zb2xlQVBJTWVz c2FnZVNvdXJjZSwKKyAgICBPdGhlck1lc3NhZ2VTb3VyY2UsCiB9OwogCisvLyBGSVhNRTogbWFr ZSB0aGlzIGVudW0gcHJpdmF0ZSB0byBpbnNwZWN0b3IsIHJlbW92ZSBpdCBmcm9tIGNsaWVudCBj YWxsYmFja3MuCisvLyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjYz NzEKIGVudW0gTWVzc2FnZVR5cGUgewogICAgIExvZ01lc3NhZ2VUeXBlLAotICAgIE9iamVjdE1l c3NhZ2VUeXBlLAorICAgIERpck1lc3NhZ2VUeXBlLAorICAgIERpclhNTE1lc3NhZ2VUeXBlLAog ICAgIFRyYWNlTWVzc2FnZVR5cGUsCiAgICAgU3RhcnRHcm91cE1lc3NhZ2VUeXBlLAogICAgIFN0 YXJ0R3JvdXBDb2xsYXBzZWRNZXNzYWdlVHlwZSwKICAgICBFbmRHcm91cE1lc3NhZ2VUeXBlLAot ICAgIEFzc2VydE1lc3NhZ2VUeXBlLAotICAgIFVuY2F1Z2h0RXhjZXB0aW9uTWVzc2FnZVR5cGUs Ci0gICAgTmV0d29ya0Vycm9yTWVzc2FnZVR5cGUKKyAgICBBc3NlcnRNZXNzYWdlVHlwZQogfTsK IAogZW51bSBNZXNzYWdlTGV2ZWwgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvd2Vic29j a2V0cy9XZWJTb2NrZXRDaGFubmVsLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3dlYnNvY2tldHMvV2Vi U29ja2V0Q2hhbm5lbC5jcHAKaW5kZXggYzExMzViNTljMTJkODljOWFhN2VjNDQyNGJkMTY5M2U3 ZjE4NDlmMS4uNzcwODY1ZjQ2MDY3ZTY2MjUxOGEwYzM5NDM5MzRiOGEzNzEyMjAxYyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvd2Vic29ja2V0cy9XZWJTb2NrZXRDaGFubmVsLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS93ZWJzb2NrZXRzL1dlYlNvY2tldENoYW5uZWwuY3BwCkBAIC0zMzMs NyArMzMzLDcgQEAgdm9pZCBXZWJTb2NrZXRDaGFubmVsOjpkaWRGYWlsU29ja2V0U3RyZWFtKFNv Y2tldFN0cmVhbUhhbmRsZSogaGFuZGxlLCBjb25zdCBTb2MKICAgICAgICAgQVNTRVJUKGZhaWxp bmdVUkwuaXNOdWxsKCkgfHwgbV9oYW5kc2hha2UtPnVybCgpLnN0cmluZygpID09IGZhaWxpbmdV UkwpOwogICAgICAgICBpZiAoZmFpbGluZ1VSTC5pc051bGwoKSkKICAgICAgICAgICAgIGZhaWxp bmdVUkwgPSBtX2hhbmRzaGFrZS0+dXJsKCkuc3RyaW5nKCk7Ci0gICAgICAgIG1fY29udGV4dC0+ YWRkTWVzc2FnZShPdGhlck1lc3NhZ2VTb3VyY2UsIE5ldHdvcmtFcnJvck1lc3NhZ2VUeXBlLCBF cnJvck1lc3NhZ2VMZXZlbCwgbWVzc2FnZSwgMCwgZmFpbGluZ1VSTCwgMCk7CisgICAgICAgIG1f Y29udGV4dC0+YWRkTWVzc2FnZShOZXR3b3JrTWVzc2FnZVNvdXJjZSwgTG9nTWVzc2FnZVR5cGUs IEVycm9yTWVzc2FnZUxldmVsLCBtZXNzYWdlLCAwLCBmYWlsaW5nVVJMLCAwKTsKICAgICB9CiAg ICAgbV9zaG91bGREaXNjYXJkUmVjZWl2ZWREYXRhID0gdHJ1ZTsKICAgICBoYW5kbGUtPmRpc2Nv bm5lY3QoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZyBiL1NvdXJj ZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwppbmRleCBmMGNjMTMzYWZhZDY0ZWI0NDg5ODRlZGNmZmUy NWM0NTY0N2MxYWE3Li5mYTBkNmYzMWU5M2RlYWIzYmZjZTFkMzkyZmU1ZTg5ODUyOGM3NzE5IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktp dC9tYWMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMDktMTkgIFBhdmVsIEZlbGRt YW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IHN0cmVh bWxpbmUgQ29uc29sZSdzIE1lc3NhZ2VUeXBlIGFuZCBNZXNzYWdlU291cmNlIHNlbWFudGljcy4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY4MzQyCisK KyAgICAgICAgVGhpcyBjaGFuZ2UgZml4ZXMgc2VtYW50aWNzIG9mIHRoZSBNZXNzYWdlU291cmNl IGFuZCBNZXNzYWdlVHlwZToKKyAgICAgICAgTWVzc2FnZVNvdXJjZSBpcyBub3cgdGhlIHNvdXJj ZSBvZiB0aGUgbWVzc2FnZSAoYmUgaXQgTmV0d29yaywgSFRNTAorICAgICAgICBwYXJzZXIgb3Ig Q29uc29sZSBBUEkpLiBNZXNzYWdlVHlwZSBpcyBvbmx5IGRlZmluZWQgZm9yIHRoZSBDb25zb2xl IEFQSQorICAgICAgICBtZXNzYWdlcyBhbmQgY29udGFpbnMgdGhlIG5hbWUgb2YgdGhlIEFQSSBj YWxsIChsb2csIGRpciwgZGlyeG1sLCBldGMuKS4gCisgICAgICAgIFN1YnNlcXVlbnQgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY2MzcxIHdpbGwgbWFrZSBNZXNzYWdl VHlwZQorICAgICAgICBwcml2YXRlIHRvIHRoZSBpbnNwZWN0b3IuCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9XZWJDaHJv bWVDbGllbnQubW06CisgICAgICAgIChzdHJpbmdGb3JNZXNzYWdlU291cmNlKToKKyAgICAgICAg KHN0cmluZ0Zvck1lc3NhZ2VUeXBlKToKKyAgICAgICAgKiBXZWJWaWV3L1dlYlVJRGVsZWdhdGVQ cml2YXRlLmg6CisKIDIwMTEtMDktMTcgIE1paGFpIFBhcnBhcml0YSAgPG1paGFpcEBjaHJvbWl1 bS5vcmc+CiAKICAgICAgICAgRnJhbWVMb2FkZXJDbGllbnQgQmFja0ZvcndhcmRMaXN0LXJlbGF0 ZWQgbWV0aG9kcyBhcmUgdW5zdWVkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJD b3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQubW0gYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3Jl U3VwcG9ydC9XZWJDaHJvbWVDbGllbnQubW0KaW5kZXggNDAzNjA1YmI4ZGJkNjhlMDc3Nzg2Zjg3 M2YwY2FlZmEwMjAwOGVmYi4uMjdhMDY5MzE3M2U0MmQxNjYyZjYyYTFlOTgyYTJjYjhjNGY3NjMx YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21l Q2xpZW50Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9t ZUNsaWVudC5tbQpAQCAtODgsMTggKzg4LDE4IEBACiBOU1N0cmluZyAqV2ViQ29uc29sZU1lc3Nh Z2VIVE1MTWVzc2FnZVNvdXJjZSA9IEAiSFRNTE1lc3NhZ2VTb3VyY2UiOwogTlNTdHJpbmcgKldl YkNvbnNvbGVNZXNzYWdlWE1MTWVzc2FnZVNvdXJjZSA9IEAiWE1MTWVzc2FnZVNvdXJjZSI7CiBO U1N0cmluZyAqV2ViQ29uc29sZU1lc3NhZ2VKU01lc3NhZ2VTb3VyY2UgPSBAIkpTTWVzc2FnZVNv dXJjZSI7Ci1OU1N0cmluZyAqV2ViQ29uc29sZU1lc3NhZ2VDU1NNZXNzYWdlU291cmNlID0gQCJD U1NNZXNzYWdlU291cmNlIjsKK05TU3RyaW5nICpXZWJDb25zb2xlTWVzc2FnZU5ldHdvcmtNZXNz YWdlU291cmNlID0gQCJOZXR3b3JrTWVzc2FnZVNvdXJjZSI7CitOU1N0cmluZyAqV2ViQ29uc29s ZU1lc3NhZ2VDb25zb2xlQVBJTWVzc2FnZVNvdXJjZSA9IEAiQ29uc29sZUFQSU1lc3NhZ2VTb3Vy Y2UiOwogTlNTdHJpbmcgKldlYkNvbnNvbGVNZXNzYWdlT3RoZXJNZXNzYWdlU291cmNlID0gQCJP dGhlck1lc3NhZ2VTb3VyY2UiOwogCiBOU1N0cmluZyAqV2ViQ29uc29sZU1lc3NhZ2VMb2dNZXNz YWdlVHlwZSA9IEAiTG9nTWVzc2FnZVR5cGUiOwotTlNTdHJpbmcgKldlYkNvbnNvbGVNZXNzYWdl T2JqZWN0TWVzc2FnZVR5cGUgPSBAIk9iamVjdE1lc3NhZ2VUeXBlIjsKK05TU3RyaW5nICpXZWJD b25zb2xlTWVzc2FnZURpck1lc3NhZ2VUeXBlID0gQCJEaXJNZXNzYWdlVHlwZSI7CitOU1N0cmlu ZyAqV2ViQ29uc29sZU1lc3NhZ2VEaXJYTUxNZXNzYWdlVHlwZSA9IEAiRGlyWE1MTWVzc2FnZVR5 cGUiOwogTlNTdHJpbmcgKldlYkNvbnNvbGVNZXNzYWdlVHJhY2VNZXNzYWdlVHlwZSA9IEAiVHJh Y2VNZXNzYWdlVHlwZSI7CiBOU1N0cmluZyAqV2ViQ29uc29sZU1lc3NhZ2VTdGFydEdyb3VwTWVz c2FnZVR5cGUgPSBAIlN0YXJ0R3JvdXBNZXNzYWdlVHlwZSI7CiBOU1N0cmluZyAqV2ViQ29uc29s ZU1lc3NhZ2VTdGFydEdyb3VwQ29sbGFwc2VkTWVzc2FnZVR5cGUgPSBAIlN0YXJ0R3JvdXBDb2xs YXBzZWRNZXNzYWdlVHlwZSI7CiBOU1N0cmluZyAqV2ViQ29uc29sZU1lc3NhZ2VFbmRHcm91cE1l c3NhZ2VUeXBlID0gQCJFbmRHcm91cE1lc3NhZ2VUeXBlIjsKIE5TU3RyaW5nICpXZWJDb25zb2xl TWVzc2FnZUFzc2VydE1lc3NhZ2VUeXBlID0gQCJBc3NlcnRNZXNzYWdlVHlwZSI7Ci1OU1N0cmlu ZyAqV2ViQ29uc29sZU1lc3NhZ2VVbmNhdWdodEV4Y2VwdGlvbk1lc3NhZ2VUeXBlID0gQCJVbmNh dWdodEV4Y2VwdGlvbk1lc3NhZ2VUeXBlIjsKLU5TU3RyaW5nICpXZWJDb25zb2xlTWVzc2FnZU5l dHdvcmtFcnJvck1lc3NhZ2VUeXBlID0gQCJOZXR3b3JrRXJyb3JNZXNzYWdlVHlwZSI7CiAKIE5T U3RyaW5nICpXZWJDb25zb2xlTWVzc2FnZVRpcE1lc3NhZ2VMZXZlbCA9IEAiVGlwTWVzc2FnZUxl dmVsIjsKIE5TU3RyaW5nICpXZWJDb25zb2xlTWVzc2FnZUxvZ01lc3NhZ2VMZXZlbCA9IEAiTG9n TWVzc2FnZUxldmVsIjsKQEAgLTM1Nyw4ICszNTcsMTAgQEAgaW5saW5lIHN0YXRpYyBOU1N0cmlu ZyAqc3RyaW5nRm9yTWVzc2FnZVNvdXJjZShNZXNzYWdlU291cmNlIHNvdXJjZSkKICAgICAgICAg cmV0dXJuIFdlYkNvbnNvbGVNZXNzYWdlWE1MTWVzc2FnZVNvdXJjZTsKICAgICBjYXNlIEpTTWVz c2FnZVNvdXJjZToKICAgICAgICAgcmV0dXJuIFdlYkNvbnNvbGVNZXNzYWdlSlNNZXNzYWdlU291 cmNlOwotICAgIGNhc2UgQ1NTTWVzc2FnZVNvdXJjZToKLSAgICAgICAgcmV0dXJuIFdlYkNvbnNv bGVNZXNzYWdlQ1NTTWVzc2FnZVNvdXJjZTsKKyAgICBjYXNlIE5ldHdvcmtNZXNzYWdlU291cmNl OgorICAgICAgICByZXR1cm4gV2ViQ29uc29sZU1lc3NhZ2VOZXR3b3JrTWVzc2FnZVNvdXJjZTsK KyAgICBjYXNlIENvbnNvbGVBUElNZXNzYWdlU291cmNlOgorICAgICAgICByZXR1cm4gV2ViQ29u c29sZU1lc3NhZ2VDb25zb2xlQVBJTWVzc2FnZU1lc3NhZ2VTb3VyY2U7CiAgICAgY2FzZSBPdGhl ck1lc3NhZ2VTb3VyY2U6CiAgICAgICAgIHJldHVybiBXZWJDb25zb2xlTWVzc2FnZU90aGVyTWVz c2FnZVNvdXJjZTsKICAgICB9CkBAIC0zNzEsOCArMzczLDEwIEBAIGlubGluZSBzdGF0aWMgTlNT dHJpbmcgKnN0cmluZ0Zvck1lc3NhZ2VUeXBlKE1lc3NhZ2VUeXBlIHR5cGUpCiAgICAgc3dpdGNo ICh0eXBlKSB7CiAgICAgY2FzZSBMb2dNZXNzYWdlVHlwZToKICAgICAgICAgcmV0dXJuIFdlYkNv bnNvbGVNZXNzYWdlTG9nTWVzc2FnZVR5cGU7Ci0gICAgY2FzZSBPYmplY3RNZXNzYWdlVHlwZToK LSAgICAgICAgcmV0dXJuIFdlYkNvbnNvbGVNZXNzYWdlT2JqZWN0TWVzc2FnZVR5cGU7CisgICAg Y2FzZSBEaXJNZXNzYWdlVHlwZToKKyAgICAgICAgcmV0dXJuIFdlYkNvbnNvbGVNZXNzYWdlRGly TWVzc2FnZVR5cGU7CisgICAgY2FzZSBEaXJYTUxNZXNzYWdlVHlwZToKKyAgICAgICAgcmV0dXJu IFdlYkNvbnNvbGVNZXNzYWdlRGlyWE1MTWVzc2FnZVR5cGU7CiAgICAgY2FzZSBUcmFjZU1lc3Nh Z2VUeXBlOgogICAgICAgICByZXR1cm4gV2ViQ29uc29sZU1lc3NhZ2VUcmFjZU1lc3NhZ2VUeXBl OwogICAgIGNhc2UgU3RhcnRHcm91cE1lc3NhZ2VUeXBlOgpAQCAtMzgzLDEwICszODcsNiBAQCBp bmxpbmUgc3RhdGljIE5TU3RyaW5nICpzdHJpbmdGb3JNZXNzYWdlVHlwZShNZXNzYWdlVHlwZSB0 eXBlKQogICAgICAgICByZXR1cm4gV2ViQ29uc29sZU1lc3NhZ2VFbmRHcm91cE1lc3NhZ2VUeXBl OwogICAgIGNhc2UgQXNzZXJ0TWVzc2FnZVR5cGU6CiAgICAgICAgIHJldHVybiBXZWJDb25zb2xl TWVzc2FnZUFzc2VydE1lc3NhZ2VUeXBlOwotICAgIGNhc2UgVW5jYXVnaHRFeGNlcHRpb25NZXNz YWdlVHlwZToKLSAgICAgICAgcmV0dXJuIFdlYkNvbnNvbGVNZXNzYWdlVW5jYXVnaHRFeGNlcHRp b25NZXNzYWdlVHlwZTsKLSAgICBjYXNlIE5ldHdvcmtFcnJvck1lc3NhZ2VUeXBlOgotICAgICAg ICByZXR1cm4gV2ViQ29uc29sZU1lc3NhZ2VOZXR3b3JrRXJyb3JNZXNzYWdlVHlwZTsKICAgICB9 CiAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgcmV0dXJuIEAiIjsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVUlEZWxlZ2F0ZVByaXZhdGUuaCBiL1NvdXJj ZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVUlEZWxlZ2F0ZVByaXZhdGUuaAppbmRleCAzNzA0MWQ0 MDkwZWRhNmM4NjEzZjQ1ZWZmYjRlMjY4NWYwMjRlNjFmLi45Yzk4ZmRmY2M5MDgzYjlkNWE1ODQ3 YzcxMzE1Y2NhMTNlOWY5OWMzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3 L1dlYlVJRGVsZWdhdGVQcml2YXRlLmgKKysrIGIvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9X ZWJVSURlbGVnYXRlUHJpdmF0ZS5oCkBAIC05NiwxOSArOTYsMTkgQEAgZW51bSB7CiBleHRlcm4g TlNTdHJpbmcgKldlYkNvbnNvbGVNZXNzYWdlSFRNTE1lc3NhZ2VTb3VyY2U7CiBleHRlcm4gTlNT dHJpbmcgKldlYkNvbnNvbGVNZXNzYWdlWE1MTWVzc2FnZVNvdXJjZTsKIGV4dGVybiBOU1N0cmlu ZyAqV2ViQ29uc29sZU1lc3NhZ2VKU01lc3NhZ2VTb3VyY2U7Ci1leHRlcm4gTlNTdHJpbmcgKldl YkNvbnNvbGVNZXNzYWdlQ1NTTWVzc2FnZVNvdXJjZTsKK2V4dGVybiBOU1N0cmluZyAqV2ViQ29u c29sZU1lc3NhZ2VOZXR3b3JrTWVzc2FnZVNvdXJjZTsKK2V4dGVybiBOU1N0cmluZyAqV2ViQ29u c29sZU1lc3NhZ2VDb25zb2xlQVBJTWVzc2FnZVNvdXJjZTsKIGV4dGVybiBOU1N0cmluZyAqV2Vi Q29uc29sZU1lc3NhZ2VPdGhlck1lc3NhZ2VTb3VyY2U7CiAKIC8vIE1lc3NhZ2UgVHlwZXMuCiBl eHRlcm4gTlNTdHJpbmcgKldlYkNvbnNvbGVNZXNzYWdlTG9nTWVzc2FnZVR5cGU7Ci1leHRlcm4g TlNTdHJpbmcgKldlYkNvbnNvbGVNZXNzYWdlT2JqZWN0TWVzc2FnZVR5cGU7CitleHRlcm4gTlNT dHJpbmcgKldlYkNvbnNvbGVNZXNzYWdlRGlyTWVzc2FnZVR5cGU7CitleHRlcm4gTlNTdHJpbmcg KldlYkNvbnNvbGVNZXNzYWdlRGlyWE1MTWVzc2FnZVR5cGU7CiBleHRlcm4gTlNTdHJpbmcgKldl YkNvbnNvbGVNZXNzYWdlVHJhY2VNZXNzYWdlVHlwZTsKIGV4dGVybiBOU1N0cmluZyAqV2ViQ29u c29sZU1lc3NhZ2VTdGFydEdyb3VwTWVzc2FnZVR5cGU7CiBleHRlcm4gTlNTdHJpbmcgKldlYkNv bnNvbGVNZXNzYWdlU3RhcnRHcm91cENvbGxhcHNlZE1lc3NhZ2VUeXBlOwogZXh0ZXJuIE5TU3Ry aW5nICpXZWJDb25zb2xlTWVzc2FnZUVuZEdyb3VwTWVzc2FnZVR5cGU7CiBleHRlcm4gTlNTdHJp bmcgKldlYkNvbnNvbGVNZXNzYWdlQXNzZXJ0TWVzc2FnZVR5cGU7Ci1leHRlcm4gTlNTdHJpbmcg KldlYkNvbnNvbGVNZXNzYWdlVW5jYXVnaHRFeGNlcHRpb25NZXNzYWdlVHlwZTsKLWV4dGVybiBO U1N0cmluZyAqV2ViQ29uc29sZU1lc3NhZ2VOZXR3b3JrRXJyb3JNZXNzYWdlVHlwZTsKIAogLy8g TWVzc2FnZSBMZXZlbHMuCiBleHRlcm4gTlNTdHJpbmcgKldlYkNvbnNvbGVNZXNzYWdlVGlwTWVz c2FnZUxldmVsOwo= 107858 2011-09-19 08:28:25 -0700 2011-09-19 10:39:27 -0700 [Path] Mac bot fixed. bug-68342-20110919192822.patch text/plain 35914 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogOTU0MDQKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA3NjhjNDRhNDE2Nzc4YTFiNGMyNGE3 MzkwNTQwNjgzNDg1YWNiYmE5Li5kMDA1NTZjMWRkNzQ2ZWRlOWJiZDhiYmI5MjljNzY4MTI4OTAw NGM5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDktMTkgIFBhdmVsIEZlbGRtYW4gIDxw ZmVsZG1hbkBnb29nbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IHN0cmVhbWxpbmUg Q29uc29sZSdzIE1lc3NhZ2VUeXBlIGFuZCBNZXNzYWdlU291cmNlIHNlbWFudGljcy4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY4MzQyCisKKyAgICAg ICAgVGhpcyBjaGFuZ2UgZml4ZXMgc2VtYW50aWNzIG9mIHRoZSBNZXNzYWdlU291cmNlIGFuZCBN ZXNzYWdlVHlwZToKKyAgICAgICAgTWVzc2FnZVNvdXJjZSBpcyBub3cgdGhlIHNvdXJjZSBvZiB0 aGUgbWVzc2FnZSAoYmUgaXQgTmV0d29yaywgSFRNTAorICAgICAgICBwYXJzZXIgb3IgQ29uc29s ZSBBUEkpLiBNZXNzYWdlVHlwZSBpcyBvbmx5IGRlZmluZWQgZm9yIHRoZSBDb25zb2xlIEFQSQor ICAgICAgICBtZXNzYWdlcyBhbmQgY29udGFpbnMgdGhlIG5hbWUgb2YgdGhlIEFQSSBjYWxsIChs b2csIGRpciwgZGlyeG1sLCBldGMuKS4KKyAgICAgICAgU3Vic2VxdWVudCBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjYzNzEgd2lsbCBtYWtlIE1lc3NhZ2VUeXBlCisg ICAgICAgIHByaXZhdGUgdG8gdGhlIGluc3BlY3Rvci4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9wcm90b2NvbC9jb25zb2xlLWFn ZW50LWV4cGVjdGVkLnR4dDoKKwogMjAxMS0wOS0xOCAgSWx5YSBUaWtob25vdnNreSAgPGxvaXNs b0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogcmVxdWVzdEFuaW1hdGlv bkZyYW1lIGNhbGxiYWNrcyBkb24ndCBzaG93IHVwIGluIHRoZSB0aW1lbGluZSBwYW5lbC4KZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9wcm90b2NvbC9jb25zb2xlLWFnZW50LWV4 cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9wcm90b2NvbC9jb25zb2xlLWFnZW50 LWV4cGVjdGVkLnR4dAppbmRleCBlMDNjY2UyYmVmYjQwYjYwOTBiMzY0ZGYyZDgzMTBlZTAxNWFk NDYwLi44ZTA4Y2MwMmIyMDRhY2VhMDIyOTUxOWEyMDdhY2MyYjljYTg3ZThkIDEwMDY0NAotLS0g YS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvcHJvdG9jb2wvY29uc29sZS1hZ2VudC1leHBlY3RlZC50 eHQKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3Byb3RvY29sL2NvbnNvbGUtYWdlbnQtZXhw ZWN0ZWQudHh0CkBAIC01Myw4ICs1Myw4IEBAIGV2ZW50IENvbnNvbGVBZ2VudC5tZXNzYWdlQWRk ZWQKIHsKICAgICBtZXRob2QgOiAiQ29uc29sZS5tZXNzYWdlQWRkZWQiCiAgICAgcGFyYW1zIDog ewotICAgICAgICBtZXNzYWdlT2JqIDogewotICAgICAgICAgICAgc291cmNlIDogImphdmFzY3Jp cHQiCisgICAgICAgIG1lc3NhZ2UgOiB7CisgICAgICAgICAgICBzb3VyY2UgOiAiY29uc29sZS1h cGkiCiAgICAgICAgICAgICB0eXBlIDogImxvZyIKICAgICAgICAgICAgIGxldmVsIDogImxvZyIK ICAgICAgICAgICAgIGxpbmUgOiAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VM b2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDBiYmY2MDYwMGQxMmUxNTY5MGRh MWY2YzY4MmI2NDljODZlMzkyMy4uMmJlNzYzMzkyMTcxYzAzMDE5NGM2MmE1ODE2ZGViMDgwYzJl NjU4ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X ZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQzIEBACisyMDExLTA5LTE5ICBQYXZlbCBGZWxk bWFuICA8cGZlbGRtYW5AZ29vZ2xlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBzdHJl YW1saW5lIENvbnNvbGUncyBNZXNzYWdlVHlwZSBhbmQgTWVzc2FnZVNvdXJjZSBzZW1hbnRpY3Mu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02ODM0Mgor CisgICAgICAgIFRoaXMgY2hhbmdlIGZpeGVzIHNlbWFudGljcyBvZiB0aGUgTWVzc2FnZVNvdXJj ZSBhbmQgTWVzc2FnZVR5cGU6CisgICAgICAgIE1lc3NhZ2VTb3VyY2UgaXMgbm93IHRoZSBzb3Vy Y2Ugb2YgdGhlIG1lc3NhZ2UgKGJlIGl0IE5ldHdvcmssIEhUTUwKKyAgICAgICAgcGFyc2VyIG9y IENvbnNvbGUgQVBJKS4gTWVzc2FnZVR5cGUgaXMgb25seSBkZWZpbmVkIGZvciB0aGUgQ29uc29s ZSBBUEkKKyAgICAgICAgbWVzc2FnZXMgYW5kIGNvbnRhaW5zIHRoZSBuYW1lIG9mIHRoZSBBUEkg Y2FsbCAobG9nLCBkaXIsIGRpcnhtbCwgZXRjLikuCisgICAgICAgIFN1YnNlcXVlbnQgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY2MzcxIHdpbGwgbWFrZSBNZXNzYWdl VHlwZQorICAgICAgICBwcml2YXRlIHRvIHRoZSBpbnNwZWN0b3IuCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBkb20vRG9jdW1lbnQuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OmxvZ0V4Y2VwdGlvblRvQ29uc29sZSk6CisgICAgICAg ICogaW5zcGVjdG9yL0NvbnNvbGVNZXNzYWdlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Om1lc3Nh Z2VTb3VyY2VWYWx1ZSk6CisgICAgICAgIChXZWJDb3JlOjptZXNzYWdlVHlwZVZhbHVlKToKKyAg ICAgICAgKFdlYkNvcmU6OkNvbnNvbGVNZXNzYWdlOjphZGRUb0Zyb250ZW5kKToKKyAgICAgICAg KiBpbnNwZWN0b3IvSW5zcGVjdG9yLmpzb246CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3Rv ckNvbnNvbGVBZ2VudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDb25zb2xlQWdl bnQ6OmRpZFJlY2VpdmVSZXNwb25zZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDb25z b2xlQWdlbnQ6OmRpZEZhaWxMb2FkaW5nKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5k L0NvbnNvbGVNZXNzYWdlLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdl LmNyZWF0ZVRleHRNZXNzYWdlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2Fn ZS5wcm90b3R5cGUuX2Zvcm1hdE1lc3NhZ2UpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnNv bGVNZXNzYWdlLnByb3RvdHlwZS50b1N0cmluZyk6CisgICAgICAgICogcGFnZS9Db25zb2xlLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OnByaW50TWVzc2FnZVNvdXJjZUFuZExldmVsUHJlZml4KToK KyAgICAgICAgKFdlYkNvcmU6OkNvbnNvbGU6OmFkZE1lc3NhZ2UpOgorICAgICAgICAoV2ViQ29y ZTo6Q29uc29sZTo6ZGlyKToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnNvbGU6OmRpcnhtbCk6Cisg ICAgICAgIChXZWJDb3JlOjpDb25zb2xlOjpncm91cCk6CisgICAgICAgIChXZWJDb3JlOjpDb25z b2xlOjpncm91cENvbGxhcHNlZCk6CisgICAgICAgIChXZWJDb3JlOjpDb25zb2xlOjpncm91cEVu ZCk6CisgICAgICAgICogcGFnZS9Db25zb2xlVHlwZXMuaDoKKyAgICAgICAgKiB3ZWJzb2NrZXRz L1dlYlNvY2tldENoYW5uZWwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6V2ViU29ja2V0Q2hhbm5l bDo6ZGlkRmFpbFNvY2tldFN0cmVhbSk6CisKIDIwMTEtMDktMTggIElseWEgVGlraG9ub3Zza3kg IDxsb2lzbG9AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IHJlcXVlc3RB bmltYXRpb25GcmFtZSBjYWxsYmFja3MgZG9uJ3Qgc2hvdyB1cCBpbiB0aGUgdGltZWxpbmUgcGFu ZWwuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwIGIvU291cmNl L1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAppbmRleCAxOTQzZmFlNzgyZjQzY2MxNzI4YzM3MzZi NWEyNGViOTNjNzFjM2MyLi41Mjc2OTIwZTk2Y2Y1NDY3OWI5MWRmNjRlZWQyZTlmZDNlOGYwMTM0 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKQEAgLTIzNTcsOCArMjM1Nyw3IEBAIEV2ZW50VGFy Z2V0KiBEb2N1bWVudDo6ZXJyb3JFdmVudFRhcmdldCgpCiAKIHZvaWQgRG9jdW1lbnQ6OmxvZ0V4 Y2VwdGlvblRvQ29uc29sZShjb25zdCBTdHJpbmcmIGVycm9yTWVzc2FnZSwgaW50IGxpbmVOdW1i ZXIsIGNvbnN0IFN0cmluZyYgc291cmNlVVJMLCBQYXNzUmVmUHRyPFNjcmlwdENhbGxTdGFjaz4g Y2FsbFN0YWNrKQogewotICAgIE1lc3NhZ2VUeXBlIG1lc3NhZ2VUeXBlID0gY2FsbFN0YWNrID8g VW5jYXVnaHRFeGNlcHRpb25NZXNzYWdlVHlwZSA6IExvZ01lc3NhZ2VUeXBlOwotICAgIGFkZE1l c3NhZ2UoSlNNZXNzYWdlU291cmNlLCBtZXNzYWdlVHlwZSwgRXJyb3JNZXNzYWdlTGV2ZWwsIGVy cm9yTWVzc2FnZSwgbGluZU51bWJlciwgc291cmNlVVJMLCBjYWxsU3RhY2spOworICAgIGFkZE1l c3NhZ2UoSlNNZXNzYWdlU291cmNlLCBMb2dNZXNzYWdlVHlwZSwgRXJyb3JNZXNzYWdlTGV2ZWws IGVycm9yTWVzc2FnZSwgbGluZU51bWJlciwgc291cmNlVVJMLCBjYWxsU3RhY2spOwogfQogCiB2 b2lkIERvY3VtZW50OjpzZXRVUkwoY29uc3QgS1VSTCYgdXJsKQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0NvbnNvbGVNZXNzYWdlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9Db25zb2xlTWVzc2FnZS5jcHAKaW5kZXggMGJjNGJhMTdlNGRhMGM1ZDQyMmRjZjkx NjQ0MDM5NWEwYTgzNWUzNC4uNDg2MjYxOThmYjY3NzM0YTdjNTJiMzQ3MmM3ZTRkY2M1NDFkNzc3 ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0NvbnNvbGVNZXNzYWdlLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvQ29uc29sZU1lc3NhZ2UuY3BwCkBAIC05 MSw3ICs5MSw4IEBAIHN0YXRpYyBTdHJpbmcgbWVzc2FnZVNvdXJjZVZhbHVlKE1lc3NhZ2VTb3Vy Y2Ugc291cmNlKQogICAgIGNhc2UgSFRNTE1lc3NhZ2VTb3VyY2U6IHJldHVybiAiaHRtbCI7CiAg ICAgY2FzZSBYTUxNZXNzYWdlU291cmNlOiByZXR1cm4gInhtbCI7CiAgICAgY2FzZSBKU01lc3Nh Z2VTb3VyY2U6IHJldHVybiAiamF2YXNjcmlwdCI7Ci0gICAgY2FzZSBDU1NNZXNzYWdlU291cmNl OiByZXR1cm4gImNzcyI7CisgICAgY2FzZSBOZXR3b3JrTWVzc2FnZVNvdXJjZTogcmV0dXJuICJu ZXR3b3JrIjsKKyAgICBjYXNlIENvbnNvbGVBUElNZXNzYWdlU291cmNlOiByZXR1cm4gImNvbnNv bGUtYXBpIjsKICAgICBjYXNlIE90aGVyTWVzc2FnZVNvdXJjZTogcmV0dXJuICJvdGhlciI7CiAg ICAgfQogICAgIHJldHVybiAib3RoZXIiOwpAQCAtMTAxLDE0ICsxMDIsMTMgQEAgc3RhdGljIFN0 cmluZyBtZXNzYWdlVHlwZVZhbHVlKE1lc3NhZ2VUeXBlIHR5cGUpCiB7CiAgICAgc3dpdGNoICh0 eXBlKSB7CiAgICAgY2FzZSBMb2dNZXNzYWdlVHlwZTogcmV0dXJuICJsb2ciOwotICAgIGNhc2Ug T2JqZWN0TWVzc2FnZVR5cGU6IHJldHVybiAib3RoZXIiOworICAgIGNhc2UgRGlyTWVzc2FnZVR5 cGU6IHJldHVybiAiZGlyIjsKKyAgICBjYXNlIERpclhNTE1lc3NhZ2VUeXBlOiByZXR1cm4gImRp clhNTCI7CiAgICAgY2FzZSBUcmFjZU1lc3NhZ2VUeXBlOiByZXR1cm4gInRyYWNlIjsKICAgICBj YXNlIFN0YXJ0R3JvdXBNZXNzYWdlVHlwZTogcmV0dXJuICJzdGFydEdyb3VwIjsKICAgICBjYXNl IFN0YXJ0R3JvdXBDb2xsYXBzZWRNZXNzYWdlVHlwZTogcmV0dXJuICJzdGFydEdyb3VwQ29sbGFw c2VkIjsKICAgICBjYXNlIEVuZEdyb3VwTWVzc2FnZVR5cGU6IHJldHVybiAiZW5kR3JvdXAiOwog ICAgIGNhc2UgQXNzZXJ0TWVzc2FnZVR5cGU6IHJldHVybiAiYXNzZXJ0IjsKLSAgICBjYXNlIFVu Y2F1Z2h0RXhjZXB0aW9uTWVzc2FnZVR5cGU6IHJldHVybiAidW5jYXVnaHRFeGNlcHRpb24iOwot ICAgIGNhc2UgTmV0d29ya0Vycm9yTWVzc2FnZVR5cGU6IHJldHVybiAibmV0d29ya0Vycm9yIjsK ICAgICB9CiAgICAgcmV0dXJuICJvdGhlciI7CiB9CkBAIC0xMzUsNyArMTM1LDcgQEAgdm9pZCBD b25zb2xlTWVzc2FnZTo6YWRkVG9Gcm9udGVuZChJbnNwZWN0b3JGcm9udGVuZDo6Q29uc29sZSog ZnJvbnRlbmQsIEluamVjdGUKICAgICBqc29uT2JqLT5zZXRTdHJpbmcoInVybCIsIG1fdXJsKTsK ICAgICBqc29uT2JqLT5zZXROdW1iZXIoInJlcGVhdENvdW50Iiwgc3RhdGljX2Nhc3Q8aW50Piht X3JlcGVhdENvdW50KSk7CiAgICAganNvbk9iai0+c2V0U3RyaW5nKCJ0ZXh0IiwgbV9tZXNzYWdl KTsKLSAgICBpZiAobV90eXBlID09IE5ldHdvcmtFcnJvck1lc3NhZ2VUeXBlKSAKKyAgICBpZiAo bV9zb3VyY2UgPT0gTmV0d29ya01lc3NhZ2VTb3VyY2UgJiYgIW1fcmVxdWVzdElkLmlzRW1wdHko KSkKICAgICAgICAganNvbk9iai0+c2V0U3RyaW5nKCJuZXR3b3JrUmVxdWVzdElkIiwgbV9yZXF1 ZXN0SWQpOwogICAgIGlmIChtX2FyZ3VtZW50cyAmJiBtX2FyZ3VtZW50cy0+YXJndW1lbnRDb3Vu dCgpKSB7CiAgICAgICAgIEluamVjdGVkU2NyaXB0IGluamVjdGVkU2NyaXB0ID0gaW5qZWN0ZWRT Y3JpcHRNYW5hZ2VyLT5pbmplY3RlZFNjcmlwdEZvcihtX2FyZ3VtZW50cy0+Z2xvYmFsU3RhdGUo KSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24g Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24KaW5kZXggYTkzNzc1MTQ5 NWEyNDE2MjEzMDM3YmZkMzA5YTUxYjZmODA3M2FmYy4uNTAyOGQ0YmE2YThmODJjNGQxOWExOWMw MjllMWYzOTY5YWYwNmRjOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3Rvci5qc29uCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNv bgpAQCAtMzMyLDIyICszMzIsMjIgQEAKICAgICB9LAogICAgIHsKICAgICAgICAgImRvbWFpbiI6 ICJDb25zb2xlIiwKLSAgICAgICAgImRlc2NyaXB0aW9uIjogIkNvbnNvbGUgZG9tYWluIGRlZmlu ZXMgbWV0aG9kcyBhbmQgZXZlbnRzIGZvciBpbnRlcmFjdGlvbiB3aXRoIHRoZSBKYXZhU2NyaXB0 IGNvbnNvbGUuIENvbnNvbGUgY29sbGVjdHMgbWVzc2FnZXMgY3JlYXRlZCBieSBtZWFucyBvZiB0 aGUgPGEgaHJlZj0naHR0cDovL2dldGZpcmVidWcuY29tL3dpa2kvaW5kZXgucGhwL0NvbnNvbGVf QVBJJz5KYXZhU2NyaXB0IENvbnNvbGUgQVBJPC9hPi4gT25lIG5lZWRzIHRvIGVuYWJsZSB0aGlz IGRvbWFpbiB1c2luZyA8Y29kZT5lbmFibGU8L2NvZGU+IGZ1bmN0aW9uIGluIG9yZGVyIHRvIHN0 YXJ0IHJlY2VpdmluZyB0aGUgY29uc29sZSBtZXNzYWdlcy4gQnJvd3NlciB3aWxsIGNvbGxlY3Qg bWVzc2FnZXMgaXNzdWVkIHdoaWxlIGNvbnNvbGUgZG9tYWluIGlzIG5vdCBlbmFibGVkIGFuZCB3 aWxsIHJlcG9ydCB0aGVtIHVzaW5nIDxjb2RlPm1lc3NhZ2VBZGRlZDwvY29kZT4gbm90aWZpY2F0 aW9uIHVwb24gZW5hYmxpbmcuIiwKKyAgICAgICAgImRlc2NyaXB0aW9uIjogIkNvbnNvbGUgZG9t YWluIGRlZmluZXMgbWV0aG9kcyBhbmQgZXZlbnRzIGZvciBpbnRlcmFjdGlvbiB3aXRoIHRoZSBK YXZhU2NyaXB0IGNvbnNvbGUuIENvbnNvbGUgY29sbGVjdHMgbWVzc2FnZXMgY3JlYXRlZCBieSBt ZWFucyBvZiB0aGUgPGEgaHJlZj0naHR0cDovL2dldGZpcmVidWcuY29tL3dpa2kvaW5kZXgucGhw L0NvbnNvbGVfQVBJJz5KYXZhU2NyaXB0IENvbnNvbGUgQVBJPC9hPi4gT25lIG5lZWRzIHRvIGVu YWJsZSB0aGlzIGRvbWFpbiB1c2luZyA8Y29kZT5lbmFibGU8L2NvZGU+IGNvbW1hbmQgaW4gb3Jk ZXIgdG8gc3RhcnQgcmVjZWl2aW5nIHRoZSBjb25zb2xlIG1lc3NhZ2VzLiBCcm93c2VyIGNvbGxl Y3RzIG1lc3NhZ2VzIGlzc3VlZCB3aGlsZSBjb25zb2xlIGRvbWFpbiBpcyBub3QgZW5hYmxlZCBh cyB3ZWxsIGFuZCByZXBvcnRzIHRoZW0gdXNpbmcgPGNvZGU+bWVzc2FnZUFkZGVkPC9jb2RlPiBu b3RpZmljYXRpb24gdXBvbiBlbmFibGluZy4iLAogICAgICAgICAidHlwZXMiOiBbCiAgICAgICAg ICAgICB7CiAgICAgICAgICAgICAgICAgImlkIjogIkNvbnNvbGVNZXNzYWdlIiwKICAgICAgICAg ICAgICAgICAidHlwZSI6ICJvYmplY3QiLAogICAgICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6 ICJDb25zb2xlIG1lc3NhZ2UuIiwKICAgICAgICAgICAgICAgICAicHJvcGVydGllcyI6IFsKLSAg ICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJzb3VyY2UiLCAidHlwZSI6ICJzdHJpbmciLCAi ZW51bSI6IFsiaHRtbCIsICJ3bWwiLCAieG1sIiwgImphdmFzY3JpcHQiLCAiY3NzIiwgIm90aGVy Il0sICJkZXNjcmlwdGlvbiI6ICJNZXNzYWdlIHNvdXJjZS4iIH0sCi0gICAgICAgICAgICAgICAg ICAgIHsgIm5hbWUiOiAidHlwZSIsICJ0eXBlIjogInN0cmluZyIsICJlbnVtIjogWyJsb2ciLCAi b3RoZXIiLCAidHJhY2UiLCAic3RhcnRHcm91cCIsICJzdGFydEdyb3VwQ29sbGFwc2VkIiwgImVu ZEdyb3VwIiwgImFzc2VydCIsICJ1bmNhdWdodEV4Y2VwdGlvbiIsICJuZXR3b3JrRXJyb3IiLCAi cmVzdWx0Il0sICJkZXNjcmlwdGlvbiI6ICJNZXNzYWdlIHR5cGUuIiB9LAorICAgICAgICAgICAg ICAgICAgICB7ICJuYW1lIjogInNvdXJjZSIsICJ0eXBlIjogInN0cmluZyIsICJlbnVtIjogWyJo dG1sIiwgIndtbCIsICJ4bWwiLCAiamF2YXNjcmlwdCIsICJuZXR3b3JrIiwgImNvbnNvbGUtYXBp IiwgIm90aGVyIl0sICJkZXNjcmlwdGlvbiI6ICJNZXNzYWdlIHNvdXJjZS4iIH0sCisgICAgICAg ICAgICAgICAgICAgIHsgIm5hbWUiOiAidHlwZSIsICJ0eXBlIjogInN0cmluZyIsICJlbnVtIjog WyJsb2ciLCAiZGlyIiwgImRpcnhtbCIsICJ0cmFjZSIsICJzdGFydEdyb3VwIiwgInN0YXJ0R3Jv dXBDb2xsYXBzZWQiLCAiZW5kR3JvdXAiLCAiYXNzZXJ0Il0sICJkZXNjcmlwdGlvbiI6ICJDb25z b2xlIG1lc3NhZ2UgdHlwZS4iIH0sCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAibGV2 ZWwiLCAidHlwZSI6ICJzdHJpbmciLCAiZW51bSI6IFsidGlwIiwgImxvZyIsICJ3YXJuaW5nIiwg ImVycm9yIiwgImRlYnVnIl0sICJkZXNjcmlwdGlvbiI6ICJNZXNzYWdlIHNldmVyaXR5LiIgfSwK LSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJsaW5lIiwgInR5cGUiOiAiaW50ZWdlciIs ICJkZXNjcmlwdGlvbiI6ICJMaW5lIG51bWJlciBpbiB0aGUgbWVzc2FnZSBvcmlnaW4gcmVzb3Vy Y2UuIiB9LAorICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImxpbmUiLCAidHlwZSI6ICJp bnRlZ2VyIiwgImRlc2NyaXB0aW9uIjogIkxpbmUgbnVtYmVyIGluIHRoZSByZXNvdXJjZSB0aGF0 IGdlbmVyYXRlZCB0aGlzIG1lc3NhZ2UuIiB9LAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1l IjogInVybCIsICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJVUkwgb2YgdGhlIG1l c3NhZ2Ugb3JpZ2luLiIgfSwKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJyZXBlYXRD b3VudCIsICJ0eXBlIjogImludGVnZXIiLCAiZGVzY3JpcHRpb24iOiAiUmVwZWF0IGNvdW50IGZv ciByZXBlYXRlZCBtZXNzYWdlcy4iIH0sCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAi dGV4dCIsICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJNZXNzYWdlIHRleHQuIiB9 LAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogIm5ldHdvcmtSZXF1ZXN0SWQiLCAiJHJl ZiI6ICJOZXR3b3JrLlJlcXVlc3RJZCIsICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6 ICJJZGVudGlmaWVyIG9mIHRoZSBuZXR3b3JrIHJlcXVlc3QgYXNzb2NpYXRlZCB3aXRoIHRoaXMg bWVzc2FnZS4iIH0sCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAicGFyYW1ldGVycyIs ICJ0eXBlIjogImFycmF5IiwgIml0ZW1zIjogeyAiJHJlZiI6ICJSdW50aW1lLlJlbW90ZU9iamVj dCIgfSwgImRlc2NyaXB0aW9uIjogIk1lc3NhZ2UgcGFyYW1ldGVycyBpbiBjYXNlIG9mIHRoZSBm b3JtYXR0ZWQgbWVzc2FnZS4iIH0sCisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAicGFy YW1ldGVycyIsICJ0eXBlIjogImFycmF5IiwgIml0ZW1zIjogeyAiJHJlZiI6ICJSdW50aW1lLlJl bW90ZU9iamVjdCIgfSwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIk1lc3NhZ2Ug cGFyYW1ldGVycyBpbiBjYXNlIG9mIHRoZSBmb3JtYXR0ZWQgbWVzc2FnZS4iIH0sCiAgICAgICAg ICAgICAgICAgICAgIHsgIm5hbWUiOiAic3RhY2tUcmFjZSIsICIkcmVmIjogIlN0YWNrVHJhY2Ui LCAiZGVzY3JpcHRpb24iOiAiSmF2YVNjcmlwdCBzdGFjayB0cmFjZSBmb3IgYXNzZXJ0aW9ucyBh bmQgZXJyb3IgbWVzc2FnZXMuIiB9CiAgICAgICAgICAgICAgICAgXQogICAgICAgICAgICAgfSwK QEAgLTM3MywxMyArMzczLDEzIEBACiAgICAgICAgICAgICB7CiAgICAgICAgICAgICAgICAgIm5h bWUiOiAiZW5hYmxlIiwKICAgICAgICAgICAgICAgICAicmV0dXJucyI6IFsKLSAgICAgICAgICAg ICAgICAgICAgeyAibmFtZSI6ICJleHBpcmVkTWVzc2FnZXNDb3VudCIsICJ0eXBlIjogImludGVn ZXIiLCAiZGVzY3JpcHRpb24iOiAiTnVtYmVyIG9mIG1lc3NhZ2VzIGNvbGxlY3RlZCBkdWUgdG8g bWVzc2FnZSB0aHJlYXNob2xkIG92ZXJmbG93LiIgfQorICAgICAgICAgICAgICAgICAgICB7ICJu YW1lIjogImV4cGlyZWRNZXNzYWdlc0NvdW50IiwgInR5cGUiOiAiaW50ZWdlciIsICJkZXNjcmlw dGlvbiI6ICJOdW1iZXIgb2YgbWVzc2FnZXMgZHJvcHBlZCBkdWUgdG8gbWVzc2FnZSB0aHJlYXNo b2xkIG92ZXJmbG93LiIgfQogICAgICAgICAgICAgICAgIF0sCiAgICAgICAgICAgICAgICAgImRl c2NyaXB0aW9uIjogIkVuYWJsZXMgY29uc29sZSBkb21haW4sIHNlbmRzIHRoZSBtZXNzYWdlcyBj b2xsZWN0ZWQgc28gZmFyIHRvIHRoZSBjbGllbnQgYnkgbWVhbnMgb2YgdGhlIDxjb2RlPm1lc3Nh Z2VBZGRlZDwvY29kZT4gbm90aWZpY2F0aW9uLiIgCiAgICAgICAgICAgICB9LAogICAgICAgICAg ICAgewogICAgICAgICAgICAgICAgICJuYW1lIjogImRpc2FibGUiLAotICAgICAgICAgICAgICAg ICJkZXNjcmlwdGlvbiI6ICJEaXNhYmxlcyBjb25zb2xlIGRvbWFpbiwgcHJldmVudHMgZnVydGhl ciBjb25zb2xlIG1lc3NhZ2VzIGZyb20gYmVpbmcgc2VudCB0byB0aGUgY2xpZW50LiIgCisgICAg ICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIkRpc2FibGVzIGNvbnNvbGUgZG9tYWluLCBwcmV2 ZW50cyBmdXJ0aGVyIGNvbnNvbGUgbWVzc2FnZXMgZnJvbSBiZWluZyByZXBvcnRlZCB0byB0aGUg Y2xpZW50LiIgCiAgICAgICAgICAgICB9LAogICAgICAgICAgICAgewogICAgICAgICAgICAgICAg ICJuYW1lIjogImNsZWFyTWVzc2FnZXMiLApAQCAtNDA2LDcgKzQwNiw3IEBACiAgICAgICAgICAg ICB7CiAgICAgICAgICAgICAgICAgIm5hbWUiOiAibWVzc2FnZUFkZGVkIiwKICAgICAgICAgICAg ICAgICAicGFyYW1ldGVycyI6IFsKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJtZXNz YWdlT2JqIiwgIiRyZWYiOiAiQ29uc29sZU1lc3NhZ2UiLCAiZGVzY3JpcHRpb24iOiAiQ29uc29s ZSBtZXNzYWdlIHRoYXQgaGFzIGJlZW4gYWRkZWQuIiB9CisgICAgICAgICAgICAgICAgICAgIHsg Im5hbWUiOiAibWVzc2FnZSIsICIkcmVmIjogIkNvbnNvbGVNZXNzYWdlIiwgImRlc2NyaXB0aW9u IjogIkNvbnNvbGUgbWVzc2FnZSB0aGF0IGhhcyBiZWVuIGFkZGVkLiIgfQogICAgICAgICAgICAg ICAgIF0sCiAgICAgICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIklzc3VlZCB3aGVuIG5ldyBj b25zb2xlIG1lc3NhZ2UgaXMgYWRkZWQuIgogICAgICAgICAgICAgfSwKQEAgLTQxNSwxMSArNDE1 LDExIEBACiAgICAgICAgICAgICAgICAgInBhcmFtZXRlcnMiOiBbCiAgICAgICAgICAgICAgICAg ICAgIHsgIm5hbWUiOiAiY291bnQiLCAidHlwZSI6ICJpbnRlZ2VyIiwgImRlc2NyaXB0aW9uIjog Ik5ldyByZXBlYXQgY291bnQgdmFsdWUuIiB9CiAgICAgICAgICAgICAgICAgXSwKLSAgICAgICAg ICAgICAgICAiZGVzY3JpcHRpb24iOiAiSXNzdWVkIHdoZW4gc3Vic2VxdWVudCBtZXNzYWdlKHMp IGFyZSBlcXVhbCB0byB0aGUgcHJldmlvdXMgb25lLiIKKyAgICAgICAgICAgICAgICAiZGVzY3Jp cHRpb24iOiAiSXNzdWVkIHdoZW4gc3Vic2VxdWVudCBtZXNzYWdlKHMpIGFyZSBlcXVhbCB0byB0 aGUgcHJldmlvdXMgb25lKHMpLiIKICAgICAgICAgICAgIH0sCiAgICAgICAgICAgICB7CiAgICAg ICAgICAgICAgICAgIm5hbWUiOiAibWVzc2FnZXNDbGVhcmVkIiwKLSAgICAgICAgICAgICAgICAi ZGVzY3JpcHRpb24iOiAiSXNzdWVkIHdoZW4gY29uc29sZSBpcyBjbGVhcmVkLiIKKyAgICAgICAg ICAgICAgICAiZGVzY3JpcHRpb24iOiAiSXNzdWVkIHdoZW4gY29uc29sZSBpcyBjbGVhcmVkLiBU aGlzIGhhcHBlbnMgZWl0aGVyIHVwb24gPGNvZGU+Y2xlYXJNZXNzYWdlczwvY29kZT4gY29tbWFu ZCBvciBhZnRlciBwYWdlIG5hdmlnYXRpb24uIgogICAgICAgICAgICAgfQogICAgICAgICBdCiAg ICAgfSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb25z b2xlQWdlbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnNvbGVB Z2VudC5jcHAKaW5kZXggZDZiMzI2ODk1MzViM2QwYWQyODNlNTg1YmQ1ZThmMDA2NDIzZDgzYS4u OTFlNDAyN2Y3YjUzOWE3ZjRkZTcwMWZjYWU1MzQ1YWRjNDhjODMwNiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnNvbGVBZ2VudC5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnNvbGVBZ2VudC5jcHAKQEAgLTIyNyw3 ICsyMjcsNyBAQCB2b2lkIEluc3BlY3RvckNvbnNvbGVBZ2VudDo6ZGlkUmVjZWl2ZVJlc3BvbnNl KHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgY29uc3QgUgogICAgIGlmIChyZXNwb25zZS5odHRw U3RhdHVzQ29kZSgpID49IDQwMCkgewogICAgICAgICBTdHJpbmcgbWVzc2FnZSA9ICJGYWlsZWQg dG8gbG9hZCByZXNvdXJjZTogdGhlIHNlcnZlciByZXNwb25kZWQgd2l0aCBhIHN0YXR1cyBvZiAi ICsgU3RyaW5nOjpudW1iZXIocmVzcG9uc2UuaHR0cFN0YXR1c0NvZGUoKSkgKyAiICgiICsgcmVz cG9uc2UuaHR0cFN0YXR1c1RleHQoKSArICcpJzsKICAgICAgICAgU3RyaW5nIHJlcXVlc3RJZCA9 IElkZW50aWZpZXJzRmFjdG9yeTo6cmVxdWVzdElkKGlkZW50aWZpZXIpOwotICAgICAgICBhZGRD b25zb2xlTWVzc2FnZShhZG9wdFB0cihuZXcgQ29uc29sZU1lc3NhZ2UoT3RoZXJNZXNzYWdlU291 cmNlLCBOZXR3b3JrRXJyb3JNZXNzYWdlVHlwZSwgRXJyb3JNZXNzYWdlTGV2ZWwsIG1lc3NhZ2Us IHJlc3BvbnNlLnVybCgpLnN0cmluZygpLCByZXF1ZXN0SWQpKSk7CisgICAgICAgIGFkZENvbnNv bGVNZXNzYWdlKGFkb3B0UHRyKG5ldyBDb25zb2xlTWVzc2FnZShOZXR3b3JrTWVzc2FnZVNvdXJj ZSwgTG9nTWVzc2FnZVR5cGUsIEVycm9yTWVzc2FnZUxldmVsLCBtZXNzYWdlLCByZXNwb25zZS51 cmwoKS5zdHJpbmcoKSwgcmVxdWVzdElkKSkpOwogICAgIH0KIH0KIApAQCAtMjQxLDcgKzI0MSw3 IEBAIHZvaWQgSW5zcGVjdG9yQ29uc29sZUFnZW50OjpkaWRGYWlsTG9hZGluZyh1bnNpZ25lZCBs b25nIGlkZW50aWZpZXIsIGNvbnN0IFJlc291CiAgICAgaWYgKCFlcnJvci5sb2NhbGl6ZWREZXNj cmlwdGlvbigpLmlzRW1wdHkoKSkKICAgICAgICAgbWVzc2FnZSArPSAiOiAiICsgZXJyb3IubG9j YWxpemVkRGVzY3JpcHRpb24oKTsKICAgICBTdHJpbmcgcmVxdWVzdElkID0gSWRlbnRpZmllcnNG YWN0b3J5OjpyZXF1ZXN0SWQoaWRlbnRpZmllcik7Ci0gICAgYWRkQ29uc29sZU1lc3NhZ2UoYWRv cHRQdHIobmV3IENvbnNvbGVNZXNzYWdlKE90aGVyTWVzc2FnZVNvdXJjZSwgTmV0d29ya0Vycm9y TWVzc2FnZVR5cGUsIEVycm9yTWVzc2FnZUxldmVsLCBtZXNzYWdlLCBlcnJvci5mYWlsaW5nVVJM KCksIHJlcXVlc3RJZCkpKTsKKyAgICBhZGRDb25zb2xlTWVzc2FnZShhZG9wdFB0cihuZXcgQ29u c29sZU1lc3NhZ2UoTmV0d29ya01lc3NhZ2VTb3VyY2UsIExvZ01lc3NhZ2VUeXBlLCBFcnJvck1l c3NhZ2VMZXZlbCwgbWVzc2FnZSwgZXJyb3IuZmFpbGluZ1VSTCgpLCByZXF1ZXN0SWQpKSk7CiB9 CiAKIHZvaWQgSW5zcGVjdG9yQ29uc29sZUFnZW50OjpzZXRNb25pdG9yaW5nWEhSRW5hYmxlZChF cnJvclN0cmluZyosIGJvb2wgZW5hYmxlZCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZU1lc3NhZ2UuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVNZXNzYWdlLmpzCmluZGV4IGExZDRjOGM5NGI1NDUyZWMx YWUyZmMzM2RlNDEzMmExM2I5M2YxOTIuLjdjZGQzNThjMzIyNTJmZjFkYzJlYTJhZDFkMDk4ZDBm ODIxZDk5MzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv Q29uc29sZU1lc3NhZ2UuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9Db25zb2xlTWVzc2FnZS5qcwpAQCAtNzMsNyArNzMsNyBAQCBXZWJJbnNwZWN0b3IuQ29uc29s ZU1lc3NhZ2UgPSBmdW5jdGlvbihzb3VyY2UsIHR5cGUsIGxldmVsLCBsaW5lLCB1cmwsIHJlcGVh dENvdQogV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLmNyZWF0ZVRleHRNZXNzYWdlID0gZnVu Y3Rpb24odGV4dCwgbGV2ZWwpCiB7CiAgICAgbGV2ZWwgPSBsZXZlbCB8fCBXZWJJbnNwZWN0b3Iu Q29uc29sZU1lc3NhZ2UuTWVzc2FnZUxldmVsLkxvZzsKLSAgICByZXR1cm4gbmV3IFdlYkluc3Bl Y3Rvci5Db25zb2xlTWVzc2FnZShXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZVNv dXJjZS5KUywgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLk1lc3NhZ2VUeXBlLkxvZywgbGV2 ZWwsIDAsIG51bGwsIDEsIG51bGwsIFt0ZXh0XSwgbnVsbCk7CisgICAgcmV0dXJuIG5ldyBXZWJJ bnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UoV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLk1lc3Nh Z2VTb3VyY2UuQ29uc29sZUFQSSwgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLk1lc3NhZ2VU eXBlLkxvZywgbGV2ZWwsIDAsIG51bGwsIDEsIG51bGwsIFt0ZXh0XSwgbnVsbCk7CiB9CiAKIFdl Ykluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5wcm90b3R5cGUgPSB7CkBAIC04OSwzNyArODksMTMg QEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAg IGNhc2UgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLk1lc3NhZ2VUeXBlLlRyYWNlOgogICAg ICAgICAgICAgICAgIG1lc3NhZ2VUZXh0ID0gZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUoImNvbnNv bGUudHJhY2UoKSIpOwogICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgY2FzZSBX ZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZVR5cGUuVW5jYXVnaHRFeGNlcHRpb246 Ci0gICAgICAgICAgICAgICAgbWVzc2FnZVRleHQgPSBkb2N1bWVudC5jcmVhdGVUZXh0Tm9kZSh0 aGlzLl9tZXNzYWdlVGV4dCk7Ci0gICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICBj YXNlIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlVHlwZS5OZXR3b3JrRXJyb3I6 Ci0gICAgICAgICAgICAgICAgaWYgKHRoaXMuX3JlcXVlc3QpIHsKLSAgICAgICAgICAgICAgICAg ICAgc3RhY2tUcmFjZSA9IHRoaXMuX3JlcXVlc3Quc3RhY2tUcmFjZTsKLQotICAgICAgICAgICAg ICAgICAgICBtZXNzYWdlVGV4dCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoInNwYW4iKTsKLSAg ICAgICAgICAgICAgICAgICAgbWVzc2FnZVRleHQuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRl VGV4dE5vZGUodGhpcy5fcmVxdWVzdC5yZXF1ZXN0TWV0aG9kICsgIiAiKSk7Ci0gICAgICAgICAg ICAgICAgICAgIHZhciBhbmNob3IgPSBXZWJJbnNwZWN0b3IubGlua2lmeVVSTEFzTm9kZSh0aGlz Ll9yZXF1ZXN0LnVybCk7Ci0gICAgICAgICAgICAgICAgICAgIGFuY2hvci5zZXRBdHRyaWJ1dGUo InJlcXVlc3RfaWQiLCB0aGlzLl9yZXF1ZXN0LnJlcXVlc3RJZCk7Ci0gICAgICAgICAgICAgICAg ICAgIGFuY2hvci5zZXRBdHRyaWJ1dGUoInByZWZlcnJlZF9wYW5lbCIsICJuZXR3b3JrIik7Ci0g ICAgICAgICAgICAgICAgICAgIG1lc3NhZ2VUZXh0LmFwcGVuZENoaWxkKGFuY2hvcik7Ci0gICAg ICAgICAgICAgICAgICAgIGlmICh0aGlzLl9yZXF1ZXN0LmZhaWxlZCkKLSAgICAgICAgICAgICAg ICAgICAgICAgIG1lc3NhZ2VUZXh0LmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZVRleHROb2Rl KCIgIiArIHRoaXMuX3JlcXVlc3QubG9jYWxpemVkRmFpbERlc2NyaXB0aW9uKSk7Ci0gICAgICAg ICAgICAgICAgICAgIGVsc2UKLSAgICAgICAgICAgICAgICAgICAgICAgIG1lc3NhZ2VUZXh0LmFw cGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZVRleHROb2RlKCIgIiArIHRoaXMuX3JlcXVlc3Quc3Rh dHVzQ29kZSArICIgKCIgKyB0aGlzLl9yZXF1ZXN0LnN0YXR1c1RleHQgKyAiKSIpKTsKLSAgICAg ICAgICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgICAgICAgICB2YXIgaXNFeHRlcm5hbCA9 ICFXZWJJbnNwZWN0b3IucmVzb3VyY2VGb3JVUkwodGhpcy51cmwpOwotICAgICAgICAgICAgICAg ICAgICB2YXIgYW5jaG9yID0gV2ViSW5zcGVjdG9yLmxpbmtpZnlVUkxBc05vZGUodGhpcy51cmws IHRoaXMudXJsLCAiY29uc29sZS1tZXNzYWdlLXVybCIsIGlzRXh0ZXJuYWwpOwotICAgICAgICAg ICAgICAgICAgICB0aGlzLl9mb3JtYXR0ZWRNZXNzYWdlLmFwcGVuZENoaWxkKGFuY2hvcik7Ci0g ICAgICAgICAgICAgICAgICAgIG1lc3NhZ2VUZXh0ID0gdGhpcy5fZm9ybWF0KFt0aGlzLl9tZXNz YWdlVGV4dF0pOwotICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgICAgICBicmVhazsKICAg ICAgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLk1lc3NhZ2VUeXBlLkFz c2VydDoKICAgICAgICAgICAgICAgICB2YXIgYXJncyA9IFtXZWJJbnNwZWN0b3IuVUlTdHJpbmco IkFzc2VydGlvbiBmYWlsZWQ6IildOwogICAgICAgICAgICAgICAgIGlmICh0aGlzLl9wYXJhbWV0 ZXJzKQogICAgICAgICAgICAgICAgICAgICBhcmdzID0gYXJncy5jb25jYXQodGhpcy5fcGFyYW1l dGVycyk7CiAgICAgICAgICAgICAgICAgbWVzc2FnZVRleHQgPSB0aGlzLl9mb3JtYXQoYXJncyk7 CiAgICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5D b25zb2xlTWVzc2FnZS5NZXNzYWdlVHlwZS5PYmplY3Q6CisgICAgICAgICAgICBjYXNlIFdlYklu c3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlVHlwZS5EaXI6CiAgICAgICAgICAgICAgICAg dmFyIG9iaiA9IHRoaXMuX3BhcmFtZXRlcnMgPyB0aGlzLl9wYXJhbWV0ZXJzWzBdIDogdW5kZWZp bmVkOwogICAgICAgICAgICAgICAgIHZhciBhcmdzID0gWyIlTyIsIG9ial07CiAgICAgICAgICAg ICAgICAgbWVzc2FnZVRleHQgPSB0aGlzLl9mb3JtYXQoYXJncyk7CkBAIC0xMzAsNyArMTA2LDI3 IEBAIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5wcm90b3R5cGUgPSB7CiAgICAgICAgICAg ICAgICAgYnJlYWs7CiAgICAgICAgIH0KIAotICAgICAgICBpZiAodGhpcy50eXBlICE9PSBXZWJJ bnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZVR5cGUuTmV0d29ya0Vycm9yKSB7CisgICAg ICAgIGlmICh0aGlzLnNvdXJjZSA9PT0gV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLk1lc3Nh Z2VTb3VyY2UuTmV0d29yaykgeworICAgICAgICAgICAgaWYgKHRoaXMuX3JlcXVlc3QpIHsKKyAg ICAgICAgICAgICAgICBzdGFja1RyYWNlID0gdGhpcy5fcmVxdWVzdC5zdGFja1RyYWNlOworCisg ICAgICAgICAgICAgICAgbWVzc2FnZVRleHQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJzcGFu Iik7CisgICAgICAgICAgICAgICAgbWVzc2FnZVRleHQuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3Jl YXRlVGV4dE5vZGUodGhpcy5fcmVxdWVzdC5yZXF1ZXN0TWV0aG9kICsgIiAiKSk7CisgICAgICAg ICAgICAgICAgdmFyIGFuY2hvciA9IFdlYkluc3BlY3Rvci5saW5raWZ5VVJMQXNOb2RlKHRoaXMu X3JlcXVlc3QudXJsKTsKKyAgICAgICAgICAgICAgICBhbmNob3Iuc2V0QXR0cmlidXRlKCJyZXF1 ZXN0X2lkIiwgdGhpcy5fcmVxdWVzdC5yZXF1ZXN0SWQpOworICAgICAgICAgICAgICAgIGFuY2hv ci5zZXRBdHRyaWJ1dGUoInByZWZlcnJlZF9wYW5lbCIsICJuZXR3b3JrIik7CisgICAgICAgICAg ICAgICAgbWVzc2FnZVRleHQuYXBwZW5kQ2hpbGQoYW5jaG9yKTsKKyAgICAgICAgICAgICAgICBp ZiAodGhpcy5fcmVxdWVzdC5mYWlsZWQpCisgICAgICAgICAgICAgICAgICAgIG1lc3NhZ2VUZXh0 LmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZVRleHROb2RlKCIgIiArIHRoaXMuX3JlcXVlc3Qu bG9jYWxpemVkRmFpbERlc2NyaXB0aW9uKSk7CisgICAgICAgICAgICAgICAgZWxzZQorICAgICAg ICAgICAgICAgICAgICBtZXNzYWdlVGV4dC5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVUZXh0 Tm9kZSgiICIgKyB0aGlzLl9yZXF1ZXN0LnN0YXR1c0NvZGUgKyAiICgiICsgdGhpcy5fcmVxdWVz dC5zdGF0dXNUZXh0ICsgIikiKSk7CisgICAgICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAg ICAgIHZhciBpc0V4dGVybmFsID0gIVdlYkluc3BlY3Rvci5yZXNvdXJjZUZvclVSTCh0aGlzLnVy bCk7CisgICAgICAgICAgICAgICAgdmFyIGFuY2hvciA9IFdlYkluc3BlY3Rvci5saW5raWZ5VVJM QXNOb2RlKHRoaXMudXJsLCB0aGlzLnVybCwgImNvbnNvbGUtbWVzc2FnZS11cmwiLCBpc0V4dGVy bmFsKTsKKyAgICAgICAgICAgICAgICB0aGlzLl9mb3JtYXR0ZWRNZXNzYWdlLmFwcGVuZENoaWxk KGFuY2hvcik7CisgICAgICAgICAgICAgICAgbWVzc2FnZVRleHQgPSB0aGlzLl9mb3JtYXQoW3Ro aXMuX21lc3NhZ2VUZXh0XSk7CisgICAgICAgICAgICB9CisgICAgICAgIH0gZWxzZSB7CiAgICAg ICAgICAgICBpZiAodGhpcy5fc3RhY2tUcmFjZSAmJiB0aGlzLl9zdGFja1RyYWNlLmxlbmd0aCAm JiB0aGlzLl9zdGFja1RyYWNlWzBdLnVybCkgewogICAgICAgICAgICAgICAgIHZhciB1cmxFbGVt ZW50ID0gdGhpcy5fbGlua2lmeUNhbGxGcmFtZSh0aGlzLl9zdGFja1RyYWNlWzBdKTsKICAgICAg ICAgICAgICAgICB0aGlzLl9mb3JtYXR0ZWRNZXNzYWdlLmFwcGVuZENoaWxkKHVybEVsZW1lbnQp OwpAQCAtMTQyLDI3ICsxMzgsMjEgQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLnByb3Rv dHlwZSA9IHsKIAogICAgICAgICB0aGlzLl9mb3JtYXR0ZWRNZXNzYWdlLmFwcGVuZENoaWxkKG1l c3NhZ2VUZXh0KTsKIAotICAgICAgICBpZiAodGhpcy5fc3RhY2tUcmFjZSkgewotICAgICAgICAg ICAgc3dpdGNoICh0aGlzLnR5cGUpIHsKLSAgICAgICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rv ci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlVHlwZS5UcmFjZToKLSAgICAgICAgICAgICAgICBjYXNl IFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlVHlwZS5VbmNhdWdodEV4Y2VwdGlv bjoKLSAgICAgICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNz YWdlVHlwZS5OZXR3b3JrRXJyb3I6Ci0gICAgICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3Iu Q29uc29sZU1lc3NhZ2UuTWVzc2FnZVR5cGUuQXNzZXJ0OiB7Ci0gICAgICAgICAgICAgICAgICAg IHZhciBvbCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoIm9sIik7Ci0gICAgICAgICAgICAgICAg ICAgIG9sLmNsYXNzTmFtZSA9ICJvdXRsaW5lLWRpc2Nsb3N1cmUiOwotICAgICAgICAgICAgICAg ICAgICB2YXIgdHJlZU91dGxpbmUgPSBuZXcgVHJlZU91dGxpbmUob2wpOwotCi0gICAgICAgICAg ICAgICAgICAgIHZhciBjb250ZW50ID0gdGhpcy5fZm9ybWF0dGVkTWVzc2FnZTsKLSAgICAgICAg ICAgICAgICAgICAgdmFyIHJvb3QgPSBuZXcgVHJlZUVsZW1lbnQoY29udGVudCwgbnVsbCwgdHJ1 ZSk7Ci0gICAgICAgICAgICAgICAgICAgIGNvbnRlbnQudHJlZUVsZW1lbnRGb3JUZXN0ID0gcm9v dDsKLSAgICAgICAgICAgICAgICAgICAgdHJlZU91dGxpbmUuYXBwZW5kQ2hpbGQocm9vdCk7Ci0g ICAgICAgICAgICAgICAgICAgIGlmICh0aGlzLnR5cGUgPT09IFdlYkluc3BlY3Rvci5Db25zb2xl TWVzc2FnZS5NZXNzYWdlVHlwZS5UcmFjZSkKLSAgICAgICAgICAgICAgICAgICAgICAgIHJvb3Qu ZXhwYW5kKCk7Ci0KLSAgICAgICAgICAgICAgICAgICAgdGhpcy5fcG9wdWxhdGVTdGFja1RyYWNl VHJlZUVsZW1lbnQocm9vdCk7Ci0gICAgICAgICAgICAgICAgICAgIHRoaXMuX2Zvcm1hdHRlZE1l c3NhZ2UgPSBvbDsKLSAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICB9CisgICAgICAgIHZh ciBkdW1wU3RhY2tUcmFjZSA9ICEhdGhpcy5fc3RhY2tUcmFjZSAmJiAodGhpcy5sZXZlbCA9PT0g V2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLk1lc3NhZ2VMZXZlbC5FcnJvciB8fCB0aGlzLnR5 cGUgPT09IFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlVHlwZS5UcmFjZSk7Cisg ICAgICAgIGlmIChkdW1wU3RhY2tUcmFjZSkgeworICAgICAgICAgICAgdmFyIG9sID0gZG9jdW1l bnQuY3JlYXRlRWxlbWVudCgib2wiKTsKKyAgICAgICAgICAgIG9sLmNsYXNzTmFtZSA9ICJvdXRs aW5lLWRpc2Nsb3N1cmUiOworICAgICAgICAgICAgdmFyIHRyZWVPdXRsaW5lID0gbmV3IFRyZWVP dXRsaW5lKG9sKTsKKworICAgICAgICAgICAgdmFyIGNvbnRlbnQgPSB0aGlzLl9mb3JtYXR0ZWRN ZXNzYWdlOworICAgICAgICAgICAgdmFyIHJvb3QgPSBuZXcgVHJlZUVsZW1lbnQoY29udGVudCwg bnVsbCwgdHJ1ZSk7CisgICAgICAgICAgICBjb250ZW50LnRyZWVFbGVtZW50Rm9yVGVzdCA9IHJv b3Q7CisgICAgICAgICAgICB0cmVlT3V0bGluZS5hcHBlbmRDaGlsZChyb290KTsKKyAgICAgICAg ICAgIGlmICh0aGlzLnR5cGUgPT09IFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdl VHlwZS5UcmFjZSkKKyAgICAgICAgICAgICAgICByb290LmV4cGFuZCgpOworCisgICAgICAgICAg ICB0aGlzLl9wb3B1bGF0ZVN0YWNrVHJhY2VUcmVlRWxlbWVudChyb290KTsKKyAgICAgICAgICAg IHRoaXMuX2Zvcm1hdHRlZE1lc3NhZ2UgPSBvbDsKICAgICAgICAgfQogCiAgICAgICAgIC8vIFRo aXMgaXMgdXNlZCBmb3IgaW5saW5lIG1lc3NhZ2UgYnViYmxlcyBpbiBTb3VyY2VGcmFtZXMsIG9y IG90aGVyIHBsYWluLXRleHQgcmVwcmVzZW50YXRpb25zLgpAQCAtMzg2LDggKzM3NiwxMSBAQCBX ZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UucHJvdG90eXBlID0gewogICAgICAgICAgICAgY2Fz ZSBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZVNvdXJjZS5KUzoKICAgICAgICAg ICAgICAgICBzb3VyY2VTdHJpbmcgPSAiSlMiOwogICAgICAgICAgICAgICAgIGJyZWFrOwotICAg ICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZVNvdXJjZS5D U1M6Ci0gICAgICAgICAgICAgICAgc291cmNlU3RyaW5nID0gIkNTUyI7CisgICAgICAgICAgICBj YXNlIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlU291cmNlLk5ldHdvcms6Cisg ICAgICAgICAgICAgICAgc291cmNlU3RyaW5nID0gIk5ldHdvcmsiOworICAgICAgICAgICAgICAg IGJyZWFrOworICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVz c2FnZVNvdXJjZS5Db25zb2xlQVBJOgorICAgICAgICAgICAgICAgIHNvdXJjZVN0cmluZyA9ICJD b25zb2xlQVBJIjsKICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIGNhc2UgV2Vi SW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLk1lc3NhZ2VTb3VyY2UuT3RoZXI6CiAgICAgICAgICAg ICAgICAgc291cmNlU3RyaW5nID0gIk90aGVyIjsKQEAgLTM5NywxMiArMzkwLDEzIEBAIFdlYklu c3BlY3Rvci5Db25zb2xlTWVzc2FnZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIHZhciB0eXBlU3Ry aW5nOwogICAgICAgICBzd2l0Y2ggKHRoaXMudHlwZSkgewogICAgICAgICAgICAgY2FzZSBXZWJJ bnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZVR5cGUuTG9nOgotICAgICAgICAgICAgY2Fz ZSBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZVR5cGUuVW5jYXVnaHRFeGNlcHRp b246Ci0gICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdl VHlwZS5OZXR3b3JrRXJyb3I6CiAgICAgICAgICAgICAgICAgdHlwZVN0cmluZyA9ICJMb2ciOwog ICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuQ29u c29sZU1lc3NhZ2UuTWVzc2FnZVR5cGUuT2JqZWN0OgotICAgICAgICAgICAgICAgIHR5cGVTdHJp bmcgPSAiT2JqZWN0IjsKKyAgICAgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNz YWdlLk1lc3NhZ2VUeXBlLkRpcjoKKyAgICAgICAgICAgICAgICB0eXBlU3RyaW5nID0gIkRpciI7 CisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5D b25zb2xlTWVzc2FnZS5NZXNzYWdlVHlwZS5EaXJYTUw6CisgICAgICAgICAgICAgICAgdHlwZVN0 cmluZyA9ICJEaXIgWE1MIjsKICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIGNh c2UgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLk1lc3NhZ2VUeXBlLlRyYWNlOgogICAgICAg ICAgICAgICAgIHR5cGVTdHJpbmcgPSAiVHJhY2UiOwpAQCAtNDg4LDIwICs0ODIsMjAgQEAgV2Vi SW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLk1lc3NhZ2VTb3VyY2UgPSB7CiAgICAgSFRNTDogImh0 bWwiLAogICAgIFhNTDogInhtbCIsCiAgICAgSlM6ICJqYXZhc2NyaXB0IiwKLSAgICBDU1M6ICJj c3MiLAorICAgIE5ldHdvcms6ICJuZXR3b3JrIiwKKyAgICBDb25zb2xlQVBJOiAiY29uc29sZS1h cGkiLAogICAgIE90aGVyOiAib3RoZXIiCiB9CiAKIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2Fn ZS5NZXNzYWdlVHlwZSA9IHsKICAgICBMb2c6ICJsb2ciLAotICAgIE9iamVjdDogIm90aGVyIiwK KyAgICBEaXI6ICJkaXIiLAorICAgIERpclhNTDogImRpcnhtbCIsCiAgICAgVHJhY2U6ICJ0cmFj ZSIsCiAgICAgU3RhcnRHcm91cDogInN0YXJ0R3JvdXAiLAogICAgIFN0YXJ0R3JvdXBDb2xsYXBz ZWQ6ICJzdGFydEdyb3VwQ29sbGFwc2VkIiwKICAgICBFbmRHcm91cDogImVuZEdyb3VwIiwKICAg ICBBc3NlcnQ6ICJhc3NlcnQiLAotICAgIFVuY2F1Z2h0RXhjZXB0aW9uOiAidW5jYXVnaHRFeGNl cHRpb24iLAotICAgIE5ldHdvcmtFcnJvcjogIm5ldHdvcmtFcnJvciIsCiAgICAgUmVzdWx0OiAi cmVzdWx0IgogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnNvbGUuY3Bw IGIvU291cmNlL1dlYkNvcmUvcGFnZS9Db25zb2xlLmNwcAppbmRleCA5NWZkYjM5OTA0ZTE0MTdm NjQ1NTFmYTE1ZDBiMGJjNzA0YzRkZTJmLi43NGRmZTc0YWIyNDI5NGJlM2I1ZTdkY2I3ZWZhOGZj YmUzNDI5MWJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnNvbGUuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ29uc29sZS5jcHAKQEAgLTk1LDggKzk1LDExIEBAIHN0 YXRpYyB2b2lkIHByaW50TWVzc2FnZVNvdXJjZUFuZExldmVsUHJlZml4KE1lc3NhZ2VTb3VyY2Ug c291cmNlLCBNZXNzYWdlTGV2ZWwKICAgICBjYXNlIEpTTWVzc2FnZVNvdXJjZToKICAgICAgICAg c291cmNlU3RyaW5nID0gIkpTIjsKICAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBDU1NNZXNzYWdl U291cmNlOgotICAgICAgICBzb3VyY2VTdHJpbmcgPSAiQ1NTIjsKKyAgICBjYXNlIE5ldHdvcmtN ZXNzYWdlU291cmNlOgorICAgICAgICBzb3VyY2VTdHJpbmcgPSAiTkVUV09SSyI7CisgICAgICAg IGJyZWFrOworICAgIGNhc2UgQ29uc29sZUFQSU1lc3NhZ2VTb3VyY2U6CisgICAgICAgIHNvdXJj ZVN0cmluZyA9ICJDT05TT0xFQVBJIjsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBPdGhlck1l c3NhZ2VTb3VyY2U6CiAgICAgICAgIHNvdXJjZVN0cmluZyA9ICJPVEhFUiI7CkBAIC0xNzYsNyAr MTc5LDcgQEAgdm9pZCBDb25zb2xlOjphZGRNZXNzYWdlKE1lc3NhZ2VUeXBlIHR5cGUsIE1lc3Nh Z2VMZXZlbCBsZXZlbCwgUGFzc1JlZlB0cjxTY3JpcHQKIAogICAgIGlmIChDb25zb2xlOjpzaG91 bGRQcmludEV4Y2VwdGlvbnMoKSkgewogICAgICAgICBwcmludFNvdXJjZVVSTEFuZExpbmUobGFz dENhbGxlci5zb3VyY2VVUkwoKSwgMCk7Ci0gICAgICAgIHByaW50TWVzc2FnZVNvdXJjZUFuZExl dmVsUHJlZml4KEpTTWVzc2FnZVNvdXJjZSwgbGV2ZWwpOworICAgICAgICBwcmludE1lc3NhZ2VT b3VyY2VBbmRMZXZlbFByZWZpeChDb25zb2xlQVBJTWVzc2FnZVNvdXJjZSwgbGV2ZWwpOwogCiAg ICAgICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBhcmd1bWVudHMtPmFyZ3VtZW50Q291bnQo KTsgKytpKSB7CiAgICAgICAgICAgICBTdHJpbmcgYXJnQXNTdHJpbmc7CkBAIC0xODgsOSArMTkx LDkgQEAgdm9pZCBDb25zb2xlOjphZGRNZXNzYWdlKE1lc3NhZ2VUeXBlIHR5cGUsIE1lc3NhZ2VM ZXZlbCBsZXZlbCwgUGFzc1JlZlB0cjxTY3JpcHQKIAogICAgIFN0cmluZyBtZXNzYWdlOwogICAg IGlmIChhcmd1bWVudHMtPmdldEZpcnN0QXJndW1lbnRBc1N0cmluZyhtZXNzYWdlKSkKLSAgICAg ICAgcGFnZS0+Y2hyb21lKCktPmNsaWVudCgpLT5hZGRNZXNzYWdlVG9Db25zb2xlKEpTTWVzc2Fn ZVNvdXJjZSwgdHlwZSwgbGV2ZWwsIG1lc3NhZ2UsIGxhc3RDYWxsZXIubGluZU51bWJlcigpLCBs YXN0Q2FsbGVyLnNvdXJjZVVSTCgpKTsKKyAgICAgICAgcGFnZS0+Y2hyb21lKCktPmNsaWVudCgp LT5hZGRNZXNzYWdlVG9Db25zb2xlKENvbnNvbGVBUElNZXNzYWdlU291cmNlLCB0eXBlLCBsZXZl bCwgbWVzc2FnZSwgbGFzdENhbGxlci5saW5lTnVtYmVyKCksIGxhc3RDYWxsZXIuc291cmNlVVJM KCkpOwogCi0gICAgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjphZGRNZXNzYWdlVG9Db25zb2xl KHBhZ2UsIEpTTWVzc2FnZVNvdXJjZSwgdHlwZSwgbGV2ZWwsIG1lc3NhZ2UsIGFyZ3VtZW50cywg Y2FsbFN0YWNrKTsKKyAgICBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmFkZE1lc3NhZ2VUb0Nv bnNvbGUocGFnZSwgQ29uc29sZUFQSU1lc3NhZ2VTb3VyY2UsIHR5cGUsIGxldmVsLCBtZXNzYWdl LCBhcmd1bWVudHMsIGNhbGxTdGFjayk7CiB9CiAKIHZvaWQgQ29uc29sZTo6ZGVidWcoUGFzc1Jl ZlB0cjxTY3JpcHRBcmd1bWVudHM+IGFyZ3VtZW50cywgUGFzc1JlZlB0cjxTY3JpcHRDYWxsU3Rh Y2s+IGNhbGxTdGFjaykKQEAgLTIxNiwxMyArMjE5LDEyIEBAIHZvaWQgQ29uc29sZTo6bG9nKFBh c3NSZWZQdHI8U2NyaXB0QXJndW1lbnRzPiBhcmd1bWVudHMsIFBhc3NSZWZQdHI8U2NyaXB0Q2Fs bFN0CiAKIHZvaWQgQ29uc29sZTo6ZGlyKFBhc3NSZWZQdHI8U2NyaXB0QXJndW1lbnRzPiBhcmd1 bWVudHMsIFBhc3NSZWZQdHI8U2NyaXB0Q2FsbFN0YWNrPiBjYWxsU3RhY2spCiB7Ci0gICAgYWRk TWVzc2FnZShPYmplY3RNZXNzYWdlVHlwZSwgTG9nTWVzc2FnZUxldmVsLCBhcmd1bWVudHMsIGNh bGxTdGFjayk7CisgICAgYWRkTWVzc2FnZShEaXJNZXNzYWdlVHlwZSwgTG9nTWVzc2FnZUxldmVs LCBhcmd1bWVudHMsIGNhbGxTdGFjayk7CiB9CiAKIHZvaWQgQ29uc29sZTo6ZGlyeG1sKFBhc3NS ZWZQdHI8U2NyaXB0QXJndW1lbnRzPiBhcmd1bWVudHMsIFBhc3NSZWZQdHI8U2NyaXB0Q2FsbFN0 YWNrPiBjYWxsU3RhY2spCiB7Ci0gICAgLy8gVGhlIHN0YW5kYXJkIGJlaGF2aW9yIG9mIG91ciBj b25zb2xlLmxvZyB3aWxsIHByaW50IHRoZSBET00gdHJlZSBmb3Igbm9kZXMuCi0gICAgbG9nKGFy Z3VtZW50cywgY2FsbFN0YWNrKTsKKyAgICBhZGRNZXNzYWdlKERpclhNTE1lc3NhZ2VUeXBlLCBM b2dNZXNzYWdlTGV2ZWwsIGFyZ3VtZW50cywgY2FsbFN0YWNrKTsKIH0KIAogdm9pZCBDb25zb2xl Ojp0cmFjZShQYXNzUmVmUHRyPFNjcmlwdEFyZ3VtZW50cz4gYXJndW1lbnRzLCBQYXNzUmVmUHRy PFNjcmlwdENhbGxTdGFjaz4gcHJwQ2FsbFN0YWNrKQpAQCAtMzE2LDE3ICszMTgsMTcgQEAgdm9p ZCBDb25zb2xlOjp0aW1lU3RhbXAoUGFzc1JlZlB0cjxTY3JpcHRBcmd1bWVudHM+IGFyZ3VtZW50 cywgUGFzc1JlZlB0cjxTY3JpcHQKIAogdm9pZCBDb25zb2xlOjpncm91cChQYXNzUmVmUHRyPFNj cmlwdEFyZ3VtZW50cz4gYXJndW1lbnRzLCBQYXNzUmVmUHRyPFNjcmlwdENhbGxTdGFjaz4gY2Fs bFN0YWNrKQogewotICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6YWRkTWVzc2FnZVRvQ29u c29sZShwYWdlKCksIEpTTWVzc2FnZVNvdXJjZSwgU3RhcnRHcm91cE1lc3NhZ2VUeXBlLCBMb2dN ZXNzYWdlTGV2ZWwsIFN0cmluZygpLCBhcmd1bWVudHMsIGNhbGxTdGFjayk7CisgICAgSW5zcGVj dG9ySW5zdHJ1bWVudGF0aW9uOjphZGRNZXNzYWdlVG9Db25zb2xlKHBhZ2UoKSwgQ29uc29sZUFQ SU1lc3NhZ2VTb3VyY2UsIFN0YXJ0R3JvdXBNZXNzYWdlVHlwZSwgTG9nTWVzc2FnZUxldmVsLCBT dHJpbmcoKSwgYXJndW1lbnRzLCBjYWxsU3RhY2spOwogfQogCiB2b2lkIENvbnNvbGU6Omdyb3Vw Q29sbGFwc2VkKFBhc3NSZWZQdHI8U2NyaXB0QXJndW1lbnRzPiBhcmd1bWVudHMsIFBhc3NSZWZQ dHI8U2NyaXB0Q2FsbFN0YWNrPiBjYWxsU3RhY2spCiB7Ci0gICAgSW5zcGVjdG9ySW5zdHJ1bWVu dGF0aW9uOjphZGRNZXNzYWdlVG9Db25zb2xlKHBhZ2UoKSwgSlNNZXNzYWdlU291cmNlLCBTdGFy dEdyb3VwQ29sbGFwc2VkTWVzc2FnZVR5cGUsIExvZ01lc3NhZ2VMZXZlbCwgU3RyaW5nKCksIGFy Z3VtZW50cywgY2FsbFN0YWNrKTsKKyAgICBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmFkZE1l c3NhZ2VUb0NvbnNvbGUocGFnZSgpLCBDb25zb2xlQVBJTWVzc2FnZVNvdXJjZSwgU3RhcnRHcm91 cENvbGxhcHNlZE1lc3NhZ2VUeXBlLCBMb2dNZXNzYWdlTGV2ZWwsIFN0cmluZygpLCBhcmd1bWVu dHMsIGNhbGxTdGFjayk7CiB9CiAKIHZvaWQgQ29uc29sZTo6Z3JvdXBFbmQoKQogewotICAgIElu c3BlY3Rvckluc3RydW1lbnRhdGlvbjo6YWRkTWVzc2FnZVRvQ29uc29sZShwYWdlKCksIEpTTWVz c2FnZVNvdXJjZSwgRW5kR3JvdXBNZXNzYWdlVHlwZSwgTG9nTWVzc2FnZUxldmVsLCBTdHJpbmco KSwgMCwgU3RyaW5nKCkpOworICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6YWRkTWVzc2Fn ZVRvQ29uc29sZShwYWdlKCksIENvbnNvbGVBUElNZXNzYWdlU291cmNlLCBFbmRHcm91cE1lc3Nh Z2VUeXBlLCBMb2dNZXNzYWdlTGV2ZWwsIFN0cmluZygpLCAwLCBTdHJpbmcoKSk7CiB9CiAKIGJv b2wgQ29uc29sZTo6c2hvdWxkQ2FwdHVyZUZ1bGxTdGFja1RyYWNlKCkgY29uc3QKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ29uc29sZVR5cGVzLmggYi9Tb3VyY2UvV2ViQ29yZS9w YWdlL0NvbnNvbGVUeXBlcy5oCmluZGV4IDA3MjFiMzZmMmFiODE0NDAzYTlhN2I5MGMwOTQxNjNi OWRjMjE5ZTYuLjhiNDQwMzBjNjkzNmE3Y2U5MDQ2N2Y0ZmRkOTJmYjFjZWQ0ZTNlNDggMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ29uc29sZVR5cGVzLmgKKysrIGIvU291cmNlL1dl YkNvcmUvcGFnZS9Db25zb2xlVHlwZXMuaApAQCAtMzIsMjAgKzMyLDIyIEBAIGVudW0gTWVzc2Fn ZVNvdXJjZSB7CiAgICAgSFRNTE1lc3NhZ2VTb3VyY2UsCiAgICAgWE1MTWVzc2FnZVNvdXJjZSwK ICAgICBKU01lc3NhZ2VTb3VyY2UsCi0gICAgQ1NTTWVzc2FnZVNvdXJjZSwKLSAgICBPdGhlck1l c3NhZ2VTb3VyY2UKKyAgICBOZXR3b3JrTWVzc2FnZVNvdXJjZSwKKyAgICBDb25zb2xlQVBJTWVz c2FnZVNvdXJjZSwKKyAgICBPdGhlck1lc3NhZ2VTb3VyY2UsCiB9OwogCisvLyBGSVhNRTogbWFr ZSB0aGlzIGVudW0gcHJpdmF0ZSB0byBpbnNwZWN0b3IsIHJlbW92ZSBpdCBmcm9tIGNsaWVudCBj YWxsYmFja3MuCisvLyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjYz NzEKIGVudW0gTWVzc2FnZVR5cGUgewogICAgIExvZ01lc3NhZ2VUeXBlLAotICAgIE9iamVjdE1l c3NhZ2VUeXBlLAorICAgIERpck1lc3NhZ2VUeXBlLAorICAgIERpclhNTE1lc3NhZ2VUeXBlLAog ICAgIFRyYWNlTWVzc2FnZVR5cGUsCiAgICAgU3RhcnRHcm91cE1lc3NhZ2VUeXBlLAogICAgIFN0 YXJ0R3JvdXBDb2xsYXBzZWRNZXNzYWdlVHlwZSwKICAgICBFbmRHcm91cE1lc3NhZ2VUeXBlLAot ICAgIEFzc2VydE1lc3NhZ2VUeXBlLAotICAgIFVuY2F1Z2h0RXhjZXB0aW9uTWVzc2FnZVR5cGUs Ci0gICAgTmV0d29ya0Vycm9yTWVzc2FnZVR5cGUKKyAgICBBc3NlcnRNZXNzYWdlVHlwZQogfTsK IAogZW51bSBNZXNzYWdlTGV2ZWwgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvd2Vic29j a2V0cy9XZWJTb2NrZXRDaGFubmVsLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3dlYnNvY2tldHMvV2Vi U29ja2V0Q2hhbm5lbC5jcHAKaW5kZXggYzExMzViNTljMTJkODljOWFhN2VjNDQyNGJkMTY5M2U3 ZjE4NDlmMS4uNzcwODY1ZjQ2MDY3ZTY2MjUxOGEwYzM5NDM5MzRiOGEzNzEyMjAxYyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvd2Vic29ja2V0cy9XZWJTb2NrZXRDaGFubmVsLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS93ZWJzb2NrZXRzL1dlYlNvY2tldENoYW5uZWwuY3BwCkBAIC0zMzMs NyArMzMzLDcgQEAgdm9pZCBXZWJTb2NrZXRDaGFubmVsOjpkaWRGYWlsU29ja2V0U3RyZWFtKFNv Y2tldFN0cmVhbUhhbmRsZSogaGFuZGxlLCBjb25zdCBTb2MKICAgICAgICAgQVNTRVJUKGZhaWxp bmdVUkwuaXNOdWxsKCkgfHwgbV9oYW5kc2hha2UtPnVybCgpLnN0cmluZygpID09IGZhaWxpbmdV UkwpOwogICAgICAgICBpZiAoZmFpbGluZ1VSTC5pc051bGwoKSkKICAgICAgICAgICAgIGZhaWxp bmdVUkwgPSBtX2hhbmRzaGFrZS0+dXJsKCkuc3RyaW5nKCk7Ci0gICAgICAgIG1fY29udGV4dC0+ YWRkTWVzc2FnZShPdGhlck1lc3NhZ2VTb3VyY2UsIE5ldHdvcmtFcnJvck1lc3NhZ2VUeXBlLCBF cnJvck1lc3NhZ2VMZXZlbCwgbWVzc2FnZSwgMCwgZmFpbGluZ1VSTCwgMCk7CisgICAgICAgIG1f Y29udGV4dC0+YWRkTWVzc2FnZShOZXR3b3JrTWVzc2FnZVNvdXJjZSwgTG9nTWVzc2FnZVR5cGUs IEVycm9yTWVzc2FnZUxldmVsLCBtZXNzYWdlLCAwLCBmYWlsaW5nVVJMLCAwKTsKICAgICB9CiAg ICAgbV9zaG91bGREaXNjYXJkUmVjZWl2ZWREYXRhID0gdHJ1ZTsKICAgICBoYW5kbGUtPmRpc2Nv bm5lY3QoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZyBiL1NvdXJj ZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwppbmRleCBmMGNjMTMzYWZhZDY0ZWI0NDg5ODRlZGNmZmUy NWM0NTY0N2MxYWE3Li5mYTBkNmYzMWU5M2RlYWIzYmZjZTFkMzkyZmU1ZTg5ODUyOGM3NzE5IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktp dC9tYWMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMDktMTkgIFBhdmVsIEZlbGRt YW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IHN0cmVh bWxpbmUgQ29uc29sZSdzIE1lc3NhZ2VUeXBlIGFuZCBNZXNzYWdlU291cmNlIHNlbWFudGljcy4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY4MzQyCisK KyAgICAgICAgVGhpcyBjaGFuZ2UgZml4ZXMgc2VtYW50aWNzIG9mIHRoZSBNZXNzYWdlU291cmNl IGFuZCBNZXNzYWdlVHlwZToKKyAgICAgICAgTWVzc2FnZVNvdXJjZSBpcyBub3cgdGhlIHNvdXJj ZSBvZiB0aGUgbWVzc2FnZSAoYmUgaXQgTmV0d29yaywgSFRNTAorICAgICAgICBwYXJzZXIgb3Ig Q29uc29sZSBBUEkpLiBNZXNzYWdlVHlwZSBpcyBvbmx5IGRlZmluZWQgZm9yIHRoZSBDb25zb2xl IEFQSQorICAgICAgICBtZXNzYWdlcyBhbmQgY29udGFpbnMgdGhlIG5hbWUgb2YgdGhlIEFQSSBj YWxsIChsb2csIGRpciwgZGlyeG1sLCBldGMuKS4gCisgICAgICAgIFN1YnNlcXVlbnQgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY2MzcxIHdpbGwgbWFrZSBNZXNzYWdl VHlwZQorICAgICAgICBwcml2YXRlIHRvIHRoZSBpbnNwZWN0b3IuCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9XZWJDaHJv bWVDbGllbnQubW06CisgICAgICAgIChzdHJpbmdGb3JNZXNzYWdlU291cmNlKToKKyAgICAgICAg KHN0cmluZ0Zvck1lc3NhZ2VUeXBlKToKKyAgICAgICAgKiBXZWJWaWV3L1dlYlVJRGVsZWdhdGVQ cml2YXRlLmg6CisKIDIwMTEtMDktMTcgIE1paGFpIFBhcnBhcml0YSAgPG1paGFpcEBjaHJvbWl1 bS5vcmc+CiAKICAgICAgICAgRnJhbWVMb2FkZXJDbGllbnQgQmFja0ZvcndhcmRMaXN0LXJlbGF0 ZWQgbWV0aG9kcyBhcmUgdW5zdWVkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJD b3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQubW0gYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3Jl U3VwcG9ydC9XZWJDaHJvbWVDbGllbnQubW0KaW5kZXggNDAzNjA1YmI4ZGJkNjhlMDc3Nzg2Zjg3 M2YwY2FlZmEwMjAwOGVmYi4uZmU0MTQyY2RlOTY5MDU1OTY3MmRmZmE0NmUzN2UyNGRkNTg4NDQ3 NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21l Q2xpZW50Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9t ZUNsaWVudC5tbQpAQCAtODgsMTggKzg4LDE4IEBACiBOU1N0cmluZyAqV2ViQ29uc29sZU1lc3Nh Z2VIVE1MTWVzc2FnZVNvdXJjZSA9IEAiSFRNTE1lc3NhZ2VTb3VyY2UiOwogTlNTdHJpbmcgKldl YkNvbnNvbGVNZXNzYWdlWE1MTWVzc2FnZVNvdXJjZSA9IEAiWE1MTWVzc2FnZVNvdXJjZSI7CiBO U1N0cmluZyAqV2ViQ29uc29sZU1lc3NhZ2VKU01lc3NhZ2VTb3VyY2UgPSBAIkpTTWVzc2FnZVNv dXJjZSI7Ci1OU1N0cmluZyAqV2ViQ29uc29sZU1lc3NhZ2VDU1NNZXNzYWdlU291cmNlID0gQCJD U1NNZXNzYWdlU291cmNlIjsKK05TU3RyaW5nICpXZWJDb25zb2xlTWVzc2FnZU5ldHdvcmtNZXNz YWdlU291cmNlID0gQCJOZXR3b3JrTWVzc2FnZVNvdXJjZSI7CitOU1N0cmluZyAqV2ViQ29uc29s ZU1lc3NhZ2VDb25zb2xlQVBJTWVzc2FnZVNvdXJjZSA9IEAiQ29uc29sZUFQSU1lc3NhZ2VTb3Vy Y2UiOwogTlNTdHJpbmcgKldlYkNvbnNvbGVNZXNzYWdlT3RoZXJNZXNzYWdlU291cmNlID0gQCJP dGhlck1lc3NhZ2VTb3VyY2UiOwogCiBOU1N0cmluZyAqV2ViQ29uc29sZU1lc3NhZ2VMb2dNZXNz YWdlVHlwZSA9IEAiTG9nTWVzc2FnZVR5cGUiOwotTlNTdHJpbmcgKldlYkNvbnNvbGVNZXNzYWdl T2JqZWN0TWVzc2FnZVR5cGUgPSBAIk9iamVjdE1lc3NhZ2VUeXBlIjsKK05TU3RyaW5nICpXZWJD b25zb2xlTWVzc2FnZURpck1lc3NhZ2VUeXBlID0gQCJEaXJNZXNzYWdlVHlwZSI7CitOU1N0cmlu ZyAqV2ViQ29uc29sZU1lc3NhZ2VEaXJYTUxNZXNzYWdlVHlwZSA9IEAiRGlyWE1MTWVzc2FnZVR5 cGUiOwogTlNTdHJpbmcgKldlYkNvbnNvbGVNZXNzYWdlVHJhY2VNZXNzYWdlVHlwZSA9IEAiVHJh Y2VNZXNzYWdlVHlwZSI7CiBOU1N0cmluZyAqV2ViQ29uc29sZU1lc3NhZ2VTdGFydEdyb3VwTWVz c2FnZVR5cGUgPSBAIlN0YXJ0R3JvdXBNZXNzYWdlVHlwZSI7CiBOU1N0cmluZyAqV2ViQ29uc29s ZU1lc3NhZ2VTdGFydEdyb3VwQ29sbGFwc2VkTWVzc2FnZVR5cGUgPSBAIlN0YXJ0R3JvdXBDb2xs YXBzZWRNZXNzYWdlVHlwZSI7CiBOU1N0cmluZyAqV2ViQ29uc29sZU1lc3NhZ2VFbmRHcm91cE1l c3NhZ2VUeXBlID0gQCJFbmRHcm91cE1lc3NhZ2VUeXBlIjsKIE5TU3RyaW5nICpXZWJDb25zb2xl TWVzc2FnZUFzc2VydE1lc3NhZ2VUeXBlID0gQCJBc3NlcnRNZXNzYWdlVHlwZSI7Ci1OU1N0cmlu ZyAqV2ViQ29uc29sZU1lc3NhZ2VVbmNhdWdodEV4Y2VwdGlvbk1lc3NhZ2VUeXBlID0gQCJVbmNh dWdodEV4Y2VwdGlvbk1lc3NhZ2VUeXBlIjsKLU5TU3RyaW5nICpXZWJDb25zb2xlTWVzc2FnZU5l dHdvcmtFcnJvck1lc3NhZ2VUeXBlID0gQCJOZXR3b3JrRXJyb3JNZXNzYWdlVHlwZSI7CiAKIE5T U3RyaW5nICpXZWJDb25zb2xlTWVzc2FnZVRpcE1lc3NhZ2VMZXZlbCA9IEAiVGlwTWVzc2FnZUxl dmVsIjsKIE5TU3RyaW5nICpXZWJDb25zb2xlTWVzc2FnZUxvZ01lc3NhZ2VMZXZlbCA9IEAiTG9n TWVzc2FnZUxldmVsIjsKQEAgLTM1Nyw4ICszNTcsMTAgQEAgaW5saW5lIHN0YXRpYyBOU1N0cmlu ZyAqc3RyaW5nRm9yTWVzc2FnZVNvdXJjZShNZXNzYWdlU291cmNlIHNvdXJjZSkKICAgICAgICAg cmV0dXJuIFdlYkNvbnNvbGVNZXNzYWdlWE1MTWVzc2FnZVNvdXJjZTsKICAgICBjYXNlIEpTTWVz c2FnZVNvdXJjZToKICAgICAgICAgcmV0dXJuIFdlYkNvbnNvbGVNZXNzYWdlSlNNZXNzYWdlU291 cmNlOwotICAgIGNhc2UgQ1NTTWVzc2FnZVNvdXJjZToKLSAgICAgICAgcmV0dXJuIFdlYkNvbnNv bGVNZXNzYWdlQ1NTTWVzc2FnZVNvdXJjZTsKKyAgICBjYXNlIE5ldHdvcmtNZXNzYWdlU291cmNl OgorICAgICAgICByZXR1cm4gV2ViQ29uc29sZU1lc3NhZ2VOZXR3b3JrTWVzc2FnZVNvdXJjZTsK KyAgICBjYXNlIENvbnNvbGVBUElNZXNzYWdlU291cmNlOgorICAgICAgICByZXR1cm4gV2ViQ29u c29sZU1lc3NhZ2VDb25zb2xlQVBJTWVzc2FnZVNvdXJjZTsKICAgICBjYXNlIE90aGVyTWVzc2Fn ZVNvdXJjZToKICAgICAgICAgcmV0dXJuIFdlYkNvbnNvbGVNZXNzYWdlT3RoZXJNZXNzYWdlU291 cmNlOwogICAgIH0KQEAgLTM3MSw4ICszNzMsMTAgQEAgaW5saW5lIHN0YXRpYyBOU1N0cmluZyAq c3RyaW5nRm9yTWVzc2FnZVR5cGUoTWVzc2FnZVR5cGUgdHlwZSkKICAgICBzd2l0Y2ggKHR5cGUp IHsKICAgICBjYXNlIExvZ01lc3NhZ2VUeXBlOgogICAgICAgICByZXR1cm4gV2ViQ29uc29sZU1l c3NhZ2VMb2dNZXNzYWdlVHlwZTsKLSAgICBjYXNlIE9iamVjdE1lc3NhZ2VUeXBlOgotICAgICAg ICByZXR1cm4gV2ViQ29uc29sZU1lc3NhZ2VPYmplY3RNZXNzYWdlVHlwZTsKKyAgICBjYXNlIERp ck1lc3NhZ2VUeXBlOgorICAgICAgICByZXR1cm4gV2ViQ29uc29sZU1lc3NhZ2VEaXJNZXNzYWdl VHlwZTsKKyAgICBjYXNlIERpclhNTE1lc3NhZ2VUeXBlOgorICAgICAgICByZXR1cm4gV2ViQ29u c29sZU1lc3NhZ2VEaXJYTUxNZXNzYWdlVHlwZTsKICAgICBjYXNlIFRyYWNlTWVzc2FnZVR5cGU6 CiAgICAgICAgIHJldHVybiBXZWJDb25zb2xlTWVzc2FnZVRyYWNlTWVzc2FnZVR5cGU7CiAgICAg Y2FzZSBTdGFydEdyb3VwTWVzc2FnZVR5cGU6CkBAIC0zODMsMTAgKzM4Nyw2IEBAIGlubGluZSBz dGF0aWMgTlNTdHJpbmcgKnN0cmluZ0Zvck1lc3NhZ2VUeXBlKE1lc3NhZ2VUeXBlIHR5cGUpCiAg ICAgICAgIHJldHVybiBXZWJDb25zb2xlTWVzc2FnZUVuZEdyb3VwTWVzc2FnZVR5cGU7CiAgICAg Y2FzZSBBc3NlcnRNZXNzYWdlVHlwZToKICAgICAgICAgcmV0dXJuIFdlYkNvbnNvbGVNZXNzYWdl QXNzZXJ0TWVzc2FnZVR5cGU7Ci0gICAgY2FzZSBVbmNhdWdodEV4Y2VwdGlvbk1lc3NhZ2VUeXBl OgotICAgICAgICByZXR1cm4gV2ViQ29uc29sZU1lc3NhZ2VVbmNhdWdodEV4Y2VwdGlvbk1lc3Nh Z2VUeXBlOwotICAgIGNhc2UgTmV0d29ya0Vycm9yTWVzc2FnZVR5cGU6Ci0gICAgICAgIHJldHVy biBXZWJDb25zb2xlTWVzc2FnZU5ldHdvcmtFcnJvck1lc3NhZ2VUeXBlOwogICAgIH0KICAgICBB U1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICByZXR1cm4gQCIiOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9tYWMvV2ViVmlldy9XZWJVSURlbGVnYXRlUHJpdmF0ZS5oIGIvU291cmNlL1dlYktp dC9tYWMvV2ViVmlldy9XZWJVSURlbGVnYXRlUHJpdmF0ZS5oCmluZGV4IDM3MDQxZDQwOTBlZGE2 Yzg2MTNmNDVlZmZiNGUyNjg1ZjAyNGU2MWYuLjljOThmZGZjYzkwODNiOWQ1YTU4NDdjNzEzMTVj Y2ExM2U5Zjk5YzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVUlE ZWxlZ2F0ZVByaXZhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlVJRGVs ZWdhdGVQcml2YXRlLmgKQEAgLTk2LDE5ICs5NiwxOSBAQCBlbnVtIHsKIGV4dGVybiBOU1N0cmlu ZyAqV2ViQ29uc29sZU1lc3NhZ2VIVE1MTWVzc2FnZVNvdXJjZTsKIGV4dGVybiBOU1N0cmluZyAq V2ViQ29uc29sZU1lc3NhZ2VYTUxNZXNzYWdlU291cmNlOwogZXh0ZXJuIE5TU3RyaW5nICpXZWJD b25zb2xlTWVzc2FnZUpTTWVzc2FnZVNvdXJjZTsKLWV4dGVybiBOU1N0cmluZyAqV2ViQ29uc29s ZU1lc3NhZ2VDU1NNZXNzYWdlU291cmNlOworZXh0ZXJuIE5TU3RyaW5nICpXZWJDb25zb2xlTWVz c2FnZU5ldHdvcmtNZXNzYWdlU291cmNlOworZXh0ZXJuIE5TU3RyaW5nICpXZWJDb25zb2xlTWVz c2FnZUNvbnNvbGVBUElNZXNzYWdlU291cmNlOwogZXh0ZXJuIE5TU3RyaW5nICpXZWJDb25zb2xl TWVzc2FnZU90aGVyTWVzc2FnZVNvdXJjZTsKIAogLy8gTWVzc2FnZSBUeXBlcy4KIGV4dGVybiBO U1N0cmluZyAqV2ViQ29uc29sZU1lc3NhZ2VMb2dNZXNzYWdlVHlwZTsKLWV4dGVybiBOU1N0cmlu ZyAqV2ViQ29uc29sZU1lc3NhZ2VPYmplY3RNZXNzYWdlVHlwZTsKK2V4dGVybiBOU1N0cmluZyAq V2ViQ29uc29sZU1lc3NhZ2VEaXJNZXNzYWdlVHlwZTsKK2V4dGVybiBOU1N0cmluZyAqV2ViQ29u c29sZU1lc3NhZ2VEaXJYTUxNZXNzYWdlVHlwZTsKIGV4dGVybiBOU1N0cmluZyAqV2ViQ29uc29s ZU1lc3NhZ2VUcmFjZU1lc3NhZ2VUeXBlOwogZXh0ZXJuIE5TU3RyaW5nICpXZWJDb25zb2xlTWVz c2FnZVN0YXJ0R3JvdXBNZXNzYWdlVHlwZTsKIGV4dGVybiBOU1N0cmluZyAqV2ViQ29uc29sZU1l c3NhZ2VTdGFydEdyb3VwQ29sbGFwc2VkTWVzc2FnZVR5cGU7CiBleHRlcm4gTlNTdHJpbmcgKldl YkNvbnNvbGVNZXNzYWdlRW5kR3JvdXBNZXNzYWdlVHlwZTsKIGV4dGVybiBOU1N0cmluZyAqV2Vi Q29uc29sZU1lc3NhZ2VBc3NlcnRNZXNzYWdlVHlwZTsKLWV4dGVybiBOU1N0cmluZyAqV2ViQ29u c29sZU1lc3NhZ2VVbmNhdWdodEV4Y2VwdGlvbk1lc3NhZ2VUeXBlOwotZXh0ZXJuIE5TU3RyaW5n ICpXZWJDb25zb2xlTWVzc2FnZU5ldHdvcmtFcnJvck1lc3NhZ2VUeXBlOwogCiAvLyBNZXNzYWdl IExldmVscy4KIGV4dGVybiBOU1N0cmluZyAqV2ViQ29uc29sZU1lc3NhZ2VUaXBNZXNzYWdlTGV2 ZWw7Cg== 107879 2011-09-19 10:39:36 -0700 2011-09-19 10:53:23 -0700 [Patch] Review comments addressed bug-68342-20110919213933.patch text/plain 39004 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogOTU0MDQKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA3NjhjNDRhNDE2Nzc4YTFiNGMyNGE3 MzkwNTQwNjgzNDg1YWNiYmE5Li4wMWYwNDgwMGJkZTI3OWQwYmZkYWM4ZjIwYzVkMzNhZDcxNjE3 OTg4IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMDktMTkgIFBhdmVsIEZlbGRtYW4gIDxw ZmVsZG1hbkBnb29nbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IHN0cmVhbWxpbmUg Q29uc29sZSdzIE1lc3NhZ2VUeXBlIGFuZCBNZXNzYWdlU291cmNlIHNlbWFudGljcy4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY4MzQyCisKKyAgICAg ICAgVGhpcyBjaGFuZ2UgZml4ZXMgc2VtYW50aWNzIG9mIHRoZSBNZXNzYWdlU291cmNlIGFuZCBN ZXNzYWdlVHlwZToKKyAgICAgICAgTWVzc2FnZVNvdXJjZSBpcyBub3cgdGhlIHNvdXJjZSBvZiB0 aGUgbWVzc2FnZSAoYmUgaXQgTmV0d29yaywgSFRNTAorICAgICAgICBwYXJzZXIgb3IgQ29uc29s ZSBBUEkpLiBNZXNzYWdlVHlwZSBpcyBvbmx5IGRlZmluZWQgZm9yIHRoZSBDb25zb2xlIEFQSQor ICAgICAgICBtZXNzYWdlcyBhbmQgY29udGFpbnMgdGhlIG5hbWUgb2YgdGhlIEFQSSBjYWxsIChs b2csIGRpciwgZGlyeG1sLCBldGMuKS4KKyAgICAgICAgU3Vic2VxdWVudCBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjYzNzEgd2lsbCBtYWtlIE1lc3NhZ2VUeXBlCisg ICAgICAgIHByaXZhdGUgdG8gdGhlIGluc3BlY3Rvci4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9wcm90b2NvbC9jb25zb2xlLWFn ZW50LWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiBwbGF0Zm9ybS9jaHJvbWl1bS9odHRwL3Rlc3Rz L2luc3BlY3Rvci9jb25zb2xlLXJlc291cmNlLWVycm9ycy1leHBlY3RlZC50eHQ6IEFkZGVkLgor CiAyMDExLTA5LTE4ICBJbHlhIFRpa2hvbm92c2t5ICA8bG9pc2xvQGNocm9taXVtLm9yZz4KIAog ICAgICAgICBXZWIgSW5zcGVjdG9yOiByZXF1ZXN0QW5pbWF0aW9uRnJhbWUgY2FsbGJhY2tzIGRv bid0IHNob3cgdXAgaW4gdGhlIHRpbWVsaW5lIHBhbmVsLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvaW5zcGVjdG9yL3Byb3RvY29sL2NvbnNvbGUtYWdlbnQtZXhwZWN0ZWQudHh0IGIvTGF5b3V0 VGVzdHMvaW5zcGVjdG9yL3Byb3RvY29sL2NvbnNvbGUtYWdlbnQtZXhwZWN0ZWQudHh0CmluZGV4 IGUwM2NjZTJiZWZiNDBiNjA5MGIzNjRkZjJkODMxMGVlMDE1YWQ0NjAuLjhlMDhjYzAyYjIwNGFj ZWEwMjI5NTE5YTIwN2FjYzJiOWNhODdlOGQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3Bl Y3Rvci9wcm90b2NvbC9jb25zb2xlLWFnZW50LWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0 cy9pbnNwZWN0b3IvcHJvdG9jb2wvY29uc29sZS1hZ2VudC1leHBlY3RlZC50eHQKQEAgLTUzLDgg KzUzLDggQEAgZXZlbnQgQ29uc29sZUFnZW50Lm1lc3NhZ2VBZGRlZAogewogICAgIG1ldGhvZCA6 ICJDb25zb2xlLm1lc3NhZ2VBZGRlZCIKICAgICBwYXJhbXMgOiB7Ci0gICAgICAgIG1lc3NhZ2VP YmogOiB7Ci0gICAgICAgICAgICBzb3VyY2UgOiAiamF2YXNjcmlwdCIKKyAgICAgICAgbWVzc2Fn ZSA6IHsKKyAgICAgICAgICAgIHNvdXJjZSA6ICJjb25zb2xlLWFwaSIKICAgICAgICAgICAgIHR5 cGUgOiAibG9nIgogICAgICAgICAgICAgbGV2ZWwgOiAibG9nIgogICAgICAgICAgICAgbGluZSA6 IDAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2Nocm9taXVtL2h0dHAvdGVzdHMv aW5zcGVjdG9yL2NvbnNvbGUtcmVzb3VyY2UtZXJyb3JzLWV4cGVjdGVkLnR4dCBiL0xheW91dFRl c3RzL3BsYXRmb3JtL2Nocm9taXVtL2h0dHAvdGVzdHMvaW5zcGVjdG9yL2NvbnNvbGUtcmVzb3Vy Y2UtZXJyb3JzLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5lZmM3OTQzNWM0NzA4M2Q2MDkyZjAy YjU3Y2E2MjcxMDM4NjMxZGE0Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZv cm0vY2hyb21pdW0vaHR0cC90ZXN0cy9pbnNwZWN0b3IvY29uc29sZS1yZXNvdXJjZS1lcnJvcnMt ZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsOCBAQAorVGVzdHMgdGhhdCBlcnJvcnMgdG8gbG9hZCBh IHJlc291cmNlIGNhdXNlIGVycm9yIG1lc3NhZ2VzIHRvIGJlIGxvZ2dlZCB0byBjb25zb2xlLgor CisKK0dFVCBodHRwOi8vMTI3LjAuMC4xOjgwMDAvaW5zcGVjdG9yL21pc3NpbmcuY3NzIDQwNCAo Tm90IEZvdW5kKSBjb25zb2xlLW1lc3NhZ2UgY29uc29sZS1lcnJvci1sZXZlbAorR0VUIGh0dHA6 Ly8xMjcuMC4wLjE6ODAwMC9pbnNwZWN0b3Ivbm9uLWV4aXN0ZW50LWlmcmFtZS5odG1sIDQwNCAo Tm90IEZvdW5kKSBjb25zb2xlLW1lc3NhZ2UgY29uc29sZS1lcnJvci1sZXZlbAorR0VUIGh0dHA6 Ly8xMjcuMC4wLjE6ODAwMC9pbnNwZWN0b3Ivbm9uLWV4aXN0ZW50LXNjcmlwdC5qcyA0MDQgKE5v dCBGb3VuZCkgY29uc29sZS1tZXNzYWdlIGNvbnNvbGUtZXJyb3ItbGV2ZWwKK0dFVCBodHRwOi8v MTI3LjAuMC4xOjgwMDAvaW5zcGVjdG9yL25vbi1leGlzdGVudC14aHIgNDA0IChOb3QgRm91bmQp bG9hZFhIUmNvbnNvbGUtcmVzb3VyY2UtZXJyb3JzLmh0bWw6MThwZXJmb3JtQWN0aW9uc2NvbnNv bGUtcmVzb3VyY2UtZXJyb3JzLmh0bWw6MTAoYW5vbnltb3VzIGZ1bmN0aW9uKUluamVjdGVkU2Ny aXB0Ll9ldmFsdWF0ZU9uSW5qZWN0ZWRTY3JpcHQuX2V2YWx1YXRlQW5kV3JhcEluamVjdGVkU2Ny aXB0LmV2YWx1YXRlIGNvbnNvbGUtbWVzc2FnZSBjb25zb2xlLWVycm9yLWxldmVsCisKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxv ZwppbmRleCA0MGJiZjYwNjAwZDEyZTE1NjkwZGExZjZjNjgyYjY0OWM4NmUzOTIzLi4yYmU3NjMz OTIxNzFjMDMwMTk0YzYyYTU4MTZkZWIwODBjMmU2NThlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs NDMgQEAKKzIwMTEtMDktMTkgIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgor CisgICAgICAgIFdlYiBJbnNwZWN0b3I6IHN0cmVhbWxpbmUgQ29uc29sZSdzIE1lc3NhZ2VUeXBl IGFuZCBNZXNzYWdlU291cmNlIHNlbWFudGljcy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTY4MzQyCisKKyAgICAgICAgVGhpcyBjaGFuZ2UgZml4ZXMg c2VtYW50aWNzIG9mIHRoZSBNZXNzYWdlU291cmNlIGFuZCBNZXNzYWdlVHlwZToKKyAgICAgICAg TWVzc2FnZVNvdXJjZSBpcyBub3cgdGhlIHNvdXJjZSBvZiB0aGUgbWVzc2FnZSAoYmUgaXQgTmV0 d29yaywgSFRNTAorICAgICAgICBwYXJzZXIgb3IgQ29uc29sZSBBUEkpLiBNZXNzYWdlVHlwZSBp cyBvbmx5IGRlZmluZWQgZm9yIHRoZSBDb25zb2xlIEFQSQorICAgICAgICBtZXNzYWdlcyBhbmQg Y29udGFpbnMgdGhlIG5hbWUgb2YgdGhlIEFQSSBjYWxsIChsb2csIGRpciwgZGlyeG1sLCBldGMu KS4KKyAgICAgICAgU3Vic2VxdWVudCBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NjYzNzEgd2lsbCBtYWtlIE1lc3NhZ2VUeXBlCisgICAgICAgIHByaXZhdGUgdG8gdGhl IGluc3BlY3Rvci4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIGRvbS9Eb2N1bWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6bG9n RXhjZXB0aW9uVG9Db25zb2xlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvQ29uc29sZU1lc3NhZ2Uu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6bWVzc2FnZVNvdXJjZVZhbHVlKToKKyAgICAgICAgKFdl YkNvcmU6Om1lc3NhZ2VUeXBlVmFsdWUpOgorICAgICAgICAoV2ViQ29yZTo6Q29uc29sZU1lc3Nh Z2U6OmFkZFRvRnJvbnRlbmQpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3IuanNvbjoK KyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yQ29uc29sZUFnZW50LmNwcDoKKyAgICAgICAg KFdlYkNvcmU6Okluc3BlY3RvckNvbnNvbGVBZ2VudDo6ZGlkUmVjZWl2ZVJlc3BvbnNlKToKKyAg ICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNvbnNvbGVBZ2VudDo6ZGlkRmFpbExvYWRpbmcpOgor ICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZU1lc3NhZ2UuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuY3JlYXRlVGV4dE1lc3NhZ2UpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLnByb3RvdHlwZS5fZm9ybWF0TWVzc2FnZSk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UucHJvdG90eXBlLnRvU3RyaW5n KToKKyAgICAgICAgKiBwYWdlL0NvbnNvbGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6cHJpbnRN ZXNzYWdlU291cmNlQW5kTGV2ZWxQcmVmaXgpOgorICAgICAgICAoV2ViQ29yZTo6Q29uc29sZTo6 YWRkTWVzc2FnZSk6CisgICAgICAgIChXZWJDb3JlOjpDb25zb2xlOjpkaXIpOgorICAgICAgICAo V2ViQ29yZTo6Q29uc29sZTo6ZGlyeG1sKToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnNvbGU6Omdy b3VwKToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnNvbGU6Omdyb3VwQ29sbGFwc2VkKToKKyAgICAg ICAgKFdlYkNvcmU6OkNvbnNvbGU6Omdyb3VwRW5kKToKKyAgICAgICAgKiBwYWdlL0NvbnNvbGVU eXBlcy5oOgorICAgICAgICAqIHdlYnNvY2tldHMvV2ViU29ja2V0Q2hhbm5lbC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpXZWJTb2NrZXRDaGFubmVsOjpkaWRGYWlsU29ja2V0U3RyZWFtKToKKwog MjAxMS0wOS0xOCAgSWx5YSBUaWtob25vdnNreSAgPGxvaXNsb0BjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgV2ViIEluc3BlY3RvcjogcmVxdWVzdEFuaW1hdGlvbkZyYW1lIGNhbGxiYWNrcyBkb24n dCBzaG93IHVwIGluIHRoZSB0aW1lbGluZSBwYW5lbC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2RvbS9Eb2N1bWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCmlu ZGV4IDE5NDNmYWU3ODJmNDNjYzE3MjhjMzczNmI1YTI0ZWI5M2M3MWMzYzIuLjUyNzY5MjBlOTZj ZjU0Njc5YjkxZGY2NGVlZDJlOWZkM2U4ZjAxMzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2RvbS9Eb2N1bWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcApA QCAtMjM1Nyw4ICsyMzU3LDcgQEAgRXZlbnRUYXJnZXQqIERvY3VtZW50OjplcnJvckV2ZW50VGFy Z2V0KCkKIAogdm9pZCBEb2N1bWVudDo6bG9nRXhjZXB0aW9uVG9Db25zb2xlKGNvbnN0IFN0cmlu ZyYgZXJyb3JNZXNzYWdlLCBpbnQgbGluZU51bWJlciwgY29uc3QgU3RyaW5nJiBzb3VyY2VVUkws IFBhc3NSZWZQdHI8U2NyaXB0Q2FsbFN0YWNrPiBjYWxsU3RhY2spCiB7Ci0gICAgTWVzc2FnZVR5 cGUgbWVzc2FnZVR5cGUgPSBjYWxsU3RhY2sgPyBVbmNhdWdodEV4Y2VwdGlvbk1lc3NhZ2VUeXBl IDogTG9nTWVzc2FnZVR5cGU7Ci0gICAgYWRkTWVzc2FnZShKU01lc3NhZ2VTb3VyY2UsIG1lc3Nh Z2VUeXBlLCBFcnJvck1lc3NhZ2VMZXZlbCwgZXJyb3JNZXNzYWdlLCBsaW5lTnVtYmVyLCBzb3Vy Y2VVUkwsIGNhbGxTdGFjayk7CisgICAgYWRkTWVzc2FnZShKU01lc3NhZ2VTb3VyY2UsIExvZ01l c3NhZ2VUeXBlLCBFcnJvck1lc3NhZ2VMZXZlbCwgZXJyb3JNZXNzYWdlLCBsaW5lTnVtYmVyLCBz b3VyY2VVUkwsIGNhbGxTdGFjayk7CiB9CiAKIHZvaWQgRG9jdW1lbnQ6OnNldFVSTChjb25zdCBL VVJMJiB1cmwpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvQ29uc29sZU1l c3NhZ2UuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0NvbnNvbGVNZXNzYWdlLmNwcApp bmRleCAwYmM0YmExN2U0ZGEwYzVkNDIyZGNmOTE2NDQwMzk1YTBhODM1ZTM0Li5kNDRhNDk1OTA4 MzQzMDkyM2E3ZTExMTdkNjYzYTRjOTg2NmIyYzU4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvQ29uc29sZU1lc3NhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9Db25zb2xlTWVzc2FnZS5jcHAKQEAgLTkxLDcgKzkxLDggQEAgc3RhdGljIFN0cmluZyBt ZXNzYWdlU291cmNlVmFsdWUoTWVzc2FnZVNvdXJjZSBzb3VyY2UpCiAgICAgY2FzZSBIVE1MTWVz c2FnZVNvdXJjZTogcmV0dXJuICJodG1sIjsKICAgICBjYXNlIFhNTE1lc3NhZ2VTb3VyY2U6IHJl dHVybiAieG1sIjsKICAgICBjYXNlIEpTTWVzc2FnZVNvdXJjZTogcmV0dXJuICJqYXZhc2NyaXB0 IjsKLSAgICBjYXNlIENTU01lc3NhZ2VTb3VyY2U6IHJldHVybiAiY3NzIjsKKyAgICBjYXNlIE5l dHdvcmtNZXNzYWdlU291cmNlOiByZXR1cm4gIm5ldHdvcmsiOworICAgIGNhc2UgQ29uc29sZUFQ SU1lc3NhZ2VTb3VyY2U6IHJldHVybiAiY29uc29sZS1hcGkiOwogICAgIGNhc2UgT3RoZXJNZXNz YWdlU291cmNlOiByZXR1cm4gIm90aGVyIjsKICAgICB9CiAgICAgcmV0dXJuICJvdGhlciI7CkBA IC0xMDEsMTQgKzEwMiwxMyBAQCBzdGF0aWMgU3RyaW5nIG1lc3NhZ2VUeXBlVmFsdWUoTWVzc2Fn ZVR5cGUgdHlwZSkKIHsKICAgICBzd2l0Y2ggKHR5cGUpIHsKICAgICBjYXNlIExvZ01lc3NhZ2VU eXBlOiByZXR1cm4gImxvZyI7Ci0gICAgY2FzZSBPYmplY3RNZXNzYWdlVHlwZTogcmV0dXJuICJv dGhlciI7CisgICAgY2FzZSBEaXJNZXNzYWdlVHlwZTogcmV0dXJuICJkaXIiOworICAgIGNhc2Ug RGlyWE1MTWVzc2FnZVR5cGU6IHJldHVybiAiZGlyWE1MIjsKICAgICBjYXNlIFRyYWNlTWVzc2Fn ZVR5cGU6IHJldHVybiAidHJhY2UiOwogICAgIGNhc2UgU3RhcnRHcm91cE1lc3NhZ2VUeXBlOiBy ZXR1cm4gInN0YXJ0R3JvdXAiOwogICAgIGNhc2UgU3RhcnRHcm91cENvbGxhcHNlZE1lc3NhZ2VU eXBlOiByZXR1cm4gInN0YXJ0R3JvdXBDb2xsYXBzZWQiOwogICAgIGNhc2UgRW5kR3JvdXBNZXNz YWdlVHlwZTogcmV0dXJuICJlbmRHcm91cCI7CiAgICAgY2FzZSBBc3NlcnRNZXNzYWdlVHlwZTog cmV0dXJuICJhc3NlcnQiOwotICAgIGNhc2UgVW5jYXVnaHRFeGNlcHRpb25NZXNzYWdlVHlwZTog cmV0dXJuICJ1bmNhdWdodEV4Y2VwdGlvbiI7Ci0gICAgY2FzZSBOZXR3b3JrRXJyb3JNZXNzYWdl VHlwZTogcmV0dXJuICJuZXR3b3JrRXJyb3IiOwogICAgIH0KICAgICByZXR1cm4gIm90aGVyIjsK IH0KQEAgLTEyOSwxMyArMTI5LDE0IEBAIHZvaWQgQ29uc29sZU1lc3NhZ2U6OmFkZFRvRnJvbnRl bmQoSW5zcGVjdG9yRnJvbnRlbmQ6OkNvbnNvbGUqIGZyb250ZW5kLCBJbmplY3RlCiB7CiAgICAg UmVmUHRyPEluc3BlY3Rvck9iamVjdD4ganNvbk9iaiA9IEluc3BlY3Rvck9iamVjdDo6Y3JlYXRl KCk7CiAgICAganNvbk9iai0+c2V0U3RyaW5nKCJzb3VyY2UiLCBtZXNzYWdlU291cmNlVmFsdWUo bV9zb3VyY2UpKTsKKyAgICAvLyBGSVhNRTogb25seSBzZW5kIG91dCB0eXBlIGZvciBDb25zb2xl QVBJIHNvdXJjZSBtZXNzYWdlcy4KICAgICBqc29uT2JqLT5zZXRTdHJpbmcoInR5cGUiLCBtZXNz YWdlVHlwZVZhbHVlKG1fdHlwZSkpOwogICAgIGpzb25PYmotPnNldFN0cmluZygibGV2ZWwiLCBt ZXNzYWdlTGV2ZWxWYWx1ZShtX2xldmVsKSk7CiAgICAganNvbk9iai0+c2V0TnVtYmVyKCJsaW5l Iiwgc3RhdGljX2Nhc3Q8aW50PihtX2xpbmUpKTsKICAgICBqc29uT2JqLT5zZXRTdHJpbmcoInVy bCIsIG1fdXJsKTsKICAgICBqc29uT2JqLT5zZXROdW1iZXIoInJlcGVhdENvdW50Iiwgc3RhdGlj X2Nhc3Q8aW50PihtX3JlcGVhdENvdW50KSk7CiAgICAganNvbk9iai0+c2V0U3RyaW5nKCJ0ZXh0 IiwgbV9tZXNzYWdlKTsKLSAgICBpZiAobV90eXBlID09IE5ldHdvcmtFcnJvck1lc3NhZ2VUeXBl KSAKKyAgICBpZiAobV9zb3VyY2UgPT0gTmV0d29ya01lc3NhZ2VTb3VyY2UgJiYgIW1fcmVxdWVz dElkLmlzRW1wdHkoKSkKICAgICAgICAganNvbk9iai0+c2V0U3RyaW5nKCJuZXR3b3JrUmVxdWVz dElkIiwgbV9yZXF1ZXN0SWQpOwogICAgIGlmIChtX2FyZ3VtZW50cyAmJiBtX2FyZ3VtZW50cy0+ YXJndW1lbnRDb3VudCgpKSB7CiAgICAgICAgIEluamVjdGVkU2NyaXB0IGluamVjdGVkU2NyaXB0 ID0gaW5qZWN0ZWRTY3JpcHRNYW5hZ2VyLT5pbmplY3RlZFNjcmlwdEZvcihtX2FyZ3VtZW50cy0+ Z2xvYmFsU3RhdGUoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yLmpzb24gYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24KaW5k ZXggYTkzNzc1MTQ5NWEyNDE2MjEzMDM3YmZkMzA5YTUxYjZmODA3M2FmYy4uNTAyOGQ0YmE2YThm ODJjNGQxOWExOWMwMjllMWYzOTY5YWYwNmRjOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3Rvci5qc29uCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3IuanNvbgpAQCAtMzMyLDIyICszMzIsMjIgQEAKICAgICB9LAogICAgIHsKICAgICAg ICAgImRvbWFpbiI6ICJDb25zb2xlIiwKLSAgICAgICAgImRlc2NyaXB0aW9uIjogIkNvbnNvbGUg ZG9tYWluIGRlZmluZXMgbWV0aG9kcyBhbmQgZXZlbnRzIGZvciBpbnRlcmFjdGlvbiB3aXRoIHRo ZSBKYXZhU2NyaXB0IGNvbnNvbGUuIENvbnNvbGUgY29sbGVjdHMgbWVzc2FnZXMgY3JlYXRlZCBi eSBtZWFucyBvZiB0aGUgPGEgaHJlZj0naHR0cDovL2dldGZpcmVidWcuY29tL3dpa2kvaW5kZXgu cGhwL0NvbnNvbGVfQVBJJz5KYXZhU2NyaXB0IENvbnNvbGUgQVBJPC9hPi4gT25lIG5lZWRzIHRv IGVuYWJsZSB0aGlzIGRvbWFpbiB1c2luZyA8Y29kZT5lbmFibGU8L2NvZGU+IGZ1bmN0aW9uIGlu IG9yZGVyIHRvIHN0YXJ0IHJlY2VpdmluZyB0aGUgY29uc29sZSBtZXNzYWdlcy4gQnJvd3NlciB3 aWxsIGNvbGxlY3QgbWVzc2FnZXMgaXNzdWVkIHdoaWxlIGNvbnNvbGUgZG9tYWluIGlzIG5vdCBl bmFibGVkIGFuZCB3aWxsIHJlcG9ydCB0aGVtIHVzaW5nIDxjb2RlPm1lc3NhZ2VBZGRlZDwvY29k ZT4gbm90aWZpY2F0aW9uIHVwb24gZW5hYmxpbmcuIiwKKyAgICAgICAgImRlc2NyaXB0aW9uIjog IkNvbnNvbGUgZG9tYWluIGRlZmluZXMgbWV0aG9kcyBhbmQgZXZlbnRzIGZvciBpbnRlcmFjdGlv biB3aXRoIHRoZSBKYXZhU2NyaXB0IGNvbnNvbGUuIENvbnNvbGUgY29sbGVjdHMgbWVzc2FnZXMg Y3JlYXRlZCBieSBtZWFucyBvZiB0aGUgPGEgaHJlZj0naHR0cDovL2dldGZpcmVidWcuY29tL3dp a2kvaW5kZXgucGhwL0NvbnNvbGVfQVBJJz5KYXZhU2NyaXB0IENvbnNvbGUgQVBJPC9hPi4gT25l IG5lZWRzIHRvIGVuYWJsZSB0aGlzIGRvbWFpbiB1c2luZyA8Y29kZT5lbmFibGU8L2NvZGU+IGNv bW1hbmQgaW4gb3JkZXIgdG8gc3RhcnQgcmVjZWl2aW5nIHRoZSBjb25zb2xlIG1lc3NhZ2VzLiBC cm93c2VyIGNvbGxlY3RzIG1lc3NhZ2VzIGlzc3VlZCB3aGlsZSBjb25zb2xlIGRvbWFpbiBpcyBu b3QgZW5hYmxlZCBhcyB3ZWxsIGFuZCByZXBvcnRzIHRoZW0gdXNpbmcgPGNvZGU+bWVzc2FnZUFk ZGVkPC9jb2RlPiBub3RpZmljYXRpb24gdXBvbiBlbmFibGluZy4iLAogICAgICAgICAidHlwZXMi OiBbCiAgICAgICAgICAgICB7CiAgICAgICAgICAgICAgICAgImlkIjogIkNvbnNvbGVNZXNzYWdl IiwKICAgICAgICAgICAgICAgICAidHlwZSI6ICJvYmplY3QiLAogICAgICAgICAgICAgICAgICJk ZXNjcmlwdGlvbiI6ICJDb25zb2xlIG1lc3NhZ2UuIiwKICAgICAgICAgICAgICAgICAicHJvcGVy dGllcyI6IFsKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJzb3VyY2UiLCAidHlwZSI6 ICJzdHJpbmciLCAiZW51bSI6IFsiaHRtbCIsICJ3bWwiLCAieG1sIiwgImphdmFzY3JpcHQiLCAi Y3NzIiwgIm90aGVyIl0sICJkZXNjcmlwdGlvbiI6ICJNZXNzYWdlIHNvdXJjZS4iIH0sCi0gICAg ICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAidHlwZSIsICJ0eXBlIjogInN0cmluZyIsICJlbnVt IjogWyJsb2ciLCAib3RoZXIiLCAidHJhY2UiLCAic3RhcnRHcm91cCIsICJzdGFydEdyb3VwQ29s bGFwc2VkIiwgImVuZEdyb3VwIiwgImFzc2VydCIsICJ1bmNhdWdodEV4Y2VwdGlvbiIsICJuZXR3 b3JrRXJyb3IiLCAicmVzdWx0Il0sICJkZXNjcmlwdGlvbiI6ICJNZXNzYWdlIHR5cGUuIiB9LAor ICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInNvdXJjZSIsICJ0eXBlIjogInN0cmluZyIs ICJlbnVtIjogWyJodG1sIiwgIndtbCIsICJ4bWwiLCAiamF2YXNjcmlwdCIsICJuZXR3b3JrIiwg ImNvbnNvbGUtYXBpIiwgIm90aGVyIl0sICJkZXNjcmlwdGlvbiI6ICJNZXNzYWdlIHNvdXJjZS4i IH0sCisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAidHlwZSIsICJ0eXBlIjogInN0cmlu ZyIsICJlbnVtIjogWyJsb2ciLCAiZGlyIiwgImRpcnhtbCIsICJ0cmFjZSIsICJzdGFydEdyb3Vw IiwgInN0YXJ0R3JvdXBDb2xsYXBzZWQiLCAiZW5kR3JvdXAiLCAiYXNzZXJ0Il0sICJkZXNjcmlw dGlvbiI6ICJDb25zb2xlIG1lc3NhZ2UgdHlwZS4iIH0sCiAgICAgICAgICAgICAgICAgICAgIHsg Im5hbWUiOiAibGV2ZWwiLCAidHlwZSI6ICJzdHJpbmciLCAiZW51bSI6IFsidGlwIiwgImxvZyIs ICJ3YXJuaW5nIiwgImVycm9yIiwgImRlYnVnIl0sICJkZXNjcmlwdGlvbiI6ICJNZXNzYWdlIHNl dmVyaXR5LiIgfSwKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJsaW5lIiwgInR5cGUi OiAiaW50ZWdlciIsICJkZXNjcmlwdGlvbiI6ICJMaW5lIG51bWJlciBpbiB0aGUgbWVzc2FnZSBv cmlnaW4gcmVzb3VyY2UuIiB9LAorICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImxpbmUi LCAidHlwZSI6ICJpbnRlZ2VyIiwgImRlc2NyaXB0aW9uIjogIkxpbmUgbnVtYmVyIGluIHRoZSBy ZXNvdXJjZSB0aGF0IGdlbmVyYXRlZCB0aGlzIG1lc3NhZ2UuIiB9LAogICAgICAgICAgICAgICAg ICAgICB7ICJuYW1lIjogInVybCIsICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJV Ukwgb2YgdGhlIG1lc3NhZ2Ugb3JpZ2luLiIgfSwKICAgICAgICAgICAgICAgICAgICAgeyAibmFt ZSI6ICJyZXBlYXRDb3VudCIsICJ0eXBlIjogImludGVnZXIiLCAiZGVzY3JpcHRpb24iOiAiUmVw ZWF0IGNvdW50IGZvciByZXBlYXRlZCBtZXNzYWdlcy4iIH0sCiAgICAgICAgICAgICAgICAgICAg IHsgIm5hbWUiOiAidGV4dCIsICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJNZXNz YWdlIHRleHQuIiB9LAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogIm5ldHdvcmtSZXF1 ZXN0SWQiLCAiJHJlZiI6ICJOZXR3b3JrLlJlcXVlc3RJZCIsICJvcHRpb25hbCI6IHRydWUsICJk ZXNjcmlwdGlvbiI6ICJJZGVudGlmaWVyIG9mIHRoZSBuZXR3b3JrIHJlcXVlc3QgYXNzb2NpYXRl ZCB3aXRoIHRoaXMgbWVzc2FnZS4iIH0sCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAi cGFyYW1ldGVycyIsICJ0eXBlIjogImFycmF5IiwgIml0ZW1zIjogeyAiJHJlZiI6ICJSdW50aW1l LlJlbW90ZU9iamVjdCIgfSwgImRlc2NyaXB0aW9uIjogIk1lc3NhZ2UgcGFyYW1ldGVycyBpbiBj YXNlIG9mIHRoZSBmb3JtYXR0ZWQgbWVzc2FnZS4iIH0sCisgICAgICAgICAgICAgICAgICAgIHsg Im5hbWUiOiAicGFyYW1ldGVycyIsICJ0eXBlIjogImFycmF5IiwgIml0ZW1zIjogeyAiJHJlZiI6 ICJSdW50aW1lLlJlbW90ZU9iamVjdCIgfSwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9u IjogIk1lc3NhZ2UgcGFyYW1ldGVycyBpbiBjYXNlIG9mIHRoZSBmb3JtYXR0ZWQgbWVzc2FnZS4i IH0sCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAic3RhY2tUcmFjZSIsICIkcmVmIjog IlN0YWNrVHJhY2UiLCAiZGVzY3JpcHRpb24iOiAiSmF2YVNjcmlwdCBzdGFjayB0cmFjZSBmb3Ig YXNzZXJ0aW9ucyBhbmQgZXJyb3IgbWVzc2FnZXMuIiB9CiAgICAgICAgICAgICAgICAgXQogICAg ICAgICAgICAgfSwKQEAgLTM3MywxMyArMzczLDEzIEBACiAgICAgICAgICAgICB7CiAgICAgICAg ICAgICAgICAgIm5hbWUiOiAiZW5hYmxlIiwKICAgICAgICAgICAgICAgICAicmV0dXJucyI6IFsK LSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJleHBpcmVkTWVzc2FnZXNDb3VudCIsICJ0 eXBlIjogImludGVnZXIiLCAiZGVzY3JpcHRpb24iOiAiTnVtYmVyIG9mIG1lc3NhZ2VzIGNvbGxl Y3RlZCBkdWUgdG8gbWVzc2FnZSB0aHJlYXNob2xkIG92ZXJmbG93LiIgfQorICAgICAgICAgICAg ICAgICAgICB7ICJuYW1lIjogImV4cGlyZWRNZXNzYWdlc0NvdW50IiwgInR5cGUiOiAiaW50ZWdl ciIsICJkZXNjcmlwdGlvbiI6ICJOdW1iZXIgb2YgbWVzc2FnZXMgZHJvcHBlZCBkdWUgdG8gbWVz c2FnZSB0aHJlYXNob2xkIG92ZXJmbG93LiIgfQogICAgICAgICAgICAgICAgIF0sCiAgICAgICAg ICAgICAgICAgImRlc2NyaXB0aW9uIjogIkVuYWJsZXMgY29uc29sZSBkb21haW4sIHNlbmRzIHRo ZSBtZXNzYWdlcyBjb2xsZWN0ZWQgc28gZmFyIHRvIHRoZSBjbGllbnQgYnkgbWVhbnMgb2YgdGhl IDxjb2RlPm1lc3NhZ2VBZGRlZDwvY29kZT4gbm90aWZpY2F0aW9uLiIgCiAgICAgICAgICAgICB9 LAogICAgICAgICAgICAgewogICAgICAgICAgICAgICAgICJuYW1lIjogImRpc2FibGUiLAotICAg ICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJEaXNhYmxlcyBjb25zb2xlIGRvbWFpbiwgcHJl dmVudHMgZnVydGhlciBjb25zb2xlIG1lc3NhZ2VzIGZyb20gYmVpbmcgc2VudCB0byB0aGUgY2xp ZW50LiIgCisgICAgICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIkRpc2FibGVzIGNvbnNvbGUg ZG9tYWluLCBwcmV2ZW50cyBmdXJ0aGVyIGNvbnNvbGUgbWVzc2FnZXMgZnJvbSBiZWluZyByZXBv cnRlZCB0byB0aGUgY2xpZW50LiIgCiAgICAgICAgICAgICB9LAogICAgICAgICAgICAgewogICAg ICAgICAgICAgICAgICJuYW1lIjogImNsZWFyTWVzc2FnZXMiLApAQCAtNDA2LDcgKzQwNiw3IEBA CiAgICAgICAgICAgICB7CiAgICAgICAgICAgICAgICAgIm5hbWUiOiAibWVzc2FnZUFkZGVkIiwK ICAgICAgICAgICAgICAgICAicGFyYW1ldGVycyI6IFsKLSAgICAgICAgICAgICAgICAgICAgeyAi bmFtZSI6ICJtZXNzYWdlT2JqIiwgIiRyZWYiOiAiQ29uc29sZU1lc3NhZ2UiLCAiZGVzY3JpcHRp b24iOiAiQ29uc29sZSBtZXNzYWdlIHRoYXQgaGFzIGJlZW4gYWRkZWQuIiB9CisgICAgICAgICAg ICAgICAgICAgIHsgIm5hbWUiOiAibWVzc2FnZSIsICIkcmVmIjogIkNvbnNvbGVNZXNzYWdlIiwg ImRlc2NyaXB0aW9uIjogIkNvbnNvbGUgbWVzc2FnZSB0aGF0IGhhcyBiZWVuIGFkZGVkLiIgfQog ICAgICAgICAgICAgICAgIF0sCiAgICAgICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIklzc3Vl ZCB3aGVuIG5ldyBjb25zb2xlIG1lc3NhZ2UgaXMgYWRkZWQuIgogICAgICAgICAgICAgfSwKQEAg LTQxNSwxMSArNDE1LDExIEBACiAgICAgICAgICAgICAgICAgInBhcmFtZXRlcnMiOiBbCiAgICAg ICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiY291bnQiLCAidHlwZSI6ICJpbnRlZ2VyIiwgImRl c2NyaXB0aW9uIjogIk5ldyByZXBlYXQgY291bnQgdmFsdWUuIiB9CiAgICAgICAgICAgICAgICAg XSwKLSAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiSXNzdWVkIHdoZW4gc3Vic2VxdWVu dCBtZXNzYWdlKHMpIGFyZSBlcXVhbCB0byB0aGUgcHJldmlvdXMgb25lLiIKKyAgICAgICAgICAg ICAgICAiZGVzY3JpcHRpb24iOiAiSXNzdWVkIHdoZW4gc3Vic2VxdWVudCBtZXNzYWdlKHMpIGFy ZSBlcXVhbCB0byB0aGUgcHJldmlvdXMgb25lKHMpLiIKICAgICAgICAgICAgIH0sCiAgICAgICAg ICAgICB7CiAgICAgICAgICAgICAgICAgIm5hbWUiOiAibWVzc2FnZXNDbGVhcmVkIiwKLSAgICAg ICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiSXNzdWVkIHdoZW4gY29uc29sZSBpcyBjbGVhcmVk LiIKKyAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiSXNzdWVkIHdoZW4gY29uc29sZSBp cyBjbGVhcmVkLiBUaGlzIGhhcHBlbnMgZWl0aGVyIHVwb24gPGNvZGU+Y2xlYXJNZXNzYWdlczwv Y29kZT4gY29tbWFuZCBvciBhZnRlciBwYWdlIG5hdmlnYXRpb24uIgogICAgICAgICAgICAgfQog ICAgICAgICBdCiAgICAgfSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JDb25zb2xlQWdlbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3RvckNvbnNvbGVBZ2VudC5jcHAKaW5kZXggZDZiMzI2ODk1MzViM2QwYWQyODNlNTg1YmQ1ZThm MDA2NDIzZDgzYS4uOTFlNDAyN2Y3YjUzOWE3ZjRkZTcwMWZjYWU1MzQ1YWRjNDhjODMwNiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnNvbGVBZ2VudC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnNvbGVBZ2VudC5j cHAKQEAgLTIyNyw3ICsyMjcsNyBAQCB2b2lkIEluc3BlY3RvckNvbnNvbGVBZ2VudDo6ZGlkUmVj ZWl2ZVJlc3BvbnNlKHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgY29uc3QgUgogICAgIGlmIChy ZXNwb25zZS5odHRwU3RhdHVzQ29kZSgpID49IDQwMCkgewogICAgICAgICBTdHJpbmcgbWVzc2Fn ZSA9ICJGYWlsZWQgdG8gbG9hZCByZXNvdXJjZTogdGhlIHNlcnZlciByZXNwb25kZWQgd2l0aCBh IHN0YXR1cyBvZiAiICsgU3RyaW5nOjpudW1iZXIocmVzcG9uc2UuaHR0cFN0YXR1c0NvZGUoKSkg KyAiICgiICsgcmVzcG9uc2UuaHR0cFN0YXR1c1RleHQoKSArICcpJzsKICAgICAgICAgU3RyaW5n IHJlcXVlc3RJZCA9IElkZW50aWZpZXJzRmFjdG9yeTo6cmVxdWVzdElkKGlkZW50aWZpZXIpOwot ICAgICAgICBhZGRDb25zb2xlTWVzc2FnZShhZG9wdFB0cihuZXcgQ29uc29sZU1lc3NhZ2UoT3Ro ZXJNZXNzYWdlU291cmNlLCBOZXR3b3JrRXJyb3JNZXNzYWdlVHlwZSwgRXJyb3JNZXNzYWdlTGV2 ZWwsIG1lc3NhZ2UsIHJlc3BvbnNlLnVybCgpLnN0cmluZygpLCByZXF1ZXN0SWQpKSk7CisgICAg ICAgIGFkZENvbnNvbGVNZXNzYWdlKGFkb3B0UHRyKG5ldyBDb25zb2xlTWVzc2FnZShOZXR3b3Jr TWVzc2FnZVNvdXJjZSwgTG9nTWVzc2FnZVR5cGUsIEVycm9yTWVzc2FnZUxldmVsLCBtZXNzYWdl LCByZXNwb25zZS51cmwoKS5zdHJpbmcoKSwgcmVxdWVzdElkKSkpOwogICAgIH0KIH0KIApAQCAt MjQxLDcgKzI0MSw3IEBAIHZvaWQgSW5zcGVjdG9yQ29uc29sZUFnZW50OjpkaWRGYWlsTG9hZGlu Zyh1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGNvbnN0IFJlc291CiAgICAgaWYgKCFlcnJvci5s b2NhbGl6ZWREZXNjcmlwdGlvbigpLmlzRW1wdHkoKSkKICAgICAgICAgbWVzc2FnZSArPSAiOiAi ICsgZXJyb3IubG9jYWxpemVkRGVzY3JpcHRpb24oKTsKICAgICBTdHJpbmcgcmVxdWVzdElkID0g SWRlbnRpZmllcnNGYWN0b3J5OjpyZXF1ZXN0SWQoaWRlbnRpZmllcik7Ci0gICAgYWRkQ29uc29s ZU1lc3NhZ2UoYWRvcHRQdHIobmV3IENvbnNvbGVNZXNzYWdlKE90aGVyTWVzc2FnZVNvdXJjZSwg TmV0d29ya0Vycm9yTWVzc2FnZVR5cGUsIEVycm9yTWVzc2FnZUxldmVsLCBtZXNzYWdlLCBlcnJv ci5mYWlsaW5nVVJMKCksIHJlcXVlc3RJZCkpKTsKKyAgICBhZGRDb25zb2xlTWVzc2FnZShhZG9w dFB0cihuZXcgQ29uc29sZU1lc3NhZ2UoTmV0d29ya01lc3NhZ2VTb3VyY2UsIExvZ01lc3NhZ2VU eXBlLCBFcnJvck1lc3NhZ2VMZXZlbCwgbWVzc2FnZSwgZXJyb3IuZmFpbGluZ1VSTCgpLCByZXF1 ZXN0SWQpKSk7CiB9CiAKIHZvaWQgSW5zcGVjdG9yQ29uc29sZUFnZW50OjpzZXRNb25pdG9yaW5n WEhSRW5hYmxlZChFcnJvclN0cmluZyosIGJvb2wgZW5hYmxlZCkKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZU1lc3NhZ2UuanMgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVNZXNzYWdlLmpzCmluZGV4IGExZDRj OGM5NGI1NDUyZWMxYWUyZmMzM2RlNDEzMmExM2I5M2YxOTIuLjg5MDlkYTEwMjg4ODIxZTY0NWU1 YTg3MDYzYzU3ODc4OWIwODU0OTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvQ29uc29sZU1lc3NhZ2UuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9Db25zb2xlTWVzc2FnZS5qcwpAQCAtNzMsNjQgKzczLDYxIEBAIFdlYklu c3BlY3Rvci5Db25zb2xlTWVzc2FnZSA9IGZ1bmN0aW9uKHNvdXJjZSwgdHlwZSwgbGV2ZWwsIGxp bmUsIHVybCwgcmVwZWF0Q291CiBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuY3JlYXRlVGV4 dE1lc3NhZ2UgPSBmdW5jdGlvbih0ZXh0LCBsZXZlbCkKIHsKICAgICBsZXZlbCA9IGxldmVsIHx8 IFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlTGV2ZWwuTG9nOwotICAgIHJldHVy biBuZXcgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlKFdlYkluc3BlY3Rvci5Db25zb2xlTWVz c2FnZS5NZXNzYWdlU291cmNlLkpTLCBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2Fn ZVR5cGUuTG9nLCBsZXZlbCwgMCwgbnVsbCwgMSwgbnVsbCwgW3RleHRdLCBudWxsKTsKKyAgICBy ZXR1cm4gbmV3IFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZShXZWJJbnNwZWN0b3IuQ29uc29s ZU1lc3NhZ2UuTWVzc2FnZVNvdXJjZS5Db25zb2xlQVBJLCBXZWJJbnNwZWN0b3IuQ29uc29sZU1l c3NhZ2UuTWVzc2FnZVR5cGUuTG9nLCBsZXZlbCwgMCwgbnVsbCwgMSwgbnVsbCwgW3RleHRdLCBu dWxsKTsKIH0KIAogV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLnByb3RvdHlwZSA9IHsKICAg ICBfZm9ybWF0TWVzc2FnZTogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgdmFyIHN0YWNrVHJh Y2UgPSB0aGlzLl9zdGFja1RyYWNlOwotCiAgICAgICAgIHRoaXMuX2Zvcm1hdHRlZE1lc3NhZ2Ug PSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJzcGFuIik7CiAgICAgICAgIHRoaXMuX2Zvcm1hdHRl ZE1lc3NhZ2UuY2xhc3NOYW1lID0gImNvbnNvbGUtbWVzc2FnZS10ZXh0IHNvdXJjZS1jb2RlIjsK IAogICAgICAgICB2YXIgbWVzc2FnZVRleHQ7Ci0gICAgICAgIHN3aXRjaCAodGhpcy50eXBlKSB7 Ci0gICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlVHlw ZS5UcmFjZToKLSAgICAgICAgICAgICAgICBtZXNzYWdlVGV4dCA9IGRvY3VtZW50LmNyZWF0ZVRl eHROb2RlKCJjb25zb2xlLnRyYWNlKCkiKTsKLSAgICAgICAgICAgICAgICBicmVhazsKLSAgICAg ICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLk1lc3NhZ2VUeXBlLlVuY2F1 Z2h0RXhjZXB0aW9uOgotICAgICAgICAgICAgICAgIG1lc3NhZ2VUZXh0ID0gZG9jdW1lbnQuY3Jl YXRlVGV4dE5vZGUodGhpcy5fbWVzc2FnZVRleHQpOwotICAgICAgICAgICAgICAgIGJyZWFrOwot ICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZVR5cGUu TmV0d29ya0Vycm9yOgotICAgICAgICAgICAgICAgIGlmICh0aGlzLl9yZXF1ZXN0KSB7Ci0gICAg ICAgICAgICAgICAgICAgIHN0YWNrVHJhY2UgPSB0aGlzLl9yZXF1ZXN0LnN0YWNrVHJhY2U7Ci0K LSAgICAgICAgICAgICAgICAgICAgbWVzc2FnZVRleHQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50 KCJzcGFuIik7Ci0gICAgICAgICAgICAgICAgICAgIG1lc3NhZ2VUZXh0LmFwcGVuZENoaWxkKGRv Y3VtZW50LmNyZWF0ZVRleHROb2RlKHRoaXMuX3JlcXVlc3QucmVxdWVzdE1ldGhvZCArICIgIikp OwotICAgICAgICAgICAgICAgICAgICB2YXIgYW5jaG9yID0gV2ViSW5zcGVjdG9yLmxpbmtpZnlV UkxBc05vZGUodGhpcy5fcmVxdWVzdC51cmwpOwotICAgICAgICAgICAgICAgICAgICBhbmNob3Iu c2V0QXR0cmlidXRlKCJyZXF1ZXN0X2lkIiwgdGhpcy5fcmVxdWVzdC5yZXF1ZXN0SWQpOwotICAg ICAgICAgICAgICAgICAgICBhbmNob3Iuc2V0QXR0cmlidXRlKCJwcmVmZXJyZWRfcGFuZWwiLCAi bmV0d29yayIpOwotICAgICAgICAgICAgICAgICAgICBtZXNzYWdlVGV4dC5hcHBlbmRDaGlsZChh bmNob3IpOwotICAgICAgICAgICAgICAgICAgICBpZiAodGhpcy5fcmVxdWVzdC5mYWlsZWQpCi0g ICAgICAgICAgICAgICAgICAgICAgICBtZXNzYWdlVGV4dC5hcHBlbmRDaGlsZChkb2N1bWVudC5j cmVhdGVUZXh0Tm9kZSgiICIgKyB0aGlzLl9yZXF1ZXN0LmxvY2FsaXplZEZhaWxEZXNjcmlwdGlv bikpOwotICAgICAgICAgICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAgICAgICAgICAgICBt ZXNzYWdlVGV4dC5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVUZXh0Tm9kZSgiICIgKyB0aGlz Ll9yZXF1ZXN0LnN0YXR1c0NvZGUgKyAiICgiICsgdGhpcy5fcmVxdWVzdC5zdGF0dXNUZXh0ICsg IikiKSk7Ci0gICAgICAgICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgICAgICAgICAgdmFy IGlzRXh0ZXJuYWwgPSAhV2ViSW5zcGVjdG9yLnJlc291cmNlRm9yVVJMKHRoaXMudXJsKTsKLSAg ICAgICAgICAgICAgICAgICAgdmFyIGFuY2hvciA9IFdlYkluc3BlY3Rvci5saW5raWZ5VVJMQXNO b2RlKHRoaXMudXJsLCB0aGlzLnVybCwgImNvbnNvbGUtbWVzc2FnZS11cmwiLCBpc0V4dGVybmFs KTsKLSAgICAgICAgICAgICAgICAgICAgdGhpcy5fZm9ybWF0dGVkTWVzc2FnZS5hcHBlbmRDaGls ZChhbmNob3IpOwotICAgICAgICAgICAgICAgICAgICBtZXNzYWdlVGV4dCA9IHRoaXMuX2Zvcm1h dChbdGhpcy5fbWVzc2FnZVRleHRdKTsKLSAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAg ICAgYnJlYWs7Ci0gICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5N ZXNzYWdlVHlwZS5Bc3NlcnQ6Ci0gICAgICAgICAgICAgICAgdmFyIGFyZ3MgPSBbV2ViSW5zcGVj dG9yLlVJU3RyaW5nKCJBc3NlcnRpb24gZmFpbGVkOiIpXTsKLSAgICAgICAgICAgICAgICBpZiAo dGhpcy5fcGFyYW1ldGVycykKLSAgICAgICAgICAgICAgICAgICAgYXJncyA9IGFyZ3MuY29uY2F0 KHRoaXMuX3BhcmFtZXRlcnMpOwotICAgICAgICAgICAgICAgIG1lc3NhZ2VUZXh0ID0gdGhpcy5f Zm9ybWF0KGFyZ3MpOwotICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgY2FzZSBX ZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZVR5cGUuT2JqZWN0OgotICAgICAgICAg ICAgICAgIHZhciBvYmogPSB0aGlzLl9wYXJhbWV0ZXJzID8gdGhpcy5fcGFyYW1ldGVyc1swXSA6 IHVuZGVmaW5lZDsKLSAgICAgICAgICAgICAgICB2YXIgYXJncyA9IFsiJU8iLCBvYmpdOwotICAg ICAgICAgICAgICAgIG1lc3NhZ2VUZXh0ID0gdGhpcy5fZm9ybWF0KGFyZ3MpOwotICAgICAgICAg ICAgICAgIGJyZWFrOwotICAgICAgICAgICAgZGVmYXVsdDoKLSAgICAgICAgICAgICAgICB2YXIg YXJncyA9IHRoaXMuX3BhcmFtZXRlcnMgfHwgW3RoaXMuX21lc3NhZ2VUZXh0XTsKLSAgICAgICAg ICAgICAgICBtZXNzYWdlVGV4dCA9IHRoaXMuX2Zvcm1hdChhcmdzKTsKLSAgICAgICAgICAgICAg ICBicmVhazsKKyAgICAgICAgaWYgKHRoaXMuc291cmNlID09PSBXZWJJbnNwZWN0b3IuQ29uc29s ZU1lc3NhZ2UuTWVzc2FnZVNvdXJjZS5Db25zb2xlQVBJKSB7CisgICAgICAgICAgICBzd2l0Y2gg KHRoaXMudHlwZSkgeworICAgICAgICAgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLkNvbnNvbGVN ZXNzYWdlLk1lc3NhZ2VUeXBlLlRyYWNlOgorICAgICAgICAgICAgICAgICAgICBtZXNzYWdlVGV4 dCA9IGRvY3VtZW50LmNyZWF0ZVRleHROb2RlKCJjb25zb2xlLnRyYWNlKCkiKTsKKyAgICAgICAg ICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuQ29u c29sZU1lc3NhZ2UuTWVzc2FnZVR5cGUuQXNzZXJ0OgorICAgICAgICAgICAgICAgICAgICB2YXIg YXJncyA9IFtXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkFzc2VydGlvbiBmYWlsZWQ6IildOworICAg ICAgICAgICAgICAgICAgICBpZiAodGhpcy5fcGFyYW1ldGVycykKKyAgICAgICAgICAgICAgICAg ICAgICAgIGFyZ3MgPSBhcmdzLmNvbmNhdCh0aGlzLl9wYXJhbWV0ZXJzKTsKKyAgICAgICAgICAg ICAgICAgICAgbWVzc2FnZVRleHQgPSB0aGlzLl9mb3JtYXQoYXJncyk7CisgICAgICAgICAgICAg ICAgICAgIGJyZWFrOworICAgICAgICAgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLkNvbnNvbGVN ZXNzYWdlLk1lc3NhZ2VUeXBlLkRpcjoKKyAgICAgICAgICAgICAgICAgICAgdmFyIG9iaiA9IHRo aXMuX3BhcmFtZXRlcnMgPyB0aGlzLl9wYXJhbWV0ZXJzWzBdIDogdW5kZWZpbmVkOworICAgICAg ICAgICAgICAgICAgICB2YXIgYXJncyA9IFsiJU8iLCBvYmpdOworICAgICAgICAgICAgICAgICAg ICBtZXNzYWdlVGV4dCA9IHRoaXMuX2Zvcm1hdChhcmdzKTsKKyAgICAgICAgICAgICAgICAgICAg YnJlYWs7CisgICAgICAgICAgICAgICAgZGVmYXVsdDoKKyAgICAgICAgICAgICAgICAgICAgdmFy IGFyZ3MgPSB0aGlzLl9wYXJhbWV0ZXJzIHx8IFt0aGlzLl9tZXNzYWdlVGV4dF07CisgICAgICAg ICAgICAgICAgICAgIG1lc3NhZ2VUZXh0ID0gdGhpcy5fZm9ybWF0KGFyZ3MpOworICAgICAgICAg ICAgfQorICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgdmFyIGFyZ3MgPSB0aGlzLl9wYXJh bWV0ZXJzIHx8IFt0aGlzLl9tZXNzYWdlVGV4dF07CisgICAgICAgICAgICBtZXNzYWdlVGV4dCA9 IHRoaXMuX2Zvcm1hdChhcmdzKTsKICAgICAgICAgfQogCi0gICAgICAgIGlmICh0aGlzLnR5cGUg IT09IFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlVHlwZS5OZXR3b3JrRXJyb3Ip IHsKKyAgICAgICAgaWYgKHRoaXMuc291cmNlID09PSBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3Nh Z2UuTWVzc2FnZVNvdXJjZS5OZXR3b3JrKSB7CisgICAgICAgICAgICBpZiAodGhpcy5fcmVxdWVz dCkgeworICAgICAgICAgICAgICAgIHRoaXMuX3N0YWNrVHJhY2UgPSB0aGlzLl9yZXF1ZXN0LnN0 YWNrVHJhY2U7CisgICAgICAgICAgICAgICAgbWVzc2FnZVRleHQgPSBkb2N1bWVudC5jcmVhdGVF bGVtZW50KCJzcGFuIik7CisgICAgICAgICAgICAgICAgbWVzc2FnZVRleHQuYXBwZW5kQ2hpbGQo ZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUodGhpcy5fcmVxdWVzdC5yZXF1ZXN0TWV0aG9kICsgIiAi KSk7CisgICAgICAgICAgICAgICAgdmFyIGFuY2hvciA9IFdlYkluc3BlY3Rvci5saW5raWZ5VVJM QXNOb2RlKHRoaXMuX3JlcXVlc3QudXJsKTsKKyAgICAgICAgICAgICAgICBhbmNob3Iuc2V0QXR0 cmlidXRlKCJyZXF1ZXN0X2lkIiwgdGhpcy5fcmVxdWVzdC5yZXF1ZXN0SWQpOworICAgICAgICAg ICAgICAgIGFuY2hvci5zZXRBdHRyaWJ1dGUoInByZWZlcnJlZF9wYW5lbCIsICJuZXR3b3JrIik7 CisgICAgICAgICAgICAgICAgbWVzc2FnZVRleHQuYXBwZW5kQ2hpbGQoYW5jaG9yKTsKKyAgICAg ICAgICAgICAgICBpZiAodGhpcy5fcmVxdWVzdC5mYWlsZWQpCisgICAgICAgICAgICAgICAgICAg IG1lc3NhZ2VUZXh0LmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZVRleHROb2RlKCIgIiArIHRo aXMuX3JlcXVlc3QubG9jYWxpemVkRmFpbERlc2NyaXB0aW9uKSk7CisgICAgICAgICAgICAgICAg ZWxzZQorICAgICAgICAgICAgICAgICAgICBtZXNzYWdlVGV4dC5hcHBlbmRDaGlsZChkb2N1bWVu dC5jcmVhdGVUZXh0Tm9kZSgiICIgKyB0aGlzLl9yZXF1ZXN0LnN0YXR1c0NvZGUgKyAiICgiICsg dGhpcy5fcmVxdWVzdC5zdGF0dXNUZXh0ICsgIikiKSk7CisgICAgICAgICAgICB9IGVsc2Ugewor ICAgICAgICAgICAgICAgIHZhciBpc0V4dGVybmFsID0gIVdlYkluc3BlY3Rvci5yZXNvdXJjZUZv clVSTCh0aGlzLnVybCk7CisgICAgICAgICAgICAgICAgdmFyIGFuY2hvciA9IFdlYkluc3BlY3Rv ci5saW5raWZ5VVJMQXNOb2RlKHRoaXMudXJsLCB0aGlzLnVybCwgImNvbnNvbGUtbWVzc2FnZS11 cmwiLCBpc0V4dGVybmFsKTsKKyAgICAgICAgICAgICAgICB0aGlzLl9mb3JtYXR0ZWRNZXNzYWdl LmFwcGVuZENoaWxkKGFuY2hvcik7CisgICAgICAgICAgICAgICAgbWVzc2FnZVRleHQgPSB0aGlz Ll9mb3JtYXQoW3RoaXMuX21lc3NhZ2VUZXh0XSk7CisgICAgICAgICAgICB9CisgICAgICAgIH0g ZWxzZSB7CiAgICAgICAgICAgICBpZiAodGhpcy5fc3RhY2tUcmFjZSAmJiB0aGlzLl9zdGFja1Ry YWNlLmxlbmd0aCAmJiB0aGlzLl9zdGFja1RyYWNlWzBdLnVybCkgewogICAgICAgICAgICAgICAg IHZhciB1cmxFbGVtZW50ID0gdGhpcy5fbGlua2lmeUNhbGxGcmFtZSh0aGlzLl9zdGFja1RyYWNl WzBdKTsKICAgICAgICAgICAgICAgICB0aGlzLl9mb3JtYXR0ZWRNZXNzYWdlLmFwcGVuZENoaWxk KHVybEVsZW1lbnQpOwpAQCAtMTQyLDI3ICsxMzksMjEgQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVN ZXNzYWdlLnByb3RvdHlwZSA9IHsKIAogICAgICAgICB0aGlzLl9mb3JtYXR0ZWRNZXNzYWdlLmFw cGVuZENoaWxkKG1lc3NhZ2VUZXh0KTsKIAotICAgICAgICBpZiAodGhpcy5fc3RhY2tUcmFjZSkg ewotICAgICAgICAgICAgc3dpdGNoICh0aGlzLnR5cGUpIHsKLSAgICAgICAgICAgICAgICBjYXNl IFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlVHlwZS5UcmFjZToKLSAgICAgICAg ICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlVHlwZS5VbmNh dWdodEV4Y2VwdGlvbjoKLSAgICAgICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5Db25zb2xl TWVzc2FnZS5NZXNzYWdlVHlwZS5OZXR3b3JrRXJyb3I6Ci0gICAgICAgICAgICAgICAgY2FzZSBX ZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZVR5cGUuQXNzZXJ0OiB7Ci0gICAgICAg ICAgICAgICAgICAgIHZhciBvbCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoIm9sIik7Ci0gICAg ICAgICAgICAgICAgICAgIG9sLmNsYXNzTmFtZSA9ICJvdXRsaW5lLWRpc2Nsb3N1cmUiOwotICAg ICAgICAgICAgICAgICAgICB2YXIgdHJlZU91dGxpbmUgPSBuZXcgVHJlZU91dGxpbmUob2wpOwot Ci0gICAgICAgICAgICAgICAgICAgIHZhciBjb250ZW50ID0gdGhpcy5fZm9ybWF0dGVkTWVzc2Fn ZTsKLSAgICAgICAgICAgICAgICAgICAgdmFyIHJvb3QgPSBuZXcgVHJlZUVsZW1lbnQoY29udGVu dCwgbnVsbCwgdHJ1ZSk7Ci0gICAgICAgICAgICAgICAgICAgIGNvbnRlbnQudHJlZUVsZW1lbnRG b3JUZXN0ID0gcm9vdDsKLSAgICAgICAgICAgICAgICAgICAgdHJlZU91dGxpbmUuYXBwZW5kQ2hp bGQocm9vdCk7Ci0gICAgICAgICAgICAgICAgICAgIGlmICh0aGlzLnR5cGUgPT09IFdlYkluc3Bl Y3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlVHlwZS5UcmFjZSkKLSAgICAgICAgICAgICAgICAg ICAgICAgIHJvb3QuZXhwYW5kKCk7Ci0KLSAgICAgICAgICAgICAgICAgICAgdGhpcy5fcG9wdWxh dGVTdGFja1RyYWNlVHJlZUVsZW1lbnQocm9vdCk7Ci0gICAgICAgICAgICAgICAgICAgIHRoaXMu X2Zvcm1hdHRlZE1lc3NhZ2UgPSBvbDsKLSAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICB9 CisgICAgICAgIHZhciBkdW1wU3RhY2tUcmFjZSA9ICEhdGhpcy5fc3RhY2tUcmFjZSAmJiAodGhp cy5sZXZlbCA9PT0gV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLk1lc3NhZ2VMZXZlbC5FcnJv ciB8fCB0aGlzLnR5cGUgPT09IFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlVHlw ZS5UcmFjZSk7CisgICAgICAgIGlmIChkdW1wU3RhY2tUcmFjZSkgeworICAgICAgICAgICAgdmFy IG9sID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgib2wiKTsKKyAgICAgICAgICAgIG9sLmNsYXNz TmFtZSA9ICJvdXRsaW5lLWRpc2Nsb3N1cmUiOworICAgICAgICAgICAgdmFyIHRyZWVPdXRsaW5l ID0gbmV3IFRyZWVPdXRsaW5lKG9sKTsKKworICAgICAgICAgICAgdmFyIGNvbnRlbnQgPSB0aGlz Ll9mb3JtYXR0ZWRNZXNzYWdlOworICAgICAgICAgICAgdmFyIHJvb3QgPSBuZXcgVHJlZUVsZW1l bnQoY29udGVudCwgbnVsbCwgdHJ1ZSk7CisgICAgICAgICAgICBjb250ZW50LnRyZWVFbGVtZW50 Rm9yVGVzdCA9IHJvb3Q7CisgICAgICAgICAgICB0cmVlT3V0bGluZS5hcHBlbmRDaGlsZChyb290 KTsKKyAgICAgICAgICAgIGlmICh0aGlzLnR5cGUgPT09IFdlYkluc3BlY3Rvci5Db25zb2xlTWVz c2FnZS5NZXNzYWdlVHlwZS5UcmFjZSkKKyAgICAgICAgICAgICAgICByb290LmV4cGFuZCgpOwor CisgICAgICAgICAgICB0aGlzLl9wb3B1bGF0ZVN0YWNrVHJhY2VUcmVlRWxlbWVudChyb290KTsK KyAgICAgICAgICAgIHRoaXMuX2Zvcm1hdHRlZE1lc3NhZ2UgPSBvbDsKICAgICAgICAgfQogCiAg ICAgICAgIC8vIFRoaXMgaXMgdXNlZCBmb3IgaW5saW5lIG1lc3NhZ2UgYnViYmxlcyBpbiBTb3Vy Y2VGcmFtZXMsIG9yIG90aGVyIHBsYWluLXRleHQgcmVwcmVzZW50YXRpb25zLgpAQCAtMzg2LDgg KzM3NywxMSBAQCBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UucHJvdG90eXBlID0gewogICAg ICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZVNvdXJjZS5K UzoKICAgICAgICAgICAgICAgICBzb3VyY2VTdHJpbmcgPSAiSlMiOwogICAgICAgICAgICAgICAg IGJyZWFrOwotICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVz c2FnZVNvdXJjZS5DU1M6Ci0gICAgICAgICAgICAgICAgc291cmNlU3RyaW5nID0gIkNTUyI7Cisg ICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlU291cmNl Lk5ldHdvcms6CisgICAgICAgICAgICAgICAgc291cmNlU3RyaW5nID0gIk5ldHdvcmsiOworICAg ICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuQ29uc29s ZU1lc3NhZ2UuTWVzc2FnZVNvdXJjZS5Db25zb2xlQVBJOgorICAgICAgICAgICAgICAgIHNvdXJj ZVN0cmluZyA9ICJDb25zb2xlQVBJIjsKICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAg ICAgIGNhc2UgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLk1lc3NhZ2VTb3VyY2UuT3RoZXI6 CiAgICAgICAgICAgICAgICAgc291cmNlU3RyaW5nID0gIk90aGVyIjsKQEAgLTM5NywxMiArMzkx LDEzIEBAIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5wcm90b3R5cGUgPSB7CiAgICAgICAg IHZhciB0eXBlU3RyaW5nOwogICAgICAgICBzd2l0Y2ggKHRoaXMudHlwZSkgewogICAgICAgICAg ICAgY2FzZSBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZVR5cGUuTG9nOgotICAg ICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZVR5cGUuVW5j YXVnaHRFeGNlcHRpb246Ci0gICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5Db25zb2xlTWVz c2FnZS5NZXNzYWdlVHlwZS5OZXR3b3JrRXJyb3I6CiAgICAgICAgICAgICAgICAgdHlwZVN0cmlu ZyA9ICJMb2ciOwogICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgY2FzZSBXZWJJ bnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZVR5cGUuT2JqZWN0OgotICAgICAgICAgICAg ICAgIHR5cGVTdHJpbmcgPSAiT2JqZWN0IjsKKyAgICAgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9y LkNvbnNvbGVNZXNzYWdlLk1lc3NhZ2VUeXBlLkRpcjoKKyAgICAgICAgICAgICAgICB0eXBlU3Ry aW5nID0gIkRpciI7CisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICBjYXNlIFdl Ykluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlVHlwZS5EaXJYTUw6CisgICAgICAgICAg ICAgICAgdHlwZVN0cmluZyA9ICJEaXIgWE1MIjsKICAgICAgICAgICAgICAgICBicmVhazsKICAg ICAgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLk1lc3NhZ2VUeXBlLlRy YWNlOgogICAgICAgICAgICAgICAgIHR5cGVTdHJpbmcgPSAiVHJhY2UiOwpAQCAtNDg4LDIwICs0 ODMsMjAgQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLk1lc3NhZ2VTb3VyY2UgPSB7CiAg ICAgSFRNTDogImh0bWwiLAogICAgIFhNTDogInhtbCIsCiAgICAgSlM6ICJqYXZhc2NyaXB0IiwK LSAgICBDU1M6ICJjc3MiLAorICAgIE5ldHdvcms6ICJuZXR3b3JrIiwKKyAgICBDb25zb2xlQVBJ OiAiY29uc29sZS1hcGkiLAogICAgIE90aGVyOiAib3RoZXIiCiB9CiAKIFdlYkluc3BlY3Rvci5D b25zb2xlTWVzc2FnZS5NZXNzYWdlVHlwZSA9IHsKICAgICBMb2c6ICJsb2ciLAotICAgIE9iamVj dDogIm90aGVyIiwKKyAgICBEaXI6ICJkaXIiLAorICAgIERpclhNTDogImRpcnhtbCIsCiAgICAg VHJhY2U6ICJ0cmFjZSIsCiAgICAgU3RhcnRHcm91cDogInN0YXJ0R3JvdXAiLAogICAgIFN0YXJ0 R3JvdXBDb2xsYXBzZWQ6ICJzdGFydEdyb3VwQ29sbGFwc2VkIiwKICAgICBFbmRHcm91cDogImVu ZEdyb3VwIiwKICAgICBBc3NlcnQ6ICJhc3NlcnQiLAotICAgIFVuY2F1Z2h0RXhjZXB0aW9uOiAi dW5jYXVnaHRFeGNlcHRpb24iLAotICAgIE5ldHdvcmtFcnJvcjogIm5ldHdvcmtFcnJvciIsCiAg ICAgUmVzdWx0OiAicmVzdWx0IgogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdl L0NvbnNvbGUuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9Db25zb2xlLmNwcAppbmRleCA5NWZk YjM5OTA0ZTE0MTdmNjQ1NTFmYTE1ZDBiMGJjNzA0YzRkZTJmLi43NGRmZTc0YWIyNDI5NGJlM2I1 ZTdkY2I3ZWZhOGZjYmUzNDI5MWJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0Nv bnNvbGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ29uc29sZS5jcHAKQEAgLTk1LDgg Kzk1LDExIEBAIHN0YXRpYyB2b2lkIHByaW50TWVzc2FnZVNvdXJjZUFuZExldmVsUHJlZml4KE1l c3NhZ2VTb3VyY2Ugc291cmNlLCBNZXNzYWdlTGV2ZWwKICAgICBjYXNlIEpTTWVzc2FnZVNvdXJj ZToKICAgICAgICAgc291cmNlU3RyaW5nID0gIkpTIjsKICAgICAgICAgYnJlYWs7Ci0gICAgY2Fz ZSBDU1NNZXNzYWdlU291cmNlOgotICAgICAgICBzb3VyY2VTdHJpbmcgPSAiQ1NTIjsKKyAgICBj YXNlIE5ldHdvcmtNZXNzYWdlU291cmNlOgorICAgICAgICBzb3VyY2VTdHJpbmcgPSAiTkVUV09S SyI7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgQ29uc29sZUFQSU1lc3NhZ2VTb3VyY2U6Cisg ICAgICAgIHNvdXJjZVN0cmluZyA9ICJDT05TT0xFQVBJIjsKICAgICAgICAgYnJlYWs7CiAgICAg Y2FzZSBPdGhlck1lc3NhZ2VTb3VyY2U6CiAgICAgICAgIHNvdXJjZVN0cmluZyA9ICJPVEhFUiI7 CkBAIC0xNzYsNyArMTc5LDcgQEAgdm9pZCBDb25zb2xlOjphZGRNZXNzYWdlKE1lc3NhZ2VUeXBl IHR5cGUsIE1lc3NhZ2VMZXZlbCBsZXZlbCwgUGFzc1JlZlB0cjxTY3JpcHQKIAogICAgIGlmIChD b25zb2xlOjpzaG91bGRQcmludEV4Y2VwdGlvbnMoKSkgewogICAgICAgICBwcmludFNvdXJjZVVS TEFuZExpbmUobGFzdENhbGxlci5zb3VyY2VVUkwoKSwgMCk7Ci0gICAgICAgIHByaW50TWVzc2Fn ZVNvdXJjZUFuZExldmVsUHJlZml4KEpTTWVzc2FnZVNvdXJjZSwgbGV2ZWwpOworICAgICAgICBw cmludE1lc3NhZ2VTb3VyY2VBbmRMZXZlbFByZWZpeChDb25zb2xlQVBJTWVzc2FnZVNvdXJjZSwg bGV2ZWwpOwogCiAgICAgICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBhcmd1bWVudHMtPmFy Z3VtZW50Q291bnQoKTsgKytpKSB7CiAgICAgICAgICAgICBTdHJpbmcgYXJnQXNTdHJpbmc7CkBA IC0xODgsOSArMTkxLDkgQEAgdm9pZCBDb25zb2xlOjphZGRNZXNzYWdlKE1lc3NhZ2VUeXBlIHR5 cGUsIE1lc3NhZ2VMZXZlbCBsZXZlbCwgUGFzc1JlZlB0cjxTY3JpcHQKIAogICAgIFN0cmluZyBt ZXNzYWdlOwogICAgIGlmIChhcmd1bWVudHMtPmdldEZpcnN0QXJndW1lbnRBc1N0cmluZyhtZXNz YWdlKSkKLSAgICAgICAgcGFnZS0+Y2hyb21lKCktPmNsaWVudCgpLT5hZGRNZXNzYWdlVG9Db25z b2xlKEpTTWVzc2FnZVNvdXJjZSwgdHlwZSwgbGV2ZWwsIG1lc3NhZ2UsIGxhc3RDYWxsZXIubGlu ZU51bWJlcigpLCBsYXN0Q2FsbGVyLnNvdXJjZVVSTCgpKTsKKyAgICAgICAgcGFnZS0+Y2hyb21l KCktPmNsaWVudCgpLT5hZGRNZXNzYWdlVG9Db25zb2xlKENvbnNvbGVBUElNZXNzYWdlU291cmNl LCB0eXBlLCBsZXZlbCwgbWVzc2FnZSwgbGFzdENhbGxlci5saW5lTnVtYmVyKCksIGxhc3RDYWxs ZXIuc291cmNlVVJMKCkpOwogCi0gICAgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjphZGRNZXNz YWdlVG9Db25zb2xlKHBhZ2UsIEpTTWVzc2FnZVNvdXJjZSwgdHlwZSwgbGV2ZWwsIG1lc3NhZ2Us IGFyZ3VtZW50cywgY2FsbFN0YWNrKTsKKyAgICBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmFk ZE1lc3NhZ2VUb0NvbnNvbGUocGFnZSwgQ29uc29sZUFQSU1lc3NhZ2VTb3VyY2UsIHR5cGUsIGxl dmVsLCBtZXNzYWdlLCBhcmd1bWVudHMsIGNhbGxTdGFjayk7CiB9CiAKIHZvaWQgQ29uc29sZTo6 ZGVidWcoUGFzc1JlZlB0cjxTY3JpcHRBcmd1bWVudHM+IGFyZ3VtZW50cywgUGFzc1JlZlB0cjxT Y3JpcHRDYWxsU3RhY2s+IGNhbGxTdGFjaykKQEAgLTIxNiwxMyArMjE5LDEyIEBAIHZvaWQgQ29u c29sZTo6bG9nKFBhc3NSZWZQdHI8U2NyaXB0QXJndW1lbnRzPiBhcmd1bWVudHMsIFBhc3NSZWZQ dHI8U2NyaXB0Q2FsbFN0CiAKIHZvaWQgQ29uc29sZTo6ZGlyKFBhc3NSZWZQdHI8U2NyaXB0QXJn dW1lbnRzPiBhcmd1bWVudHMsIFBhc3NSZWZQdHI8U2NyaXB0Q2FsbFN0YWNrPiBjYWxsU3RhY2sp CiB7Ci0gICAgYWRkTWVzc2FnZShPYmplY3RNZXNzYWdlVHlwZSwgTG9nTWVzc2FnZUxldmVsLCBh cmd1bWVudHMsIGNhbGxTdGFjayk7CisgICAgYWRkTWVzc2FnZShEaXJNZXNzYWdlVHlwZSwgTG9n TWVzc2FnZUxldmVsLCBhcmd1bWVudHMsIGNhbGxTdGFjayk7CiB9CiAKIHZvaWQgQ29uc29sZTo6 ZGlyeG1sKFBhc3NSZWZQdHI8U2NyaXB0QXJndW1lbnRzPiBhcmd1bWVudHMsIFBhc3NSZWZQdHI8 U2NyaXB0Q2FsbFN0YWNrPiBjYWxsU3RhY2spCiB7Ci0gICAgLy8gVGhlIHN0YW5kYXJkIGJlaGF2 aW9yIG9mIG91ciBjb25zb2xlLmxvZyB3aWxsIHByaW50IHRoZSBET00gdHJlZSBmb3Igbm9kZXMu Ci0gICAgbG9nKGFyZ3VtZW50cywgY2FsbFN0YWNrKTsKKyAgICBhZGRNZXNzYWdlKERpclhNTE1l c3NhZ2VUeXBlLCBMb2dNZXNzYWdlTGV2ZWwsIGFyZ3VtZW50cywgY2FsbFN0YWNrKTsKIH0KIAog dm9pZCBDb25zb2xlOjp0cmFjZShQYXNzUmVmUHRyPFNjcmlwdEFyZ3VtZW50cz4gYXJndW1lbnRz LCBQYXNzUmVmUHRyPFNjcmlwdENhbGxTdGFjaz4gcHJwQ2FsbFN0YWNrKQpAQCAtMzE2LDE3ICsz MTgsMTcgQEAgdm9pZCBDb25zb2xlOjp0aW1lU3RhbXAoUGFzc1JlZlB0cjxTY3JpcHRBcmd1bWVu dHM+IGFyZ3VtZW50cywgUGFzc1JlZlB0cjxTY3JpcHQKIAogdm9pZCBDb25zb2xlOjpncm91cChQ YXNzUmVmUHRyPFNjcmlwdEFyZ3VtZW50cz4gYXJndW1lbnRzLCBQYXNzUmVmUHRyPFNjcmlwdENh bGxTdGFjaz4gY2FsbFN0YWNrKQogewotICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6YWRk TWVzc2FnZVRvQ29uc29sZShwYWdlKCksIEpTTWVzc2FnZVNvdXJjZSwgU3RhcnRHcm91cE1lc3Nh Z2VUeXBlLCBMb2dNZXNzYWdlTGV2ZWwsIFN0cmluZygpLCBhcmd1bWVudHMsIGNhbGxTdGFjayk7 CisgICAgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjphZGRNZXNzYWdlVG9Db25zb2xlKHBhZ2Uo KSwgQ29uc29sZUFQSU1lc3NhZ2VTb3VyY2UsIFN0YXJ0R3JvdXBNZXNzYWdlVHlwZSwgTG9nTWVz c2FnZUxldmVsLCBTdHJpbmcoKSwgYXJndW1lbnRzLCBjYWxsU3RhY2spOwogfQogCiB2b2lkIENv bnNvbGU6Omdyb3VwQ29sbGFwc2VkKFBhc3NSZWZQdHI8U2NyaXB0QXJndW1lbnRzPiBhcmd1bWVu dHMsIFBhc3NSZWZQdHI8U2NyaXB0Q2FsbFN0YWNrPiBjYWxsU3RhY2spCiB7Ci0gICAgSW5zcGVj dG9ySW5zdHJ1bWVudGF0aW9uOjphZGRNZXNzYWdlVG9Db25zb2xlKHBhZ2UoKSwgSlNNZXNzYWdl U291cmNlLCBTdGFydEdyb3VwQ29sbGFwc2VkTWVzc2FnZVR5cGUsIExvZ01lc3NhZ2VMZXZlbCwg U3RyaW5nKCksIGFyZ3VtZW50cywgY2FsbFN0YWNrKTsKKyAgICBJbnNwZWN0b3JJbnN0cnVtZW50 YXRpb246OmFkZE1lc3NhZ2VUb0NvbnNvbGUocGFnZSgpLCBDb25zb2xlQVBJTWVzc2FnZVNvdXJj ZSwgU3RhcnRHcm91cENvbGxhcHNlZE1lc3NhZ2VUeXBlLCBMb2dNZXNzYWdlTGV2ZWwsIFN0cmlu ZygpLCBhcmd1bWVudHMsIGNhbGxTdGFjayk7CiB9CiAKIHZvaWQgQ29uc29sZTo6Z3JvdXBFbmQo KQogewotICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6YWRkTWVzc2FnZVRvQ29uc29sZShw YWdlKCksIEpTTWVzc2FnZVNvdXJjZSwgRW5kR3JvdXBNZXNzYWdlVHlwZSwgTG9nTWVzc2FnZUxl dmVsLCBTdHJpbmcoKSwgMCwgU3RyaW5nKCkpOworICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlv bjo6YWRkTWVzc2FnZVRvQ29uc29sZShwYWdlKCksIENvbnNvbGVBUElNZXNzYWdlU291cmNlLCBF bmRHcm91cE1lc3NhZ2VUeXBlLCBMb2dNZXNzYWdlTGV2ZWwsIFN0cmluZygpLCAwLCBTdHJpbmco KSk7CiB9CiAKIGJvb2wgQ29uc29sZTo6c2hvdWxkQ2FwdHVyZUZ1bGxTdGFja1RyYWNlKCkgY29u c3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ29uc29sZVR5cGVzLmggYi9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL0NvbnNvbGVUeXBlcy5oCmluZGV4IDA3MjFiMzZmMmFiODE0NDAzYTlh N2I5MGMwOTQxNjNiOWRjMjE5ZTYuLjhiNDQwMzBjNjkzNmE3Y2U5MDQ2N2Y0ZmRkOTJmYjFjZWQ0 ZTNlNDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ29uc29sZVR5cGVzLmgKKysr IGIvU291cmNlL1dlYkNvcmUvcGFnZS9Db25zb2xlVHlwZXMuaApAQCAtMzIsMjAgKzMyLDIyIEBA IGVudW0gTWVzc2FnZVNvdXJjZSB7CiAgICAgSFRNTE1lc3NhZ2VTb3VyY2UsCiAgICAgWE1MTWVz c2FnZVNvdXJjZSwKICAgICBKU01lc3NhZ2VTb3VyY2UsCi0gICAgQ1NTTWVzc2FnZVNvdXJjZSwK LSAgICBPdGhlck1lc3NhZ2VTb3VyY2UKKyAgICBOZXR3b3JrTWVzc2FnZVNvdXJjZSwKKyAgICBD b25zb2xlQVBJTWVzc2FnZVNvdXJjZSwKKyAgICBPdGhlck1lc3NhZ2VTb3VyY2UsCiB9OwogCisv LyBGSVhNRTogbWFrZSB0aGlzIGVudW0gcHJpdmF0ZSB0byBpbnNwZWN0b3IsIHJlbW92ZSBpdCBm cm9tIGNsaWVudCBjYWxsYmFja3MuCisvLyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NjYzNzEKIGVudW0gTWVzc2FnZVR5cGUgewogICAgIExvZ01lc3NhZ2VUeXBlLAot ICAgIE9iamVjdE1lc3NhZ2VUeXBlLAorICAgIERpck1lc3NhZ2VUeXBlLAorICAgIERpclhNTE1l c3NhZ2VUeXBlLAogICAgIFRyYWNlTWVzc2FnZVR5cGUsCiAgICAgU3RhcnRHcm91cE1lc3NhZ2VU eXBlLAogICAgIFN0YXJ0R3JvdXBDb2xsYXBzZWRNZXNzYWdlVHlwZSwKICAgICBFbmRHcm91cE1l c3NhZ2VUeXBlLAotICAgIEFzc2VydE1lc3NhZ2VUeXBlLAotICAgIFVuY2F1Z2h0RXhjZXB0aW9u TWVzc2FnZVR5cGUsCi0gICAgTmV0d29ya0Vycm9yTWVzc2FnZVR5cGUKKyAgICBBc3NlcnRNZXNz YWdlVHlwZQogfTsKIAogZW51bSBNZXNzYWdlTGV2ZWwgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvd2Vic29ja2V0cy9XZWJTb2NrZXRDaGFubmVsLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3dl YnNvY2tldHMvV2ViU29ja2V0Q2hhbm5lbC5jcHAKaW5kZXggYzExMzViNTljMTJkODljOWFhN2Vj NDQyNGJkMTY5M2U3ZjE4NDlmMS4uNzcwODY1ZjQ2MDY3ZTY2MjUxOGEwYzM5NDM5MzRiOGEzNzEy MjAxYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvd2Vic29ja2V0cy9XZWJTb2NrZXRDaGFu bmVsLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS93ZWJzb2NrZXRzL1dlYlNvY2tldENoYW5uZWwu Y3BwCkBAIC0zMzMsNyArMzMzLDcgQEAgdm9pZCBXZWJTb2NrZXRDaGFubmVsOjpkaWRGYWlsU29j a2V0U3RyZWFtKFNvY2tldFN0cmVhbUhhbmRsZSogaGFuZGxlLCBjb25zdCBTb2MKICAgICAgICAg QVNTRVJUKGZhaWxpbmdVUkwuaXNOdWxsKCkgfHwgbV9oYW5kc2hha2UtPnVybCgpLnN0cmluZygp ID09IGZhaWxpbmdVUkwpOwogICAgICAgICBpZiAoZmFpbGluZ1VSTC5pc051bGwoKSkKICAgICAg ICAgICAgIGZhaWxpbmdVUkwgPSBtX2hhbmRzaGFrZS0+dXJsKCkuc3RyaW5nKCk7Ci0gICAgICAg IG1fY29udGV4dC0+YWRkTWVzc2FnZShPdGhlck1lc3NhZ2VTb3VyY2UsIE5ldHdvcmtFcnJvck1l c3NhZ2VUeXBlLCBFcnJvck1lc3NhZ2VMZXZlbCwgbWVzc2FnZSwgMCwgZmFpbGluZ1VSTCwgMCk7 CisgICAgICAgIG1fY29udGV4dC0+YWRkTWVzc2FnZShOZXR3b3JrTWVzc2FnZVNvdXJjZSwgTG9n TWVzc2FnZVR5cGUsIEVycm9yTWVzc2FnZUxldmVsLCBtZXNzYWdlLCAwLCBmYWlsaW5nVVJMLCAw KTsKICAgICB9CiAgICAgbV9zaG91bGREaXNjYXJkUmVjZWl2ZWREYXRhID0gdHJ1ZTsKICAgICBo YW5kbGUtPmRpc2Nvbm5lY3QoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5n ZUxvZyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwppbmRleCBmMGNjMTMzYWZhZDY0ZWI0 NDg5ODRlZGNmZmUyNWM0NTY0N2MxYWE3Li5mYTBkNmYzMWU5M2RlYWIzYmZjZTFkMzkyZmU1ZTg5 ODUyOGM3NzE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKKysrIGIv U291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMDktMTkg IFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IHN0cmVhbWxpbmUgQ29uc29sZSdzIE1lc3NhZ2VUeXBlIGFuZCBNZXNzYWdlU291cmNl IHNlbWFudGljcy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTY4MzQyCisKKyAgICAgICAgVGhpcyBjaGFuZ2UgZml4ZXMgc2VtYW50aWNzIG9mIHRoZSBN ZXNzYWdlU291cmNlIGFuZCBNZXNzYWdlVHlwZToKKyAgICAgICAgTWVzc2FnZVNvdXJjZSBpcyBu b3cgdGhlIHNvdXJjZSBvZiB0aGUgbWVzc2FnZSAoYmUgaXQgTmV0d29yaywgSFRNTAorICAgICAg ICBwYXJzZXIgb3IgQ29uc29sZSBBUEkpLiBNZXNzYWdlVHlwZSBpcyBvbmx5IGRlZmluZWQgZm9y IHRoZSBDb25zb2xlIEFQSQorICAgICAgICBtZXNzYWdlcyBhbmQgY29udGFpbnMgdGhlIG5hbWUg b2YgdGhlIEFQSSBjYWxsIChsb2csIGRpciwgZGlyeG1sLCBldGMuKS4gCisgICAgICAgIFN1YnNl cXVlbnQgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY2MzcxIHdpbGwg bWFrZSBNZXNzYWdlVHlwZQorICAgICAgICBwcml2YXRlIHRvIHRoZSBpbnNwZWN0b3IuCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJDb3JlU3Vw cG9ydC9XZWJDaHJvbWVDbGllbnQubW06CisgICAgICAgIChzdHJpbmdGb3JNZXNzYWdlU291cmNl KToKKyAgICAgICAgKHN0cmluZ0Zvck1lc3NhZ2VUeXBlKToKKyAgICAgICAgKiBXZWJWaWV3L1dl YlVJRGVsZWdhdGVQcml2YXRlLmg6CisKIDIwMTEtMDktMTcgIE1paGFpIFBhcnBhcml0YSAgPG1p aGFpcEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgRnJhbWVMb2FkZXJDbGllbnQgQmFja0Zvcndh cmRMaXN0LXJlbGF0ZWQgbWV0aG9kcyBhcmUgdW5zdWVkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQubW0gYi9Tb3VyY2UvV2ViS2l0 L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQubW0KaW5kZXggNDAzNjA1YmI4ZGJk NjhlMDc3Nzg2Zjg3M2YwY2FlZmEwMjAwOGVmYi4uZmU0MTQyY2RlOTY5MDU1OTY3MmRmZmE0NmUz N2UyNGRkNTg4NDQ3NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBv cnQvV2ViQ2hyb21lQ2xpZW50Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBw b3J0L1dlYkNocm9tZUNsaWVudC5tbQpAQCAtODgsMTggKzg4LDE4IEBACiBOU1N0cmluZyAqV2Vi Q29uc29sZU1lc3NhZ2VIVE1MTWVzc2FnZVNvdXJjZSA9IEAiSFRNTE1lc3NhZ2VTb3VyY2UiOwog TlNTdHJpbmcgKldlYkNvbnNvbGVNZXNzYWdlWE1MTWVzc2FnZVNvdXJjZSA9IEAiWE1MTWVzc2Fn ZVNvdXJjZSI7CiBOU1N0cmluZyAqV2ViQ29uc29sZU1lc3NhZ2VKU01lc3NhZ2VTb3VyY2UgPSBA IkpTTWVzc2FnZVNvdXJjZSI7Ci1OU1N0cmluZyAqV2ViQ29uc29sZU1lc3NhZ2VDU1NNZXNzYWdl U291cmNlID0gQCJDU1NNZXNzYWdlU291cmNlIjsKK05TU3RyaW5nICpXZWJDb25zb2xlTWVzc2Fn ZU5ldHdvcmtNZXNzYWdlU291cmNlID0gQCJOZXR3b3JrTWVzc2FnZVNvdXJjZSI7CitOU1N0cmlu ZyAqV2ViQ29uc29sZU1lc3NhZ2VDb25zb2xlQVBJTWVzc2FnZVNvdXJjZSA9IEAiQ29uc29sZUFQ SU1lc3NhZ2VTb3VyY2UiOwogTlNTdHJpbmcgKldlYkNvbnNvbGVNZXNzYWdlT3RoZXJNZXNzYWdl U291cmNlID0gQCJPdGhlck1lc3NhZ2VTb3VyY2UiOwogCiBOU1N0cmluZyAqV2ViQ29uc29sZU1l c3NhZ2VMb2dNZXNzYWdlVHlwZSA9IEAiTG9nTWVzc2FnZVR5cGUiOwotTlNTdHJpbmcgKldlYkNv bnNvbGVNZXNzYWdlT2JqZWN0TWVzc2FnZVR5cGUgPSBAIk9iamVjdE1lc3NhZ2VUeXBlIjsKK05T U3RyaW5nICpXZWJDb25zb2xlTWVzc2FnZURpck1lc3NhZ2VUeXBlID0gQCJEaXJNZXNzYWdlVHlw ZSI7CitOU1N0cmluZyAqV2ViQ29uc29sZU1lc3NhZ2VEaXJYTUxNZXNzYWdlVHlwZSA9IEAiRGly WE1MTWVzc2FnZVR5cGUiOwogTlNTdHJpbmcgKldlYkNvbnNvbGVNZXNzYWdlVHJhY2VNZXNzYWdl VHlwZSA9IEAiVHJhY2VNZXNzYWdlVHlwZSI7CiBOU1N0cmluZyAqV2ViQ29uc29sZU1lc3NhZ2VT dGFydEdyb3VwTWVzc2FnZVR5cGUgPSBAIlN0YXJ0R3JvdXBNZXNzYWdlVHlwZSI7CiBOU1N0cmlu ZyAqV2ViQ29uc29sZU1lc3NhZ2VTdGFydEdyb3VwQ29sbGFwc2VkTWVzc2FnZVR5cGUgPSBAIlN0 YXJ0R3JvdXBDb2xsYXBzZWRNZXNzYWdlVHlwZSI7CiBOU1N0cmluZyAqV2ViQ29uc29sZU1lc3Nh Z2VFbmRHcm91cE1lc3NhZ2VUeXBlID0gQCJFbmRHcm91cE1lc3NhZ2VUeXBlIjsKIE5TU3RyaW5n ICpXZWJDb25zb2xlTWVzc2FnZUFzc2VydE1lc3NhZ2VUeXBlID0gQCJBc3NlcnRNZXNzYWdlVHlw ZSI7Ci1OU1N0cmluZyAqV2ViQ29uc29sZU1lc3NhZ2VVbmNhdWdodEV4Y2VwdGlvbk1lc3NhZ2VU eXBlID0gQCJVbmNhdWdodEV4Y2VwdGlvbk1lc3NhZ2VUeXBlIjsKLU5TU3RyaW5nICpXZWJDb25z b2xlTWVzc2FnZU5ldHdvcmtFcnJvck1lc3NhZ2VUeXBlID0gQCJOZXR3b3JrRXJyb3JNZXNzYWdl VHlwZSI7CiAKIE5TU3RyaW5nICpXZWJDb25zb2xlTWVzc2FnZVRpcE1lc3NhZ2VMZXZlbCA9IEAi VGlwTWVzc2FnZUxldmVsIjsKIE5TU3RyaW5nICpXZWJDb25zb2xlTWVzc2FnZUxvZ01lc3NhZ2VM ZXZlbCA9IEAiTG9nTWVzc2FnZUxldmVsIjsKQEAgLTM1Nyw4ICszNTcsMTAgQEAgaW5saW5lIHN0 YXRpYyBOU1N0cmluZyAqc3RyaW5nRm9yTWVzc2FnZVNvdXJjZShNZXNzYWdlU291cmNlIHNvdXJj ZSkKICAgICAgICAgcmV0dXJuIFdlYkNvbnNvbGVNZXNzYWdlWE1MTWVzc2FnZVNvdXJjZTsKICAg ICBjYXNlIEpTTWVzc2FnZVNvdXJjZToKICAgICAgICAgcmV0dXJuIFdlYkNvbnNvbGVNZXNzYWdl SlNNZXNzYWdlU291cmNlOwotICAgIGNhc2UgQ1NTTWVzc2FnZVNvdXJjZToKLSAgICAgICAgcmV0 dXJuIFdlYkNvbnNvbGVNZXNzYWdlQ1NTTWVzc2FnZVNvdXJjZTsKKyAgICBjYXNlIE5ldHdvcmtN ZXNzYWdlU291cmNlOgorICAgICAgICByZXR1cm4gV2ViQ29uc29sZU1lc3NhZ2VOZXR3b3JrTWVz c2FnZVNvdXJjZTsKKyAgICBjYXNlIENvbnNvbGVBUElNZXNzYWdlU291cmNlOgorICAgICAgICBy ZXR1cm4gV2ViQ29uc29sZU1lc3NhZ2VDb25zb2xlQVBJTWVzc2FnZVNvdXJjZTsKICAgICBjYXNl IE90aGVyTWVzc2FnZVNvdXJjZToKICAgICAgICAgcmV0dXJuIFdlYkNvbnNvbGVNZXNzYWdlT3Ro ZXJNZXNzYWdlU291cmNlOwogICAgIH0KQEAgLTM3MSw4ICszNzMsMTAgQEAgaW5saW5lIHN0YXRp YyBOU1N0cmluZyAqc3RyaW5nRm9yTWVzc2FnZVR5cGUoTWVzc2FnZVR5cGUgdHlwZSkKICAgICBz d2l0Y2ggKHR5cGUpIHsKICAgICBjYXNlIExvZ01lc3NhZ2VUeXBlOgogICAgICAgICByZXR1cm4g V2ViQ29uc29sZU1lc3NhZ2VMb2dNZXNzYWdlVHlwZTsKLSAgICBjYXNlIE9iamVjdE1lc3NhZ2VU eXBlOgotICAgICAgICByZXR1cm4gV2ViQ29uc29sZU1lc3NhZ2VPYmplY3RNZXNzYWdlVHlwZTsK KyAgICBjYXNlIERpck1lc3NhZ2VUeXBlOgorICAgICAgICByZXR1cm4gV2ViQ29uc29sZU1lc3Nh Z2VEaXJNZXNzYWdlVHlwZTsKKyAgICBjYXNlIERpclhNTE1lc3NhZ2VUeXBlOgorICAgICAgICBy ZXR1cm4gV2ViQ29uc29sZU1lc3NhZ2VEaXJYTUxNZXNzYWdlVHlwZTsKICAgICBjYXNlIFRyYWNl TWVzc2FnZVR5cGU6CiAgICAgICAgIHJldHVybiBXZWJDb25zb2xlTWVzc2FnZVRyYWNlTWVzc2Fn ZVR5cGU7CiAgICAgY2FzZSBTdGFydEdyb3VwTWVzc2FnZVR5cGU6CkBAIC0zODMsMTAgKzM4Nyw2 IEBAIGlubGluZSBzdGF0aWMgTlNTdHJpbmcgKnN0cmluZ0Zvck1lc3NhZ2VUeXBlKE1lc3NhZ2VU eXBlIHR5cGUpCiAgICAgICAgIHJldHVybiBXZWJDb25zb2xlTWVzc2FnZUVuZEdyb3VwTWVzc2Fn ZVR5cGU7CiAgICAgY2FzZSBBc3NlcnRNZXNzYWdlVHlwZToKICAgICAgICAgcmV0dXJuIFdlYkNv bnNvbGVNZXNzYWdlQXNzZXJ0TWVzc2FnZVR5cGU7Ci0gICAgY2FzZSBVbmNhdWdodEV4Y2VwdGlv bk1lc3NhZ2VUeXBlOgotICAgICAgICByZXR1cm4gV2ViQ29uc29sZU1lc3NhZ2VVbmNhdWdodEV4 Y2VwdGlvbk1lc3NhZ2VUeXBlOwotICAgIGNhc2UgTmV0d29ya0Vycm9yTWVzc2FnZVR5cGU6Ci0g ICAgICAgIHJldHVybiBXZWJDb25zb2xlTWVzc2FnZU5ldHdvcmtFcnJvck1lc3NhZ2VUeXBlOwog ICAgIH0KICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICByZXR1cm4gQCIiOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJVSURlbGVnYXRlUHJpdmF0ZS5oIGIv U291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJVSURlbGVnYXRlUHJpdmF0ZS5oCmluZGV4IDM3 MDQxZDQwOTBlZGE2Yzg2MTNmNDVlZmZiNGUyNjg1ZjAyNGU2MWYuLjljOThmZGZjYzkwODNiOWQ1 YTU4NDdjNzEzMTVjY2ExM2U5Zjk5YzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL1dl YlZpZXcvV2ViVUlEZWxlZ2F0ZVByaXZhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJW aWV3L1dlYlVJRGVsZWdhdGVQcml2YXRlLmgKQEAgLTk2LDE5ICs5NiwxOSBAQCBlbnVtIHsKIGV4 dGVybiBOU1N0cmluZyAqV2ViQ29uc29sZU1lc3NhZ2VIVE1MTWVzc2FnZVNvdXJjZTsKIGV4dGVy biBOU1N0cmluZyAqV2ViQ29uc29sZU1lc3NhZ2VYTUxNZXNzYWdlU291cmNlOwogZXh0ZXJuIE5T U3RyaW5nICpXZWJDb25zb2xlTWVzc2FnZUpTTWVzc2FnZVNvdXJjZTsKLWV4dGVybiBOU1N0cmlu ZyAqV2ViQ29uc29sZU1lc3NhZ2VDU1NNZXNzYWdlU291cmNlOworZXh0ZXJuIE5TU3RyaW5nICpX ZWJDb25zb2xlTWVzc2FnZU5ldHdvcmtNZXNzYWdlU291cmNlOworZXh0ZXJuIE5TU3RyaW5nICpX ZWJDb25zb2xlTWVzc2FnZUNvbnNvbGVBUElNZXNzYWdlU291cmNlOwogZXh0ZXJuIE5TU3RyaW5n ICpXZWJDb25zb2xlTWVzc2FnZU90aGVyTWVzc2FnZVNvdXJjZTsKIAogLy8gTWVzc2FnZSBUeXBl cy4KIGV4dGVybiBOU1N0cmluZyAqV2ViQ29uc29sZU1lc3NhZ2VMb2dNZXNzYWdlVHlwZTsKLWV4 dGVybiBOU1N0cmluZyAqV2ViQ29uc29sZU1lc3NhZ2VPYmplY3RNZXNzYWdlVHlwZTsKK2V4dGVy biBOU1N0cmluZyAqV2ViQ29uc29sZU1lc3NhZ2VEaXJNZXNzYWdlVHlwZTsKK2V4dGVybiBOU1N0 cmluZyAqV2ViQ29uc29sZU1lc3NhZ2VEaXJYTUxNZXNzYWdlVHlwZTsKIGV4dGVybiBOU1N0cmlu ZyAqV2ViQ29uc29sZU1lc3NhZ2VUcmFjZU1lc3NhZ2VUeXBlOwogZXh0ZXJuIE5TU3RyaW5nICpX ZWJDb25zb2xlTWVzc2FnZVN0YXJ0R3JvdXBNZXNzYWdlVHlwZTsKIGV4dGVybiBOU1N0cmluZyAq V2ViQ29uc29sZU1lc3NhZ2VTdGFydEdyb3VwQ29sbGFwc2VkTWVzc2FnZVR5cGU7CiBleHRlcm4g TlNTdHJpbmcgKldlYkNvbnNvbGVNZXNzYWdlRW5kR3JvdXBNZXNzYWdlVHlwZTsKIGV4dGVybiBO U1N0cmluZyAqV2ViQ29uc29sZU1lc3NhZ2VBc3NlcnRNZXNzYWdlVHlwZTsKLWV4dGVybiBOU1N0 cmluZyAqV2ViQ29uc29sZU1lc3NhZ2VVbmNhdWdodEV4Y2VwdGlvbk1lc3NhZ2VUeXBlOwotZXh0 ZXJuIE5TU3RyaW5nICpXZWJDb25zb2xlTWVzc2FnZU5ldHdvcmtFcnJvck1lc3NhZ2VUeXBlOwog CiAvLyBNZXNzYWdlIExldmVscy4KIGV4dGVybiBOU1N0cmluZyAqV2ViQ29uc29sZU1lc3NhZ2VU aXBNZXNzYWdlTGV2ZWw7Cg== 107884 2011-09-19 10:53:34 -0700 2011-09-19 10:55:15 -0700 [Patch] rebaselined 2. bug-68342-20110919215331.patch text/plain 39142 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogOTU0MDQKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA3NjhjNDRhNDE2Nzc4YTFiNGMyNGE3 MzkwNTQwNjgzNDg1YWNiYmE5Li4wMWYwNDgwMGJkZTI3OWQwYmZkYWM4ZjIwYzVkMzNhZDcxNjE3 OTg4IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMDktMTkgIFBhdmVsIEZlbGRtYW4gIDxw ZmVsZG1hbkBnb29nbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IHN0cmVhbWxpbmUg Q29uc29sZSdzIE1lc3NhZ2VUeXBlIGFuZCBNZXNzYWdlU291cmNlIHNlbWFudGljcy4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY4MzQyCisKKyAgICAg ICAgVGhpcyBjaGFuZ2UgZml4ZXMgc2VtYW50aWNzIG9mIHRoZSBNZXNzYWdlU291cmNlIGFuZCBN ZXNzYWdlVHlwZToKKyAgICAgICAgTWVzc2FnZVNvdXJjZSBpcyBub3cgdGhlIHNvdXJjZSBvZiB0 aGUgbWVzc2FnZSAoYmUgaXQgTmV0d29yaywgSFRNTAorICAgICAgICBwYXJzZXIgb3IgQ29uc29s ZSBBUEkpLiBNZXNzYWdlVHlwZSBpcyBvbmx5IGRlZmluZWQgZm9yIHRoZSBDb25zb2xlIEFQSQor ICAgICAgICBtZXNzYWdlcyBhbmQgY29udGFpbnMgdGhlIG5hbWUgb2YgdGhlIEFQSSBjYWxsIChs b2csIGRpciwgZGlyeG1sLCBldGMuKS4KKyAgICAgICAgU3Vic2VxdWVudCBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjYzNzEgd2lsbCBtYWtlIE1lc3NhZ2VUeXBlCisg ICAgICAgIHByaXZhdGUgdG8gdGhlIGluc3BlY3Rvci4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9wcm90b2NvbC9jb25zb2xlLWFn ZW50LWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiBwbGF0Zm9ybS9jaHJvbWl1bS9odHRwL3Rlc3Rz L2luc3BlY3Rvci9jb25zb2xlLXJlc291cmNlLWVycm9ycy1leHBlY3RlZC50eHQ6IEFkZGVkLgor CiAyMDExLTA5LTE4ICBJbHlhIFRpa2hvbm92c2t5ICA8bG9pc2xvQGNocm9taXVtLm9yZz4KIAog ICAgICAgICBXZWIgSW5zcGVjdG9yOiByZXF1ZXN0QW5pbWF0aW9uRnJhbWUgY2FsbGJhY2tzIGRv bid0IHNob3cgdXAgaW4gdGhlIHRpbWVsaW5lIHBhbmVsLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvaW5zcGVjdG9yL3Byb3RvY29sL2NvbnNvbGUtYWdlbnQtZXhwZWN0ZWQudHh0IGIvTGF5b3V0 VGVzdHMvaW5zcGVjdG9yL3Byb3RvY29sL2NvbnNvbGUtYWdlbnQtZXhwZWN0ZWQudHh0CmluZGV4 IGUwM2NjZTJiZWZiNDBiNjA5MGIzNjRkZjJkODMxMGVlMDE1YWQ0NjAuLjhlMDhjYzAyYjIwNGFj ZWEwMjI5NTE5YTIwN2FjYzJiOWNhODdlOGQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3Bl Y3Rvci9wcm90b2NvbC9jb25zb2xlLWFnZW50LWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0 cy9pbnNwZWN0b3IvcHJvdG9jb2wvY29uc29sZS1hZ2VudC1leHBlY3RlZC50eHQKQEAgLTUzLDgg KzUzLDggQEAgZXZlbnQgQ29uc29sZUFnZW50Lm1lc3NhZ2VBZGRlZAogewogICAgIG1ldGhvZCA6 ICJDb25zb2xlLm1lc3NhZ2VBZGRlZCIKICAgICBwYXJhbXMgOiB7Ci0gICAgICAgIG1lc3NhZ2VP YmogOiB7Ci0gICAgICAgICAgICBzb3VyY2UgOiAiamF2YXNjcmlwdCIKKyAgICAgICAgbWVzc2Fn ZSA6IHsKKyAgICAgICAgICAgIHNvdXJjZSA6ICJjb25zb2xlLWFwaSIKICAgICAgICAgICAgIHR5 cGUgOiAibG9nIgogICAgICAgICAgICAgbGV2ZWwgOiAibG9nIgogICAgICAgICAgICAgbGluZSA6 IDAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2Nocm9taXVtL2h0dHAvdGVzdHMv aW5zcGVjdG9yL2NvbnNvbGUtcmVzb3VyY2UtZXJyb3JzLWV4cGVjdGVkLnR4dCBiL0xheW91dFRl c3RzL3BsYXRmb3JtL2Nocm9taXVtL2h0dHAvdGVzdHMvaW5zcGVjdG9yL2NvbnNvbGUtcmVzb3Vy Y2UtZXJyb3JzLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5lZmM3OTQzNWM0NzA4M2Q2MDkyZjAy YjU3Y2E2MjcxMDM4NjMxZGE0Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZv cm0vY2hyb21pdW0vaHR0cC90ZXN0cy9pbnNwZWN0b3IvY29uc29sZS1yZXNvdXJjZS1lcnJvcnMt ZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsOCBAQAorVGVzdHMgdGhhdCBlcnJvcnMgdG8gbG9hZCBh IHJlc291cmNlIGNhdXNlIGVycm9yIG1lc3NhZ2VzIHRvIGJlIGxvZ2dlZCB0byBjb25zb2xlLgor CisKK0dFVCBodHRwOi8vMTI3LjAuMC4xOjgwMDAvaW5zcGVjdG9yL21pc3NpbmcuY3NzIDQwNCAo Tm90IEZvdW5kKSBjb25zb2xlLW1lc3NhZ2UgY29uc29sZS1lcnJvci1sZXZlbAorR0VUIGh0dHA6 Ly8xMjcuMC4wLjE6ODAwMC9pbnNwZWN0b3Ivbm9uLWV4aXN0ZW50LWlmcmFtZS5odG1sIDQwNCAo Tm90IEZvdW5kKSBjb25zb2xlLW1lc3NhZ2UgY29uc29sZS1lcnJvci1sZXZlbAorR0VUIGh0dHA6 Ly8xMjcuMC4wLjE6ODAwMC9pbnNwZWN0b3Ivbm9uLWV4aXN0ZW50LXNjcmlwdC5qcyA0MDQgKE5v dCBGb3VuZCkgY29uc29sZS1tZXNzYWdlIGNvbnNvbGUtZXJyb3ItbGV2ZWwKK0dFVCBodHRwOi8v MTI3LjAuMC4xOjgwMDAvaW5zcGVjdG9yL25vbi1leGlzdGVudC14aHIgNDA0IChOb3QgRm91bmQp bG9hZFhIUmNvbnNvbGUtcmVzb3VyY2UtZXJyb3JzLmh0bWw6MThwZXJmb3JtQWN0aW9uc2NvbnNv bGUtcmVzb3VyY2UtZXJyb3JzLmh0bWw6MTAoYW5vbnltb3VzIGZ1bmN0aW9uKUluamVjdGVkU2Ny aXB0Ll9ldmFsdWF0ZU9uSW5qZWN0ZWRTY3JpcHQuX2V2YWx1YXRlQW5kV3JhcEluamVjdGVkU2Ny aXB0LmV2YWx1YXRlIGNvbnNvbGUtbWVzc2FnZSBjb25zb2xlLWVycm9yLWxldmVsCisKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxv ZwppbmRleCA0MGJiZjYwNjAwZDEyZTE1NjkwZGExZjZjNjgyYjY0OWM4NmUzOTIzLi4yYmU3NjMz OTIxNzFjMDMwMTk0YzYyYTU4MTZkZWIwODBjMmU2NThlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs NDMgQEAKKzIwMTEtMDktMTkgIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgor CisgICAgICAgIFdlYiBJbnNwZWN0b3I6IHN0cmVhbWxpbmUgQ29uc29sZSdzIE1lc3NhZ2VUeXBl IGFuZCBNZXNzYWdlU291cmNlIHNlbWFudGljcy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTY4MzQyCisKKyAgICAgICAgVGhpcyBjaGFuZ2UgZml4ZXMg c2VtYW50aWNzIG9mIHRoZSBNZXNzYWdlU291cmNlIGFuZCBNZXNzYWdlVHlwZToKKyAgICAgICAg TWVzc2FnZVNvdXJjZSBpcyBub3cgdGhlIHNvdXJjZSBvZiB0aGUgbWVzc2FnZSAoYmUgaXQgTmV0 d29yaywgSFRNTAorICAgICAgICBwYXJzZXIgb3IgQ29uc29sZSBBUEkpLiBNZXNzYWdlVHlwZSBp cyBvbmx5IGRlZmluZWQgZm9yIHRoZSBDb25zb2xlIEFQSQorICAgICAgICBtZXNzYWdlcyBhbmQg Y29udGFpbnMgdGhlIG5hbWUgb2YgdGhlIEFQSSBjYWxsIChsb2csIGRpciwgZGlyeG1sLCBldGMu KS4KKyAgICAgICAgU3Vic2VxdWVudCBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NjYzNzEgd2lsbCBtYWtlIE1lc3NhZ2VUeXBlCisgICAgICAgIHByaXZhdGUgdG8gdGhl IGluc3BlY3Rvci4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIGRvbS9Eb2N1bWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6bG9n RXhjZXB0aW9uVG9Db25zb2xlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvQ29uc29sZU1lc3NhZ2Uu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6bWVzc2FnZVNvdXJjZVZhbHVlKToKKyAgICAgICAgKFdl YkNvcmU6Om1lc3NhZ2VUeXBlVmFsdWUpOgorICAgICAgICAoV2ViQ29yZTo6Q29uc29sZU1lc3Nh Z2U6OmFkZFRvRnJvbnRlbmQpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3IuanNvbjoK KyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yQ29uc29sZUFnZW50LmNwcDoKKyAgICAgICAg KFdlYkNvcmU6Okluc3BlY3RvckNvbnNvbGVBZ2VudDo6ZGlkUmVjZWl2ZVJlc3BvbnNlKToKKyAg ICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNvbnNvbGVBZ2VudDo6ZGlkRmFpbExvYWRpbmcpOgor ICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZU1lc3NhZ2UuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuY3JlYXRlVGV4dE1lc3NhZ2UpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLnByb3RvdHlwZS5fZm9ybWF0TWVzc2FnZSk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UucHJvdG90eXBlLnRvU3RyaW5n KToKKyAgICAgICAgKiBwYWdlL0NvbnNvbGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6cHJpbnRN ZXNzYWdlU291cmNlQW5kTGV2ZWxQcmVmaXgpOgorICAgICAgICAoV2ViQ29yZTo6Q29uc29sZTo6 YWRkTWVzc2FnZSk6CisgICAgICAgIChXZWJDb3JlOjpDb25zb2xlOjpkaXIpOgorICAgICAgICAo V2ViQ29yZTo6Q29uc29sZTo6ZGlyeG1sKToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnNvbGU6Omdy b3VwKToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnNvbGU6Omdyb3VwQ29sbGFwc2VkKToKKyAgICAg ICAgKFdlYkNvcmU6OkNvbnNvbGU6Omdyb3VwRW5kKToKKyAgICAgICAgKiBwYWdlL0NvbnNvbGVU eXBlcy5oOgorICAgICAgICAqIHdlYnNvY2tldHMvV2ViU29ja2V0Q2hhbm5lbC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpXZWJTb2NrZXRDaGFubmVsOjpkaWRGYWlsU29ja2V0U3RyZWFtKToKKwog MjAxMS0wOS0xOCAgSWx5YSBUaWtob25vdnNreSAgPGxvaXNsb0BjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgV2ViIEluc3BlY3RvcjogcmVxdWVzdEFuaW1hdGlvbkZyYW1lIGNhbGxiYWNrcyBkb24n dCBzaG93IHVwIGluIHRoZSB0aW1lbGluZSBwYW5lbC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2RvbS9Eb2N1bWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCmlu ZGV4IDE5NDNmYWU3ODJmNDNjYzE3MjhjMzczNmI1YTI0ZWI5M2M3MWMzYzIuLjUyNzY5MjBlOTZj ZjU0Njc5YjkxZGY2NGVlZDJlOWZkM2U4ZjAxMzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2RvbS9Eb2N1bWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcApA QCAtMjM1Nyw4ICsyMzU3LDcgQEAgRXZlbnRUYXJnZXQqIERvY3VtZW50OjplcnJvckV2ZW50VGFy Z2V0KCkKIAogdm9pZCBEb2N1bWVudDo6bG9nRXhjZXB0aW9uVG9Db25zb2xlKGNvbnN0IFN0cmlu ZyYgZXJyb3JNZXNzYWdlLCBpbnQgbGluZU51bWJlciwgY29uc3QgU3RyaW5nJiBzb3VyY2VVUkws IFBhc3NSZWZQdHI8U2NyaXB0Q2FsbFN0YWNrPiBjYWxsU3RhY2spCiB7Ci0gICAgTWVzc2FnZVR5 cGUgbWVzc2FnZVR5cGUgPSBjYWxsU3RhY2sgPyBVbmNhdWdodEV4Y2VwdGlvbk1lc3NhZ2VUeXBl IDogTG9nTWVzc2FnZVR5cGU7Ci0gICAgYWRkTWVzc2FnZShKU01lc3NhZ2VTb3VyY2UsIG1lc3Nh Z2VUeXBlLCBFcnJvck1lc3NhZ2VMZXZlbCwgZXJyb3JNZXNzYWdlLCBsaW5lTnVtYmVyLCBzb3Vy Y2VVUkwsIGNhbGxTdGFjayk7CisgICAgYWRkTWVzc2FnZShKU01lc3NhZ2VTb3VyY2UsIExvZ01l c3NhZ2VUeXBlLCBFcnJvck1lc3NhZ2VMZXZlbCwgZXJyb3JNZXNzYWdlLCBsaW5lTnVtYmVyLCBz b3VyY2VVUkwsIGNhbGxTdGFjayk7CiB9CiAKIHZvaWQgRG9jdW1lbnQ6OnNldFVSTChjb25zdCBL VVJMJiB1cmwpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvQ29uc29sZU1l c3NhZ2UuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0NvbnNvbGVNZXNzYWdlLmNwcApp bmRleCAwYmM0YmExN2U0ZGEwYzVkNDIyZGNmOTE2NDQwMzk1YTBhODM1ZTM0Li5kNDRhNDk1OTA4 MzQzMDkyM2E3ZTExMTdkNjYzYTRjOTg2NmIyYzU4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvQ29uc29sZU1lc3NhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9Db25zb2xlTWVzc2FnZS5jcHAKQEAgLTkxLDcgKzkxLDggQEAgc3RhdGljIFN0cmluZyBt ZXNzYWdlU291cmNlVmFsdWUoTWVzc2FnZVNvdXJjZSBzb3VyY2UpCiAgICAgY2FzZSBIVE1MTWVz c2FnZVNvdXJjZTogcmV0dXJuICJodG1sIjsKICAgICBjYXNlIFhNTE1lc3NhZ2VTb3VyY2U6IHJl dHVybiAieG1sIjsKICAgICBjYXNlIEpTTWVzc2FnZVNvdXJjZTogcmV0dXJuICJqYXZhc2NyaXB0 IjsKLSAgICBjYXNlIENTU01lc3NhZ2VTb3VyY2U6IHJldHVybiAiY3NzIjsKKyAgICBjYXNlIE5l dHdvcmtNZXNzYWdlU291cmNlOiByZXR1cm4gIm5ldHdvcmsiOworICAgIGNhc2UgQ29uc29sZUFQ SU1lc3NhZ2VTb3VyY2U6IHJldHVybiAiY29uc29sZS1hcGkiOwogICAgIGNhc2UgT3RoZXJNZXNz YWdlU291cmNlOiByZXR1cm4gIm90aGVyIjsKICAgICB9CiAgICAgcmV0dXJuICJvdGhlciI7CkBA IC0xMDEsMTQgKzEwMiwxMyBAQCBzdGF0aWMgU3RyaW5nIG1lc3NhZ2VUeXBlVmFsdWUoTWVzc2Fn ZVR5cGUgdHlwZSkKIHsKICAgICBzd2l0Y2ggKHR5cGUpIHsKICAgICBjYXNlIExvZ01lc3NhZ2VU eXBlOiByZXR1cm4gImxvZyI7Ci0gICAgY2FzZSBPYmplY3RNZXNzYWdlVHlwZTogcmV0dXJuICJv dGhlciI7CisgICAgY2FzZSBEaXJNZXNzYWdlVHlwZTogcmV0dXJuICJkaXIiOworICAgIGNhc2Ug RGlyWE1MTWVzc2FnZVR5cGU6IHJldHVybiAiZGlyWE1MIjsKICAgICBjYXNlIFRyYWNlTWVzc2Fn ZVR5cGU6IHJldHVybiAidHJhY2UiOwogICAgIGNhc2UgU3RhcnRHcm91cE1lc3NhZ2VUeXBlOiBy ZXR1cm4gInN0YXJ0R3JvdXAiOwogICAgIGNhc2UgU3RhcnRHcm91cENvbGxhcHNlZE1lc3NhZ2VU eXBlOiByZXR1cm4gInN0YXJ0R3JvdXBDb2xsYXBzZWQiOwogICAgIGNhc2UgRW5kR3JvdXBNZXNz YWdlVHlwZTogcmV0dXJuICJlbmRHcm91cCI7CiAgICAgY2FzZSBBc3NlcnRNZXNzYWdlVHlwZTog cmV0dXJuICJhc3NlcnQiOwotICAgIGNhc2UgVW5jYXVnaHRFeGNlcHRpb25NZXNzYWdlVHlwZTog cmV0dXJuICJ1bmNhdWdodEV4Y2VwdGlvbiI7Ci0gICAgY2FzZSBOZXR3b3JrRXJyb3JNZXNzYWdl VHlwZTogcmV0dXJuICJuZXR3b3JrRXJyb3IiOwogICAgIH0KICAgICByZXR1cm4gIm90aGVyIjsK IH0KQEAgLTEyOSwxMyArMTI5LDE0IEBAIHZvaWQgQ29uc29sZU1lc3NhZ2U6OmFkZFRvRnJvbnRl bmQoSW5zcGVjdG9yRnJvbnRlbmQ6OkNvbnNvbGUqIGZyb250ZW5kLCBJbmplY3RlCiB7CiAgICAg UmVmUHRyPEluc3BlY3Rvck9iamVjdD4ganNvbk9iaiA9IEluc3BlY3Rvck9iamVjdDo6Y3JlYXRl KCk7CiAgICAganNvbk9iai0+c2V0U3RyaW5nKCJzb3VyY2UiLCBtZXNzYWdlU291cmNlVmFsdWUo bV9zb3VyY2UpKTsKKyAgICAvLyBGSVhNRTogb25seSBzZW5kIG91dCB0eXBlIGZvciBDb25zb2xl QVBJIHNvdXJjZSBtZXNzYWdlcy4KICAgICBqc29uT2JqLT5zZXRTdHJpbmcoInR5cGUiLCBtZXNz YWdlVHlwZVZhbHVlKG1fdHlwZSkpOwogICAgIGpzb25PYmotPnNldFN0cmluZygibGV2ZWwiLCBt ZXNzYWdlTGV2ZWxWYWx1ZShtX2xldmVsKSk7CiAgICAganNvbk9iai0+c2V0TnVtYmVyKCJsaW5l Iiwgc3RhdGljX2Nhc3Q8aW50PihtX2xpbmUpKTsKICAgICBqc29uT2JqLT5zZXRTdHJpbmcoInVy bCIsIG1fdXJsKTsKICAgICBqc29uT2JqLT5zZXROdW1iZXIoInJlcGVhdENvdW50Iiwgc3RhdGlj X2Nhc3Q8aW50PihtX3JlcGVhdENvdW50KSk7CiAgICAganNvbk9iai0+c2V0U3RyaW5nKCJ0ZXh0 IiwgbV9tZXNzYWdlKTsKLSAgICBpZiAobV90eXBlID09IE5ldHdvcmtFcnJvck1lc3NhZ2VUeXBl KSAKKyAgICBpZiAobV9zb3VyY2UgPT0gTmV0d29ya01lc3NhZ2VTb3VyY2UgJiYgIW1fcmVxdWVz dElkLmlzRW1wdHkoKSkKICAgICAgICAganNvbk9iai0+c2V0U3RyaW5nKCJuZXR3b3JrUmVxdWVz dElkIiwgbV9yZXF1ZXN0SWQpOwogICAgIGlmIChtX2FyZ3VtZW50cyAmJiBtX2FyZ3VtZW50cy0+ YXJndW1lbnRDb3VudCgpKSB7CiAgICAgICAgIEluamVjdGVkU2NyaXB0IGluamVjdGVkU2NyaXB0 ID0gaW5qZWN0ZWRTY3JpcHRNYW5hZ2VyLT5pbmplY3RlZFNjcmlwdEZvcihtX2FyZ3VtZW50cy0+ Z2xvYmFsU3RhdGUoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yLmpzb24gYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24KaW5k ZXggYTkzNzc1MTQ5NWEyNDE2MjEzMDM3YmZkMzA5YTUxYjZmODA3M2FmYy4uNTAyOGQ0YmE2YThm ODJjNGQxOWExOWMwMjllMWYzOTY5YWYwNmRjOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3Rvci5qc29uCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3IuanNvbgpAQCAtMzMyLDIyICszMzIsMjIgQEAKICAgICB9LAogICAgIHsKICAgICAg ICAgImRvbWFpbiI6ICJDb25zb2xlIiwKLSAgICAgICAgImRlc2NyaXB0aW9uIjogIkNvbnNvbGUg ZG9tYWluIGRlZmluZXMgbWV0aG9kcyBhbmQgZXZlbnRzIGZvciBpbnRlcmFjdGlvbiB3aXRoIHRo ZSBKYXZhU2NyaXB0IGNvbnNvbGUuIENvbnNvbGUgY29sbGVjdHMgbWVzc2FnZXMgY3JlYXRlZCBi eSBtZWFucyBvZiB0aGUgPGEgaHJlZj0naHR0cDovL2dldGZpcmVidWcuY29tL3dpa2kvaW5kZXgu cGhwL0NvbnNvbGVfQVBJJz5KYXZhU2NyaXB0IENvbnNvbGUgQVBJPC9hPi4gT25lIG5lZWRzIHRv IGVuYWJsZSB0aGlzIGRvbWFpbiB1c2luZyA8Y29kZT5lbmFibGU8L2NvZGU+IGZ1bmN0aW9uIGlu IG9yZGVyIHRvIHN0YXJ0IHJlY2VpdmluZyB0aGUgY29uc29sZSBtZXNzYWdlcy4gQnJvd3NlciB3 aWxsIGNvbGxlY3QgbWVzc2FnZXMgaXNzdWVkIHdoaWxlIGNvbnNvbGUgZG9tYWluIGlzIG5vdCBl bmFibGVkIGFuZCB3aWxsIHJlcG9ydCB0aGVtIHVzaW5nIDxjb2RlPm1lc3NhZ2VBZGRlZDwvY29k ZT4gbm90aWZpY2F0aW9uIHVwb24gZW5hYmxpbmcuIiwKKyAgICAgICAgImRlc2NyaXB0aW9uIjog IkNvbnNvbGUgZG9tYWluIGRlZmluZXMgbWV0aG9kcyBhbmQgZXZlbnRzIGZvciBpbnRlcmFjdGlv biB3aXRoIHRoZSBKYXZhU2NyaXB0IGNvbnNvbGUuIENvbnNvbGUgY29sbGVjdHMgbWVzc2FnZXMg Y3JlYXRlZCBieSBtZWFucyBvZiB0aGUgPGEgaHJlZj0naHR0cDovL2dldGZpcmVidWcuY29tL3dp a2kvaW5kZXgucGhwL0NvbnNvbGVfQVBJJz5KYXZhU2NyaXB0IENvbnNvbGUgQVBJPC9hPi4gT25l IG5lZWRzIHRvIGVuYWJsZSB0aGlzIGRvbWFpbiB1c2luZyA8Y29kZT5lbmFibGU8L2NvZGU+IGNv bW1hbmQgaW4gb3JkZXIgdG8gc3RhcnQgcmVjZWl2aW5nIHRoZSBjb25zb2xlIG1lc3NhZ2VzLiBC cm93c2VyIGNvbGxlY3RzIG1lc3NhZ2VzIGlzc3VlZCB3aGlsZSBjb25zb2xlIGRvbWFpbiBpcyBu b3QgZW5hYmxlZCBhcyB3ZWxsIGFuZCByZXBvcnRzIHRoZW0gdXNpbmcgPGNvZGU+bWVzc2FnZUFk ZGVkPC9jb2RlPiBub3RpZmljYXRpb24gdXBvbiBlbmFibGluZy4iLAogICAgICAgICAidHlwZXMi OiBbCiAgICAgICAgICAgICB7CiAgICAgICAgICAgICAgICAgImlkIjogIkNvbnNvbGVNZXNzYWdl IiwKICAgICAgICAgICAgICAgICAidHlwZSI6ICJvYmplY3QiLAogICAgICAgICAgICAgICAgICJk ZXNjcmlwdGlvbiI6ICJDb25zb2xlIG1lc3NhZ2UuIiwKICAgICAgICAgICAgICAgICAicHJvcGVy dGllcyI6IFsKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJzb3VyY2UiLCAidHlwZSI6 ICJzdHJpbmciLCAiZW51bSI6IFsiaHRtbCIsICJ3bWwiLCAieG1sIiwgImphdmFzY3JpcHQiLCAi Y3NzIiwgIm90aGVyIl0sICJkZXNjcmlwdGlvbiI6ICJNZXNzYWdlIHNvdXJjZS4iIH0sCi0gICAg ICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAidHlwZSIsICJ0eXBlIjogInN0cmluZyIsICJlbnVt IjogWyJsb2ciLCAib3RoZXIiLCAidHJhY2UiLCAic3RhcnRHcm91cCIsICJzdGFydEdyb3VwQ29s bGFwc2VkIiwgImVuZEdyb3VwIiwgImFzc2VydCIsICJ1bmNhdWdodEV4Y2VwdGlvbiIsICJuZXR3 b3JrRXJyb3IiLCAicmVzdWx0Il0sICJkZXNjcmlwdGlvbiI6ICJNZXNzYWdlIHR5cGUuIiB9LAor ICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInNvdXJjZSIsICJ0eXBlIjogInN0cmluZyIs ICJlbnVtIjogWyJodG1sIiwgIndtbCIsICJ4bWwiLCAiamF2YXNjcmlwdCIsICJuZXR3b3JrIiwg ImNvbnNvbGUtYXBpIiwgIm90aGVyIl0sICJkZXNjcmlwdGlvbiI6ICJNZXNzYWdlIHNvdXJjZS4i IH0sCisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAidHlwZSIsICJ0eXBlIjogInN0cmlu ZyIsICJlbnVtIjogWyJsb2ciLCAiZGlyIiwgImRpcnhtbCIsICJ0cmFjZSIsICJzdGFydEdyb3Vw IiwgInN0YXJ0R3JvdXBDb2xsYXBzZWQiLCAiZW5kR3JvdXAiLCAiYXNzZXJ0Il0sICJkZXNjcmlw dGlvbiI6ICJDb25zb2xlIG1lc3NhZ2UgdHlwZS4iIH0sCiAgICAgICAgICAgICAgICAgICAgIHsg Im5hbWUiOiAibGV2ZWwiLCAidHlwZSI6ICJzdHJpbmciLCAiZW51bSI6IFsidGlwIiwgImxvZyIs ICJ3YXJuaW5nIiwgImVycm9yIiwgImRlYnVnIl0sICJkZXNjcmlwdGlvbiI6ICJNZXNzYWdlIHNl dmVyaXR5LiIgfSwKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJsaW5lIiwgInR5cGUi OiAiaW50ZWdlciIsICJkZXNjcmlwdGlvbiI6ICJMaW5lIG51bWJlciBpbiB0aGUgbWVzc2FnZSBv cmlnaW4gcmVzb3VyY2UuIiB9LAorICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImxpbmUi LCAidHlwZSI6ICJpbnRlZ2VyIiwgImRlc2NyaXB0aW9uIjogIkxpbmUgbnVtYmVyIGluIHRoZSBy ZXNvdXJjZSB0aGF0IGdlbmVyYXRlZCB0aGlzIG1lc3NhZ2UuIiB9LAogICAgICAgICAgICAgICAg ICAgICB7ICJuYW1lIjogInVybCIsICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJV Ukwgb2YgdGhlIG1lc3NhZ2Ugb3JpZ2luLiIgfSwKICAgICAgICAgICAgICAgICAgICAgeyAibmFt ZSI6ICJyZXBlYXRDb3VudCIsICJ0eXBlIjogImludGVnZXIiLCAiZGVzY3JpcHRpb24iOiAiUmVw ZWF0IGNvdW50IGZvciByZXBlYXRlZCBtZXNzYWdlcy4iIH0sCiAgICAgICAgICAgICAgICAgICAg IHsgIm5hbWUiOiAidGV4dCIsICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJNZXNz YWdlIHRleHQuIiB9LAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogIm5ldHdvcmtSZXF1 ZXN0SWQiLCAiJHJlZiI6ICJOZXR3b3JrLlJlcXVlc3RJZCIsICJvcHRpb25hbCI6IHRydWUsICJk ZXNjcmlwdGlvbiI6ICJJZGVudGlmaWVyIG9mIHRoZSBuZXR3b3JrIHJlcXVlc3QgYXNzb2NpYXRl ZCB3aXRoIHRoaXMgbWVzc2FnZS4iIH0sCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAi cGFyYW1ldGVycyIsICJ0eXBlIjogImFycmF5IiwgIml0ZW1zIjogeyAiJHJlZiI6ICJSdW50aW1l LlJlbW90ZU9iamVjdCIgfSwgImRlc2NyaXB0aW9uIjogIk1lc3NhZ2UgcGFyYW1ldGVycyBpbiBj YXNlIG9mIHRoZSBmb3JtYXR0ZWQgbWVzc2FnZS4iIH0sCisgICAgICAgICAgICAgICAgICAgIHsg Im5hbWUiOiAicGFyYW1ldGVycyIsICJ0eXBlIjogImFycmF5IiwgIml0ZW1zIjogeyAiJHJlZiI6 ICJSdW50aW1lLlJlbW90ZU9iamVjdCIgfSwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9u IjogIk1lc3NhZ2UgcGFyYW1ldGVycyBpbiBjYXNlIG9mIHRoZSBmb3JtYXR0ZWQgbWVzc2FnZS4i IH0sCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAic3RhY2tUcmFjZSIsICIkcmVmIjog IlN0YWNrVHJhY2UiLCAiZGVzY3JpcHRpb24iOiAiSmF2YVNjcmlwdCBzdGFjayB0cmFjZSBmb3Ig YXNzZXJ0aW9ucyBhbmQgZXJyb3IgbWVzc2FnZXMuIiB9CiAgICAgICAgICAgICAgICAgXQogICAg ICAgICAgICAgfSwKQEAgLTM3MywxMyArMzczLDEzIEBACiAgICAgICAgICAgICB7CiAgICAgICAg ICAgICAgICAgIm5hbWUiOiAiZW5hYmxlIiwKICAgICAgICAgICAgICAgICAicmV0dXJucyI6IFsK LSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJleHBpcmVkTWVzc2FnZXNDb3VudCIsICJ0 eXBlIjogImludGVnZXIiLCAiZGVzY3JpcHRpb24iOiAiTnVtYmVyIG9mIG1lc3NhZ2VzIGNvbGxl Y3RlZCBkdWUgdG8gbWVzc2FnZSB0aHJlYXNob2xkIG92ZXJmbG93LiIgfQorICAgICAgICAgICAg ICAgICAgICB7ICJuYW1lIjogImV4cGlyZWRNZXNzYWdlc0NvdW50IiwgInR5cGUiOiAiaW50ZWdl ciIsICJkZXNjcmlwdGlvbiI6ICJOdW1iZXIgb2YgbWVzc2FnZXMgZHJvcHBlZCBkdWUgdG8gbWVz c2FnZSB0aHJlYXNob2xkIG92ZXJmbG93LiIgfQogICAgICAgICAgICAgICAgIF0sCiAgICAgICAg ICAgICAgICAgImRlc2NyaXB0aW9uIjogIkVuYWJsZXMgY29uc29sZSBkb21haW4sIHNlbmRzIHRo ZSBtZXNzYWdlcyBjb2xsZWN0ZWQgc28gZmFyIHRvIHRoZSBjbGllbnQgYnkgbWVhbnMgb2YgdGhl IDxjb2RlPm1lc3NhZ2VBZGRlZDwvY29kZT4gbm90aWZpY2F0aW9uLiIgCiAgICAgICAgICAgICB9 LAogICAgICAgICAgICAgewogICAgICAgICAgICAgICAgICJuYW1lIjogImRpc2FibGUiLAotICAg ICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJEaXNhYmxlcyBjb25zb2xlIGRvbWFpbiwgcHJl dmVudHMgZnVydGhlciBjb25zb2xlIG1lc3NhZ2VzIGZyb20gYmVpbmcgc2VudCB0byB0aGUgY2xp ZW50LiIgCisgICAgICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIkRpc2FibGVzIGNvbnNvbGUg ZG9tYWluLCBwcmV2ZW50cyBmdXJ0aGVyIGNvbnNvbGUgbWVzc2FnZXMgZnJvbSBiZWluZyByZXBv cnRlZCB0byB0aGUgY2xpZW50LiIgCiAgICAgICAgICAgICB9LAogICAgICAgICAgICAgewogICAg ICAgICAgICAgICAgICJuYW1lIjogImNsZWFyTWVzc2FnZXMiLApAQCAtNDA2LDcgKzQwNiw3IEBA CiAgICAgICAgICAgICB7CiAgICAgICAgICAgICAgICAgIm5hbWUiOiAibWVzc2FnZUFkZGVkIiwK ICAgICAgICAgICAgICAgICAicGFyYW1ldGVycyI6IFsKLSAgICAgICAgICAgICAgICAgICAgeyAi bmFtZSI6ICJtZXNzYWdlT2JqIiwgIiRyZWYiOiAiQ29uc29sZU1lc3NhZ2UiLCAiZGVzY3JpcHRp b24iOiAiQ29uc29sZSBtZXNzYWdlIHRoYXQgaGFzIGJlZW4gYWRkZWQuIiB9CisgICAgICAgICAg ICAgICAgICAgIHsgIm5hbWUiOiAibWVzc2FnZSIsICIkcmVmIjogIkNvbnNvbGVNZXNzYWdlIiwg ImRlc2NyaXB0aW9uIjogIkNvbnNvbGUgbWVzc2FnZSB0aGF0IGhhcyBiZWVuIGFkZGVkLiIgfQog ICAgICAgICAgICAgICAgIF0sCiAgICAgICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIklzc3Vl ZCB3aGVuIG5ldyBjb25zb2xlIG1lc3NhZ2UgaXMgYWRkZWQuIgogICAgICAgICAgICAgfSwKQEAg LTQxNSwxMSArNDE1LDExIEBACiAgICAgICAgICAgICAgICAgInBhcmFtZXRlcnMiOiBbCiAgICAg ICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiY291bnQiLCAidHlwZSI6ICJpbnRlZ2VyIiwgImRl c2NyaXB0aW9uIjogIk5ldyByZXBlYXQgY291bnQgdmFsdWUuIiB9CiAgICAgICAgICAgICAgICAg XSwKLSAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiSXNzdWVkIHdoZW4gc3Vic2VxdWVu dCBtZXNzYWdlKHMpIGFyZSBlcXVhbCB0byB0aGUgcHJldmlvdXMgb25lLiIKKyAgICAgICAgICAg ICAgICAiZGVzY3JpcHRpb24iOiAiSXNzdWVkIHdoZW4gc3Vic2VxdWVudCBtZXNzYWdlKHMpIGFy ZSBlcXVhbCB0byB0aGUgcHJldmlvdXMgb25lKHMpLiIKICAgICAgICAgICAgIH0sCiAgICAgICAg ICAgICB7CiAgICAgICAgICAgICAgICAgIm5hbWUiOiAibWVzc2FnZXNDbGVhcmVkIiwKLSAgICAg ICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiSXNzdWVkIHdoZW4gY29uc29sZSBpcyBjbGVhcmVk LiIKKyAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiSXNzdWVkIHdoZW4gY29uc29sZSBp cyBjbGVhcmVkLiBUaGlzIGhhcHBlbnMgZWl0aGVyIHVwb24gPGNvZGU+Y2xlYXJNZXNzYWdlczwv Y29kZT4gY29tbWFuZCBvciBhZnRlciBwYWdlIG5hdmlnYXRpb24uIgogICAgICAgICAgICAgfQog ICAgICAgICBdCiAgICAgfSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JDb25zb2xlQWdlbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3RvckNvbnNvbGVBZ2VudC5jcHAKaW5kZXggZDZiMzI2ODk1MzViM2QwYWQyODNlNTg1YmQ1ZThm MDA2NDIzZDgzYS4uOTFlNDAyN2Y3YjUzOWE3ZjRkZTcwMWZjYWU1MzQ1YWRjNDhjODMwNiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnNvbGVBZ2VudC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnNvbGVBZ2VudC5j cHAKQEAgLTIyNyw3ICsyMjcsNyBAQCB2b2lkIEluc3BlY3RvckNvbnNvbGVBZ2VudDo6ZGlkUmVj ZWl2ZVJlc3BvbnNlKHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgY29uc3QgUgogICAgIGlmIChy ZXNwb25zZS5odHRwU3RhdHVzQ29kZSgpID49IDQwMCkgewogICAgICAgICBTdHJpbmcgbWVzc2Fn ZSA9ICJGYWlsZWQgdG8gbG9hZCByZXNvdXJjZTogdGhlIHNlcnZlciByZXNwb25kZWQgd2l0aCBh IHN0YXR1cyBvZiAiICsgU3RyaW5nOjpudW1iZXIocmVzcG9uc2UuaHR0cFN0YXR1c0NvZGUoKSkg KyAiICgiICsgcmVzcG9uc2UuaHR0cFN0YXR1c1RleHQoKSArICcpJzsKICAgICAgICAgU3RyaW5n IHJlcXVlc3RJZCA9IElkZW50aWZpZXJzRmFjdG9yeTo6cmVxdWVzdElkKGlkZW50aWZpZXIpOwot ICAgICAgICBhZGRDb25zb2xlTWVzc2FnZShhZG9wdFB0cihuZXcgQ29uc29sZU1lc3NhZ2UoT3Ro ZXJNZXNzYWdlU291cmNlLCBOZXR3b3JrRXJyb3JNZXNzYWdlVHlwZSwgRXJyb3JNZXNzYWdlTGV2 ZWwsIG1lc3NhZ2UsIHJlc3BvbnNlLnVybCgpLnN0cmluZygpLCByZXF1ZXN0SWQpKSk7CisgICAg ICAgIGFkZENvbnNvbGVNZXNzYWdlKGFkb3B0UHRyKG5ldyBDb25zb2xlTWVzc2FnZShOZXR3b3Jr TWVzc2FnZVNvdXJjZSwgTG9nTWVzc2FnZVR5cGUsIEVycm9yTWVzc2FnZUxldmVsLCBtZXNzYWdl LCByZXNwb25zZS51cmwoKS5zdHJpbmcoKSwgcmVxdWVzdElkKSkpOwogICAgIH0KIH0KIApAQCAt MjQxLDcgKzI0MSw3IEBAIHZvaWQgSW5zcGVjdG9yQ29uc29sZUFnZW50OjpkaWRGYWlsTG9hZGlu Zyh1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGNvbnN0IFJlc291CiAgICAgaWYgKCFlcnJvci5s b2NhbGl6ZWREZXNjcmlwdGlvbigpLmlzRW1wdHkoKSkKICAgICAgICAgbWVzc2FnZSArPSAiOiAi ICsgZXJyb3IubG9jYWxpemVkRGVzY3JpcHRpb24oKTsKICAgICBTdHJpbmcgcmVxdWVzdElkID0g SWRlbnRpZmllcnNGYWN0b3J5OjpyZXF1ZXN0SWQoaWRlbnRpZmllcik7Ci0gICAgYWRkQ29uc29s ZU1lc3NhZ2UoYWRvcHRQdHIobmV3IENvbnNvbGVNZXNzYWdlKE90aGVyTWVzc2FnZVNvdXJjZSwg TmV0d29ya0Vycm9yTWVzc2FnZVR5cGUsIEVycm9yTWVzc2FnZUxldmVsLCBtZXNzYWdlLCBlcnJv ci5mYWlsaW5nVVJMKCksIHJlcXVlc3RJZCkpKTsKKyAgICBhZGRDb25zb2xlTWVzc2FnZShhZG9w dFB0cihuZXcgQ29uc29sZU1lc3NhZ2UoTmV0d29ya01lc3NhZ2VTb3VyY2UsIExvZ01lc3NhZ2VU eXBlLCBFcnJvck1lc3NhZ2VMZXZlbCwgbWVzc2FnZSwgZXJyb3IuZmFpbGluZ1VSTCgpLCByZXF1 ZXN0SWQpKSk7CiB9CiAKIHZvaWQgSW5zcGVjdG9yQ29uc29sZUFnZW50OjpzZXRNb25pdG9yaW5n WEhSRW5hYmxlZChFcnJvclN0cmluZyosIGJvb2wgZW5hYmxlZCkKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZU1lc3NhZ2UuanMgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVNZXNzYWdlLmpzCmluZGV4IGExZDRj OGM5NGI1NDUyZWMxYWUyZmMzM2RlNDEzMmExM2I5M2YxOTIuLjVmNTBlNjUwYWU4ZWM5YTVjNjNm ZWFmZmY4MmViNDM3ZmUxODQwZTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvQ29uc29sZU1lc3NhZ2UuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9Db25zb2xlTWVzc2FnZS5qcwpAQCAtNzMsNjQgKzczLDYyIEBAIFdlYklu c3BlY3Rvci5Db25zb2xlTWVzc2FnZSA9IGZ1bmN0aW9uKHNvdXJjZSwgdHlwZSwgbGV2ZWwsIGxp bmUsIHVybCwgcmVwZWF0Q291CiBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuY3JlYXRlVGV4 dE1lc3NhZ2UgPSBmdW5jdGlvbih0ZXh0LCBsZXZlbCkKIHsKICAgICBsZXZlbCA9IGxldmVsIHx8 IFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlTGV2ZWwuTG9nOwotICAgIHJldHVy biBuZXcgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlKFdlYkluc3BlY3Rvci5Db25zb2xlTWVz c2FnZS5NZXNzYWdlU291cmNlLkpTLCBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2Fn ZVR5cGUuTG9nLCBsZXZlbCwgMCwgbnVsbCwgMSwgbnVsbCwgW3RleHRdLCBudWxsKTsKKyAgICBy ZXR1cm4gbmV3IFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZShXZWJJbnNwZWN0b3IuQ29uc29s ZU1lc3NhZ2UuTWVzc2FnZVNvdXJjZS5Db25zb2xlQVBJLCBXZWJJbnNwZWN0b3IuQ29uc29sZU1l c3NhZ2UuTWVzc2FnZVR5cGUuTG9nLCBsZXZlbCwgMCwgbnVsbCwgMSwgbnVsbCwgW3RleHRdLCBu dWxsKTsKIH0KIAogV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLnByb3RvdHlwZSA9IHsKICAg ICBfZm9ybWF0TWVzc2FnZTogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgdmFyIHN0YWNrVHJh Y2UgPSB0aGlzLl9zdGFja1RyYWNlOwotCiAgICAgICAgIHRoaXMuX2Zvcm1hdHRlZE1lc3NhZ2Ug PSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJzcGFuIik7CiAgICAgICAgIHRoaXMuX2Zvcm1hdHRl ZE1lc3NhZ2UuY2xhc3NOYW1lID0gImNvbnNvbGUtbWVzc2FnZS10ZXh0IHNvdXJjZS1jb2RlIjsK IAogICAgICAgICB2YXIgbWVzc2FnZVRleHQ7Ci0gICAgICAgIHN3aXRjaCAodGhpcy50eXBlKSB7 Ci0gICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlVHlw ZS5UcmFjZToKLSAgICAgICAgICAgICAgICBtZXNzYWdlVGV4dCA9IGRvY3VtZW50LmNyZWF0ZVRl eHROb2RlKCJjb25zb2xlLnRyYWNlKCkiKTsKLSAgICAgICAgICAgICAgICBicmVhazsKLSAgICAg ICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLk1lc3NhZ2VUeXBlLlVuY2F1 Z2h0RXhjZXB0aW9uOgotICAgICAgICAgICAgICAgIG1lc3NhZ2VUZXh0ID0gZG9jdW1lbnQuY3Jl YXRlVGV4dE5vZGUodGhpcy5fbWVzc2FnZVRleHQpOwotICAgICAgICAgICAgICAgIGJyZWFrOwot ICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZVR5cGUu TmV0d29ya0Vycm9yOgotICAgICAgICAgICAgICAgIGlmICh0aGlzLl9yZXF1ZXN0KSB7Ci0gICAg ICAgICAgICAgICAgICAgIHN0YWNrVHJhY2UgPSB0aGlzLl9yZXF1ZXN0LnN0YWNrVHJhY2U7Ci0K LSAgICAgICAgICAgICAgICAgICAgbWVzc2FnZVRleHQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50 KCJzcGFuIik7Ci0gICAgICAgICAgICAgICAgICAgIG1lc3NhZ2VUZXh0LmFwcGVuZENoaWxkKGRv Y3VtZW50LmNyZWF0ZVRleHROb2RlKHRoaXMuX3JlcXVlc3QucmVxdWVzdE1ldGhvZCArICIgIikp OwotICAgICAgICAgICAgICAgICAgICB2YXIgYW5jaG9yID0gV2ViSW5zcGVjdG9yLmxpbmtpZnlV UkxBc05vZGUodGhpcy5fcmVxdWVzdC51cmwpOwotICAgICAgICAgICAgICAgICAgICBhbmNob3Iu c2V0QXR0cmlidXRlKCJyZXF1ZXN0X2lkIiwgdGhpcy5fcmVxdWVzdC5yZXF1ZXN0SWQpOwotICAg ICAgICAgICAgICAgICAgICBhbmNob3Iuc2V0QXR0cmlidXRlKCJwcmVmZXJyZWRfcGFuZWwiLCAi bmV0d29yayIpOwotICAgICAgICAgICAgICAgICAgICBtZXNzYWdlVGV4dC5hcHBlbmRDaGlsZChh bmNob3IpOwotICAgICAgICAgICAgICAgICAgICBpZiAodGhpcy5fcmVxdWVzdC5mYWlsZWQpCi0g ICAgICAgICAgICAgICAgICAgICAgICBtZXNzYWdlVGV4dC5hcHBlbmRDaGlsZChkb2N1bWVudC5j cmVhdGVUZXh0Tm9kZSgiICIgKyB0aGlzLl9yZXF1ZXN0LmxvY2FsaXplZEZhaWxEZXNjcmlwdGlv bikpOwotICAgICAgICAgICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAgICAgICAgICAgICBt ZXNzYWdlVGV4dC5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVUZXh0Tm9kZSgiICIgKyB0aGlz Ll9yZXF1ZXN0LnN0YXR1c0NvZGUgKyAiICgiICsgdGhpcy5fcmVxdWVzdC5zdGF0dXNUZXh0ICsg IikiKSk7Ci0gICAgICAgICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgICAgICAgICAgdmFy IGlzRXh0ZXJuYWwgPSAhV2ViSW5zcGVjdG9yLnJlc291cmNlRm9yVVJMKHRoaXMudXJsKTsKLSAg ICAgICAgICAgICAgICAgICAgdmFyIGFuY2hvciA9IFdlYkluc3BlY3Rvci5saW5raWZ5VVJMQXNO b2RlKHRoaXMudXJsLCB0aGlzLnVybCwgImNvbnNvbGUtbWVzc2FnZS11cmwiLCBpc0V4dGVybmFs KTsKLSAgICAgICAgICAgICAgICAgICAgdGhpcy5fZm9ybWF0dGVkTWVzc2FnZS5hcHBlbmRDaGls ZChhbmNob3IpOwotICAgICAgICAgICAgICAgICAgICBtZXNzYWdlVGV4dCA9IHRoaXMuX2Zvcm1h dChbdGhpcy5fbWVzc2FnZVRleHRdKTsKLSAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAg ICAgYnJlYWs7Ci0gICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5N ZXNzYWdlVHlwZS5Bc3NlcnQ6Ci0gICAgICAgICAgICAgICAgdmFyIGFyZ3MgPSBbV2ViSW5zcGVj dG9yLlVJU3RyaW5nKCJBc3NlcnRpb24gZmFpbGVkOiIpXTsKLSAgICAgICAgICAgICAgICBpZiAo dGhpcy5fcGFyYW1ldGVycykKLSAgICAgICAgICAgICAgICAgICAgYXJncyA9IGFyZ3MuY29uY2F0 KHRoaXMuX3BhcmFtZXRlcnMpOwotICAgICAgICAgICAgICAgIG1lc3NhZ2VUZXh0ID0gdGhpcy5f Zm9ybWF0KGFyZ3MpOwotICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgY2FzZSBX ZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZVR5cGUuT2JqZWN0OgotICAgICAgICAg ICAgICAgIHZhciBvYmogPSB0aGlzLl9wYXJhbWV0ZXJzID8gdGhpcy5fcGFyYW1ldGVyc1swXSA6 IHVuZGVmaW5lZDsKLSAgICAgICAgICAgICAgICB2YXIgYXJncyA9IFsiJU8iLCBvYmpdOwotICAg ICAgICAgICAgICAgIG1lc3NhZ2VUZXh0ID0gdGhpcy5fZm9ybWF0KGFyZ3MpOwotICAgICAgICAg ICAgICAgIGJyZWFrOwotICAgICAgICAgICAgZGVmYXVsdDoKLSAgICAgICAgICAgICAgICB2YXIg YXJncyA9IHRoaXMuX3BhcmFtZXRlcnMgfHwgW3RoaXMuX21lc3NhZ2VUZXh0XTsKLSAgICAgICAg ICAgICAgICBtZXNzYWdlVGV4dCA9IHRoaXMuX2Zvcm1hdChhcmdzKTsKLSAgICAgICAgICAgICAg ICBicmVhazsKKyAgICAgICAgaWYgKHRoaXMuc291cmNlID09PSBXZWJJbnNwZWN0b3IuQ29uc29s ZU1lc3NhZ2UuTWVzc2FnZVNvdXJjZS5Db25zb2xlQVBJKSB7CisgICAgICAgICAgICBzd2l0Y2gg KHRoaXMudHlwZSkgeworICAgICAgICAgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLkNvbnNvbGVN ZXNzYWdlLk1lc3NhZ2VUeXBlLlRyYWNlOgorICAgICAgICAgICAgICAgICAgICBtZXNzYWdlVGV4 dCA9IGRvY3VtZW50LmNyZWF0ZVRleHROb2RlKCJjb25zb2xlLnRyYWNlKCkiKTsKKyAgICAgICAg ICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuQ29u c29sZU1lc3NhZ2UuTWVzc2FnZVR5cGUuQXNzZXJ0OgorICAgICAgICAgICAgICAgICAgICB2YXIg YXJncyA9IFtXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkFzc2VydGlvbiBmYWlsZWQ6IildOworICAg ICAgICAgICAgICAgICAgICBpZiAodGhpcy5fcGFyYW1ldGVycykKKyAgICAgICAgICAgICAgICAg ICAgICAgIGFyZ3MgPSBhcmdzLmNvbmNhdCh0aGlzLl9wYXJhbWV0ZXJzKTsKKyAgICAgICAgICAg ICAgICAgICAgbWVzc2FnZVRleHQgPSB0aGlzLl9mb3JtYXQoYXJncyk7CisgICAgICAgICAgICAg ICAgICAgIGJyZWFrOworICAgICAgICAgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLkNvbnNvbGVN ZXNzYWdlLk1lc3NhZ2VUeXBlLkRpcjoKKyAgICAgICAgICAgICAgICAgICAgdmFyIG9iaiA9IHRo aXMuX3BhcmFtZXRlcnMgPyB0aGlzLl9wYXJhbWV0ZXJzWzBdIDogdW5kZWZpbmVkOworICAgICAg ICAgICAgICAgICAgICB2YXIgYXJncyA9IFsiJU8iLCBvYmpdOworICAgICAgICAgICAgICAgICAg ICBtZXNzYWdlVGV4dCA9IHRoaXMuX2Zvcm1hdChhcmdzKTsKKyAgICAgICAgICAgICAgICAgICAg YnJlYWs7CisgICAgICAgICAgICAgICAgZGVmYXVsdDoKKyAgICAgICAgICAgICAgICAgICAgdmFy IGFyZ3MgPSB0aGlzLl9wYXJhbWV0ZXJzIHx8IFt0aGlzLl9tZXNzYWdlVGV4dF07CisgICAgICAg ICAgICAgICAgICAgIG1lc3NhZ2VUZXh0ID0gdGhpcy5fZm9ybWF0KGFyZ3MpOworICAgICAgICAg ICAgfQorICAgICAgICB9IGVsc2UgaWYgKHRoaXMuc291cmNlID09PSBXZWJJbnNwZWN0b3IuQ29u c29sZU1lc3NhZ2UuTWVzc2FnZVNvdXJjZS5OZXR3b3JrKSB7CisgICAgICAgICAgICBpZiAodGhp cy5fcmVxdWVzdCkgeworICAgICAgICAgICAgICAgIHRoaXMuX3N0YWNrVHJhY2UgPSB0aGlzLl9y ZXF1ZXN0LnN0YWNrVHJhY2U7CisgICAgICAgICAgICAgICAgbWVzc2FnZVRleHQgPSBkb2N1bWVu dC5jcmVhdGVFbGVtZW50KCJzcGFuIik7CisgICAgICAgICAgICAgICAgbWVzc2FnZVRleHQuYXBw ZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUodGhpcy5fcmVxdWVzdC5yZXF1ZXN0TWV0 aG9kICsgIiAiKSk7CisgICAgICAgICAgICAgICAgdmFyIGFuY2hvciA9IFdlYkluc3BlY3Rvci5s aW5raWZ5VVJMQXNOb2RlKHRoaXMuX3JlcXVlc3QudXJsKTsKKyAgICAgICAgICAgICAgICBhbmNo b3Iuc2V0QXR0cmlidXRlKCJyZXF1ZXN0X2lkIiwgdGhpcy5fcmVxdWVzdC5yZXF1ZXN0SWQpOwor ICAgICAgICAgICAgICAgIGFuY2hvci5zZXRBdHRyaWJ1dGUoInByZWZlcnJlZF9wYW5lbCIsICJu ZXR3b3JrIik7CisgICAgICAgICAgICAgICAgbWVzc2FnZVRleHQuYXBwZW5kQ2hpbGQoYW5jaG9y KTsKKyAgICAgICAgICAgICAgICBpZiAodGhpcy5fcmVxdWVzdC5mYWlsZWQpCisgICAgICAgICAg ICAgICAgICAgIG1lc3NhZ2VUZXh0LmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZVRleHROb2Rl KCIgIiArIHRoaXMuX3JlcXVlc3QubG9jYWxpemVkRmFpbERlc2NyaXB0aW9uKSk7CisgICAgICAg ICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgICAgICBtZXNzYWdlVGV4dC5hcHBlbmRDaGls ZChkb2N1bWVudC5jcmVhdGVUZXh0Tm9kZSgiICIgKyB0aGlzLl9yZXF1ZXN0LnN0YXR1c0NvZGUg KyAiICgiICsgdGhpcy5fcmVxdWVzdC5zdGF0dXNUZXh0ICsgIikiKSk7CisgICAgICAgICAgICB9 IGVsc2UgeworICAgICAgICAgICAgICAgIHZhciBpc0V4dGVybmFsID0gIVdlYkluc3BlY3Rvci5y ZXNvdXJjZUZvclVSTCh0aGlzLnVybCk7CisgICAgICAgICAgICAgICAgdmFyIGFuY2hvciA9IFdl Ykluc3BlY3Rvci5saW5raWZ5VVJMQXNOb2RlKHRoaXMudXJsLCB0aGlzLnVybCwgImNvbnNvbGUt bWVzc2FnZS11cmwiLCBpc0V4dGVybmFsKTsKKyAgICAgICAgICAgICAgICB0aGlzLl9mb3JtYXR0 ZWRNZXNzYWdlLmFwcGVuZENoaWxkKGFuY2hvcik7CisgICAgICAgICAgICAgICAgbWVzc2FnZVRl eHQgPSB0aGlzLl9mb3JtYXQoW3RoaXMuX21lc3NhZ2VUZXh0XSk7CisgICAgICAgICAgICB9Cisg ICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICB2YXIgYXJncyA9IHRoaXMuX3BhcmFtZXRlcnMg fHwgW3RoaXMuX21lc3NhZ2VUZXh0XTsKKyAgICAgICAgICAgIG1lc3NhZ2VUZXh0ID0gdGhpcy5f Zm9ybWF0KGFyZ3MpOwogICAgICAgICB9CiAKLSAgICAgICAgaWYgKHRoaXMudHlwZSAhPT0gV2Vi SW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLk1lc3NhZ2VUeXBlLk5ldHdvcmtFcnJvcikgeworICAg ICAgICAvLyBGSVhNRTogd2Ugc2hvdWxkIGR1bXAgbmV0d29yayBtZXNzYWdlIG9yaWdpbnMgYXMg d2VsbC4KKyAgICAgICAgaWYgKHRoaXMuc291cmNlICE9PSBXZWJJbnNwZWN0b3IuQ29uc29sZU1l c3NhZ2UuTWVzc2FnZVNvdXJjZS5OZXR3b3JrKSB7CiAgICAgICAgICAgICBpZiAodGhpcy5fc3Rh Y2tUcmFjZSAmJiB0aGlzLl9zdGFja1RyYWNlLmxlbmd0aCAmJiB0aGlzLl9zdGFja1RyYWNlWzBd LnVybCkgewogICAgICAgICAgICAgICAgIHZhciB1cmxFbGVtZW50ID0gdGhpcy5fbGlua2lmeUNh bGxGcmFtZSh0aGlzLl9zdGFja1RyYWNlWzBdKTsKICAgICAgICAgICAgICAgICB0aGlzLl9mb3Jt YXR0ZWRNZXNzYWdlLmFwcGVuZENoaWxkKHVybEVsZW1lbnQpOwpAQCAtMTQyLDI3ICsxNDAsMjEg QEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLnByb3RvdHlwZSA9IHsKIAogICAgICAgICB0 aGlzLl9mb3JtYXR0ZWRNZXNzYWdlLmFwcGVuZENoaWxkKG1lc3NhZ2VUZXh0KTsKIAotICAgICAg ICBpZiAodGhpcy5fc3RhY2tUcmFjZSkgewotICAgICAgICAgICAgc3dpdGNoICh0aGlzLnR5cGUp IHsKLSAgICAgICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNz YWdlVHlwZS5UcmFjZToKLSAgICAgICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5Db25zb2xl TWVzc2FnZS5NZXNzYWdlVHlwZS5VbmNhdWdodEV4Y2VwdGlvbjoKLSAgICAgICAgICAgICAgICBj YXNlIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlVHlwZS5OZXR3b3JrRXJyb3I6 Ci0gICAgICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2Fn ZVR5cGUuQXNzZXJ0OiB7Ci0gICAgICAgICAgICAgICAgICAgIHZhciBvbCA9IGRvY3VtZW50LmNy ZWF0ZUVsZW1lbnQoIm9sIik7Ci0gICAgICAgICAgICAgICAgICAgIG9sLmNsYXNzTmFtZSA9ICJv dXRsaW5lLWRpc2Nsb3N1cmUiOwotICAgICAgICAgICAgICAgICAgICB2YXIgdHJlZU91dGxpbmUg PSBuZXcgVHJlZU91dGxpbmUob2wpOwotCi0gICAgICAgICAgICAgICAgICAgIHZhciBjb250ZW50 ID0gdGhpcy5fZm9ybWF0dGVkTWVzc2FnZTsKLSAgICAgICAgICAgICAgICAgICAgdmFyIHJvb3Qg PSBuZXcgVHJlZUVsZW1lbnQoY29udGVudCwgbnVsbCwgdHJ1ZSk7Ci0gICAgICAgICAgICAgICAg ICAgIGNvbnRlbnQudHJlZUVsZW1lbnRGb3JUZXN0ID0gcm9vdDsKLSAgICAgICAgICAgICAgICAg ICAgdHJlZU91dGxpbmUuYXBwZW5kQ2hpbGQocm9vdCk7Ci0gICAgICAgICAgICAgICAgICAgIGlm ICh0aGlzLnR5cGUgPT09IFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlVHlwZS5U cmFjZSkKLSAgICAgICAgICAgICAgICAgICAgICAgIHJvb3QuZXhwYW5kKCk7Ci0KLSAgICAgICAg ICAgICAgICAgICAgdGhpcy5fcG9wdWxhdGVTdGFja1RyYWNlVHJlZUVsZW1lbnQocm9vdCk7Ci0g ICAgICAgICAgICAgICAgICAgIHRoaXMuX2Zvcm1hdHRlZE1lc3NhZ2UgPSBvbDsKLSAgICAgICAg ICAgICAgICB9Ci0gICAgICAgICAgICB9CisgICAgICAgIHZhciBkdW1wU3RhY2tUcmFjZSA9ICEh dGhpcy5fc3RhY2tUcmFjZSAmJiAodGhpcy5sZXZlbCA9PT0gV2ViSW5zcGVjdG9yLkNvbnNvbGVN ZXNzYWdlLk1lc3NhZ2VMZXZlbC5FcnJvciB8fCB0aGlzLnR5cGUgPT09IFdlYkluc3BlY3Rvci5D b25zb2xlTWVzc2FnZS5NZXNzYWdlVHlwZS5UcmFjZSk7CisgICAgICAgIGlmIChkdW1wU3RhY2tU cmFjZSkgeworICAgICAgICAgICAgdmFyIG9sID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgib2wi KTsKKyAgICAgICAgICAgIG9sLmNsYXNzTmFtZSA9ICJvdXRsaW5lLWRpc2Nsb3N1cmUiOworICAg ICAgICAgICAgdmFyIHRyZWVPdXRsaW5lID0gbmV3IFRyZWVPdXRsaW5lKG9sKTsKKworICAgICAg ICAgICAgdmFyIGNvbnRlbnQgPSB0aGlzLl9mb3JtYXR0ZWRNZXNzYWdlOworICAgICAgICAgICAg dmFyIHJvb3QgPSBuZXcgVHJlZUVsZW1lbnQoY29udGVudCwgbnVsbCwgdHJ1ZSk7CisgICAgICAg ICAgICBjb250ZW50LnRyZWVFbGVtZW50Rm9yVGVzdCA9IHJvb3Q7CisgICAgICAgICAgICB0cmVl T3V0bGluZS5hcHBlbmRDaGlsZChyb290KTsKKyAgICAgICAgICAgIGlmICh0aGlzLnR5cGUgPT09 IFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlVHlwZS5UcmFjZSkKKyAgICAgICAg ICAgICAgICByb290LmV4cGFuZCgpOworCisgICAgICAgICAgICB0aGlzLl9wb3B1bGF0ZVN0YWNr VHJhY2VUcmVlRWxlbWVudChyb290KTsKKyAgICAgICAgICAgIHRoaXMuX2Zvcm1hdHRlZE1lc3Nh Z2UgPSBvbDsKICAgICAgICAgfQogCiAgICAgICAgIC8vIFRoaXMgaXMgdXNlZCBmb3IgaW5saW5l IG1lc3NhZ2UgYnViYmxlcyBpbiBTb3VyY2VGcmFtZXMsIG9yIG90aGVyIHBsYWluLXRleHQgcmVw cmVzZW50YXRpb25zLgpAQCAtMzg2LDggKzM3OCwxMSBAQCBXZWJJbnNwZWN0b3IuQ29uc29sZU1l c3NhZ2UucHJvdG90eXBlID0gewogICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuQ29uc29s ZU1lc3NhZ2UuTWVzc2FnZVNvdXJjZS5KUzoKICAgICAgICAgICAgICAgICBzb3VyY2VTdHJpbmcg PSAiSlMiOwogICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgY2FzZSBXZWJJbnNw ZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZVNvdXJjZS5DU1M6Ci0gICAgICAgICAgICAgICAg c291cmNlU3RyaW5nID0gIkNTUyI7CisgICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5Db25z b2xlTWVzc2FnZS5NZXNzYWdlU291cmNlLk5ldHdvcms6CisgICAgICAgICAgICAgICAgc291cmNl U3RyaW5nID0gIk5ldHdvcmsiOworICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAg Y2FzZSBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZVNvdXJjZS5Db25zb2xlQVBJ OgorICAgICAgICAgICAgICAgIHNvdXJjZVN0cmluZyA9ICJDb25zb2xlQVBJIjsKICAgICAgICAg ICAgICAgICBicmVhazsKICAgICAgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNz YWdlLk1lc3NhZ2VTb3VyY2UuT3RoZXI6CiAgICAgICAgICAgICAgICAgc291cmNlU3RyaW5nID0g Ik90aGVyIjsKQEAgLTM5NywxMiArMzkyLDEzIEBAIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2Fn ZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIHZhciB0eXBlU3RyaW5nOwogICAgICAgICBzd2l0Y2gg KHRoaXMudHlwZSkgewogICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3Nh Z2UuTWVzc2FnZVR5cGUuTG9nOgotICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuQ29uc29s ZU1lc3NhZ2UuTWVzc2FnZVR5cGUuVW5jYXVnaHRFeGNlcHRpb246Ci0gICAgICAgICAgICBjYXNl IFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlVHlwZS5OZXR3b3JrRXJyb3I6CiAg ICAgICAgICAgICAgICAgdHlwZVN0cmluZyA9ICJMb2ciOwogICAgICAgICAgICAgICAgIGJyZWFr OwotICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZVR5 cGUuT2JqZWN0OgotICAgICAgICAgICAgICAgIHR5cGVTdHJpbmcgPSAiT2JqZWN0IjsKKyAgICAg ICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLk1lc3NhZ2VUeXBlLkRpcjoK KyAgICAgICAgICAgICAgICB0eXBlU3RyaW5nID0gIkRpciI7CisgICAgICAgICAgICAgICAgYnJl YWs7CisgICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdl VHlwZS5EaXJYTUw6CisgICAgICAgICAgICAgICAgdHlwZVN0cmluZyA9ICJEaXIgWE1MIjsKICAg ICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLkNvbnNv bGVNZXNzYWdlLk1lc3NhZ2VUeXBlLlRyYWNlOgogICAgICAgICAgICAgICAgIHR5cGVTdHJpbmcg PSAiVHJhY2UiOwpAQCAtNDg4LDIwICs0ODQsMjAgQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNz YWdlLk1lc3NhZ2VTb3VyY2UgPSB7CiAgICAgSFRNTDogImh0bWwiLAogICAgIFhNTDogInhtbCIs CiAgICAgSlM6ICJqYXZhc2NyaXB0IiwKLSAgICBDU1M6ICJjc3MiLAorICAgIE5ldHdvcms6ICJu ZXR3b3JrIiwKKyAgICBDb25zb2xlQVBJOiAiY29uc29sZS1hcGkiLAogICAgIE90aGVyOiAib3Ro ZXIiCiB9CiAKIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlVHlwZSA9IHsKICAg ICBMb2c6ICJsb2ciLAotICAgIE9iamVjdDogIm90aGVyIiwKKyAgICBEaXI6ICJkaXIiLAorICAg IERpclhNTDogImRpcnhtbCIsCiAgICAgVHJhY2U6ICJ0cmFjZSIsCiAgICAgU3RhcnRHcm91cDog InN0YXJ0R3JvdXAiLAogICAgIFN0YXJ0R3JvdXBDb2xsYXBzZWQ6ICJzdGFydEdyb3VwQ29sbGFw c2VkIiwKICAgICBFbmRHcm91cDogImVuZEdyb3VwIiwKICAgICBBc3NlcnQ6ICJhc3NlcnQiLAot ICAgIFVuY2F1Z2h0RXhjZXB0aW9uOiAidW5jYXVnaHRFeGNlcHRpb24iLAotICAgIE5ldHdvcmtF cnJvcjogIm5ldHdvcmtFcnJvciIsCiAgICAgUmVzdWx0OiAicmVzdWx0IgogfQogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnNvbGUuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFn ZS9Db25zb2xlLmNwcAppbmRleCA5NWZkYjM5OTA0ZTE0MTdmNjQ1NTFmYTE1ZDBiMGJjNzA0YzRk ZTJmLi43NGRmZTc0YWIyNDI5NGJlM2I1ZTdkY2I3ZWZhOGZjYmUzNDI5MWJiIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnNvbGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvQ29uc29sZS5jcHAKQEAgLTk1LDggKzk1LDExIEBAIHN0YXRpYyB2b2lkIHByaW50TWVzc2Fn ZVNvdXJjZUFuZExldmVsUHJlZml4KE1lc3NhZ2VTb3VyY2Ugc291cmNlLCBNZXNzYWdlTGV2ZWwK ICAgICBjYXNlIEpTTWVzc2FnZVNvdXJjZToKICAgICAgICAgc291cmNlU3RyaW5nID0gIkpTIjsK ICAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBDU1NNZXNzYWdlU291cmNlOgotICAgICAgICBzb3Vy Y2VTdHJpbmcgPSAiQ1NTIjsKKyAgICBjYXNlIE5ldHdvcmtNZXNzYWdlU291cmNlOgorICAgICAg ICBzb3VyY2VTdHJpbmcgPSAiTkVUV09SSyI7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgQ29u c29sZUFQSU1lc3NhZ2VTb3VyY2U6CisgICAgICAgIHNvdXJjZVN0cmluZyA9ICJDT05TT0xFQVBJ IjsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBPdGhlck1lc3NhZ2VTb3VyY2U6CiAgICAgICAg IHNvdXJjZVN0cmluZyA9ICJPVEhFUiI7CkBAIC0xNzYsNyArMTc5LDcgQEAgdm9pZCBDb25zb2xl OjphZGRNZXNzYWdlKE1lc3NhZ2VUeXBlIHR5cGUsIE1lc3NhZ2VMZXZlbCBsZXZlbCwgUGFzc1Jl ZlB0cjxTY3JpcHQKIAogICAgIGlmIChDb25zb2xlOjpzaG91bGRQcmludEV4Y2VwdGlvbnMoKSkg ewogICAgICAgICBwcmludFNvdXJjZVVSTEFuZExpbmUobGFzdENhbGxlci5zb3VyY2VVUkwoKSwg MCk7Ci0gICAgICAgIHByaW50TWVzc2FnZVNvdXJjZUFuZExldmVsUHJlZml4KEpTTWVzc2FnZVNv dXJjZSwgbGV2ZWwpOworICAgICAgICBwcmludE1lc3NhZ2VTb3VyY2VBbmRMZXZlbFByZWZpeChD b25zb2xlQVBJTWVzc2FnZVNvdXJjZSwgbGV2ZWwpOwogCiAgICAgICAgIGZvciAodW5zaWduZWQg aSA9IDA7IGkgPCBhcmd1bWVudHMtPmFyZ3VtZW50Q291bnQoKTsgKytpKSB7CiAgICAgICAgICAg ICBTdHJpbmcgYXJnQXNTdHJpbmc7CkBAIC0xODgsOSArMTkxLDkgQEAgdm9pZCBDb25zb2xlOjph ZGRNZXNzYWdlKE1lc3NhZ2VUeXBlIHR5cGUsIE1lc3NhZ2VMZXZlbCBsZXZlbCwgUGFzc1JlZlB0 cjxTY3JpcHQKIAogICAgIFN0cmluZyBtZXNzYWdlOwogICAgIGlmIChhcmd1bWVudHMtPmdldEZp cnN0QXJndW1lbnRBc1N0cmluZyhtZXNzYWdlKSkKLSAgICAgICAgcGFnZS0+Y2hyb21lKCktPmNs aWVudCgpLT5hZGRNZXNzYWdlVG9Db25zb2xlKEpTTWVzc2FnZVNvdXJjZSwgdHlwZSwgbGV2ZWws IG1lc3NhZ2UsIGxhc3RDYWxsZXIubGluZU51bWJlcigpLCBsYXN0Q2FsbGVyLnNvdXJjZVVSTCgp KTsKKyAgICAgICAgcGFnZS0+Y2hyb21lKCktPmNsaWVudCgpLT5hZGRNZXNzYWdlVG9Db25zb2xl KENvbnNvbGVBUElNZXNzYWdlU291cmNlLCB0eXBlLCBsZXZlbCwgbWVzc2FnZSwgbGFzdENhbGxl ci5saW5lTnVtYmVyKCksIGxhc3RDYWxsZXIuc291cmNlVVJMKCkpOwogCi0gICAgSW5zcGVjdG9y SW5zdHJ1bWVudGF0aW9uOjphZGRNZXNzYWdlVG9Db25zb2xlKHBhZ2UsIEpTTWVzc2FnZVNvdXJj ZSwgdHlwZSwgbGV2ZWwsIG1lc3NhZ2UsIGFyZ3VtZW50cywgY2FsbFN0YWNrKTsKKyAgICBJbnNw ZWN0b3JJbnN0cnVtZW50YXRpb246OmFkZE1lc3NhZ2VUb0NvbnNvbGUocGFnZSwgQ29uc29sZUFQ SU1lc3NhZ2VTb3VyY2UsIHR5cGUsIGxldmVsLCBtZXNzYWdlLCBhcmd1bWVudHMsIGNhbGxTdGFj ayk7CiB9CiAKIHZvaWQgQ29uc29sZTo6ZGVidWcoUGFzc1JlZlB0cjxTY3JpcHRBcmd1bWVudHM+ IGFyZ3VtZW50cywgUGFzc1JlZlB0cjxTY3JpcHRDYWxsU3RhY2s+IGNhbGxTdGFjaykKQEAgLTIx NiwxMyArMjE5LDEyIEBAIHZvaWQgQ29uc29sZTo6bG9nKFBhc3NSZWZQdHI8U2NyaXB0QXJndW1l bnRzPiBhcmd1bWVudHMsIFBhc3NSZWZQdHI8U2NyaXB0Q2FsbFN0CiAKIHZvaWQgQ29uc29sZTo6 ZGlyKFBhc3NSZWZQdHI8U2NyaXB0QXJndW1lbnRzPiBhcmd1bWVudHMsIFBhc3NSZWZQdHI8U2Ny aXB0Q2FsbFN0YWNrPiBjYWxsU3RhY2spCiB7Ci0gICAgYWRkTWVzc2FnZShPYmplY3RNZXNzYWdl VHlwZSwgTG9nTWVzc2FnZUxldmVsLCBhcmd1bWVudHMsIGNhbGxTdGFjayk7CisgICAgYWRkTWVz c2FnZShEaXJNZXNzYWdlVHlwZSwgTG9nTWVzc2FnZUxldmVsLCBhcmd1bWVudHMsIGNhbGxTdGFj ayk7CiB9CiAKIHZvaWQgQ29uc29sZTo6ZGlyeG1sKFBhc3NSZWZQdHI8U2NyaXB0QXJndW1lbnRz PiBhcmd1bWVudHMsIFBhc3NSZWZQdHI8U2NyaXB0Q2FsbFN0YWNrPiBjYWxsU3RhY2spCiB7Ci0g ICAgLy8gVGhlIHN0YW5kYXJkIGJlaGF2aW9yIG9mIG91ciBjb25zb2xlLmxvZyB3aWxsIHByaW50 IHRoZSBET00gdHJlZSBmb3Igbm9kZXMuCi0gICAgbG9nKGFyZ3VtZW50cywgY2FsbFN0YWNrKTsK KyAgICBhZGRNZXNzYWdlKERpclhNTE1lc3NhZ2VUeXBlLCBMb2dNZXNzYWdlTGV2ZWwsIGFyZ3Vt ZW50cywgY2FsbFN0YWNrKTsKIH0KIAogdm9pZCBDb25zb2xlOjp0cmFjZShQYXNzUmVmUHRyPFNj cmlwdEFyZ3VtZW50cz4gYXJndW1lbnRzLCBQYXNzUmVmUHRyPFNjcmlwdENhbGxTdGFjaz4gcHJw Q2FsbFN0YWNrKQpAQCAtMzE2LDE3ICszMTgsMTcgQEAgdm9pZCBDb25zb2xlOjp0aW1lU3RhbXAo UGFzc1JlZlB0cjxTY3JpcHRBcmd1bWVudHM+IGFyZ3VtZW50cywgUGFzc1JlZlB0cjxTY3JpcHQK IAogdm9pZCBDb25zb2xlOjpncm91cChQYXNzUmVmUHRyPFNjcmlwdEFyZ3VtZW50cz4gYXJndW1l bnRzLCBQYXNzUmVmUHRyPFNjcmlwdENhbGxTdGFjaz4gY2FsbFN0YWNrKQogewotICAgIEluc3Bl Y3Rvckluc3RydW1lbnRhdGlvbjo6YWRkTWVzc2FnZVRvQ29uc29sZShwYWdlKCksIEpTTWVzc2Fn ZVNvdXJjZSwgU3RhcnRHcm91cE1lc3NhZ2VUeXBlLCBMb2dNZXNzYWdlTGV2ZWwsIFN0cmluZygp LCBhcmd1bWVudHMsIGNhbGxTdGFjayk7CisgICAgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjph ZGRNZXNzYWdlVG9Db25zb2xlKHBhZ2UoKSwgQ29uc29sZUFQSU1lc3NhZ2VTb3VyY2UsIFN0YXJ0 R3JvdXBNZXNzYWdlVHlwZSwgTG9nTWVzc2FnZUxldmVsLCBTdHJpbmcoKSwgYXJndW1lbnRzLCBj YWxsU3RhY2spOwogfQogCiB2b2lkIENvbnNvbGU6Omdyb3VwQ29sbGFwc2VkKFBhc3NSZWZQdHI8 U2NyaXB0QXJndW1lbnRzPiBhcmd1bWVudHMsIFBhc3NSZWZQdHI8U2NyaXB0Q2FsbFN0YWNrPiBj YWxsU3RhY2spCiB7Ci0gICAgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjphZGRNZXNzYWdlVG9D b25zb2xlKHBhZ2UoKSwgSlNNZXNzYWdlU291cmNlLCBTdGFydEdyb3VwQ29sbGFwc2VkTWVzc2Fn ZVR5cGUsIExvZ01lc3NhZ2VMZXZlbCwgU3RyaW5nKCksIGFyZ3VtZW50cywgY2FsbFN0YWNrKTsK KyAgICBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmFkZE1lc3NhZ2VUb0NvbnNvbGUocGFnZSgp LCBDb25zb2xlQVBJTWVzc2FnZVNvdXJjZSwgU3RhcnRHcm91cENvbGxhcHNlZE1lc3NhZ2VUeXBl LCBMb2dNZXNzYWdlTGV2ZWwsIFN0cmluZygpLCBhcmd1bWVudHMsIGNhbGxTdGFjayk7CiB9CiAK IHZvaWQgQ29uc29sZTo6Z3JvdXBFbmQoKQogewotICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlv bjo6YWRkTWVzc2FnZVRvQ29uc29sZShwYWdlKCksIEpTTWVzc2FnZVNvdXJjZSwgRW5kR3JvdXBN ZXNzYWdlVHlwZSwgTG9nTWVzc2FnZUxldmVsLCBTdHJpbmcoKSwgMCwgU3RyaW5nKCkpOworICAg IEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6YWRkTWVzc2FnZVRvQ29uc29sZShwYWdlKCksIENv bnNvbGVBUElNZXNzYWdlU291cmNlLCBFbmRHcm91cE1lc3NhZ2VUeXBlLCBMb2dNZXNzYWdlTGV2 ZWwsIFN0cmluZygpLCAwLCBTdHJpbmcoKSk7CiB9CiAKIGJvb2wgQ29uc29sZTo6c2hvdWxkQ2Fw dHVyZUZ1bGxTdGFja1RyYWNlKCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvQ29uc29sZVR5cGVzLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnNvbGVUeXBlcy5oCmlu ZGV4IDA3MjFiMzZmMmFiODE0NDAzYTlhN2I5MGMwOTQxNjNiOWRjMjE5ZTYuLjhiNDQwMzBjNjkz NmE3Y2U5MDQ2N2Y0ZmRkOTJmYjFjZWQ0ZTNlNDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvQ29uc29sZVR5cGVzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9Db25zb2xlVHlw ZXMuaApAQCAtMzIsMjAgKzMyLDIyIEBAIGVudW0gTWVzc2FnZVNvdXJjZSB7CiAgICAgSFRNTE1l c3NhZ2VTb3VyY2UsCiAgICAgWE1MTWVzc2FnZVNvdXJjZSwKICAgICBKU01lc3NhZ2VTb3VyY2Us Ci0gICAgQ1NTTWVzc2FnZVNvdXJjZSwKLSAgICBPdGhlck1lc3NhZ2VTb3VyY2UKKyAgICBOZXR3 b3JrTWVzc2FnZVNvdXJjZSwKKyAgICBDb25zb2xlQVBJTWVzc2FnZVNvdXJjZSwKKyAgICBPdGhl ck1lc3NhZ2VTb3VyY2UsCiB9OwogCisvLyBGSVhNRTogbWFrZSB0aGlzIGVudW0gcHJpdmF0ZSB0 byBpbnNwZWN0b3IsIHJlbW92ZSBpdCBmcm9tIGNsaWVudCBjYWxsYmFja3MuCisvLyBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjYzNzEKIGVudW0gTWVzc2FnZVR5cGUg ewogICAgIExvZ01lc3NhZ2VUeXBlLAotICAgIE9iamVjdE1lc3NhZ2VUeXBlLAorICAgIERpck1l c3NhZ2VUeXBlLAorICAgIERpclhNTE1lc3NhZ2VUeXBlLAogICAgIFRyYWNlTWVzc2FnZVR5cGUs CiAgICAgU3RhcnRHcm91cE1lc3NhZ2VUeXBlLAogICAgIFN0YXJ0R3JvdXBDb2xsYXBzZWRNZXNz YWdlVHlwZSwKICAgICBFbmRHcm91cE1lc3NhZ2VUeXBlLAotICAgIEFzc2VydE1lc3NhZ2VUeXBl LAotICAgIFVuY2F1Z2h0RXhjZXB0aW9uTWVzc2FnZVR5cGUsCi0gICAgTmV0d29ya0Vycm9yTWVz c2FnZVR5cGUKKyAgICBBc3NlcnRNZXNzYWdlVHlwZQogfTsKIAogZW51bSBNZXNzYWdlTGV2ZWwg ewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvd2Vic29ja2V0cy9XZWJTb2NrZXRDaGFubmVs LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3dlYnNvY2tldHMvV2ViU29ja2V0Q2hhbm5lbC5jcHAKaW5k ZXggYzExMzViNTljMTJkODljOWFhN2VjNDQyNGJkMTY5M2U3ZjE4NDlmMS4uNzcwODY1ZjQ2MDY3 ZTY2MjUxOGEwYzM5NDM5MzRiOGEzNzEyMjAxYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv d2Vic29ja2V0cy9XZWJTb2NrZXRDaGFubmVsLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS93ZWJz b2NrZXRzL1dlYlNvY2tldENoYW5uZWwuY3BwCkBAIC0zMzMsNyArMzMzLDcgQEAgdm9pZCBXZWJT b2NrZXRDaGFubmVsOjpkaWRGYWlsU29ja2V0U3RyZWFtKFNvY2tldFN0cmVhbUhhbmRsZSogaGFu ZGxlLCBjb25zdCBTb2MKICAgICAgICAgQVNTRVJUKGZhaWxpbmdVUkwuaXNOdWxsKCkgfHwgbV9o YW5kc2hha2UtPnVybCgpLnN0cmluZygpID09IGZhaWxpbmdVUkwpOwogICAgICAgICBpZiAoZmFp bGluZ1VSTC5pc051bGwoKSkKICAgICAgICAgICAgIGZhaWxpbmdVUkwgPSBtX2hhbmRzaGFrZS0+ dXJsKCkuc3RyaW5nKCk7Ci0gICAgICAgIG1fY29udGV4dC0+YWRkTWVzc2FnZShPdGhlck1lc3Nh Z2VTb3VyY2UsIE5ldHdvcmtFcnJvck1lc3NhZ2VUeXBlLCBFcnJvck1lc3NhZ2VMZXZlbCwgbWVz c2FnZSwgMCwgZmFpbGluZ1VSTCwgMCk7CisgICAgICAgIG1fY29udGV4dC0+YWRkTWVzc2FnZShO ZXR3b3JrTWVzc2FnZVNvdXJjZSwgTG9nTWVzc2FnZVR5cGUsIEVycm9yTWVzc2FnZUxldmVsLCBt ZXNzYWdlLCAwLCBmYWlsaW5nVVJMLCAwKTsKICAgICB9CiAgICAgbV9zaG91bGREaXNjYXJkUmVj ZWl2ZWREYXRhID0gdHJ1ZTsKICAgICBoYW5kbGUtPmRpc2Nvbm5lY3QoKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxv ZwppbmRleCBmMGNjMTMzYWZhZDY0ZWI0NDg5ODRlZGNmZmUyNWM0NTY0N2MxYWE3Li5mYTBkNmYz MWU5M2RlYWIzYmZjZTFkMzkyZmU1ZTg5ODUyOGM3NzE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L21hYy9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMjIgQEAKKzIwMTEtMDktMTkgIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUu Y29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IHN0cmVhbWxpbmUgQ29uc29sZSdzIE1lc3Nh Z2VUeXBlIGFuZCBNZXNzYWdlU291cmNlIHNlbWFudGljcy4KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY4MzQyCisKKyAgICAgICAgVGhpcyBjaGFuZ2Ug Zml4ZXMgc2VtYW50aWNzIG9mIHRoZSBNZXNzYWdlU291cmNlIGFuZCBNZXNzYWdlVHlwZToKKyAg ICAgICAgTWVzc2FnZVNvdXJjZSBpcyBub3cgdGhlIHNvdXJjZSBvZiB0aGUgbWVzc2FnZSAoYmUg aXQgTmV0d29yaywgSFRNTAorICAgICAgICBwYXJzZXIgb3IgQ29uc29sZSBBUEkpLiBNZXNzYWdl VHlwZSBpcyBvbmx5IGRlZmluZWQgZm9yIHRoZSBDb25zb2xlIEFQSQorICAgICAgICBtZXNzYWdl cyBhbmQgY29udGFpbnMgdGhlIG5hbWUgb2YgdGhlIEFQSSBjYWxsIChsb2csIGRpciwgZGlyeG1s LCBldGMuKS4gCisgICAgICAgIFN1YnNlcXVlbnQgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTY2MzcxIHdpbGwgbWFrZSBNZXNzYWdlVHlwZQorICAgICAgICBwcml2YXRl IHRvIHRoZSBpbnNwZWN0b3IuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQubW06CisgICAgICAg IChzdHJpbmdGb3JNZXNzYWdlU291cmNlKToKKyAgICAgICAgKHN0cmluZ0Zvck1lc3NhZ2VUeXBl KToKKyAgICAgICAgKiBXZWJWaWV3L1dlYlVJRGVsZWdhdGVQcml2YXRlLmg6CisKIDIwMTEtMDkt MTcgIE1paGFpIFBhcnBhcml0YSAgPG1paGFpcEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgRnJh bWVMb2FkZXJDbGllbnQgQmFja0ZvcndhcmRMaXN0LXJlbGF0ZWQgbWV0aG9kcyBhcmUgdW5zdWVk CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVD bGllbnQubW0gYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGll bnQubW0KaW5kZXggNDAzNjA1YmI4ZGJkNjhlMDc3Nzg2Zjg3M2YwY2FlZmEwMjAwOGVmYi4uZmU0 MTQyY2RlOTY5MDU1OTY3MmRmZmE0NmUzN2UyNGRkNTg4NDQ3NiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50Lm1tCisrKyBiL1NvdXJj ZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5tbQpAQCAtODgsMTgg Kzg4LDE4IEBACiBOU1N0cmluZyAqV2ViQ29uc29sZU1lc3NhZ2VIVE1MTWVzc2FnZVNvdXJjZSA9 IEAiSFRNTE1lc3NhZ2VTb3VyY2UiOwogTlNTdHJpbmcgKldlYkNvbnNvbGVNZXNzYWdlWE1MTWVz c2FnZVNvdXJjZSA9IEAiWE1MTWVzc2FnZVNvdXJjZSI7CiBOU1N0cmluZyAqV2ViQ29uc29sZU1l c3NhZ2VKU01lc3NhZ2VTb3VyY2UgPSBAIkpTTWVzc2FnZVNvdXJjZSI7Ci1OU1N0cmluZyAqV2Vi Q29uc29sZU1lc3NhZ2VDU1NNZXNzYWdlU291cmNlID0gQCJDU1NNZXNzYWdlU291cmNlIjsKK05T U3RyaW5nICpXZWJDb25zb2xlTWVzc2FnZU5ldHdvcmtNZXNzYWdlU291cmNlID0gQCJOZXR3b3Jr TWVzc2FnZVNvdXJjZSI7CitOU1N0cmluZyAqV2ViQ29uc29sZU1lc3NhZ2VDb25zb2xlQVBJTWVz c2FnZVNvdXJjZSA9IEAiQ29uc29sZUFQSU1lc3NhZ2VTb3VyY2UiOwogTlNTdHJpbmcgKldlYkNv bnNvbGVNZXNzYWdlT3RoZXJNZXNzYWdlU291cmNlID0gQCJPdGhlck1lc3NhZ2VTb3VyY2UiOwog CiBOU1N0cmluZyAqV2ViQ29uc29sZU1lc3NhZ2VMb2dNZXNzYWdlVHlwZSA9IEAiTG9nTWVzc2Fn ZVR5cGUiOwotTlNTdHJpbmcgKldlYkNvbnNvbGVNZXNzYWdlT2JqZWN0TWVzc2FnZVR5cGUgPSBA Ik9iamVjdE1lc3NhZ2VUeXBlIjsKK05TU3RyaW5nICpXZWJDb25zb2xlTWVzc2FnZURpck1lc3Nh Z2VUeXBlID0gQCJEaXJNZXNzYWdlVHlwZSI7CitOU1N0cmluZyAqV2ViQ29uc29sZU1lc3NhZ2VE aXJYTUxNZXNzYWdlVHlwZSA9IEAiRGlyWE1MTWVzc2FnZVR5cGUiOwogTlNTdHJpbmcgKldlYkNv bnNvbGVNZXNzYWdlVHJhY2VNZXNzYWdlVHlwZSA9IEAiVHJhY2VNZXNzYWdlVHlwZSI7CiBOU1N0 cmluZyAqV2ViQ29uc29sZU1lc3NhZ2VTdGFydEdyb3VwTWVzc2FnZVR5cGUgPSBAIlN0YXJ0R3Jv dXBNZXNzYWdlVHlwZSI7CiBOU1N0cmluZyAqV2ViQ29uc29sZU1lc3NhZ2VTdGFydEdyb3VwQ29s bGFwc2VkTWVzc2FnZVR5cGUgPSBAIlN0YXJ0R3JvdXBDb2xsYXBzZWRNZXNzYWdlVHlwZSI7CiBO U1N0cmluZyAqV2ViQ29uc29sZU1lc3NhZ2VFbmRHcm91cE1lc3NhZ2VUeXBlID0gQCJFbmRHcm91 cE1lc3NhZ2VUeXBlIjsKIE5TU3RyaW5nICpXZWJDb25zb2xlTWVzc2FnZUFzc2VydE1lc3NhZ2VU eXBlID0gQCJBc3NlcnRNZXNzYWdlVHlwZSI7Ci1OU1N0cmluZyAqV2ViQ29uc29sZU1lc3NhZ2VV bmNhdWdodEV4Y2VwdGlvbk1lc3NhZ2VUeXBlID0gQCJVbmNhdWdodEV4Y2VwdGlvbk1lc3NhZ2VU eXBlIjsKLU5TU3RyaW5nICpXZWJDb25zb2xlTWVzc2FnZU5ldHdvcmtFcnJvck1lc3NhZ2VUeXBl ID0gQCJOZXR3b3JrRXJyb3JNZXNzYWdlVHlwZSI7CiAKIE5TU3RyaW5nICpXZWJDb25zb2xlTWVz c2FnZVRpcE1lc3NhZ2VMZXZlbCA9IEAiVGlwTWVzc2FnZUxldmVsIjsKIE5TU3RyaW5nICpXZWJD b25zb2xlTWVzc2FnZUxvZ01lc3NhZ2VMZXZlbCA9IEAiTG9nTWVzc2FnZUxldmVsIjsKQEAgLTM1 Nyw4ICszNTcsMTAgQEAgaW5saW5lIHN0YXRpYyBOU1N0cmluZyAqc3RyaW5nRm9yTWVzc2FnZVNv dXJjZShNZXNzYWdlU291cmNlIHNvdXJjZSkKICAgICAgICAgcmV0dXJuIFdlYkNvbnNvbGVNZXNz YWdlWE1MTWVzc2FnZVNvdXJjZTsKICAgICBjYXNlIEpTTWVzc2FnZVNvdXJjZToKICAgICAgICAg cmV0dXJuIFdlYkNvbnNvbGVNZXNzYWdlSlNNZXNzYWdlU291cmNlOwotICAgIGNhc2UgQ1NTTWVz c2FnZVNvdXJjZToKLSAgICAgICAgcmV0dXJuIFdlYkNvbnNvbGVNZXNzYWdlQ1NTTWVzc2FnZVNv dXJjZTsKKyAgICBjYXNlIE5ldHdvcmtNZXNzYWdlU291cmNlOgorICAgICAgICByZXR1cm4gV2Vi Q29uc29sZU1lc3NhZ2VOZXR3b3JrTWVzc2FnZVNvdXJjZTsKKyAgICBjYXNlIENvbnNvbGVBUElN ZXNzYWdlU291cmNlOgorICAgICAgICByZXR1cm4gV2ViQ29uc29sZU1lc3NhZ2VDb25zb2xlQVBJ TWVzc2FnZVNvdXJjZTsKICAgICBjYXNlIE90aGVyTWVzc2FnZVNvdXJjZToKICAgICAgICAgcmV0 dXJuIFdlYkNvbnNvbGVNZXNzYWdlT3RoZXJNZXNzYWdlU291cmNlOwogICAgIH0KQEAgLTM3MSw4 ICszNzMsMTAgQEAgaW5saW5lIHN0YXRpYyBOU1N0cmluZyAqc3RyaW5nRm9yTWVzc2FnZVR5cGUo TWVzc2FnZVR5cGUgdHlwZSkKICAgICBzd2l0Y2ggKHR5cGUpIHsKICAgICBjYXNlIExvZ01lc3Nh Z2VUeXBlOgogICAgICAgICByZXR1cm4gV2ViQ29uc29sZU1lc3NhZ2VMb2dNZXNzYWdlVHlwZTsK LSAgICBjYXNlIE9iamVjdE1lc3NhZ2VUeXBlOgotICAgICAgICByZXR1cm4gV2ViQ29uc29sZU1l c3NhZ2VPYmplY3RNZXNzYWdlVHlwZTsKKyAgICBjYXNlIERpck1lc3NhZ2VUeXBlOgorICAgICAg ICByZXR1cm4gV2ViQ29uc29sZU1lc3NhZ2VEaXJNZXNzYWdlVHlwZTsKKyAgICBjYXNlIERpclhN TE1lc3NhZ2VUeXBlOgorICAgICAgICByZXR1cm4gV2ViQ29uc29sZU1lc3NhZ2VEaXJYTUxNZXNz YWdlVHlwZTsKICAgICBjYXNlIFRyYWNlTWVzc2FnZVR5cGU6CiAgICAgICAgIHJldHVybiBXZWJD b25zb2xlTWVzc2FnZVRyYWNlTWVzc2FnZVR5cGU7CiAgICAgY2FzZSBTdGFydEdyb3VwTWVzc2Fn ZVR5cGU6CkBAIC0zODMsMTAgKzM4Nyw2IEBAIGlubGluZSBzdGF0aWMgTlNTdHJpbmcgKnN0cmlu Z0Zvck1lc3NhZ2VUeXBlKE1lc3NhZ2VUeXBlIHR5cGUpCiAgICAgICAgIHJldHVybiBXZWJDb25z b2xlTWVzc2FnZUVuZEdyb3VwTWVzc2FnZVR5cGU7CiAgICAgY2FzZSBBc3NlcnRNZXNzYWdlVHlw ZToKICAgICAgICAgcmV0dXJuIFdlYkNvbnNvbGVNZXNzYWdlQXNzZXJ0TWVzc2FnZVR5cGU7Ci0g ICAgY2FzZSBVbmNhdWdodEV4Y2VwdGlvbk1lc3NhZ2VUeXBlOgotICAgICAgICByZXR1cm4gV2Vi Q29uc29sZU1lc3NhZ2VVbmNhdWdodEV4Y2VwdGlvbk1lc3NhZ2VUeXBlOwotICAgIGNhc2UgTmV0 d29ya0Vycm9yTWVzc2FnZVR5cGU6Ci0gICAgICAgIHJldHVybiBXZWJDb25zb2xlTWVzc2FnZU5l dHdvcmtFcnJvck1lc3NhZ2VUeXBlOwogICAgIH0KICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsK ICAgICByZXR1cm4gQCIiOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9X ZWJVSURlbGVnYXRlUHJpdmF0ZS5oIGIvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJVSURl bGVnYXRlUHJpdmF0ZS5oCmluZGV4IDM3MDQxZDQwOTBlZGE2Yzg2MTNmNDVlZmZiNGUyNjg1ZjAy NGU2MWYuLjljOThmZGZjYzkwODNiOWQ1YTU4NDdjNzEzMTVjY2ExM2U5Zjk5YzMgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVUlEZWxlZ2F0ZVByaXZhdGUuaAorKysg Yi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlVJRGVsZWdhdGVQcml2YXRlLmgKQEAgLTk2 LDE5ICs5NiwxOSBAQCBlbnVtIHsKIGV4dGVybiBOU1N0cmluZyAqV2ViQ29uc29sZU1lc3NhZ2VI VE1MTWVzc2FnZVNvdXJjZTsKIGV4dGVybiBOU1N0cmluZyAqV2ViQ29uc29sZU1lc3NhZ2VYTUxN ZXNzYWdlU291cmNlOwogZXh0ZXJuIE5TU3RyaW5nICpXZWJDb25zb2xlTWVzc2FnZUpTTWVzc2Fn ZVNvdXJjZTsKLWV4dGVybiBOU1N0cmluZyAqV2ViQ29uc29sZU1lc3NhZ2VDU1NNZXNzYWdlU291 cmNlOworZXh0ZXJuIE5TU3RyaW5nICpXZWJDb25zb2xlTWVzc2FnZU5ldHdvcmtNZXNzYWdlU291 cmNlOworZXh0ZXJuIE5TU3RyaW5nICpXZWJDb25zb2xlTWVzc2FnZUNvbnNvbGVBUElNZXNzYWdl U291cmNlOwogZXh0ZXJuIE5TU3RyaW5nICpXZWJDb25zb2xlTWVzc2FnZU90aGVyTWVzc2FnZVNv dXJjZTsKIAogLy8gTWVzc2FnZSBUeXBlcy4KIGV4dGVybiBOU1N0cmluZyAqV2ViQ29uc29sZU1l c3NhZ2VMb2dNZXNzYWdlVHlwZTsKLWV4dGVybiBOU1N0cmluZyAqV2ViQ29uc29sZU1lc3NhZ2VP YmplY3RNZXNzYWdlVHlwZTsKK2V4dGVybiBOU1N0cmluZyAqV2ViQ29uc29sZU1lc3NhZ2VEaXJN ZXNzYWdlVHlwZTsKK2V4dGVybiBOU1N0cmluZyAqV2ViQ29uc29sZU1lc3NhZ2VEaXJYTUxNZXNz YWdlVHlwZTsKIGV4dGVybiBOU1N0cmluZyAqV2ViQ29uc29sZU1lc3NhZ2VUcmFjZU1lc3NhZ2VU eXBlOwogZXh0ZXJuIE5TU3RyaW5nICpXZWJDb25zb2xlTWVzc2FnZVN0YXJ0R3JvdXBNZXNzYWdl VHlwZTsKIGV4dGVybiBOU1N0cmluZyAqV2ViQ29uc29sZU1lc3NhZ2VTdGFydEdyb3VwQ29sbGFw c2VkTWVzc2FnZVR5cGU7CiBleHRlcm4gTlNTdHJpbmcgKldlYkNvbnNvbGVNZXNzYWdlRW5kR3Jv dXBNZXNzYWdlVHlwZTsKIGV4dGVybiBOU1N0cmluZyAqV2ViQ29uc29sZU1lc3NhZ2VBc3NlcnRN ZXNzYWdlVHlwZTsKLWV4dGVybiBOU1N0cmluZyAqV2ViQ29uc29sZU1lc3NhZ2VVbmNhdWdodEV4 Y2VwdGlvbk1lc3NhZ2VUeXBlOwotZXh0ZXJuIE5TU3RyaW5nICpXZWJDb25zb2xlTWVzc2FnZU5l dHdvcmtFcnJvck1lc3NhZ2VUeXBlOwogCiAvLyBNZXNzYWdlIExldmVscy4KIGV4dGVybiBOU1N0 cmluZyAqV2ViQ29uc29sZU1lc3NhZ2VUaXBNZXNzYWdlTGV2ZWw7Cg== 107886 2011-09-19 10:55:25 -0700 2011-09-20 05:56:09 -0700 [Patch] rebaselined 3. bug-68342-20110919215522.patch text/plain 39142 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogOTU0MDQKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA3NjhjNDRhNDE2Nzc4YTFiNGMyNGE3 MzkwNTQwNjgzNDg1YWNiYmE5Li4wMWYwNDgwMGJkZTI3OWQwYmZkYWM4ZjIwYzVkMzNhZDcxNjE3 OTg4IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMDktMTkgIFBhdmVsIEZlbGRtYW4gIDxw ZmVsZG1hbkBnb29nbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IHN0cmVhbWxpbmUg Q29uc29sZSdzIE1lc3NhZ2VUeXBlIGFuZCBNZXNzYWdlU291cmNlIHNlbWFudGljcy4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY4MzQyCisKKyAgICAg ICAgVGhpcyBjaGFuZ2UgZml4ZXMgc2VtYW50aWNzIG9mIHRoZSBNZXNzYWdlU291cmNlIGFuZCBN ZXNzYWdlVHlwZToKKyAgICAgICAgTWVzc2FnZVNvdXJjZSBpcyBub3cgdGhlIHNvdXJjZSBvZiB0 aGUgbWVzc2FnZSAoYmUgaXQgTmV0d29yaywgSFRNTAorICAgICAgICBwYXJzZXIgb3IgQ29uc29s ZSBBUEkpLiBNZXNzYWdlVHlwZSBpcyBvbmx5IGRlZmluZWQgZm9yIHRoZSBDb25zb2xlIEFQSQor ICAgICAgICBtZXNzYWdlcyBhbmQgY29udGFpbnMgdGhlIG5hbWUgb2YgdGhlIEFQSSBjYWxsIChs b2csIGRpciwgZGlyeG1sLCBldGMuKS4KKyAgICAgICAgU3Vic2VxdWVudCBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjYzNzEgd2lsbCBtYWtlIE1lc3NhZ2VUeXBlCisg ICAgICAgIHByaXZhdGUgdG8gdGhlIGluc3BlY3Rvci4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9wcm90b2NvbC9jb25zb2xlLWFn ZW50LWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiBwbGF0Zm9ybS9jaHJvbWl1bS9odHRwL3Rlc3Rz L2luc3BlY3Rvci9jb25zb2xlLXJlc291cmNlLWVycm9ycy1leHBlY3RlZC50eHQ6IEFkZGVkLgor CiAyMDExLTA5LTE4ICBJbHlhIFRpa2hvbm92c2t5ICA8bG9pc2xvQGNocm9taXVtLm9yZz4KIAog ICAgICAgICBXZWIgSW5zcGVjdG9yOiByZXF1ZXN0QW5pbWF0aW9uRnJhbWUgY2FsbGJhY2tzIGRv bid0IHNob3cgdXAgaW4gdGhlIHRpbWVsaW5lIHBhbmVsLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvaW5zcGVjdG9yL3Byb3RvY29sL2NvbnNvbGUtYWdlbnQtZXhwZWN0ZWQudHh0IGIvTGF5b3V0 VGVzdHMvaW5zcGVjdG9yL3Byb3RvY29sL2NvbnNvbGUtYWdlbnQtZXhwZWN0ZWQudHh0CmluZGV4 IGUwM2NjZTJiZWZiNDBiNjA5MGIzNjRkZjJkODMxMGVlMDE1YWQ0NjAuLjhlMDhjYzAyYjIwNGFj ZWEwMjI5NTE5YTIwN2FjYzJiOWNhODdlOGQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3Bl Y3Rvci9wcm90b2NvbC9jb25zb2xlLWFnZW50LWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0 cy9pbnNwZWN0b3IvcHJvdG9jb2wvY29uc29sZS1hZ2VudC1leHBlY3RlZC50eHQKQEAgLTUzLDgg KzUzLDggQEAgZXZlbnQgQ29uc29sZUFnZW50Lm1lc3NhZ2VBZGRlZAogewogICAgIG1ldGhvZCA6 ICJDb25zb2xlLm1lc3NhZ2VBZGRlZCIKICAgICBwYXJhbXMgOiB7Ci0gICAgICAgIG1lc3NhZ2VP YmogOiB7Ci0gICAgICAgICAgICBzb3VyY2UgOiAiamF2YXNjcmlwdCIKKyAgICAgICAgbWVzc2Fn ZSA6IHsKKyAgICAgICAgICAgIHNvdXJjZSA6ICJjb25zb2xlLWFwaSIKICAgICAgICAgICAgIHR5 cGUgOiAibG9nIgogICAgICAgICAgICAgbGV2ZWwgOiAibG9nIgogICAgICAgICAgICAgbGluZSA6 IDAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2Nocm9taXVtL2h0dHAvdGVzdHMv aW5zcGVjdG9yL2NvbnNvbGUtcmVzb3VyY2UtZXJyb3JzLWV4cGVjdGVkLnR4dCBiL0xheW91dFRl c3RzL3BsYXRmb3JtL2Nocm9taXVtL2h0dHAvdGVzdHMvaW5zcGVjdG9yL2NvbnNvbGUtcmVzb3Vy Y2UtZXJyb3JzLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5lZmM3OTQzNWM0NzA4M2Q2MDkyZjAy YjU3Y2E2MjcxMDM4NjMxZGE0Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZv cm0vY2hyb21pdW0vaHR0cC90ZXN0cy9pbnNwZWN0b3IvY29uc29sZS1yZXNvdXJjZS1lcnJvcnMt ZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsOCBAQAorVGVzdHMgdGhhdCBlcnJvcnMgdG8gbG9hZCBh IHJlc291cmNlIGNhdXNlIGVycm9yIG1lc3NhZ2VzIHRvIGJlIGxvZ2dlZCB0byBjb25zb2xlLgor CisKK0dFVCBodHRwOi8vMTI3LjAuMC4xOjgwMDAvaW5zcGVjdG9yL21pc3NpbmcuY3NzIDQwNCAo Tm90IEZvdW5kKSBjb25zb2xlLW1lc3NhZ2UgY29uc29sZS1lcnJvci1sZXZlbAorR0VUIGh0dHA6 Ly8xMjcuMC4wLjE6ODAwMC9pbnNwZWN0b3Ivbm9uLWV4aXN0ZW50LWlmcmFtZS5odG1sIDQwNCAo Tm90IEZvdW5kKSBjb25zb2xlLW1lc3NhZ2UgY29uc29sZS1lcnJvci1sZXZlbAorR0VUIGh0dHA6 Ly8xMjcuMC4wLjE6ODAwMC9pbnNwZWN0b3Ivbm9uLWV4aXN0ZW50LXNjcmlwdC5qcyA0MDQgKE5v dCBGb3VuZCkgY29uc29sZS1tZXNzYWdlIGNvbnNvbGUtZXJyb3ItbGV2ZWwKK0dFVCBodHRwOi8v MTI3LjAuMC4xOjgwMDAvaW5zcGVjdG9yL25vbi1leGlzdGVudC14aHIgNDA0IChOb3QgRm91bmQp bG9hZFhIUmNvbnNvbGUtcmVzb3VyY2UtZXJyb3JzLmh0bWw6MThwZXJmb3JtQWN0aW9uc2NvbnNv bGUtcmVzb3VyY2UtZXJyb3JzLmh0bWw6MTAoYW5vbnltb3VzIGZ1bmN0aW9uKUluamVjdGVkU2Ny aXB0Ll9ldmFsdWF0ZU9uSW5qZWN0ZWRTY3JpcHQuX2V2YWx1YXRlQW5kV3JhcEluamVjdGVkU2Ny aXB0LmV2YWx1YXRlIGNvbnNvbGUtbWVzc2FnZSBjb25zb2xlLWVycm9yLWxldmVsCisKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxv ZwppbmRleCA0MGJiZjYwNjAwZDEyZTE1NjkwZGExZjZjNjgyYjY0OWM4NmUzOTIzLi4yYmU3NjMz OTIxNzFjMDMwMTk0YzYyYTU4MTZkZWIwODBjMmU2NThlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs NDMgQEAKKzIwMTEtMDktMTkgIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgor CisgICAgICAgIFdlYiBJbnNwZWN0b3I6IHN0cmVhbWxpbmUgQ29uc29sZSdzIE1lc3NhZ2VUeXBl IGFuZCBNZXNzYWdlU291cmNlIHNlbWFudGljcy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTY4MzQyCisKKyAgICAgICAgVGhpcyBjaGFuZ2UgZml4ZXMg c2VtYW50aWNzIG9mIHRoZSBNZXNzYWdlU291cmNlIGFuZCBNZXNzYWdlVHlwZToKKyAgICAgICAg TWVzc2FnZVNvdXJjZSBpcyBub3cgdGhlIHNvdXJjZSBvZiB0aGUgbWVzc2FnZSAoYmUgaXQgTmV0 d29yaywgSFRNTAorICAgICAgICBwYXJzZXIgb3IgQ29uc29sZSBBUEkpLiBNZXNzYWdlVHlwZSBp cyBvbmx5IGRlZmluZWQgZm9yIHRoZSBDb25zb2xlIEFQSQorICAgICAgICBtZXNzYWdlcyBhbmQg Y29udGFpbnMgdGhlIG5hbWUgb2YgdGhlIEFQSSBjYWxsIChsb2csIGRpciwgZGlyeG1sLCBldGMu KS4KKyAgICAgICAgU3Vic2VxdWVudCBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NjYzNzEgd2lsbCBtYWtlIE1lc3NhZ2VUeXBlCisgICAgICAgIHByaXZhdGUgdG8gdGhl IGluc3BlY3Rvci4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIGRvbS9Eb2N1bWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6bG9n RXhjZXB0aW9uVG9Db25zb2xlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvQ29uc29sZU1lc3NhZ2Uu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6bWVzc2FnZVNvdXJjZVZhbHVlKToKKyAgICAgICAgKFdl YkNvcmU6Om1lc3NhZ2VUeXBlVmFsdWUpOgorICAgICAgICAoV2ViQ29yZTo6Q29uc29sZU1lc3Nh Z2U6OmFkZFRvRnJvbnRlbmQpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3IuanNvbjoK KyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yQ29uc29sZUFnZW50LmNwcDoKKyAgICAgICAg KFdlYkNvcmU6Okluc3BlY3RvckNvbnNvbGVBZ2VudDo6ZGlkUmVjZWl2ZVJlc3BvbnNlKToKKyAg ICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNvbnNvbGVBZ2VudDo6ZGlkRmFpbExvYWRpbmcpOgor ICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZU1lc3NhZ2UuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuY3JlYXRlVGV4dE1lc3NhZ2UpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLnByb3RvdHlwZS5fZm9ybWF0TWVzc2FnZSk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UucHJvdG90eXBlLnRvU3RyaW5n KToKKyAgICAgICAgKiBwYWdlL0NvbnNvbGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6cHJpbnRN ZXNzYWdlU291cmNlQW5kTGV2ZWxQcmVmaXgpOgorICAgICAgICAoV2ViQ29yZTo6Q29uc29sZTo6 YWRkTWVzc2FnZSk6CisgICAgICAgIChXZWJDb3JlOjpDb25zb2xlOjpkaXIpOgorICAgICAgICAo V2ViQ29yZTo6Q29uc29sZTo6ZGlyeG1sKToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnNvbGU6Omdy b3VwKToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnNvbGU6Omdyb3VwQ29sbGFwc2VkKToKKyAgICAg ICAgKFdlYkNvcmU6OkNvbnNvbGU6Omdyb3VwRW5kKToKKyAgICAgICAgKiBwYWdlL0NvbnNvbGVU eXBlcy5oOgorICAgICAgICAqIHdlYnNvY2tldHMvV2ViU29ja2V0Q2hhbm5lbC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpXZWJTb2NrZXRDaGFubmVsOjpkaWRGYWlsU29ja2V0U3RyZWFtKToKKwog MjAxMS0wOS0xOCAgSWx5YSBUaWtob25vdnNreSAgPGxvaXNsb0BjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgV2ViIEluc3BlY3RvcjogcmVxdWVzdEFuaW1hdGlvbkZyYW1lIGNhbGxiYWNrcyBkb24n dCBzaG93IHVwIGluIHRoZSB0aW1lbGluZSBwYW5lbC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2RvbS9Eb2N1bWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCmlu ZGV4IDE5NDNmYWU3ODJmNDNjYzE3MjhjMzczNmI1YTI0ZWI5M2M3MWMzYzIuLjUyNzY5MjBlOTZj ZjU0Njc5YjkxZGY2NGVlZDJlOWZkM2U4ZjAxMzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2RvbS9Eb2N1bWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcApA QCAtMjM1Nyw4ICsyMzU3LDcgQEAgRXZlbnRUYXJnZXQqIERvY3VtZW50OjplcnJvckV2ZW50VGFy Z2V0KCkKIAogdm9pZCBEb2N1bWVudDo6bG9nRXhjZXB0aW9uVG9Db25zb2xlKGNvbnN0IFN0cmlu ZyYgZXJyb3JNZXNzYWdlLCBpbnQgbGluZU51bWJlciwgY29uc3QgU3RyaW5nJiBzb3VyY2VVUkws IFBhc3NSZWZQdHI8U2NyaXB0Q2FsbFN0YWNrPiBjYWxsU3RhY2spCiB7Ci0gICAgTWVzc2FnZVR5 cGUgbWVzc2FnZVR5cGUgPSBjYWxsU3RhY2sgPyBVbmNhdWdodEV4Y2VwdGlvbk1lc3NhZ2VUeXBl IDogTG9nTWVzc2FnZVR5cGU7Ci0gICAgYWRkTWVzc2FnZShKU01lc3NhZ2VTb3VyY2UsIG1lc3Nh Z2VUeXBlLCBFcnJvck1lc3NhZ2VMZXZlbCwgZXJyb3JNZXNzYWdlLCBsaW5lTnVtYmVyLCBzb3Vy Y2VVUkwsIGNhbGxTdGFjayk7CisgICAgYWRkTWVzc2FnZShKU01lc3NhZ2VTb3VyY2UsIExvZ01l c3NhZ2VUeXBlLCBFcnJvck1lc3NhZ2VMZXZlbCwgZXJyb3JNZXNzYWdlLCBsaW5lTnVtYmVyLCBz b3VyY2VVUkwsIGNhbGxTdGFjayk7CiB9CiAKIHZvaWQgRG9jdW1lbnQ6OnNldFVSTChjb25zdCBL VVJMJiB1cmwpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvQ29uc29sZU1l c3NhZ2UuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0NvbnNvbGVNZXNzYWdlLmNwcApp bmRleCAwYmM0YmExN2U0ZGEwYzVkNDIyZGNmOTE2NDQwMzk1YTBhODM1ZTM0Li5kNDRhNDk1OTA4 MzQzMDkyM2E3ZTExMTdkNjYzYTRjOTg2NmIyYzU4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvQ29uc29sZU1lc3NhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9Db25zb2xlTWVzc2FnZS5jcHAKQEAgLTkxLDcgKzkxLDggQEAgc3RhdGljIFN0cmluZyBt ZXNzYWdlU291cmNlVmFsdWUoTWVzc2FnZVNvdXJjZSBzb3VyY2UpCiAgICAgY2FzZSBIVE1MTWVz c2FnZVNvdXJjZTogcmV0dXJuICJodG1sIjsKICAgICBjYXNlIFhNTE1lc3NhZ2VTb3VyY2U6IHJl dHVybiAieG1sIjsKICAgICBjYXNlIEpTTWVzc2FnZVNvdXJjZTogcmV0dXJuICJqYXZhc2NyaXB0 IjsKLSAgICBjYXNlIENTU01lc3NhZ2VTb3VyY2U6IHJldHVybiAiY3NzIjsKKyAgICBjYXNlIE5l dHdvcmtNZXNzYWdlU291cmNlOiByZXR1cm4gIm5ldHdvcmsiOworICAgIGNhc2UgQ29uc29sZUFQ SU1lc3NhZ2VTb3VyY2U6IHJldHVybiAiY29uc29sZS1hcGkiOwogICAgIGNhc2UgT3RoZXJNZXNz YWdlU291cmNlOiByZXR1cm4gIm90aGVyIjsKICAgICB9CiAgICAgcmV0dXJuICJvdGhlciI7CkBA IC0xMDEsMTQgKzEwMiwxMyBAQCBzdGF0aWMgU3RyaW5nIG1lc3NhZ2VUeXBlVmFsdWUoTWVzc2Fn ZVR5cGUgdHlwZSkKIHsKICAgICBzd2l0Y2ggKHR5cGUpIHsKICAgICBjYXNlIExvZ01lc3NhZ2VU eXBlOiByZXR1cm4gImxvZyI7Ci0gICAgY2FzZSBPYmplY3RNZXNzYWdlVHlwZTogcmV0dXJuICJv dGhlciI7CisgICAgY2FzZSBEaXJNZXNzYWdlVHlwZTogcmV0dXJuICJkaXIiOworICAgIGNhc2Ug RGlyWE1MTWVzc2FnZVR5cGU6IHJldHVybiAiZGlyWE1MIjsKICAgICBjYXNlIFRyYWNlTWVzc2Fn ZVR5cGU6IHJldHVybiAidHJhY2UiOwogICAgIGNhc2UgU3RhcnRHcm91cE1lc3NhZ2VUeXBlOiBy ZXR1cm4gInN0YXJ0R3JvdXAiOwogICAgIGNhc2UgU3RhcnRHcm91cENvbGxhcHNlZE1lc3NhZ2VU eXBlOiByZXR1cm4gInN0YXJ0R3JvdXBDb2xsYXBzZWQiOwogICAgIGNhc2UgRW5kR3JvdXBNZXNz YWdlVHlwZTogcmV0dXJuICJlbmRHcm91cCI7CiAgICAgY2FzZSBBc3NlcnRNZXNzYWdlVHlwZTog cmV0dXJuICJhc3NlcnQiOwotICAgIGNhc2UgVW5jYXVnaHRFeGNlcHRpb25NZXNzYWdlVHlwZTog cmV0dXJuICJ1bmNhdWdodEV4Y2VwdGlvbiI7Ci0gICAgY2FzZSBOZXR3b3JrRXJyb3JNZXNzYWdl VHlwZTogcmV0dXJuICJuZXR3b3JrRXJyb3IiOwogICAgIH0KICAgICByZXR1cm4gIm90aGVyIjsK IH0KQEAgLTEyOSwxMyArMTI5LDE0IEBAIHZvaWQgQ29uc29sZU1lc3NhZ2U6OmFkZFRvRnJvbnRl bmQoSW5zcGVjdG9yRnJvbnRlbmQ6OkNvbnNvbGUqIGZyb250ZW5kLCBJbmplY3RlCiB7CiAgICAg UmVmUHRyPEluc3BlY3Rvck9iamVjdD4ganNvbk9iaiA9IEluc3BlY3Rvck9iamVjdDo6Y3JlYXRl KCk7CiAgICAganNvbk9iai0+c2V0U3RyaW5nKCJzb3VyY2UiLCBtZXNzYWdlU291cmNlVmFsdWUo bV9zb3VyY2UpKTsKKyAgICAvLyBGSVhNRTogb25seSBzZW5kIG91dCB0eXBlIGZvciBDb25zb2xl QVBJIHNvdXJjZSBtZXNzYWdlcy4KICAgICBqc29uT2JqLT5zZXRTdHJpbmcoInR5cGUiLCBtZXNz YWdlVHlwZVZhbHVlKG1fdHlwZSkpOwogICAgIGpzb25PYmotPnNldFN0cmluZygibGV2ZWwiLCBt ZXNzYWdlTGV2ZWxWYWx1ZShtX2xldmVsKSk7CiAgICAganNvbk9iai0+c2V0TnVtYmVyKCJsaW5l Iiwgc3RhdGljX2Nhc3Q8aW50PihtX2xpbmUpKTsKICAgICBqc29uT2JqLT5zZXRTdHJpbmcoInVy bCIsIG1fdXJsKTsKICAgICBqc29uT2JqLT5zZXROdW1iZXIoInJlcGVhdENvdW50Iiwgc3RhdGlj X2Nhc3Q8aW50PihtX3JlcGVhdENvdW50KSk7CiAgICAganNvbk9iai0+c2V0U3RyaW5nKCJ0ZXh0 IiwgbV9tZXNzYWdlKTsKLSAgICBpZiAobV90eXBlID09IE5ldHdvcmtFcnJvck1lc3NhZ2VUeXBl KSAKKyAgICBpZiAobV9zb3VyY2UgPT0gTmV0d29ya01lc3NhZ2VTb3VyY2UgJiYgIW1fcmVxdWVz dElkLmlzRW1wdHkoKSkKICAgICAgICAganNvbk9iai0+c2V0U3RyaW5nKCJuZXR3b3JrUmVxdWVz dElkIiwgbV9yZXF1ZXN0SWQpOwogICAgIGlmIChtX2FyZ3VtZW50cyAmJiBtX2FyZ3VtZW50cy0+ YXJndW1lbnRDb3VudCgpKSB7CiAgICAgICAgIEluamVjdGVkU2NyaXB0IGluamVjdGVkU2NyaXB0 ID0gaW5qZWN0ZWRTY3JpcHRNYW5hZ2VyLT5pbmplY3RlZFNjcmlwdEZvcihtX2FyZ3VtZW50cy0+ Z2xvYmFsU3RhdGUoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yLmpzb24gYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24KaW5k ZXggYTkzNzc1MTQ5NWEyNDE2MjEzMDM3YmZkMzA5YTUxYjZmODA3M2FmYy4uNTAyOGQ0YmE2YThm ODJjNGQxOWExOWMwMjllMWYzOTY5YWYwNmRjOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3Rvci5qc29uCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3IuanNvbgpAQCAtMzMyLDIyICszMzIsMjIgQEAKICAgICB9LAogICAgIHsKICAgICAg ICAgImRvbWFpbiI6ICJDb25zb2xlIiwKLSAgICAgICAgImRlc2NyaXB0aW9uIjogIkNvbnNvbGUg ZG9tYWluIGRlZmluZXMgbWV0aG9kcyBhbmQgZXZlbnRzIGZvciBpbnRlcmFjdGlvbiB3aXRoIHRo ZSBKYXZhU2NyaXB0IGNvbnNvbGUuIENvbnNvbGUgY29sbGVjdHMgbWVzc2FnZXMgY3JlYXRlZCBi eSBtZWFucyBvZiB0aGUgPGEgaHJlZj0naHR0cDovL2dldGZpcmVidWcuY29tL3dpa2kvaW5kZXgu cGhwL0NvbnNvbGVfQVBJJz5KYXZhU2NyaXB0IENvbnNvbGUgQVBJPC9hPi4gT25lIG5lZWRzIHRv IGVuYWJsZSB0aGlzIGRvbWFpbiB1c2luZyA8Y29kZT5lbmFibGU8L2NvZGU+IGZ1bmN0aW9uIGlu IG9yZGVyIHRvIHN0YXJ0IHJlY2VpdmluZyB0aGUgY29uc29sZSBtZXNzYWdlcy4gQnJvd3NlciB3 aWxsIGNvbGxlY3QgbWVzc2FnZXMgaXNzdWVkIHdoaWxlIGNvbnNvbGUgZG9tYWluIGlzIG5vdCBl bmFibGVkIGFuZCB3aWxsIHJlcG9ydCB0aGVtIHVzaW5nIDxjb2RlPm1lc3NhZ2VBZGRlZDwvY29k ZT4gbm90aWZpY2F0aW9uIHVwb24gZW5hYmxpbmcuIiwKKyAgICAgICAgImRlc2NyaXB0aW9uIjog IkNvbnNvbGUgZG9tYWluIGRlZmluZXMgbWV0aG9kcyBhbmQgZXZlbnRzIGZvciBpbnRlcmFjdGlv biB3aXRoIHRoZSBKYXZhU2NyaXB0IGNvbnNvbGUuIENvbnNvbGUgY29sbGVjdHMgbWVzc2FnZXMg Y3JlYXRlZCBieSBtZWFucyBvZiB0aGUgPGEgaHJlZj0naHR0cDovL2dldGZpcmVidWcuY29tL3dp a2kvaW5kZXgucGhwL0NvbnNvbGVfQVBJJz5KYXZhU2NyaXB0IENvbnNvbGUgQVBJPC9hPi4gT25l IG5lZWRzIHRvIGVuYWJsZSB0aGlzIGRvbWFpbiB1c2luZyA8Y29kZT5lbmFibGU8L2NvZGU+IGNv bW1hbmQgaW4gb3JkZXIgdG8gc3RhcnQgcmVjZWl2aW5nIHRoZSBjb25zb2xlIG1lc3NhZ2VzLiBC cm93c2VyIGNvbGxlY3RzIG1lc3NhZ2VzIGlzc3VlZCB3aGlsZSBjb25zb2xlIGRvbWFpbiBpcyBu b3QgZW5hYmxlZCBhcyB3ZWxsIGFuZCByZXBvcnRzIHRoZW0gdXNpbmcgPGNvZGU+bWVzc2FnZUFk ZGVkPC9jb2RlPiBub3RpZmljYXRpb24gdXBvbiBlbmFibGluZy4iLAogICAgICAgICAidHlwZXMi OiBbCiAgICAgICAgICAgICB7CiAgICAgICAgICAgICAgICAgImlkIjogIkNvbnNvbGVNZXNzYWdl IiwKICAgICAgICAgICAgICAgICAidHlwZSI6ICJvYmplY3QiLAogICAgICAgICAgICAgICAgICJk ZXNjcmlwdGlvbiI6ICJDb25zb2xlIG1lc3NhZ2UuIiwKICAgICAgICAgICAgICAgICAicHJvcGVy dGllcyI6IFsKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJzb3VyY2UiLCAidHlwZSI6 ICJzdHJpbmciLCAiZW51bSI6IFsiaHRtbCIsICJ3bWwiLCAieG1sIiwgImphdmFzY3JpcHQiLCAi Y3NzIiwgIm90aGVyIl0sICJkZXNjcmlwdGlvbiI6ICJNZXNzYWdlIHNvdXJjZS4iIH0sCi0gICAg ICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAidHlwZSIsICJ0eXBlIjogInN0cmluZyIsICJlbnVt IjogWyJsb2ciLCAib3RoZXIiLCAidHJhY2UiLCAic3RhcnRHcm91cCIsICJzdGFydEdyb3VwQ29s bGFwc2VkIiwgImVuZEdyb3VwIiwgImFzc2VydCIsICJ1bmNhdWdodEV4Y2VwdGlvbiIsICJuZXR3 b3JrRXJyb3IiLCAicmVzdWx0Il0sICJkZXNjcmlwdGlvbiI6ICJNZXNzYWdlIHR5cGUuIiB9LAor ICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInNvdXJjZSIsICJ0eXBlIjogInN0cmluZyIs ICJlbnVtIjogWyJodG1sIiwgIndtbCIsICJ4bWwiLCAiamF2YXNjcmlwdCIsICJuZXR3b3JrIiwg ImNvbnNvbGUtYXBpIiwgIm90aGVyIl0sICJkZXNjcmlwdGlvbiI6ICJNZXNzYWdlIHNvdXJjZS4i IH0sCisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAidHlwZSIsICJ0eXBlIjogInN0cmlu ZyIsICJlbnVtIjogWyJsb2ciLCAiZGlyIiwgImRpcnhtbCIsICJ0cmFjZSIsICJzdGFydEdyb3Vw IiwgInN0YXJ0R3JvdXBDb2xsYXBzZWQiLCAiZW5kR3JvdXAiLCAiYXNzZXJ0Il0sICJkZXNjcmlw dGlvbiI6ICJDb25zb2xlIG1lc3NhZ2UgdHlwZS4iIH0sCiAgICAgICAgICAgICAgICAgICAgIHsg Im5hbWUiOiAibGV2ZWwiLCAidHlwZSI6ICJzdHJpbmciLCAiZW51bSI6IFsidGlwIiwgImxvZyIs ICJ3YXJuaW5nIiwgImVycm9yIiwgImRlYnVnIl0sICJkZXNjcmlwdGlvbiI6ICJNZXNzYWdlIHNl dmVyaXR5LiIgfSwKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJsaW5lIiwgInR5cGUi OiAiaW50ZWdlciIsICJkZXNjcmlwdGlvbiI6ICJMaW5lIG51bWJlciBpbiB0aGUgbWVzc2FnZSBv cmlnaW4gcmVzb3VyY2UuIiB9LAorICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImxpbmUi LCAidHlwZSI6ICJpbnRlZ2VyIiwgImRlc2NyaXB0aW9uIjogIkxpbmUgbnVtYmVyIGluIHRoZSBy ZXNvdXJjZSB0aGF0IGdlbmVyYXRlZCB0aGlzIG1lc3NhZ2UuIiB9LAogICAgICAgICAgICAgICAg ICAgICB7ICJuYW1lIjogInVybCIsICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJV Ukwgb2YgdGhlIG1lc3NhZ2Ugb3JpZ2luLiIgfSwKICAgICAgICAgICAgICAgICAgICAgeyAibmFt ZSI6ICJyZXBlYXRDb3VudCIsICJ0eXBlIjogImludGVnZXIiLCAiZGVzY3JpcHRpb24iOiAiUmVw ZWF0IGNvdW50IGZvciByZXBlYXRlZCBtZXNzYWdlcy4iIH0sCiAgICAgICAgICAgICAgICAgICAg IHsgIm5hbWUiOiAidGV4dCIsICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJNZXNz YWdlIHRleHQuIiB9LAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogIm5ldHdvcmtSZXF1 ZXN0SWQiLCAiJHJlZiI6ICJOZXR3b3JrLlJlcXVlc3RJZCIsICJvcHRpb25hbCI6IHRydWUsICJk ZXNjcmlwdGlvbiI6ICJJZGVudGlmaWVyIG9mIHRoZSBuZXR3b3JrIHJlcXVlc3QgYXNzb2NpYXRl ZCB3aXRoIHRoaXMgbWVzc2FnZS4iIH0sCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAi cGFyYW1ldGVycyIsICJ0eXBlIjogImFycmF5IiwgIml0ZW1zIjogeyAiJHJlZiI6ICJSdW50aW1l LlJlbW90ZU9iamVjdCIgfSwgImRlc2NyaXB0aW9uIjogIk1lc3NhZ2UgcGFyYW1ldGVycyBpbiBj YXNlIG9mIHRoZSBmb3JtYXR0ZWQgbWVzc2FnZS4iIH0sCisgICAgICAgICAgICAgICAgICAgIHsg Im5hbWUiOiAicGFyYW1ldGVycyIsICJ0eXBlIjogImFycmF5IiwgIml0ZW1zIjogeyAiJHJlZiI6 ICJSdW50aW1lLlJlbW90ZU9iamVjdCIgfSwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9u IjogIk1lc3NhZ2UgcGFyYW1ldGVycyBpbiBjYXNlIG9mIHRoZSBmb3JtYXR0ZWQgbWVzc2FnZS4i IH0sCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAic3RhY2tUcmFjZSIsICIkcmVmIjog IlN0YWNrVHJhY2UiLCAiZGVzY3JpcHRpb24iOiAiSmF2YVNjcmlwdCBzdGFjayB0cmFjZSBmb3Ig YXNzZXJ0aW9ucyBhbmQgZXJyb3IgbWVzc2FnZXMuIiB9CiAgICAgICAgICAgICAgICAgXQogICAg ICAgICAgICAgfSwKQEAgLTM3MywxMyArMzczLDEzIEBACiAgICAgICAgICAgICB7CiAgICAgICAg ICAgICAgICAgIm5hbWUiOiAiZW5hYmxlIiwKICAgICAgICAgICAgICAgICAicmV0dXJucyI6IFsK LSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJleHBpcmVkTWVzc2FnZXNDb3VudCIsICJ0 eXBlIjogImludGVnZXIiLCAiZGVzY3JpcHRpb24iOiAiTnVtYmVyIG9mIG1lc3NhZ2VzIGNvbGxl Y3RlZCBkdWUgdG8gbWVzc2FnZSB0aHJlYXNob2xkIG92ZXJmbG93LiIgfQorICAgICAgICAgICAg ICAgICAgICB7ICJuYW1lIjogImV4cGlyZWRNZXNzYWdlc0NvdW50IiwgInR5cGUiOiAiaW50ZWdl ciIsICJkZXNjcmlwdGlvbiI6ICJOdW1iZXIgb2YgbWVzc2FnZXMgZHJvcHBlZCBkdWUgdG8gbWVz c2FnZSB0aHJlYXNob2xkIG92ZXJmbG93LiIgfQogICAgICAgICAgICAgICAgIF0sCiAgICAgICAg ICAgICAgICAgImRlc2NyaXB0aW9uIjogIkVuYWJsZXMgY29uc29sZSBkb21haW4sIHNlbmRzIHRo ZSBtZXNzYWdlcyBjb2xsZWN0ZWQgc28gZmFyIHRvIHRoZSBjbGllbnQgYnkgbWVhbnMgb2YgdGhl IDxjb2RlPm1lc3NhZ2VBZGRlZDwvY29kZT4gbm90aWZpY2F0aW9uLiIgCiAgICAgICAgICAgICB9 LAogICAgICAgICAgICAgewogICAgICAgICAgICAgICAgICJuYW1lIjogImRpc2FibGUiLAotICAg ICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJEaXNhYmxlcyBjb25zb2xlIGRvbWFpbiwgcHJl dmVudHMgZnVydGhlciBjb25zb2xlIG1lc3NhZ2VzIGZyb20gYmVpbmcgc2VudCB0byB0aGUgY2xp ZW50LiIgCisgICAgICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIkRpc2FibGVzIGNvbnNvbGUg ZG9tYWluLCBwcmV2ZW50cyBmdXJ0aGVyIGNvbnNvbGUgbWVzc2FnZXMgZnJvbSBiZWluZyByZXBv cnRlZCB0byB0aGUgY2xpZW50LiIgCiAgICAgICAgICAgICB9LAogICAgICAgICAgICAgewogICAg ICAgICAgICAgICAgICJuYW1lIjogImNsZWFyTWVzc2FnZXMiLApAQCAtNDA2LDcgKzQwNiw3IEBA CiAgICAgICAgICAgICB7CiAgICAgICAgICAgICAgICAgIm5hbWUiOiAibWVzc2FnZUFkZGVkIiwK ICAgICAgICAgICAgICAgICAicGFyYW1ldGVycyI6IFsKLSAgICAgICAgICAgICAgICAgICAgeyAi bmFtZSI6ICJtZXNzYWdlT2JqIiwgIiRyZWYiOiAiQ29uc29sZU1lc3NhZ2UiLCAiZGVzY3JpcHRp b24iOiAiQ29uc29sZSBtZXNzYWdlIHRoYXQgaGFzIGJlZW4gYWRkZWQuIiB9CisgICAgICAgICAg ICAgICAgICAgIHsgIm5hbWUiOiAibWVzc2FnZSIsICIkcmVmIjogIkNvbnNvbGVNZXNzYWdlIiwg ImRlc2NyaXB0aW9uIjogIkNvbnNvbGUgbWVzc2FnZSB0aGF0IGhhcyBiZWVuIGFkZGVkLiIgfQog ICAgICAgICAgICAgICAgIF0sCiAgICAgICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIklzc3Vl ZCB3aGVuIG5ldyBjb25zb2xlIG1lc3NhZ2UgaXMgYWRkZWQuIgogICAgICAgICAgICAgfSwKQEAg LTQxNSwxMSArNDE1LDExIEBACiAgICAgICAgICAgICAgICAgInBhcmFtZXRlcnMiOiBbCiAgICAg ICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiY291bnQiLCAidHlwZSI6ICJpbnRlZ2VyIiwgImRl c2NyaXB0aW9uIjogIk5ldyByZXBlYXQgY291bnQgdmFsdWUuIiB9CiAgICAgICAgICAgICAgICAg XSwKLSAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiSXNzdWVkIHdoZW4gc3Vic2VxdWVu dCBtZXNzYWdlKHMpIGFyZSBlcXVhbCB0byB0aGUgcHJldmlvdXMgb25lLiIKKyAgICAgICAgICAg ICAgICAiZGVzY3JpcHRpb24iOiAiSXNzdWVkIHdoZW4gc3Vic2VxdWVudCBtZXNzYWdlKHMpIGFy ZSBlcXVhbCB0byB0aGUgcHJldmlvdXMgb25lKHMpLiIKICAgICAgICAgICAgIH0sCiAgICAgICAg ICAgICB7CiAgICAgICAgICAgICAgICAgIm5hbWUiOiAibWVzc2FnZXNDbGVhcmVkIiwKLSAgICAg ICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiSXNzdWVkIHdoZW4gY29uc29sZSBpcyBjbGVhcmVk LiIKKyAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiSXNzdWVkIHdoZW4gY29uc29sZSBp cyBjbGVhcmVkLiBUaGlzIGhhcHBlbnMgZWl0aGVyIHVwb24gPGNvZGU+Y2xlYXJNZXNzYWdlczwv Y29kZT4gY29tbWFuZCBvciBhZnRlciBwYWdlIG5hdmlnYXRpb24uIgogICAgICAgICAgICAgfQog ICAgICAgICBdCiAgICAgfSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JDb25zb2xlQWdlbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3RvckNvbnNvbGVBZ2VudC5jcHAKaW5kZXggZDZiMzI2ODk1MzViM2QwYWQyODNlNTg1YmQ1ZThm MDA2NDIzZDgzYS4uOTFlNDAyN2Y3YjUzOWE3ZjRkZTcwMWZjYWU1MzQ1YWRjNDhjODMwNiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnNvbGVBZ2VudC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnNvbGVBZ2VudC5j cHAKQEAgLTIyNyw3ICsyMjcsNyBAQCB2b2lkIEluc3BlY3RvckNvbnNvbGVBZ2VudDo6ZGlkUmVj ZWl2ZVJlc3BvbnNlKHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgY29uc3QgUgogICAgIGlmIChy ZXNwb25zZS5odHRwU3RhdHVzQ29kZSgpID49IDQwMCkgewogICAgICAgICBTdHJpbmcgbWVzc2Fn ZSA9ICJGYWlsZWQgdG8gbG9hZCByZXNvdXJjZTogdGhlIHNlcnZlciByZXNwb25kZWQgd2l0aCBh IHN0YXR1cyBvZiAiICsgU3RyaW5nOjpudW1iZXIocmVzcG9uc2UuaHR0cFN0YXR1c0NvZGUoKSkg KyAiICgiICsgcmVzcG9uc2UuaHR0cFN0YXR1c1RleHQoKSArICcpJzsKICAgICAgICAgU3RyaW5n IHJlcXVlc3RJZCA9IElkZW50aWZpZXJzRmFjdG9yeTo6cmVxdWVzdElkKGlkZW50aWZpZXIpOwot ICAgICAgICBhZGRDb25zb2xlTWVzc2FnZShhZG9wdFB0cihuZXcgQ29uc29sZU1lc3NhZ2UoT3Ro ZXJNZXNzYWdlU291cmNlLCBOZXR3b3JrRXJyb3JNZXNzYWdlVHlwZSwgRXJyb3JNZXNzYWdlTGV2 ZWwsIG1lc3NhZ2UsIHJlc3BvbnNlLnVybCgpLnN0cmluZygpLCByZXF1ZXN0SWQpKSk7CisgICAg ICAgIGFkZENvbnNvbGVNZXNzYWdlKGFkb3B0UHRyKG5ldyBDb25zb2xlTWVzc2FnZShOZXR3b3Jr TWVzc2FnZVNvdXJjZSwgTG9nTWVzc2FnZVR5cGUsIEVycm9yTWVzc2FnZUxldmVsLCBtZXNzYWdl LCByZXNwb25zZS51cmwoKS5zdHJpbmcoKSwgcmVxdWVzdElkKSkpOwogICAgIH0KIH0KIApAQCAt MjQxLDcgKzI0MSw3IEBAIHZvaWQgSW5zcGVjdG9yQ29uc29sZUFnZW50OjpkaWRGYWlsTG9hZGlu Zyh1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGNvbnN0IFJlc291CiAgICAgaWYgKCFlcnJvci5s b2NhbGl6ZWREZXNjcmlwdGlvbigpLmlzRW1wdHkoKSkKICAgICAgICAgbWVzc2FnZSArPSAiOiAi ICsgZXJyb3IubG9jYWxpemVkRGVzY3JpcHRpb24oKTsKICAgICBTdHJpbmcgcmVxdWVzdElkID0g SWRlbnRpZmllcnNGYWN0b3J5OjpyZXF1ZXN0SWQoaWRlbnRpZmllcik7Ci0gICAgYWRkQ29uc29s ZU1lc3NhZ2UoYWRvcHRQdHIobmV3IENvbnNvbGVNZXNzYWdlKE90aGVyTWVzc2FnZVNvdXJjZSwg TmV0d29ya0Vycm9yTWVzc2FnZVR5cGUsIEVycm9yTWVzc2FnZUxldmVsLCBtZXNzYWdlLCBlcnJv ci5mYWlsaW5nVVJMKCksIHJlcXVlc3RJZCkpKTsKKyAgICBhZGRDb25zb2xlTWVzc2FnZShhZG9w dFB0cihuZXcgQ29uc29sZU1lc3NhZ2UoTmV0d29ya01lc3NhZ2VTb3VyY2UsIExvZ01lc3NhZ2VU eXBlLCBFcnJvck1lc3NhZ2VMZXZlbCwgbWVzc2FnZSwgZXJyb3IuZmFpbGluZ1VSTCgpLCByZXF1 ZXN0SWQpKSk7CiB9CiAKIHZvaWQgSW5zcGVjdG9yQ29uc29sZUFnZW50OjpzZXRNb25pdG9yaW5n WEhSRW5hYmxlZChFcnJvclN0cmluZyosIGJvb2wgZW5hYmxlZCkKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZU1lc3NhZ2UuanMgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVNZXNzYWdlLmpzCmluZGV4IGExZDRj OGM5NGI1NDUyZWMxYWUyZmMzM2RlNDEzMmExM2I5M2YxOTIuLjVmNTBlNjUwYWU4ZWM5YTVjNjNm ZWFmZmY4MmViNDM3ZmUxODQwZTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvQ29uc29sZU1lc3NhZ2UuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9Db25zb2xlTWVzc2FnZS5qcwpAQCAtNzMsNjQgKzczLDYyIEBAIFdlYklu c3BlY3Rvci5Db25zb2xlTWVzc2FnZSA9IGZ1bmN0aW9uKHNvdXJjZSwgdHlwZSwgbGV2ZWwsIGxp bmUsIHVybCwgcmVwZWF0Q291CiBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuY3JlYXRlVGV4 dE1lc3NhZ2UgPSBmdW5jdGlvbih0ZXh0LCBsZXZlbCkKIHsKICAgICBsZXZlbCA9IGxldmVsIHx8 IFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlTGV2ZWwuTG9nOwotICAgIHJldHVy biBuZXcgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlKFdlYkluc3BlY3Rvci5Db25zb2xlTWVz c2FnZS5NZXNzYWdlU291cmNlLkpTLCBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2Fn ZVR5cGUuTG9nLCBsZXZlbCwgMCwgbnVsbCwgMSwgbnVsbCwgW3RleHRdLCBudWxsKTsKKyAgICBy ZXR1cm4gbmV3IFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZShXZWJJbnNwZWN0b3IuQ29uc29s ZU1lc3NhZ2UuTWVzc2FnZVNvdXJjZS5Db25zb2xlQVBJLCBXZWJJbnNwZWN0b3IuQ29uc29sZU1l c3NhZ2UuTWVzc2FnZVR5cGUuTG9nLCBsZXZlbCwgMCwgbnVsbCwgMSwgbnVsbCwgW3RleHRdLCBu dWxsKTsKIH0KIAogV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLnByb3RvdHlwZSA9IHsKICAg ICBfZm9ybWF0TWVzc2FnZTogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgdmFyIHN0YWNrVHJh Y2UgPSB0aGlzLl9zdGFja1RyYWNlOwotCiAgICAgICAgIHRoaXMuX2Zvcm1hdHRlZE1lc3NhZ2Ug PSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJzcGFuIik7CiAgICAgICAgIHRoaXMuX2Zvcm1hdHRl ZE1lc3NhZ2UuY2xhc3NOYW1lID0gImNvbnNvbGUtbWVzc2FnZS10ZXh0IHNvdXJjZS1jb2RlIjsK IAogICAgICAgICB2YXIgbWVzc2FnZVRleHQ7Ci0gICAgICAgIHN3aXRjaCAodGhpcy50eXBlKSB7 Ci0gICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlVHlw ZS5UcmFjZToKLSAgICAgICAgICAgICAgICBtZXNzYWdlVGV4dCA9IGRvY3VtZW50LmNyZWF0ZVRl eHROb2RlKCJjb25zb2xlLnRyYWNlKCkiKTsKLSAgICAgICAgICAgICAgICBicmVhazsKLSAgICAg ICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLk1lc3NhZ2VUeXBlLlVuY2F1 Z2h0RXhjZXB0aW9uOgotICAgICAgICAgICAgICAgIG1lc3NhZ2VUZXh0ID0gZG9jdW1lbnQuY3Jl YXRlVGV4dE5vZGUodGhpcy5fbWVzc2FnZVRleHQpOwotICAgICAgICAgICAgICAgIGJyZWFrOwot ICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZVR5cGUu TmV0d29ya0Vycm9yOgotICAgICAgICAgICAgICAgIGlmICh0aGlzLl9yZXF1ZXN0KSB7Ci0gICAg ICAgICAgICAgICAgICAgIHN0YWNrVHJhY2UgPSB0aGlzLl9yZXF1ZXN0LnN0YWNrVHJhY2U7Ci0K LSAgICAgICAgICAgICAgICAgICAgbWVzc2FnZVRleHQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50 KCJzcGFuIik7Ci0gICAgICAgICAgICAgICAgICAgIG1lc3NhZ2VUZXh0LmFwcGVuZENoaWxkKGRv Y3VtZW50LmNyZWF0ZVRleHROb2RlKHRoaXMuX3JlcXVlc3QucmVxdWVzdE1ldGhvZCArICIgIikp OwotICAgICAgICAgICAgICAgICAgICB2YXIgYW5jaG9yID0gV2ViSW5zcGVjdG9yLmxpbmtpZnlV UkxBc05vZGUodGhpcy5fcmVxdWVzdC51cmwpOwotICAgICAgICAgICAgICAgICAgICBhbmNob3Iu c2V0QXR0cmlidXRlKCJyZXF1ZXN0X2lkIiwgdGhpcy5fcmVxdWVzdC5yZXF1ZXN0SWQpOwotICAg ICAgICAgICAgICAgICAgICBhbmNob3Iuc2V0QXR0cmlidXRlKCJwcmVmZXJyZWRfcGFuZWwiLCAi bmV0d29yayIpOwotICAgICAgICAgICAgICAgICAgICBtZXNzYWdlVGV4dC5hcHBlbmRDaGlsZChh bmNob3IpOwotICAgICAgICAgICAgICAgICAgICBpZiAodGhpcy5fcmVxdWVzdC5mYWlsZWQpCi0g ICAgICAgICAgICAgICAgICAgICAgICBtZXNzYWdlVGV4dC5hcHBlbmRDaGlsZChkb2N1bWVudC5j cmVhdGVUZXh0Tm9kZSgiICIgKyB0aGlzLl9yZXF1ZXN0LmxvY2FsaXplZEZhaWxEZXNjcmlwdGlv bikpOwotICAgICAgICAgICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAgICAgICAgICAgICBt ZXNzYWdlVGV4dC5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVUZXh0Tm9kZSgiICIgKyB0aGlz Ll9yZXF1ZXN0LnN0YXR1c0NvZGUgKyAiICgiICsgdGhpcy5fcmVxdWVzdC5zdGF0dXNUZXh0ICsg IikiKSk7Ci0gICAgICAgICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgICAgICAgICAgdmFy IGlzRXh0ZXJuYWwgPSAhV2ViSW5zcGVjdG9yLnJlc291cmNlRm9yVVJMKHRoaXMudXJsKTsKLSAg ICAgICAgICAgICAgICAgICAgdmFyIGFuY2hvciA9IFdlYkluc3BlY3Rvci5saW5raWZ5VVJMQXNO b2RlKHRoaXMudXJsLCB0aGlzLnVybCwgImNvbnNvbGUtbWVzc2FnZS11cmwiLCBpc0V4dGVybmFs KTsKLSAgICAgICAgICAgICAgICAgICAgdGhpcy5fZm9ybWF0dGVkTWVzc2FnZS5hcHBlbmRDaGls ZChhbmNob3IpOwotICAgICAgICAgICAgICAgICAgICBtZXNzYWdlVGV4dCA9IHRoaXMuX2Zvcm1h dChbdGhpcy5fbWVzc2FnZVRleHRdKTsKLSAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAg ICAgYnJlYWs7Ci0gICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5N ZXNzYWdlVHlwZS5Bc3NlcnQ6Ci0gICAgICAgICAgICAgICAgdmFyIGFyZ3MgPSBbV2ViSW5zcGVj dG9yLlVJU3RyaW5nKCJBc3NlcnRpb24gZmFpbGVkOiIpXTsKLSAgICAgICAgICAgICAgICBpZiAo dGhpcy5fcGFyYW1ldGVycykKLSAgICAgICAgICAgICAgICAgICAgYXJncyA9IGFyZ3MuY29uY2F0 KHRoaXMuX3BhcmFtZXRlcnMpOwotICAgICAgICAgICAgICAgIG1lc3NhZ2VUZXh0ID0gdGhpcy5f Zm9ybWF0KGFyZ3MpOwotICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgY2FzZSBX ZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZVR5cGUuT2JqZWN0OgotICAgICAgICAg ICAgICAgIHZhciBvYmogPSB0aGlzLl9wYXJhbWV0ZXJzID8gdGhpcy5fcGFyYW1ldGVyc1swXSA6 IHVuZGVmaW5lZDsKLSAgICAgICAgICAgICAgICB2YXIgYXJncyA9IFsiJU8iLCBvYmpdOwotICAg ICAgICAgICAgICAgIG1lc3NhZ2VUZXh0ID0gdGhpcy5fZm9ybWF0KGFyZ3MpOwotICAgICAgICAg ICAgICAgIGJyZWFrOwotICAgICAgICAgICAgZGVmYXVsdDoKLSAgICAgICAgICAgICAgICB2YXIg YXJncyA9IHRoaXMuX3BhcmFtZXRlcnMgfHwgW3RoaXMuX21lc3NhZ2VUZXh0XTsKLSAgICAgICAg ICAgICAgICBtZXNzYWdlVGV4dCA9IHRoaXMuX2Zvcm1hdChhcmdzKTsKLSAgICAgICAgICAgICAg ICBicmVhazsKKyAgICAgICAgaWYgKHRoaXMuc291cmNlID09PSBXZWJJbnNwZWN0b3IuQ29uc29s ZU1lc3NhZ2UuTWVzc2FnZVNvdXJjZS5Db25zb2xlQVBJKSB7CisgICAgICAgICAgICBzd2l0Y2gg KHRoaXMudHlwZSkgeworICAgICAgICAgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLkNvbnNvbGVN ZXNzYWdlLk1lc3NhZ2VUeXBlLlRyYWNlOgorICAgICAgICAgICAgICAgICAgICBtZXNzYWdlVGV4 dCA9IGRvY3VtZW50LmNyZWF0ZVRleHROb2RlKCJjb25zb2xlLnRyYWNlKCkiKTsKKyAgICAgICAg ICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuQ29u c29sZU1lc3NhZ2UuTWVzc2FnZVR5cGUuQXNzZXJ0OgorICAgICAgICAgICAgICAgICAgICB2YXIg YXJncyA9IFtXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkFzc2VydGlvbiBmYWlsZWQ6IildOworICAg ICAgICAgICAgICAgICAgICBpZiAodGhpcy5fcGFyYW1ldGVycykKKyAgICAgICAgICAgICAgICAg ICAgICAgIGFyZ3MgPSBhcmdzLmNvbmNhdCh0aGlzLl9wYXJhbWV0ZXJzKTsKKyAgICAgICAgICAg ICAgICAgICAgbWVzc2FnZVRleHQgPSB0aGlzLl9mb3JtYXQoYXJncyk7CisgICAgICAgICAgICAg ICAgICAgIGJyZWFrOworICAgICAgICAgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLkNvbnNvbGVN ZXNzYWdlLk1lc3NhZ2VUeXBlLkRpcjoKKyAgICAgICAgICAgICAgICAgICAgdmFyIG9iaiA9IHRo aXMuX3BhcmFtZXRlcnMgPyB0aGlzLl9wYXJhbWV0ZXJzWzBdIDogdW5kZWZpbmVkOworICAgICAg ICAgICAgICAgICAgICB2YXIgYXJncyA9IFsiJU8iLCBvYmpdOworICAgICAgICAgICAgICAgICAg ICBtZXNzYWdlVGV4dCA9IHRoaXMuX2Zvcm1hdChhcmdzKTsKKyAgICAgICAgICAgICAgICAgICAg YnJlYWs7CisgICAgICAgICAgICAgICAgZGVmYXVsdDoKKyAgICAgICAgICAgICAgICAgICAgdmFy IGFyZ3MgPSB0aGlzLl9wYXJhbWV0ZXJzIHx8IFt0aGlzLl9tZXNzYWdlVGV4dF07CisgICAgICAg ICAgICAgICAgICAgIG1lc3NhZ2VUZXh0ID0gdGhpcy5fZm9ybWF0KGFyZ3MpOworICAgICAgICAg ICAgfQorICAgICAgICB9IGVsc2UgaWYgKHRoaXMuc291cmNlID09PSBXZWJJbnNwZWN0b3IuQ29u c29sZU1lc3NhZ2UuTWVzc2FnZVNvdXJjZS5OZXR3b3JrKSB7CisgICAgICAgICAgICBpZiAodGhp cy5fcmVxdWVzdCkgeworICAgICAgICAgICAgICAgIHRoaXMuX3N0YWNrVHJhY2UgPSB0aGlzLl9y ZXF1ZXN0LnN0YWNrVHJhY2U7CisgICAgICAgICAgICAgICAgbWVzc2FnZVRleHQgPSBkb2N1bWVu dC5jcmVhdGVFbGVtZW50KCJzcGFuIik7CisgICAgICAgICAgICAgICAgbWVzc2FnZVRleHQuYXBw ZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUodGhpcy5fcmVxdWVzdC5yZXF1ZXN0TWV0 aG9kICsgIiAiKSk7CisgICAgICAgICAgICAgICAgdmFyIGFuY2hvciA9IFdlYkluc3BlY3Rvci5s aW5raWZ5VVJMQXNOb2RlKHRoaXMuX3JlcXVlc3QudXJsKTsKKyAgICAgICAgICAgICAgICBhbmNo b3Iuc2V0QXR0cmlidXRlKCJyZXF1ZXN0X2lkIiwgdGhpcy5fcmVxdWVzdC5yZXF1ZXN0SWQpOwor ICAgICAgICAgICAgICAgIGFuY2hvci5zZXRBdHRyaWJ1dGUoInByZWZlcnJlZF9wYW5lbCIsICJu ZXR3b3JrIik7CisgICAgICAgICAgICAgICAgbWVzc2FnZVRleHQuYXBwZW5kQ2hpbGQoYW5jaG9y KTsKKyAgICAgICAgICAgICAgICBpZiAodGhpcy5fcmVxdWVzdC5mYWlsZWQpCisgICAgICAgICAg ICAgICAgICAgIG1lc3NhZ2VUZXh0LmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZVRleHROb2Rl KCIgIiArIHRoaXMuX3JlcXVlc3QubG9jYWxpemVkRmFpbERlc2NyaXB0aW9uKSk7CisgICAgICAg ICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgICAgICBtZXNzYWdlVGV4dC5hcHBlbmRDaGls ZChkb2N1bWVudC5jcmVhdGVUZXh0Tm9kZSgiICIgKyB0aGlzLl9yZXF1ZXN0LnN0YXR1c0NvZGUg KyAiICgiICsgdGhpcy5fcmVxdWVzdC5zdGF0dXNUZXh0ICsgIikiKSk7CisgICAgICAgICAgICB9 IGVsc2UgeworICAgICAgICAgICAgICAgIHZhciBpc0V4dGVybmFsID0gIVdlYkluc3BlY3Rvci5y ZXNvdXJjZUZvclVSTCh0aGlzLnVybCk7CisgICAgICAgICAgICAgICAgdmFyIGFuY2hvciA9IFdl Ykluc3BlY3Rvci5saW5raWZ5VVJMQXNOb2RlKHRoaXMudXJsLCB0aGlzLnVybCwgImNvbnNvbGUt bWVzc2FnZS11cmwiLCBpc0V4dGVybmFsKTsKKyAgICAgICAgICAgICAgICB0aGlzLl9mb3JtYXR0 ZWRNZXNzYWdlLmFwcGVuZENoaWxkKGFuY2hvcik7CisgICAgICAgICAgICAgICAgbWVzc2FnZVRl eHQgPSB0aGlzLl9mb3JtYXQoW3RoaXMuX21lc3NhZ2VUZXh0XSk7CisgICAgICAgICAgICB9Cisg ICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICB2YXIgYXJncyA9IHRoaXMuX3BhcmFtZXRlcnMg fHwgW3RoaXMuX21lc3NhZ2VUZXh0XTsKKyAgICAgICAgICAgIG1lc3NhZ2VUZXh0ID0gdGhpcy5f Zm9ybWF0KGFyZ3MpOwogICAgICAgICB9CiAKLSAgICAgICAgaWYgKHRoaXMudHlwZSAhPT0gV2Vi SW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLk1lc3NhZ2VUeXBlLk5ldHdvcmtFcnJvcikgeworICAg ICAgICAvLyBGSVhNRTogd2Ugc2hvdWxkIGR1bXAgbmV0d29yayBtZXNzYWdlIG9yaWdpbnMgYXMg d2VsbC4KKyAgICAgICAgaWYgKHRoaXMuc291cmNlICE9PSBXZWJJbnNwZWN0b3IuQ29uc29sZU1l c3NhZ2UuTWVzc2FnZVNvdXJjZS5OZXR3b3JrKSB7CiAgICAgICAgICAgICBpZiAodGhpcy5fc3Rh Y2tUcmFjZSAmJiB0aGlzLl9zdGFja1RyYWNlLmxlbmd0aCAmJiB0aGlzLl9zdGFja1RyYWNlWzBd LnVybCkgewogICAgICAgICAgICAgICAgIHZhciB1cmxFbGVtZW50ID0gdGhpcy5fbGlua2lmeUNh bGxGcmFtZSh0aGlzLl9zdGFja1RyYWNlWzBdKTsKICAgICAgICAgICAgICAgICB0aGlzLl9mb3Jt YXR0ZWRNZXNzYWdlLmFwcGVuZENoaWxkKHVybEVsZW1lbnQpOwpAQCAtMTQyLDI3ICsxNDAsMjEg QEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLnByb3RvdHlwZSA9IHsKIAogICAgICAgICB0 aGlzLl9mb3JtYXR0ZWRNZXNzYWdlLmFwcGVuZENoaWxkKG1lc3NhZ2VUZXh0KTsKIAotICAgICAg ICBpZiAodGhpcy5fc3RhY2tUcmFjZSkgewotICAgICAgICAgICAgc3dpdGNoICh0aGlzLnR5cGUp IHsKLSAgICAgICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNz YWdlVHlwZS5UcmFjZToKLSAgICAgICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5Db25zb2xl TWVzc2FnZS5NZXNzYWdlVHlwZS5VbmNhdWdodEV4Y2VwdGlvbjoKLSAgICAgICAgICAgICAgICBj YXNlIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlVHlwZS5OZXR3b3JrRXJyb3I6 Ci0gICAgICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2Fn ZVR5cGUuQXNzZXJ0OiB7Ci0gICAgICAgICAgICAgICAgICAgIHZhciBvbCA9IGRvY3VtZW50LmNy ZWF0ZUVsZW1lbnQoIm9sIik7Ci0gICAgICAgICAgICAgICAgICAgIG9sLmNsYXNzTmFtZSA9ICJv dXRsaW5lLWRpc2Nsb3N1cmUiOwotICAgICAgICAgICAgICAgICAgICB2YXIgdHJlZU91dGxpbmUg PSBuZXcgVHJlZU91dGxpbmUob2wpOwotCi0gICAgICAgICAgICAgICAgICAgIHZhciBjb250ZW50 ID0gdGhpcy5fZm9ybWF0dGVkTWVzc2FnZTsKLSAgICAgICAgICAgICAgICAgICAgdmFyIHJvb3Qg PSBuZXcgVHJlZUVsZW1lbnQoY29udGVudCwgbnVsbCwgdHJ1ZSk7Ci0gICAgICAgICAgICAgICAg ICAgIGNvbnRlbnQudHJlZUVsZW1lbnRGb3JUZXN0ID0gcm9vdDsKLSAgICAgICAgICAgICAgICAg ICAgdHJlZU91dGxpbmUuYXBwZW5kQ2hpbGQocm9vdCk7Ci0gICAgICAgICAgICAgICAgICAgIGlm ICh0aGlzLnR5cGUgPT09IFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlVHlwZS5U cmFjZSkKLSAgICAgICAgICAgICAgICAgICAgICAgIHJvb3QuZXhwYW5kKCk7Ci0KLSAgICAgICAg ICAgICAgICAgICAgdGhpcy5fcG9wdWxhdGVTdGFja1RyYWNlVHJlZUVsZW1lbnQocm9vdCk7Ci0g ICAgICAgICAgICAgICAgICAgIHRoaXMuX2Zvcm1hdHRlZE1lc3NhZ2UgPSBvbDsKLSAgICAgICAg ICAgICAgICB9Ci0gICAgICAgICAgICB9CisgICAgICAgIHZhciBkdW1wU3RhY2tUcmFjZSA9ICEh dGhpcy5fc3RhY2tUcmFjZSAmJiAodGhpcy5sZXZlbCA9PT0gV2ViSW5zcGVjdG9yLkNvbnNvbGVN ZXNzYWdlLk1lc3NhZ2VMZXZlbC5FcnJvciB8fCB0aGlzLnR5cGUgPT09IFdlYkluc3BlY3Rvci5D b25zb2xlTWVzc2FnZS5NZXNzYWdlVHlwZS5UcmFjZSk7CisgICAgICAgIGlmIChkdW1wU3RhY2tU cmFjZSkgeworICAgICAgICAgICAgdmFyIG9sID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgib2wi KTsKKyAgICAgICAgICAgIG9sLmNsYXNzTmFtZSA9ICJvdXRsaW5lLWRpc2Nsb3N1cmUiOworICAg ICAgICAgICAgdmFyIHRyZWVPdXRsaW5lID0gbmV3IFRyZWVPdXRsaW5lKG9sKTsKKworICAgICAg ICAgICAgdmFyIGNvbnRlbnQgPSB0aGlzLl9mb3JtYXR0ZWRNZXNzYWdlOworICAgICAgICAgICAg dmFyIHJvb3QgPSBuZXcgVHJlZUVsZW1lbnQoY29udGVudCwgbnVsbCwgdHJ1ZSk7CisgICAgICAg ICAgICBjb250ZW50LnRyZWVFbGVtZW50Rm9yVGVzdCA9IHJvb3Q7CisgICAgICAgICAgICB0cmVl T3V0bGluZS5hcHBlbmRDaGlsZChyb290KTsKKyAgICAgICAgICAgIGlmICh0aGlzLnR5cGUgPT09 IFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlVHlwZS5UcmFjZSkKKyAgICAgICAg ICAgICAgICByb290LmV4cGFuZCgpOworCisgICAgICAgICAgICB0aGlzLl9wb3B1bGF0ZVN0YWNr VHJhY2VUcmVlRWxlbWVudChyb290KTsKKyAgICAgICAgICAgIHRoaXMuX2Zvcm1hdHRlZE1lc3Nh Z2UgPSBvbDsKICAgICAgICAgfQogCiAgICAgICAgIC8vIFRoaXMgaXMgdXNlZCBmb3IgaW5saW5l IG1lc3NhZ2UgYnViYmxlcyBpbiBTb3VyY2VGcmFtZXMsIG9yIG90aGVyIHBsYWluLXRleHQgcmVw cmVzZW50YXRpb25zLgpAQCAtMzg2LDggKzM3OCwxMSBAQCBXZWJJbnNwZWN0b3IuQ29uc29sZU1l c3NhZ2UucHJvdG90eXBlID0gewogICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuQ29uc29s ZU1lc3NhZ2UuTWVzc2FnZVNvdXJjZS5KUzoKICAgICAgICAgICAgICAgICBzb3VyY2VTdHJpbmcg PSAiSlMiOwogICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgY2FzZSBXZWJJbnNw ZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZVNvdXJjZS5DU1M6Ci0gICAgICAgICAgICAgICAg c291cmNlU3RyaW5nID0gIkNTUyI7CisgICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5Db25z b2xlTWVzc2FnZS5NZXNzYWdlU291cmNlLk5ldHdvcms6CisgICAgICAgICAgICAgICAgc291cmNl U3RyaW5nID0gIk5ldHdvcmsiOworICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAg Y2FzZSBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZVNvdXJjZS5Db25zb2xlQVBJ OgorICAgICAgICAgICAgICAgIHNvdXJjZVN0cmluZyA9ICJDb25zb2xlQVBJIjsKICAgICAgICAg ICAgICAgICBicmVhazsKICAgICAgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNz YWdlLk1lc3NhZ2VTb3VyY2UuT3RoZXI6CiAgICAgICAgICAgICAgICAgc291cmNlU3RyaW5nID0g Ik90aGVyIjsKQEAgLTM5NywxMiArMzkyLDEzIEBAIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2Fn ZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIHZhciB0eXBlU3RyaW5nOwogICAgICAgICBzd2l0Y2gg KHRoaXMudHlwZSkgewogICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3Nh Z2UuTWVzc2FnZVR5cGUuTG9nOgotICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuQ29uc29s ZU1lc3NhZ2UuTWVzc2FnZVR5cGUuVW5jYXVnaHRFeGNlcHRpb246Ci0gICAgICAgICAgICBjYXNl IFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlVHlwZS5OZXR3b3JrRXJyb3I6CiAg ICAgICAgICAgICAgICAgdHlwZVN0cmluZyA9ICJMb2ciOwogICAgICAgICAgICAgICAgIGJyZWFr OwotICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZVR5 cGUuT2JqZWN0OgotICAgICAgICAgICAgICAgIHR5cGVTdHJpbmcgPSAiT2JqZWN0IjsKKyAgICAg ICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLk1lc3NhZ2VUeXBlLkRpcjoK KyAgICAgICAgICAgICAgICB0eXBlU3RyaW5nID0gIkRpciI7CisgICAgICAgICAgICAgICAgYnJl YWs7CisgICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdl VHlwZS5EaXJYTUw6CisgICAgICAgICAgICAgICAgdHlwZVN0cmluZyA9ICJEaXIgWE1MIjsKICAg ICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLkNvbnNv bGVNZXNzYWdlLk1lc3NhZ2VUeXBlLlRyYWNlOgogICAgICAgICAgICAgICAgIHR5cGVTdHJpbmcg PSAiVHJhY2UiOwpAQCAtNDg4LDIwICs0ODQsMjAgQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNz YWdlLk1lc3NhZ2VTb3VyY2UgPSB7CiAgICAgSFRNTDogImh0bWwiLAogICAgIFhNTDogInhtbCIs CiAgICAgSlM6ICJqYXZhc2NyaXB0IiwKLSAgICBDU1M6ICJjc3MiLAorICAgIE5ldHdvcms6ICJu ZXR3b3JrIiwKKyAgICBDb25zb2xlQVBJOiAiY29uc29sZS1hcGkiLAogICAgIE90aGVyOiAib3Ro ZXIiCiB9CiAKIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlVHlwZSA9IHsKICAg ICBMb2c6ICJsb2ciLAotICAgIE9iamVjdDogIm90aGVyIiwKKyAgICBEaXI6ICJkaXIiLAorICAg IERpclhNTDogImRpcnhtbCIsCiAgICAgVHJhY2U6ICJ0cmFjZSIsCiAgICAgU3RhcnRHcm91cDog InN0YXJ0R3JvdXAiLAogICAgIFN0YXJ0R3JvdXBDb2xsYXBzZWQ6ICJzdGFydEdyb3VwQ29sbGFw c2VkIiwKICAgICBFbmRHcm91cDogImVuZEdyb3VwIiwKICAgICBBc3NlcnQ6ICJhc3NlcnQiLAot ICAgIFVuY2F1Z2h0RXhjZXB0aW9uOiAidW5jYXVnaHRFeGNlcHRpb24iLAotICAgIE5ldHdvcmtF cnJvcjogIm5ldHdvcmtFcnJvciIsCiAgICAgUmVzdWx0OiAicmVzdWx0IgogfQogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnNvbGUuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFn ZS9Db25zb2xlLmNwcAppbmRleCA5NWZkYjM5OTA0ZTE0MTdmNjQ1NTFmYTE1ZDBiMGJjNzA0YzRk ZTJmLi43NGRmZTc0YWIyNDI5NGJlM2I1ZTdkY2I3ZWZhOGZjYmUzNDI5MWJiIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnNvbGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvQ29uc29sZS5jcHAKQEAgLTk1LDggKzk1LDExIEBAIHN0YXRpYyB2b2lkIHByaW50TWVzc2Fn ZVNvdXJjZUFuZExldmVsUHJlZml4KE1lc3NhZ2VTb3VyY2Ugc291cmNlLCBNZXNzYWdlTGV2ZWwK ICAgICBjYXNlIEpTTWVzc2FnZVNvdXJjZToKICAgICAgICAgc291cmNlU3RyaW5nID0gIkpTIjsK ICAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBDU1NNZXNzYWdlU291cmNlOgotICAgICAgICBzb3Vy Y2VTdHJpbmcgPSAiQ1NTIjsKKyAgICBjYXNlIE5ldHdvcmtNZXNzYWdlU291cmNlOgorICAgICAg ICBzb3VyY2VTdHJpbmcgPSAiTkVUV09SSyI7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgQ29u c29sZUFQSU1lc3NhZ2VTb3VyY2U6CisgICAgICAgIHNvdXJjZVN0cmluZyA9ICJDT05TT0xFQVBJ IjsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBPdGhlck1lc3NhZ2VTb3VyY2U6CiAgICAgICAg IHNvdXJjZVN0cmluZyA9ICJPVEhFUiI7CkBAIC0xNzYsNyArMTc5LDcgQEAgdm9pZCBDb25zb2xl OjphZGRNZXNzYWdlKE1lc3NhZ2VUeXBlIHR5cGUsIE1lc3NhZ2VMZXZlbCBsZXZlbCwgUGFzc1Jl ZlB0cjxTY3JpcHQKIAogICAgIGlmIChDb25zb2xlOjpzaG91bGRQcmludEV4Y2VwdGlvbnMoKSkg ewogICAgICAgICBwcmludFNvdXJjZVVSTEFuZExpbmUobGFzdENhbGxlci5zb3VyY2VVUkwoKSwg MCk7Ci0gICAgICAgIHByaW50TWVzc2FnZVNvdXJjZUFuZExldmVsUHJlZml4KEpTTWVzc2FnZVNv dXJjZSwgbGV2ZWwpOworICAgICAgICBwcmludE1lc3NhZ2VTb3VyY2VBbmRMZXZlbFByZWZpeChD b25zb2xlQVBJTWVzc2FnZVNvdXJjZSwgbGV2ZWwpOwogCiAgICAgICAgIGZvciAodW5zaWduZWQg aSA9IDA7IGkgPCBhcmd1bWVudHMtPmFyZ3VtZW50Q291bnQoKTsgKytpKSB7CiAgICAgICAgICAg ICBTdHJpbmcgYXJnQXNTdHJpbmc7CkBAIC0xODgsOSArMTkxLDkgQEAgdm9pZCBDb25zb2xlOjph ZGRNZXNzYWdlKE1lc3NhZ2VUeXBlIHR5cGUsIE1lc3NhZ2VMZXZlbCBsZXZlbCwgUGFzc1JlZlB0 cjxTY3JpcHQKIAogICAgIFN0cmluZyBtZXNzYWdlOwogICAgIGlmIChhcmd1bWVudHMtPmdldEZp cnN0QXJndW1lbnRBc1N0cmluZyhtZXNzYWdlKSkKLSAgICAgICAgcGFnZS0+Y2hyb21lKCktPmNs aWVudCgpLT5hZGRNZXNzYWdlVG9Db25zb2xlKEpTTWVzc2FnZVNvdXJjZSwgdHlwZSwgbGV2ZWws IG1lc3NhZ2UsIGxhc3RDYWxsZXIubGluZU51bWJlcigpLCBsYXN0Q2FsbGVyLnNvdXJjZVVSTCgp KTsKKyAgICAgICAgcGFnZS0+Y2hyb21lKCktPmNsaWVudCgpLT5hZGRNZXNzYWdlVG9Db25zb2xl KENvbnNvbGVBUElNZXNzYWdlU291cmNlLCB0eXBlLCBsZXZlbCwgbWVzc2FnZSwgbGFzdENhbGxl ci5saW5lTnVtYmVyKCksIGxhc3RDYWxsZXIuc291cmNlVVJMKCkpOwogCi0gICAgSW5zcGVjdG9y SW5zdHJ1bWVudGF0aW9uOjphZGRNZXNzYWdlVG9Db25zb2xlKHBhZ2UsIEpTTWVzc2FnZVNvdXJj ZSwgdHlwZSwgbGV2ZWwsIG1lc3NhZ2UsIGFyZ3VtZW50cywgY2FsbFN0YWNrKTsKKyAgICBJbnNw ZWN0b3JJbnN0cnVtZW50YXRpb246OmFkZE1lc3NhZ2VUb0NvbnNvbGUocGFnZSwgQ29uc29sZUFQ SU1lc3NhZ2VTb3VyY2UsIHR5cGUsIGxldmVsLCBtZXNzYWdlLCBhcmd1bWVudHMsIGNhbGxTdGFj ayk7CiB9CiAKIHZvaWQgQ29uc29sZTo6ZGVidWcoUGFzc1JlZlB0cjxTY3JpcHRBcmd1bWVudHM+ IGFyZ3VtZW50cywgUGFzc1JlZlB0cjxTY3JpcHRDYWxsU3RhY2s+IGNhbGxTdGFjaykKQEAgLTIx NiwxMyArMjE5LDEyIEBAIHZvaWQgQ29uc29sZTo6bG9nKFBhc3NSZWZQdHI8U2NyaXB0QXJndW1l bnRzPiBhcmd1bWVudHMsIFBhc3NSZWZQdHI8U2NyaXB0Q2FsbFN0CiAKIHZvaWQgQ29uc29sZTo6 ZGlyKFBhc3NSZWZQdHI8U2NyaXB0QXJndW1lbnRzPiBhcmd1bWVudHMsIFBhc3NSZWZQdHI8U2Ny aXB0Q2FsbFN0YWNrPiBjYWxsU3RhY2spCiB7Ci0gICAgYWRkTWVzc2FnZShPYmplY3RNZXNzYWdl VHlwZSwgTG9nTWVzc2FnZUxldmVsLCBhcmd1bWVudHMsIGNhbGxTdGFjayk7CisgICAgYWRkTWVz c2FnZShEaXJNZXNzYWdlVHlwZSwgTG9nTWVzc2FnZUxldmVsLCBhcmd1bWVudHMsIGNhbGxTdGFj ayk7CiB9CiAKIHZvaWQgQ29uc29sZTo6ZGlyeG1sKFBhc3NSZWZQdHI8U2NyaXB0QXJndW1lbnRz PiBhcmd1bWVudHMsIFBhc3NSZWZQdHI8U2NyaXB0Q2FsbFN0YWNrPiBjYWxsU3RhY2spCiB7Ci0g ICAgLy8gVGhlIHN0YW5kYXJkIGJlaGF2aW9yIG9mIG91ciBjb25zb2xlLmxvZyB3aWxsIHByaW50 IHRoZSBET00gdHJlZSBmb3Igbm9kZXMuCi0gICAgbG9nKGFyZ3VtZW50cywgY2FsbFN0YWNrKTsK KyAgICBhZGRNZXNzYWdlKERpclhNTE1lc3NhZ2VUeXBlLCBMb2dNZXNzYWdlTGV2ZWwsIGFyZ3Vt ZW50cywgY2FsbFN0YWNrKTsKIH0KIAogdm9pZCBDb25zb2xlOjp0cmFjZShQYXNzUmVmUHRyPFNj cmlwdEFyZ3VtZW50cz4gYXJndW1lbnRzLCBQYXNzUmVmUHRyPFNjcmlwdENhbGxTdGFjaz4gcHJw Q2FsbFN0YWNrKQpAQCAtMzE2LDE3ICszMTgsMTcgQEAgdm9pZCBDb25zb2xlOjp0aW1lU3RhbXAo UGFzc1JlZlB0cjxTY3JpcHRBcmd1bWVudHM+IGFyZ3VtZW50cywgUGFzc1JlZlB0cjxTY3JpcHQK IAogdm9pZCBDb25zb2xlOjpncm91cChQYXNzUmVmUHRyPFNjcmlwdEFyZ3VtZW50cz4gYXJndW1l bnRzLCBQYXNzUmVmUHRyPFNjcmlwdENhbGxTdGFjaz4gY2FsbFN0YWNrKQogewotICAgIEluc3Bl Y3Rvckluc3RydW1lbnRhdGlvbjo6YWRkTWVzc2FnZVRvQ29uc29sZShwYWdlKCksIEpTTWVzc2Fn ZVNvdXJjZSwgU3RhcnRHcm91cE1lc3NhZ2VUeXBlLCBMb2dNZXNzYWdlTGV2ZWwsIFN0cmluZygp LCBhcmd1bWVudHMsIGNhbGxTdGFjayk7CisgICAgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjph ZGRNZXNzYWdlVG9Db25zb2xlKHBhZ2UoKSwgQ29uc29sZUFQSU1lc3NhZ2VTb3VyY2UsIFN0YXJ0 R3JvdXBNZXNzYWdlVHlwZSwgTG9nTWVzc2FnZUxldmVsLCBTdHJpbmcoKSwgYXJndW1lbnRzLCBj YWxsU3RhY2spOwogfQogCiB2b2lkIENvbnNvbGU6Omdyb3VwQ29sbGFwc2VkKFBhc3NSZWZQdHI8 U2NyaXB0QXJndW1lbnRzPiBhcmd1bWVudHMsIFBhc3NSZWZQdHI8U2NyaXB0Q2FsbFN0YWNrPiBj YWxsU3RhY2spCiB7Ci0gICAgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjphZGRNZXNzYWdlVG9D b25zb2xlKHBhZ2UoKSwgSlNNZXNzYWdlU291cmNlLCBTdGFydEdyb3VwQ29sbGFwc2VkTWVzc2Fn ZVR5cGUsIExvZ01lc3NhZ2VMZXZlbCwgU3RyaW5nKCksIGFyZ3VtZW50cywgY2FsbFN0YWNrKTsK KyAgICBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmFkZE1lc3NhZ2VUb0NvbnNvbGUocGFnZSgp LCBDb25zb2xlQVBJTWVzc2FnZVNvdXJjZSwgU3RhcnRHcm91cENvbGxhcHNlZE1lc3NhZ2VUeXBl LCBMb2dNZXNzYWdlTGV2ZWwsIFN0cmluZygpLCBhcmd1bWVudHMsIGNhbGxTdGFjayk7CiB9CiAK IHZvaWQgQ29uc29sZTo6Z3JvdXBFbmQoKQogewotICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlv bjo6YWRkTWVzc2FnZVRvQ29uc29sZShwYWdlKCksIEpTTWVzc2FnZVNvdXJjZSwgRW5kR3JvdXBN ZXNzYWdlVHlwZSwgTG9nTWVzc2FnZUxldmVsLCBTdHJpbmcoKSwgMCwgU3RyaW5nKCkpOworICAg IEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6YWRkTWVzc2FnZVRvQ29uc29sZShwYWdlKCksIENv bnNvbGVBUElNZXNzYWdlU291cmNlLCBFbmRHcm91cE1lc3NhZ2VUeXBlLCBMb2dNZXNzYWdlTGV2 ZWwsIFN0cmluZygpLCAwLCBTdHJpbmcoKSk7CiB9CiAKIGJvb2wgQ29uc29sZTo6c2hvdWxkQ2Fw dHVyZUZ1bGxTdGFja1RyYWNlKCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvQ29uc29sZVR5cGVzLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnNvbGVUeXBlcy5oCmlu ZGV4IDA3MjFiMzZmMmFiODE0NDAzYTlhN2I5MGMwOTQxNjNiOWRjMjE5ZTYuLjhiNDQwMzBjNjkz NmE3Y2U5MDQ2N2Y0ZmRkOTJmYjFjZWQ0ZTNlNDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvQ29uc29sZVR5cGVzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9Db25zb2xlVHlw ZXMuaApAQCAtMzIsMjAgKzMyLDIyIEBAIGVudW0gTWVzc2FnZVNvdXJjZSB7CiAgICAgSFRNTE1l c3NhZ2VTb3VyY2UsCiAgICAgWE1MTWVzc2FnZVNvdXJjZSwKICAgICBKU01lc3NhZ2VTb3VyY2Us Ci0gICAgQ1NTTWVzc2FnZVNvdXJjZSwKLSAgICBPdGhlck1lc3NhZ2VTb3VyY2UKKyAgICBOZXR3 b3JrTWVzc2FnZVNvdXJjZSwKKyAgICBDb25zb2xlQVBJTWVzc2FnZVNvdXJjZSwKKyAgICBPdGhl ck1lc3NhZ2VTb3VyY2UsCiB9OwogCisvLyBGSVhNRTogbWFrZSB0aGlzIGVudW0gcHJpdmF0ZSB0 byBpbnNwZWN0b3IsIHJlbW92ZSBpdCBmcm9tIGNsaWVudCBjYWxsYmFja3MuCisvLyBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjYzNzEKIGVudW0gTWVzc2FnZVR5cGUg ewogICAgIExvZ01lc3NhZ2VUeXBlLAotICAgIE9iamVjdE1lc3NhZ2VUeXBlLAorICAgIERpck1l c3NhZ2VUeXBlLAorICAgIERpclhNTE1lc3NhZ2VUeXBlLAogICAgIFRyYWNlTWVzc2FnZVR5cGUs CiAgICAgU3RhcnRHcm91cE1lc3NhZ2VUeXBlLAogICAgIFN0YXJ0R3JvdXBDb2xsYXBzZWRNZXNz YWdlVHlwZSwKICAgICBFbmRHcm91cE1lc3NhZ2VUeXBlLAotICAgIEFzc2VydE1lc3NhZ2VUeXBl LAotICAgIFVuY2F1Z2h0RXhjZXB0aW9uTWVzc2FnZVR5cGUsCi0gICAgTmV0d29ya0Vycm9yTWVz c2FnZVR5cGUKKyAgICBBc3NlcnRNZXNzYWdlVHlwZQogfTsKIAogZW51bSBNZXNzYWdlTGV2ZWwg ewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvd2Vic29ja2V0cy9XZWJTb2NrZXRDaGFubmVs LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3dlYnNvY2tldHMvV2ViU29ja2V0Q2hhbm5lbC5jcHAKaW5k ZXggYzExMzViNTljMTJkODljOWFhN2VjNDQyNGJkMTY5M2U3ZjE4NDlmMS4uNzcwODY1ZjQ2MDY3 ZTY2MjUxOGEwYzM5NDM5MzRiOGEzNzEyMjAxYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv d2Vic29ja2V0cy9XZWJTb2NrZXRDaGFubmVsLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS93ZWJz b2NrZXRzL1dlYlNvY2tldENoYW5uZWwuY3BwCkBAIC0zMzMsNyArMzMzLDcgQEAgdm9pZCBXZWJT b2NrZXRDaGFubmVsOjpkaWRGYWlsU29ja2V0U3RyZWFtKFNvY2tldFN0cmVhbUhhbmRsZSogaGFu ZGxlLCBjb25zdCBTb2MKICAgICAgICAgQVNTRVJUKGZhaWxpbmdVUkwuaXNOdWxsKCkgfHwgbV9o YW5kc2hha2UtPnVybCgpLnN0cmluZygpID09IGZhaWxpbmdVUkwpOwogICAgICAgICBpZiAoZmFp bGluZ1VSTC5pc051bGwoKSkKICAgICAgICAgICAgIGZhaWxpbmdVUkwgPSBtX2hhbmRzaGFrZS0+ dXJsKCkuc3RyaW5nKCk7Ci0gICAgICAgIG1fY29udGV4dC0+YWRkTWVzc2FnZShPdGhlck1lc3Nh Z2VTb3VyY2UsIE5ldHdvcmtFcnJvck1lc3NhZ2VUeXBlLCBFcnJvck1lc3NhZ2VMZXZlbCwgbWVz c2FnZSwgMCwgZmFpbGluZ1VSTCwgMCk7CisgICAgICAgIG1fY29udGV4dC0+YWRkTWVzc2FnZShO ZXR3b3JrTWVzc2FnZVNvdXJjZSwgTG9nTWVzc2FnZVR5cGUsIEVycm9yTWVzc2FnZUxldmVsLCBt ZXNzYWdlLCAwLCBmYWlsaW5nVVJMLCAwKTsKICAgICB9CiAgICAgbV9zaG91bGREaXNjYXJkUmVj ZWl2ZWREYXRhID0gdHJ1ZTsKICAgICBoYW5kbGUtPmRpc2Nvbm5lY3QoKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxv ZwppbmRleCBmMGNjMTMzYWZhZDY0ZWI0NDg5ODRlZGNmZmUyNWM0NTY0N2MxYWE3Li5mYTBkNmYz MWU5M2RlYWIzYmZjZTFkMzkyZmU1ZTg5ODUyOGM3NzE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L21hYy9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMjIgQEAKKzIwMTEtMDktMTkgIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUu Y29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IHN0cmVhbWxpbmUgQ29uc29sZSdzIE1lc3Nh Z2VUeXBlIGFuZCBNZXNzYWdlU291cmNlIHNlbWFudGljcy4KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY4MzQyCisKKyAgICAgICAgVGhpcyBjaGFuZ2Ug Zml4ZXMgc2VtYW50aWNzIG9mIHRoZSBNZXNzYWdlU291cmNlIGFuZCBNZXNzYWdlVHlwZToKKyAg ICAgICAgTWVzc2FnZVNvdXJjZSBpcyBub3cgdGhlIHNvdXJjZSBvZiB0aGUgbWVzc2FnZSAoYmUg aXQgTmV0d29yaywgSFRNTAorICAgICAgICBwYXJzZXIgb3IgQ29uc29sZSBBUEkpLiBNZXNzYWdl VHlwZSBpcyBvbmx5IGRlZmluZWQgZm9yIHRoZSBDb25zb2xlIEFQSQorICAgICAgICBtZXNzYWdl cyBhbmQgY29udGFpbnMgdGhlIG5hbWUgb2YgdGhlIEFQSSBjYWxsIChsb2csIGRpciwgZGlyeG1s LCBldGMuKS4gCisgICAgICAgIFN1YnNlcXVlbnQgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTY2MzcxIHdpbGwgbWFrZSBNZXNzYWdlVHlwZQorICAgICAgICBwcml2YXRl IHRvIHRoZSBpbnNwZWN0b3IuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQubW06CisgICAgICAg IChzdHJpbmdGb3JNZXNzYWdlU291cmNlKToKKyAgICAgICAgKHN0cmluZ0Zvck1lc3NhZ2VUeXBl KToKKyAgICAgICAgKiBXZWJWaWV3L1dlYlVJRGVsZWdhdGVQcml2YXRlLmg6CisKIDIwMTEtMDkt MTcgIE1paGFpIFBhcnBhcml0YSAgPG1paGFpcEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgRnJh bWVMb2FkZXJDbGllbnQgQmFja0ZvcndhcmRMaXN0LXJlbGF0ZWQgbWV0aG9kcyBhcmUgdW5zdWVk CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVD bGllbnQubW0gYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGll bnQubW0KaW5kZXggNDAzNjA1YmI4ZGJkNjhlMDc3Nzg2Zjg3M2YwY2FlZmEwMjAwOGVmYi4uZmU0 MTQyY2RlOTY5MDU1OTY3MmRmZmE0NmUzN2UyNGRkNTg4NDQ3NiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50Lm1tCisrKyBiL1NvdXJj ZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5tbQpAQCAtODgsMTgg Kzg4LDE4IEBACiBOU1N0cmluZyAqV2ViQ29uc29sZU1lc3NhZ2VIVE1MTWVzc2FnZVNvdXJjZSA9 IEAiSFRNTE1lc3NhZ2VTb3VyY2UiOwogTlNTdHJpbmcgKldlYkNvbnNvbGVNZXNzYWdlWE1MTWVz c2FnZVNvdXJjZSA9IEAiWE1MTWVzc2FnZVNvdXJjZSI7CiBOU1N0cmluZyAqV2ViQ29uc29sZU1l c3NhZ2VKU01lc3NhZ2VTb3VyY2UgPSBAIkpTTWVzc2FnZVNvdXJjZSI7Ci1OU1N0cmluZyAqV2Vi Q29uc29sZU1lc3NhZ2VDU1NNZXNzYWdlU291cmNlID0gQCJDU1NNZXNzYWdlU291cmNlIjsKK05T U3RyaW5nICpXZWJDb25zb2xlTWVzc2FnZU5ldHdvcmtNZXNzYWdlU291cmNlID0gQCJOZXR3b3Jr TWVzc2FnZVNvdXJjZSI7CitOU1N0cmluZyAqV2ViQ29uc29sZU1lc3NhZ2VDb25zb2xlQVBJTWVz c2FnZVNvdXJjZSA9IEAiQ29uc29sZUFQSU1lc3NhZ2VTb3VyY2UiOwogTlNTdHJpbmcgKldlYkNv bnNvbGVNZXNzYWdlT3RoZXJNZXNzYWdlU291cmNlID0gQCJPdGhlck1lc3NhZ2VTb3VyY2UiOwog CiBOU1N0cmluZyAqV2ViQ29uc29sZU1lc3NhZ2VMb2dNZXNzYWdlVHlwZSA9IEAiTG9nTWVzc2Fn ZVR5cGUiOwotTlNTdHJpbmcgKldlYkNvbnNvbGVNZXNzYWdlT2JqZWN0TWVzc2FnZVR5cGUgPSBA Ik9iamVjdE1lc3NhZ2VUeXBlIjsKK05TU3RyaW5nICpXZWJDb25zb2xlTWVzc2FnZURpck1lc3Nh Z2VUeXBlID0gQCJEaXJNZXNzYWdlVHlwZSI7CitOU1N0cmluZyAqV2ViQ29uc29sZU1lc3NhZ2VE aXJYTUxNZXNzYWdlVHlwZSA9IEAiRGlyWE1MTWVzc2FnZVR5cGUiOwogTlNTdHJpbmcgKldlYkNv bnNvbGVNZXNzYWdlVHJhY2VNZXNzYWdlVHlwZSA9IEAiVHJhY2VNZXNzYWdlVHlwZSI7CiBOU1N0 cmluZyAqV2ViQ29uc29sZU1lc3NhZ2VTdGFydEdyb3VwTWVzc2FnZVR5cGUgPSBAIlN0YXJ0R3Jv dXBNZXNzYWdlVHlwZSI7CiBOU1N0cmluZyAqV2ViQ29uc29sZU1lc3NhZ2VTdGFydEdyb3VwQ29s bGFwc2VkTWVzc2FnZVR5cGUgPSBAIlN0YXJ0R3JvdXBDb2xsYXBzZWRNZXNzYWdlVHlwZSI7CiBO U1N0cmluZyAqV2ViQ29uc29sZU1lc3NhZ2VFbmRHcm91cE1lc3NhZ2VUeXBlID0gQCJFbmRHcm91 cE1lc3NhZ2VUeXBlIjsKIE5TU3RyaW5nICpXZWJDb25zb2xlTWVzc2FnZUFzc2VydE1lc3NhZ2VU eXBlID0gQCJBc3NlcnRNZXNzYWdlVHlwZSI7Ci1OU1N0cmluZyAqV2ViQ29uc29sZU1lc3NhZ2VV bmNhdWdodEV4Y2VwdGlvbk1lc3NhZ2VUeXBlID0gQCJVbmNhdWdodEV4Y2VwdGlvbk1lc3NhZ2VU eXBlIjsKLU5TU3RyaW5nICpXZWJDb25zb2xlTWVzc2FnZU5ldHdvcmtFcnJvck1lc3NhZ2VUeXBl ID0gQCJOZXR3b3JrRXJyb3JNZXNzYWdlVHlwZSI7CiAKIE5TU3RyaW5nICpXZWJDb25zb2xlTWVz c2FnZVRpcE1lc3NhZ2VMZXZlbCA9IEAiVGlwTWVzc2FnZUxldmVsIjsKIE5TU3RyaW5nICpXZWJD b25zb2xlTWVzc2FnZUxvZ01lc3NhZ2VMZXZlbCA9IEAiTG9nTWVzc2FnZUxldmVsIjsKQEAgLTM1 Nyw4ICszNTcsMTAgQEAgaW5saW5lIHN0YXRpYyBOU1N0cmluZyAqc3RyaW5nRm9yTWVzc2FnZVNv dXJjZShNZXNzYWdlU291cmNlIHNvdXJjZSkKICAgICAgICAgcmV0dXJuIFdlYkNvbnNvbGVNZXNz YWdlWE1MTWVzc2FnZVNvdXJjZTsKICAgICBjYXNlIEpTTWVzc2FnZVNvdXJjZToKICAgICAgICAg cmV0dXJuIFdlYkNvbnNvbGVNZXNzYWdlSlNNZXNzYWdlU291cmNlOwotICAgIGNhc2UgQ1NTTWVz c2FnZVNvdXJjZToKLSAgICAgICAgcmV0dXJuIFdlYkNvbnNvbGVNZXNzYWdlQ1NTTWVzc2FnZVNv dXJjZTsKKyAgICBjYXNlIE5ldHdvcmtNZXNzYWdlU291cmNlOgorICAgICAgICByZXR1cm4gV2Vi Q29uc29sZU1lc3NhZ2VOZXR3b3JrTWVzc2FnZVNvdXJjZTsKKyAgICBjYXNlIENvbnNvbGVBUElN ZXNzYWdlU291cmNlOgorICAgICAgICByZXR1cm4gV2ViQ29uc29sZU1lc3NhZ2VDb25zb2xlQVBJ TWVzc2FnZVNvdXJjZTsKICAgICBjYXNlIE90aGVyTWVzc2FnZVNvdXJjZToKICAgICAgICAgcmV0 dXJuIFdlYkNvbnNvbGVNZXNzYWdlT3RoZXJNZXNzYWdlU291cmNlOwogICAgIH0KQEAgLTM3MSw4 ICszNzMsMTAgQEAgaW5saW5lIHN0YXRpYyBOU1N0cmluZyAqc3RyaW5nRm9yTWVzc2FnZVR5cGUo TWVzc2FnZVR5cGUgdHlwZSkKICAgICBzd2l0Y2ggKHR5cGUpIHsKICAgICBjYXNlIExvZ01lc3Nh Z2VUeXBlOgogICAgICAgICByZXR1cm4gV2ViQ29uc29sZU1lc3NhZ2VMb2dNZXNzYWdlVHlwZTsK LSAgICBjYXNlIE9iamVjdE1lc3NhZ2VUeXBlOgotICAgICAgICByZXR1cm4gV2ViQ29uc29sZU1l c3NhZ2VPYmplY3RNZXNzYWdlVHlwZTsKKyAgICBjYXNlIERpck1lc3NhZ2VUeXBlOgorICAgICAg ICByZXR1cm4gV2ViQ29uc29sZU1lc3NhZ2VEaXJNZXNzYWdlVHlwZTsKKyAgICBjYXNlIERpclhN TE1lc3NhZ2VUeXBlOgorICAgICAgICByZXR1cm4gV2ViQ29uc29sZU1lc3NhZ2VEaXJYTUxNZXNz YWdlVHlwZTsKICAgICBjYXNlIFRyYWNlTWVzc2FnZVR5cGU6CiAgICAgICAgIHJldHVybiBXZWJD b25zb2xlTWVzc2FnZVRyYWNlTWVzc2FnZVR5cGU7CiAgICAgY2FzZSBTdGFydEdyb3VwTWVzc2Fn ZVR5cGU6CkBAIC0zODMsMTAgKzM4Nyw2IEBAIGlubGluZSBzdGF0aWMgTlNTdHJpbmcgKnN0cmlu Z0Zvck1lc3NhZ2VUeXBlKE1lc3NhZ2VUeXBlIHR5cGUpCiAgICAgICAgIHJldHVybiBXZWJDb25z b2xlTWVzc2FnZUVuZEdyb3VwTWVzc2FnZVR5cGU7CiAgICAgY2FzZSBBc3NlcnRNZXNzYWdlVHlw ZToKICAgICAgICAgcmV0dXJuIFdlYkNvbnNvbGVNZXNzYWdlQXNzZXJ0TWVzc2FnZVR5cGU7Ci0g ICAgY2FzZSBVbmNhdWdodEV4Y2VwdGlvbk1lc3NhZ2VUeXBlOgotICAgICAgICByZXR1cm4gV2Vi Q29uc29sZU1lc3NhZ2VVbmNhdWdodEV4Y2VwdGlvbk1lc3NhZ2VUeXBlOwotICAgIGNhc2UgTmV0 d29ya0Vycm9yTWVzc2FnZVR5cGU6Ci0gICAgICAgIHJldHVybiBXZWJDb25zb2xlTWVzc2FnZU5l dHdvcmtFcnJvck1lc3NhZ2VUeXBlOwogICAgIH0KICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsK ICAgICByZXR1cm4gQCIiOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9X ZWJVSURlbGVnYXRlUHJpdmF0ZS5oIGIvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJVSURl bGVnYXRlUHJpdmF0ZS5oCmluZGV4IDM3MDQxZDQwOTBlZGE2Yzg2MTNmNDVlZmZiNGUyNjg1ZjAy NGU2MWYuLjljOThmZGZjYzkwODNiOWQ1YTU4NDdjNzEzMTVjY2ExM2U5Zjk5YzMgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVUlEZWxlZ2F0ZVByaXZhdGUuaAorKysg Yi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlVJRGVsZWdhdGVQcml2YXRlLmgKQEAgLTk2 LDE5ICs5NiwxOSBAQCBlbnVtIHsKIGV4dGVybiBOU1N0cmluZyAqV2ViQ29uc29sZU1lc3NhZ2VI VE1MTWVzc2FnZVNvdXJjZTsKIGV4dGVybiBOU1N0cmluZyAqV2ViQ29uc29sZU1lc3NhZ2VYTUxN ZXNzYWdlU291cmNlOwogZXh0ZXJuIE5TU3RyaW5nICpXZWJDb25zb2xlTWVzc2FnZUpTTWVzc2Fn ZVNvdXJjZTsKLWV4dGVybiBOU1N0cmluZyAqV2ViQ29uc29sZU1lc3NhZ2VDU1NNZXNzYWdlU291 cmNlOworZXh0ZXJuIE5TU3RyaW5nICpXZWJDb25zb2xlTWVzc2FnZU5ldHdvcmtNZXNzYWdlU291 cmNlOworZXh0ZXJuIE5TU3RyaW5nICpXZWJDb25zb2xlTWVzc2FnZUNvbnNvbGVBUElNZXNzYWdl U291cmNlOwogZXh0ZXJuIE5TU3RyaW5nICpXZWJDb25zb2xlTWVzc2FnZU90aGVyTWVzc2FnZVNv dXJjZTsKIAogLy8gTWVzc2FnZSBUeXBlcy4KIGV4dGVybiBOU1N0cmluZyAqV2ViQ29uc29sZU1l c3NhZ2VMb2dNZXNzYWdlVHlwZTsKLWV4dGVybiBOU1N0cmluZyAqV2ViQ29uc29sZU1lc3NhZ2VP YmplY3RNZXNzYWdlVHlwZTsKK2V4dGVybiBOU1N0cmluZyAqV2ViQ29uc29sZU1lc3NhZ2VEaXJN ZXNzYWdlVHlwZTsKK2V4dGVybiBOU1N0cmluZyAqV2ViQ29uc29sZU1lc3NhZ2VEaXJYTUxNZXNz YWdlVHlwZTsKIGV4dGVybiBOU1N0cmluZyAqV2ViQ29uc29sZU1lc3NhZ2VUcmFjZU1lc3NhZ2VU eXBlOwogZXh0ZXJuIE5TU3RyaW5nICpXZWJDb25zb2xlTWVzc2FnZVN0YXJ0R3JvdXBNZXNzYWdl VHlwZTsKIGV4dGVybiBOU1N0cmluZyAqV2ViQ29uc29sZU1lc3NhZ2VTdGFydEdyb3VwQ29sbGFw c2VkTWVzc2FnZVR5cGU7CiBleHRlcm4gTlNTdHJpbmcgKldlYkNvbnNvbGVNZXNzYWdlRW5kR3Jv dXBNZXNzYWdlVHlwZTsKIGV4dGVybiBOU1N0cmluZyAqV2ViQ29uc29sZU1lc3NhZ2VBc3NlcnRN ZXNzYWdlVHlwZTsKLWV4dGVybiBOU1N0cmluZyAqV2ViQ29uc29sZU1lc3NhZ2VVbmNhdWdodEV4 Y2VwdGlvbk1lc3NhZ2VUeXBlOwotZXh0ZXJuIE5TU3RyaW5nICpXZWJDb25zb2xlTWVzc2FnZU5l dHdvcmtFcnJvck1lc3NhZ2VUeXBlOwogCiAvLyBNZXNzYWdlIExldmVscy4KIGV4dGVybiBOU1N0 cmluZyAqV2ViQ29uc29sZU1lc3NhZ2VUaXBNZXNzYWdlTGV2ZWw7Cg==