MIME-Version: 1.0
References: 
 <CAFiTN-u5D5o_AGNbHRZHaOqAMWkxLf+hSk_r9X3gv6HbLOB5+g@mail.gmail.com>
 <CALj2ACViThGQDYi-yeqUeHqG2Pozn2AiyvtDtjE6zhhbM0KsEA@mail.gmail.com>
 <CAA4eK1+44b3vd_OWfiaVNtjf5Njb5cek09pmKRmttBByeg0NoA@mail.gmail.com>
 <CAFiTN-v3L0WacCDx5dkOSonaZQbJfstXL4HrCPD1ahRdUsRnSg@mail.gmail.com>
 <CALj2ACW63uuxh0fSoxEAF8OMWhz1dJKSkp268WJDzf5BUqCf5g@mail.gmail.com>
 <CAFiTN-s9WWLOhW1TO27NtJwGf0bh2+MWyp3NEkZFeN_S5_p_rA@mail.gmail.com>
 <CAA4eK1LxnsEx5sMbQkK5MHAgXKPROMQXQ0n=fKMwz+UsfKQaMQ@mail.gmail.com>
 <CAD21AoDj+c4LXf2y4ESR-gVyv9d8V0G4R8R9pn-PcmT5zPzYcg@mail.gmail.com>
 <CAA4eK1KokmAwNOL6bS-ip_E3F96PiQTjC4j-M+5vD1T6uUyi3Q@mail.gmail.com>
 <CAFiTN-vFKE8E_N6h+peX9DP92mxCeFdm5A9Esn4DkLmNcZ-dOA@mail.gmail.com>
 <CAFiTN-shLYf-fOTQ_dBf3Xfx05gxs_8d93MHZXyyz6w2Bg5geQ@mail.gmail.com>
 <CAFiTN-tEgkKQHUikn6iBFCYf7XOObR7ncUq=OVh7WEk=6P4ymw@mail.gmail.com>
 <CAFiTN-tQiakd8m+-d6WN6RpJXSv_JcropZ2oGzme4d1JudQhYg@mail.gmail.com>
 <CAJpy0uDKbYWt+YPADj=4fHEvrGEWgnG1n_YsiGT_EZiZf0VSAw@mail.gmail.com>
 <CAFiTN-t82BiXen+HfdR9jZyOpuSO92xonnUK=khXsiZWBfOxMA@mail.gmail.com>
 <CAJpy0uAu2paxGAEffD=vaBTW9Jqbtxxawb8K8FgiASfeKPnGog@mail.gmail.com>
 <CAJpy0uC0ZWgHOivJ102A1fMkppwK3RuSMafRPKyjwkmJrjhVUw@mail.gmail.com>
 <CAFiTN-vFV9-zajrwjYHYyFnyQsooOAXW4CpxB5f-iT3APjOtoQ@mail.gmail.com>
 <CAJpy0uBeU1dZgaqsSVKc=P=EVUKxRgVuHR8jDXFL-HLibbE-kQ@mail.gmail.com>
 <CAA4eK1+FOkOxhzVLAnDymoNjp4i98H-L1+ZsWDgJEv-ndnTzTA@mail.gmail.com>
 <CAFiTN-sVK6Bp+BawCJU_WpAXQSTX4OkKmce5EE4YNBgD-XSjZw@mail.gmail.com>
 <CAA4eK1LbjV0bctib9wUnBpEkC+2rZFPnGuRtrKuc5AtUAzum+A@mail.gmail.com>
 <CAFiTN-vq50N3QP9p3_SH+tJ8Pn=uRDb0X4qEcQZYcGW9AX88rQ@mail.gmail.com>
 <CAFiTN-u3+zRGPESP5kUUfa6NxaWh1HL-gd1225KJ0Uvzi1urow@mail.gmail.com>
 <CAA4eK1L4iNk6mNTC83PbYrRfUdtivH4U961PkdFfOO7mvc=USg@mail.gmail.com>
 <CAFiTN-v+Mh64UfR5zb5rwgyGm6HS80XRSZ_XeaWkg8=+s9o3Kg@mail.gmail.com>
 <CAFiTN-s3ZFHteQsiC3H4=AjTWxuwN-w69XQ3xL5X6YOMTua4pA@mail.gmail.com>
 <CAJpy0uDe724nY59j-8hMapZ_Fru1Wo-NucF4Ea1B3Jrw=+J+UQ@mail.gmail.com>
 <CAFiTN-uR=86L_5tyiA7n73EXCSCuDfQKfL5O=c8n7zZom8_ONQ@mail.gmail.com>
 <CAD21AoDfOS-J0M9WbM3D20eGbSPzbfLQ-9XoYkxO4AZ9twqyvg@mail.gmail.com>
 <CAFiTN-vMTg2X7vwfHLr5Gvy8ViV63_iaEcpHmM8V5GpA9-u8cg@mail.gmail.com>
 <CAA4eK1+b2Ws0e_ZYJsgZAPn7VWndxAK_YM_QMKcfXst3e7F6Jg@mail.gmail.com>
 <CAFiTN-v6hFKMPrSyTBsz=AtEETYMbOxrqvhZJsPQqKgQc4WCLw@mail.gmail.com>
 <CAA4eK1KV3rYkaxys5fh-PtE9kq5xrFbiaRpOSPoRgQG494ek+g@mail.gmail.com>
 <CAFiTN-utvu=QjY1QQ1a_TvkpkpvesMWo9M8wTFYLaOTPdpOJvw@mail.gmail.com>
 <CAA4eK1+HoSOEqNwT3twArPNx4_D7hSUoEg2LnYhX8n9iUwhXgQ@mail.gmail.com>
 <CAFiTN-tqmsfW0Sk=1RhzuduxqLrf9KEc8VOvBae+4aYxWTJwuA@mail.gmail.com>
 <CAA4eK1JmCQ=DHe3HsqpX+P3mGDUd_Z7E7oAxdstK6822W6tuCw@mail.gmail.com>
 <CAFiTN-uE4eAUYewuq3c5deAt3TtVork+H6rkUHRv68cOGr5rmQ@mail.gmail.com>
 <CAFiTN-sJbhPX+LbA8YuQeYJpfGA2XA+OKXf8jCm04RoJOyzLvw@mail.gmail.com>
 <CAJpy0uBPOyWj9itFjHzGXfrUuYS8KGmAvgdcV_9FPjWZ0EZz_w@mail.gmail.com>
 <CAFiTN-s=iLE4qM4qmw9yXKqW09R_c_HqaSGeZXJ2EaTVfXss+g@mail.gmail.com>
 <CAA4eK1KYo0vZpPSRc_4gVpa06-J39gxjs3tHFyckgkBfYJSfFA@mail.gmail.com>
 <CAFiTN-vrKc6OWzrg6yvpwYcj79k=zkrDp3uwiZzjwrWLJAq6tw@mail.gmail.com>
 <CAA4eK1LmvrfEgn1NUZZ=E3yMCjQdNZ5=_SBEry73-EmF6jM_PQ@mail.gmail.com>
 <CAFiTN-vjfub5b3PqPQzfOw9BSjm8jt28ott+Hoz9CrRxJHzYkg@mail.gmail.com>
 <CAFiTN-v=ANapYvRK+SOy2wJb4CSuD6Vb6_bTGuReM9Dv+3tucA@mail.gmail.com>
 <CALDaNm1zEYoSdf2Ns-=UJRw95E5sbfpB0oaNUWtRJN27Q1Knhw@mail.gmail.com>
 <CALDaNm3USsXVNBsfdpkp60HVgrTV4taWMk1xZYNBa7QUF=V0jg@mail.gmail.com>
 <CAFiTN-sNg9ghLNkB2Kn0SwBGOub9acc99XZZU_d5NAcyW-yrEg@mail.gmail.com>
 <CAJpy0uAF3EYcYdpTHdKMeXfvaPbNvnWrZUATrSLL1hqjao=33A@mail.gmail.com>
 <CAFiTN-uikggCKp2LscTorKY5d3KF9j93DW0xebDcRX86G+ZsSw@mail.gmail.com>
 <CAJpy0uDaOoVK8S3_xxTAcTDpfK1AY7tApw7nPOZG_gUz+DMi=Q@mail.gmail.com>
 <CAA4eK1+AdeC5B9xrAXSKWGtTh-0d8xdD=fZttmOBm+c8o8thAQ@mail.gmail.com>
 <CAFiTN-skBQAeuzuUd+PDK0Gqc8g+4x9ypBMwJhOrmW8ZCFKGSA@mail.gmail.com>
 <CAJpy0uCdrsW5T+okq7xTOVxagje7FW3DOeY5B0CGKYa5VqF_tQ@mail.gmail.com>
 <CAFiTN-u+_mFj9caYYFO7=_YHFXk5y=vvOm2H2=5hctYktmAVGA@mail.gmail.com>
 <CALDaNm1aivk9KgQ5daeF6YZzuE+0wWc2yb7wb6qikNyvfPN0Sg@mail.gmail.com>
 <CAJpy0uD6fTEUYJx3+yDbvB=VW7c5AaGoeSd7iwHdYYO=kYGn3g@mail.gmail.com>
 <CALDaNm2YOOdJ25X1sJ+DYz37K6Qi4g0ZNFHb_pQMF9UqancnEA@mail.gmail.com>
 <CAHut+PtMS5bENS0DVtBj+s3kUEOq61+hSkqLODjFB78egB0imQ@mail.gmail.com>
 <CAFiTN-s_M83sfs+MHHbUrMesjsCPN4JWxY5MChCEiY1U-u7=9g@mail.gmail.com>
 <CAFiTN-vj8NTm9w_L2XdhxJCub_RZw__YVUgfXa1B1kJzJctRNw@mail.gmail.com>
 <CAJpy0uBDLnfhuSiev8W9ZMFNTzUmqhds2dKayUpLoN-z1dtsLA@mail.gmail.com>
 <CAFiTN-uL9f0X+=Ep4BbAPvaTJA7S4XHM--G4BsnPJw4uJW7EGQ@mail.gmail.com>
 <CAJpy0uDG=t-y_m8t1zpBzfz9viP3K8dyQgkruaraVT85UtTkrg@mail.gmail.com>
 <CAFiTN-tR8Rhs8uhfbck0Ac4dd1MopvvYgjK39nWyNXRp9Z3Qww@mail.gmail.com>
 <CAA4eK1Kf15UpNmpTTE2XyX=9PE_oTpOoy5xqg3rFWbxwwP4Rbg@mail.gmail.com>
 <CAFiTN-tNqb0vjuadDz-as67ksSXa=aEK+JW=4b54RVmkUK1m2Q@mail.gmail.com>
 <CAFiTN-vDCxx6ydUFo59L8qNBbierg4as3TGPPiavR7UZjYurzA@mail.gmail.com>
 <CAHut+PsWms218ENALnytLEV4NpxjOrAYhChLDaMaeE65-vNgrQ@mail.gmail.com>
 <CAFiTN-v9i9RmDvdUmtMUow4=b+nr0k7LKMyEQ+6ZF=EVdfBhBA@mail.gmail.com>
 <CALDaNm2YTKwPDjt9OV49RgM0zbkWhMhNu228bj_7f+zzcPb-ew@mail.gmail.com>
 <CAFiTN-t_4XvofM3an-WmykqnPE+9wf9U+o2M7p1CWd9eXkN88Q@mail.gmail.com>
 <CAHut+PuaqNDfDu_3xkZR4OYxw-B7ew_WjpLXCBvMcSBJz2K6Xg@mail.gmail.com>
 <CAFiTN-uqNN9S_hRuda_th5MEpywa15g+XO00yM6tNJ-spGRRJw@mail.gmail.com>
 <CABdArM6QxXatkGefTHy__HgaYHBvbKesffeXzT8Vn-kvcvGK4w@mail.gmail.com>
 <CAFiTN-tgMWr=TGPhs9BxaPuSC_jhM7sJJ4fHedE5W6=h40jLfA@mail.gmail.com>
 <CABdArM5fgzfyC2mH3YGB8t8cJBHWqAG1BS6rJMk7mX-8=9d=Cg@mail.gmail.com>
 <CABdArM568KF4WXdFX_aZkCiDK8R71Wpep0gC2a+cV8BMobwkrg@mail.gmail.com>
 <CAFiTN-vQ0tu18BD3UmKPb0rzZyFMQAVgGbdpMA8iYLX7PZOqOA@mail.gmail.com>
 <CALDaNm20PDtmG2E3qaTC+YuL5twv+c9k573wL3sb=OwgmZphxQ@mail.gmail.com>
 <CAA4eK1LhOHa_TEznw+gFoq+w0vMvvsDG2g9Xq8Mwa8xZMY73og@mail.gmail.com>
 <CAFiTN-vPDqrQ2rHykNgd+groFxqwBYFQF97R-Co2EmtUkV6MTg@mail.gmail.com>
 <CAFiTN-vsd=wNiEPXPQhZnipAb--+mBUC01M-pcjBjbRockgCUA@mail.gmail.com>
 <CAJpy0uCjSq_gUCJBfURhqtB6bLvkKSUL-sVXpaGKjEapv5+t+Q@mail.gmail.com>
 <CAFiTN-uZ-LaStAY3NuCY-nb7GCB9joiHX7HtHEMseJ0xfnqVSg@mail.gmail.com>
 <CAFiTN-vhJxRW5NQ628oidnk0KtHwKt11dW9-+vxqpXLTgjiYiA@mail.gmail.com>
 <CALDaNm1cJURibYKY4+DuNosjM72C9oGheUF-roMyff__+AsKBw@mail.gmail.com>
 <CAJpy0uD1_77TDAFc4jE-94X-WUus7Q3gGU0pXfC+Tticq1hFvA@mail.gmail.com>
 <CAA4eK1LFcSc4XCj4mU-cv27F_6n6=+ehJ=YAsAnyBbz4Sv_tVg@mail.gmail.com>
 <CAFiTN-s5ZtjXKrSbam7TNWJ9Ax-kCancXcestAnx2by7dK0-UA@mail.gmail.com>
 <CAFiTN-u=Da32mXyz8jocEGtuLSG4ccXXj_aEzUTPp2zkLb3MVA@mail.gmail.com>
 <CALDaNm1qY5e0thfsDB2uWXqZn4hgTWTxiUDwcF1hWA-jodsKYg@mail.gmail.com>
 <CALDaNm1nFtv3dtdRdbqWo2Rf_av7XbxDfK1Orqjcqs_Su_cLRQ@mail.gmail.com>
 <CABdArM7R498qC5Fr42aU_q-2Sc5QsT4dyKgmO_f6Uy=8oCAFXA@mail.gmail.com>
 <CAFiTN-sRZ+Z_9B3ue2L4zkbcfmPjjcAjcR1C+px1PyAs+HGsSg@mail.gmail.com>
 <CAFiTN-sdcjf9xJ2M-=ab5e4y662tTmFFiP4gHL44tC9PcQozcw@mail.gmail.com>
 <CALDaNm2WNjaNxUijVkvT6y69D62rfCu8OMwU-Pf-84un2r_=ig@mail.gmail.com>
 <CAHut+PvEP5uUR13xJ3gbNKGU49=Rg32DXMGZ2wL9jTcKHyN_=Q@mail.gmail.com>
 <CALDaNm3Jb5AQTsFJFxYZZJCaheT7qToCZkEALfW-vsMMFxjOyQ@mail.gmail.com>
 <CAHut+PtQn5U9i00qvBmjo0KBxyb+ZmBb38NzF91KnX4J86Jg_g@mail.gmail.com>
 <CALDaNm1a1gzy0L38U394_4OFwGUS8ALgSONYj++VLimY0g9piQ@mail.gmail.com>
 <CABdArM5X63AdtS99QKGjVijUd_Q_dV8QUDSo4nTHKJjn3JwtAg@mail.gmail.com>
 <CAA4eK1+h=QV4Zi=PW8Zt2D6be5ki5Mu2HgdXcfUophptx6Mt_A@mail.gmail.com>
 <CAFiTN-s-tuxar9Dp5He0CFa1pzfy1fmiwcBj6PtwD0hDodE5ng@mail.gmail.com>
 <CAFiTN-sx=k+Th=uYsrLcS6YMZbPVi9Wrggn1w2Nzf9MLEU7YRQ@mail.gmail.com>
 <CAFiTN-u5pcgAhXyJgj+p7-xmShtp0i8xA000tzjCLFQp_zMXUA@mail.gmail.com>
 <CAFiTN-tRpS7b3qFqckqFtHETj0jyzj-8SxC1arjfwf-hQd47PQ@mail.gmail.com>
In-Reply-To: 
 <CAFiTN-tRpS7b3qFqckqFtHETj0jyzj-8SxC1arjfwf-hQd47PQ@mail.gmail.com>
From: Amit Kapila <amit.kapila16@gmail.com>
Date: Sun, 31 May 2026 04:54:08 -0700
Message-ID: 
 <CAA4eK1K7aSLhvA8JxPnMbPi2axr5hRn2NQf8yyjjpMZ5RTnsRQ@mail.gmail.com>
Subject: Re: Proposal: Conflict log history table for Logical Replication
To: Dilip Kumar <dilipbalaut@gmail.com>
Cc: Nisha Moond <nisha.moond412@gmail.com>, vignesh C <vignesh21@gmail.com>,
	Peter Smith <smithpb2250@gmail.com>, shveta malik <shveta.malik@gmail.com>,
	Masahiko Sawada <sawada.mshk@gmail.com>,
	Bharath Rupireddy <bharath.rupireddyforpostgres@gmail.com>,
	PostgreSQL Hackers <pgsql-hackers@lists.postgresql.org>,
 shveta malik <shvetamalik@gmail.com>
Content-Type: multipart/mixed; boundary="00000000000022385e06531bbd8c"
Archived-At: 
 <https://www.postgresql.org/message-id/CAA4eK1K7aSLhvA8JxPnMbPi2axr5hRn2NQf8yyjjpMZ5RTnsRQ%40mail.gmail.com>
Precedence: bulk

--00000000000022385e06531bbd8c
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Sat, May 30, 2026 at 1:12=E2=80=AFAM Dilip Kumar <dilipbalaut@gmail.com>=
 wrote:
>

Few comments on 0001 and 0002
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D
1.
+ Oid         subconflictlogrelid; /* Relid of the conflict log table. */
 #ifdef CATALOG_VARLEN /* variable-length fields start here */
+ /*
+ * Strategy for logging replication conflicts:
+ * 'log' - server log only,
+ * 'table' - conflict log table only,
+ * 'all' - both log and table.
+ */
+ text subconflictlogdest BKI_FORCE_NOT_NULL;

'log' sounds redundant in the above two field names. I feel naming
them as subconflictrelid and subconflictdest should be sufficient.

2. If you agree with the above, then let's make similar changes at
other places in the patch. We can change
alter_sub_conflictlogdestination to alter_sub_conflict_destination.
Also, similar to AlterSubscription_refresh and
AlterSubscription_refresh_seq, we can name this new function as
AlterSubscription_conflict_dest.

3. Now, let's consider whether we should change the option name to
conflict_data_destination instead of conflict_log_destination? The
reason I am asking to consider this change is that one of the option
values is 'log', so it sounded a bit odd to name the option as
conflict_log_destination. If we change this then we can consider
changing the name of Enum ConflictLogDest as well.

Apart from above, I have made some changes in the attached. Kindly
review and see which all can be incorporated in the next version.

--=20
With Regards,
Amit Kapila.

--00000000000022385e06531bbd8c
Content-Type: text/plain; charset="US-ASCII"; name="v43-0001_amit.1.patch.txt"
Content-Disposition: attachment; filename="v43-0001_amit.1.patch.txt"
Content-Transfer-Encoding: base64
Content-ID: <f_mptq0wt10>
X-Attachment-Id: f_mptq0wt10

ZGlmZiAtLWdpdCBhL3NyYy9iYWNrZW5kL2NhdGFsb2cvY2F0YWxvZy5jIGIvc3JjL2JhY2tlbmQv
Y2F0YWxvZy9jYXRhbG9nLmMKaW5kZXggNDZkMjdlZDAyYTkuLmI3ZmNhYWY2Nzk2IDEwMDY0NAot
LS0gYS9zcmMvYmFja2VuZC9jYXRhbG9nL2NhdGFsb2cuYworKysgYi9zcmMvYmFja2VuZC9jYXRh
bG9nL2NhdGFsb2cuYwpAQCAtMjM0LDggKzIzNCw3IEBAIElzVG9hc3RDbGFzcyhGb3JtX3BnX2Ns
YXNzIHJlbHR1cGxlKQogCiAvKgogICogSXNDb25mbGljdExvZ1RhYmxlQ2xhc3MKLSAqCQlUcnVl
IGlmZiBGb3JtX3BnX2NsYXNzIHR1cGxlIHJlcHJlc2VudHMgYSBzdWJzY3JpcHRpb24tc3BlY2lm
aWMKLSAqICAgICAgQ29uZmxpY3QgTG9nIFRhYmxlLgorICoJCVRydWUgaWZmIHBnX2NsYXNzIHR1
cGxlIHJlcHJlc2VudHMgYSBDb25mbGljdCBMb2cgVGFibGUuCiAgKgogICoJCURvZXMgbm90IHBl
cmZvcm0gYW55IGNhdGFsb2cgYWNjZXNzZXMuCiAgKi8KZGlmZiAtLWdpdCBhL3NyYy9iYWNrZW5k
L2NhdGFsb2cvaGVhcC5jIGIvc3JjL2JhY2tlbmQvY2F0YWxvZy9oZWFwLmMKaW5kZXggM2I2YTE2
M2MxODQuLjk2ZGVmMzAxOWIzIDEwMDY0NAotLS0gYS9zcmMvYmFja2VuZC9jYXRhbG9nL2hlYXAu
YworKysgYi9zcmMvYmFja2VuZC9jYXRhbG9nL2hlYXAuYwpAQCAtMzI3LDcgKzMyNyw3IEBAIGhl
YXBfY3JlYXRlKGNvbnN0IGNoYXIgKnJlbG5hbWUsCiAJCQllcmVwb3J0KEVSUk9SLAogCQkJCQko
ZXJyY29kZShFUlJDT0RFX0lOU1VGRklDSUVOVF9QUklWSUxFR0UpLAogCQkJCQkgZXJybXNnKCJw
ZXJtaXNzaW9uIGRlbmllZCB0byBjcmVhdGUgXCIlcy4lc1wiIiwKLQkJCQkJIGdldF9uYW1lc3Bh
Y2VfbmFtZShyZWxuYW1lc3BhY2UpLCByZWxuYW1lKSwKKwkJCQkJCQlnZXRfbmFtZXNwYWNlX25h
bWUocmVsbmFtZXNwYWNlKSwgcmVsbmFtZSksCiAJCQkJCSBlcnJkZXRhaWwoIkNvbmZsaWN0IHNj
aGVtYSBtb2RpZmljYXRpb25zIGFyZSBjdXJyZW50bHkgZGlzYWxsb3dlZC4iKSkpOwogCX0KIApk
aWZmIC0tZ2l0IGEvc3JjL2JhY2tlbmQvY2F0YWxvZy9wZ19wdWJsaWNhdGlvbi5jIGIvc3JjL2Jh
Y2tlbmQvY2F0YWxvZy9wZ19wdWJsaWNhdGlvbi5jCmluZGV4IDkzNzkxMjEwZTM1Li4yYTI3ZjZm
NDI2NiAxMDA2NDQKLS0tIGEvc3JjL2JhY2tlbmQvY2F0YWxvZy9wZ19wdWJsaWNhdGlvbi5jCisr
KyBiL3NyYy9iYWNrZW5kL2NhdGFsb2cvcGdfcHVibGljYXRpb24uYwpAQCAtMTU2LDcgKzE1Niw4
IEBAIGNoZWNrX3B1YmxpY2F0aW9uX2FkZF9zY2hlbWEoT2lkIHNjaGVtYWlkKQogICogaXMgcmVh
bGx5IGluYWRlcXVhdGUgZm9yIHRoYXQsIHNpbmNlIHRoZSBpbmZvcm1hdGlvbl9zY2hlbWEgY291
bGQgYmUKICAqIGRyb3BwZWQgYW5kIHJlbG9hZGVkIGFuZCB0aGVuIGl0J2xsIGJlIGNvbnNpZGVy
ZWQgcHVibGlzaGFibGUuICBUaGUgYmVzdAogICogbG9uZy10ZXJtIHNvbHV0aW9uIG1heSBiZSB0
byBhZGQgYSAicmVsaXNwdWJsaXNoYWJsZSIgYm9vbCB0byBwZ19jbGFzcywKLSAqIGFuZCBkZXBl
bmQgb24gdGhhdCBpbnN0ZWFkIG9mIE9JRCBjaGVja3MuCisgKiBhbmQgZGVwZW5kIG9uIHRoYXQg
aW5zdGVhZCBvZiBPSUQgY2hlY2tzLiAgSXNDb25mbGljdExvZ1RhYmxlQ2xhc3MoKQorICogZXhj
bHVkZXMgdGFibGVzIGluIGNvbmZsaWN0IHNjaGVtYS4KICAqLwogc3RhdGljIGJvb2wKIGlzX3B1
Ymxpc2hhYmxlX2NsYXNzKE9pZCByZWxpZCwgRm9ybV9wZ19jbGFzcyByZWx0dXBsZSkKZGlmZiAt
LWdpdCBhL3NyYy9iYWNrZW5kL2NvbW1hbmRzL3N1YnNjcmlwdGlvbmNtZHMuYyBiL3NyYy9iYWNr
ZW5kL2NvbW1hbmRzL3N1YnNjcmlwdGlvbmNtZHMuYwppbmRleCA4OGYyMmJiYjI4Ni4uYWYyNDcw
ZjYwYzQgMTAwNjQ0Ci0tLSBhL3NyYy9iYWNrZW5kL2NvbW1hbmRzL3N1YnNjcmlwdGlvbmNtZHMu
YworKysgYi9zcmMvYmFja2VuZC9jb21tYW5kcy9zdWJzY3JpcHRpb25jbWRzLmMKQEAgLTg0NSw5
ICs4NDUsOCBAQCBDcmVhdGVTdWJzY3JpcHRpb24oUGFyc2VTdGF0ZSAqcHN0YXRlLCBDcmVhdGVT
dWJzY3JpcHRpb25TdG10ICpzdG10LAogCQlDU3RyaW5nR2V0VGV4dERhdHVtKENvbmZsaWN0TG9n
RGVzdE5hbWVzW29wdHMuY29uZmxpY3Rsb2dkZXN0XSk7CiAKIAkvKgotCSAqIElmIGxvZ2dpbmcg
dG8gYSB0YWJsZSBpcyByZXF1aXJlZCwgcGh5c2ljYWxseSBjcmVhdGUgaXQgbm93LiBXZSBjcmVh
dGUKLQkgKiB0aGUgY29uZmxpY3QgbG9nIHRhYmxlIGhlcmUgc28gaXRzIHJlbGF0aW9uIE9JRCBj
YW4gYmUgc3RvcmVkIHdoZW4KLQkgKiBpbnNlcnRpbmcgdGhlIHBnX3N1YnNjcmlwdGlvbiB0dXBs
ZSBiZWxvdy4KKwkgKiBXZSBjcmVhdGUgdGhlIGNvbmZsaWN0IGxvZyB0YWJsZSBoZXJlLCBpZiBy
ZXF1aXJlZCwgc28gdGhhdCBpdHMgcmVsYXRpb24KKwkgKiBPSUQgY2FuIGJlIHN0b3JlZCB3aGVu
IGluc2VydGluZyB0aGUgcGdfc3Vic2NyaXB0aW9uIHR1cGxlIGJlbG93LgogCSAqLwogCWlmIChD
T05GTElDVFNfTE9HR0VEX1RPX1RBQkxFKG9wdHMuY29uZmxpY3Rsb2dkZXN0KSkKIAkJbG9ncmVs
aWQgPSBjcmVhdGVfY29uZmxpY3RfbG9nX3RhYmxlKHN1YmlkLCBzdG10LT5zdWJuYW1lLCBvd25l
cik7CkBAIC04NzcsOCArODc2LDggQEAgQ3JlYXRlU3Vic2NyaXB0aW9uKFBhcnNlU3RhdGUgKnBz
dGF0ZSwgQ3JlYXRlU3Vic2NyaXB0aW9uU3RtdCAqc3RtdCwKIAl9CiAKIAkvKgotCSAqIElmIGNv
bmZsaWN0cyBhcmUgbG9ncyB0byB0YWJsZSBlc3RhYmxpc2ggYW4gaW50ZXJuYWwgZGVwZW5kZW5j
eQotCSAqIGJldHdlZW4gdGhlIGNvbmZsaWN0IGxvZyB0YWJsZSBhbmQgdGhlIHN1YnNjcmlwdGlv
bi4KKwkgKiBFc3RhYmxpc2ggYW4gaW50ZXJuYWwgZGVwZW5kZW5jeSBiZXR3ZWVuIGNvbmZsaWN0
IGxvZyB0YWJsZSBhbmQKKwkgKiBzdWJzY3JpcHRpb24uCiAJICoKIAkgKiBXZSB1c2UgREVQRU5E
RU5DWV9JTlRFUk5BTCB0byBzaWduaWZ5IHRoYXQgdGhlIHRhYmxlJ3MgbGlmZWN5Y2xlIGlzCiAJ
ICogc3RyaWN0bHkgdGllZCB0byB0aGUgc3Vic2NyaXB0aW9uLCBzaW1pbGFyIHRvIGhvdyBhIFRP
QVNUIHRhYmxlIHJlbGF0ZXMKQEAgLTg4Nyw3ICs4ODYsNyBAQCBDcmVhdGVTdWJzY3JpcHRpb24o
UGFyc2VTdGF0ZSAqcHN0YXRlLCBDcmVhdGVTdWJzY3JpcHRpb25TdG10ICpzdG10LAogCSAqIFRo
aXMgZW5zdXJlcyB0aGUgY29uZmxpY3QgbG9nIHRhYmxlIGlzIGF1dG9tYXRpY2FsbHkgcmVhcGVk
IGR1cmluZyBhCiAJICogRFJPUCBTVUJTQ1JJUFRJT04gdmlhIHBlcmZvcm1EZWxldGlvbigpLgog
CSAqLwotCWlmIChDT05GTElDVFNfTE9HR0VEX1RPX1RBQkxFKG9wdHMuY29uZmxpY3Rsb2dkZXN0
KSkKKwlpZiAoT2lkSXNWYWxpZChsb2dyZWxpZCkpCiAJewogCQlPYmplY3RBZGRyZXNzIGNsdDsK
IApkaWZmIC0tZ2l0IGEvc3JjL2JhY2tlbmQvY29tbWFuZHMvdGFibGVjbWRzLmMgYi9zcmMvYmFj
a2VuZC9jb21tYW5kcy90YWJsZWNtZHMuYwppbmRleCAyZGNmNjRmYTUzYi4uMGEwY2EyYjg1MGUg
MTAwNjQ0Ci0tLSBhL3NyYy9iYWNrZW5kL2NvbW1hbmRzL3RhYmxlY21kcy5jCisrKyBiL3NyYy9i
YWNrZW5kL2NvbW1hbmRzL3RhYmxlY21kcy5jCkBAIC0yNDU3LDggKzI0NTcsOCBAQCB0cnVuY2F0
ZV9jaGVja19yZWwoT2lkIHJlbGlkLCBGb3JtX3BnX2NsYXNzIHJlbHR1cGxlKQogCSAqIHBnX2xh
cmdlb2JqZWN0IGFuZCBwZ19sYXJnZW9iamVjdF9tZXRhZGF0YSB0byBiZSB0cnVuY2F0ZWQgYXMg
cGFydCBvZgogCSAqIHBnX3VwZ3JhZGUsIGJlY2F1c2Ugd2UgbmVlZCB0byBjaGFuZ2UgaXRzIHJl
bGZpbGVub2RlIHRvIG1hdGNoIHRoZSBvbGQKIAkgKiBjbHVzdGVyLCBhbmQgYWxsb3dpbmcgYSBU
UlVOQ0FURSBjb21tYW5kIHRvIGJlIGV4ZWN1dGVkIGlzIHRoZSBlYXNpZXN0Ci0JICogd2F5IG9m
IGRvaW5nIHRoYXQuICBXZSBhbHNvIGFsbG93IFRSVU5DQVRFIG9uIHRoZSBjb25mbGljdCBsb2cg
dGFibGVzLAotCSAqIHRvIHBlcm1pdCB1c2VycyB0byBtYW51YWxseSBwcnVuZSB0aGVzZSBsb2dz
IHRvIG1hbmFnZSBkaXNrIHNwYWNlLgorCSAqIHdheSBvZiBkb2luZyB0aGF0LiBXZSBhbHNvIGFs
bG93IFRSVU5DQVRFIG9uIHRoZSBjb25mbGljdCBsb2cgdGFibGVzLAorCSAqIHRvIHBlcm1pdCB1
c2VycyB0byBtYW51YWxseSBwcnVuZSBjb25mbGljdCBkYXRhIHRvIG1hbmFnZSBkaXNrIHNwYWNl
LgogCSAqLwogCWlmICghYWxsb3dTeXN0ZW1UYWJsZU1vZHMgJiYgSXNTeXN0ZW1DbGFzcyhyZWxp
ZCwgcmVsdHVwbGUpICYmCiAJCSFJc0NvbmZsaWN0TG9nVGFibGVDbGFzcyhyZWx0dXBsZSkK
--00000000000022385e06531bbd8c--