Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1hzzp3-0004lx-BT for pgsql-hackers@arkaria.postgresql.org; Tue, 20 Aug 2019 08:48:57 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.89) (envelope-from ) id 1hzzp2-0008Fd-1T for pgsql-hackers@arkaria.postgresql.org; Tue, 20 Aug 2019 08:48:56 +0000 Received: from makus.postgresql.org ([2001:4800:3e1:1::229]) by malur.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1hzzp0-0008FN-Oi for pgsql-hackers@lists.postgresql.org; Tue, 20 Aug 2019 08:48:55 +0000 Received: from out4-smtp.messagingengine.com ([66.111.4.28]) by makus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.92) (envelope-from ) id 1hzzox-0003d3-5a for pgsql-hackers@postgresql.org; Tue, 20 Aug 2019 08:48:53 +0000 Received: from compute7.internal (compute7.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id 7EE3D22293 for ; Tue, 20 Aug 2019 04:48:49 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute7.internal (MEProxy); Tue, 20 Aug 2019 04:48:49 -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=AobPyI/2SQO0qbPIbDMVbGSyy/3j/ s3jfkI3zq0EmLc=; b=XqxbMHw5UF4UQa3LRCQC7WqO48YvghqzMbctiDgJra9Pk UhN9ucJZpDy+ZKqyUPHrOUFLKiX3+E+fzLlGDil67IrwbxSlIt2OhiWSBTj4s+GQ 7JrqOVn31fK6fn/fiRfCR1PYdh0IUjunnFIB0aiNdDfxpq0NeAm3d3JOohKBlbdZ u+efObf/iCN4JzlUdyb6CBppQYDOJwLhoh127ajmw9yFYxu3G7sjZVU3MrVuO0oH upl1ErBfIqCFa2Uq7nkFiBFVpPo+WikasPR1WbpUrmQW4XLMKvgyDY8EwEH+JqP2 +T9kA1YN57UlgwtoWR9DA+T3QIF6ODB0nxGlnUlqw== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduvddrudeguddgtdeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefvhffuohfkffgfgggtsehmtderre dtfeejnecuhfhrohhmpefrvghtvghrucfgihhsvghnthhrrghuthcuoehpvghtvghrrdgv ihhsvghnthhrrghuthesvdhnughquhgrughrrghnthdrtghomheqnecuffhomhgrihhnpe dvnhguqhhurggurhgrnhhtrdgtohhmnecukfhppedujeeirdelrddvtddurddutdenucfr rghrrghmpehmrghilhhfrhhomhepphgvthgvrhdrvghishgvnhhtrhgruhhtsedvnhguqh hurggurhgrnhhtrdgtohhmnecuvehluhhsthgvrhfuihiivgeptd X-ME-Proxy: Received: from april.pezone.net (static.10.201.9.176.clients.your-server.de [176.9.201.10]) by mail.messagingengine.com (Postfix) with ESMTPA id 65BE1380075 for ; Tue, 20 Aug 2019 04:48:48 -0400 (EDT) To: pgsql-hackers From: Peter Eisentraut Subject: Make SQL/JSON error code names match SQL standard Openpgp: preference=signencrypt Autocrypt: addr=peter.eisentraut@2ndquadrant.com; prefer-encrypt=mutual; keydata= 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 3jI= Organization: 2ndQuadrant Message-ID: <86b67eef-bb26-c97d-3e35-64f1fbd4f9fe@2ndquadrant.com> Date: Tue, 20 Aug 2019 10:48:47 +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="------------B842EE7BF7B1052E453B440F" 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. --------------B842EE7BF7B1052E453B440F Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit I propose the attached patch to make the new SQL/JSON error code names match the SQL standard. The existing minor differences don't seem necessary. -- Peter Eisentraut http://www.2ndQuadrant.com/ PostgreSQL Development, 24x7 Support, Remote DBA, Training & Services --------------B842EE7BF7B1052E453B440F Content-Type: text/plain; charset=UTF-8; x-mac-type="0"; x-mac-creator="0"; name="0001-Make-SQL-JSON-error-code-names-match-SQL-standard.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename*0="0001-Make-SQL-JSON-error-code-names-match-SQL-standard.patch" RnJvbSAwMjYyOTlmMzI1ZTdkMmFmYmNkNmM3N2I1OGUyOTY4ZTg4ZTVmNzAwIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQZXRlciBFaXNlbnRyYXV0IDxwZXRlckBlaXNlbnRy YXV0Lm9yZz4KRGF0ZTogVHVlLCAyMCBBdWcgMjAxOSAxMDo0NjozMiArMDIwMApTdWJqZWN0 OiBbUEFUQ0hdIE1ha2UgU1FML0pTT04gZXJyb3IgY29kZSBuYW1lcyBtYXRjaCBTUUwgc3Rh bmRhcmQKCi0tLQogc3JjL2JhY2tlbmQvdXRpbHMvYWR0L2pzb25wYXRoX2V4ZWMuYyB8IDM2 ICsrKysrKysrKysrKystLS0tLS0tLS0tLS0tLQogc3JjL2JhY2tlbmQvdXRpbHMvZXJyY29k ZXMudHh0ICAgICAgICB8IDIyICsrKysrKysrLS0tLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwg MjkgaW5zZXJ0aW9ucygrKSwgMjkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvc3JjL2Jh Y2tlbmQvdXRpbHMvYWR0L2pzb25wYXRoX2V4ZWMuYyBiL3NyYy9iYWNrZW5kL3V0aWxzL2Fk dC9qc29ucGF0aF9leGVjLmMKaW5kZXggOGFiNTYzZmRlZC4uMjJlYzU3OGQ3NyAxMDA2NDQK LS0tIGEvc3JjL2JhY2tlbmQvdXRpbHMvYWR0L2pzb25wYXRoX2V4ZWMuYworKysgYi9zcmMv YmFja2VuZC91dGlscy9hZHQvanNvbnBhdGhfZXhlYy5jCkBAIC0zMzYsNyArMzM2LDcgQEAg anNvbmJfcGF0aF9tYXRjaChQR19GVU5DVElPTl9BUkdTKQogCiAJaWYgKCFzaWxlbnQpCiAJ CWVyZXBvcnQoRVJST1IsCi0JCQkJKGVycmNvZGUoRVJSQ09ERV9TSU5HTEVUT05fSlNPTl9J VEVNX1JFUVVJUkVEKSwKKwkJCQkoZXJyY29kZShFUlJDT0RFX1NJTkdMRVRPTl9TUUxfSlNP Tl9JVEVNX1JFUVVJUkVEKSwKIAkJCQkgZXJybXNnKCJzaW5nbGUgYm9vbGVhbiByZXN1bHQg aXMgZXhwZWN0ZWQiKSkpOwogCiAJUEdfUkVUVVJOX05VTEwoKTsKQEAgLTYwMSw3ICs2MDEs NyBAQCBleGVjdXRlSXRlbU9wdFVud3JhcFRhcmdldChKc29uUGF0aEV4ZWNDb250ZXh0ICpj eHQsIEpzb25QYXRoSXRlbSAqanNwLAogCQkJCQkJcmV0dXJuIGpwZXJFcnJvcjsKIAogCQkJ CQllcmVwb3J0KEVSUk9SLAotCQkJCQkJCShlcnJjb2RlKEVSUkNPREVfSlNPTl9NRU1CRVJf Tk9UX0ZPVU5EKSwgXAorCQkJCQkJCShlcnJjb2RlKEVSUkNPREVfU1FMX0pTT05fTUVNQkVS X05PVF9GT1VORCksIFwKIAkJCQkJCQkgZXJybXNnKCJKU09OIG9iamVjdCBkb2VzIG5vdCBj b250YWluIGtleSBcIiVzXCIiLAogCQkJCQkJCQkJcG5zdHJkdXAoa2V5LnZhbC5zdHJpbmcu dmFsLAogCQkJCQkJCQkJCQkga2V5LnZhbC5zdHJpbmcubGVuKSkpKTsKQEAgLTYxMyw3ICs2 MTMsNyBAQCBleGVjdXRlSXRlbU9wdFVud3JhcFRhcmdldChKc29uUGF0aEV4ZWNDb250ZXh0 ICpjeHQsIEpzb25QYXRoSXRlbSAqanNwLAogCQkJewogCQkJCUFzc2VydChmb3VuZCk7CiAJ CQkJUkVUVVJOX0VSUk9SKGVyZXBvcnQoRVJST1IsCi0JCQkJCQkJCQkgKGVycmNvZGUoRVJS Q09ERV9KU09OX01FTUJFUl9OT1RfRk9VTkQpLAorCQkJCQkJCQkJIChlcnJjb2RlKEVSUkNP REVfU1FMX0pTT05fTUVNQkVSX05PVF9GT1VORCksCiAJCQkJCQkJCQkgIGVycm1zZygianNv bnBhdGggbWVtYmVyIGFjY2Vzc29yIGNhbiBvbmx5IGJlIGFwcGxpZWQgdG8gYW4gb2JqZWN0 IikpKSk7CiAJCQl9CiAJCQlicmVhazsKQEAgLTY0Miw3ICs2NDIsNyBAQCBleGVjdXRlSXRl bU9wdFVud3JhcFRhcmdldChKc29uUGF0aEV4ZWNDb250ZXh0ICpjeHQsIEpzb25QYXRoSXRl bSAqanNwLAogCQkJCXJlcyA9IGV4ZWN1dGVOZXh0SXRlbShjeHQsIGpzcCwgTlVMTCwgamIs IGZvdW5kLCB0cnVlKTsKIAkJCWVsc2UgaWYgKCFqc3BJZ25vcmVTdHJ1Y3R1cmFsRXJyb3Jz KGN4dCkpCiAJCQkJUkVUVVJOX0VSUk9SKGVyZXBvcnQoRVJST1IsCi0JCQkJCQkJCQkgKGVy cmNvZGUoRVJSQ09ERV9KU09OX0FSUkFZX05PVF9GT1VORCksCisJCQkJCQkJCQkgKGVycmNv ZGUoRVJSQ09ERV9TUUxfSlNPTl9BUlJBWV9OT1RfRk9VTkQpLAogCQkJCQkJCQkJICBlcnJt c2coImpzb25wYXRoIHdpbGRjYXJkIGFycmF5IGFjY2Vzc29yIGNhbiBvbmx5IGJlIGFwcGxp ZWQgdG8gYW4gYXJyYXkiKSkpKTsKIAkJCWJyZWFrOwogCkBAIC02OTAsNyArNjkwLDcgQEAg ZXhlY3V0ZUl0ZW1PcHRVbndyYXBUYXJnZXQoSnNvblBhdGhFeGVjQ29udGV4dCAqY3h0LCBK c29uUGF0aEl0ZW0gKmpzcCwKIAkJCQkJCSBpbmRleF9mcm9tID4gaW5kZXhfdG8gfHwKIAkJ CQkJCSBpbmRleF90byA+PSBzaXplKSkKIAkJCQkJCVJFVFVSTl9FUlJPUihlcmVwb3J0KEVS Uk9SLAotCQkJCQkJCQkJCQkgKGVycmNvZGUoRVJSQ09ERV9JTlZBTElEX0pTT05fU1VCU0NS SVBUKSwKKwkJCQkJCQkJCQkJIChlcnJjb2RlKEVSUkNPREVfSU5WQUxJRF9TUUxfSlNPTl9T VUJTQ1JJUFQpLAogCQkJCQkJCQkJCQkgIGVycm1zZygianNvbnBhdGggYXJyYXkgc3Vic2Ny aXB0IGlzIG91dCBvZiBib3VuZHMiKSkpKTsKIAogCQkJCQlpZiAoaW5kZXhfZnJvbSA8IDAp CkBAIC03NDcsNyArNzQ3LDcgQEAgZXhlY3V0ZUl0ZW1PcHRVbndyYXBUYXJnZXQoSnNvblBh dGhFeGVjQ29udGV4dCAqY3h0LCBKc29uUGF0aEl0ZW0gKmpzcCwKIAkJCWVsc2UgaWYgKCFq c3BJZ25vcmVTdHJ1Y3R1cmFsRXJyb3JzKGN4dCkpCiAJCQl7CiAJCQkJUkVUVVJOX0VSUk9S KGVyZXBvcnQoRVJST1IsCi0JCQkJCQkJCQkgKGVycmNvZGUoRVJSQ09ERV9KU09OX0FSUkFZ X05PVF9GT1VORCksCisJCQkJCQkJCQkgKGVycmNvZGUoRVJSQ09ERV9TUUxfSlNPTl9BUlJB WV9OT1RfRk9VTkQpLAogCQkJCQkJCQkJICBlcnJtc2coImpzb25wYXRoIGFycmF5IGFjY2Vz c29yIGNhbiBvbmx5IGJlIGFwcGxpZWQgdG8gYW4gYXJyYXkiKSkpKTsKIAkJCX0KIAkJCWJy ZWFrOwpAQCAtODAxLDcgKzgwMSw3IEBAIGV4ZWN1dGVJdGVtT3B0VW53cmFwVGFyZ2V0KEpz b25QYXRoRXhlY0NvbnRleHQgKmN4dCwgSnNvblBhdGhJdGVtICpqc3AsCiAJCQl7CiAJCQkJ QXNzZXJ0KGZvdW5kKTsKIAkJCQlSRVRVUk5fRVJST1IoZXJlcG9ydChFUlJPUiwKLQkJCQkJ CQkJCSAoZXJyY29kZShFUlJDT0RFX0pTT05fT0JKRUNUX05PVF9GT1VORCksCisJCQkJCQkJ CQkgKGVycmNvZGUoRVJSQ09ERV9TUUxfSlNPTl9PQkpFQ1RfTk9UX0ZPVU5EKSwKIAkJCQkJ CQkJCSAgZXJybXNnKCJqc29ucGF0aCB3aWxkY2FyZCBtZW1iZXIgYWNjZXNzb3IgY2FuIG9u bHkgYmUgYXBwbGllZCB0byBhbiBvYmplY3QiKSkpKTsKIAkJCX0KIAkJCWJyZWFrOwpAQCAt OTMxLDcgKzkzMSw3IEBAIGV4ZWN1dGVJdGVtT3B0VW53cmFwVGFyZ2V0KEpzb25QYXRoRXhl Y0NvbnRleHQgKmN4dCwgSnNvblBhdGhJdGVtICpqc3AsCiAJCQkJCXsKIAkJCQkJCWlmICgh anNwSWdub3JlU3RydWN0dXJhbEVycm9ycyhjeHQpKQogCQkJCQkJCVJFVFVSTl9FUlJPUihl cmVwb3J0KEVSUk9SLAotCQkJCQkJCQkJCQkJIChlcnJjb2RlKEVSUkNPREVfSlNPTl9BUlJB WV9OT1RfRk9VTkQpLAorCQkJCQkJCQkJCQkJIChlcnJjb2RlKEVSUkNPREVfU1FMX0pTT05f QVJSQVlfTk9UX0ZPVU5EKSwKIAkJCQkJCQkJCQkJCSAgZXJybXNnKCJqc29ucGF0aCBpdGVt IG1ldGhvZCAuJXMoKSBjYW4gb25seSBiZSBhcHBsaWVkIHRvIGFuIGFycmF5IiwKIAkJCQkJ CQkJCQkJCQkJIGpzcE9wZXJhdGlvbk5hbWUoanNwLT50eXBlKSkpKSk7CiAJCQkJCQlicmVh azsKQEAgLTk4NSw3ICs5ODUsNyBAQCBleGVjdXRlSXRlbU9wdFVud3JhcFRhcmdldChKc29u UGF0aEV4ZWNDb250ZXh0ICpjeHQsIEpzb25QYXRoSXRlbSAqanNwLAogCiAJCQkJCWlmICho YXZlX2Vycm9yKQogCQkJCQkJUkVUVVJOX0VSUk9SKGVyZXBvcnQoRVJST1IsCi0JCQkJCQkJ CQkJCSAoZXJyY29kZShFUlJDT0RFX05PTl9OVU1FUklDX0pTT05fSVRFTSksCisJCQkJCQkJ CQkJCSAoZXJyY29kZShFUlJDT0RFX05PTl9OVU1FUklDX1NRTF9KU09OX0lURU0pLAogCQkJ CQkJCQkJCQkgIGVycm1zZygianNvbnBhdGggaXRlbSBtZXRob2QgLiVzKCkgY2FuIG9ubHkg YmUgYXBwbGllZCB0byBhIG51bWVyaWMgdmFsdWUiLAogCQkJCQkJCQkJCQkJCSBqc3BPcGVy YXRpb25OYW1lKGpzcC0+dHlwZSkpKSkpOwogCQkJCQlyZXMgPSBqcGVyT2s7CkBAIC0xMDA2 LDcgKzEwMDYsNyBAQCBleGVjdXRlSXRlbU9wdFVud3JhcFRhcmdldChKc29uUGF0aEV4ZWND b250ZXh0ICpjeHQsIEpzb25QYXRoSXRlbSAqanNwLAogCiAJCQkJCWlmIChoYXZlX2Vycm9y IHx8IGlzaW5mKHZhbCkpCiAJCQkJCQlSRVRVUk5fRVJST1IoZXJlcG9ydChFUlJPUiwKLQkJ CQkJCQkJCQkJIChlcnJjb2RlKEVSUkNPREVfTk9OX05VTUVSSUNfSlNPTl9JVEVNKSwKKwkJ CQkJCQkJCQkJIChlcnJjb2RlKEVSUkNPREVfTk9OX05VTUVSSUNfU1FMX0pTT05fSVRFTSks CiAJCQkJCQkJCQkJCSAgZXJybXNnKCJqc29ucGF0aCBpdGVtIG1ldGhvZCAuJXMoKSBjYW4g b25seSBiZSBhcHBsaWVkIHRvIGEgbnVtZXJpYyB2YWx1ZSIsCiAJCQkJCQkJCQkJCQkJIGpz cE9wZXJhdGlvbk5hbWUoanNwLT50eXBlKSkpKSk7CiAKQEAgLTEwMTksNyArMTAxOSw3IEBA IGV4ZWN1dGVJdGVtT3B0VW53cmFwVGFyZ2V0KEpzb25QYXRoRXhlY0NvbnRleHQgKmN4dCwg SnNvblBhdGhJdGVtICpqc3AsCiAKIAkJCQlpZiAocmVzID09IGpwZXJOb3RGb3VuZCkKIAkJ CQkJUkVUVVJOX0VSUk9SKGVyZXBvcnQoRVJST1IsCi0JCQkJCQkJCQkJIChlcnJjb2RlKEVS UkNPREVfTk9OX05VTUVSSUNfSlNPTl9JVEVNKSwKKwkJCQkJCQkJCQkgKGVycmNvZGUoRVJS Q09ERV9OT05fTlVNRVJJQ19TUUxfSlNPTl9JVEVNKSwKIAkJCQkJCQkJCQkgIGVycm1zZygi anNvbnBhdGggaXRlbSBtZXRob2QgLiVzKCkgY2FuIG9ubHkgYmUgYXBwbGllZCB0byBhIHN0 cmluZyBvciBudW1lcmljIHZhbHVlIiwKIAkJCQkJCQkJCQkJCSBqc3BPcGVyYXRpb25OYW1l KGpzcC0+dHlwZSkpKSkpOwogCkBAIC0xNTAzLDE0ICsxNTAzLDE0IEBAIGV4ZWN1dGVCaW5h cnlBcml0aG1FeHByKEpzb25QYXRoRXhlY0NvbnRleHQgKmN4dCwgSnNvblBhdGhJdGVtICpq c3AsCiAJaWYgKEpzb25WYWx1ZUxpc3RMZW5ndGgoJmxzZXEpICE9IDEgfHwKIAkJIShsdmFs ID0gZ2V0U2NhbGFyKEpzb25WYWx1ZUxpc3RIZWFkKCZsc2VxKSwgamJ2TnVtZXJpYykpKQog CQlSRVRVUk5fRVJST1IoZXJlcG9ydChFUlJPUiwKLQkJCQkJCQkgKGVycmNvZGUoRVJSQ09E RV9TSU5HTEVUT05fSlNPTl9JVEVNX1JFUVVJUkVEKSwKKwkJCQkJCQkgKGVycmNvZGUoRVJS Q09ERV9TSU5HTEVUT05fU1FMX0pTT05fSVRFTV9SRVFVSVJFRCksCiAJCQkJCQkJICBlcnJt c2coImxlZnQgb3BlcmFuZCBvZiBqc29ucGF0aCBvcGVyYXRvciAlcyBpcyBub3QgYSBzaW5n bGUgbnVtZXJpYyB2YWx1ZSIsCiAJCQkJCQkJCQkganNwT3BlcmF0aW9uTmFtZShqc3AtPnR5 cGUpKSkpKTsKIAogCWlmIChKc29uVmFsdWVMaXN0TGVuZ3RoKCZyc2VxKSAhPSAxIHx8CiAJ CSEocnZhbCA9IGdldFNjYWxhcihKc29uVmFsdWVMaXN0SGVhZCgmcnNlcSksIGpidk51bWVy aWMpKSkKIAkJUkVUVVJOX0VSUk9SKGVyZXBvcnQoRVJST1IsCi0JCQkJCQkJIChlcnJjb2Rl KEVSUkNPREVfU0lOR0xFVE9OX0pTT05fSVRFTV9SRVFVSVJFRCksCisJCQkJCQkJIChlcnJj b2RlKEVSUkNPREVfU0lOR0xFVE9OX1NRTF9KU09OX0lURU1fUkVRVUlSRUQpLAogCQkJCQkJ CSAgZXJybXNnKCJyaWdodCBvcGVyYW5kIG9mIGpzb25wYXRoIG9wZXJhdG9yICVzIGlzIG5v dCBhIHNpbmdsZSBudW1lcmljIHZhbHVlIiwKIAkJCQkJCQkJCSBqc3BPcGVyYXRpb25OYW1l KGpzcC0+dHlwZSkpKSkpOwogCkBAIC0xNTc4LDcgKzE1NzgsNyBAQCBleGVjdXRlVW5hcnlB cml0aG1FeHByKEpzb25QYXRoRXhlY0NvbnRleHQgKmN4dCwgSnNvblBhdGhJdGVtICpqc3As CiAJCQkJY29udGludWU7CQkvKiBza2lwIG5vbi1udW1lcmljcyBwcm9jZXNzaW5nICovCiAK IAkJCVJFVFVSTl9FUlJPUihlcmVwb3J0KEVSUk9SLAotCQkJCQkJCQkgKGVycmNvZGUoRVJS Q09ERV9KU09OX05VTUJFUl9OT1RfRk9VTkQpLAorCQkJCQkJCQkgKGVycmNvZGUoRVJSQ09E RV9TUUxfSlNPTl9OVU1CRVJfTk9UX0ZPVU5EKSwKIAkJCQkJCQkJICBlcnJtc2coIm9wZXJh bmQgb2YgdW5hcnkganNvbnBhdGggb3BlcmF0b3IgJXMgaXMgbm90IGEgbnVtZXJpYyB2YWx1 ZSIsCiAJCQkJCQkJCQkJIGpzcE9wZXJhdGlvbk5hbWUoanNwLT50eXBlKSkpKSk7CiAJCX0K QEAgLTE3MDAsNyArMTcwMCw3IEBAIGV4ZWN1dGVOdW1lcmljSXRlbU1ldGhvZChKc29uUGF0 aEV4ZWNDb250ZXh0ICpjeHQsIEpzb25QYXRoSXRlbSAqanNwLAogCiAJaWYgKCEoamIgPSBn ZXRTY2FsYXIoamIsIGpidk51bWVyaWMpKSkKIAkJUkVUVVJOX0VSUk9SKGVyZXBvcnQoRVJS T1IsCi0JCQkJCQkJIChlcnJjb2RlKEVSUkNPREVfTk9OX05VTUVSSUNfSlNPTl9JVEVNKSwK KwkJCQkJCQkgKGVycmNvZGUoRVJSQ09ERV9OT05fTlVNRVJJQ19TUUxfSlNPTl9JVEVNKSwK IAkJCQkJCQkgIGVycm1zZygianNvbnBhdGggaXRlbSBtZXRob2QgLiVzKCkgY2FuIG9ubHkg YmUgYXBwbGllZCB0byBhIG51bWVyaWMgdmFsdWUiLAogCQkJCQkJCQkJIGpzcE9wZXJhdGlv bk5hbWUoanNwLT50eXBlKSkpKSk7CiAKQEAgLTE3NTksNyArMTc1OSw3IEBAIGV4ZWN1dGVL ZXlWYWx1ZU1ldGhvZChKc29uUGF0aEV4ZWNDb250ZXh0ICpjeHQsIEpzb25QYXRoSXRlbSAq anNwLAogCiAJaWYgKEpzb25iVHlwZShqYikgIT0gamJ2T2JqZWN0IHx8IGpiLT50eXBlICE9 IGpidkJpbmFyeSkKIAkJUkVUVVJOX0VSUk9SKGVyZXBvcnQoRVJST1IsCi0JCQkJCQkJIChl cnJjb2RlKEVSUkNPREVfSlNPTl9PQkpFQ1RfTk9UX0ZPVU5EKSwKKwkJCQkJCQkgKGVycmNv ZGUoRVJSQ09ERV9TUUxfSlNPTl9PQkpFQ1RfTk9UX0ZPVU5EKSwKIAkJCQkJCQkgIGVycm1z ZygianNvbnBhdGggaXRlbSBtZXRob2QgLiVzKCkgY2FuIG9ubHkgYmUgYXBwbGllZCB0byBh biBvYmplY3QiLAogCQkJCQkJCQkJIGpzcE9wZXJhdGlvbk5hbWUoanNwLT50eXBlKSkpKSk7 CiAKQEAgLTIxODksNyArMjE4OSw3IEBAIGdldEFycmF5SW5kZXgoSnNvblBhdGhFeGVjQ29u dGV4dCAqY3h0LCBKc29uUGF0aEl0ZW0gKmpzcCwgSnNvbmJWYWx1ZSAqamIsCiAJaWYgKEpz b25WYWx1ZUxpc3RMZW5ndGgoJmZvdW5kKSAhPSAxIHx8CiAJCSEoamJ2ID0gZ2V0U2NhbGFy KEpzb25WYWx1ZUxpc3RIZWFkKCZmb3VuZCksIGpidk51bWVyaWMpKSkKIAkJUkVUVVJOX0VS Uk9SKGVyZXBvcnQoRVJST1IsCi0JCQkJCQkJIChlcnJjb2RlKEVSUkNPREVfSU5WQUxJRF9K U09OX1NVQlNDUklQVCksCisJCQkJCQkJIChlcnJjb2RlKEVSUkNPREVfSU5WQUxJRF9TUUxf SlNPTl9TVUJTQ1JJUFQpLAogCQkJCQkJCSAgZXJybXNnKCJqc29ucGF0aCBhcnJheSBzdWJz Y3JpcHQgaXMgbm90IGEgc2luZ2xlIG51bWVyaWMgdmFsdWUiKSkpKTsKIAogCW51bWVyaWNf aW5kZXggPSBEaXJlY3RGdW5jdGlvbkNhbGwyKG51bWVyaWNfdHJ1bmMsCkBAIC0yMjAxLDcg KzIyMDEsNyBAQCBnZXRBcnJheUluZGV4KEpzb25QYXRoRXhlY0NvbnRleHQgKmN4dCwgSnNv blBhdGhJdGVtICpqc3AsIEpzb25iVmFsdWUgKmpiLAogCiAJaWYgKGhhdmVfZXJyb3IpCiAJ CVJFVFVSTl9FUlJPUihlcmVwb3J0KEVSUk9SLAotCQkJCQkJCSAoZXJyY29kZShFUlJDT0RF X0lOVkFMSURfSlNPTl9TVUJTQ1JJUFQpLAorCQkJCQkJCSAoZXJyY29kZShFUlJDT0RFX0lO VkFMSURfU1FMX0pTT05fU1VCU0NSSVBUKSwKIAkJCQkJCQkgIGVycm1zZygianNvbnBhdGgg YXJyYXkgc3Vic2NyaXB0IGlzIG91dCBvZiBpbnRlZ2VyIHJhbmdlIikpKSk7CiAKIAlyZXR1 cm4ganBlck9rOwpkaWZmIC0tZ2l0IGEvc3JjL2JhY2tlbmQvdXRpbHMvZXJyY29kZXMudHh0 IGIvc3JjL2JhY2tlbmQvdXRpbHMvZXJyY29kZXMudHh0CmluZGV4IDE2ZjVjYTIzM2EuLjg2 N2U5OGI2OTAgMTAwNjQ0Ci0tLSBhL3NyYy9iYWNrZW5kL3V0aWxzL2VycmNvZGVzLnR4dAor KysgYi9zcmMvYmFja2VuZC91dGlscy9lcnJjb2Rlcy50eHQKQEAgLTIwOCwxOSArMjA4LDE5 IEBAIFNlY3Rpb246IENsYXNzIDIyIC0gRGF0YSBFeGNlcHRpb24KIDIyMDBUICAgIEUgICAg RVJSQ09ERV9JTlZBTElEX1hNTF9QUk9DRVNTSU5HX0lOU1RSVUNUSU9OICAgICAgICAgICAg ICAgICAgICAgaW52YWxpZF94bWxfcHJvY2Vzc2luZ19pbnN0cnVjdGlvbgogMjIwMzAgICAg RSAgICBFUlJDT0RFX0RVUExJQ0FURV9KU09OX09CSkVDVF9LRVlfVkFMVUUgICAgICAgICAg ICAgICAgICAgICAgICBkdXBsaWNhdGVfanNvbl9vYmplY3Rfa2V5X3ZhbHVlCiAyMjAzMiAg ICBFICAgIEVSUkNPREVfSU5WQUxJRF9KU09OX1RFWFQgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGludmFsaWRfanNvbl90ZXh0Ci0yMjAzMyAgICBFICAgIEVSUkNP REVfSU5WQUxJRF9KU09OX1NVQlNDUklQVCAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGludmFsaWRfanNvbl9zdWJzY3JpcHQKLTIyMDM0ICAgIEUgICAgRVJSQ09ERV9NT1JF X1RIQU5fT05FX0pTT05fSVRFTSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbW9y ZV90aGFuX29uZV9qc29uX2l0ZW0KLTIyMDM1ICAgIEUgICAgRVJSQ09ERV9OT19KU09OX0lU RU0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbm9fanNvbl9p dGVtCi0yMjAzNiAgICBFICAgIEVSUkNPREVfTk9OX05VTUVSSUNfSlNPTl9JVEVNICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIG5vbl9udW1lcmljX2pzb25faXRlbQotMjIw MzcgICAgRSAgICBFUlJDT0RFX05PTl9VTklRVUVfS0VZU19JTl9KU09OX09CSkVDVCAgICAg ICAgICAgICAgICAgICAgICAgICBub25fdW5pcXVlX2tleXNfaW5fanNvbl9vYmplY3QKLTIy MDM4ICAgIEUgICAgRVJSQ09ERV9TSU5HTEVUT05fSlNPTl9JVEVNX1JFUVVJUkVEICAgICAg ICAgICAgICAgICAgICAgICAgICAgc2luZ2xldG9uX2pzb25faXRlbV9yZXF1aXJlZAotMjIw MzkgICAgRSAgICBFUlJDT0RFX0pTT05fQVJSQVlfTk9UX0ZPVU5EICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBqc29uX2FycmF5X25vdF9mb3VuZAotMjIwM0EgICAgRSAg ICBFUlJDT0RFX0pTT05fTUVNQkVSX05PVF9GT1VORCAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBqc29uX21lbWJlcl9ub3RfZm91bmQKLTIyMDNCICAgIEUgICAgRVJSQ09E RV9KU09OX05VTUJFUl9OT1RfRk9VTkQgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAganNvbl9udW1iZXJfbm90X2ZvdW5kCi0yMjAzQyAgICBFICAgIEVSUkNPREVfSlNPTl9P QkpFQ1RfTk9UX0ZPVU5EICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG9iamVj dF9ub3RfZm91bmQKLTIyMDNGICAgIEUgICAgRVJSQ09ERV9KU09OX1NDQUxBUl9SRVFVSVJF RCAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAganNvbl9zY2FsYXJfcmVxdWly ZWQKKzIyMDMzICAgIEUgICAgRVJSQ09ERV9JTlZBTElEX1NRTF9KU09OX1NVQlNDUklQVCAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgaW52YWxpZF9zcWxfanNvbl9zdWJzY3JpcHQK KzIyMDM0ICAgIEUgICAgRVJSQ09ERV9NT1JFX1RIQU5fT05FX1NRTF9KU09OX0lURU0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgbW9yZV90aGFuX29uZV9zcWxfanNvbl9pdGVtCisy MjAzNSAgICBFICAgIEVSUkNPREVfTk9fU1FMX0pTT05fSVRFTSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIG5vX3NxbF9qc29uX2l0ZW0KKzIyMDM2ICAgIEUgICAg RVJSQ09ERV9OT05fTlVNRVJJQ19TUUxfSlNPTl9JVEVNICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgbm9uX251bWVyaWNfc3FsX2pzb25faXRlbQorMjIwMzcgICAgRSAgICBFUlJD T0RFX05PTl9VTklRVUVfS0VZU19JTl9BX0pTT05fT0JKRUNUICAgICAgICAgICAgICAgICAg ICAgICBub25fdW5pcXVlX2tleXNfaW5fYV9qc29uX29iamVjdAorMjIwMzggICAgRSAgICBF UlJDT0RFX1NJTkdMRVRPTl9TUUxfSlNPTl9JVEVNX1JFUVVJUkVEICAgICAgICAgICAgICAg ICAgICAgICBzaW5nbGV0b25fc3FsX2pzb25faXRlbV9yZXF1aXJlZAorMjIwMzkgICAgRSAg ICBFUlJDT0RFX1NRTF9KU09OX0FSUkFZX05PVF9GT1VORCAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBzcWxfanNvbl9hcnJheV9ub3RfZm91bmQKKzIyMDNBICAgIEUgICAgRVJS Q09ERV9TUUxfSlNPTl9NRU1CRVJfTk9UX0ZPVU5EICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgc3FsX2pzb25fbWVtYmVyX25vdF9mb3VuZAorMjIwM0IgICAgRSAgICBFUlJDT0RF X1NRTF9KU09OX05VTUJFUl9OT1RfRk9VTkQgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBzcWxfanNvbl9udW1iZXJfbm90X2ZvdW5kCisyMjAzQyAgICBFICAgIEVSUkNPREVfU1FM X0pTT05fT0JKRUNUX05PVF9GT1VORCAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNx bF9qc29uX29iamVjdF9ub3RfZm91bmQKIDIyMDNEICAgIEUgICAgRVJSQ09ERV9UT09fTUFO WV9KU09OX0FSUkFZX0VMRU1FTlRTICAgICAgICAgICAgICAgICAgICAgICAgICAgdG9vX21h bnlfanNvbl9hcnJheV9lbGVtZW50cwogMjIwM0UgICAgRSAgICBFUlJDT0RFX1RPT19NQU5Z X0pTT05fT0JKRUNUX01FTUJFUlMgICAgICAgICAgICAgICAgICAgICAgICAgICB0b29fbWFu eV9qc29uX29iamVjdF9tZW1iZXJzCisyMjAzRiAgICBFICAgIEVSUkNPREVfU1FMX0pTT05f U0NBTEFSX1JFUVVJUkVEICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNxbF9qc29u X3NjYWxhcl9yZXF1aXJlZAogCiBTZWN0aW9uOiBDbGFzcyAyMyAtIEludGVncml0eSBDb25z dHJhaW50IFZpb2xhdGlvbgogCi0tIAoyLjIyLjAKCg== --------------B842EE7BF7B1052E453B440F--