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 1nGylo-0005gp-6e for pgsql-hackers@arkaria.postgresql.org; Mon, 07 Feb 2022 07:49:08 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.92) (envelope-from ) id 1nGylm-0001OO-Pa for pgsql-hackers@arkaria.postgresql.org; Mon, 07 Feb 2022 07:49:06 +0000 Received: from magus.postgresql.org ([2a02:c0:301:0:ffff::29]) by malur.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nGyll-0001OE-EB for pgsql-hackers@lists.postgresql.org; Mon, 07 Feb 2022 07:49:06 +0000 Received: from out4-smtp.messagingengine.com ([66.111.4.28]) by magus.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nGylc-0002xT-OZ for pgsql-hackers@postgresql.org; Mon, 07 Feb 2022 07:49:04 +0000 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 744C45C00E9 for ; Mon, 7 Feb 2022 02:48:53 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Mon, 07 Feb 2022 02:48:53 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:date:from:from :in-reply-to:message-id:mime-version:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; bh=TxDqkvErntK9BnXOL/AFqmDjGrvsTm3w2vgpK2h7/ 4g=; b=FZcriOv1lVz68ObXs+9ZW694McY7AXXL9j57JEjtZiTtw/M0nbXs4TwJc CDC1zK6cNhxmM2eCBh9CnbBq+H6gWTKjKIocx+ZoGrEX6gvj/8ljSwE104d2VdRO Ci7uzoqLjIvmbehS7OGAk/RpFLDICSfiwvtOn9sxlQDfV/J3y9xk/aboqNOJ5iA+ 6zEbI+WC9dZOmsSjEpI7ndQmKoqnpgLYHp2qySND1ZWNsK1WarRt+NGaRHHinVQV FCJ2zEI+/WkWhvGVp/L4XJ8xfqeq8C++PeXsiSnMmH1go3ON8+OMbQfc9DcYGPIM DZxDGaiXg6nYczjdjS0jpR6v1aAGA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvvddrheeggddutdelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpegtkfffgggfhffuvfesmhdtreertd efjeenucfhrhhomheprfgvthgvrhcugfhishgvnhhtrhgruhhtuceophgvthgvrhdrvghi shgvnhhtrhgruhhtsegvnhhtvghrphhrihhsvggusgdrtghomheqnecuggftrfgrthhtvg hrnhepteevuedvieekieeghfevfffhhfdvjeevleelfeeikeeikedvffegteekuddtfeel necuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepphgvth gvrhdrvghishgvnhhtrhgruhhtsegvnhhtvghrphhrihhsvggusgdrtghomh X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Mon, 7 Feb 2022 02:48:52 -0500 (EST) Content-Type: multipart/mixed; boundary="------------PvWpm3Gq9Oi4CV173sfuBdph" Message-ID: Date: Mon, 7 Feb 2022 08:48:50 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:91.0) Gecko/20100101 Thunderbird/91.5.1 Content-Language: en-US From: Peter Eisentraut Subject: Remove IS_AF_UNIX macro? To: pgsql-hackers List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Archived-At: Precedence: bulk This is a multi-part message in MIME format. --------------PvWpm3Gq9Oi4CV173sfuBdph Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit I noticed that in pgstatfuncs.c, the AF_UNIX macro is being used unprotected by HAVE_UNIX_SOCKETS, apparently since 2008. So I think the redirection through IS_AF_UNIX() is no longer necessary. (More generally, all supported platforms are now HAVE_UNIX_SOCKETS, but even if there were a new platform in the future, it seems plausible that it would define the AF_UNIX symbol even without kernel support.) So maybe we should remove the IS_AF_UNIX() macro and make the code a bit more consistent? --------------PvWpm3Gq9Oi4CV173sfuBdph Content-Type: text/plain; charset=UTF-8; name="0001-Remove-IS_AF_UNIX-macro.patch" Content-Disposition: attachment; filename="0001-Remove-IS_AF_UNIX-macro.patch" Content-Transfer-Encoding: base64 RnJvbSAzODhiZTVlYmQxMzdmYzQwOTg3OGFjNzQwNjE1MjZlNmRmY2VjZjU3IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQZXRlciBFaXNlbnRyYXV0IDxwZXRlckBlaXNlbnRy YXV0Lm9yZz4KRGF0ZTogTW9uLCA3IEZlYiAyMDIyIDA4OjM3OjAwICswMTAwClN1YmplY3Q6 IFtQQVRDSF0gUmVtb3ZlIElTX0FGX1VOSVggbWFjcm8KCi0tLQogc3JjL2JhY2tlbmQvbGli cHEvaGJhLmMgICAgICAgICAgICAgfCAgNCArKy0tCiBzcmMvYmFja2VuZC9saWJwcS9wcWNv bW0uYyAgICAgICAgICB8IDI0ICsrKysrKysrKysrKy0tLS0tLS0tLS0tLQogc3JjL2JhY2tl bmQvcG9zdG1hc3Rlci9wb3N0bWFzdGVyLmMgfCAgNCArKy0tCiBzcmMvaW5jbHVkZS9jb21t b24vaXAuaCAgICAgICAgICAgICB8ICA2IC0tLS0tLQogc3JjL2ludGVyZmFjZXMvbGlicHEv ZmUtY29ubmVjdC5jICAgfCAxNCArKysrKysrLS0tLS0tLQogNSBmaWxlcyBjaGFuZ2VkLCAy MyBpbnNlcnRpb25zKCspLCAyOSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9zcmMvYmFj a2VuZC9saWJwcS9oYmEuYyBiL3NyYy9iYWNrZW5kL2xpYnBxL2hiYS5jCmluZGV4IGE3ZjNk ZWYxODQuLmQ4NGE0MGI3MjYgMTAwNjQ0Ci0tLSBhL3NyYy9iYWNrZW5kL2xpYnBxL2hiYS5j CisrKyBiL3NyYy9iYWNrZW5kL2xpYnBxL2hiYS5jCkBAIC0yMTM4LDEyICsyMTM4LDEyIEBA IGNoZWNrX2hiYShoYmFQb3J0ICpwb3J0KQogCQkvKiBDaGVjayBjb25uZWN0aW9uIHR5cGUg Ki8KIAkJaWYgKGhiYS0+Y29ubnR5cGUgPT0gY3RMb2NhbCkKIAkJewotCQkJaWYgKCFJU19B Rl9VTklYKHBvcnQtPnJhZGRyLmFkZHIuc3NfZmFtaWx5KSkKKwkJCWlmIChwb3J0LT5yYWRk ci5hZGRyLnNzX2ZhbWlseSAhPSBBRl9VTklYKQogCQkJCWNvbnRpbnVlOwogCQl9CiAJCWVs c2UKIAkJewotCQkJaWYgKElTX0FGX1VOSVgocG9ydC0+cmFkZHIuYWRkci5zc19mYW1pbHkp KQorCQkJaWYgKHBvcnQtPnJhZGRyLmFkZHIuc3NfZmFtaWx5ID09IEFGX1VOSVgpCiAJCQkJ Y29udGludWU7CiAKIAkJCS8qIENoZWNrIFNTTCBzdGF0ZSAqLwpkaWZmIC0tZ2l0IGEvc3Jj L2JhY2tlbmQvbGlicHEvcHFjb21tLmMgYi9zcmMvYmFja2VuZC9saWJwcS9wcWNvbW0uYwpp bmRleCBmMDU3MjNkYzkyLi5iOTZjMjgxMWE0IDEwMDY0NAotLS0gYS9zcmMvYmFja2VuZC9s aWJwcS9wcWNvbW0uYworKysgYi9zcmMvYmFja2VuZC9saWJwcS9wcWNvbW0uYwpAQCAtNDA4 LDcgKzQwOCw3IEBAIFN0cmVhbVNlcnZlclBvcnQoaW50IGZhbWlseSwgY29uc3QgY2hhciAq aG9zdE5hbWUsIHVuc2lnbmVkIHNob3J0IHBvcnROdW1iZXIsCiAKIAlmb3IgKGFkZHIgPSBh ZGRyczsgYWRkcjsgYWRkciA9IGFkZHItPmFpX25leHQpCiAJewotCQlpZiAoIUlTX0FGX1VO SVgoZmFtaWx5KSAmJiBJU19BRl9VTklYKGFkZHItPmFpX2ZhbWlseSkpCisJCWlmIChmYW1p bHkgIT0gQUZfVU5JWCAmJiBhZGRyLT5haV9mYW1pbHkgPT0gQUZfVU5JWCkKIAkJewogCQkJ LyoKIAkJCSAqIE9ubHkgc2V0IHVwIGEgdW5peCBkb21haW4gc29ja2V0IHdoZW4gdGhleSBy ZWFsbHkgYXNrZWQgZm9yIGl0LgpAQCAtNDkzLDcgKzQ5Myw3IEBAIFN0cmVhbVNlcnZlclBv cnQoaW50IGZhbWlseSwgY29uc3QgY2hhciAqaG9zdE5hbWUsIHVuc2lnbmVkIHNob3J0IHBv cnROdW1iZXIsCiAJCSAqIHVucHJlZGljdGFibGUgYmVoYXZpb3IuIFdpdGggbm8gZmxhZ3Mg YXQgYWxsLCB3aW4zMiBiZWhhdmVzIGFzIFVuaXgKIAkJICogd2l0aCBTT19SRVVTRUFERFIu CiAJCSAqLwotCQlpZiAoIUlTX0FGX1VOSVgoYWRkci0+YWlfZmFtaWx5KSkKKwkJaWYgKGFk ZHItPmFpX2ZhbWlseSAhPSBBRl9VTklYKQogCQl7CiAJCQlpZiAoKHNldHNvY2tvcHQoZmQs IFNPTF9TT0NLRVQsIFNPX1JFVVNFQUREUiwKIAkJCQkJCQkoY2hhciAqKSAmb25lLCBzaXpl b2Yob25lKSkpID09IC0xKQpAQCAtNTQ1LDcgKzU0NSw3IEBAIFN0cmVhbVNlcnZlclBvcnQo aW50IGZhbWlseSwgY29uc3QgY2hhciAqaG9zdE5hbWUsIHVuc2lnbmVkIHNob3J0IHBvcnRO dW1iZXIsCiAJCQkJCSBlcnJtc2coImNvdWxkIG5vdCBiaW5kICVzIGFkZHJlc3MgXCIlc1wi OiAlbSIsCiAJCQkJCQkJZmFtaWx5RGVzYywgYWRkckRlc2MpLAogCQkJCQkgc2F2ZWRfZXJy bm8gPT0gRUFERFJJTlVTRSA/Ci0JCQkJCSAoSVNfQUZfVU5JWChhZGRyLT5haV9mYW1pbHkp ID8KKwkJCQkJIChhZGRyLT5haV9mYW1pbHkgPT0gQUZfVU5JWCA/CiAJCQkJCSAgZXJyaGlu dCgiSXMgYW5vdGhlciBwb3N0bWFzdGVyIGFscmVhZHkgcnVubmluZyBvbiBwb3J0ICVkPyIs CiAJCQkJCQkJICAoaW50KSBwb3J0TnVtYmVyKSA6CiAJCQkJCSAgZXJyaGludCgiSXMgYW5v dGhlciBwb3N0bWFzdGVyIGFscmVhZHkgcnVubmluZyBvbiBwb3J0ICVkPyIKQEAgLTc2Myw3 ICs3NjMsNyBAQCBTdHJlYW1Db25uZWN0aW9uKHBnc29ja2V0IHNlcnZlcl9mZCwgUG9ydCAq cG9ydCkKIAl9CiAKIAkvKiBzZWxlY3QgTk9ERUxBWSBhbmQgS0VFUEFMSVZFIG9wdGlvbnMg aWYgaXQncyBhIFRDUCBjb25uZWN0aW9uICovCi0JaWYgKCFJU19BRl9VTklYKHBvcnQtPmxh ZGRyLmFkZHIuc3NfZmFtaWx5KSkKKwlpZiAocG9ydC0+bGFkZHIuYWRkci5zc19mYW1pbHkg IT0gQUZfVU5JWCkKIAl7CiAJCWludAkJCW9uOwogI2lmZGVmIFdJTjMyCkBAIC0xNjM4LDcg KzE2MzgsNyBAQCBpbnQKIHBxX2dldGtlZXBhbGl2ZXNpZGxlKFBvcnQgKnBvcnQpCiB7CiAj aWYgZGVmaW5lZChQR19UQ1BfS0VFUEFMSVZFX0lETEUpIHx8IGRlZmluZWQoU0lPX0tFRVBB TElWRV9WQUxTKQotCWlmIChwb3J0ID09IE5VTEwgfHwgSVNfQUZfVU5JWChwb3J0LT5sYWRk ci5hZGRyLnNzX2ZhbWlseSkpCisJaWYgKHBvcnQgPT0gTlVMTCB8fCBwb3J0LT5sYWRkci5h ZGRyLnNzX2ZhbWlseSA9PSBBRl9VTklYKQogCQlyZXR1cm4gMDsKIAogCWlmIChwb3J0LT5r ZWVwYWxpdmVzX2lkbGUgIT0gMCkKQEAgLTE2NzIsNyArMTY3Miw3IEBAIHBxX2dldGtlZXBh bGl2ZXNpZGxlKFBvcnQgKnBvcnQpCiBpbnQKIHBxX3NldGtlZXBhbGl2ZXNpZGxlKGludCBp ZGxlLCBQb3J0ICpwb3J0KQogewotCWlmIChwb3J0ID09IE5VTEwgfHwgSVNfQUZfVU5JWChw b3J0LT5sYWRkci5hZGRyLnNzX2ZhbWlseSkpCisJaWYgKHBvcnQgPT0gTlVMTCB8fCBwb3J0 LT5sYWRkci5hZGRyLnNzX2ZhbWlseSA9PSBBRl9VTklYKQogCQlyZXR1cm4gU1RBVFVTX09L OwogCiAvKiBjaGVjayBTSU9fS0VFUEFMSVZFX1ZBTFMgaGVyZSwgbm90IGp1c3QgV0lOMzIs IGFzIHNvbWUgdG9vbGNoYWlucyBsYWNrIGl0ICovCkBAIC0xNzIzLDcgKzE3MjMsNyBAQCBp bnQKIHBxX2dldGtlZXBhbGl2ZXNpbnRlcnZhbChQb3J0ICpwb3J0KQogewogI2lmIGRlZmlu ZWQoVENQX0tFRVBJTlRWTCkgfHwgZGVmaW5lZChTSU9fS0VFUEFMSVZFX1ZBTFMpCi0JaWYg KHBvcnQgPT0gTlVMTCB8fCBJU19BRl9VTklYKHBvcnQtPmxhZGRyLmFkZHIuc3NfZmFtaWx5 KSkKKwlpZiAocG9ydCA9PSBOVUxMIHx8IHBvcnQtPmxhZGRyLmFkZHIuc3NfZmFtaWx5ID09 IEFGX1VOSVgpCiAJCXJldHVybiAwOwogCiAJaWYgKHBvcnQtPmtlZXBhbGl2ZXNfaW50ZXJ2 YWwgIT0gMCkKQEAgLTE3NTcsNyArMTc1Nyw3IEBAIHBxX2dldGtlZXBhbGl2ZXNpbnRlcnZh bChQb3J0ICpwb3J0KQogaW50CiBwcV9zZXRrZWVwYWxpdmVzaW50ZXJ2YWwoaW50IGludGVy dmFsLCBQb3J0ICpwb3J0KQogewotCWlmIChwb3J0ID09IE5VTEwgfHwgSVNfQUZfVU5JWChw b3J0LT5sYWRkci5hZGRyLnNzX2ZhbWlseSkpCisJaWYgKHBvcnQgPT0gTlVMTCB8fCBwb3J0 LT5sYWRkci5hZGRyLnNzX2ZhbWlseSA9PSBBRl9VTklYKQogCQlyZXR1cm4gU1RBVFVTX09L OwogCiAjaWYgZGVmaW5lZChUQ1BfS0VFUElOVFZMKSB8fCBkZWZpbmVkKFNJT19LRUVQQUxJ VkVfVkFMUykKQEAgLTE4MDcsNyArMTgwNyw3IEBAIGludAogcHFfZ2V0a2VlcGFsaXZlc2Nv dW50KFBvcnQgKnBvcnQpCiB7CiAjaWZkZWYgVENQX0tFRVBDTlQKLQlpZiAocG9ydCA9PSBO VUxMIHx8IElTX0FGX1VOSVgocG9ydC0+bGFkZHIuYWRkci5zc19mYW1pbHkpKQorCWlmIChw b3J0ID09IE5VTEwgfHwgcG9ydC0+bGFkZHIuYWRkci5zc19mYW1pbHkgPT0gQUZfVU5JWCkK IAkJcmV0dXJuIDA7CiAKIAlpZiAocG9ydC0+a2VlcGFsaXZlc19jb3VudCAhPSAwKQpAQCAt MTgzNiw3ICsxODM2LDcgQEAgcHFfZ2V0a2VlcGFsaXZlc2NvdW50KFBvcnQgKnBvcnQpCiBp bnQKIHBxX3NldGtlZXBhbGl2ZXNjb3VudChpbnQgY291bnQsIFBvcnQgKnBvcnQpCiB7Ci0J aWYgKHBvcnQgPT0gTlVMTCB8fCBJU19BRl9VTklYKHBvcnQtPmxhZGRyLmFkZHIuc3NfZmFt aWx5KSkKKwlpZiAocG9ydCA9PSBOVUxMIHx8IHBvcnQtPmxhZGRyLmFkZHIuc3NfZmFtaWx5 ID09IEFGX1VOSVgpCiAJCXJldHVybiBTVEFUVVNfT0s7CiAKICNpZmRlZiBUQ1BfS0VFUENO VApAQCAtMTg4Miw3ICsxODgyLDcgQEAgaW50CiBwcV9nZXR0Y3B1c2VydGltZW91dChQb3J0 ICpwb3J0KQogewogI2lmZGVmIFRDUF9VU0VSX1RJTUVPVVQKLQlpZiAocG9ydCA9PSBOVUxM IHx8IElTX0FGX1VOSVgocG9ydC0+bGFkZHIuYWRkci5zc19mYW1pbHkpKQorCWlmIChwb3J0 ID09IE5VTEwgfHwgcG9ydC0+bGFkZHIuYWRkci5zc19mYW1pbHkgPT0gQUZfVU5JWCkKIAkJ cmV0dXJuIDA7CiAKIAlpZiAocG9ydC0+dGNwX3VzZXJfdGltZW91dCAhPSAwKQpAQCAtMTkx MSw3ICsxOTExLDcgQEAgcHFfZ2V0dGNwdXNlcnRpbWVvdXQoUG9ydCAqcG9ydCkKIGludAog cHFfc2V0dGNwdXNlcnRpbWVvdXQoaW50IHRpbWVvdXQsIFBvcnQgKnBvcnQpCiB7Ci0JaWYg KHBvcnQgPT0gTlVMTCB8fCBJU19BRl9VTklYKHBvcnQtPmxhZGRyLmFkZHIuc3NfZmFtaWx5 KSkKKwlpZiAocG9ydCA9PSBOVUxMIHx8IHBvcnQtPmxhZGRyLmFkZHIuc3NfZmFtaWx5ID09 IEFGX1VOSVgpCiAJCXJldHVybiBTVEFUVVNfT0s7CiAKICNpZmRlZiBUQ1BfVVNFUl9USU1F T1VUCmRpZmYgLS1naXQgYS9zcmMvYmFja2VuZC9wb3N0bWFzdGVyL3Bvc3RtYXN0ZXIuYyBi L3NyYy9iYWNrZW5kL3Bvc3RtYXN0ZXIvcG9zdG1hc3Rlci5jCmluZGV4IGFjMGVjMDk4NmEu Ljk0NzhlMjgyNTcgMTAwNjQ0Ci0tLSBhL3NyYy9iYWNrZW5kL3Bvc3RtYXN0ZXIvcG9zdG1h c3Rlci5jCisrKyBiL3NyYy9iYWNrZW5kL3Bvc3RtYXN0ZXIvcG9zdG1hc3Rlci5jCkBAIC0y MDg1LDcgKzIwODUsNyBAQCBQcm9jZXNzU3RhcnR1cFBhY2tldChQb3J0ICpwb3J0LCBib29s IHNzbF9kb25lLCBib29sIGdzc19kb25lKQogCiAjaWZkZWYgVVNFX1NTTAogCQkvKiBObyBT U0wgd2hlbiBkaXNhYmxlZCBvciBvbiBVbml4IHNvY2tldHMgKi8KLQkJaWYgKCFMb2FkZWRT U0wgfHwgSVNfQUZfVU5JWChwb3J0LT5sYWRkci5hZGRyLnNzX2ZhbWlseSkpCisJCWlmICgh TG9hZGVkU1NMIHx8IHBvcnQtPmxhZGRyLmFkZHIuc3NfZmFtaWx5ID09IEFGX1VOSVgpCiAJ CQlTU0xvayA9ICdOJzsKIAkJZWxzZQogCQkJU1NMb2sgPSAnUyc7CQkvKiBTdXBwb3J0IGZv ciBTU0wgKi8KQEAgLTIxMzQsNyArMjEzNCw3IEBAIFByb2Nlc3NTdGFydHVwUGFja2V0KFBv cnQgKnBvcnQsIGJvb2wgc3NsX2RvbmUsIGJvb2wgZ3NzX2RvbmUpCiAKICNpZmRlZiBFTkFC TEVfR1NTCiAJCS8qIE5vIEdTU0FQSSBlbmNyeXB0aW9uIHdoZW4gb24gVW5peCBzb2NrZXQg Ki8KLQkJaWYgKCFJU19BRl9VTklYKHBvcnQtPmxhZGRyLmFkZHIuc3NfZmFtaWx5KSkKKwkJ aWYgKHBvcnQtPmxhZGRyLmFkZHIuc3NfZmFtaWx5ICE9IEFGX1VOSVgpCiAJCQlHU1NvayA9 ICdHJzsKICNlbmRpZgogCmRpZmYgLS1naXQgYS9zcmMvaW5jbHVkZS9jb21tb24vaXAuaCBi L3NyYy9pbmNsdWRlL2NvbW1vbi9pcC5oCmluZGV4IDg1Yzg4NTc0MzUuLjg0MTQ1MjA5ODkg MTAwNjQ0Ci0tLSBhL3NyYy9pbmNsdWRlL2NvbW1vbi9pcC5oCisrKyBiL3NyYy9pbmNsdWRl L2NvbW1vbi9pcC5oCkBAIC0xOCwxMiArMTgsNiBAQAogI2luY2x1ZGUgImxpYnBxL3BxY29t bS5oIgkJLyogcGdybWluY2x1ZGUgaWdub3JlICovCiAKIAotI2lmZGVmCUhBVkVfVU5JWF9T T0NLRVRTCi0jZGVmaW5lIElTX0FGX1VOSVgoZmFtKSAoKGZhbSkgPT0gQUZfVU5JWCkKLSNl bHNlCi0jZGVmaW5lIElTX0FGX1VOSVgoZmFtKSAoMCkKLSNlbmRpZgotCiBleHRlcm4gaW50 CXBnX2dldGFkZHJpbmZvX2FsbChjb25zdCBjaGFyICpob3N0bmFtZSwgY29uc3QgY2hhciAq c2Vydm5hbWUsCiAJCQkJCQkJICAgY29uc3Qgc3RydWN0IGFkZHJpbmZvICpoaW50cCwKIAkJ CQkJCQkgICBzdHJ1Y3QgYWRkcmluZm8gKipyZXN1bHQpOwpkaWZmIC0tZ2l0IGEvc3JjL2lu dGVyZmFjZXMvbGlicHEvZmUtY29ubmVjdC5jIGIvc3JjL2ludGVyZmFjZXMvbGlicHEvZmUt Y29ubmVjdC5jCmluZGV4IGE2YTFkYjMzNTYuLjMwZDZiN2IzNzcgMTAwNjQ0Ci0tLSBhL3Ny Yy9pbnRlcmZhY2VzL2xpYnBxL2ZlLWNvbm5lY3QuYworKysgYi9zcmMvaW50ZXJmYWNlcy9s aWJwcS9mZS1jb25uZWN0LmMKQEAgLTE2OTQsNyArMTY5NCw3IEBAIHN0YXRpYyB2b2lkCiBl bWl0SG9zdElkZW50aXR5SW5mbyhQR2Nvbm4gKmNvbm4sIGNvbnN0IGNoYXIgKmhvc3RfYWRk cikKIHsKICNpZmRlZiBIQVZFX1VOSVhfU09DS0VUUwotCWlmIChJU19BRl9VTklYKGNvbm4t PnJhZGRyLmFkZHIuc3NfZmFtaWx5KSkKKwlpZiAoY29ubi0+cmFkZHIuYWRkci5zc19mYW1p bHkgPT0gQUZfVU5JWCkKIAl7CiAJCWNoYXIJCXNlcnZpY2VbTklfTUFYSE9TVF07CiAKQEAg LTE3NTgsNyArMTc1OCw3IEBAIGNvbm5lY3RGYWlsdXJlTWVzc2FnZShQR2Nvbm4gKmNvbm4s IGludCBlcnJvcm5vKQogCQkJCQkgIFNPQ0tfU1RSRVJST1IoZXJyb3Jubywgc2VidWYsIHNp emVvZihzZWJ1ZikpKTsKIAogI2lmZGVmIEhBVkVfVU5JWF9TT0NLRVRTCi0JaWYgKElTX0FG X1VOSVgoY29ubi0+cmFkZHIuYWRkci5zc19mYW1pbHkpKQorCWlmIChjb25uLT5yYWRkci5h ZGRyLnNzX2ZhbWlseSA9PSBBRl9VTklYKQogCQlhcHBlbmRQUUV4cEJ1ZmZlclN0cigmY29u bi0+ZXJyb3JNZXNzYWdlLAogCQkJCQkJCSBsaWJwcV9nZXR0ZXh0KCJcdElzIHRoZSBzZXJ2 ZXIgcnVubmluZyBsb2NhbGx5IGFuZCBhY2NlcHRpbmcgY29ubmVjdGlvbnMgb24gdGhhdCBz b2NrZXQ/XG4iKSk7CiAJZWxzZQpAQCAtMjU5MCw3ICsyNTkwLDcgQEAgUFFjb25uZWN0UG9s bChQR2Nvbm4gKmNvbm4pCiAJCQkJCSAqIFRDUCBzb2NrZXRzLCBub25ibG9jayBtb2RlLCBj bG9zZS1vbi1leGVjLiAgVHJ5IHRoZQogCQkJCQkgKiBuZXh0IGFkZHJlc3MgaWYgYW55IG9m IHRoaXMgZmFpbHMuCiAJCQkJCSAqLwotCQkJCQlpZiAoIUlTX0FGX1VOSVgoYWRkcl9jdXIt PmFpX2ZhbWlseSkpCisJCQkJCWlmIChhZGRyX2N1ci0+YWlfZmFtaWx5ICE9IEFGX1VOSVgp CiAJCQkJCXsKIAkJCQkJCWlmICghY29ubmVjdE5vRGVsYXkoY29ubikpCiAJCQkJCQl7CkBA IC0yNjE5LDcgKzI2MTksNyBAQCBQUWNvbm5lY3RQb2xsKFBHY29ubiAqY29ubikKIAkJCQkJ fQogI2VuZGlmCQkJCQkJCS8qIEZfU0VURkQgKi8KIAotCQkJCQlpZiAoIUlTX0FGX1VOSVgo YWRkcl9jdXItPmFpX2ZhbWlseSkpCisJCQkJCWlmIChhZGRyX2N1ci0+YWlfZmFtaWx5ICE9 IEFGX1VOSVgpCiAJCQkJCXsKICNpZm5kZWYgV0lOMzIKIAkJCQkJCWludAkJCW9uID0gMTsK QEAgLTI4MjEsNyArMjgyMSw3IEBAIFBRY29ubmVjdFBvbGwoUEdjb25uICpjb25uKQogCQkJ CSAqIFVuaXgtZG9tYWluIHNvY2tldC4KIAkJCQkgKi8KIAkJCQlpZiAoY29ubi0+cmVxdWly ZXBlZXIgJiYgY29ubi0+cmVxdWlyZXBlZXJbMF0gJiYKLQkJCQkJSVNfQUZfVU5JWChjb25u LT5yYWRkci5hZGRyLnNzX2ZhbWlseSkpCisJCQkJCWNvbm4tPnJhZGRyLmFkZHIuc3NfZmFt aWx5ID09IEFGX1VOSVgpCiAJCQkJewogI2lmbmRlZiBXSU4zMgogCQkJCQljaGFyCSAgICpy ZW1vdGVfdXNlcm5hbWU7CkBAIC0yODY3LDcgKzI4NjcsNyBAQCBQUWNvbm5lY3RQb2xsKFBH Y29ubiAqY29ubikKICNlbmRpZgkJCQkJCQkvKiBXSU4zMiAqLwogCQkJCX0KIAotCQkJCWlm IChJU19BRl9VTklYKGNvbm4tPnJhZGRyLmFkZHIuc3NfZmFtaWx5KSkKKwkJCQlpZiAoY29u bi0+cmFkZHIuYWRkci5zc19mYW1pbHkgPT0gQUZfVU5JWCkKIAkJCQl7CiAJCQkJCS8qIERv bid0IHJlcXVlc3QgU1NMIG9yIEdTU0FQSSBvdmVyIFVuaXggc29ja2V0cyAqLwogI2lmZGVm IFVTRV9TU0wKQEAgLTQ1MjgsNyArNDUyOCw3IEBAIFBRY2FuY2VsKFBHY2FuY2VsICpjYW5j ZWwsIGNoYXIgKmVycmJ1ZiwgaW50IGVycmJ1ZnNpemUpCiAJICogVGhpcyBlbnN1cmVzIHRo YXQgdGhpcyBmdW5jdGlvbiBkb2VzIG5vdCBibG9jayBpbmRlZmluaXRlbHkgd2hlbgogCSAq IHJlYXNvbmFibGUga2VlcGFsaXZlIGFuZCB0aW1lb3V0IHNldHRpbmdzIGhhdmUgYmVlbiBw cm92aWRlZC4KIAkgKi8KLQlpZiAoIUlTX0FGX1VOSVgoY2FuY2VsLT5yYWRkci5hZGRyLnNz X2ZhbWlseSkgJiYKKwlpZiAoY2FuY2VsLT5yYWRkci5hZGRyLnNzX2ZhbWlseSAhPSBBRl9V TklYICYmCiAJCWNhbmNlbC0+a2VlcGFsaXZlcyAhPSAwKQogCXsKICNpZm5kZWYgV0lOMzIK LS0gCjIuMzUuMQoK --------------PvWpm3Gq9Oi4CV173sfuBdph--