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: Nisha Moond <nisha.moond412@gmail.com>
Date: Mon, 1 Jun 2026 17:53:08 +0530
Message-ID: 
 <CABdArM5Ka_m_GWhL_zZbeDPKmL-Wezwb4A-NHnO-v-fRDuhA-Q@mail.gmail.com>
Subject: Re: Proposal: Conflict log history table for Logical Replication
To: Dilip Kumar <dilipbalaut@gmail.com>
Cc: Amit Kapila <amit.kapila16@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="0000000000009be686065330425e"
Archived-At: 
 <https://www.postgresql.org/message-id/CABdArM5Ka_m_GWhL_zZbeDPKmL-Wezwb4A-NHnO-v-fRDuhA-Q%40mail.gmail.com>
Precedence: bulk

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

On Sat, May 30, 2026 at 1:42=E2=80=AFPM Dilip Kumar <dilipbalaut@gmail.com>=
 wrote:
>
> In latest patch set I have fixed Nisha's comments by creating a toast
> table, a separate patch
> (v43-0005-Create-conflict-log-table-after-inserting-subscr.patch)
> attached for creating conflict log table after inserting subscription
> row.
>

Thanks for the patches. Please find a couple of comments on v43:

1) A non-superuser cannot read the new columns 'subconflictlogrelid'
and 'subconflictlogdest' from pg_subscription.
A comment in system_views.sql say:
"-- All columns of pg_subscription except subconninfo are publicly readable=
."

I think we should grant public access to these new columns as well.

2) patch-002: conflict.c

-const ConflictLogColumnDef ConflictLogSchema[] =3D {
+StaticAssertDecl(lengthof(ConflictLogDestNames) =3D=3D 3,
+ "ConflictLogDestNames length mismatch");
+

Should we use "CONFLICT_LOG_DEST_ALL + 1" instead of the hard-coded value "=
3"?

The attached diff fixes the above items, along with a few indentation
and whitespace. Please consider it if you agree with the changes.

--
Thanks,
Nisha

--0000000000009be686065330425e
Content-Type: text/plain; charset="US-ASCII"; name="v43_comments_nisha.txt"
Content-Disposition: attachment; filename="v43_comments_nisha.txt"
Content-Transfer-Encoding: base64
Content-ID: <f_mpv6g58r0>
X-Attachment-Id: f_mpv6g58r0

ZGlmZiAtLWdpdCBhL3NyYy9iYWNrZW5kL2NhdGFsb2cvYWNsY2hrLmMgYi9zcmMvYmFja2VuZC9j
YXRhbG9nL2FjbGNoay5jCmluZGV4IDE5YzU2OGY0NzA1Li4xNmFiNDQ2YTRhNyAxMDA2NDQKLS0t
IGEvc3JjL2JhY2tlbmQvY2F0YWxvZy9hY2xjaGsuYworKysgYi9zcmMvYmFja2VuZC9jYXRhbG9n
L2FjbGNoay5jCkBAIC0zMzU3LDE0ICszMzU3LDE0IEBAIHBnX2NsYXNzX2FjbG1hc2tfZXh0KE9p
ZCB0YWJsZV9vaWQsIE9pZCByb2xlaWQsIEFjbE1vZGUgbWFzaywKIAkJCQljbGFzc0Zvcm0tPnJl
bGtpbmQgIT0gUkVMS0lORF9WSUVXKQogCQkJewogCQkJCS8qCi0JCQkJKiBEZW55IGFueW9uZSBw
ZXJtaXNzaW9uIHRvIHVwZGF0ZSBhIHN5c3RlbSBjYXRhbG9nIHVubGVzcwotCQkJCSogcGdfYXV0
aGlkLnJvbHN1cGVyIGlzIHNldC4KLQkJCQkqCi0JCQkJKiBBcyBvZiA3LjQgd2UgaGF2ZSBzb21l
IHVwZGF0YWJsZSBzeXN0ZW0gdmlld3M7IHRob3NlCi0JCQkJKiBzaG91bGRuJ3QgYmUgcHJvdGVj
dGVkIGluIHRoaXMgd2F5LiAgQXNzdW1lIHRoZSB2aWV3IHJ1bGVzCi0JCQkJKiBjYW4gdGFrZSBj
YXJlIG9mIHRoZW1zZWx2ZXMuICBBQ0xfVVNBR0UgaXMgaWYgd2UgZXZlciBoYXZlCi0JCQkJKiBz
eXN0ZW0gc2VxdWVuY2VzLgotCQkJCSovCisJCQkJICogRGVueSBhbnlvbmUgcGVybWlzc2lvbiB0
byB1cGRhdGUgYSBzeXN0ZW0gY2F0YWxvZyB1bmxlc3MKKwkJCQkgKiBwZ19hdXRoaWQucm9sc3Vw
ZXIgaXMgc2V0LgorCQkJCSAqCisJCQkJICogQXMgb2YgNy40IHdlIGhhdmUgc29tZSB1cGRhdGFi
bGUgc3lzdGVtIHZpZXdzOyB0aG9zZQorCQkJCSAqIHNob3VsZG4ndCBiZSBwcm90ZWN0ZWQgaW4g
dGhpcyB3YXkuICBBc3N1bWUgdGhlIHZpZXcgcnVsZXMKKwkJCQkgKiBjYW4gdGFrZSBjYXJlIG9m
IHRoZW1zZWx2ZXMuICBBQ0xfVVNBR0UgaXMgaWYgd2UgZXZlciBoYXZlCisJCQkJICogc3lzdGVt
IHNlcXVlbmNlcy4KKwkJCQkgKi8KIAkJCQltYXNrICY9IH4oQUNMX0lOU0VSVCB8IEFDTF9VUERB
VEUgfCBBQ0xfREVMRVRFIHwgQUNMX1RSVU5DQVRFIHwKIAkJCQkJCSAgQUNMX1VTQUdFKTsKIAkJ
CX0KZGlmZiAtLWdpdCBhL3NyYy9iYWNrZW5kL2NhdGFsb2cvY2F0YWxvZy5jIGIvc3JjL2JhY2tl
bmQvY2F0YWxvZy9jYXRhbG9nLmMKaW5kZXggNDZkMjdlZDAyYTkuLjlhYWJlZjNjY2VmIDEwMDY0
NAotLS0gYS9zcmMvYmFja2VuZC9jYXRhbG9nL2NhdGFsb2cuYworKysgYi9zcmMvYmFja2VuZC9j
YXRhbG9nL2NhdGFsb2cuYwpAQCAtMjkzLDcgKzI5Myw2IEBAIElzQ29uZmxpY3ROYW1lc3BhY2Uo
T2lkIG5hbWVzcGFjZUlkKQogCXJldHVybiBuYW1lc3BhY2VJZCA9PSBQR19DT05GTElDVF9OQU1F
U1BBQ0U7CiB9CiAKLQogLyoKICAqIElzUmVzZXJ2ZWROYW1lCiAgKgkJVHJ1ZSBpZmYgbmFtZSBz
dGFydHMgd2l0aCB0aGUgcGdfIHByZWZpeC4KZGlmZiAtLWdpdCBhL3NyYy9iYWNrZW5kL2NhdGFs
b2cvc3lzdGVtX3ZpZXdzLnNxbCBiL3NyYy9iYWNrZW5kL2NhdGFsb2cvc3lzdGVtX3ZpZXdzLnNx
bAppbmRleCA3M2ExYzFjNDY3MC4uMTY2MzI5NTUxZGEgMTAwNjQ0Ci0tLSBhL3NyYy9iYWNrZW5k
L2NhdGFsb2cvc3lzdGVtX3ZpZXdzLnNxbAorKysgYi9zcmMvYmFja2VuZC9jYXRhbG9nL3N5c3Rl
bV92aWV3cy5zcWwKQEAgLTE1MjcsNyArMTUyNyw4IEBAIEdSQU5UIFNFTEVDVCAob2lkLCBzdWJk
YmlkLCBzdWJza2lwbHNuLCBzdWJuYW1lLCBzdWJvd25lciwgc3ViZW5hYmxlZCwKICAgICAgICAg
ICAgICAgc3ViYmluYXJ5LCBzdWJzdHJlYW0sIHN1YnR3b3BoYXNlc3RhdGUsIHN1YmRpc2FibGVv
bmVyciwKIAkJCSAgc3VicGFzc3dvcmRyZXF1aXJlZCwgc3VicnVuYXNvd25lciwgc3ViZmFpbG92
ZXIsCiAgICAgICAgICAgICAgIHN1YnJldGFpbmRlYWR0dXBsZXMsIHN1Ym1heHJldGVudGlvbiwg
c3VicmV0ZW50aW9uYWN0aXZlLAotICAgICAgICAgICAgICBzdWJzZXJ2ZXIsIHN1YnNsb3RuYW1l
LCBzdWJzeW5jY29tbWl0LCBzdWJwdWJsaWNhdGlvbnMsIHN1Ym9yaWdpbikKKyAgICAgICAgICAg
ICAgc3Vic2VydmVyLCBzdWJjb25mbGljdGxvZ3JlbGlkLCBzdWJjb25mbGljdGxvZ2Rlc3QsCisJ
CQkgIHN1YnNsb3RuYW1lLCBzdWJzeW5jY29tbWl0LCBzdWJwdWJsaWNhdGlvbnMsIHN1Ym9yaWdp
bikKICAgICBPTiBwZ19zdWJzY3JpcHRpb24gVE8gcHVibGljOwogCiBDUkVBVEUgVklFVyBwZ19z
dGF0X3N1YnNjcmlwdGlvbl9zdGF0cyBBUwpkaWZmIC0tZ2l0IGEvc3JjL2JhY2tlbmQvY29tbWFu
ZHMvc3Vic2NyaXB0aW9uY21kcy5jIGIvc3JjL2JhY2tlbmQvY29tbWFuZHMvc3Vic2NyaXB0aW9u
Y21kcy5jCmluZGV4IDY3MzExYTY1ZTI5Li44MzYxNTI3Nzk0MSAxMDA2NDQKLS0tIGEvc3JjL2Jh
Y2tlbmQvY29tbWFuZHMvc3Vic2NyaXB0aW9uY21kcy5jCisrKyBiL3NyYy9iYWNrZW5kL2NvbW1h
bmRzL3N1YnNjcmlwdGlvbmNtZHMuYwpAQCAtODQ0LDcgKzg0NCw3IEBAIENyZWF0ZVN1YnNjcmlw
dGlvbihQYXJzZVN0YXRlICpwc3RhdGUsIENyZWF0ZVN1YnNjcmlwdGlvblN0bXQgKnN0bXQsCiAJ
CUNTdHJpbmdHZXRUZXh0RGF0dW0oQ29uZmxpY3RMb2dEZXN0TmFtZXNbb3B0cy5jb25mbGljdGxv
Z2Rlc3RdKTsKIAogCXZhbHVlc1tBbnVtX3BnX3N1YnNjcmlwdGlvbl9zdWJjb25mbGljdGxvZ3Jl
bGlkIC0gMV0gPQotCQkJCQkJCQkJT2JqZWN0SWRHZXREYXR1bShJbnZhbGlkT2lkKTsKKwkJT2Jq
ZWN0SWRHZXREYXR1bShJbnZhbGlkT2lkKTsKIAogCXR1cCA9IGhlYXBfZm9ybV90dXBsZShSZWxh
dGlvbkdldERlc2NyKHJlbCksIHZhbHVlcywgbnVsbHMpOwogCkBAIC04NjksOSArODY5LDkgQEAg
Q3JlYXRlU3Vic2NyaXB0aW9uKFBhcnNlU3RhdGUgKnBzdGF0ZSwgQ3JlYXRlU3Vic2NyaXB0aW9u
U3RtdCAqc3RtdCwKIAkJbWVtc2V0KHJlcGxhY2VzLCBmYWxzZSwgc2l6ZW9mKHJlcGxhY2VzKSk7
CiAKIAkJdmFsdWVzW0FudW1fcGdfc3Vic2NyaXB0aW9uX3N1YmNvbmZsaWN0bG9ncmVsaWQgLSAx
XSA9Ci0JCQkJCQkJCQlPYmplY3RJZEdldERhdHVtKGxvZ3JlbGlkKTsKKwkJCU9iamVjdElkR2V0
RGF0dW0obG9ncmVsaWQpOwogCQlyZXBsYWNlc1tBbnVtX3BnX3N1YnNjcmlwdGlvbl9zdWJjb25m
bGljdGxvZ3JlbGlkIC0gMV0gPQotCQkJCQkJCQkJdHJ1ZTsKKwkJCXRydWU7CiAKIAkJLyogTWFr
ZSBzdWJzY3JpcHRpb24gdHVwbGUgdmlzaWJsZSBiZWZvcmUgdXBkYXRpbmcgaXQuICovCiAJCUNv
bW1hbmRDb3VudGVySW5jcmVtZW50KCk7CkBAIC0xODk3LDkgKzE4OTcsOSBAQCBBbHRlclN1YnNj
cmlwdGlvbihQYXJzZVN0YXRlICpwc3RhdGUsIEFsdGVyU3Vic2NyaXB0aW9uU3RtdCAqc3RtdCwK
IAkJCQkJCWlmICh1cGRhdGVfcmVsaWQpCiAJCQkJCQl7CiAJCQkJCQkJdmFsdWVzW0FudW1fcGdf
c3Vic2NyaXB0aW9uX3N1YmNvbmZsaWN0bG9ncmVsaWQgLSAxXSA9Ci0JCQkJCQkJCQkJCQkJCU9i
amVjdElkR2V0RGF0dW0ocmVsaWQpOworCQkJCQkJCQlPYmplY3RJZEdldERhdHVtKHJlbGlkKTsK
IAkJCQkJCQlyZXBsYWNlc1tBbnVtX3BnX3N1YnNjcmlwdGlvbl9zdWJjb25mbGljdGxvZ3JlbGlk
IC0gMV0gPQotCQkJCQkJCQkJCQkJCQl0cnVlOworCQkJCQkJCQl0cnVlOwogCQkJCQkJfQogCQkJ
CQl9CiAJCQkJfQpkaWZmIC0tZ2l0IGEvc3JjL2JhY2tlbmQvcmVwbGljYXRpb24vbG9naWNhbC9j
b25mbGljdC5jIGIvc3JjL2JhY2tlbmQvcmVwbGljYXRpb24vbG9naWNhbC9jb25mbGljdC5jCmlu
ZGV4IDI3ODMwY2NiMGNjLi4yMjQ0MmNiYmU0ZiAxMDA2NDQKLS0tIGEvc3JjL2JhY2tlbmQvcmVw
bGljYXRpb24vbG9naWNhbC9jb25mbGljdC5jCisrKyBiL3NyYy9iYWNrZW5kL3JlcGxpY2F0aW9u
L2xvZ2ljYWwvY29uZmxpY3QuYwpAQCAtNDQsNyArNDQsNyBAQCBjb25zdCBjaGFyICpjb25zdCBD
b25mbGljdExvZ0Rlc3ROYW1lc1tdID0gewogCVtDT05GTElDVF9MT0dfREVTVF9BTExdID0gImFs
bCIKIH07CiAKLVN0YXRpY0Fzc2VydERlY2wobGVuZ3Rob2YoQ29uZmxpY3RMb2dEZXN0TmFtZXMp
ID09IDMsCitTdGF0aWNBc3NlcnREZWNsKGxlbmd0aG9mKENvbmZsaWN0TG9nRGVzdE5hbWVzKSA9
PSBDT05GTElDVF9MT0dfREVTVF9BTEwgKyAxLAogCQkJCSAiQ29uZmxpY3RMb2dEZXN0TmFtZXMg
bGVuZ3RoIG1pc21hdGNoIik7CiAKIC8qIFN0cnVjdHVyZSB0byBob2xkIG1ldGFkYXRhIGZvciBv
bmUgY29sdW1uIG9mIHRoZSBjb25mbGljdCBsb2cgdGFibGUgKi8KZGlmZiAtLWdpdCBhL3NyYy9p
bmNsdWRlL2NhdGFsb2cvcGdfc3Vic2NyaXB0aW9uLmggYi9zcmMvaW5jbHVkZS9jYXRhbG9nL3Bn
X3N1YnNjcmlwdGlvbi5oCmluZGV4IGNjMzFiNGQwMGJjLi44OWQyMzAwYWJlMSAxMDA2NDQKLS0t
IGEvc3JjL2luY2x1ZGUvY2F0YWxvZy9wZ19zdWJzY3JpcHRpb24uaAorKysgYi9zcmMvaW5jbHVk
ZS9jYXRhbG9nL3BnX3N1YnNjcmlwdGlvbi5oCkBAIC05NSw3ICs5NSw3IEBAIENBVEFMT0cocGdf
c3Vic2NyaXB0aW9uLDYxMDAsU3Vic2NyaXB0aW9uUmVsYXRpb25JZCkgQktJX1NIQVJFRF9SRUxB
VElPTiBCS0lfUk9XCiAJT2lkCQkJc3Vic2VydmVyIEJLSV9MT09LVVBfT1BUKHBnX2ZvcmVpZ25f
c2VydmVyKTsJLyogSWYgY29ubmVjdGlvbiB1c2VzCiAJCQkJCQkJCQkJCQkJCQkJICogc2VydmVy
ICovCiAKLQlPaWQgICAgICAgICBzdWJjb25mbGljdGxvZ3JlbGlkOyAvKiBSZWxpZCBvZiB0aGUg
Y29uZmxpY3QgbG9nIHRhYmxlLiAqLworCU9pZAkJCXN1YmNvbmZsaWN0bG9ncmVsaWQ7IC8qIFJl
bGlkIG9mIHRoZSBjb25mbGljdCBsb2cgdGFibGUuICovCiAjaWZkZWYgQ0FUQUxPR19WQVJMRU4J
CQkvKiB2YXJpYWJsZS1sZW5ndGggZmllbGRzIHN0YXJ0IGhlcmUgKi8KIAkvKgogCSAqIFN0cmF0
ZWd5IGZvciBsb2dnaW5nIHJlcGxpY2F0aW9uIGNvbmZsaWN0czoKZGlmZiAtLWdpdCBhL3NyYy9p
bmNsdWRlL3JlcGxpY2F0aW9uL3dvcmtlcl9pbnRlcm5hbC5oIGIvc3JjL2luY2x1ZGUvcmVwbGlj
YXRpb24vd29ya2VyX2ludGVybmFsLmgKaW5kZXggNmE0NDdkYTY1MTAuLjZiNjUyNWRjMmUyIDEw
MDY0NAotLS0gYS9zcmMvaW5jbHVkZS9yZXBsaWNhdGlvbi93b3JrZXJfaW50ZXJuYWwuaAorKysg
Yi9zcmMvaW5jbHVkZS9yZXBsaWNhdGlvbi93b3JrZXJfaW50ZXJuYWwuaApAQCAtMjYwLDcgKzI2
MCw3IEBAIGV4dGVybiBQR0RMTElNUE9SVCBMaXN0ICp0YWJsZV9zdGF0ZXNfbm90X3JlYWR5Owog
CiBleHRlcm4gWExvZ1JlY1B0ciByZW1vdGVfZmluYWxfbHNuOwogZXh0ZXJuIFRpbWVzdGFtcFR6
IHJlbW90ZV9jb21taXRfdHM7Ci1leHRlcm4gVHJhbnNhY3Rpb25JZAlyZW1vdGVfeGlkOworZXh0
ZXJuIFRyYW5zYWN0aW9uSWQgcmVtb3RlX3hpZDsKIAogZXh0ZXJuIHZvaWQgbG9naWNhbHJlcF93
b3JrZXJfYXR0YWNoKGludCBzbG90KTsKIGV4dGVybiBMb2dpY2FsUmVwV29ya2VyICpsb2dpY2Fs
cmVwX3dvcmtlcl9maW5kKExvZ2ljYWxSZXBXb3JrZXJUeXBlIHd0eXBlLAo=
--0000000000009be686065330425e--