Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1jniUY-0007PN-GT for pgsql-hackers@arkaria.postgresql.org; Tue, 23 Jun 2020 12:57:35 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.92) (envelope-from ) id 1jniUX-0008Qg-87 for pgsql-hackers@arkaria.postgresql.org; Tue, 23 Jun 2020 12:57:33 +0000 Received: from makus.postgresql.org ([2001:4800:3e1:1::229]) by malur.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1jniUW-0008QY-2i for pgsql-hackers@lists.postgresql.org; Tue, 23 Jun 2020 12:57:33 +0000 Received: from forward5-smtp.messagingengine.com ([66.111.4.239]) by makus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1jniUS-0003NF-7u for pgsql-hackers@postgresql.org; Tue, 23 Jun 2020 12:57:30 +0000 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailforward.nyi.internal (Postfix) with ESMTP id 5DD1019407EA for ; Tue, 23 Jun 2020 08:57:26 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Tue, 23 Jun 2020 08:57:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:message-id :mime-version:subject:to:x-me-proxy:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm3; bh=OcIOli909J3utX4stl4IXhZjvp8bO /UGT2ggVJPFnFc=; b=OYwy8CiLSN/b5vU12CPPdlMgTa7Wqij4oxQbQAVqCDauG WZ08brh4ey4RRGIdIMxUFupwRHsCBEQngA3MP9sjE8hN9aWdN1KIQtXxTyzfLypY oxZJVP0au/yWzMIoAAhiTLHHsIvPfCF9W7rnagoORYnzP+dCBKYbSMVrT/vf9/ZQ GIIftemZ0y+IrxnkftSUukj/8xfajDZcfPIPLIkNiySiXUmWxi19Qn26MN4xCYWc GWzVcF87M3KQRGb3hb+gfnO+lj9OsNOoLZzUWb5jcwjqRxMqlHLZIrk+we9ya251 D3UPNDT+Q/rm4xTAlDVIz8SxXvVsxo0LxXYEPSdVA== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedrudekhedgfedtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefvhffuohfkffgfgggtsehmtderre dtfeejnecuhfhrohhmpefrvghtvghrucfgihhsvghnthhrrghuthcuoehpvghtvghrrdgv ihhsvghnthhrrghuthesvdhnughquhgrughrrghnthdrtghomheqnecuggftrfgrthhtvg hrnhepkeeileelfedttdelteekvefghefhvdeigfduteejtdeuuefgffdvleethfefuedv necuffhomhgrihhnpedvnhguqhhurggurhgrnhhtrdgtohhmnecukfhppeelfedrvdegfe drudeluddrvdefkeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhl fhhrohhmpehpvghtvghrrdgvihhsvghnthhrrghuthesvdhnughquhgrughrrghnthdrtg homh X-ME-Proxy: Received: from april.pezone.net (p5df3bfee.dip0.t-ipconnect.de [93.243.191.238]) by mail.messagingengine.com (Postfix) with ESMTPA id 21B2630674DD for ; Tue, 23 Jun 2020 08:57:24 -0400 (EDT) To: pgsql-hackers From: Peter Eisentraut Subject: some more pg_dump refactoring Organization: 2ndQuadrant Message-ID: <6594334b-40fd-14f1-6bc5-877afa3feed5@2ndquadrant.com> Date: Tue, 23 Jun 2020 14:57:23 +0200 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.14; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------7132AEAE61F49DC09CA3F107" Content-Language: en-US List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Precedence: bulk This is a multi-part message in MIME format. --------------7132AEAE61F49DC09CA3F107 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Here is a patch to reorganize dumpFunc() and dumpAgg() in pg_dump, similar to daa9fe8a5264a3f192efa5ddee8fb011ad9da365. Instead of repeating the almost same large query in each version branch, use one query and add a few columns to the SELECT list depending on the version. This saves a lot of duplication. I have tested this with various old versions of PostgreSQL I had available, but a bit more random testing with old versions would be welcome. -- Peter Eisentraut http://www.2ndQuadrant.com/ PostgreSQL Development, 24x7 Support, Remote DBA, Training & Services --------------7132AEAE61F49DC09CA3F107 Content-Type: text/plain; charset=UTF-8; x-mac-type="0"; x-mac-creator="0"; name="0001-pg_dump-Reorganize-dumpFunc-and-dumpAgg.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="0001-pg_dump-Reorganize-dumpFunc-and-dumpAgg.patch" RnJvbSAzOTdhM2VhMTQyNTIxZTU2MThiMjQ1MTA3ZDViNDAxMTM1ZDc2ZDNjIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQZXRlciBFaXNlbnRyYXV0IDxwZXRlckBlaXNlbnRy YXV0Lm9yZz4KRGF0ZTogVHVlLCAyMyBKdW4gMjAyMCAxNDozMjozMSArMDIwMApTdWJqZWN0 OiBbUEFUQ0hdIHBnX2R1bXA6IFJlb3JnYW5pemUgZHVtcEZ1bmMoKSBhbmQgZHVtcEFnZygp CgpTaW1pbGFyIHRvIGRhYTlmZThhNTI2NGEzZjE5MmVmYTVkZGVlOGZiMDExYWQ5ZGEzNjUs IGluc3RlYWQgb2YKcmVwZWF0aW5nIHRoZSBhbG1vc3Qgc2FtZSBsYXJnZSBxdWVyeSBpbiBl YWNoIHZlcnNpb24gYnJhbmNoLCB1c2Ugb25lCnF1ZXJ5IGFuZCBhZGQgYSBmZXcgY29sdW1u cyB0byB0aGUgU0VMRUNUIGxpc3QgZGVwZW5kaW5nIG9uIHRoZQp2ZXJzaW9uLiAgVGhpcyBz YXZlcyBhIGxvdCBvZiBkdXBsaWNhdGlvbi4KLS0tCiBzcmMvYmluL3BnX2R1bXAvcGdfZHVt cC5jIHwgNDg5ICsrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZp bGUgY2hhbmdlZCwgMTU0IGluc2VydGlvbnMoKyksIDMzNSBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9zcmMvYmluL3BnX2R1bXAvcGdfZHVtcC5jIGIvc3JjL2Jpbi9wZ19kdW1wL3Bn X2R1bXAuYwppbmRleCBhNDFhM2RiODc2Li5iOTQ3YmY4NmE3IDEwMDY0NAotLS0gYS9zcmMv YmluL3BnX2R1bXAvcGdfZHVtcC5jCisrKyBiL3NyYy9iaW4vcGdfZHVtcC9wZ19kdW1wLmMK QEAgLTExODQ3LDE3MSArMTE4NDcsODggQEAgZHVtcEZ1bmMoQXJjaGl2ZSAqZm91dCwgRnVu Y0luZm8gKmZpbmZvKQogCWFzUGFydCA9IGNyZWF0ZVBRRXhwQnVmZmVyKCk7CiAKIAkvKiBG ZXRjaCBmdW5jdGlvbi1zcGVjaWZpYyBkZXRhaWxzICovCisJYXBwZW5kUFFFeHBCdWZmZXIo cXVlcnksCisJCQkJCSAgIlNFTEVDVFxuIgorCQkJCQkgICJwcm9yZXRzZXQsXG4iCisJCQkJ CSAgInByb3NyYyxcbiIKKwkJCQkJICAicHJvYmluLFxuIgorCQkJCQkgICJwcm92b2xhdGls ZSxcbiIKKwkJCQkJICAicHJvaXNzdHJpY3QsXG4iCisJCQkJCSAgInByb3NlY2RlZixcbiIK KwkJCQkJICAiKFNFTEVDVCBsYW5uYW1lIEZST00gcGdfY2F0YWxvZy5wZ19sYW5ndWFnZSBX SEVSRSBvaWQgPSBwcm9sYW5nKSBBUyBsYW5uYW1lLFxuIik7CisKIAlpZiAoZm91dC0+cmVt b3RlVmVyc2lvbiA+PSAxMjAwMDApCi0JewotCQkvKgotCQkgKiBwcm9zdXBwb3J0IHdhcyBh ZGRlZCBpbiAxMgotCQkgKi8KIAkJYXBwZW5kUFFFeHBCdWZmZXIocXVlcnksCi0JCQkJCQkg ICJTRUxFQ1QgcHJvcmV0c2V0LCBwcm9zcmMsIHByb2JpbiwgIgotCQkJCQkJICAicGdfY2F0 YWxvZy5wZ19nZXRfZnVuY3Rpb25fYXJndW1lbnRzKG9pZCkgQVMgZnVuY2FyZ3MsICIKLQkJ CQkJCSAgInBnX2NhdGFsb2cucGdfZ2V0X2Z1bmN0aW9uX2lkZW50aXR5X2FyZ3VtZW50cyhv aWQpIEFTIGZ1bmNpYXJncywgIgotCQkJCQkJICAicGdfY2F0YWxvZy5wZ19nZXRfZnVuY3Rp b25fcmVzdWx0KG9pZCkgQVMgZnVuY3Jlc3VsdCwgIgotCQkJCQkJICAiYXJyYXlfdG9fc3Ry aW5nKHByb3RyZnR5cGVzLCAnICcpIEFTIHByb3RyZnR5cGVzLCAiCi0JCQkJCQkgICJwcm9r aW5kLCBwcm92b2xhdGlsZSwgcHJvaXNzdHJpY3QsIHByb3NlY2RlZiwgIgotCQkJCQkJICAi cHJvbGVha3Byb29mLCBwcm9jb25maWcsIHByb2Nvc3QsIHByb3Jvd3MsICIKLQkJCQkJCSAg InByb3N1cHBvcnQsIHByb3BhcmFsbGVsLCAiCi0JCQkJCQkgICIoU0VMRUNUIGxhbm5hbWUg RlJPTSBwZ19jYXRhbG9nLnBnX2xhbmd1YWdlIFdIRVJFIG9pZCA9IHByb2xhbmcpIEFTIGxh bm5hbWUgIgotCQkJCQkJICAiRlJPTSBwZ19jYXRhbG9nLnBnX3Byb2MgIgotCQkJCQkJICAi V0hFUkUgb2lkID0gJyV1Jzo6cGdfY2F0YWxvZy5vaWQiLAotCQkJCQkJICBmaW5mby0+ZG9i ai5jYXRJZC5vaWQpOwotCX0KLQllbHNlIGlmIChmb3V0LT5yZW1vdGVWZXJzaW9uID49IDEx MDAwMCkKLQl7Ci0JCS8qCi0JCSAqIHByb2tpbmQgd2FzIGFkZGVkIGluIDExCi0JCSAqLwor CQkJCQkJICAicHJvc3VwcG9ydCxcbiIpOworCWVsc2UKIAkJYXBwZW5kUFFFeHBCdWZmZXIo cXVlcnksCi0JCQkJCQkgICJTRUxFQ1QgcHJvcmV0c2V0LCBwcm9zcmMsIHByb2JpbiwgIgot CQkJCQkJICAicGdfY2F0YWxvZy5wZ19nZXRfZnVuY3Rpb25fYXJndW1lbnRzKG9pZCkgQVMg ZnVuY2FyZ3MsICIKLQkJCQkJCSAgInBnX2NhdGFsb2cucGdfZ2V0X2Z1bmN0aW9uX2lkZW50 aXR5X2FyZ3VtZW50cyhvaWQpIEFTIGZ1bmNpYXJncywgIgotCQkJCQkJICAicGdfY2F0YWxv Zy5wZ19nZXRfZnVuY3Rpb25fcmVzdWx0KG9pZCkgQVMgZnVuY3Jlc3VsdCwgIgotCQkJCQkJ ICAiYXJyYXlfdG9fc3RyaW5nKHByb3RyZnR5cGVzLCAnICcpIEFTIHByb3RyZnR5cGVzLCAi Ci0JCQkJCQkgICJwcm9raW5kLCBwcm92b2xhdGlsZSwgcHJvaXNzdHJpY3QsIHByb3NlY2Rl ZiwgIgotCQkJCQkJICAicHJvbGVha3Byb29mLCBwcm9jb25maWcsIHByb2Nvc3QsIHByb3Jv d3MsICIKLQkJCQkJCSAgIictJyBBUyBwcm9zdXBwb3J0LCBwcm9wYXJhbGxlbCwgIgotCQkJ CQkJICAiKFNFTEVDVCBsYW5uYW1lIEZST00gcGdfY2F0YWxvZy5wZ19sYW5ndWFnZSBXSEVS RSBvaWQgPSBwcm9sYW5nKSBBUyBsYW5uYW1lICIKLQkJCQkJCSAgIkZST00gcGdfY2F0YWxv Zy5wZ19wcm9jICIKLQkJCQkJCSAgIldIRVJFIG9pZCA9ICcldSc6OnBnX2NhdGFsb2cub2lk IiwKLQkJCQkJCSAgZmluZm8tPmRvYmouY2F0SWQub2lkKTsKLQl9Ci0JZWxzZSBpZiAoZm91 dC0+cmVtb3RlVmVyc2lvbiA+PSA5MDYwMCkKLQl7Ci0JCS8qCi0JCSAqIHByb3BhcmFsbGVs IHdhcyBhZGRlZCBpbiA5LjYKLQkJICovCisJCQkJCQkgICInLScgQVMgcHJvc3VwcG9ydCxc biIpOworCisJaWYgKGZvdXQtPnJlbW90ZVZlcnNpb24gPj0gMTEwMDAwKQogCQlhcHBlbmRQ UUV4cEJ1ZmZlcihxdWVyeSwKLQkJCQkJCSAgIlNFTEVDVCBwcm9yZXRzZXQsIHByb3NyYywg cHJvYmluLCAiCi0JCQkJCQkgICJwZ19jYXRhbG9nLnBnX2dldF9mdW5jdGlvbl9hcmd1bWVu dHMob2lkKSBBUyBmdW5jYXJncywgIgotCQkJCQkJICAicGdfY2F0YWxvZy5wZ19nZXRfZnVu Y3Rpb25faWRlbnRpdHlfYXJndW1lbnRzKG9pZCkgQVMgZnVuY2lhcmdzLCAiCi0JCQkJCQkg ICJwZ19jYXRhbG9nLnBnX2dldF9mdW5jdGlvbl9yZXN1bHQob2lkKSBBUyBmdW5jcmVzdWx0 LCAiCi0JCQkJCQkgICJhcnJheV90b19zdHJpbmcocHJvdHJmdHlwZXMsICcgJykgQVMgcHJv dHJmdHlwZXMsICIKLQkJCQkJCSAgIkNBU0UgV0hFTiBwcm9pc3dpbmRvdyBUSEVOICd3JyBF TFNFICdmJyBFTkQgQVMgcHJva2luZCwgIgotCQkJCQkJICAicHJvdm9sYXRpbGUsIHByb2lz c3RyaWN0LCBwcm9zZWNkZWYsICIKLQkJCQkJCSAgInByb2xlYWtwcm9vZiwgcHJvY29uZmln LCBwcm9jb3N0LCBwcm9yb3dzLCAiCi0JCQkJCQkgICInLScgQVMgcHJvc3VwcG9ydCwgcHJv cGFyYWxsZWwsICIKLQkJCQkJCSAgIihTRUxFQ1QgbGFubmFtZSBGUk9NIHBnX2NhdGFsb2cu cGdfbGFuZ3VhZ2UgV0hFUkUgb2lkID0gcHJvbGFuZykgQVMgbGFubmFtZSAiCi0JCQkJCQkg ICJGUk9NIHBnX2NhdGFsb2cucGdfcHJvYyAiCi0JCQkJCQkgICJXSEVSRSBvaWQgPSAnJXUn OjpwZ19jYXRhbG9nLm9pZCIsCi0JCQkJCQkgIGZpbmZvLT5kb2JqLmNhdElkLm9pZCk7Ci0J fQotCWVsc2UgaWYgKGZvdXQtPnJlbW90ZVZlcnNpb24gPj0gOTA1MDApCi0JewotCQkvKgot CQkgKiBwcm90cmZ0eXBlcyB3YXMgYWRkZWQgaW4gOS41Ci0JCSAqLworCQkJCQkJICAicHJv a2luZCxcbiIpOworCWVsc2UgaWYgKGZvdXQtPnJlbW90ZVZlcnNpb24gPj0gODA0MDApCiAJ CWFwcGVuZFBRRXhwQnVmZmVyKHF1ZXJ5LAotCQkJCQkJICAiU0VMRUNUIHByb3JldHNldCwg cHJvc3JjLCBwcm9iaW4sICIKLQkJCQkJCSAgInBnX2NhdGFsb2cucGdfZ2V0X2Z1bmN0aW9u X2FyZ3VtZW50cyhvaWQpIEFTIGZ1bmNhcmdzLCAiCi0JCQkJCQkgICJwZ19jYXRhbG9nLnBn X2dldF9mdW5jdGlvbl9pZGVudGl0eV9hcmd1bWVudHMob2lkKSBBUyBmdW5jaWFyZ3MsICIK LQkJCQkJCSAgInBnX2NhdGFsb2cucGdfZ2V0X2Z1bmN0aW9uX3Jlc3VsdChvaWQpIEFTIGZ1 bmNyZXN1bHQsICIKLQkJCQkJCSAgImFycmF5X3RvX3N0cmluZyhwcm90cmZ0eXBlcywgJyAn KSBBUyBwcm90cmZ0eXBlcywgIgotCQkJCQkJICAiQ0FTRSBXSEVOIHByb2lzd2luZG93IFRI RU4gJ3cnIEVMU0UgJ2YnIEVORCBBUyBwcm9raW5kLCAiCi0JCQkJCQkgICJwcm92b2xhdGls ZSwgcHJvaXNzdHJpY3QsIHByb3NlY2RlZiwgIgotCQkJCQkJICAicHJvbGVha3Byb29mLCBw cm9jb25maWcsIHByb2Nvc3QsIHByb3Jvd3MsICIKLQkJCQkJCSAgIictJyBBUyBwcm9zdXBw b3J0LCAiCi0JCQkJCQkgICIoU0VMRUNUIGxhbm5hbWUgRlJPTSBwZ19jYXRhbG9nLnBnX2xh bmd1YWdlIFdIRVJFIG9pZCA9IHByb2xhbmcpIEFTIGxhbm5hbWUgIgotCQkJCQkJICAiRlJP TSBwZ19jYXRhbG9nLnBnX3Byb2MgIgotCQkJCQkJICAiV0hFUkUgb2lkID0gJyV1Jzo6cGdf Y2F0YWxvZy5vaWQiLAotCQkJCQkJICBmaW5mby0+ZG9iai5jYXRJZC5vaWQpOwotCX0KLQll bHNlIGlmIChmb3V0LT5yZW1vdGVWZXJzaW9uID49IDkwMjAwKQotCXsKLQkJLyoKLQkJICog cHJvbGVha3Byb29mIHdhcyBhZGRlZCBpbiA5LjIKLQkJICovCisJCQkJCQkgICJDQVNFIFdI RU4gcHJvaXN3aW5kb3cgVEhFTiAndycgRUxTRSAnZicgRU5EIEFTIHByb2tpbmQsXG4iKTsK KwllbHNlCiAJCWFwcGVuZFBRRXhwQnVmZmVyKHF1ZXJ5LAotCQkJCQkJICAiU0VMRUNUIHBy b3JldHNldCwgcHJvc3JjLCBwcm9iaW4sICIKLQkJCQkJCSAgInBnX2NhdGFsb2cucGdfZ2V0 X2Z1bmN0aW9uX2FyZ3VtZW50cyhvaWQpIEFTIGZ1bmNhcmdzLCAiCi0JCQkJCQkgICJwZ19j YXRhbG9nLnBnX2dldF9mdW5jdGlvbl9pZGVudGl0eV9hcmd1bWVudHMob2lkKSBBUyBmdW5j aWFyZ3MsICIKLQkJCQkJCSAgInBnX2NhdGFsb2cucGdfZ2V0X2Z1bmN0aW9uX3Jlc3VsdChv aWQpIEFTIGZ1bmNyZXN1bHQsICIKLQkJCQkJCSAgIkNBU0UgV0hFTiBwcm9pc3dpbmRvdyBU SEVOICd3JyBFTFNFICdmJyBFTkQgQVMgcHJva2luZCwgIgotCQkJCQkJICAicHJvdm9sYXRp bGUsIHByb2lzc3RyaWN0LCBwcm9zZWNkZWYsICIKLQkJCQkJCSAgInByb2xlYWtwcm9vZiwg cHJvY29uZmlnLCBwcm9jb3N0LCBwcm9yb3dzLCAiCi0JCQkJCQkgICInLScgQVMgcHJvc3Vw cG9ydCwgIgotCQkJCQkJICAiKFNFTEVDVCBsYW5uYW1lIEZST00gcGdfY2F0YWxvZy5wZ19s YW5ndWFnZSBXSEVSRSBvaWQgPSBwcm9sYW5nKSBBUyBsYW5uYW1lICIKLQkJCQkJCSAgIkZS T00gcGdfY2F0YWxvZy5wZ19wcm9jICIKLQkJCQkJCSAgIldIRVJFIG9pZCA9ICcldSc6OnBn X2NhdGFsb2cub2lkIiwKLQkJCQkJCSAgZmluZm8tPmRvYmouY2F0SWQub2lkKTsKLQl9Ci0J ZWxzZSBpZiAoZm91dC0+cmVtb3RlVmVyc2lvbiA+PSA4MDQwMCkKKwkJCQkJCSAgIidmJyBB UyBwcm9raW5kLFxuIik7CisKKwlpZiAoZm91dC0+cmVtb3RlVmVyc2lvbiA+PSA5MDYwMCkK KwkJYXBwZW5kUFFFeHBCdWZmZXIocXVlcnksCisJCQkJCQkgICJwcm9wYXJhbGxlbCxcbiIp OworCWVsc2UKKwkJYXBwZW5kUFFFeHBCdWZmZXIocXVlcnksCisJCQkJCQkgICIndScgQVMg cHJvcGFyYWxsZWwsXG4iKTsKKworCWlmIChmb3V0LT5yZW1vdGVWZXJzaW9uID49IDkwNTAw KQorCQlhcHBlbmRQUUV4cEJ1ZmZlcihxdWVyeSwKKwkJCQkJCSAgImFycmF5X3RvX3N0cmlu Zyhwcm90cmZ0eXBlcywgJyAnKSBBUyBwcm90cmZ0eXBlcyxcbiIpOworCisJaWYgKGZvdXQt PnJlbW90ZVZlcnNpb24gPj0gOTAyMDApCisJCWFwcGVuZFBRRXhwQnVmZmVyKHF1ZXJ5LAor CQkJCQkJICAicHJvbGVha3Byb29mLFxuIik7CisJZWxzZQorCQlhcHBlbmRQUUV4cEJ1ZmZl cihxdWVyeSwKKwkJCQkJCSAgImZhbHNlIEFTIHByb2xlYWtwcm9vZixcbiIpOworCisJaWYg KGZvdXQtPnJlbW90ZVZlcnNpb24gPj0gODA0MDApCiAJewogCQkvKgogCQkgKiBJbiA4LjQg YW5kIHVwIHdlIHJlbHkgb24gcGdfZ2V0X2Z1bmN0aW9uX2FyZ3VtZW50cyBhbmQKIAkJICog cGdfZ2V0X2Z1bmN0aW9uX3Jlc3VsdCBpbnN0ZWFkIG9mIGV4YW1pbmluZyBwcm9hbGxhcmd0 eXBlcyBldGMuCiAJCSAqLwogCQlhcHBlbmRQUUV4cEJ1ZmZlcihxdWVyeSwKLQkJCQkJCSAg IlNFTEVDVCBwcm9yZXRzZXQsIHByb3NyYywgcHJvYmluLCAiCi0JCQkJCQkgICJwZ19jYXRh bG9nLnBnX2dldF9mdW5jdGlvbl9hcmd1bWVudHMob2lkKSBBUyBmdW5jYXJncywgIgotCQkJ CQkJICAicGdfY2F0YWxvZy5wZ19nZXRfZnVuY3Rpb25faWRlbnRpdHlfYXJndW1lbnRzKG9p ZCkgQVMgZnVuY2lhcmdzLCAiCi0JCQkJCQkgICJwZ19jYXRhbG9nLnBnX2dldF9mdW5jdGlv bl9yZXN1bHQob2lkKSBBUyBmdW5jcmVzdWx0LCAiCi0JCQkJCQkgICJDQVNFIFdIRU4gcHJv aXN3aW5kb3cgVEhFTiAndycgRUxTRSAnZicgRU5EIEFTIHByb2tpbmQsICIKLQkJCQkJCSAg InByb3ZvbGF0aWxlLCBwcm9pc3N0cmljdCwgcHJvc2VjZGVmLCAiCi0JCQkJCQkgICJmYWxz ZSBBUyBwcm9sZWFrcHJvb2YsICIKLQkJCQkJCSAgIiBwcm9jb25maWcsIHByb2Nvc3QsIHBy b3Jvd3MsICIKLQkJCQkJCSAgIictJyBBUyBwcm9zdXBwb3J0LCAiCi0JCQkJCQkgICIoU0VM RUNUIGxhbm5hbWUgRlJPTSBwZ19jYXRhbG9nLnBnX2xhbmd1YWdlIFdIRVJFIG9pZCA9IHBy b2xhbmcpIEFTIGxhbm5hbWUgIgotCQkJCQkJICAiRlJPTSBwZ19jYXRhbG9nLnBnX3Byb2Mg IgotCQkJCQkJICAiV0hFUkUgb2lkID0gJyV1Jzo6cGdfY2F0YWxvZy5vaWQiLAotCQkJCQkJ ICBmaW5mby0+ZG9iai5jYXRJZC5vaWQpOwotCX0KLQllbHNlIGlmIChmb3V0LT5yZW1vdGVW ZXJzaW9uID49IDgwMzAwKQotCXsKLQkJYXBwZW5kUFFFeHBCdWZmZXIocXVlcnksCi0JCQkJ CQkgICJTRUxFQ1QgcHJvcmV0c2V0LCBwcm9zcmMsIHByb2JpbiwgIgotCQkJCQkJICAicHJv YWxsYXJndHlwZXMsIHByb2FyZ21vZGVzLCBwcm9hcmduYW1lcywgIgotCQkJCQkJICAiJ2Yn IEFTIHByb2tpbmQsICIKLQkJCQkJCSAgInByb3ZvbGF0aWxlLCBwcm9pc3N0cmljdCwgcHJv c2VjZGVmLCAiCi0JCQkJCQkgICJmYWxzZSBBUyBwcm9sZWFrcHJvb2YsICIKLQkJCQkJCSAg InByb2NvbmZpZywgcHJvY29zdCwgcHJvcm93cywgIgotCQkJCQkJICAiJy0nIEFTIHByb3N1 cHBvcnQsICIKLQkJCQkJCSAgIihTRUxFQ1QgbGFubmFtZSBGUk9NIHBnX2NhdGFsb2cucGdf bGFuZ3VhZ2UgV0hFUkUgb2lkID0gcHJvbGFuZykgQVMgbGFubmFtZSAiCi0JCQkJCQkgICJG Uk9NIHBnX2NhdGFsb2cucGdfcHJvYyAiCi0JCQkJCQkgICJXSEVSRSBvaWQgPSAnJXUnOjpw Z19jYXRhbG9nLm9pZCIsCi0JCQkJCQkgIGZpbmZvLT5kb2JqLmNhdElkLm9pZCk7CisJCQkJ CQkgICJwZ19jYXRhbG9nLnBnX2dldF9mdW5jdGlvbl9hcmd1bWVudHMob2lkKSBBUyBmdW5j YXJncyxcbiIKKwkJCQkJCSAgInBnX2NhdGFsb2cucGdfZ2V0X2Z1bmN0aW9uX2lkZW50aXR5 X2FyZ3VtZW50cyhvaWQpIEFTIGZ1bmNpYXJncyxcbiIKKwkJCQkJCSAgInBnX2NhdGFsb2cu cGdfZ2V0X2Z1bmN0aW9uX3Jlc3VsdChvaWQpIEFTIGZ1bmNyZXN1bHQsXG4iKTsKIAl9CiAJ ZWxzZSBpZiAoZm91dC0+cmVtb3RlVmVyc2lvbiA+PSA4MDEwMCkKLQl7CiAJCWFwcGVuZFBR RXhwQnVmZmVyKHF1ZXJ5LAotCQkJCQkJICAiU0VMRUNUIHByb3JldHNldCwgcHJvc3JjLCBw cm9iaW4sICIKLQkJCQkJCSAgInByb2FsbGFyZ3R5cGVzLCBwcm9hcmdtb2RlcywgcHJvYXJn bmFtZXMsICIKLQkJCQkJCSAgIidmJyBBUyBwcm9raW5kLCAiCi0JCQkJCQkgICJwcm92b2xh dGlsZSwgcHJvaXNzdHJpY3QsIHByb3NlY2RlZiwgIgotCQkJCQkJICAiZmFsc2UgQVMgcHJv bGVha3Byb29mLCAiCi0JCQkJCQkgICJudWxsIEFTIHByb2NvbmZpZywgMCBBUyBwcm9jb3N0 LCAwIEFTIHByb3Jvd3MsICIKLQkJCQkJCSAgIictJyBBUyBwcm9zdXBwb3J0LCAiCi0JCQkJ CQkgICIoU0VMRUNUIGxhbm5hbWUgRlJPTSBwZ19jYXRhbG9nLnBnX2xhbmd1YWdlIFdIRVJF IG9pZCA9IHByb2xhbmcpIEFTIGxhbm5hbWUgIgotCQkJCQkJICAiRlJPTSBwZ19jYXRhbG9n LnBnX3Byb2MgIgotCQkJCQkJICAiV0hFUkUgb2lkID0gJyV1Jzo6cGdfY2F0YWxvZy5vaWQi LAotCQkJCQkJICBmaW5mby0+ZG9iai5jYXRJZC5vaWQpOwotCX0KKwkJCQkJCSAgInByb2Fs bGFyZ3R5cGVzLFxuIgorCQkJCQkJICAicHJvYXJnbW9kZXMsXG4iCisJCQkJCQkgICJwcm9h cmduYW1lcyxcbiIpOwogCWVsc2UKLQl7CiAJCWFwcGVuZFBRRXhwQnVmZmVyKHF1ZXJ5LAot CQkJCQkJICAiU0VMRUNUIHByb3JldHNldCwgcHJvc3JjLCBwcm9iaW4sICIKLQkJCQkJCSAg Im51bGwgQVMgcHJvYWxsYXJndHlwZXMsICIKLQkJCQkJCSAgIm51bGwgQVMgcHJvYXJnbW9k ZXMsICIKLQkJCQkJCSAgInByb2FyZ25hbWVzLCAiCi0JCQkJCQkgICInZicgQVMgcHJva2lu ZCwgIgotCQkJCQkJICAicHJvdm9sYXRpbGUsIHByb2lzc3RyaWN0LCBwcm9zZWNkZWYsICIK LQkJCQkJCSAgImZhbHNlIEFTIHByb2xlYWtwcm9vZiwgIgotCQkJCQkJICAibnVsbCBBUyBw cm9jb25maWcsIDAgQVMgcHJvY29zdCwgMCBBUyBwcm9yb3dzLCAiCi0JCQkJCQkgICInLScg QVMgcHJvc3VwcG9ydCwgIgotCQkJCQkJICAiKFNFTEVDVCBsYW5uYW1lIEZST00gcGdfY2F0 YWxvZy5wZ19sYW5ndWFnZSBXSEVSRSBvaWQgPSBwcm9sYW5nKSBBUyBsYW5uYW1lICIKLQkJ CQkJCSAgIkZST00gcGdfY2F0YWxvZy5wZ19wcm9jICIKLQkJCQkJCSAgIldIRVJFIG9pZCA9 ICcldSc6OnBnX2NhdGFsb2cub2lkIiwKLQkJCQkJCSAgZmluZm8tPmRvYmouY2F0SWQub2lk KTsKLQl9CisJCQkJCQkgICJudWxsIEFTIHByb2FsbGFyZ3R5cGVzLFxuIgorCQkJCQkJICAi bnVsbCBBUyBwcm9hcmdtb2RlcyxcbiIKKwkJCQkJCSAgInByb2FyZ25hbWVzLFxuIik7CisK KwlpZiAoZm91dC0+cmVtb3RlVmVyc2lvbiA+PSA4MDMwMCkKKwkJYXBwZW5kUFFFeHBCdWZm ZXIocXVlcnksCisJCQkJCQkgICJwcm9jb25maWcsXG4iCisJCQkJCQkgICJwcm9jb3N0LFxu IgorCQkJCQkJICAicHJvcm93c1xuIik7CisJZWxzZQorCQlhcHBlbmRQUUV4cEJ1ZmZlcihx dWVyeSwKKwkJCQkJCSAgIm51bGwgQVMgcHJvY29uZmlnLFxuIgorCQkJCQkJICAiMCBBUyBw cm9jb3N0LFxuIgorCQkJCQkJICAiMCBBUyBwcm9yb3dzXG4iKTsKKworCWFwcGVuZFBRRXhw QnVmZmVyKHF1ZXJ5LAorCQkJCQkgICJGUk9NIHBnX2NhdGFsb2cucGdfcHJvYyAiCisJCQkJ CSAgIldIRVJFIG9pZCA9ICcldSc6OnBnX2NhdGFsb2cub2lkIiwKKwkJCQkJICBmaW5mby0+ ZG9iai5jYXRJZC5vaWQpOwogCiAJcmVzID0gRXhlY3V0ZVNxbFF1ZXJ5Rm9yU2luZ2xlUm93 KGZvdXQsIHF1ZXJ5LT5kYXRhKTsKIApAQCAtMTIwNDUsMTIgKzExOTYyLDcgQEAgZHVtcEZ1 bmMoQXJjaGl2ZSAqZm91dCwgRnVuY0luZm8gKmZpbmZvKQogCXByb2Nvc3QgPSBQUWdldHZh bHVlKHJlcywgMCwgUFFmbnVtYmVyKHJlcywgInByb2Nvc3QiKSk7CiAJcHJvcm93cyA9IFBR Z2V0dmFsdWUocmVzLCAwLCBQUWZudW1iZXIocmVzLCAicHJvcm93cyIpKTsKIAlwcm9zdXBw b3J0ID0gUFFnZXR2YWx1ZShyZXMsIDAsIFBRZm51bWJlcihyZXMsICJwcm9zdXBwb3J0Iikp OwotCi0JaWYgKFBRZm51bWJlcihyZXMsICJwcm9wYXJhbGxlbCIpICE9IC0xKQotCQlwcm9w YXJhbGxlbCA9IFBRZ2V0dmFsdWUocmVzLCAwLCBQUWZudW1iZXIocmVzLCAicHJvcGFyYWxs ZWwiKSk7Ci0JZWxzZQotCQlwcm9wYXJhbGxlbCA9IE5VTEw7Ci0KKwlwcm9wYXJhbGxlbCA9 IFBRZ2V0dmFsdWUocmVzLCAwLCBQUWZudW1iZXIocmVzLCAicHJvcGFyYWxsZWwiKSk7CiAJ bGFubmFtZSA9IFBRZ2V0dmFsdWUocmVzLCAwLCBQUWZudW1iZXIocmVzLCAibGFubmFtZSIp KTsKIAogCS8qCkBAIC0xMjI2NCw3ICsxMjE3Niw3IEBAIGR1bXBGdW5jKEFyY2hpdmUgKmZv dXQsIEZ1bmNJbmZvICpmaW5mbykKIAkJYXBwZW5kUFFFeHBCdWZmZXIocSwgIiBTVVBQT1JU ICVzIiwgcHJvc3VwcG9ydCk7CiAJfQogCi0JaWYgKHByb3BhcmFsbGVsICE9IE5VTEwgJiYg cHJvcGFyYWxsZWxbMF0gIT0gUFJPUEFSQUxMRUxfVU5TQUZFKQorCWlmIChwcm9wYXJhbGxl bFswXSAhPSBQUk9QQVJBTExFTF9VTlNBRkUpCiAJewogCQlpZiAocHJvcGFyYWxsZWxbMF0g PT0gUFJPUEFSQUxMRUxfU0FGRSkKIAkJCWFwcGVuZFBRRXhwQnVmZmVyU3RyKHEsICIgUEFS QUxMRUwgU0FGRSIpOwpAQCAtMTM5MzksMjcgKzEzODUxLDggQEAgZHVtcEFnZyhBcmNoaXZl ICpmb3V0LCBBZ2dJbmZvICphZ2dpbmZvKQogCWNoYXIJICAgKmFnZ2Z1bGxzaWcgPSBOVUxM OwkvKiBmdWxsIHNpZ25hdHVyZSAqLwogCWNoYXIJICAgKmFnZ3NpZ190YWc7CiAJUEdyZXN1 bHQgICAqcmVzOwotCWludAkJCWlfYWdndHJhbnNmbjsKLQlpbnQJCQlpX2FnZ2ZpbmFsZm47 Ci0JaW50CQkJaV9hZ2djb21iaW5lZm47Ci0JaW50CQkJaV9hZ2dzZXJpYWxmbjsKLQlpbnQJ CQlpX2FnZ2Rlc2VyaWFsZm47Ci0JaW50CQkJaV9hZ2dtdHJhbnNmbjsKLQlpbnQJCQlpX2Fn Z21pbnZ0cmFuc2ZuOwotCWludAkJCWlfYWdnbWZpbmFsZm47Ci0JaW50CQkJaV9hZ2dmaW5h bGV4dHJhOwotCWludAkJCWlfYWdnbWZpbmFsZXh0cmE7Ci0JaW50CQkJaV9hZ2dmaW5hbG1v ZGlmeTsKLQlpbnQJCQlpX2FnZ21maW5hbG1vZGlmeTsKLQlpbnQJCQlpX2FnZ3NvcnRvcDsK LQlpbnQJCQlpX2FnZ2tpbmQ7Ci0JaW50CQkJaV9hZ2d0cmFuc3R5cGU7Ci0JaW50CQkJaV9h Z2d0cmFuc3NwYWNlOwotCWludAkJCWlfYWdnbXRyYW5zdHlwZTsKLQlpbnQJCQlpX2FnZ210 cmFuc3NwYWNlOwogCWludAkJCWlfYWdnaW5pdHZhbDsKIAlpbnQJCQlpX2FnZ21pbml0dmFs OwotCWludAkJCWlfcHJvcGFyYWxsZWw7CiAJY29uc3QgY2hhciAqYWdndHJhbnNmbjsKIAlj b25zdCBjaGFyICphZ2dmaW5hbGZuOwogCWNvbnN0IGNoYXIgKmFnZ2NvbWJpbmVmbjsKQEAg LTEzOTk0LDE3MCArMTM4ODcsMTAxIEBAIGR1bXBBZ2coQXJjaGl2ZSAqZm91dCwgQWdnSW5m byAqYWdnaW5mbykKIAlkZXRhaWxzID0gY3JlYXRlUFFFeHBCdWZmZXIoKTsKIAogCS8qIEdl dCBhZ2dyZWdhdGUtc3BlY2lmaWMgZGV0YWlscyAqLworCWFwcGVuZFBRRXhwQnVmZmVyKHF1 ZXJ5LAorCQkJCQkgICJTRUxFQ1RcbiIKKwkJCQkJICAiYWdndHJhbnNmbixcbiIKKwkJCQkJ ICAiYWdnZmluYWxmbixcbiIKKwkJCQkJICAiYWdndHJhbnN0eXBlOjpwZ19jYXRhbG9nLnJl Z3R5cGUsXG4iCisJCQkJCSAgImFnZ2luaXR2YWwsXG4iKTsKKwogCWlmIChmb3V0LT5yZW1v dGVWZXJzaW9uID49IDExMDAwMCkKLQl7Ci0JCWFwcGVuZFBRRXhwQnVmZmVyKHF1ZXJ5LCAi U0VMRUNUIGFnZ3RyYW5zZm4sICIKLQkJCQkJCSAgImFnZ2ZpbmFsZm4sIGFnZ3RyYW5zdHlw ZTo6cGdfY2F0YWxvZy5yZWd0eXBlLCAiCi0JCQkJCQkgICJhZ2djb21iaW5lZm4sIGFnZ3Nl cmlhbGZuLCBhZ2dkZXNlcmlhbGZuLCBhZ2dtdHJhbnNmbiwgIgotCQkJCQkJICAiYWdnbWlu dnRyYW5zZm4sIGFnZ21maW5hbGZuLCBhZ2dtdHJhbnN0eXBlOjpwZ19jYXRhbG9nLnJlZ3R5 cGUsICIKLQkJCQkJCSAgImFnZ2ZpbmFsZXh0cmEsIGFnZ21maW5hbGV4dHJhLCAiCi0JCQkJ CQkgICJhZ2dmaW5hbG1vZGlmeSwgYWdnbWZpbmFsbW9kaWZ5LCAiCi0JCQkJCQkgICJhZ2dz b3J0b3AsICIKLQkJCQkJCSAgImFnZ2tpbmQsICIKLQkJCQkJCSAgImFnZ3RyYW5zc3BhY2Us IGFnZ2luaXR2YWwsICIKLQkJCQkJCSAgImFnZ210cmFuc3NwYWNlLCBhZ2dtaW5pdHZhbCwg IgotCQkJCQkJICAicGdfY2F0YWxvZy5wZ19nZXRfZnVuY3Rpb25fYXJndW1lbnRzKHAub2lk KSBBUyBmdW5jYXJncywgIgotCQkJCQkJICAicGdfY2F0YWxvZy5wZ19nZXRfZnVuY3Rpb25f aWRlbnRpdHlfYXJndW1lbnRzKHAub2lkKSBBUyBmdW5jaWFyZ3MsICIKLQkJCQkJCSAgInAu cHJvcGFyYWxsZWwgIgotCQkJCQkJICAiRlJPTSBwZ19jYXRhbG9nLnBnX2FnZ3JlZ2F0ZSBh LCBwZ19jYXRhbG9nLnBnX3Byb2MgcCAiCi0JCQkJCQkgICJXSEVSRSBhLmFnZ2Zub2lkID0g cC5vaWQgIgotCQkJCQkJICAiQU5EIHAub2lkID0gJyV1Jzo6cGdfY2F0YWxvZy5vaWQiLAot CQkJCQkJICBhZ2dpbmZvLT5hZ2dmbi5kb2JqLmNhdElkLm9pZCk7Ci0JfQotCWVsc2UgaWYg KGZvdXQtPnJlbW90ZVZlcnNpb24gPj0gOTA2MDApCi0JewotCQlhcHBlbmRQUUV4cEJ1ZmZl cihxdWVyeSwgIlNFTEVDVCBhZ2d0cmFuc2ZuLCAiCi0JCQkJCQkgICJhZ2dmaW5hbGZuLCBh Z2d0cmFuc3R5cGU6OnBnX2NhdGFsb2cucmVndHlwZSwgIgotCQkJCQkJICAiYWdnY29tYmlu ZWZuLCBhZ2dzZXJpYWxmbiwgYWdnZGVzZXJpYWxmbiwgYWdnbXRyYW5zZm4sICIKLQkJCQkJ CSAgImFnZ21pbnZ0cmFuc2ZuLCBhZ2dtZmluYWxmbiwgYWdnbXRyYW5zdHlwZTo6cGdfY2F0 YWxvZy5yZWd0eXBlLCAiCi0JCQkJCQkgICJhZ2dmaW5hbGV4dHJhLCBhZ2dtZmluYWxleHRy YSwgIgotCQkJCQkJICAiJzAnIEFTIGFnZ2ZpbmFsbW9kaWZ5LCAnMCcgQVMgYWdnbWZpbmFs bW9kaWZ5LCAiCi0JCQkJCQkgICJhZ2dzb3J0b3AsICIKLQkJCQkJCSAgImFnZ2tpbmQsICIK LQkJCQkJCSAgImFnZ3RyYW5zc3BhY2UsIGFnZ2luaXR2YWwsICIKLQkJCQkJCSAgImFnZ210 cmFuc3NwYWNlLCBhZ2dtaW5pdHZhbCwgIgotCQkJCQkJICAicGdfY2F0YWxvZy5wZ19nZXRf ZnVuY3Rpb25fYXJndW1lbnRzKHAub2lkKSBBUyBmdW5jYXJncywgIgotCQkJCQkJICAicGdf Y2F0YWxvZy5wZ19nZXRfZnVuY3Rpb25faWRlbnRpdHlfYXJndW1lbnRzKHAub2lkKSBBUyBm dW5jaWFyZ3MsICIKLQkJCQkJCSAgInAucHJvcGFyYWxsZWwgIgotCQkJCQkJICAiRlJPTSBw Z19jYXRhbG9nLnBnX2FnZ3JlZ2F0ZSBhLCBwZ19jYXRhbG9nLnBnX3Byb2MgcCAiCi0JCQkJ CQkgICJXSEVSRSBhLmFnZ2Zub2lkID0gcC5vaWQgIgotCQkJCQkJICAiQU5EIHAub2lkID0g JyV1Jzo6cGdfY2F0YWxvZy5vaWQiLAotCQkJCQkJICBhZ2dpbmZvLT5hZ2dmbi5kb2JqLmNh dElkLm9pZCk7Ci0JfQotCWVsc2UgaWYgKGZvdXQtPnJlbW90ZVZlcnNpb24gPj0gOTA0MDAp Ci0JewotCQlhcHBlbmRQUUV4cEJ1ZmZlcihxdWVyeSwgIlNFTEVDVCBhZ2d0cmFuc2ZuLCAi Ci0JCQkJCQkgICJhZ2dmaW5hbGZuLCBhZ2d0cmFuc3R5cGU6OnBnX2NhdGFsb2cucmVndHlw ZSwgIgotCQkJCQkJICAiJy0nIEFTIGFnZ2NvbWJpbmVmbiwgJy0nIEFTIGFnZ3NlcmlhbGZu LCAiCi0JCQkJCQkgICInLScgQVMgYWdnZGVzZXJpYWxmbiwgYWdnbXRyYW5zZm4sIGFnZ21p bnZ0cmFuc2ZuLCAiCi0JCQkJCQkgICJhZ2dtZmluYWxmbiwgYWdnbXRyYW5zdHlwZTo6cGdf Y2F0YWxvZy5yZWd0eXBlLCAiCi0JCQkJCQkgICJhZ2dmaW5hbGV4dHJhLCBhZ2dtZmluYWxl eHRyYSwgIgotCQkJCQkJICAiJzAnIEFTIGFnZ2ZpbmFsbW9kaWZ5LCAnMCcgQVMgYWdnbWZp bmFsbW9kaWZ5LCAiCi0JCQkJCQkgICJhZ2dzb3J0b3AsICIKLQkJCQkJCSAgImFnZ2tpbmQs ICIKLQkJCQkJCSAgImFnZ3RyYW5zc3BhY2UsIGFnZ2luaXR2YWwsICIKLQkJCQkJCSAgImFn Z210cmFuc3NwYWNlLCBhZ2dtaW5pdHZhbCwgIgotCQkJCQkJICAicGdfY2F0YWxvZy5wZ19n ZXRfZnVuY3Rpb25fYXJndW1lbnRzKHAub2lkKSBBUyBmdW5jYXJncywgIgotCQkJCQkJICAi cGdfY2F0YWxvZy5wZ19nZXRfZnVuY3Rpb25faWRlbnRpdHlfYXJndW1lbnRzKHAub2lkKSBB UyBmdW5jaWFyZ3MgIgotCQkJCQkJICAiRlJPTSBwZ19jYXRhbG9nLnBnX2FnZ3JlZ2F0ZSBh LCBwZ19jYXRhbG9nLnBnX3Byb2MgcCAiCi0JCQkJCQkgICJXSEVSRSBhLmFnZ2Zub2lkID0g cC5vaWQgIgotCQkJCQkJICAiQU5EIHAub2lkID0gJyV1Jzo6cGdfY2F0YWxvZy5vaWQiLAot CQkJCQkJICBhZ2dpbmZvLT5hZ2dmbi5kb2JqLmNhdElkLm9pZCk7Ci0JfQotCWVsc2UgaWYg KGZvdXQtPnJlbW90ZVZlcnNpb24gPj0gODA0MDApCi0JewotCQlhcHBlbmRQUUV4cEJ1ZmZl cihxdWVyeSwgIlNFTEVDVCBhZ2d0cmFuc2ZuLCAiCi0JCQkJCQkgICJhZ2dmaW5hbGZuLCBh Z2d0cmFuc3R5cGU6OnBnX2NhdGFsb2cucmVndHlwZSwgIgotCQkJCQkJICAiJy0nIEFTIGFn Z2NvbWJpbmVmbiwgJy0nIEFTIGFnZ3NlcmlhbGZuLCAiCi0JCQkJCQkgICInLScgQVMgYWdn ZGVzZXJpYWxmbiwgJy0nIEFTIGFnZ210cmFuc2ZuLCAiCi0JCQkJCQkgICInLScgQVMgYWdn bWludnRyYW5zZm4sICctJyBBUyBhZ2dtZmluYWxmbiwgIgotCQkJCQkJICAiMCBBUyBhZ2dt dHJhbnN0eXBlLCBmYWxzZSBBUyBhZ2dmaW5hbGV4dHJhLCAiCi0JCQkJCQkgICJmYWxzZSBB UyBhZ2dtZmluYWxleHRyYSwgIgotCQkJCQkJICAiJzAnIEFTIGFnZ2ZpbmFsbW9kaWZ5LCAn MCcgQVMgYWdnbWZpbmFsbW9kaWZ5LCAiCi0JCQkJCQkgICJhZ2dzb3J0b3AsICIKLQkJCQkJ CSAgIiduJyBBUyBhZ2draW5kLCAiCi0JCQkJCQkgICIwIEFTIGFnZ3RyYW5zc3BhY2UsIGFn Z2luaXR2YWwsICIKLQkJCQkJCSAgIjAgQVMgYWdnbXRyYW5zc3BhY2UsIE5VTEwgQVMgYWdn bWluaXR2YWwsICIKLQkJCQkJCSAgInBnX2NhdGFsb2cucGdfZ2V0X2Z1bmN0aW9uX2FyZ3Vt ZW50cyhwLm9pZCkgQVMgZnVuY2FyZ3MsICIKLQkJCQkJCSAgInBnX2NhdGFsb2cucGdfZ2V0 X2Z1bmN0aW9uX2lkZW50aXR5X2FyZ3VtZW50cyhwLm9pZCkgQVMgZnVuY2lhcmdzICIKLQkJ CQkJCSAgIkZST00gcGdfY2F0YWxvZy5wZ19hZ2dyZWdhdGUgYSwgcGdfY2F0YWxvZy5wZ19w cm9jIHAgIgotCQkJCQkJICAiV0hFUkUgYS5hZ2dmbm9pZCA9IHAub2lkICIKLQkJCQkJCSAg IkFORCBwLm9pZCA9ICcldSc6OnBnX2NhdGFsb2cub2lkIiwKLQkJCQkJCSAgYWdnaW5mby0+ YWdnZm4uZG9iai5jYXRJZC5vaWQpOwotCX0KLQllbHNlIGlmIChmb3V0LT5yZW1vdGVWZXJz aW9uID49IDgwMTAwKQotCXsKLQkJYXBwZW5kUFFFeHBCdWZmZXIocXVlcnksICJTRUxFQ1Qg YWdndHJhbnNmbiwgIgotCQkJCQkJICAiYWdnZmluYWxmbiwgYWdndHJhbnN0eXBlOjpwZ19j YXRhbG9nLnJlZ3R5cGUsICIKLQkJCQkJCSAgIictJyBBUyBhZ2djb21iaW5lZm4sICctJyBB UyBhZ2dzZXJpYWxmbiwgIgotCQkJCQkJICAiJy0nIEFTIGFnZ2Rlc2VyaWFsZm4sICctJyBB UyBhZ2dtdHJhbnNmbiwgIgotCQkJCQkJICAiJy0nIEFTIGFnZ21pbnZ0cmFuc2ZuLCAnLScg QVMgYWdnbWZpbmFsZm4sICIKLQkJCQkJCSAgIjAgQVMgYWdnbXRyYW5zdHlwZSwgZmFsc2Ug QVMgYWdnZmluYWxleHRyYSwgIgotCQkJCQkJICAiZmFsc2UgQVMgYWdnbWZpbmFsZXh0cmEs ICIKLQkJCQkJCSAgIicwJyBBUyBhZ2dmaW5hbG1vZGlmeSwgJzAnIEFTIGFnZ21maW5hbG1v ZGlmeSwgIgotCQkJCQkJICAiYWdnc29ydG9wLCAiCi0JCQkJCQkgICInbicgQVMgYWdna2lu ZCwgIgotCQkJCQkJICAiMCBBUyBhZ2d0cmFuc3NwYWNlLCBhZ2dpbml0dmFsLCAiCi0JCQkJ CQkgICIwIEFTIGFnZ210cmFuc3NwYWNlLCBOVUxMIEFTIGFnZ21pbml0dmFsICIKLQkJCQkJ CSAgIkZST00gcGdfY2F0YWxvZy5wZ19hZ2dyZWdhdGUgYSwgcGdfY2F0YWxvZy5wZ19wcm9j IHAgIgotCQkJCQkJICAiV0hFUkUgYS5hZ2dmbm9pZCA9IHAub2lkICIKLQkJCQkJCSAgIkFO RCBwLm9pZCA9ICcldSc6OnBnX2NhdGFsb2cub2lkIiwKLQkJCQkJCSAgYWdnaW5mby0+YWdn Zm4uZG9iai5jYXRJZC5vaWQpOwotCX0KKwkJYXBwZW5kUFFFeHBCdWZmZXIocXVlcnksCisJ CQkJCQkgICJhZ2dmaW5hbG1vZGlmeSxcbiIKKwkJCQkJCSAgImFnZ21maW5hbG1vZGlmeSxc biIpOwogCWVsc2UKLQl7Ci0JCWFwcGVuZFBRRXhwQnVmZmVyKHF1ZXJ5LCAiU0VMRUNUIGFn Z3RyYW5zZm4sICIKLQkJCQkJCSAgImFnZ2ZpbmFsZm4sIGFnZ3RyYW5zdHlwZTo6cGdfY2F0 YWxvZy5yZWd0eXBlLCAiCi0JCQkJCQkgICInLScgQVMgYWdnY29tYmluZWZuLCAnLScgQVMg YWdnc2VyaWFsZm4sICIKLQkJCQkJCSAgIictJyBBUyBhZ2dkZXNlcmlhbGZuLCAnLScgQVMg YWdnbXRyYW5zZm4sICIKLQkJCQkJCSAgIictJyBBUyBhZ2dtaW52dHJhbnNmbiwgJy0nIEFT IGFnZ21maW5hbGZuLCAiCi0JCQkJCQkgICIwIEFTIGFnZ210cmFuc3R5cGUsIGZhbHNlIEFT IGFnZ2ZpbmFsZXh0cmEsICIKLQkJCQkJCSAgImZhbHNlIEFTIGFnZ21maW5hbGV4dHJhLCAi Ci0JCQkJCQkgICInMCcgQVMgYWdnZmluYWxtb2RpZnksICcwJyBBUyBhZ2dtZmluYWxtb2Rp ZnksICIKLQkJCQkJCSAgIjAgQVMgYWdnc29ydG9wLCAiCi0JCQkJCQkgICInbicgQVMgYWdn a2luZCwgIgotCQkJCQkJICAiMCBBUyBhZ2d0cmFuc3NwYWNlLCBhZ2dpbml0dmFsLCAiCi0J CQkJCQkgICIwIEFTIGFnZ210cmFuc3NwYWNlLCBOVUxMIEFTIGFnZ21pbml0dmFsICIKLQkJ CQkJCSAgIkZST00gcGdfY2F0YWxvZy5wZ19hZ2dyZWdhdGUgYSwgcGdfY2F0YWxvZy5wZ19w cm9jIHAgIgotCQkJCQkJICAiV0hFUkUgYS5hZ2dmbm9pZCA9IHAub2lkICIKLQkJCQkJCSAg IkFORCBwLm9pZCA9ICcldSc6OnBnX2NhdGFsb2cub2lkIiwKLQkJCQkJCSAgYWdnaW5mby0+ YWdnZm4uZG9iai5jYXRJZC5vaWQpOwotCX0KKwkJYXBwZW5kUFFFeHBCdWZmZXIocXVlcnks CisJCQkJCQkgICInMCcgQVMgYWdnZmluYWxtb2RpZnksXG4iCisJCQkJCQkgICInMCcgQVMg YWdnbWZpbmFsbW9kaWZ5LFxuIik7CisKKwlpZiAoZm91dC0+cmVtb3RlVmVyc2lvbiA+PSA5 MDYwMCkKKwkJYXBwZW5kUFFFeHBCdWZmZXIocXVlcnksCisJCQkJCQkgICJhZ2djb21iaW5l Zm4sXG4iCisJCQkJCQkgICJhZ2dzZXJpYWxmbixcbiIKKwkJCQkJCSAgImFnZ2Rlc2VyaWFs Zm4sXG4iCisJCQkJCQkgICJwcm9wYXJhbGxlbCxcbiIpOworCWVsc2UKKwkJYXBwZW5kUFFF eHBCdWZmZXIocXVlcnksCisJCQkJCQkgICInLScgQVMgYWdnY29tYmluZWZuLFxuIgorCQkJ CQkJICAiJy0nIEFTIGFnZ3NlcmlhbGZuLFxuIgorCQkJCQkJICAiJy0nIEFTIGFnZ2Rlc2Vy aWFsZm4sXG4iCisJCQkJCQkgICIndScgQVMgcHJvcGFyYWxsZWwsXG4iKTsKKworCWlmIChm b3V0LT5yZW1vdGVWZXJzaW9uID49IDkwNDAwKQorCQlhcHBlbmRQUUV4cEJ1ZmZlcihxdWVy eSwKKwkJCQkJCSAgImFnZ2tpbmQsXG4iCisJCQkJCQkgICJhZ2dtdHJhbnNmbixcbiIKKwkJ CQkJCSAgImFnZ21pbnZ0cmFuc2ZuLFxuIgorCQkJCQkJICAiYWdnbWZpbmFsZm4sXG4iCisJ CQkJCQkgICJhZ2dtdHJhbnN0eXBlOjpwZ19jYXRhbG9nLnJlZ3R5cGUsXG4iCisJCQkJCQkg ICJhZ2dmaW5hbGV4dHJhLFxuIgorCQkJCQkJICAiYWdnbWZpbmFsZXh0cmEsXG4iCisJCQkJ CQkgICJhZ2d0cmFuc3NwYWNlLFxuIgorCQkJCQkJICAiYWdnbXRyYW5zc3BhY2UsXG4iCisJ CQkJCQkgICJhZ2dtaW5pdHZhbCxcbiIpOworCWVsc2UKKwkJYXBwZW5kUFFFeHBCdWZmZXIo cXVlcnksCisJCQkJCQkgICInbicgQVMgYWdna2luZCxcbiIKKwkJCQkJCSAgIictJyBBUyBh Z2dtdHJhbnNmbixcbiIKKwkJCQkJCSAgIictJyBBUyBhZ2dtaW52dHJhbnNmbixcbiIKKwkJ CQkJCSAgIictJyBBUyBhZ2dtZmluYWxmbixcbiIKKwkJCQkJCSAgIjAgQVMgYWdnbXRyYW5z dHlwZSxcbiIKKwkJCQkJCSAgImZhbHNlIEFTIGFnZ2ZpbmFsZXh0cmEsXG4iCisJCQkJCQkg ICJmYWxzZSBBUyBhZ2dtZmluYWxleHRyYSxcbiIKKwkJCQkJCSAgIjAgQVMgYWdndHJhbnNz cGFjZSxcbiIKKwkJCQkJCSAgIjAgQVMgYWdnbXRyYW5zc3BhY2UsXG4iCisJCQkJCQkgICJO VUxMIEFTIGFnZ21pbml0dmFsLFxuIik7CisKKwlpZiAoZm91dC0+cmVtb3RlVmVyc2lvbiA+ PSA4MDEwMCkKKwkJYXBwZW5kUFFFeHBCdWZmZXIocXVlcnksCisJCQkJCQkgICJhZ2dzb3J0 b3AsXG4iKTsKKwllbHNlCisJCWFwcGVuZFBRRXhwQnVmZmVyKHF1ZXJ5LAorCQkJCQkJICAi MCBBUyBhZ2dzb3J0b3AsXG4iKTsKKworCWFwcGVuZFBRRXhwQnVmZmVyKHF1ZXJ5LAorCQkJ CQkgICJwZ19jYXRhbG9nLnBnX2dldF9mdW5jdGlvbl9hcmd1bWVudHMocC5vaWQpIEFTIGZ1 bmNhcmdzLFxuIgorCQkJCQkgICJwZ19jYXRhbG9nLnBnX2dldF9mdW5jdGlvbl9pZGVudGl0 eV9hcmd1bWVudHMocC5vaWQpIEFTIGZ1bmNpYXJnc1xuIgorCQkJCQkgICJGUk9NIHBnX2Nh dGFsb2cucGdfYWdncmVnYXRlIGEsIHBnX2NhdGFsb2cucGdfcHJvYyBwICIKKwkJCQkJICAi V0hFUkUgYS5hZ2dmbm9pZCA9IHAub2lkICIKKwkJCQkJICAiQU5EIHAub2lkID0gJyV1Jzo6 cGdfY2F0YWxvZy5vaWQiLAorCQkJCQkgIGFnZ2luZm8tPmFnZ2ZuLmRvYmouY2F0SWQub2lk KTsKIAogCXJlcyA9IEV4ZWN1dGVTcWxRdWVyeUZvclNpbmdsZVJvdyhmb3V0LCBxdWVyeS0+ ZGF0YSk7CiAKLQlpX2FnZ3RyYW5zZm4gPSBQUWZudW1iZXIocmVzLCAiYWdndHJhbnNmbiIp OwotCWlfYWdnZmluYWxmbiA9IFBRZm51bWJlcihyZXMsICJhZ2dmaW5hbGZuIik7Ci0JaV9h Z2djb21iaW5lZm4gPSBQUWZudW1iZXIocmVzLCAiYWdnY29tYmluZWZuIik7Ci0JaV9hZ2dz ZXJpYWxmbiA9IFBRZm51bWJlcihyZXMsICJhZ2dzZXJpYWxmbiIpOwotCWlfYWdnZGVzZXJp YWxmbiA9IFBRZm51bWJlcihyZXMsICJhZ2dkZXNlcmlhbGZuIik7Ci0JaV9hZ2dtdHJhbnNm biA9IFBRZm51bWJlcihyZXMsICJhZ2dtdHJhbnNmbiIpOwotCWlfYWdnbWludnRyYW5zZm4g PSBQUWZudW1iZXIocmVzLCAiYWdnbWludnRyYW5zZm4iKTsKLQlpX2FnZ21maW5hbGZuID0g UFFmbnVtYmVyKHJlcywgImFnZ21maW5hbGZuIik7Ci0JaV9hZ2dmaW5hbGV4dHJhID0gUFFm bnVtYmVyKHJlcywgImFnZ2ZpbmFsZXh0cmEiKTsKLQlpX2FnZ21maW5hbGV4dHJhID0gUFFm bnVtYmVyKHJlcywgImFnZ21maW5hbGV4dHJhIik7Ci0JaV9hZ2dmaW5hbG1vZGlmeSA9IFBR Zm51bWJlcihyZXMsICJhZ2dmaW5hbG1vZGlmeSIpOwotCWlfYWdnbWZpbmFsbW9kaWZ5ID0g UFFmbnVtYmVyKHJlcywgImFnZ21maW5hbG1vZGlmeSIpOwotCWlfYWdnc29ydG9wID0gUFFm bnVtYmVyKHJlcywgImFnZ3NvcnRvcCIpOwotCWlfYWdna2luZCA9IFBRZm51bWJlcihyZXMs ICJhZ2draW5kIik7Ci0JaV9hZ2d0cmFuc3R5cGUgPSBQUWZudW1iZXIocmVzLCAiYWdndHJh bnN0eXBlIik7Ci0JaV9hZ2d0cmFuc3NwYWNlID0gUFFmbnVtYmVyKHJlcywgImFnZ3RyYW5z c3BhY2UiKTsKLQlpX2FnZ210cmFuc3R5cGUgPSBQUWZudW1iZXIocmVzLCAiYWdnbXRyYW5z dHlwZSIpOwotCWlfYWdnbXRyYW5zc3BhY2UgPSBQUWZudW1iZXIocmVzLCAiYWdnbXRyYW5z c3BhY2UiKTsKIAlpX2FnZ2luaXR2YWwgPSBQUWZudW1iZXIocmVzLCAiYWdnaW5pdHZhbCIp OwogCWlfYWdnbWluaXR2YWwgPSBQUWZudW1iZXIocmVzLCAiYWdnbWluaXR2YWwiKTsKLQlp X3Byb3BhcmFsbGVsID0gUFFmbnVtYmVyKHJlcywgInByb3BhcmFsbGVsIik7Ci0KLQlhZ2d0 cmFuc2ZuID0gUFFnZXR2YWx1ZShyZXMsIDAsIGlfYWdndHJhbnNmbik7Ci0JYWdnZmluYWxm biA9IFBRZ2V0dmFsdWUocmVzLCAwLCBpX2FnZ2ZpbmFsZm4pOwotCWFnZ2NvbWJpbmVmbiA9 IFBRZ2V0dmFsdWUocmVzLCAwLCBpX2FnZ2NvbWJpbmVmbik7Ci0JYWdnc2VyaWFsZm4gPSBQ UWdldHZhbHVlKHJlcywgMCwgaV9hZ2dzZXJpYWxmbik7Ci0JYWdnZGVzZXJpYWxmbiA9IFBR Z2V0dmFsdWUocmVzLCAwLCBpX2FnZ2Rlc2VyaWFsZm4pOwotCWFnZ210cmFuc2ZuID0gUFFn ZXR2YWx1ZShyZXMsIDAsIGlfYWdnbXRyYW5zZm4pOwotCWFnZ21pbnZ0cmFuc2ZuID0gUFFn ZXR2YWx1ZShyZXMsIDAsIGlfYWdnbWludnRyYW5zZm4pOwotCWFnZ21maW5hbGZuID0gUFFn ZXR2YWx1ZShyZXMsIDAsIGlfYWdnbWZpbmFsZm4pOwotCWFnZ2ZpbmFsZXh0cmEgPSAoUFFn ZXR2YWx1ZShyZXMsIDAsIGlfYWdnZmluYWxleHRyYSlbMF0gPT0gJ3QnKTsKLQlhZ2dtZmlu YWxleHRyYSA9IChQUWdldHZhbHVlKHJlcywgMCwgaV9hZ2dtZmluYWxleHRyYSlbMF0gPT0g J3QnKTsKLQlhZ2dmaW5hbG1vZGlmeSA9IFBRZ2V0dmFsdWUocmVzLCAwLCBpX2FnZ2ZpbmFs bW9kaWZ5KVswXTsKLQlhZ2dtZmluYWxtb2RpZnkgPSBQUWdldHZhbHVlKHJlcywgMCwgaV9h Z2dtZmluYWxtb2RpZnkpWzBdOwotCWFnZ3NvcnRvcCA9IFBRZ2V0dmFsdWUocmVzLCAwLCBp X2FnZ3NvcnRvcCk7Ci0JYWdna2luZCA9IFBRZ2V0dmFsdWUocmVzLCAwLCBpX2FnZ2tpbmQp WzBdOwotCWFnZ3RyYW5zdHlwZSA9IFBRZ2V0dmFsdWUocmVzLCAwLCBpX2FnZ3RyYW5zdHlw ZSk7Ci0JYWdndHJhbnNzcGFjZSA9IFBRZ2V0dmFsdWUocmVzLCAwLCBpX2FnZ3RyYW5zc3Bh Y2UpOwotCWFnZ210cmFuc3R5cGUgPSBQUWdldHZhbHVlKHJlcywgMCwgaV9hZ2dtdHJhbnN0 eXBlKTsKLQlhZ2dtdHJhbnNzcGFjZSA9IFBRZ2V0dmFsdWUocmVzLCAwLCBpX2FnZ210cmFu c3NwYWNlKTsKKworCWFnZ3RyYW5zZm4gPSBQUWdldHZhbHVlKHJlcywgMCwgUFFmbnVtYmVy KHJlcywgImFnZ3RyYW5zZm4iKSk7CisJYWdnZmluYWxmbiA9IFBRZ2V0dmFsdWUocmVzLCAw LCBQUWZudW1iZXIocmVzLCAiYWdnZmluYWxmbiIpKTsKKwlhZ2djb21iaW5lZm4gPSBQUWdl dHZhbHVlKHJlcywgMCwgUFFmbnVtYmVyKHJlcywgImFnZ2NvbWJpbmVmbiIpKTsKKwlhZ2dz ZXJpYWxmbiA9IFBRZ2V0dmFsdWUocmVzLCAwLCBQUWZudW1iZXIocmVzLCAiYWdnc2VyaWFs Zm4iKSk7CisJYWdnZGVzZXJpYWxmbiA9IFBRZ2V0dmFsdWUocmVzLCAwLCBQUWZudW1iZXIo cmVzLCAiYWdnZGVzZXJpYWxmbiIpKTsKKwlhZ2dtdHJhbnNmbiA9IFBRZ2V0dmFsdWUocmVz LCAwLCBQUWZudW1iZXIocmVzLCAiYWdnbXRyYW5zZm4iKSk7CisJYWdnbWludnRyYW5zZm4g PSBQUWdldHZhbHVlKHJlcywgMCwgUFFmbnVtYmVyKHJlcywgImFnZ21pbnZ0cmFuc2ZuIikp OworCWFnZ21maW5hbGZuID0gUFFnZXR2YWx1ZShyZXMsIDAsIFBRZm51bWJlcihyZXMsICJh Z2dtZmluYWxmbiIpKTsKKwlhZ2dmaW5hbGV4dHJhID0gKFBRZ2V0dmFsdWUocmVzLCAwLCBQ UWZudW1iZXIocmVzLCAiYWdnZmluYWxleHRyYSIpKVswXSA9PSAndCcpOworCWFnZ21maW5h bGV4dHJhID0gKFBRZ2V0dmFsdWUocmVzLCAwLCBQUWZudW1iZXIocmVzLCAiYWdnbWZpbmFs ZXh0cmEiKSlbMF0gPT0gJ3QnKTsKKwlhZ2dmaW5hbG1vZGlmeSA9IFBRZ2V0dmFsdWUocmVz LCAwLCBQUWZudW1iZXIocmVzLCAiYWdnZmluYWxtb2RpZnkiKSlbMF07CisJYWdnbWZpbmFs bW9kaWZ5ID0gUFFnZXR2YWx1ZShyZXMsIDAsIFBRZm51bWJlcihyZXMsICJhZ2dtZmluYWxt b2RpZnkiKSlbMF07CisJYWdnc29ydG9wID0gUFFnZXR2YWx1ZShyZXMsIDAsIFBRZm51bWJl cihyZXMsICJhZ2dzb3J0b3AiKSk7CisJYWdna2luZCA9IFBRZ2V0dmFsdWUocmVzLCAwLCBQ UWZudW1iZXIocmVzLCAiYWdna2luZCIpKVswXTsKKwlhZ2d0cmFuc3R5cGUgPSBQUWdldHZh bHVlKHJlcywgMCwgUFFmbnVtYmVyKHJlcywgImFnZ3RyYW5zdHlwZSIpKTsKKwlhZ2d0cmFu c3NwYWNlID0gUFFnZXR2YWx1ZShyZXMsIDAsIFBRZm51bWJlcihyZXMsICJhZ2d0cmFuc3Nw YWNlIikpOworCWFnZ210cmFuc3R5cGUgPSBQUWdldHZhbHVlKHJlcywgMCwgUFFmbnVtYmVy KHJlcywgImFnZ210cmFuc3R5cGUiKSk7CisJYWdnbXRyYW5zc3BhY2UgPSBQUWdldHZhbHVl KHJlcywgMCwgUFFmbnVtYmVyKHJlcywgImFnZ210cmFuc3NwYWNlIikpOwogCWFnZ2luaXR2 YWwgPSBQUWdldHZhbHVlKHJlcywgMCwgaV9hZ2dpbml0dmFsKTsKIAlhZ2dtaW5pdHZhbCA9 IFBRZ2V0dmFsdWUocmVzLCAwLCBpX2FnZ21pbml0dmFsKTsKKwlwcm9wYXJhbGxlbCA9IFBR Z2V0dmFsdWUocmVzLCAwLCBQUWZudW1iZXIocmVzLCAicHJvcGFyYWxsZWwiKSk7CiAKIAlp ZiAoZm91dC0+cmVtb3RlVmVyc2lvbiA+PSA4MDQwMCkKIAl7CkBAIC0xNDE3NiwxMSArMTQw MDAsNiBAQCBkdW1wQWdnKEFyY2hpdmUgKmZvdXQsIEFnZ0luZm8gKmFnZ2luZm8pCiAKIAlh Z2dzaWdfdGFnID0gZm9ybWF0X2FnZ3JlZ2F0ZV9zaWduYXR1cmUoYWdnaW5mbywgZm91dCwg ZmFsc2UpOwogCi0JaWYgKGlfcHJvcGFyYWxsZWwgIT0gLTEpCi0JCXByb3BhcmFsbGVsID0g UFFnZXR2YWx1ZShyZXMsIDAsIFBRZm51bWJlcihyZXMsICJwcm9wYXJhbGxlbCIpKTsKLQll bHNlCi0JCXByb3BhcmFsbGVsID0gTlVMTDsKLQogCS8qIGlkZW50aWZ5IGRlZmF1bHQgbW9k aWZ5IGZsYWcgZm9yIGFnZ2tpbmQgKG11c3QgbWF0Y2ggRGVmaW5lQWdncmVnYXRlKSAqLwog CWRlZmF1bHRmaW5hbG1vZGlmeSA9IChhZ2draW5kID09IEFHR0tJTkRfTk9STUFMKSA/IEFH R01PRElGWV9SRUFEX09OTFkgOiBBR0dNT0RJRllfUkVBRF9XUklURTsKIAkvKiByZXBsYWNl IG9taXR0ZWQgZmxhZ3MgZm9yIG9sZCB2ZXJzaW9ucyAqLwpAQCAtMTQyOTksNyArMTQxMTgs NyBAQCBkdW1wQWdnKEFyY2hpdmUgKmZvdXQsIEFnZ0luZm8gKmFnZ2luZm8pCiAJaWYgKGFn Z2tpbmQgPT0gQUdHS0lORF9IWVBPVEhFVElDQUwpCiAJCWFwcGVuZFBRRXhwQnVmZmVyU3Ry KGRldGFpbHMsICIsXG4gICAgSFlQT1RIRVRJQ0FMIik7CiAKLQlpZiAocHJvcGFyYWxsZWwg IT0gTlVMTCAmJiBwcm9wYXJhbGxlbFswXSAhPSBQUk9QQVJBTExFTF9VTlNBRkUpCisJaWYg KHByb3BhcmFsbGVsWzBdICE9IFBST1BBUkFMTEVMX1VOU0FGRSkKIAl7CiAJCWlmIChwcm9w YXJhbGxlbFswXSA9PSBQUk9QQVJBTExFTF9TQUZFKQogCQkJYXBwZW5kUFFFeHBCdWZmZXJT dHIoZGV0YWlscywgIixcbiAgICBQQVJBTExFTCA9IHNhZmUiKTsKLS0gCjIuMjcuMAoK --------------7132AEAE61F49DC09CA3F107--