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 1i0G49-0004Y8-ME for pgsql-hackers@arkaria.postgresql.org; Wed, 21 Aug 2019 02:09:38 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.89) (envelope-from ) id 1i0G48-0006Xd-6D for pgsql-hackers@arkaria.postgresql.org; Wed, 21 Aug 2019 02:09:36 +0000 Received: from magus.postgresql.org ([2a02:c0:301:0:ffff::29]) by malur.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1i0G47-0006OD-MJ for pgsql-hackers@lists.postgresql.org; Wed, 21 Aug 2019 02:09:35 +0000 Received: from mail-pg1-x535.google.com ([2607:f8b0:4864:20::535]) by magus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1i0G43-0002qd-Qv for pgsql-hackers@postgresql.org; Wed, 21 Aug 2019 02:09:35 +0000 Received: by mail-pg1-x535.google.com with SMTP id d1so379927pgp.4 for ; Tue, 20 Aug 2019 19:09:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=j-davis-com.20150623.gappssmtp.com; s=20150623; h=message-id:subject:from:to:cc:date:in-reply-to:references :mime-version; bh=GPzd3PHtIYhmgy0aPZe2SK6KIcxxc0Zc/9BOLWB6bVc=; b=etZ2L3MJ4+JMt/aZkVHFxlovO63o+q95P8hRUhV1Q1jDUkGJpsJLi8j801je19sqhO cFJFwSzR85v9oOoCBXG2oS0iOQkLQQezYelN8Okv3/27DsWQBF3gF51E8LQkhXvqaJOE wT/cgBIOU+jB1VVYWLtc8AyC970bCG5drzcj4GM01Bx0qwoE/l40JCw9KOOFqNfv2UBo 9VMR4cQGTSB7LmfHJQKkgFNO8rob0NlpfunmvlHFm/+alUlIk+dNFjm6uYVhzz3nSNse ADFsMmUUldxiJJNaYowQrvQEzeeF19SXlBcoBAF7zgWnma3Ob92ynDkhJAWlXt3Ub0St XCyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:subject:from:to:cc:date:in-reply-to :references:mime-version; bh=GPzd3PHtIYhmgy0aPZe2SK6KIcxxc0Zc/9BOLWB6bVc=; b=Y+VSEf7s/eqt+JasEYAD1IayheY4bRugivFQDOEUErgvyjlWse9fLoJRCg3xtYB+r1 GozgLoNIMc6rHC05sXBTQ93lZjWrhmHNQk+T9NkguElwGJC37TbmUsOE/E+L3n3q3dqD GdJanfRbwG1EXzo4fsa4bgmEWA4/vkNT+IwYX9gKgtBqWgahz5sNjfNrG7KoXLSawSQD mIZFV5zY1veEu5Vv0WA9ykM7ilky7BDRHV7saiTJDxLKVTHDztODjwvGkdCwWXHgvrVL TFoXLroaNQbUL3l9+GTncxPTgZ03z5+xoBwrhGwHdY80nONZ1LKUebBrVb0akR7yv71g IUfg== X-Gm-Message-State: APjAAAVClrY4RRqyKwrGChS+UOMANT1zlr21zmgrr8Hi2RyMji0PqD/V C79KD3NK0v/rKtoM7GHeziB3KA== X-Google-Smtp-Source: APXvYqwosDQ5ZdNTEG4m03rTQpVToxX68vg24ty0VSP8uVF505ZAgR0cbp9puKdwmlumpnOO/aXbVQ== X-Received: by 2002:a17:90a:c24e:: with SMTP id d14mr3040330pjx.129.1566353368663; Tue, 20 Aug 2019 19:09:28 -0700 (PDT) Received: from jdavis ([2600:1010:b010:e1d1:79e8:c09f:28f7:b726]) by smtp.gmail.com with ESMTPSA id p1sm22046896pfn.83.2019.08.20.19.09.27 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 20 Aug 2019 19:09:27 -0700 (PDT) Message-ID: <4863222980d349a6251065ea67f00ac41dedb162.camel@j-davis.com> Subject: Re: Add "password_protocol" connection parameter to libpq From: Jeff Davis To: Michael Paquier , "Jonathan S. Katz" Cc: Stephen Frost , Peter Eisentraut , pgsql-hackers@postgresql.org Date: Tue, 20 Aug 2019 19:09:25 -0700 In-Reply-To: <20190819055100.GC18166@paquier.xyz> References: <7a7a2f07-d013-eb80-85ba-9edaaf845038@2ndquadrant.com> <95b40ddcb3897772f075e6891521ee3f06f443d1.camel@j-davis.com> <93653d2b-7cf7-6992-7d3e-600ffd461354@2ndquadrant.com> <20190813025634.GF2551@paquier.xyz> <67726b008fa31d00d9a38257b3d1673b8afff2dd.camel@j-davis.com> <1e34ce7a-9d4c-dd99-3781-e0a3203f5aef@postgresql.org> <20190814023857.GB14446@paquier.xyz> <54269124d50791eacb71f1fead40422185ae8ddc.camel@j-davis.com> <20190816012815.GW16436@tamriel.snowman.net> <20190819055100.GC18166@paquier.xyz> Content-Type: multipart/mixed; boundary="=-IpQ2CtuY2Oi32CwWtvOh" X-Mailer: Evolution 3.28.5-0ubuntu0.18.04.1 Mime-Version: 1.0 List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Precedence: bulk --=-IpQ2CtuY2Oi32CwWtvOh Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit On Mon, 2019-08-19 at 14:51 +0900, Michael Paquier wrote: > On Fri, Aug 16, 2019 at 02:11:57PM -0400, Jonathan S. Katz wrote: > > To be pedantic, +1 on the channel_binding param. > > Seems like we are moving in this direction then. I don't object to > the introduction of this parameter. OK, new patch attached. Seems like everyone is in agreement that we need a channel_binding param. Regards, Jeff Davis --=-IpQ2CtuY2Oi32CwWtvOh Content-Disposition: attachment; filename="0001-Add-libpq-parameter-channel_binding.patch" Content-Type: text/x-patch; name="0001-Add-libpq-parameter-channel_binding.patch"; charset="UTF-8" Content-Transfer-Encoding: base64 RnJvbSAwZWI4ZTc2ZDA4YTY0OTc5YzMwNzA3NjFlZmFiOTVkNjFjNGZmODg3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKZWZmIERhdmlzIDxqZWZmQGotZGF2aXMuY29tPgpEYXRlOiBU dWUsIDIwIEF1ZyAyMDE5IDE4OjU5OjIzIC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gQWRkIGxpYnBx IHBhcmFtZXRlciAnY2hhbm5lbF9iaW5kaW5nJy4KCkFsbG93IGNsaWVudHMgdG8gcmVxdWlyZSBj aGFubmVsIGJpbmRpbmcgdG8gZW5oYW5jZSBzZWN1cml0eSBhZ2FpbnN0CnVudHJ1c3RlZCBzZXJ2 ZXJzLgoKQXV0aG9yOiBKZWZmIERhdmlzCkRpc2N1c3Npb246IGh0dHBzOi8vcG9zdGdyLmVzL20v MjI3MDE1ZDg0MTdmMmI0ZmVmMDNmODk2NmRiZmE1Y2JjYzRmNDRkYS5jYW1lbCU0MGotZGF2aXMu Y29tCi0tLQogZG9jL3NyYy9zZ21sL2xpYnBxLnNnbWwgICAgICAgICAgIHwgMTkgKysrKysrKysr KysrKysrKysrKwogc3JjL2ludGVyZmFjZXMvbGlicHEvZmUtYXV0aC5jICAgIHwgMzAgKysrKysr KysrKysrKysrKysrKysrKysrKysrKystCiBzcmMvaW50ZXJmYWNlcy9saWJwcS9mZS1jb25uZWN0 LmMgfCAyOCArKysrKysrKysrKysrKysrKysrKysrKysrKysrCiBzcmMvaW50ZXJmYWNlcy9saWJw cS9saWJwcS1pbnQuaCAgfCAgMiArKwogNCBmaWxlcyBjaGFuZ2VkLCA3OCBpbnNlcnRpb25zKCsp LCAxIGRlbGV0aW9uKC0pCgpkaWZmIC0tZ2l0IGEvZG9jL3NyYy9zZ21sL2xpYnBxLnNnbWwgYi9k b2Mvc3JjL3NnbWwvbGlicHEuc2dtbAppbmRleCBlNzI5NWFiZGEyOC4uMTc4NWNiMWJjYzUgMTAw NjQ0Ci0tLSBhL2RvYy9zcmMvc2dtbC9saWJwcS5zZ21sCisrKyBiL2RvYy9zcmMvc2dtbC9saWJw cS5zZ21sCkBAIC0xMTE4LDYgKzExMTgsMjUgQEAgcG9zdGdyZXNxbDovLyUyRnZhciUyRmxpYiUy RnBvc3RncmVzcWwvZGJuYW1lCiAgICAgICA8L2xpc3RpdGVtPgogICAgICA8L3Zhcmxpc3RlbnRy eT4KIAorICAgICA8dmFybGlzdGVudHJ5IGlkPSJsaWJwcS1jb25uZWN0LWNoYW5uZWwtYmluZGlu ZyIgeHJlZmxhYmVsPSJjaGFubmVsX2JpbmRpbmciPgorICAgICAgPHRlcm0+PGxpdGVyYWw+Y2hh bm5lbF9iaW5kaW5nPC9saXRlcmFsPjwvdGVybT4KKyAgICAgIDxsaXN0aXRlbT4KKyAgICAgIDxw YXJhPgorICAgICAgICBBIHNldHRpbmcgb2YgPGxpdGVyYWw+cmVxdWlyZTwvbGl0ZXJhbD4gbWVh bnMgdGhhdCB0aGUgY29ubmVjdGlvbiBtdXN0CisgICAgICAgIGVtcGxveSBjaGFubmVsIGJpbmRp bmc7IGFuZCB0aGF0IHRoZSBjbGllbnQgd2lsbCBub3QgcmVzcG9uZCB0bworICAgICAgICByZXF1 ZXN0cyBmcm9tIHRoZSBzZXJ2ZXIgZm9yIGNsZWFydGV4dCBwYXNzd29yZCBvciBNRDUKKyAgICAg ICAgYXV0aGVudGljYXRpb24uIFRoZSBkZWZhdWx0IHNldHRpbmcgaXMgPGxpdGVyYWw+cHJlZmVy PC9saXRlcmFsPiwKKyAgICAgICAgd2hpY2ggZW1wbG95cyBjaGFubmVsIGJpbmRpbmcgaWYgYXZh aWxhYmxlLgorICAgICAgPC9wYXJhPgorICAgICAgPHBhcmE+CisgICAgICAgIENoYW5uZWwgYmlu ZGluZyBpcyBhIG1ldGhvZCBmb3IgdGhlIHNlcnZlciB0byBhdXRoZW50aWNhdGUgaXRzZWxmIHRv CisgICAgICAgIHRoZSBjbGllbnQuIEl0IGlzIG9ubHkgc3VwcG9ydGVkIG92ZXIgU1NMIGNvbm5l Y3Rpb25zCisgICAgICAgIHdpdGggPHByb2R1Y3RuYW1lPlBvc3RncmVTUUw8L3Byb2R1Y3RuYW1l PiAxMS4wIG9yIGxhdGVyIHNlcnZlcnMgdXNpbmcKKyAgICAgICAgdGhlIDxsaXRlcmFsPnNjcmFt LXNoYS0yNTY8L2xpdGVyYWw+IGF1dGhlbnRpY2F0aW9uIG1ldGhvZC4KKyAgICAgIDwvcGFyYT4K KyAgICAgIDwvbGlzdGl0ZW0+CisgICAgIDwvdmFybGlzdGVudHJ5PgorCiAgICAgIDx2YXJsaXN0 ZW50cnkgaWQ9ImxpYnBxLWNvbm5lY3QtY29ubmVjdC10aW1lb3V0IiB4cmVmbGFiZWw9ImNvbm5l Y3RfdGltZW91dCI+CiAgICAgICA8dGVybT48bGl0ZXJhbD5jb25uZWN0X3RpbWVvdXQ8L2xpdGVy YWw+PC90ZXJtPgogICAgICAgPGxpc3RpdGVtPgpkaWZmIC0tZ2l0IGEvc3JjL2ludGVyZmFjZXMv bGlicHEvZmUtYXV0aC5jIGIvc3JjL2ludGVyZmFjZXMvbGlicHEvZmUtYXV0aC5jCmluZGV4IGFi MjI3NDIxYjNiLi41ZGYzMDkxMzMzNyAxMDA2NDQKLS0tIGEvc3JjL2ludGVyZmFjZXMvbGlicHEv ZmUtYXV0aC5jCisrKyBiL3NyYy9pbnRlcmZhY2VzL2xpYnBxL2ZlLWF1dGguYwpAQCAtNDIzLDYg KzQyMywxMyBAQCBwZ19TQVNMX2luaXQoUEdjb25uICpjb25uLCBpbnQgcGF5bG9hZGxlbikKIAog CWluaXRQUUV4cEJ1ZmZlcigmbWVjaGFuaXNtX2J1Zik7CiAKKwlpZiAoY29ubi0+Y2hhbm5lbF9i aW5kaW5nWzBdID09ICdyJyAmJiAhY29ubi0+c3NsX2luX3VzZSkKKwl7CisJCXByaW50ZlBRRXhw QnVmZmVyKCZjb25uLT5lcnJvck1lc3NhZ2UsCisJCQkJCQkgIGxpYnBxX2dldHRleHQoIkNoYW5u ZWwgYmluZGluZyByZXF1aXJlZCwgYnV0IFNTTCBub3QgaW4gdXNlXG4iKSk7CisJCWdvdG8gZXJy b3I7CisJfQorCiAJaWYgKGNvbm4tPnNhc2xfc3RhdGUpCiAJewogCQlwcmludGZQUUV4cEJ1ZmZl cigmY29ubi0+ZXJyb3JNZXNzYWdlLApAQCAtNDg4LDcgKzQ5NSw4IEBAIHBnX1NBU0xfaW5pdChQ R2Nvbm4gKmNvbm4sIGludCBwYXlsb2FkbGVuKQogCQkJCWdvdG8gZXJyb3I7CiAJCQl9CiAJCX0K LQkJZWxzZSBpZiAoc3RyY21wKG1lY2hhbmlzbV9idWYuZGF0YSwgU0NSQU1fU0hBXzI1Nl9OQU1F KSA9PSAwICYmCisJCWVsc2UgaWYgKGNvbm4tPmNoYW5uZWxfYmluZGluZ1swXSAhPSAncicgJiYK KwkJCQkgc3RyY21wKG1lY2hhbmlzbV9idWYuZGF0YSwgU0NSQU1fU0hBXzI1Nl9OQU1FKSA9PSAw ICYmCiAJCQkJICFzZWxlY3RlZF9tZWNoYW5pc20pCiAJCQlzZWxlY3RlZF9tZWNoYW5pc20gPSBT Q1JBTV9TSEFfMjU2X05BTUU7CiAJfQpAQCAtNTY1LDYgKzU3Myw5IEBAIHBnX1NBU0xfaW5pdChQ R2Nvbm4gKmNvbm4sIGludCBwYXlsb2FkbGVuKQogCWlmIChpbml0aWFscmVzcG9uc2UpCiAJCWZy ZWUoaW5pdGlhbHJlc3BvbnNlKTsKIAorCWlmIChzdHJjbXAoc2VsZWN0ZWRfbWVjaGFuaXNtLCBT Q1JBTV9TSEFfMjU2X1BMVVNfTkFNRSkgPT0gMCkKKwkJY29ubi0+Y2hhbm5lbF9ib3VuZCA9IHRy dWU7CisKIAlyZXR1cm4gU1RBVFVTX09LOwogCiBlcnJvcjoKQEAgLTc5MSw2ICs4MDIsMTIgQEAg cGdfZmVfc2VuZGF1dGgoQXV0aFJlcXVlc3QgYXJlcSwgaW50IHBheWxvYWRsZW4sIFBHY29ubiAq Y29ubikKIAlzd2l0Y2ggKGFyZXEpCiAJewogCQljYXNlIEFVVEhfUkVRX09LOgorCQkJaWYgKGNv bm4tPmNoYW5uZWxfYmluZGluZ1swXSA9PSAncicgJiYgIWNvbm4tPmNoYW5uZWxfYm91bmQpCisJ CQl7CisJCQkJcHJpbnRmUFFFeHBCdWZmZXIoJmNvbm4tPmVycm9yTWVzc2FnZSwKKwkJCQkJCQkJ ICBsaWJwcV9nZXR0ZXh0KCJDaGFubmVsIGJpbmRpbmcgcmVxdWlyZWQgYnV0IG5vdCBvZmZlcmVk IGJ5IHNlcnZlclxuIikpOworCQkJCXJldHVybiBTVEFUVVNfRVJST1I7CisJCQl9CiAJCQlicmVh azsKIAogCQljYXNlIEFVVEhfUkVRX0tSQjQ6CkBAIC05MTksNiArOTM2LDE3IEBAIHBnX2ZlX3Nl bmRhdXRoKEF1dGhSZXF1ZXN0IGFyZXEsIGludCBwYXlsb2FkbGVuLCBQR2Nvbm4gKmNvbm4pCiAJ CQl7CiAJCQkJY2hhcgkgICAqcGFzc3dvcmQ7CiAKKwkJCQlpZiAoY29ubi0+Y2hhbm5lbF9iaW5k aW5nWzBdID09ICdyJykKKwkJCQl7CisJCQkJCWlmIChhcmVxID09IEFVVEhfUkVRX1BBU1NXT1JE KQorCQkJCQkJcHJpbnRmUFFFeHBCdWZmZXIoJmNvbm4tPmVycm9yTWVzc2FnZSwKKwkJCQkJCQkJ CQkgIGxpYnBxX2dldHRleHQoIkNoYW5uZWwgYmluZGluZyByZXF1aXJlZCBidXQgc2VydmVyIHJl cXVlc3RlZCBjbGVhcnRleHQgcGFzc3dvcmQgYXV0aGVudGljYXRpb25cbiIpKTsKKwkJCQkJZWxz ZQorCQkJCQkJcHJpbnRmUFFFeHBCdWZmZXIoJmNvbm4tPmVycm9yTWVzc2FnZSwKKwkJCQkJCQkJ CQkgIGxpYnBxX2dldHRleHQoIkNoYW5uZWwgYmluZGluZyByZXF1aXJlZCBidXQgc2VydmVyIHJl cXVlc3RlZCBNRDUgYXV0aGVudGljYXRpb25cbiIpKTsKKwkJCQkJcmV0dXJuIFNUQVRVU19FUlJP UjsKKwkJCQl9CisKIAkJCQljb25uLT5wYXNzd29yZF9uZWVkZWQgPSB0cnVlOwogCQkJCXBhc3N3 b3JkID0gY29ubi0+Y29ubmhvc3RbY29ubi0+d2hpY2hob3N0XS5wYXNzd29yZDsKIAkJCQlpZiAo cGFzc3dvcmQgPT0gTlVMTCkKZGlmZiAtLWdpdCBhL3NyYy9pbnRlcmZhY2VzL2xpYnBxL2ZlLWNv bm5lY3QuYyBiL3NyYy9pbnRlcmZhY2VzL2xpYnBxL2ZlLWNvbm5lY3QuYwppbmRleCBmYTVhZjE4 ZmZhYy4uZTk2MjdjMDZlYzEgMTAwNjQ0Ci0tLSBhL3NyYy9pbnRlcmZhY2VzL2xpYnBxL2ZlLWNv bm5lY3QuYworKysgYi9zcmMvaW50ZXJmYWNlcy9saWJwcS9mZS1jb25uZWN0LmMKQEAgLTEyNCw2 ICsxMjQsNyBAQCBzdGF0aWMgaW50CWxkYXBTZXJ2aWNlTG9va3VwKGNvbnN0IGNoYXIgKnB1cmws IFBRY29ubmluZm9PcHRpb24gKm9wdGlvbnMsCiAjZGVmaW5lIERlZmF1bHRUdHkJCSIiCiAjZGVm aW5lIERlZmF1bHRPcHRpb24JIiIKICNkZWZpbmUgRGVmYXVsdEF1dGh0eXBlCQkgICIiCisjZGVm aW5lIERlZmF1bHRDaGFubmVsQmluZGluZwkicHJlZmVyIgogI2RlZmluZSBEZWZhdWx0VGFyZ2V0 U2Vzc2lvbkF0dHJzCSJhbnkiCiAjaWZkZWYgVVNFX1NTTAogI2RlZmluZSBEZWZhdWx0U1NMTW9k ZSAicHJlZmVyIgpAQCAtMjExLDYgKzIxMiwxMCBAQCBzdGF0aWMgY29uc3QgaW50ZXJuYWxQUWNv bm5pbmZvT3B0aW9uIFBRY29ubmluZm9PcHRpb25zW10gPSB7CiAJCSJEYXRhYmFzZS1QYXNzd29y ZC1GaWxlIiwgIiIsIDY0LAogCW9mZnNldG9mKHN0cnVjdCBwZ19jb25uLCBwZ3Bhc3NmaWxlKX0s CiAKKwl7ImNoYW5uZWxfYmluZGluZyIsICJQR0NIQU5ORUxCSU5ESU5HIiwgTlVMTCwgTlVMTCwK KwkgIkNoYW5uZWwtQmluZGluZyIsICIiLCA3LCAvKiBzaXplb2YoInJlcXVpcmUiKSAqLworCW9m ZnNldG9mKHN0cnVjdCBwZ19jb25uLCBjaGFubmVsX2JpbmRpbmcpfSwKKwogCXsiY29ubmVjdF90 aW1lb3V0IiwgIlBHQ09OTkVDVF9USU1FT1VUIiwgTlVMTCwgTlVMTCwKIAkJIkNvbm5lY3QtdGlt ZW91dCIsICIiLCAxMCwJLyogc3RybGVuKElOVDMyX01BWCkgPT0gMTAgKi8KIAlvZmZzZXRvZihz dHJ1Y3QgcGdfY29ubiwgY29ubmVjdF90aW1lb3V0KX0sCkBAIC01NTYsNiArNTYxLDcgQEAgcHFE cm9wU2VydmVyRGF0YShQR2Nvbm4gKmNvbm4pCiAJY29ubi0+bGFzdF9zcWxzdGF0ZVswXSA9ICdc MCc7CiAJY29ubi0+YXV0aF9yZXFfcmVjZWl2ZWQgPSBmYWxzZTsKIAljb25uLT5wYXNzd29yZF9u ZWVkZWQgPSBmYWxzZTsKKwljb25uLT5jaGFubmVsX2JvdW5kID0gZmFsc2U7CiAJY29ubi0+d3Jp dGVfZmFpbGVkID0gZmFsc2U7CiAJaWYgKGNvbm4tPndyaXRlX2Vycl9tc2cpCiAJCWZyZWUoY29u bi0+d3JpdGVfZXJyX21zZyk7CkBAIC0xMTk3LDYgKzEyMDMsMjggQEAgY29ubmVjdE9wdGlvbnMy KFBHY29ubiAqY29ubikKIAkJfQogCX0KIAorCS8qCisJICogdmFsaWRhdGUgY2hhbm5lbF9iaW5k aW5nIG9wdGlvbgorCSAqLworCWlmIChjb25uLT5jaGFubmVsX2JpbmRpbmcpCisJeworCQlpZiAo c3RyY21wKGNvbm4tPmNoYW5uZWxfYmluZGluZywgInByZWZlciIpICE9IDAKKwkJCSYmIHN0cmNt cChjb25uLT5jaGFubmVsX2JpbmRpbmcsICJyZXF1aXJlIikgIT0gMCkKKwkJeworCQkJY29ubi0+ c3RhdHVzID0gQ09OTkVDVElPTl9CQUQ7CisJCQlwcmludGZQUUV4cEJ1ZmZlcigmY29ubi0+ZXJy b3JNZXNzYWdlLAorCQkJCQkJCSAgbGlicHFfZ2V0dGV4dCgiaW52YWxpZCBjaGFubmVsX2JpbmRp bmcgdmFsdWU6IFwiJXNcIlxuIiksCisJCQkJCQkJICBjb25uLT5jaGFubmVsX2JpbmRpbmcpOwor CQkJcmV0dXJuIGZhbHNlOworCQl9CisJfQorCWVsc2UKKwl7CisJCWNvbm4tPmNoYW5uZWxfYmlu ZGluZyA9IHN0cmR1cChEZWZhdWx0Q2hhbm5lbEJpbmRpbmcpOworCQlpZiAoIWNvbm4tPmNoYW5u ZWxfYmluZGluZykKKwkJCWdvdG8gb29tX2Vycm9yOworCX0KKwogCS8qCiAJICogdmFsaWRhdGUg c3NsbW9kZSBvcHRpb24KIAkgKi8KZGlmZiAtLWdpdCBhL3NyYy9pbnRlcmZhY2VzL2xpYnBxL2xp YnBxLWludC5oIGIvc3JjL2ludGVyZmFjZXMvbGlicHEvbGlicHEtaW50LmgKaW5kZXggZDM3YmIz Y2U0MDQuLjcwYTViNDQ1ZDcyIDEwMDY0NAotLS0gYS9zcmMvaW50ZXJmYWNlcy9saWJwcS9saWJw cS1pbnQuaAorKysgYi9zcmMvaW50ZXJmYWNlcy9saWJwcS9saWJwcS1pbnQuaApAQCAtMzQ3LDYg KzM0Nyw3IEBAIHN0cnVjdCBwZ19jb25uCiAJY2hhcgkgICAqcGd1c2VyOwkJCS8qIFBvc3RncmVz IHVzZXJuYW1lIGFuZCBwYXNzd29yZCwgaWYgYW55ICovCiAJY2hhcgkgICAqcGdwYXNzOwogCWNo YXIJICAgKnBncGFzc2ZpbGU7CQkvKiBwYXRoIHRvIGEgZmlsZSBjb250YWluaW5nIHBhc3N3b3Jk KHMpICovCisJY2hhcgkgICAqY2hhbm5lbF9iaW5kaW5nOwkvKiBjaGFubmVsIGJpbmRpbmcgbW9k ZSAocmVxdWlyZSxwcmVmZXIpICovCiAJY2hhcgkgICAqa2VlcGFsaXZlczsJCS8qIHVzZSBUQ1Ag a2VlcGFsaXZlcz8gKi8KIAljaGFyCSAgICprZWVwYWxpdmVzX2lkbGU7CS8qIHRpbWUgYmV0d2Vl biBUQ1Aga2VlcGFsaXZlcyAqLwogCWNoYXIJICAgKmtlZXBhbGl2ZXNfaW50ZXJ2YWw7CS8qIHRp bWUgYmV0d2VlbiBUQ1Aga2VlcGFsaXZlCkBAIC00MTAsNiArNDExLDcgQEAgc3RydWN0IHBnX2Nv bm4KIAlpbnQJCQlzdmVyc2lvbjsJCS8qIHNlcnZlciB2ZXJzaW9uLCBlLmcuIDcwNDAxIGZvciA3 LjQuMSAqLwogCWJvb2wJCWF1dGhfcmVxX3JlY2VpdmVkOwkvKiB0cnVlIGlmIGFueSB0eXBlIG9m IGF1dGggcmVxIHJlY2VpdmVkICovCiAJYm9vbAkJcGFzc3dvcmRfbmVlZGVkOwkvKiB0cnVlIGlm IHNlcnZlciBkZW1hbmRlZCBhIHBhc3N3b3JkICovCisJYm9vbAkJY2hhbm5lbF9ib3VuZDsJLyog dHJ1ZSBpZiBjaGFubmVsX2JpbmRpbmcgaGFwcGVuZWQgKi8KIAlib29sCQlzaWdwaXBlX3NvOwkJ LyogaGF2ZSB3ZSBtYXNrZWQgU0lHUElQRSB2aWEgU09fTk9TSUdQSVBFPyAqLwogCWJvb2wJCXNp Z3BpcGVfZmxhZzsJLyogY2FuIHdlIG1hc2sgU0lHUElQRSB2aWEgTVNHX05PU0lHTkFMPyAqLwog CWJvb2wJCXdyaXRlX2ZhaWxlZDsJLyogaGF2ZSB3ZSBoYWQgYSB3cml0ZSBmYWlsdXJlIG9uIHNv Y2s/ICovCi0tIAoyLjE3LjEKCg== --=-IpQ2CtuY2Oi32CwWtvOh--