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 1oMGfZ-0005FS-0X for pgsql-hackers@arkaria.postgresql.org; Thu, 11 Aug 2022 22:28:49 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.92) (envelope-from ) id 1oMGfX-00085T-If for pgsql-hackers@arkaria.postgresql.org; Thu, 11 Aug 2022 22:28:47 +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 1oMGfX-00080B-3k for pgsql-hackers@lists.postgresql.org; Thu, 11 Aug 2022 22:28:47 +0000 Received: from mail-oi1-x22a.google.com ([2607:f8b0:4864:20::22a]) by magus.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1oMGfU-0000XS-QY for pgsql-hackers@postgresql.org; Thu, 11 Aug 2022 22:28:46 +0000 Received: by mail-oi1-x22a.google.com with SMTP id u9so22933746oiv.12 for ; Thu, 11 Aug 2022 15:28:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=timescale.com; s=google; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc; bh=9fzFCJh2lPVgZlStJ0We50wWZBEnbtzGUA2NimY6tIk=; b=YHJnH4jGsrHKpxTYL+aReGtgzOLJABCtkoc702p4ovsWvk9FCTLx2K+ZGmOIXdboUV 6msLlrW5sdMXnzNEIOi7766UzdOs1aajR1iovblQXfjfFPhFEIt1LfyVlNINRy3xFkFY 8btRBKXNHAHj/dq4c9qzPS+AmY3bZezaOqHhJaGH37lVeo7uIzWqZumOyl3ITGfvH00Z 5pjQM8HG2p0NUxGjHX8Aj+dq6C1crUMSAJwIT2rxMosjOwlyLhGPNRk1GEX+eQ51J6gP angzygbhUvrjbMgzc5SeL2eilrp4QKPXSTKmljCRAWXsvaiyADgKbfLP61SvwrCWwRuB mD/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc; bh=9fzFCJh2lPVgZlStJ0We50wWZBEnbtzGUA2NimY6tIk=; b=dmxQv22qdH3y1unx+kXBNPK+4FlsNKNf5t2moQSOsVDddRU8AiHHF2CAPA8wo1tZIf DiN/gjKRaZTORTADEGc92IhCB3y9xXo2+IbYCqN3rmGabJRlZVzd6Qnok0MQOtpQFC9d mJFNd4kauVgE6/en2F02AM6jpc7fysoAtAjQw8uOfzqRTocMwi4WNUk4ZO203ulZvyQ3 be8VjNo71IU3Gx10glV6CXMdnOrnGoNnhQY3lQz8pKYx1aOGXH7P01MQoH6vOPCNJSvA v1OSoEAin2j5XlqkTFv6txAVuTHpUl7eQQ7dLbwy4ht8YQZb5Pk1SZORIOa94P3f74vr 8vGQ== X-Gm-Message-State: ACgBeo3uG5xUYumBdVtz3wMvR+8ev8B1LJAVcIJBIN3PIDQZin6rAI29 WqqQePr89eYgublYCPcooijL4QSphKKkEd/qh6yhYg== X-Google-Smtp-Source: AA6agR74G+xjNx4fGF2kOmJMUii2370WoWjk6KmEjNANpKWux8FZtUy4oHeEUBOQlXqpudTdaGo6DVrxGBjSU3VMHhI= X-Received: by 2002:a05:6808:f01:b0:33a:9e95:3117 with SMTP id m1-20020a0568080f0100b0033a9e953117mr4172198oiw.285.1660256922780; Thu, 11 Aug 2022 15:28:42 -0700 (PDT) MIME-Version: 1.0 References: <3b678314-054a-6119-b373-4574067f404e@timescale.com> <34308245-ea21-82ee-b1fd-00b4766f3527@amazon.com> <2a1e2717-8c68-3f9e-1e02-32da71deb327@amazon.com> In-Reply-To: <2a1e2717-8c68-3f9e-1e02-32da71deb327@amazon.com> From: Jacob Champion Date: Thu, 11 Aug 2022 15:28:31 -0700 Message-ID: Subject: Re: [PATCH] Expose port->authn_id to extensions and triggers To: "Drouvot, Bertrand" Cc: Michael Paquier , Joe Conway , Robert Haas , Tom Lane , "sfrost@snowman.net" , "rjuju123@gmail.com" , "pgsql-hackers@postgresql.org" , "andres@anarazel.de" Content-Type: multipart/mixed; boundary="0000000000001ea5b405e5feb06f" List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Archived-At: Precedence: bulk --0000000000001ea5b405e5feb06f Content-Type: text/plain; charset="UTF-8" On Wed, Aug 10, 2022 at 10:48 PM Drouvot, Bertrand wrote: > What do you think about adding a second field in ClientConnectionInfo > for the auth method (as suggested by Michael upthread)? Sure -- without a followup patch, it's not really tested, though. v2 adjusts set_authn_id() to copy the auth_method over as well. It "passes tests" but is otherwise unexercised. Thanks, --Jacob --0000000000001ea5b405e5feb06f Content-Type: text/plain; charset="US-ASCII"; name="since-v1.diff.txt" Content-Disposition: attachment; filename="since-v1.diff.txt" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_l6plyyoc0 Y29tbWl0IDY5Y2FjZDVlMDg2OWIxOGQ2NGZmNDIzM2VmNmE3MzEyM2M1MTM0OTYKQXV0aG9yOiBK YWNvYiBDaGFtcGlvbiA8amNoYW1waW9uQHRpbWVzY2FsZS5jb20+CkRhdGU6ICAgVGh1IEF1ZyAx MSAxNToxNjoxNSAyMDIyIC0wNzAwCgogICAgc3F1YXNoISBBbGxvdyBwYXJhbGxlbCB3b3JrZXJz IHRvIHJlYWQgYXV0aG5faWQKICAgIAogICAgQWRkIGEgY29weSBvZiBoYmEtPmF1dGhfbWV0aG9k IHRvIENsaWVudENvbm5lY3Rpb25JbmZvIHdoZW4KICAgIHNldF9hdXRobl9pZCgpIGlzIGNhbGxl ZC4KCmRpZmYgLS1naXQgYS9zcmMvYmFja2VuZC9saWJwcS9hdXRoLmMgYi9zcmMvYmFja2VuZC9s aWJwcS9hdXRoLmMKaW5kZXggMzEzYTZlYTcwMS4uOTExM2YwNDE4OSAxMDA2NDQKLS0tIGEvc3Jj L2JhY2tlbmQvbGlicHEvYXV0aC5jCisrKyBiL3NyYy9iYWNrZW5kL2xpYnBxL2F1dGguYwpAQCAt MzMzLDkgKzMzMyw5IEBAIGF1dGhfZmFpbGVkKFBvcnQgKnBvcnQsIGludCBzdGF0dXMsIGNvbnN0 IGNoYXIgKmxvZ2RldGFpbCkKIAogCiAvKgotICogU2V0cyB0aGUgYXV0aGVudGljYXRlZCBpZGVu dGl0eSBmb3IgdGhlIGN1cnJlbnQgdXNlci4gIFRoZSBwcm92aWRlZCBzdHJpbmcKLSAqIHdpbGwg YmUgY29waWVkIGludG8gdGhlIFRvcE1lbW9yeUNvbnRleHQuICBUaGUgSUQgd2lsbCBiZSBsb2dn ZWQgaWYKLSAqIGxvZ19jb25uZWN0aW9ucyBpcyBlbmFibGVkLgorICogU2V0cyB0aGUgYXV0aGVu dGljYXRlZCBpZGVudGl0eSBmb3IgdGhlIGN1cnJlbnQgdXNlci4gVGhlIHByb3ZpZGVkIHN0cmlu ZworICogd2lsbCBiZSBzdG9yZWQgaW50byBNeUNsaWVudENvbm5lY3Rpb25JbmZvLCBhbG9uZ3Np ZGUgdGhlIGN1cnJlbnQgSEJBIG1ldGhvZAorICogaW4gdXNlLiBUaGUgSUQgd2lsbCBiZSBsb2dn ZWQgaWYgbG9nX2Nvbm5lY3Rpb25zIGlzIGVuYWJsZWQuCiAgKgogICogQXV0aCBtZXRob2RzIHNo b3VsZCBjYWxsIHRoaXMgcm91dGluZSBleGFjdGx5IG9uY2UsIGFzIHNvb24gYXMgdGhlIHVzZXIg aXMKICAqIHN1Y2Nlc3NmdWxseSBhdXRoZW50aWNhdGVkLCBldmVuIGlmIHRoZXkgaGF2ZSByZWFz b25zIHRvIGtub3cgdGhhdApAQCAtMzY1LDYgKzM2NSw3IEBAIHNldF9hdXRobl9pZChQb3J0ICpw b3J0LCBjb25zdCBjaGFyICppZCkKIAl9CiAKIAlNeUNsaWVudENvbm5lY3Rpb25JbmZvLmF1dGhu X2lkID0gTWVtb3J5Q29udGV4dFN0cmR1cChUb3BNZW1vcnlDb250ZXh0LCBpZCk7CisJTXlDbGll bnRDb25uZWN0aW9uSW5mby5hdXRoX21ldGhvZCA9IHBvcnQtPmhiYS0+YXV0aF9tZXRob2Q7CiAK IAlpZiAoTG9nX2Nvbm5lY3Rpb25zKQogCXsKQEAgLTM3Miw4ICszNzMsOCBAQCBzZXRfYXV0aG5f aWQoUG9ydCAqcG9ydCwgY29uc3QgY2hhciAqaWQpCiAJCQkJZXJybXNnKCJjb25uZWN0aW9uIGF1 dGhlbnRpY2F0ZWQ6IGlkZW50aXR5PVwiJXNcIiBtZXRob2Q9JXMgIgogCQkJCQkgICAiKCVzOiVk KSIsCiAJCQkJCSAgIE15Q2xpZW50Q29ubmVjdGlvbkluZm8uYXV0aG5faWQsCi0JCQkJCSAgIGhi YV9hdXRobmFtZShwb3J0LT5oYmEtPmF1dGhfbWV0aG9kKSwgSGJhRmlsZU5hbWUsCi0JCQkJCSAg IHBvcnQtPmhiYS0+bGluZW51bWJlcikpOworCQkJCQkgICBoYmFfYXV0aG5hbWUoTXlDbGllbnRD b25uZWN0aW9uSW5mby5hdXRoX21ldGhvZCksCisJCQkJCSAgIEhiYUZpbGVOYW1lLCBwb3J0LT5o YmEtPmxpbmVudW1iZXIpKTsKIAl9CiB9CiAKZGlmZiAtLWdpdCBhL3NyYy9iYWNrZW5kL3V0aWxz L2luaXQvbWlzY2luaXQuYyBiL3NyYy9iYWNrZW5kL3V0aWxzL2luaXQvbWlzY2luaXQuYwppbmRl eCA5NzMxMDMzNzRiLi4xNTViYTkyYzY3IDEwMDY0NAotLS0gYS9zcmMvYmFja2VuZC91dGlscy9p bml0L21pc2Npbml0LmMKKysrIGIvc3JjL2JhY2tlbmQvdXRpbHMvaW5pdC9taXNjaW5pdC5jCkBA IC05NTQsNiArOTU0LDggQEAgRXN0aW1hdGVDbGllbnRDb25uZWN0aW9uSW5mb1NwYWNlKHZvaWQp CiAJaWYgKE15Q2xpZW50Q29ubmVjdGlvbkluZm8uYXV0aG5faWQpCiAJCXNpemUgPSBhZGRfc2l6 ZShzaXplLCBzdHJsZW4oTXlDbGllbnRDb25uZWN0aW9uSW5mby5hdXRobl9pZCkgKyAxKTsKIAor CXNpemUgPSBhZGRfc2l6ZShzaXplLCBzaXplb2YoVXNlckF1dGgpKTsKKwogCXJldHVybiBzaXpl OwogfQogCkBAIC05ODEsNiArOTgzLDE1IEBAIFNlcmlhbGl6ZUNsaWVudENvbm5lY3Rpb25JbmZv KFNpemUgbWF4c2l6ZSwgY2hhciAqc3RhcnRfYWRkcmVzcykKIAkJbWF4c2l6ZSAtPSBsZW47CiAJ CXN0YXJ0X2FkZHJlc3MgKz0gbGVuOwogCX0KKworCXsKKwkJVXNlckF1dGgJICAgKmF1dGhfbWV0 aG9kID0gKFVzZXJBdXRoKikgc3RhcnRfYWRkcmVzczsKKworCQlBc3NlcnQoc2l6ZW9mKCphdXRo X21ldGhvZCkgPD0gbWF4c2l6ZSk7CisJCSphdXRoX21ldGhvZCA9IE15Q2xpZW50Q29ubmVjdGlv bkluZm8uYXV0aF9tZXRob2Q7CisJCW1heHNpemUgLT0gc2l6ZW9mKCphdXRoX21ldGhvZCk7CisJ CXN0YXJ0X2FkZHJlc3MgKz0gc2l6ZW9mKCphdXRoX21ldGhvZCk7CisJfQogfQogCiAvKgpAQCAt MTAwMSw2ICsxMDEyLDEzIEBAIFJlc3RvcmVDbGllbnRDb25uZWN0aW9uSW5mbyhjaGFyICpjb25u aW5mbykKIAkJCQkJCQkJCQkJCQkJCSAgY29ubmluZm8pOwogCQljb25uaW5mbyArPSBzdHJsZW4o Y29ubmluZm8pICsgMTsKIAl9CisKKwl7CisJCVVzZXJBdXRoCSAgICphdXRoX21ldGhvZCA9IChV c2VyQXV0aCopIGNvbm5pbmZvOworCisJCU15Q2xpZW50Q29ubmVjdGlvbkluZm8uYXV0aF9tZXRo b2QgPSAqYXV0aF9tZXRob2Q7CisJCWNvbm5pbmZvICs9IHNpemVvZigqYXV0aF9tZXRob2QpOwor CX0KIH0KIAogCmRpZmYgLS1naXQgYS9zcmMvaW5jbHVkZS9saWJwcS9saWJwcS1iZS5oIGIvc3Jj L2luY2x1ZGUvbGlicHEvbGlicHEtYmUuaAppbmRleCBjOTAwNDExZmRkLi4wNjQzNzMzNzY1IDEw MDY0NAotLS0gYS9zcmMvaW5jbHVkZS9saWJwcS9saWJwcS1iZS5oCisrKyBiL3NyYy9pbmNsdWRl L2xpYnBxL2xpYnBxLWJlLmgKQEAgLTExMSw3ICsxMTEsNyBAQCB0eXBlZGVmIHN0cnVjdAogewog CS8qCiAJICogQXV0aGVudGljYXRlZCBpZGVudGl0eS4gIFRoZSBtZWFuaW5nIG9mIHRoaXMgaWRl bnRpZmllciBpcyBkZXBlbmRlbnQgb24KLQkgKiBoYmEtPmF1dGhfbWV0aG9kOyBpdCBpcyB0aGUg aWRlbnRpdHkgKGlmIGFueSkgdGhhdCB0aGUgdXNlciBwcmVzZW50ZWQKKwkgKiBhdXRoX21ldGhv ZDsgaXQgaXMgdGhlIGlkZW50aXR5IChpZiBhbnkpIHRoYXQgdGhlIHVzZXIgcHJlc2VudGVkCiAJ ICogZHVyaW5nIHRoZSBhdXRoZW50aWNhdGlvbiBjeWNsZSwgYmVmb3JlIHRoZXkgd2VyZSBhc3Np Z25lZCBhIGRhdGFiYXNlCiAJICogcm9sZS4gIChJdCBpcyBlZmZlY3RpdmVseSB0aGUgIlNZU1RF TS1VU0VSTkFNRSIgb2YgYSBwZ19pZGVudCB1c2VybWFwCiAJICogLS0gdGhvdWdoIHRoZSBleGFj dCBzdHJpbmcgaW4gdXNlIG1heSBiZSBkaWZmZXJlbnQsIGRlcGVuZGluZyBvbiBwZ19oYmEKQEAg LTEyMSw2ICsxMjEsMTIgQEAgdHlwZWRlZiBzdHJ1Y3QKIAkgKiBleGFtcGxlIGlmIHRoZSAidHJ1 c3QiIGF1dGggbWV0aG9kIGlzIGluIHVzZS4KIAkgKi8KIAljb25zdCBjaGFyICphdXRobl9pZDsK KworCS8qCisJICogVGhlIEhCQSBtZXRob2QgdGhhdCBkZXRlcm1pbmVkIHRoZSBhYm92ZSBhdXRo bl9pZC4gVGhpcyBvbmx5IGhhcyBtZWFuaW5nCisJICogaWYgYXV0aG5faWQgaXMgbm90IE5VTEw7 IG90aGVyd2lzZSBpdCdzIHVuZGVmaW5lZC4KKwkgKi8KKwlVc2VyQXV0aAlhdXRoX21ldGhvZDsK IH0gQ2xpZW50Q29ubmVjdGlvbkluZm87CiAKIC8qCg== --0000000000001ea5b405e5feb06f Content-Type: text/x-patch; charset="US-ASCII"; name="v2-0001-Allow-parallel-workers-to-read-authn_id.patch" Content-Disposition: attachment; filename="v2-0001-Allow-parallel-workers-to-read-authn_id.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_l6plyyoj1 RnJvbSAzMmQ0NjU1Mjc2NzhhZDZlZjJmMTc3Mjg3Yzc5N2NkODdmZWJhNTg1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKYWNvYiBDaGFtcGlvbiA8cGNoYW1waW9uQHZtd2FyZS5jb20+ CkRhdGU6IFdlZCwgMjMgTWFyIDIwMjIgMTU6MDc6MDUgLTA3MDAKU3ViamVjdDogW1BBVENIIHYy XSBBbGxvdyBwYXJhbGxlbCB3b3JrZXJzIHRvIHJlYWQgYXV0aG5faWQKCk1vdmUgYXV0aG5faWQg aW50byBhIG5ldyBnbG9iYWwsIE15Q2xpZW50Q29ubmVjdGlvbkluZm8sIHdoaWNoIGlzCmludGVu ZGVkIHRvIGhvbGQgYWxsIHRoZSBjbGllbnQgaW5mb3JtYXRpb24gdGhhdCBuZWVkcyB0byBiZSBz aGFyZWQKYmV0d2VlbiB0aGUgYmFja2VuZCBhbmQgYW55IHBhcmFsbGVsIHdvcmtlcnMuIE15Q2xp ZW50Q29ubmVjdGlvbkluZm8gaXMKc2VyaWFsaXplZCBhbmQgcmVzdG9yZWQgdXNpbmcgYSBuZXcg cGFyYWxsZWwga2V5LgoKQWRkaXRpb25hbGx5LCBtYWtlIGEgY29weSBvZiBoYmEtPmF1dGhfbWV0 aG9kIGluIENsaWVudENvbm5lY3Rpb25JbmZvCndoZW4gc2V0X2F1dGhuX2lkKCkgaXMgY2FsbGVk LCBmb3IgdXNlIGJ5IFNZU1RFTV9VU0VSLgotLS0KIHNyYy9iYWNrZW5kL2FjY2Vzcy90cmFuc2Ft L3BhcmFsbGVsLmMgfCAxOSArKysrKy0KIHNyYy9iYWNrZW5kL2xpYnBxL2F1dGguYyAgICAgICAg ICAgICAgfCAyNSArKysrLS0tLQogc3JjL2JhY2tlbmQvdXRpbHMvaW5pdC9taXNjaW5pdC5jICAg ICB8IDkwICsrKysrKysrKysrKysrKysrKysrKysrKysrKwogc3JjL2luY2x1ZGUvbGlicHEvbGli cHEtYmUuaCAgICAgICAgICB8IDQ1ICsrKysrKysrKystLS0tCiBzcmMvaW5jbHVkZS9taXNjYWRt aW4uaCAgICAgICAgICAgICAgIHwgIDQgKysKIDUgZmlsZXMgY2hhbmdlZCwgMTU4IGluc2VydGlv bnMoKyksIDI1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3NyYy9iYWNrZW5kL2FjY2Vzcy90 cmFuc2FtL3BhcmFsbGVsLmMgYi9zcmMvYmFja2VuZC9hY2Nlc3MvdHJhbnNhbS9wYXJhbGxlbC5j CmluZGV4IGRmMGNkNzc1NTguLmJjOTMxMDFmZjcgMTAwNjQ0Ci0tLSBhL3NyYy9iYWNrZW5kL2Fj Y2Vzcy90cmFuc2FtL3BhcmFsbGVsLmMKKysrIGIvc3JjL2JhY2tlbmQvYWNjZXNzL3RyYW5zYW0v cGFyYWxsZWwuYwpAQCAtNzYsNiArNzYsNyBAQAogI2RlZmluZSBQQVJBTExFTF9LRVlfUkVJTkRF WF9TVEFURQkJCVVJTlQ2NENPTlNUKDB4RkZGRkZGRkZGRkZGMDAwQykKICNkZWZpbmUgUEFSQUxM RUxfS0VZX1JFTE1BUFBFUl9TVEFURQkJVUlOVDY0Q09OU1QoMHhGRkZGRkZGRkZGRkYwMDBEKQog I2RlZmluZSBQQVJBTExFTF9LRVlfVU5DT01NSVRURURFTlVNUwkJVUlOVDY0Q09OU1QoMHhGRkZG RkZGRkZGRkYwMDBFKQorI2RlZmluZSBQQVJBTExFTF9LRVlfQ0xJRU5UQ09OTklORk8JCQlVSU5U NjRDT05TVCgweEZGRkZGRkZGRkZGRjAwMEYpCiAKIC8qIEZpeGVkLXNpemUgcGFyYWxsZWwgc3Rh dGUuICovCiB0eXBlZGVmIHN0cnVjdCBGaXhlZFBhcmFsbGVsU3RhdGUKQEAgLTIxMiw2ICsyMTMs NyBAQCBJbml0aWFsaXplUGFyYWxsZWxEU00oUGFyYWxsZWxDb250ZXh0ICpwY3h0KQogCVNpemUJ CXJlaW5kZXhsZW4gPSAwOwogCVNpemUJCXJlbG1hcHBlcmxlbiA9IDA7CiAJU2l6ZQkJdW5jb21t aXR0ZWRlbnVtc2xlbiA9IDA7CisJU2l6ZQkJY2xpZW50Y29ubmluZm9sZW4gPSAwOwogCVNpemUJ CXNlZ3NpemUgPSAwOwogCWludAkJCWk7CiAJRml4ZWRQYXJhbGxlbFN0YXRlICpmcHM7CkBAIC0y NzIsOCArMjc0LDEwIEBAIEluaXRpYWxpemVQYXJhbGxlbERTTShQYXJhbGxlbENvbnRleHQgKnBj eHQpCiAJCXNobV90b2NfZXN0aW1hdGVfY2h1bmsoJnBjeHQtPmVzdGltYXRvciwgcmVsbWFwcGVy bGVuKTsKIAkJdW5jb21taXR0ZWRlbnVtc2xlbiA9IEVzdGltYXRlVW5jb21taXR0ZWRFbnVtc1Nw YWNlKCk7CiAJCXNobV90b2NfZXN0aW1hdGVfY2h1bmsoJnBjeHQtPmVzdGltYXRvciwgdW5jb21t aXR0ZWRlbnVtc2xlbik7CisJCWNsaWVudGNvbm5pbmZvbGVuID0gRXN0aW1hdGVDbGllbnRDb25u ZWN0aW9uSW5mb1NwYWNlKCk7CisJCXNobV90b2NfZXN0aW1hdGVfY2h1bmsoJnBjeHQtPmVzdGlt YXRvciwgY2xpZW50Y29ubmluZm9sZW4pOwogCQkvKiBJZiB5b3UgYWRkIG1vcmUgY2h1bmtzIGhl cmUsIHlvdSBwcm9iYWJseSBuZWVkIHRvIGFkZCBrZXlzLiAqLwotCQlzaG1fdG9jX2VzdGltYXRl X2tleXMoJnBjeHQtPmVzdGltYXRvciwgMTEpOworCQlzaG1fdG9jX2VzdGltYXRlX2tleXMoJnBj eHQtPmVzdGltYXRvciwgMTIpOwogCiAJCS8qIEVzdGltYXRlIHNwYWNlIG5lZWQgZm9yIGVycm9y IHF1ZXVlcy4gKi8KIAkJU3RhdGljQXNzZXJ0U3RtdChCVUZGRVJBTElHTihQQVJBTExFTF9FUlJP Ul9RVUVVRV9TSVpFKSA9PQpAQCAtMzUyLDYgKzM1Niw3IEBAIEluaXRpYWxpemVQYXJhbGxlbERT TShQYXJhbGxlbENvbnRleHQgKnBjeHQpCiAJCWNoYXIJICAgKnNlc3Npb25fZHNtX2hhbmRsZV9z cGFjZTsKIAkJY2hhcgkgICAqZW50cnlwb2ludHN0YXRlOwogCQljaGFyCSAgICp1bmNvbW1pdHRl ZGVudW1zc3BhY2U7CisJCWNoYXIJICAgKmNsaWVudGNvbm5pbmZvc3BhY2U7CiAJCVNpemUJCWxu YW1lbGVuOwogCiAJCS8qIFNlcmlhbGl6ZSBzaGFyZWQgbGlicmFyaWVzIHdlIGhhdmUgbG9hZGVk LiAqLwpAQCAtNDIyLDYgKzQyNywxMiBAQCBJbml0aWFsaXplUGFyYWxsZWxEU00oUGFyYWxsZWxD b250ZXh0ICpwY3h0KQogCQlzaG1fdG9jX2luc2VydChwY3h0LT50b2MsIFBBUkFMTEVMX0tFWV9V TkNPTU1JVFRFREVOVU1TLAogCQkJCQkgICB1bmNvbW1pdHRlZGVudW1zc3BhY2UpOwogCisJCS8q IFNlcmlhbGl6ZSBvdXIgQ2xpZW50Q29ubmVjdGlvbkluZm8uICovCisJCWNsaWVudGNvbm5pbmZv c3BhY2UgPSBzaG1fdG9jX2FsbG9jYXRlKHBjeHQtPnRvYywgY2xpZW50Y29ubmluZm9sZW4pOwor CQlTZXJpYWxpemVDbGllbnRDb25uZWN0aW9uSW5mbyhjbGllbnRjb25uaW5mb2xlbiwgY2xpZW50 Y29ubmluZm9zcGFjZSk7CisJCXNobV90b2NfaW5zZXJ0KHBjeHQtPnRvYywgUEFSQUxMRUxfS0VZ X0NMSUVOVENPTk5JTkZPLAorCQkJCQkgICBjbGllbnRjb25uaW5mb3NwYWNlKTsKKwogCQkvKiBB bGxvY2F0ZSBzcGFjZSBmb3Igd29ya2VyIGluZm9ybWF0aW9uLiAqLwogCQlwY3h0LT53b3JrZXIg PSBwYWxsb2MwKHNpemVvZihQYXJhbGxlbFdvcmtlckluZm8pICogcGN4dC0+bndvcmtlcnMpOwog CkBAIC0xMjcwLDYgKzEyODEsNyBAQCBQYXJhbGxlbFdvcmtlck1haW4oRGF0dW0gbWFpbl9hcmcp CiAJY2hhcgkgICAqcmVpbmRleHNwYWNlOwogCWNoYXIJICAgKnJlbG1hcHBlcnNwYWNlOwogCWNo YXIJICAgKnVuY29tbWl0dGVkZW51bXNzcGFjZTsKKwljaGFyCSAgICpjbGllbnRjb25uaW5mb3Nw YWNlOwogCVN0cmluZ0luZm9EYXRhIG1zZ2J1ZjsKIAljaGFyCSAgICpzZXNzaW9uX2RzbV9oYW5k bGVfc3BhY2U7CiAJU25hcHNob3QJdHNuYXBzaG90OwpAQCAtMTQ3OSw2ICsxNDkxLDExIEBAIFBh cmFsbGVsV29ya2VyTWFpbihEYXR1bSBtYWluX2FyZykKIAkJCQkJCQkJCQkgICBmYWxzZSk7CiAJ UmVzdG9yZVVuY29tbWl0dGVkRW51bXModW5jb21taXR0ZWRlbnVtc3NwYWNlKTsKIAorCS8qIFJl c3RvcmUgdGhlIENsaWVudENvbm5lY3Rpb25JbmZvLiAqLworCWNsaWVudGNvbm5pbmZvc3BhY2Ug PSBzaG1fdG9jX2xvb2t1cCh0b2MsIFBBUkFMTEVMX0tFWV9DTElFTlRDT05OSU5GTywKKwkJCQkJ CQkJCQkgZmFsc2UpOworCVJlc3RvcmVDbGllbnRDb25uZWN0aW9uSW5mbyhjbGllbnRjb25uaW5m b3NwYWNlKTsKKwogCS8qIEF0dGFjaCB0byB0aGUgbGVhZGVyJ3Mgc2VyaWFsaXphYmxlIHRyYW5z YWN0aW9uLCBpZiBTRVJJQUxJWkFCTEUuICovCiAJQXR0YWNoU2VyaWFsaXphYmxlWGFjdChmcHMt PnNlcmlhbGl6YWJsZV94YWN0X2hhbmRsZSk7CiAKZGlmZiAtLWdpdCBhL3NyYy9iYWNrZW5kL2xp YnBxL2F1dGguYyBiL3NyYy9iYWNrZW5kL2xpYnBxL2F1dGguYwppbmRleCAyZDlhYjdlZGNlLi45 MTEzZjA0MTg5IDEwMDY0NAotLS0gYS9zcmMvYmFja2VuZC9saWJwcS9hdXRoLmMKKysrIGIvc3Jj L2JhY2tlbmQvbGlicHEvYXV0aC5jCkBAIC0zMzMsMjQgKzMzMywyNCBAQCBhdXRoX2ZhaWxlZChQ b3J0ICpwb3J0LCBpbnQgc3RhdHVzLCBjb25zdCBjaGFyICpsb2dkZXRhaWwpCiAKIAogLyoKLSAq IFNldHMgdGhlIGF1dGhlbnRpY2F0ZWQgaWRlbnRpdHkgZm9yIHRoZSBjdXJyZW50IHVzZXIuICBU aGUgcHJvdmlkZWQgc3RyaW5nCi0gKiB3aWxsIGJlIGNvcGllZCBpbnRvIHRoZSBUb3BNZW1vcnlD b250ZXh0LiAgVGhlIElEIHdpbGwgYmUgbG9nZ2VkIGlmCi0gKiBsb2dfY29ubmVjdGlvbnMgaXMg ZW5hYmxlZC4KKyAqIFNldHMgdGhlIGF1dGhlbnRpY2F0ZWQgaWRlbnRpdHkgZm9yIHRoZSBjdXJy ZW50IHVzZXIuIFRoZSBwcm92aWRlZCBzdHJpbmcKKyAqIHdpbGwgYmUgc3RvcmVkIGludG8gTXlD bGllbnRDb25uZWN0aW9uSW5mbywgYWxvbmdzaWRlIHRoZSBjdXJyZW50IEhCQSBtZXRob2QKKyAq IGluIHVzZS4gVGhlIElEIHdpbGwgYmUgbG9nZ2VkIGlmIGxvZ19jb25uZWN0aW9ucyBpcyBlbmFi bGVkLgogICoKICAqIEF1dGggbWV0aG9kcyBzaG91bGQgY2FsbCB0aGlzIHJvdXRpbmUgZXhhY3Rs eSBvbmNlLCBhcyBzb29uIGFzIHRoZSB1c2VyIGlzCiAgKiBzdWNjZXNzZnVsbHkgYXV0aGVudGlj YXRlZCwgZXZlbiBpZiB0aGV5IGhhdmUgcmVhc29ucyB0byBrbm93IHRoYXQKICAqIGF1dGhvcml6 YXRpb24gd2lsbCBmYWlsIGxhdGVyLgogICoKICAqIFRoZSBwcm92aWRlZCBzdHJpbmcgd2lsbCBi ZSBjb3BpZWQgaW50byBUb3BNZW1vcnlDb250ZXh0LCB0byBtYXRjaCB0aGUKLSAqIGxpZmV0aW1l IG9mIHRoZSBQb3J0LCBzbyBpdCBpcyBzYWZlIHRvIHBhc3MgYSBzdHJpbmcgdGhhdCBpcyBtYW5h Z2VkIGJ5IGFuCi0gKiBleHRlcm5hbCBsaWJyYXJ5LgorICogbGlmZXRpbWUgb2YgTXlDbGllbnRD b25uZWN0aW9uSW5mbywgc28gaXQgaXMgc2FmZSB0byBwYXNzIGEgc3RyaW5nIHRoYXQgaXMKKyAq IG1hbmFnZWQgYnkgYW4gZXh0ZXJuYWwgbGlicmFyeS4KICAqLwogc3RhdGljIHZvaWQKIHNldF9h dXRobl9pZChQb3J0ICpwb3J0LCBjb25zdCBjaGFyICppZCkKIHsKIAlBc3NlcnQoaWQpOwogCi0J aWYgKHBvcnQtPmF1dGhuX2lkKQorCWlmIChNeUNsaWVudENvbm5lY3Rpb25JbmZvLmF1dGhuX2lk KQogCXsKIAkJLyoKIAkJICogQW4gZXhpc3RpbmcgYXV0aG5faWQgc2hvdWxkIG5ldmVyIGJlIG92 ZXJ3cml0dGVuOyB0aGF0IG1lYW5zIHR3bwpAQCAtMzYxLDE4ICszNjEsMjAgQEAgc2V0X2F1dGhu X2lkKFBvcnQgKnBvcnQsIGNvbnN0IGNoYXIgKmlkKQogCQllcmVwb3J0KEZBVEFMLAogCQkJCShl cnJtc2coImF1dGhlbnRpY2F0aW9uIGlkZW50aWZpZXIgc2V0IG1vcmUgdGhhbiBvbmNlIiksCiAJ CQkJIGVycmRldGFpbF9sb2coInByZXZpb3VzIGlkZW50aWZpZXI6IFwiJXNcIjsgbmV3IGlkZW50 aWZpZXI6IFwiJXNcIiIsCi0JCQkJCQkJICAgcG9ydC0+YXV0aG5faWQsIGlkKSkpOworCQkJCQkJ CSAgIE15Q2xpZW50Q29ubmVjdGlvbkluZm8uYXV0aG5faWQsIGlkKSkpOwogCX0KIAotCXBvcnQt PmF1dGhuX2lkID0gTWVtb3J5Q29udGV4dFN0cmR1cChUb3BNZW1vcnlDb250ZXh0LCBpZCk7CisJ TXlDbGllbnRDb25uZWN0aW9uSW5mby5hdXRobl9pZCA9IE1lbW9yeUNvbnRleHRTdHJkdXAoVG9w TWVtb3J5Q29udGV4dCwgaWQpOworCU15Q2xpZW50Q29ubmVjdGlvbkluZm8uYXV0aF9tZXRob2Qg PSBwb3J0LT5oYmEtPmF1dGhfbWV0aG9kOwogCiAJaWYgKExvZ19jb25uZWN0aW9ucykKIAl7CiAJ CWVyZXBvcnQoTE9HLAogCQkJCWVycm1zZygiY29ubmVjdGlvbiBhdXRoZW50aWNhdGVkOiBpZGVu dGl0eT1cIiVzXCIgbWV0aG9kPSVzICIKIAkJCQkJICAgIiglczolZCkiLAotCQkJCQkgICBwb3J0 LT5hdXRobl9pZCwgaGJhX2F1dGhuYW1lKHBvcnQtPmhiYS0+YXV0aF9tZXRob2QpLCBIYmFGaWxl TmFtZSwKLQkJCQkJICAgcG9ydC0+aGJhLT5saW5lbnVtYmVyKSk7CisJCQkJCSAgIE15Q2xpZW50 Q29ubmVjdGlvbkluZm8uYXV0aG5faWQsCisJCQkJCSAgIGhiYV9hdXRobmFtZShNeUNsaWVudENv bm5lY3Rpb25JbmZvLmF1dGhfbWV0aG9kKSwKKwkJCQkJICAgSGJhRmlsZU5hbWUsIHBvcnQtPmhi YS0+bGluZW51bWJlcikpOwogCX0KIH0KIApAQCAtMTkwOCw3ICsxOTEwLDggQEAgYXV0aF9wZWVy KGhiYVBvcnQgKnBvcnQpCiAJICovCiAJc2V0X2F1dGhuX2lkKHBvcnQsIHB3LT5wd19uYW1lKTsK IAotCXJldCA9IGNoZWNrX3VzZXJtYXAocG9ydC0+aGJhLT51c2VybWFwLCBwb3J0LT51c2VyX25h bWUsIHBvcnQtPmF1dGhuX2lkLCBmYWxzZSk7CisJcmV0ID0gY2hlY2tfdXNlcm1hcChwb3J0LT5o YmEtPnVzZXJtYXAsIHBvcnQtPnVzZXJfbmFtZSwKKwkJCQkJCU15Q2xpZW50Q29ubmVjdGlvbklu Zm8uYXV0aG5faWQsIGZhbHNlKTsKIAogCXJldHVybiByZXQ7CiAjZWxzZQpkaWZmIC0tZ2l0IGEv c3JjL2JhY2tlbmQvdXRpbHMvaW5pdC9taXNjaW5pdC5jIGIvc3JjL2JhY2tlbmQvdXRpbHMvaW5p dC9taXNjaW5pdC5jCmluZGV4IGViNDNiMmM1ZTUuLjE1NWJhOTJjNjcgMTAwNjQ0Ci0tLSBhL3Ny Yy9iYWNrZW5kL3V0aWxzL2luaXQvbWlzY2luaXQuYworKysgYi9zcmMvYmFja2VuZC91dGlscy9p bml0L21pc2Npbml0LmMKQEAgLTkzMSw2ICs5MzEsOTYgQEAgR2V0VXNlck5hbWVGcm9tSWQoT2lk IHJvbGVpZCwgYm9vbCBub2VycikKIAlyZXR1cm4gcmVzdWx0OwogfQogCisvKiAtLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0KKyAqCQkJCVBhcmFsbGVsIGNvbm5lY3Rpb24gc3RhdGUKKyAqCisgKiBDbGllbnRDb25u ZWN0aW9uSW5mbyBjb250YWlucyBwaWVjZXMgb2YgaW5mb3JtYXRpb24gYWJvdXQgdGhlIGNsaWVu dCB0aGF0CisgKiBuZWVkIHRvIGJlIHN5bmNlZCB0byBwYXJhbGxlbCB3b3JrZXJzIHdoZW4gdGhl eSBpbml0aWFsaXplLiBPdmVyIHRpbWUsIHRoaXMKKyAqIGxpc3Qgd2lsbCBwcm9iYWJseSBncm93 LCBhbmQgbWF5IHN1YnN1bWUgc29tZSBvZiB0aGUgInVzZXIgc3RhdGUiIHZhcmlhYmxlcworICog YWJvdmUuCisgKi0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KKyAqLworCitDbGllbnRDb25uZWN0aW9uSW5mbyBN eUNsaWVudENvbm5lY3Rpb25JbmZvOworCisvKgorICogQ2FsY3VsYXRlIHRoZSBzcGFjZSBuZWVk ZWQgdG8gc2VyaWFsaXplIE15Q2xpZW50Q29ubmVjdGlvbkluZm8uCisgKi8KK1NpemUKK0VzdGlt YXRlQ2xpZW50Q29ubmVjdGlvbkluZm9TcGFjZSh2b2lkKQoreworCVNpemUJCXNpemUgPSAxOwor CisJaWYgKE15Q2xpZW50Q29ubmVjdGlvbkluZm8uYXV0aG5faWQpCisJCXNpemUgPSBhZGRfc2l6 ZShzaXplLCBzdHJsZW4oTXlDbGllbnRDb25uZWN0aW9uSW5mby5hdXRobl9pZCkgKyAxKTsKKwor CXNpemUgPSBhZGRfc2l6ZShzaXplLCBzaXplb2YoVXNlckF1dGgpKTsKKworCXJldHVybiBzaXpl OworfQorCisvKgorICogU2VyaWFsaXplIE15Q2xpZW50Q29ubmVjdGlvbkluZm8gZm9yIHVzZSBi eSBwYXJhbGxlbCB3b3JrZXJzLgorICovCit2b2lkCitTZXJpYWxpemVDbGllbnRDb25uZWN0aW9u SW5mbyhTaXplIG1heHNpemUsIGNoYXIgKnN0YXJ0X2FkZHJlc3MpCit7CisJLyoKKwkgKiBGaXJz dCBieXRlIGlzIGFuIGluZGljYXRpb24gb2Ygd2hldGhlciBvciBub3QgYXV0aG5faWQgaGFzIGJl ZW4gc2V0IHRvCisJICogbm9uLU5VTEwsIHRvIGRpZmZlcmVudGlhdGUgdGhhdCBjYXNlIGZyb20g dGhlIGVtcHR5IHN0cmluZy4KKwkgKi8KKwlBc3NlcnQobWF4c2l6ZSA+IDApOworCXN0YXJ0X2Fk ZHJlc3NbMF0gPSBNeUNsaWVudENvbm5lY3Rpb25JbmZvLmF1dGhuX2lkID8gMSA6IDA7CisJc3Rh cnRfYWRkcmVzcysrOworCW1heHNpemUtLTsKKworCWlmIChNeUNsaWVudENvbm5lY3Rpb25JbmZv LmF1dGhuX2lkKQorCXsKKwkJU2l6ZSBsZW47CisKKwkJbGVuID0gc3RybGNweShzdGFydF9hZGRy ZXNzLCBNeUNsaWVudENvbm5lY3Rpb25JbmZvLmF1dGhuX2lkLCBtYXhzaXplKSArIDE7CisJCUFz c2VydChsZW4gPD0gbWF4c2l6ZSk7CisJCW1heHNpemUgLT0gbGVuOworCQlzdGFydF9hZGRyZXNz ICs9IGxlbjsKKwl9CisKKwl7CisJCVVzZXJBdXRoCSAgICphdXRoX21ldGhvZCA9IChVc2VyQXV0 aCopIHN0YXJ0X2FkZHJlc3M7CisKKwkJQXNzZXJ0KHNpemVvZigqYXV0aF9tZXRob2QpIDw9IG1h eHNpemUpOworCQkqYXV0aF9tZXRob2QgPSBNeUNsaWVudENvbm5lY3Rpb25JbmZvLmF1dGhfbWV0 aG9kOworCQltYXhzaXplIC09IHNpemVvZigqYXV0aF9tZXRob2QpOworCQlzdGFydF9hZGRyZXNz ICs9IHNpemVvZigqYXV0aF9tZXRob2QpOworCX0KK30KKworLyoKKyAqIFJlc3RvcmUgTXlDbGll bnRDb25uZWN0aW9uSW5mbyBmcm9tIGl0cyBzZXJpYWxpemVkIHJlcHJlc2VudGF0aW9uLgorICov Cit2b2lkCitSZXN0b3JlQ2xpZW50Q29ubmVjdGlvbkluZm8oY2hhciAqY29ubmluZm8pCit7CisJ aWYgKGNvbm5pbmZvWzBdID09IDApCisJeworCQlNeUNsaWVudENvbm5lY3Rpb25JbmZvLmF1dGhu X2lkID0gTlVMTDsKKwkJY29ubmluZm8rKzsKKwl9CisJZWxzZQorCXsKKwkJY29ubmluZm8rKzsK KwkJTXlDbGllbnRDb25uZWN0aW9uSW5mby5hdXRobl9pZCA9IE1lbW9yeUNvbnRleHRTdHJkdXAo VG9wTWVtb3J5Q29udGV4dCwKKwkJCQkJCQkJCQkJCQkJCSAgY29ubmluZm8pOworCQljb25uaW5m byArPSBzdHJsZW4oY29ubmluZm8pICsgMTsKKwl9CisKKwl7CisJCVVzZXJBdXRoCSAgICphdXRo X21ldGhvZCA9IChVc2VyQXV0aCopIGNvbm5pbmZvOworCisJCU15Q2xpZW50Q29ubmVjdGlvbklu Zm8uYXV0aF9tZXRob2QgPSAqYXV0aF9tZXRob2Q7CisJCWNvbm5pbmZvICs9IHNpemVvZigqYXV0 aF9tZXRob2QpOworCX0KK30KKwogCiAvKi0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KICAqCQkJCUludGVybG9j ay1maWxlIHN1cHBvcnQKZGlmZiAtLWdpdCBhL3NyYy9pbmNsdWRlL2xpYnBxL2xpYnBxLWJlLmgg Yi9zcmMvaW5jbHVkZS9saWJwcS9saWJwcS1iZS5oCmluZGV4IDkwYzIwZGEyMmIuLjA2NDM3MzM3 NjUgMTAwNjQ0Ci0tLSBhL3NyYy9pbmNsdWRlL2xpYnBxL2xpYnBxLWJlLmgKKysrIGIvc3JjL2lu Y2x1ZGUvbGlicHEvbGlicHEtYmUuaApAQCAtOTgsNiArOTgsMzcgQEAgdHlwZWRlZiBzdHJ1Y3QK IH0gcGdfZ3NzaW5mbzsKICNlbmRpZgogCisvKgorICogRmllbGRzIGRlc2NyaWJpbmcgdGhlIGNs aWVudCBjb25uZWN0aW9uLCB0aGF0IGFsc28gbmVlZCB0byBiZSBjb3BpZWQgb3ZlciB0bworICog cGFyYWxsZWwgd29ya2VycywgZ28gaW50byB0aGUgQ2xpZW50Q29ubmVjdGlvbkluZm8gcmF0aGVy IHRoYW4gUG9ydC4gVGhlIHNhbWUKKyAqIHJ1bGVzIGFwcGx5IGZvciBhbGxvY2F0aW9ucyBoZXJl IGFzIGZvciBQb3J0IChtdXN0IGJlIG1hbGxvYydkIG9yIHBhbGxvYydkIGluCisgKiBUb3BNZW1v cnlDb250ZXh0KS4KKyAqCisgKiBJZiB5b3UgYWRkIGEgc3RydWN0IG1lbWJlciBoZXJlLCByZW1l bWJlciB0byBhbHNvIGhhbmRsZSBzZXJpYWxpemF0aW9uIGluCisgKiBTZXJpYWxpemVDbGllbnRD b25uZWN0aW9uSW5mbygpIGV0IGFsLgorICovCit0eXBlZGVmIHN0cnVjdAoreworCS8qCisJICog QXV0aGVudGljYXRlZCBpZGVudGl0eS4gIFRoZSBtZWFuaW5nIG9mIHRoaXMgaWRlbnRpZmllciBp cyBkZXBlbmRlbnQgb24KKwkgKiBhdXRoX21ldGhvZDsgaXQgaXMgdGhlIGlkZW50aXR5IChpZiBh bnkpIHRoYXQgdGhlIHVzZXIgcHJlc2VudGVkCisJICogZHVyaW5nIHRoZSBhdXRoZW50aWNhdGlv biBjeWNsZSwgYmVmb3JlIHRoZXkgd2VyZSBhc3NpZ25lZCBhIGRhdGFiYXNlCisJICogcm9sZS4g IChJdCBpcyBlZmZlY3RpdmVseSB0aGUgIlNZU1RFTS1VU0VSTkFNRSIgb2YgYSBwZ19pZGVudCB1 c2VybWFwCisJICogLS0gdGhvdWdoIHRoZSBleGFjdCBzdHJpbmcgaW4gdXNlIG1heSBiZSBkaWZm ZXJlbnQsIGRlcGVuZGluZyBvbiBwZ19oYmEKKwkgKiBvcHRpb25zLikKKwkgKgorCSAqIGF1dGhu X2lkIGlzIE5VTEwgaWYgdGhlIHVzZXIgaGFzIG5vdCBhY3R1YWxseSBiZWVuIGF1dGhlbnRpY2F0 ZWQsIGZvcgorCSAqIGV4YW1wbGUgaWYgdGhlICJ0cnVzdCIgYXV0aCBtZXRob2QgaXMgaW4gdXNl LgorCSAqLworCWNvbnN0IGNoYXIgKmF1dGhuX2lkOworCisJLyoKKwkgKiBUaGUgSEJBIG1ldGhv ZCB0aGF0IGRldGVybWluZWQgdGhlIGFib3ZlIGF1dGhuX2lkLiBUaGlzIG9ubHkgaGFzIG1lYW5p bmcKKwkgKiBpZiBhdXRobl9pZCBpcyBub3QgTlVMTDsgb3RoZXJ3aXNlIGl0J3MgdW5kZWZpbmVk LgorCSAqLworCVVzZXJBdXRoCWF1dGhfbWV0aG9kOworfSBDbGllbnRDb25uZWN0aW9uSW5mbzsK KwogLyoKICAqIFRoaXMgaXMgdXNlZCBieSB0aGUgcG9zdG1hc3RlciBpbiBpdHMgY29tbXVuaWNh dGlvbiB3aXRoIGZyb250ZW5kcy4gIEl0CiAgKiBjb250YWlucyBhbGwgc3RhdGUgaW5mb3JtYXRp b24gbmVlZGVkIGR1cmluZyB0aGlzIGNvbW11bmljYXRpb24gYmVmb3JlIHRoZQpAQCAtMTU4LDE5 ICsxODksNiBAQCB0eXBlZGVmIHN0cnVjdCBQb3J0CiAJICovCiAJSGJhTGluZSAgICAqaGJhOwog Ci0JLyoKLQkgKiBBdXRoZW50aWNhdGVkIGlkZW50aXR5LiAgVGhlIG1lYW5pbmcgb2YgdGhpcyBp ZGVudGlmaWVyIGlzIGRlcGVuZGVudCBvbgotCSAqIGhiYS0+YXV0aF9tZXRob2Q7IGl0IGlzIHRo ZSBpZGVudGl0eSAoaWYgYW55KSB0aGF0IHRoZSB1c2VyIHByZXNlbnRlZAotCSAqIGR1cmluZyB0 aGUgYXV0aGVudGljYXRpb24gY3ljbGUsIGJlZm9yZSB0aGV5IHdlcmUgYXNzaWduZWQgYSBkYXRh YmFzZQotCSAqIHJvbGUuICAoSXQgaXMgZWZmZWN0aXZlbHkgdGhlICJTWVNURU0tVVNFUk5BTUUi IG9mIGEgcGdfaWRlbnQgdXNlcm1hcAotCSAqIC0tIHRob3VnaCB0aGUgZXhhY3Qgc3RyaW5nIGlu IHVzZSBtYXkgYmUgZGlmZmVyZW50LCBkZXBlbmRpbmcgb24gcGdfaGJhCi0JICogb3B0aW9ucy4p Ci0JICoKLQkgKiBhdXRobl9pZCBpcyBOVUxMIGlmIHRoZSB1c2VyIGhhcyBub3QgYWN0dWFsbHkg YmVlbiBhdXRoZW50aWNhdGVkLCBmb3IKLQkgKiBleGFtcGxlIGlmIHRoZSAidHJ1c3QiIGF1dGgg bWV0aG9kIGlzIGluIHVzZS4KLQkgKi8KLQljb25zdCBjaGFyICphdXRobl9pZDsKLQogCS8qCiAJ ICogVENQIGtlZXBhbGl2ZSBhbmQgdXNlciB0aW1lb3V0IHNldHRpbmdzLgogCSAqCkBAIC0zMjcs NiArMzQ1LDcgQEAgZXh0ZXJuIHNzaXplX3QgYmVfZ3NzYXBpX3dyaXRlKFBvcnQgKnBvcnQsIHZv aWQgKnB0ciwgc2l6ZV90IGxlbik7CiAjZW5kaWYJCQkJCQkJLyogRU5BQkxFX0dTUyAqLwogCiBl eHRlcm4gUEdETExJTVBPUlQgUHJvdG9jb2xWZXJzaW9uIEZyb250ZW5kUHJvdG9jb2w7CitleHRl cm4gUEdETExJTVBPUlQgQ2xpZW50Q29ubmVjdGlvbkluZm8gTXlDbGllbnRDb25uZWN0aW9uSW5m bzsKIAogLyogVENQIGtlZXBhbGl2ZXMgY29uZmlndXJhdGlvbi4gVGhlc2UgYXJlIG5vLW9wcyBv biBhbiBBRl9VTklYIHNvY2tldC4gKi8KIApkaWZmIC0tZ2l0IGEvc3JjL2luY2x1ZGUvbWlzY2Fk bWluLmggYi9zcmMvaW5jbHVkZS9taXNjYWRtaW4uaAppbmRleCAwNjdiNzI5ZDVhLi4zZTkyOTdl Mzk5IDEwMDY0NAotLS0gYS9zcmMvaW5jbHVkZS9taXNjYWRtaW4uaAorKysgYi9zcmMvaW5jbHVk ZS9taXNjYWRtaW4uaApAQCAtNDgxLDYgKzQ4MSwxMCBAQCBleHRlcm4gYm9vbCBoYXNfcm9scmVw bGljYXRpb24oT2lkIHJvbGVpZCk7CiB0eXBlZGVmIHZvaWQgKCpzaG1lbV9yZXF1ZXN0X2hvb2tf dHlwZSkgKHZvaWQpOwogZXh0ZXJuIFBHRExMSU1QT1JUIHNobWVtX3JlcXVlc3RfaG9va190eXBl IHNobWVtX3JlcXVlc3RfaG9vazsKIAorZXh0ZXJuIFNpemUgRXN0aW1hdGVDbGllbnRDb25uZWN0 aW9uSW5mb1NwYWNlKHZvaWQpOworZXh0ZXJuIHZvaWQgU2VyaWFsaXplQ2xpZW50Q29ubmVjdGlv bkluZm8oU2l6ZSBtYXhzaXplLCBjaGFyICpzdGFydF9hZGRyZXNzKTsKK2V4dGVybiB2b2lkIFJl c3RvcmVDbGllbnRDb25uZWN0aW9uSW5mbyhjaGFyICpwcm9jaW5mbyk7CisKIC8qIGluIGV4ZWN1 dG9yL25vZGVIYXNoLmMgKi8KIGV4dGVybiBzaXplX3QgZ2V0X2hhc2hfbWVtb3J5X2xpbWl0KHZv aWQpOwogCi0tIAoyLjI1LjEKCg== --0000000000001ea5b405e5feb06f--