Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1wOzBO-000KV9-2l for pgsql-hackers@arkaria.postgresql.org; Mon, 18 May 2026 14:43:03 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.96) (envelope-from ) id 1wOzBM-002Zux-0u for pgsql-hackers@arkaria.postgresql.org; Mon, 18 May 2026 14:43:01 +0000 Received: from magus.postgresql.org ([2a02:c0:301:0:ffff::29]) by malur.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1wOzBL-002Zup-2l for pgsql-hackers@lists.postgresql.org; Mon, 18 May 2026 14:43:00 +0000 Received: from mail-qk1-x735.google.com ([2607:f8b0:4864:20::735]) by magus.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.98.2) (envelope-from ) id 1wOzBK-00000000CV2-1N0U for pgsql-hackers@lists.postgresql.org; Mon, 18 May 2026 14:43:00 +0000 Received: by mail-qk1-x735.google.com with SMTP id af79cd13be357-912475287a5so262649285a.2 for ; Mon, 18 May 2026 07:42:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779115376; x=1779720176; darn=lists.postgresql.org; h=in-reply-to:references:subject:cc:to:from:message-id:date :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=5Z7ydZiKhXGVlFSIYa3qdSAcykggTXKuH5tYqYabwyk=; b=J0LRvgRGCKcPSQIATB+jJtQGCCQG2cSDOKUVuAocs9fo+fsECne4xBsxWvQG4wp2Sg ka/mMPKkTVGUMoPTAYAeT0u82q6jBgnrJjYpi05NSFTtolf+/FgJy3uyKVDh621u0jyC DgMVK+iBM7RtQ13vevZKZsy49DDBeg8TUY2p7tov0fDQmhSYApz2gjM/ECqJI/MAQuES 9cn3bd62tHN1o9tj5uGFjC9eFgwut0l87zrTPEcx/SSA1SW7gWngT4oZVLZb9g1p+I7n ShWRHXNSWKEo2+//kttqSisYR63saoosDulbWglP1gPCv+ZqiSW4nV9jFJIdSVnTBBx4 Azjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779115376; x=1779720176; h=in-reply-to:references:subject:cc:to:from:message-id:date :mime-version:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=5Z7ydZiKhXGVlFSIYa3qdSAcykggTXKuH5tYqYabwyk=; b=dh14Fk9qSRjFWwPyfofPFqMN+c7+qwK2JZWVR/LDSIUb4mXxbTP7WICGGonSPCZcPM HFjgip1R76tZiSfQXcnmO+/6WzlUlZj0N/cZRypN9H5fT590v62W3swE4s1D1jxZNuew lx2MUr9ANXqD8oxnxm3CWu0QYv1NqgCz+uiIOSUubTI1DILf/Pul1RykBqojAEaKX/o0 LJ1tqbhpwQ4gS35Zyz5r/9J/I8fKUYcAf1C2f3UaNKQKozSuLGG+S2ArCZPzETqPhi1R sjgvfC1RjzZ6/YnnWoznJ3US1ekLtsSMdekkmAql6YSpuA5N+oLFI0kMFFi+oA9/heP/ ao0w== X-Gm-Message-State: AOJu0YwpP8QQh177qKJs7Pvbn9sYqPn9qV8sZs5k7l0nEHxeR4nbhoVb u3onvA6vOBHhZEQaSJH1hLyGOkx61a2kkFnAMvFFwOfQ+LMkGpyPV6Mh X-Gm-Gg: Acq92OFOBjMkpMs/TiMm/o+D76EMn3xp5nlPT7Cbg989shegtBufpeu+dA54YcUJExz H4WXT7+48YLjUXzcWi27vTfEsGT/clOWd9KrMulJHCT2c1bLbYuwA2vC+9J7BBZH9VLBbUwDKWw sBDG1wnQwKbRY/7q7bgoURUjRya/cNhSjiIplJ+EfoHJ4f8p7yBQ8G91Hnnuq/hV3It+mmnQUeh lG9xA5RVmKu906CdYPBCn42q8DJlrQjoed7E4sIWb4eujG9u2D6Y2CDY8VzdSP9CHoAzuweE8Lj VKpMlU5CATKGMpOTtX5bnHLIYJUmgtiCYrJrrmvmaYIzIN+ZeIi8ko3JHEZOGC7cCTNZrlr+dzJ 0ZqrliuNcRkkUAkC3OjMV23ZCbGucHln79XV271hsuabOXyLKmQDWBpNJQj2jcIfjywyucdi4B9 yr5BsK4GXc9ziTN+BggjjeVwc9AiDJpSDtGNl7RiB0g53jng== X-Received: by 2002:a05:620a:6cc1:b0:8d7:3f45:b95f with SMTP id af79cd13be357-911cdd4cb9bmr2323728885a.16.1779115376322; Mon, 18 May 2026 07:42:56 -0700 (PDT) Received: from localhost ([2804:14d:328a:a59c:dc47:a7be:7e31:dfb5]) by smtp.gmail.com with ESMTPSA id af79cd13be357-910bd62e233sm1513264185a.45.2026.05.18.07.42.54 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 18 May 2026 07:42:55 -0700 (PDT) Content-Type: multipart/mixed; boundary=53eeaeab8405698a79aed5708160b5644b6b0a7b76fcda5894cc9c5ff7c9 Mime-Version: 1.0 Date: Mon, 18 May 2026 11:42:52 -0300 Message-Id: From: "Matheus Alcantara" To: "Fujii Masao" Cc: "PostgreSQL Hackers" Subject: Re: postgres_fdw: use_scram_passthrough on user mapping is ignored when also set on server X-Mailer: aerc 0.21.0 References: In-Reply-To: List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Archived-At: Precedence: bulk --53eeaeab8405698a79aed5708160b5644b6b0a7b76fcda5894cc9c5ff7c9 Content-Type: multipart/alternative; boundary=f410729fe8d0a989f015e093741219b957429b406a68be90ed3f4b07c867 --f410729fe8d0a989f015e093741219b957429b406a68be90ed3f4b07c867 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Content-Type: text/plain; charset=UTF-8 On Mon May 18, 2026 at 5:01 AM -03, Fujii Masao wrote: > Thanks for the patches! > > Neither dblink nor postgres_fdw seems to have tests checking whether opti= ons > are specified at the proper object level (foreign server, user mapping, e= tc.). > So adding the test for ALTER FOREIGN DATA WRAPPER ... > (use_scram_passthrough ...) > seems a bit overkill to me. Also, even if we decide to add such a test, > it might be simpler to put it in sql/dblink.sql rather than as a TAP test= . > Thoughts? > I think that the test is worth to have to avoid such issues in the future again, but I agree that adding as a TAP test is overkill. I've moved to sql/dblink.sql on the new attached version. Do you think that we need to add such test for postgres_fdw too? >> Are you considering backporting these patches? I think that 0003 is >> good, not sure about 0001 and 0002. > > I assume your concern is that v18 was already released with the current > behavior, where the server-level use_scram_passthrough setting overrides > the user-mapping-level one. Backpatching the behavior change to v18 could > therefore affect existing users relying on that behavior, right? > Yes, you are right, this was my main concern. > If the documentation had clearly stated that the user-mapping-level setti= ng > takes precedence, we could reasonably treat the current behavior as a bug > and change it even in v18. But since there is no such documentation, > I understand the hesitation. > Yeah, we don't have any documentation about this on 18, but we do have for sslkey and sslcert where in postgres-fdw.sgml we have the following: sslkey and sslcert - these may appear in either or both a connection and a user mapping. If both are present, the user mapping setting overrides the connection setting. So I think that is desirable to have the same behavior for use_scram_passthrough. > That said, I'm feeling tempted to backpatch the change to v18, because ha= ving > only v18 behave differently seems odd and potentially confusing... > I agree with this. > The issue addressed by patch 0003 may have a similar concern. However, > since use_scram_passthrough set on dblink_fdw currently has no effect > even if there are existing users depending on that, it seems acceptable t= o > change that behavior in v18. Is that your thinking? > Yes, you are right. Even if there are users that are relying on this it's not working, so we at lest make it explicitly and avoid confusions. Thank you for reviewing the patches! -- Matheus Alcantara EDB: https://www.enterprisedb.com --f410729fe8d0a989f015e093741219b957429b406a68be90ed3f4b07c867-- --53eeaeab8405698a79aed5708160b5644b6b0a7b76fcda5894cc9c5ff7c9 Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=v3-0001-postgres_fdw-Allow-user-mapping-to-override-use_s.patch Content-Type: text/plain; charset=utf-8; name=v3-0001-postgres_fdw-Allow-user-mapping-to-override-use_s.patch RnJvbSBiNDU5MzlhYzRhNjA4YTllMTc4ZGU0YzBiOTA5ODJkZGNiYjBiYjFiIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXRoZXVzIEFsY2FudGFyYSA8bXRocy5kZXZAcG0ubWU+CkRh dGU6IFRodSwgMTQgTWF5IDIwMjYgMTc6MDA6MTMgLTAzMDAKU3ViamVjdDogW1BBVENIIHYzIDEv M10gcG9zdGdyZXNfZmR3OiBBbGxvdyB1c2VyIG1hcHBpbmcgdG8gb3ZlcnJpZGUKIHVzZV9zY3Jh bV9wYXNzdGhyb3VnaAoKUHJldmlvdXNseSwgdXNlX3NjcmFtX3Bhc3N0aHJvdWdoIHdhcyBjaGVj a2VkIG9uIHRoZSBmb3JlaWduIHNlcnZlcgpvcHRpb25zIGZpcnN0LCB3aGljaCBtZWFudCB0aGF0 IGlmIHNldCBvbiB0aGUgc2VydmVyLCB0aGUgdXNlciBtYXBwaW5nCm9wdGlvbiB3b3VsZCBiZSBp Z25vcmVkLiBUaGlzIGNoYW5nZXMgdGhlIHByZWNlZGVuY2UgdG8gY2hlY2sgdGhlIHVzZXIKbWFw cGluZyBvcHRpb24gZmlyc3QsIGFsbG93aW5nIHVzZXJzIHRvIG92ZXJyaWRlIHRoZSBzZXJ2ZXIt bGV2ZWwKc2V0dGluZyBvbiBhIHBlci11c2VyIGJhc2lzLgoKVGhpcyBpcyBjb25zaXN0ZW50IHdp dGggaG93IG90aGVyIGNvbm5lY3Rpb24gb3B0aW9ucyBsaWtlIHNzbGNlcnQgYW5kCnNzbGtleSBh cmUgaGFuZGxlZCwgd2hlcmUgdXNlciBtYXBwaW5nIHNldHRpbmdzIHRha2UgcHJlY2VkZW5jZSBv dmVyCnNlcnZlciBzZXR0aW5ncy4KCkFsc28gYWRkIGEgdGVzdCBjYXNlIHRvIHZlcmlmeSB0aGF0 IHNldHRpbmcgdXNlX3NjcmFtX3Bhc3N0aHJvdWdoPWZhbHNlCm9uIGEgdXNlciBtYXBwaW5nIGNv cnJlY3RseSBkaXNhYmxlcyBTQ1JBTSBwYXNzdGhyb3VnaCBldmVuIHdoZW4gdGhlCnNlcnZlciBo YXMgaXQgZW5hYmxlZC4KClJldmlld2VkLWJ5OiBGdWppaSBNYXNhbyA8bWFzYW8uZnVqaWlAZ21h aWwuY29tPgpEaXNjdXNzaW9uOiBodHRwczovL3d3dy5wb3N0Z3Jlc3FsLm9yZy9tZXNzYWdlLWlk L0NBSEdRR3dFSjhyWmptYk92Q2ljeXI0dmJ1TGlvMDgyYk5UZGUwV05vU1dhV3I5d1ZjZyU0MG1h aWwuZ21haWwuY29tCi0tLQogY29udHJpYi9wb3N0Z3Jlc19mZHcvY29ubmVjdGlvbi5jICAgICAg ICB8IDEwICsrKysrKy0tCiBjb250cmliL3Bvc3RncmVzX2Zkdy90LzAwMV9hdXRoX3NjcmFtLnBs IHwgMzAgKysrKysrKysrKysrKysrKysrKysrKysrCiBkb2Mvc3JjL3NnbWwvcG9zdGdyZXMtZmR3 LnNnbWwgICAgICAgICAgIHwgIDQgKysrLQogMyBmaWxlcyBjaGFuZ2VkLCA0MSBpbnNlcnRpb25z KCspLCAzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2NvbnRyaWIvcG9zdGdyZXNfZmR3L2Nv bm5lY3Rpb24uYyBiL2NvbnRyaWIvcG9zdGdyZXNfZmR3L2Nvbm5lY3Rpb24uYwppbmRleCAzZDJh OGQwNTE5ZC4uZDcxNzY5Mjk2YjggMTAwNjQ0Ci0tLSBhL2NvbnRyaWIvcG9zdGdyZXNfZmR3L2Nv bm5lY3Rpb24uYworKysgYi9jb250cmliL3Bvc3RncmVzX2Zkdy9jb25uZWN0aW9uLmMKQEAgLTcx NSwxMiArNzE1LDE4IEBAIFVzZXJNYXBwaW5nUGFzc3dvcmRSZXF1aXJlZChVc2VyTWFwcGluZyAq dXNlcikKIAlyZXR1cm4gdHJ1ZTsKIH0KIAorLyoKKyAqIFJldHVybiB3aGV0aGVyIFNDUkFNIHBh c3MtdGhyb3VnaCBpcyBlbmFibGVkLgorICoKKyAqIElmIHVzZV9zY3JhbV9wYXNzdGhyb3VnaCBp cyBzcGVjaWZpZWQgaW4gYm90aCB0aGUgZm9yZWlnbiBzZXJ2ZXIKKyAqIGFuZCB0aGUgdXNlciBt YXBwaW5nLCB0aGUgdXNlciBtYXBwaW5nIHNldHRpbmcgdGFrZXMgcHJlY2VkZW5jZS4KKyAqLwog c3RhdGljIGJvb2wKIFVzZVNjcmFtUGFzc3Rocm91Z2goRm9yZWlnblNlcnZlciAqc2VydmVyLCBV c2VyTWFwcGluZyAqdXNlcikKIHsKIAlMaXN0Q2VsbCAgICpjZWxsOwogCi0JZm9yZWFjaChjZWxs LCBzZXJ2ZXItPm9wdGlvbnMpCisJZm9yZWFjaChjZWxsLCB1c2VyLT5vcHRpb25zKQogCXsKIAkJ RGVmRWxlbSAgICAqZGVmID0gKERlZkVsZW0gKikgbGZpcnN0KGNlbGwpOwogCkBAIC03MjgsNyAr NzM0LDcgQEAgVXNlU2NyYW1QYXNzdGhyb3VnaChGb3JlaWduU2VydmVyICpzZXJ2ZXIsIFVzZXJN YXBwaW5nICp1c2VyKQogCQkJcmV0dXJuIGRlZkdldEJvb2xlYW4oZGVmKTsKIAl9CiAKLQlmb3Jl YWNoKGNlbGwsIHVzZXItPm9wdGlvbnMpCisJZm9yZWFjaChjZWxsLCBzZXJ2ZXItPm9wdGlvbnMp CiAJewogCQlEZWZFbGVtICAgICpkZWYgPSAoRGVmRWxlbSAqKSBsZmlyc3QoY2VsbCk7CiAKZGlm ZiAtLWdpdCBhL2NvbnRyaWIvcG9zdGdyZXNfZmR3L3QvMDAxX2F1dGhfc2NyYW0ucGwgYi9jb250 cmliL3Bvc3RncmVzX2Zkdy90LzAwMV9hdXRoX3NjcmFtLnBsCmluZGV4IDZjMThkYjRmMmM4Li5j NGI1N2NkODFiMyAxMDA2NDQKLS0tIGEvY29udHJpYi9wb3N0Z3Jlc19mZHcvdC8wMDFfYXV0aF9z Y3JhbS5wbAorKysgYi9jb250cmliL3Bvc3RncmVzX2Zkdy90LzAwMV9hdXRoX3NjcmFtLnBsCkBA IC0yMCw2ICsyMCw3IEBAIG15ICRkYjEgPSAiZGIxIjsgICAgIyBGb3Igbm9kZTEKIG15ICRkYjIg PSAiZGIyIjsgICAgIyBGb3Igbm9kZTIKIG15ICRmZHdfc2VydmVyID0gImRiMV9mZHciOwogbXkg JGZkd19zZXJ2ZXIyID0gImRiMl9mZHciOworbXkgJGZkd19zZXJ2ZXIzID0gImRiMV9mZHdfb3Zl cnJpZGUiOwogCiBteSAkbm9kZTEgPSBQb3N0Z3JlU1FMOjpUZXN0OjpDbHVzdGVyLT5uZXcoJ25v ZGUxJyk7CiBteSAkbm9kZTIgPSBQb3N0Z3JlU1FMOjpUZXN0OjpDbHVzdGVyLT5uZXcoJ25vZGUy Jyk7CkBAIC00Niw5ICs0NywxMSBAQCBzZXR1cF90YWJsZSgkbm9kZTIsICRkYjIsICJ0MiIpOwog JG5vZGUxLT5zYWZlX3BzcWwoJGRiMCwgJ0NSRUFURSBFWFRFTlNJT04gSUYgTk9UIEVYSVNUUyBw b3N0Z3Jlc19mZHcnKTsKIHNldHVwX2Zkd19zZXJ2ZXIoJG5vZGUxLCAkZGIwLCAkZmR3X3NlcnZl ciwgJG5vZGUxLCAkZGIxKTsKIHNldHVwX2Zkd19zZXJ2ZXIoJG5vZGUxLCAkZGIwLCAkZmR3X3Nl cnZlcjIsICRub2RlMiwgJGRiMik7CitzZXR1cF9mZHdfc2VydmVyKCRub2RlMSwgJGRiMCwgJGZk d19zZXJ2ZXIzLCAkbm9kZTEsICRkYjEpOwogCiBzZXR1cF91c2VyX21hcHBpbmcoJG5vZGUxLCAk ZGIwLCAkZmR3X3NlcnZlcik7CiBzZXR1cF91c2VyX21hcHBpbmcoJG5vZGUxLCAkZGIwLCAkZmR3 X3NlcnZlcjIpOworc2V0dXBfdXNlcl9tYXBwaW5nKCRub2RlMSwgJGRiMCwgJGZkd19zZXJ2ZXIz KTsKIAogIyBNYWtlIHRoZSB1c2VyIGhhdmUgdGhlIHNhbWUgU0NSQU0ga2V5IG9uIGJvdGggc2Vy dmVycy4gRm9yY2luZyB0byBoYXZlIHRoZQogIyBzYW1lIGl0ZXJhdGlvbiBhbmQgc2FsdC4KQEAg LTY4LDYgKzcxLDMzIEBAIHRlc3RfZmR3X2F1dGgoJG5vZGUxLCAkZGIwLCAidDIiLCAkZmR3X3Nl cnZlcjIsCiB0ZXN0X2F1dGgoJG5vZGUyLCAkZGIyLCAidDIiLAogCSJTQ1JBTSBhdXRoIGRpcmVj dGx5IG9uIGZvcmVpZ24gc2VydmVyIHNob3VsZCBzdGlsbCBzdWNjZWVkIik7CiAKKyMgVGVzdCB0 aGF0IHVzZV9zY3JhbV9wYXNzdGhyb3VnaD1mYWxzZSBvbiB1c2VyIG1hcHBpbmcgb3ZlcnJpZGVz IHNlcnZlciBzZXR0aW5nCit7CisJbXkgJGNvbm5zdHIgPSAkbm9kZTEtPmNvbm5zdHIoJGRiMCkg LiBxcScgdXNlcj0kdXNlcic7CisKKwkkbm9kZTEtPnNhZmVfcHNxbCgkZGIwLAorCQlxcSdBTFRF UiBVU0VSIE1BUFBJTkcgRk9SICR1c2VyIFNFUlZFUiAkZmR3X3NlcnZlcjMgT1BUSU9OUyhhZGQg dXNlX3NjcmFtX3Bhc3N0aHJvdWdoIFwnZmFsc2VcJyknLAorCQljb25uc3RyID0+ICRjb25uc3Ry CisJKTsKKworCSRub2RlMS0+c2FmZV9wc3FsKAorCQkkZGIwLAorCQlxcSdDUkVBVEUgRk9SRUlH TiBUQUJMRSBvdmVycmlkZV90IChnIGludCwgY29sMiBpbnQpIFNFUlZFUiAkZmR3X3NlcnZlcjMg T1BUSU9OUyAodGFibGVfbmFtZSBcJ3RcJyk7JywKKwkJY29ubnN0ciA9PiAkY29ubnN0ciApOwor CSRub2RlMS0+c2FmZV9wc3FsKCRkYjAsIHFxJ0dSQU5UIFNFTEVDVCBPTiBvdmVycmlkZV90IFRP ICR1c2VyOycsIGNvbm5zdHIgPT4gJGNvbm5zdHIpOworCisJbXkgKCRyZXQsICRzdGRvdXQsICRz dGRlcnIpID0gJG5vZGUxLT5wc3FsKAorCQkkZGIwLAorCQlxcSdTRUxFQ1QgY291bnQoMSkgRlJP TSBvdmVycmlkZV90JywKKwkJY29ubnN0ciA9PiAkY29ubnN0cik7CisKKwlpcygkcmV0LCAzLCAn U0NSQU0gcGFzc3Rocm91Z2ggZGlzYWJsZWQgb24gdXNlciBtYXBwaW5nIHNob3VsZCBmYWlsJyk7 CisJbGlrZSgKKwkJJHN0ZGVyciwKKwkJcXIvcGFzc3dvcmQvaSwKKwkJJ2V4cGVjdGVkIHBhc3N3 b3JkLXJlbGF0ZWQgZXJyb3Igd2hlbiBzY3JhbSBwYXNzdGhyb3VnaCBkaXNhYmxlZCBvbiB1c2Vy IG1hcHBpbmcnKTsKK30KKwogU0tJUDoKIHsKIAlza2lwICJ0ZXN0IHJlcXVpcmVzIFVuaXgtZG9t YWluIHNvY2tldHMiLCA0IGlmICEkdXNlX3VuaXhfc29ja2V0czsKZGlmZiAtLWdpdCBhL2RvYy9z cmMvc2dtbC9wb3N0Z3Jlcy1mZHcuc2dtbCBiL2RvYy9zcmMvc2dtbC9wb3N0Z3Jlcy1mZHcuc2dt bAppbmRleCBiODFmMzM3MzJmYi4uYjllMWIwNDQ2M2UgMTAwNjQ0Ci0tLSBhL2RvYy9zcmMvc2dt bC9wb3N0Z3Jlcy1mZHcuc2dtbAorKysgYi9kb2Mvc3JjL3NnbWwvcG9zdGdyZXMtZmR3LnNnbWwK QEAgLTgwMyw3ICs4MDMsOSBAQCBPUFRJT05TIChBREQgcGFzc3dvcmRfcmVxdWlyZWQgJ2ZhbHNl Jyk7CiAgICAgICAgPHBhcmE+CiAgICAgICAgIFRoaXMgb3B0aW9uIGNvbnRyb2xzIHdoZXRoZXIg PGZpbGVuYW1lPnBvc3RncmVzX2ZkdzwvZmlsZW5hbWU+IHdpbGwKICAgICAgICAgdXNlIHRoZSBT Q1JBTSBwYXNzLXRocm91Z2ggYXV0aGVudGljYXRpb24gdG8gY29ubmVjdCB0byB0aGUgZm9yZWln bgotICAgICAgICBzZXJ2ZXIuICBXaXRoIFNDUkFNIHBhc3MtdGhyb3VnaCBhdXRoZW50aWNhdGlv biwKKyAgICAgICAgc2VydmVyLiAgSXQgY2FuIGJlIHNwZWNpZmllZCBmb3IgYSBmb3JlaWduIHNl cnZlciBvciBhIHVzZXIgbWFwcGluZy4KKyAgICAgICAgQSB1c2VyIG1hcHBpbmcgc2V0dGluZyBv dmVycmlkZXMgdGhlIGZvcmVpZ24gc2VydmVyIHNldHRpbmcuCisgICAgICAgIFdpdGggU0NSQU0g cGFzcy10aHJvdWdoIGF1dGhlbnRpY2F0aW9uLAogICAgICAgICA8ZmlsZW5hbWU+cG9zdGdyZXNf ZmR3PC9maWxlbmFtZT4gdXNlcyBTQ1JBTS1oYXNoZWQgc2VjcmV0cyBpbnN0ZWFkIG9mCiAgICAg ICAgIHBsYWluLXRleHQgdXNlciBwYXNzd29yZHMgdG8gY29ubmVjdCB0byB0aGUgcmVtb3RlIHNl cnZlci4gIFRoaXMKICAgICAgICAgYXZvaWRzIHN0b3JpbmcgcGxhaW4tdGV4dCB1c2VyIHBhc3N3 b3JkcyBpbiBQb3N0Z3JlU1FMIHN5c3RlbQotLSAKMi41My4wCgo= --53eeaeab8405698a79aed5708160b5644b6b0a7b76fcda5894cc9c5ff7c9 Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=v3-0002-dblink-Allow-user-mapping-to-override-use_scram_p.patch Content-Type: text/plain; charset=utf-8; name=v3-0002-dblink-Allow-user-mapping-to-override-use_scram_p.patch RnJvbSA2MWM4ZjEzMzFkODNkYjc4MDRhNjJmNzg1NmRjOTA0NzIzY2QyYmFmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXRoZXVzIEFsY2FudGFyYSA8bXRocy5kZXZAcG0ubWU+CkRh dGU6IFRodSwgMTQgTWF5IDIwMjYgMTc6MDg6MjQgLTAzMDAKU3ViamVjdDogW1BBVENIIHYzIDIv M10gZGJsaW5rOiBBbGxvdyB1c2VyIG1hcHBpbmcgdG8gb3ZlcnJpZGUKIHVzZV9zY3JhbV9wYXNz dGhyb3VnaAoKUHJldmlvdXNseSwgdXNlX3NjcmFtX3Bhc3N0aHJvdWdoIHdhcyBjaGVja2VkIG9u IHRoZSBmb3JlaWduIHNlcnZlcgpvcHRpb25zIGZpcnN0LCB3aGljaCBtZWFudCB0aGF0IGlmIHNl dCBvbiB0aGUgc2VydmVyLCB0aGUgdXNlciBtYXBwaW5nCm9wdGlvbiB3b3VsZCBiZSBpZ25vcmVk LiBUaGlzIGNoYW5nZXMgdGhlIHByZWNlZGVuY2UgdG8gY2hlY2sgdGhlIHVzZXIKbWFwcGluZyBv cHRpb24gZmlyc3QsIGFsbG93aW5nIHVzZXJzIHRvIG92ZXJyaWRlIHRoZSBzZXJ2ZXItbGV2ZWwK c2V0dGluZyBvbiBhIHBlci11c2VyIGJhc2lzLgoKVGhpcyBpcyBjb25zaXN0ZW50IHdpdGggaG93 IHBvc3RncmVzX2ZkdyBoYW5kbGVzIHRoaXMgb3B0aW9uIGFuZCBob3cKb3RoZXIgY29ubmVjdGlv biBvcHRpb25zIGxpa2Ugc3NsY2VydCBhbmQgc3Nsa2V5IHdvcmssIHdoZXJlIHVzZXIKbWFwcGlu ZyBzZXR0aW5ncyB0YWtlIHByZWNlZGVuY2Ugb3ZlciBzZXJ2ZXIgc2V0dGluZ3MuCgpBbHNvIGFk ZCBhIHRlc3QgY2FzZSB0byB2ZXJpZnkgdGhhdCBzZXR0aW5nIHVzZV9zY3JhbV9wYXNzdGhyb3Vn aD1mYWxzZQpvbiBhIHVzZXIgbWFwcGluZyBjb3JyZWN0bHkgZGlzYWJsZXMgU0NSQU0gcGFzc3Ro cm91Z2ggZXZlbiB3aGVuIHRoZQpzZXJ2ZXIgaGFzIGl0IGVuYWJsZWQuCgpSZXZpZXdlZC1ieTog RnVqaWkgTWFzYW8gPG1hc2FvLmZ1amlpQGdtYWlsLmNvbT4KRGlzY3Vzc2lvbjogaHR0cHM6Ly93 d3cucG9zdGdyZXNxbC5vcmcvbWVzc2FnZS1pZC9DQUhHUUd3RUo4clpqbWJPdkNpY3lyNHZidUxp bzA4MmJOVGRlMFdOb1NXYVdyOXdWY2clNDBtYWlsLmdtYWlsLmNvbQotLS0KIGNvbnRyaWIvZGJs aW5rL2RibGluay5jICAgICAgICAgICAgfCAxMCArKysrKysrKy0tCiBjb250cmliL2RibGluay90 LzAwMV9hdXRoX3NjcmFtLnBsIHwgMjQgKysrKysrKysrKysrKysrKysrKysrKysrCiBkb2Mvc3Jj L3NnbWwvZGJsaW5rLnNnbWwgICAgICAgICAgIHwgMTAgKysrKysrLS0tLQogMyBmaWxlcyBjaGFu Z2VkLCAzOCBpbnNlcnRpb25zKCspLCA2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2NvbnRy aWIvZGJsaW5rL2RibGluay5jIGIvY29udHJpYi9kYmxpbmsvZGJsaW5rLmMKaW5kZXggZDg0M2Vl ZTdlOTcuLmJiNmZjYWU0OTc0IDEwMDY0NAotLS0gYS9jb250cmliL2RibGluay9kYmxpbmsuYwor KysgYi9jb250cmliL2RibGluay9kYmxpbmsuYwpAQCAtMzIzMCwxMiArMzIzMCwxOCBAQCBhcHBl bmRTQ1JBTUtleXNJbmZvKFN0cmluZ0luZm8gYnVmKQogfQogCiAKKy8qCisgKiBSZXR1cm4gd2hl dGhlciBTQ1JBTSBwYXNzLXRocm91Z2ggaXMgZW5hYmxlZC4KKyAqCisgKiBJZiB1c2Vfc2NyYW1f cGFzc3Rocm91Z2ggaXMgc3BlY2lmaWVkIGluIGJvdGggdGhlIGZvcmVpZ24gc2VydmVyCisgKiBh bmQgdGhlIHVzZXIgbWFwcGluZywgdGhlIHVzZXIgbWFwcGluZyBzZXR0aW5nIHRha2VzIHByZWNl ZGVuY2UuCisgKi8KIHN0YXRpYyBib29sCiBVc2VTY3JhbVBhc3N0aHJvdWdoKEZvcmVpZ25TZXJ2 ZXIgKmZvcmVpZ25fc2VydmVyLCBVc2VyTWFwcGluZyAqdXNlcikKIHsKIAlMaXN0Q2VsbCAgICpj ZWxsOwogCi0JZm9yZWFjaChjZWxsLCBmb3JlaWduX3NlcnZlci0+b3B0aW9ucykKKwlmb3JlYWNo KGNlbGwsIHVzZXItPm9wdGlvbnMpCiAJewogCQlEZWZFbGVtICAgICpkZWYgPSBsZmlyc3QoY2Vs bCk7CiAKQEAgLTMyNDMsNyArMzI0OSw3IEBAIFVzZVNjcmFtUGFzc3Rocm91Z2goRm9yZWlnblNl cnZlciAqZm9yZWlnbl9zZXJ2ZXIsIFVzZXJNYXBwaW5nICp1c2VyKQogCQkJcmV0dXJuIGRlZkdl dEJvb2xlYW4oZGVmKTsKIAl9CiAKLQlmb3JlYWNoKGNlbGwsIHVzZXItPm9wdGlvbnMpCisJZm9y ZWFjaChjZWxsLCBmb3JlaWduX3NlcnZlci0+b3B0aW9ucykKIAl7CiAJCURlZkVsZW0gICAgKmRl ZiA9IChEZWZFbGVtICopIGxmaXJzdChjZWxsKTsKIApkaWZmIC0tZ2l0IGEvY29udHJpYi9kYmxp bmsvdC8wMDFfYXV0aF9zY3JhbS5wbCBiL2NvbnRyaWIvZGJsaW5rL3QvMDAxX2F1dGhfc2NyYW0u cGwKaW5kZXggOTU1OGNhODNiN2MuLmIwODdiMzhlNWE1IDEwMDY0NAotLS0gYS9jb250cmliL2Ri bGluay90LzAwMV9hdXRoX3NjcmFtLnBsCisrKyBiL2NvbnRyaWIvZGJsaW5rL3QvMDAxX2F1dGhf c2NyYW0ucGwKQEAgLTI0LDYgKzI0LDcgQEAgbXkgJGRiMSA9ICJkYjEiOyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAjIEZvciBub2RlMQogbXkgJGRiMiA9ICJkYjIiOyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAjIEZvciBub2RlMgogbXkgJGZkd19zZXJ2ZXIgPSAiZGIxX2Zk dyI7CiBteSAkZmR3X3NlcnZlcjIgPSAiZGIyX2ZkdyI7CitteSAkZmR3X3NlcnZlcjMgPSAiZGIx X2Zkd19vdmVycmlkZSI7CiBteSAkZmR3X2ludmFsaWRfc2VydmVyID0gImRiMl9mZHdfaW52YWxp ZCI7ICAgICMgRm9yIGludmFsaWQgZmR3IG9wdGlvbnMKIG15ICRmZHdfaW52YWxpZF9zZXJ2ZXIy ID0KICAgImRiMl9mZHdfaW52YWxpZDIiOyAgICAjIEZvciBpbnZhbGlkIHNjcmFtIGtleXMgZmR3 IG9wdGlvbnMKQEAgLTU1LDEwICs1NiwxMiBAQCBzZXR1cF9mZHdfc2VydmVyKCRub2RlMSwgJGRi MCwgJGZkd19zZXJ2ZXIsICRub2RlMSwgJGRiMSk7CiBzZXR1cF9mZHdfc2VydmVyKCRub2RlMSwg JGRiMCwgJGZkd19zZXJ2ZXIyLCAkbm9kZTIsICRkYjIpOwogc2V0dXBfaW52YWxpZF9mZHdfc2Vy dmVyKCRub2RlMSwgJGRiMCwgJGZkd19pbnZhbGlkX3NlcnZlciwgJG5vZGUyLCAkZGIyKTsKIHNl dHVwX2Zkd19zZXJ2ZXIoJG5vZGUxLCAkZGIwLCAkZmR3X2ludmFsaWRfc2VydmVyMiwgJG5vZGUy LCAkZGIyKTsKK3NldHVwX2Zkd19zZXJ2ZXIoJG5vZGUxLCAkZGIwLCAkZmR3X3NlcnZlcjMsICRu b2RlMSwgJGRiMSk7CiAKIHNldHVwX3VzZXJfbWFwcGluZygkbm9kZTEsICRkYjAsICRmZHdfc2Vy dmVyKTsKIHNldHVwX3VzZXJfbWFwcGluZygkbm9kZTEsICRkYjAsICRmZHdfc2VydmVyMik7CiBz ZXR1cF91c2VyX21hcHBpbmcoJG5vZGUxLCAkZGIwLCAkZmR3X2ludmFsaWRfc2VydmVyKTsKK3Nl dHVwX3VzZXJfbWFwcGluZygkbm9kZTEsICRkYjAsICRmZHdfc2VydmVyMyk7CiAKICMgTWFrZSB0 aGUgdXNlciBoYXZlIHRoZSBzYW1lIFNDUkFNIGtleSBvbiBib3RoIHNlcnZlcnMuIEZvcmNpbmcg dG8gaGF2ZSB0aGUKICMgc2FtZSBpdGVyYXRpb24gYW5kIHNhbHQuCkBAIC05Niw2ICs5OSwyNyBA QCB0ZXN0X2Zkd19hdXRoKCRub2RlMSwgJGRiMCwgInQyIiwgJGZkd19zZXJ2ZXIyLAogCiB0ZXN0 X2Zkd19hdXRoX3dpdGhfaW52YWxpZF9vdmVyd3JpdHRlbl9yZXF1aXJlX2F1dGgoJGZkd19pbnZh bGlkX3NlcnZlcik7CiAKKyMgVGVzdCB0aGF0IHVzZV9zY3JhbV9wYXNzdGhyb3VnaD1mYWxzZSBv biB1c2VyIG1hcHBpbmcgb3ZlcnJpZGVzIHNlcnZlciBzZXR0aW5nCit7CisJbXkgJGNvbm5zdHIg PSAkbm9kZTEtPmNvbm5zdHIoJGRiMCkgLiBxcScgdXNlcj0kdXNlcic7CisKKwkkbm9kZTEtPnNh ZmVfcHNxbCgkZGIwLAorCQlxcSdBTFRFUiBVU0VSIE1BUFBJTkcgRk9SICR1c2VyIFNFUlZFUiAk ZmR3X3NlcnZlcjMgT1BUSU9OUyhhZGQgdXNlX3NjcmFtX3Bhc3N0aHJvdWdoIFwnZmFsc2VcJykn LAorCQljb25uc3RyID0+ICRjb25uc3RyCisJKTsKKworCW15ICgkcmV0LCAkc3Rkb3V0LCAkc3Rk ZXJyKSA9ICRub2RlMS0+cHNxbCgKKwkJJGRiMCwKKwkJInNlbGVjdCAqIGZyb20gZGJsaW5rKCck ZmR3X3NlcnZlcjMnLCAnc2VsZWN0ICogZnJvbSB0JykgYXMgdChhIGludCwgYiBpbnQpIiwKKwkJ Y29ubnN0ciA9PiAkY29ubnN0cik7CisKKwlpcygkcmV0LCAzLCAnU0NSQU0gcGFzc3Rocm91Z2gg ZGlzYWJsZWQgb24gdXNlciBtYXBwaW5nIHNob3VsZCBmYWlsJyk7CisJbGlrZSgKKwkJJHN0ZGVy ciwKKwkJcXIvcGFzc3dvcmQvaSwKKwkJJ2V4cGVjdGVkIHBhc3N3b3JkLXJlbGF0ZWQgZXJyb3Ig d2hlbiBzY3JhbSBwYXNzdGhyb3VnaCBkaXNhYmxlZCBvbiB1c2VyIG1hcHBpbmcnKTsKK30KKwog IyBFbnN1cmUgdGhhdCB0cnVzdCBjb25uZWN0aW9ucyBmYWlsIHdpdGhvdXQgc3VwZXJ1c2VyIG9w dC1pbi4KIHVubGluaygkbm9kZTEtPmRhdGFfZGlyIC4gJy9wZ19oYmEuY29uZicpOwogdW5saW5r KCRub2RlMi0+ZGF0YV9kaXIgLiAnL3BnX2hiYS5jb25mJyk7CmRpZmYgLS1naXQgYS9kb2Mvc3Jj L3NnbWwvZGJsaW5rLnNnbWwgYi9kb2Mvc3JjL3NnbWwvZGJsaW5rLnNnbWwKaW5kZXggZGQ2Nzc4 ZDIyYTguLmZjNDk2Yjc0Mjg4IDEwMDY0NAotLS0gYS9kb2Mvc3JjL3NnbWwvZGJsaW5rLnNnbWwK KysrIGIvZG9jL3NyYy9zZ21sL2RibGluay5zZ21sCkBAIC0xNTQsMTAgKzE1NCwxMiBAQCBkYmxp bmtfY29ubmVjdCh0ZXh0IGNvbm5uYW1lLCB0ZXh0IGNvbm5zdHIpIHJldHVybnMgdGV4dAogICAg IFRoZSBmb3JlaWduLWRhdGEgd3JhcHBlciA8ZmlsZW5hbWU+ZGJsaW5rX2ZkdzwvZmlsZW5hbWU+ IGhhcyBhbiBhZGRpdGlvbmFsCiAgICAgQm9vbGVhbiBvcHRpb24gPGxpdGVyYWw+dXNlX3NjcmFt X3Bhc3N0aHJvdWdoPC9saXRlcmFsPiB0aGF0IGNvbnRyb2xzCiAgICAgd2hldGhlciA8ZmlsZW5h bWU+ZGJsaW5rPC9maWxlbmFtZT4gd2lsbCB1c2UgdGhlIFNDUkFNIHBhc3MtdGhyb3VnaAotICAg IGF1dGhlbnRpY2F0aW9uIHRvIGNvbm5lY3QgdG8gdGhlIHJlbW90ZSBkYXRhYmFzZS4gIFdpdGgg U0NSQU0gcGFzcy10aHJvdWdoCi0gICAgYXV0aGVudGljYXRpb24sIDxmaWxlbmFtZT5kYmxpbms8 L2ZpbGVuYW1lPiB1c2VzIFNDUkFNLWhhc2hlZCBzZWNyZXRzCi0gICAgaW5zdGVhZCBvZiBwbGFp bi10ZXh0IHVzZXIgcGFzc3dvcmRzIHRvIGNvbm5lY3QgdG8gdGhlIHJlbW90ZSBzZXJ2ZXIuIFRo aXMKLSAgICBhdm9pZHMgc3RvcmluZyBwbGFpbi10ZXh0IHVzZXIgcGFzc3dvcmRzIGluIFBvc3Rn cmVTUUwgc3lzdGVtIGNhdGFsb2dzLgorICAgIGF1dGhlbnRpY2F0aW9uIHRvIGNvbm5lY3QgdG8g dGhlIHJlbW90ZSBkYXRhYmFzZS4gIEl0IGNhbiBiZSBzcGVjaWZpZWQKKyAgICBmb3IgYSBmb3Jl aWduIHNlcnZlciBvciBhIHVzZXIgbWFwcGluZy4gIEEgdXNlciBtYXBwaW5nIHNldHRpbmcgb3Zl cnJpZGVzCisgICAgdGhlIGZvcmVpZ24gc2VydmVyIHNldHRpbmcuICBXaXRoIFNDUkFNIHBhc3Mt dGhyb3VnaCBhdXRoZW50aWNhdGlvbiwKKyAgICA8ZmlsZW5hbWU+ZGJsaW5rPC9maWxlbmFtZT4g dXNlcyBTQ1JBTS1oYXNoZWQgc2VjcmV0cyBpbnN0ZWFkIG9mIHBsYWluLXRleHQKKyAgICB1c2Vy IHBhc3N3b3JkcyB0byBjb25uZWN0IHRvIHRoZSByZW1vdGUgc2VydmVyLiBUaGlzIGF2b2lkcyBz dG9yaW5nCisgICAgcGxhaW4tdGV4dCB1c2VyIHBhc3N3b3JkcyBpbiBQb3N0Z3JlU1FMIHN5c3Rl bSBjYXRhbG9ncy4KICAgICBTZWUgdGhlIGRvY3VtZW50YXRpb24gb2YgdGhlIGVxdWl2YWxlbnQg PGxpbmsKICAgICBsaW5rZW5kPSJwb3N0Z3Jlcy1mZHctb3B0aW9uLXVzZS1zY3JhbS1wYXNzdGhy b3VnaCI+PGxpdGVyYWw+dXNlX3NjcmFtX3Bhc3N0aHJvdWdoPC9saXRlcmFsPjwvbGluaz4KICAg ICBvcHRpb24gb2YgcG9zdGdyZXNfZmR3IGZvciBmdXJ0aGVyIGRldGFpbHMgYW5kIHJlc3RyaWN0 aW9ucy4KLS0gCjIuNTMuMAoK --53eeaeab8405698a79aed5708160b5644b6b0a7b76fcda5894cc9c5ff7c9 Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=v3-0003-dblink-Reject-use_scram_passthrough-option-on-for.patch Content-Type: text/plain; charset=utf-8; name=v3-0003-dblink-Reject-use_scram_passthrough-option-on-for.patch RnJvbSBiYjUwNWYwYjVlZTlhOGIxYjI2Y2M0NmNkZjhjMGY5ZjNiYzQ0YTZmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXRoZXVzIEFsY2FudGFyYSA8bXRocy5kZXZAcG0ubWU+CkRh dGU6IEZyaSwgMTUgTWF5IDIwMjYgMTI6Mzg6NDggLTAzMDAKU3ViamVjdDogW1BBVENIIHYzIDMv M10gZGJsaW5rOiBSZWplY3QgdXNlX3NjcmFtX3Bhc3N0aHJvdWdoIG9wdGlvbiBvbiBmb3JlaWdu CiBkYXRhIHdyYXBwZXIKClRoZSB1c2Vfc2NyYW1fcGFzc3Rocm91Z2ggb3B0aW9uIG9ubHkgbWFr ZXMgc2Vuc2UgZm9yIGZvcmVpZ24gc2VydmVyCmFuZCB1c2VyIG1hcHBpbmcgY29udGV4dHMsIGFz IGl0IGNvbnRyb2xzIGF1dGhlbnRpY2F0aW9uIGJlaGF2aW9yIGZvcgpzcGVjaWZpYyBjb25uZWN0 aW9ucy4gUHJldmlvdXNseSwgdGhpcyBvcHRpb24gd2FzIGluY29ycmVjdGx5IGFjY2VwdGVkCndo ZW4gc2V0IHZpYSBBTFRFUiBGT1JFSUdOIERBVEEgV1JBUFBFUiBPUFRJT05TLCBldmVuIHRob3Vn aCBpdCBoYWQKbm8gZWZmZWN0IGF0IHRoYXQgbGV2ZWwuCgpSZXN0cmljdCB0aGUgb3B0aW9uIHZh bGlkYXRpb24gdG8gb25seSBhY2NlcHQgdXNlX3NjcmFtX3Bhc3N0aHJvdWdoCndoZW4gdGhlIGNv bnRleHQgaXMgRm9yZWlnblNlcnZlclJlbGF0aW9uSWQgb3IgVXNlck1hcHBpbmdSZWxhdGlvbklk LgoKUmV2aWV3ZWQtYnk6IEZ1amlpIE1hc2FvIDxtYXNhby5mdWppaUBnbWFpbC5jb20+CkRpc2N1 c3Npb246IGh0dHBzOi8vd3d3LnBvc3RncmVzcWwub3JnL21lc3NhZ2UtaWQvQ0FIR1FHd0VKOHJa am1iT3ZDaWN5cjR2YnVMaW8wODJiTlRkZTBXTm9TV2FXcjl3VmNnJTQwbWFpbC5nbWFpbC5jb20K LS0tCiBjb250cmliL2RibGluay9kYmxpbmsuYyAgICAgICAgICAgIHwgOCArKysrKystLQogY29u dHJpYi9kYmxpbmsvZXhwZWN0ZWQvZGJsaW5rLm91dCB8IDUgKysrKysKIGNvbnRyaWIvZGJsaW5r L3NxbC9kYmxpbmsuc3FsICAgICAgfCA0ICsrKysKIDMgZmlsZXMgY2hhbmdlZCwgMTUgaW5zZXJ0 aW9ucygrKSwgMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9jb250cmliL2RibGluay9kYmxp bmsuYyBiL2NvbnRyaWIvZGJsaW5rL2RibGluay5jCmluZGV4IGJiNmZjYWU0OTc0Li40NTFjMzIw OGFmZSAxMDA2NDQKLS0tIGEvY29udHJpYi9kYmxpbmsvZGJsaW5rLmMKKysrIGIvY29udHJpYi9k YmxpbmsvZGJsaW5rLmMKQEAgLTMxMTUsOCArMzExNSwxMiBAQCBzdGF0aWMgYm9vbAogaXNfdmFs aWRfZGJsaW5rX2Zkd19vcHRpb24oY29uc3QgUFFjb25uaW5mb09wdGlvbiAqb3B0aW9ucywgY29u c3QgY2hhciAqb3B0aW9uLAogCQkJCQkJICAgT2lkIGNvbnRleHQpCiB7Ci0JaWYgKHN0cmNtcChv cHRpb24sICJ1c2Vfc2NyYW1fcGFzc3Rocm91Z2giKSA9PSAwKQotCQlyZXR1cm4gdHJ1ZTsKKwkv KiBUaGVzZSBvcHRpb25zIGFyZSBvbmx5IHZhbGlkIGZvciBmb3JlaWduIHNlcnZlciBvciB1c2Vy IG1hcHBpbmcgY29udGV4dHMgKi8KKwlpZiAoY29udGV4dCA9PSBGb3JlaWduU2VydmVyUmVsYXRp b25JZCB8fCBjb250ZXh0ID09IFVzZXJNYXBwaW5nUmVsYXRpb25JZCkKKwl7CisJCWlmIChzdHJj bXAob3B0aW9uLCAidXNlX3NjcmFtX3Bhc3N0aHJvdWdoIikgPT0gMCkKKwkJCXJldHVybiB0cnVl OworCX0KIAogCXJldHVybiBpc192YWxpZF9kYmxpbmtfb3B0aW9uKG9wdGlvbnMsIG9wdGlvbiwg Y29udGV4dCk7CiB9CmRpZmYgLS1naXQgYS9jb250cmliL2RibGluay9leHBlY3RlZC9kYmxpbmsu b3V0IGIvY29udHJpYi9kYmxpbmsvZXhwZWN0ZWQvZGJsaW5rLm91dAppbmRleCBjNzBjNzk1NzRm ZC4uMWQyNzU5ZGVmOWUgMTAwNjQ0Ci0tLSBhL2NvbnRyaWIvZGJsaW5rL2V4cGVjdGVkL2RibGlu ay5vdXQKKysrIGIvY29udHJpYi9kYmxpbmsvZXhwZWN0ZWQvZGJsaW5rLm91dApAQCAtMTIyMCw2 ICsxMjIwLDExIEBAIFNIT1cgaW50ZXJ2YWxzdHlsZTsKICBwb3N0Z3JlcwogKDEgcm93KQogCist LSBDaGVjayB0aGF0IGFkZGluZyB1c2Vfc2NyYW1fcGFzc3Rocm91Z2ggb3B0aW9uIG9uIGFuIGZv cmVpZ24gZGF0YSB3cmFwcGVyIGlzCistLSBub3QgYWxsb3dlZAorQUxURVIgRk9SRUlHTiBEQVRB IFdSQVBQRVIgZGJsaW5rX2ZkdyBPUFRJT05TKGFkZCB1c2Vfc2NyYW1fcGFzc3Rocm91Z2ggJ3Ry dWUnKTsKK0VSUk9SOiAgaW52YWxpZCBvcHRpb24gInVzZV9zY3JhbV9wYXNzdGhyb3VnaCIKK0hJ TlQ6ICBUaGVyZSBhcmUgbm8gdmFsaWQgb3B0aW9ucyBpbiB0aGlzIGNvbnRleHQuCiAtLSBDbGVh biB1cCBHVUMtc2V0dGluZyB0ZXN0cwogU0VMRUNUIGRibGlua19kaXNjb25uZWN0KCdteWNvbm4n KTsKICBkYmxpbmtfZGlzY29ubmVjdCAKZGlmZiAtLWdpdCBhL2NvbnRyaWIvZGJsaW5rL3NxbC9k Ymxpbmsuc3FsIGIvY29udHJpYi9kYmxpbmsvc3FsL2RibGluay5zcWwKaW5kZXggMzY1YjIxMDM2 ZTguLmQ2N2EwYTU5OTJlIDEwMDY0NAotLS0gYS9jb250cmliL2RibGluay9zcWwvZGJsaW5rLnNx bAorKysgYi9jb250cmliL2RibGluay9zcWwvZGJsaW5rLnNxbApAQCAtNjM1LDYgKzYzNSwxMCBA QCBGUk9NIGRibGlua19mZXRjaCgnbXljb25uJywnZXJyb3JfY3Vyc29yJywgMSkgQVMgdChpIGlu dCk7CiBTSE9XIGRhdGVzdHlsZTsKIFNIT1cgaW50ZXJ2YWxzdHlsZTsKIAorLS0gQ2hlY2sgdGhh dCBhZGRpbmcgdXNlX3NjcmFtX3Bhc3N0aHJvdWdoIG9wdGlvbiBvbiBhbiBmb3JlaWduIGRhdGEg d3JhcHBlciBpcworLS0gbm90IGFsbG93ZWQKK0FMVEVSIEZPUkVJR04gREFUQSBXUkFQUEVSIGRi bGlua19mZHcgT1BUSU9OUyhhZGQgdXNlX3NjcmFtX3Bhc3N0aHJvdWdoICd0cnVlJyk7CisKIC0t IENsZWFuIHVwIEdVQy1zZXR0aW5nIHRlc3RzCiBTRUxFQ1QgZGJsaW5rX2Rpc2Nvbm5lY3QoJ215 Y29ubicpOwogUkVTRVQgZGF0ZXN0eWxlOwotLSAKMi41My4wCgo= --53eeaeab8405698a79aed5708160b5644b6b0a7b76fcda5894cc9c5ff7c9--