MIME-Version: 1.0
References: <CAKYtNAp9vOtydXL3_pnGJ+TetZtN=FYSnZSMCqXceU3mkHPxPg@mail.gmail.com>
 <202501110844.5ztsym4vbflm@alvherre.pgsql> <CAKYtNAo-6HZy-JhTYS321AxGE_BPCg7WTFVLeXTuFMZ6HYK2vg@mail.gmail.com>
 <CACJufxGcZ1rK94cgfdc9McCD7W-83PT9_cx5VoFeC-HVc10Wzg@mail.gmail.com>
 <CAKYtNAqd4k+4+XANxjDc35i+WPme476DkP7msjYpX85F+4UsUg@mail.gmail.com>
 <CAKYtNAobHS158cfmA3X+Zr+oJ1ffNjjn3+BrU4-MokZ16jSVzw@mail.gmail.com>
 <CACJufxEtDgADBXQhX5cp3mJtNVMy+j+Jdovuk3PWe5qJ0sE3Ag@mail.gmail.com>
 <CAKYtNArwUxqR=LkQY1PT7tw+raMhf53oafo4WmSHGPHiER9d=A@mail.gmail.com>
 <CACJufxHUDGWe=2ZukvMfuwEcSK8CsVYm=9+rtPnrW7CRCfoCsw@mail.gmail.com>
 <CACJufxGOy1kAot+SAD9siKB797rj9K-bqeZOrS4fDYFFLo31bA@mail.gmail.com>
 <CAKYtNApE=x0sZxU3c9KqsYRU3dCztcfhQ+CDWhzgtH83HQUkuA@mail.gmail.com>
 <CACJufxHNNjAhVYJQS8x5U-9Fqsj6+tzG4uCivk2XTAOPTmstTA@mail.gmail.com>
 <CACJufxFJ9yJ=+WAHpXbDxf077Xw3O+ZziTwS55+ZK5APJ+6mUg@mail.gmail.com>
 <CACJufxEA-Q2hatN_BLcNrgfo8-4-m102gDdwVp0NTbuM2zyeDA@mail.gmail.com>
 <CAKYtNAqWjU6-J=VA-9-CVDLh7nX_Y_MgdSgyLFb6yYyZ1NYsyg@mail.gmail.com>
 <CACJufxEFxaiqytZRpL0Xbj8_XEtTm8-A2FE6u_9vigGO3z5oZQ@mail.gmail.com>
 <CAKYtNAr732dgvu43vLRBnDK=dPBVWAFBKaCp0982kwp0Yn8DOA@mail.gmail.com>
 <CACJufxGwXjG80LZ4miX+dXaT+3z5Kf1Mf0P_7FnR+641oqfUyg@mail.gmail.com>
 <CACJufxEQUcjBocKJQ0Amf3AfiS9wFB7zYSHrj1qqD_oWeaJoGQ@mail.gmail.com>
 <CAKYtNApzcsV3a_jR6oduA12yKrx=aBv+vcA=RseT-2rLrC2o_g@mail.gmail.com>
 <CAFC+b6p84_wtbviPu-mLNxfOPLozN8OOjWcz_tjoDf=SuVDMTQ@mail.gmail.com>
 <CAFC+b6qJ9BAmN-J2ha-Q08MPbZ2FqTUB++B0ouvSk72px3D-NA@mail.gmail.com>
 <CAKYtNAqsOwq-u-h0+WEm2nonwZD4S=9ri4-d0vhAGjNQZ7FjnQ@mail.gmail.com>
 <CAKYtNAr+YSMu1TkyXzsxtvCMRoya05_=1V_LFKDrL=XpYJ9DxQ@mail.gmail.com>
 <CACJufxGp5p7_7EwNwg-GuKZO+XB9uxfWTZ+QWhhNvwgUF0Vb0w@mail.gmail.com>
 <CACJufxGoUgqv+T1MXuh_SH_FTwTMpqfUcntHP1c5Q7KnyPXgKQ@mail.gmail.com>
 <CACJufxFWFLZhtgk92HR78tKiYk0yRX-26v2y1eEN2NtjyXtU4A@mail.gmail.com>
 <CAKYtNApkrfDHyN5z+Spbat1xzVOEL9y5o+ALimYmb3eH3T8Vhw@mail.gmail.com>
 <CACJufxFrzYJ0oZNm=v9hg10UpPQNe+p0+2ydNirHxyhUT_JtXw@mail.gmail.com>
 <CAKYtNAqP=URFvX2dqH5RT+wmd9nrnrfH45rvD2H_w9zNBvJqQA@mail.gmail.com> <CACJufxEcGGddRgwDLafyi+GJDOamPR4rrPG_0tZp6Rh81mEPfA@mail.gmail.com>
In-Reply-To: <CACJufxEcGGddRgwDLafyi+GJDOamPR4rrPG_0tZp6Rh81mEPfA@mail.gmail.com>
From: jian he <jian.universality@gmail.com>
Date: Tue, 4 Feb 2025 15:42:28 +0800
Message-ID: <CACJufxHPfwRm6Ssy73vhB6etrW7q4CRuTBmfyHFBH66wwwFe3g@mail.gmail.com>
Subject: Re: Non-text mode for pg_dumpall
To: Mahendra Singh Thalor <mahi6run@gmail.com>
Cc: Srinath Reddy <srinath2133@gmail.com>, pgsql-hackers@lists.postgresql.org
Content-Type: multipart/mixed; boundary="000000000000c39581062d4c2819"
Archived-At: <https://www.postgresql.org/message-id/CACJufxHPfwRm6Ssy73vhB6etrW7q4CRuTBmfyHFBH66wwwFe3g%40mail.gmail.com>
Precedence: bulk

--000000000000c39581062d4c2819
Content-Type: text/plain; charset="UTF-8"

hi.
This attached patch solves problems mentioned in [1].
so pg_restore --file restoring multiple databases will have the
```\connect dbname``` command in it.
the output plain text file can be used in psql.


pg_restore --file output will be:

--
-- Database "template1" dump
--

-- Dumped from database version 18devel_debug_build_622f678c10
-- Dumped by pg_dump version 18devel_debug_build_622f678c10

-- Started on 2025-02-04 14:34:44 CST

\connect template1

.....

-- Completed on 2025-02-04 14:34:53 CST

--
-- Database "template1" dump complete
--


[1] https://postgr.es/m/CACJufxFrzYJ0oZNm=v9hg10UpPQNe+p0+2ydNirHxyhUT_JtXw@mail.gmail.com

--000000000000c39581062d4c2819
Content-Type: application/octet-stream; 
	name="v15-0001-make-pg_restore-file-option-using-connect-for.no-cfbot"
Content-Disposition: attachment; 
	filename="v15-0001-make-pg_restore-file-option-using-connect-for.no-cfbot"
Content-Transfer-Encoding: base64
Content-ID: <f_m6q5qa500>
X-Attachment-Id: f_m6q5qa500

RnJvbSBhNDZkMjgzNzFmNjJiNTE3MTJmMjRmNjg3ZGVkZmExY2ZkY2NhMzQyIE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBqaWFuIGhlIDxqaWFuLnVuaXZlcnNhbGl0eUBnbWFpbC5jb20+
CkRhdGU6IFR1ZSwgNCBGZWIgMjAyNSAxNToyNDo1OSArMDgwMApTdWJqZWN0OiBbUEFUQ0ggdjE1
IDEvMV0gbWFrZSBwZ19yZXN0b3JlIC0tZmlsZSBvcHRpb24gdXNpbmcgXGNvbm5lY3QgZm9yCiBy
ZXRzb3JpbmcgbXVsdGlwbGUgZGF0YWJhc2VzLgoKVGhpcyBwYXRjaCBzb2x2ZXMgcHJvYmxlbXMg
bWVudGlvbmVkIGluIFsxXS4Kc28gcGdfcmVzdG9yZSAtLWZpbGUgb3V0cHV0IGlzIHNhbmUuCgp3
ZSBwcmludCBvdXQgdGhlIGRhdGFiYXNlIG5hbWUgd2UgYXJlIHJlc3RvcmluZyB0aHJvdWdoCmBg
YGFocHJpbnRmKEFILCAiLS1cbi0tIERhdGFiYXNlIFwiJXNcIiBkdW1wXG4tLVxuXG4iLCBkYm5h
bWUpO2BgYC4KClNvIHRoZSBwZ19yZXN0b3JlIC0tZmlsZSBvdXRwdXQgY29tbWVudHMgbWFrZSBp
dCBlYXN5IHRvIGRpc3Rpbmd1aXNoIHdoaWNoIGRhdGFiYXNlIGNvbnRlbnRzIHdlIGFyZSBkdW1w
aW5nLgoKb3ZlcmFsbCBpdCB3aWxsIGJlIGxpa2U6Ci0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQotLQotLSBEYXRhYmFzZSAidGVt
cGxhdGUxIiBkdW1wCi0tCgotLSBEdW1wZWQgZnJvbSBkYXRhYmFzZSB2ZXJzaW9uIDE4ZGV2ZWxf
ZGVidWdfYnVpbGRfNjIyZjY3OGMxMAotLSBEdW1wZWQgYnkgcGdfZHVtcCB2ZXJzaW9uIDE4ZGV2
ZWxfZGVidWdfYnVpbGRfNjIyZjY3OGMxMAoKLS0gU3RhcnRlZCBvbiAyMDI1LTAyLTA0IDE0OjM0
OjQ0IENTVAoKXGNvbm5lY3QgdGVtcGxhdGUxCi4uLi4uCgotLSBDb21wbGV0ZWQgb24gMjAyNS0w
Mi0wNCAxNDozNDo1MyBDU1QKCi0tCi0tIERhdGFiYXNlICJ0ZW1wbGF0ZTEiIGR1bXAgY29tcGxl
dGUKLS0KCi0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLQpbMV0gaHR0cHM6Ly9wb3N0Z3IuZXMvbS9DQUNKdWZ4RnJ6WUowb1pObT12
OWhnMTBVcFBRTmUrcDArMnlkTmlySHh5aFVUX0p0WHdAbWFpbC5nbWFpbC5jb20KLS0tCiBzcmMv
YmluL3BnX2R1bXAvcGdfYmFja3VwLmggICAgICAgICAgfCAgMiArLQogc3JjL2Jpbi9wZ19kdW1w
L3BnX2JhY2t1cF9hcmNoaXZlci5jIHwgMjEgKysrKysrKysrKysrKystLS0tLS0tCiBzcmMvYmlu
L3BnX2R1bXAvcGdfYmFja3VwX3Rhci5jICAgICAgfCAgMiArLQogc3JjL2Jpbi9wZ19kdW1wL3Bn
X2R1bXAuYyAgICAgICAgICAgIHwgIDIgKy0KIHNyYy9iaW4vcGdfZHVtcC9wZ19yZXN0b3JlLmMg
ICAgICAgICB8IDEyICsrKysrKystLS0tLQogNSBmaWxlcyBjaGFuZ2VkLCAyNCBpbnNlcnRpb25z
KCspLCAxNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9zcmMvYmluL3BnX2R1bXAvcGdfYmFj
a3VwLmggYi9zcmMvYmluL3BnX2R1bXAvcGdfYmFja3VwLmgKaW5kZXggNjUwMDBlNWEwOC4uNzI5
ZmZjOWUxMiAxMDA2NDQKLS0tIGEvc3JjL2Jpbi9wZ19kdW1wL3BnX2JhY2t1cC5oCisrKyBiL3Ny
Yy9iaW4vcGdfZHVtcC9wZ19iYWNrdXAuaApAQCAtMzA2LDcgKzMwNiw3IEBAIGV4dGVybiB2b2lk
IFNldEFyY2hpdmVPcHRpb25zKEFyY2hpdmUgKkFILCBEdW1wT3B0aW9ucyAqZG9wdCwgUmVzdG9y
ZU9wdGlvbnMgKnJvCiAKIGV4dGVybiB2b2lkIFByb2Nlc3NBcmNoaXZlUmVzdG9yZU9wdGlvbnMo
QXJjaGl2ZSAqQUhYKTsKIAotZXh0ZXJuIHZvaWQgUmVzdG9yZUFyY2hpdmUoQXJjaGl2ZSAqQUhY
LCBib29sIGFwcGVuZF9kYXRhKTsKK2V4dGVybiB2b2lkIFJlc3RvcmVBcmNoaXZlKEFyY2hpdmUg
KkFIWCwgYm9vbCBhcHBlbmRfZGF0YSwgY29uc3QgY2hhciAqZGJuYW1lKTsKIAogLyogT3BlbiBh
biBleGlzdGluZyBhcmNoaXZlICovCiBleHRlcm4gQXJjaGl2ZSAqT3BlbkFyY2hpdmUoY29uc3Qg
Y2hhciAqRmlsZVNwZWMsIGNvbnN0IEFyY2hpdmVGb3JtYXQgZm10KTsKZGlmZiAtLWdpdCBhL3Ny
Yy9iaW4vcGdfZHVtcC9wZ19iYWNrdXBfYXJjaGl2ZXIuYyBiL3NyYy9iaW4vcGdfZHVtcC9wZ19i
YWNrdXBfYXJjaGl2ZXIuYwppbmRleCBlOTFmNGI4MzZmLi5mZDZmZDE2NjQyIDEwMDY0NAotLS0g
YS9zcmMvYmluL3BnX2R1bXAvcGdfYmFja3VwX2FyY2hpdmVyLmMKKysrIGIvc3JjL2Jpbi9wZ19k
dW1wL3BnX2JhY2t1cF9hcmNoaXZlci5jCkBAIC0zMzYsOSArMzM2LDExIEBAIFByb2Nlc3NBcmNo
aXZlUmVzdG9yZU9wdGlvbnMoQXJjaGl2ZSAqQUhYKQogICoKICAqIElmIGFwcGVuZF9kYXRhIGlz
IHNldCwgdGhlbiBhcHBlbmQgZGF0YSBpbnRvIGZpbGUgYXMgd2UgYXJlIHJlc3RvcmluZyBkdW1w
CiAgKiBvZiBtdWx0aXBsZSBkYXRhYmFzZXMgd2hpY2ggd2FzIHRha2VuIGJ5IHBnX2R1bXBhbGwu
CisgKiBJZiBkYm5hbWUgaXMgbm90IE5VTEwsIHRoZW4gcGdfcmVzdG9yZSByZXN0b3JlIGFyY2hp
dmUgdG8gZmlsZSB3aWxsIGhhdmUKKyAqIGNvbW1lbnRzIGFib3V0IHdoaWNoIGRhdGFiYXNlIGN1
cnJlbnRseSBpcyBiZWluZyBkdW1wZWQuCiAgKi8KIHZvaWQKLVJlc3RvcmVBcmNoaXZlKEFyY2hp
dmUgKkFIWCwgYm9vbCBhcHBlbmRfZGF0YSkKK1Jlc3RvcmVBcmNoaXZlKEFyY2hpdmUgKkFIWCwg
Ym9vbCBhcHBlbmRfZGF0YSwgY29uc3QgY2hhciAqZGJuYW1lKQogewogCUFyY2hpdmVIYW5kbGUg
KkFIID0gKEFyY2hpdmVIYW5kbGUgKikgQUhYOwogCVJlc3RvcmVPcHRpb25zICpyb3B0ID0gQUgt
PnB1YmxpYy5yb3B0OwpAQCAtNDU3LDcgKzQ1OSwxMCBAQCBSZXN0b3JlQXJjaGl2ZShBcmNoaXZl
ICpBSFgsIGJvb2wgYXBwZW5kX2RhdGEpCiAJaWYgKHJvcHQtPmZpbGVuYW1lIHx8IHJvcHQtPmNv
bXByZXNzaW9uX3NwZWMuYWxnb3JpdGhtICE9IFBHX0NPTVBSRVNTSU9OX05PTkUpCiAJCVNldE91
dHB1dChBSCwgcm9wdC0+ZmlsZW5hbWUsIHJvcHQtPmNvbXByZXNzaW9uX3NwZWMsIGFwcGVuZF9k
YXRhKTsKIAotCWFocHJpbnRmKEFILCAiLS1cbi0tIFBvc3RncmVTUUwgZGF0YWJhc2UgZHVtcFxu
LS1cblxuIik7CisJaWYgKGFwcGVuZF9kYXRhICYmIGRibmFtZSAhPSBOVUxMKQorCQlhaHByaW50
ZihBSCwgIi0tXG4tLSBEYXRhYmFzZSBcIiVzXCIgZHVtcFxuLS1cblxuIiwgZGJuYW1lKTsKKwll
bHNlCisJCWFocHJpbnRmKEFILCAiLS1cbi0tIFBvc3RncmVTUUwgZGF0YWJhc2UgZHVtcFxuLS1c
blxuIik7CiAKIAlpZiAoQUgtPmFyY2hpdmVSZW1vdGVWZXJzaW9uKQogCQlhaHByaW50ZihBSCwg
Ii0tIER1bXBlZCBmcm9tIGRhdGFiYXNlIHZlcnNpb24gJXNcbiIsCkBAIC03OTcsOCArODAyLDEw
IEBAIFJlc3RvcmVBcmNoaXZlKEFyY2hpdmUgKkFIWCwgYm9vbCBhcHBlbmRfZGF0YSkKIAlpZiAo
QUgtPnB1YmxpYy52ZXJib3NlKQogCQlkdW1wVGltZXN0YW1wKEFILCAiQ29tcGxldGVkIG9uIiwg
dGltZShOVUxMKSk7CiAKLQlhaHByaW50ZihBSCwgIi0tXG4tLSBQb3N0Z3JlU1FMIGRhdGFiYXNl
IGR1bXAgY29tcGxldGVcbi0tXG5cbiIpOwotCisJaWYgKGFwcGVuZF9kYXRhICYmIGRibmFtZSAh
PSBOVUxMKQorCQlhaHByaW50ZihBSCwgIi0tXG4tLSBEYXRhYmFzZSBcIiVzXCIgZHVtcCBjb21w
bGV0ZVxuLS1cblxuIiwgZGJuYW1lKTsKKwllbHNlCisJCWFocHJpbnRmKEFILCAiLS1cbi0tIFBv
c3RncmVTUUwgZGF0YWJhc2UgZHVtcFxuLS1cblxuIik7CiAJLyoKIAkgKiBDbGVhbiB1cCAmIHdl
J3JlIGRvbmUuCiAJICovCkBAIC0yOTI2LDEzICsyOTMzLDEzIEBAIF90b2NFbnRyeVJlcXVpcmVk
KFRvY0VudHJ5ICp0ZSwgdGVTZWN0aW9uIGN1clNlY3Rpb24sIEFyY2hpdmVIYW5kbGUgKkFIKQog
CiAJLyoKIAkgKiBEQVRBQkFTRSBhbmQgREFUQUJBU0UgUFJPUEVSVElFUyBhbHNvIGhhdmUgYSBz
cGVjaWFsIHJ1bGU6IHRoZXkgYXJlCi0JICogcmVzdG9yZWQgaW4gY3JlYXRlREIgbW9kZSwgYW5k
IG5vdCByZXN0b3JlZCBvdGhlcndpc2UsIGluZGVwZW5kZW50bHkgb2YKLQkgKiBhbGwgZWxzZS4K
KwkgKiByZXN0b3JlZCBpbiBjcmVhdGVEQiBtb2RlIG9yIHJlc3RvcmVkIGZvcm1hdCBpcyBub3Qg
cGxhaW4gZmlsZSwgYW5kIG5vdAorCSAqIHJlc3RvcmVkIG90aGVyd2lzZSwgaW5kZXBlbmRlbnRs
eSBvZiBhbGwgZWxzZS4KIAkgKi8KIAlpZiAoc3RyY21wKHRlLT5kZXNjLCAiREFUQUJBU0UiKSA9
PSAwIHx8CiAJCXN0cmNtcCh0ZS0+ZGVzYywgIkRBVEFCQVNFIFBST1BFUlRJRVMiKSA9PSAwKQog
CXsKLQkJaWYgKHJvcHQtPmNyZWF0ZURCKQorCQlpZiAocm9wdC0+Y3JlYXRlREIgfHwgQUgtPmZv
cm1hdCAhPSBhcmNoTnVsbCkKIAkJCXJldHVybiBSRVFfU0NIRU1BOwogCQllbHNlCiAJCQlyZXR1
cm4gMDsKZGlmZiAtLWdpdCBhL3NyYy9iaW4vcGdfZHVtcC9wZ19iYWNrdXBfdGFyLmMgYi9zcmMv
YmluL3BnX2R1bXAvcGdfYmFja3VwX3Rhci5jCmluZGV4IGQ5NGQwZGUyYTUuLjQ1ZjBmYjQ2ZTAg
MTAwNjQ0Ci0tLSBhL3NyYy9iaW4vcGdfZHVtcC9wZ19iYWNrdXBfdGFyLmMKKysrIGIvc3JjL2Jp
bi9wZ19kdW1wL3BnX2JhY2t1cF90YXIuYwpAQCAtODI2LDcgKzgyNiw3IEBAIF9DbG9zZUFyY2hp
dmUoQXJjaGl2ZUhhbmRsZSAqQUgpCiAJCXNhdlZlcmJvc2UgPSBBSC0+cHVibGljLnZlcmJvc2U7
CiAJCUFILT5wdWJsaWMudmVyYm9zZSA9IDA7CiAKLQkJUmVzdG9yZUFyY2hpdmUoKEFyY2hpdmUg
KikgQUgsIGZhbHNlKTsKKwkJUmVzdG9yZUFyY2hpdmUoKEFyY2hpdmUgKikgQUgsIGZhbHNlLCBO
VUxMKTsKIAogCQlTZXRBcmNoaXZlT3B0aW9ucygoQXJjaGl2ZSAqKSBBSCwgc2F2RG9wdCwgc2F2
Um9wdCk7CiAKZGlmZiAtLWdpdCBhL3NyYy9iaW4vcGdfZHVtcC9wZ19kdW1wLmMgYi9zcmMvYmlu
L3BnX2R1bXAvcGdfZHVtcC5jCmluZGV4IDYxMDY3ZTE1NDIuLjUxYzU5NWE3YTUgMTAwNjQ0Ci0t
LSBhL3NyYy9iaW4vcGdfZHVtcC9wZ19kdW1wLmMKKysrIGIvc3JjL2Jpbi9wZ19kdW1wL3BnX2R1
bXAuYwpAQCAtMTE0OCw3ICsxMTQ4LDcgQEAgbWFpbihpbnQgYXJnYywgY2hhciAqKmFyZ3YpCiAJ
ICogcmlnaHQgbm93LgogCSAqLwogCWlmIChwbGFpblRleHQpCi0JCVJlc3RvcmVBcmNoaXZlKGZv
dXQsIGZhbHNlKTsKKwkJUmVzdG9yZUFyY2hpdmUoZm91dCwgZmFsc2UsIE5VTEwpOwogCiAJQ2xv
c2VBcmNoaXZlKGZvdXQpOwogCmRpZmYgLS1naXQgYS9zcmMvYmluL3BnX2R1bXAvcGdfcmVzdG9y
ZS5jIGIvc3JjL2Jpbi9wZ19kdW1wL3BnX3Jlc3RvcmUuYwppbmRleCA0NDQ0MTVkMmVlLi5iMjE2
ODczNzczIDEwMDY0NAotLS0gYS9zcmMvYmluL3BnX2R1bXAvcGdfcmVzdG9yZS5jCisrKyBiL3Ny
Yy9iaW4vcGdfZHVtcC9wZ19yZXN0b3JlLmMKQEAgLTc1LDcgKzc1LDggQEAgc3RhdGljIHZvaWQg
dXNhZ2UoY29uc3QgY2hhciAqcHJvZ25hbWUpOwogc3RhdGljIHZvaWQgcmVhZF9yZXN0b3JlX2Zp
bHRlcnMoY29uc3QgY2hhciAqZmlsZW5hbWUsIFJlc3RvcmVPcHRpb25zICpvcHRzKTsKIHN0YXRp
YyBib29sIElzRmlsZUV4aXN0c0luRGlyZWN0b3J5KGNvbnN0IGNoYXIgKmRpciwgY29uc3QgY2hh
ciAqZmlsZW5hbWUpOwogc3RhdGljIGludCByZXN0b3JlT25lRGF0YWJhc2UoY29uc3QgY2hhciAq
aW5wdXRGaWxlU3BlYywgUmVzdG9yZU9wdGlvbnMgKm9wdHMsCi0JCQkJCQkJICBpbnQgbnVtV29y
a2VycywgYm9vbCBhcHBlbmRfZGF0YSk7CisJCQkJCQkJICBpbnQgbnVtV29ya2VycywgYm9vbCBh
cHBlbmRfZGF0YSwKKwkJCQkJCQkgIGNvbnN0IGNoYXIgKmRibmFtZSk7CiBzdGF0aWMgaW50IFJl
YWRPbmVTdGF0ZW1lbnQoU3RyaW5nSW5mbyBpbkJ1ZiwgRklMRSAqcGZpbGUpOwogc3RhdGljIGlu
dCByZXN0b3JlQWxsRGF0YWJhc2VzKFBHY29ubiAqY29ubiwgY29uc3QgY2hhciAqZHVtcGRpcnBh
dGgsCiAJCQkJCQkJICAgU2ltcGxlU3RyaW5nTGlzdCBkYl9leGNsdWRlX3BhdHRlcm5zLCBSZXN0
b3JlT3B0aW9ucyAqb3B0cywgaW50IG51bVdvcmtlcnMpOwpAQCAtNTI1LDE2ICs1MjYsMTcgQEAg
bWFpbihpbnQgYXJnYywgY2hhciAqKmFyZ3YpCiAJCX0KIAl9CiAKLQlyZXR1cm4gcmVzdG9yZU9u
ZURhdGFiYXNlKGlucHV0RmlsZVNwZWMsIG9wdHMsIG51bVdvcmtlcnMsIGZhbHNlKTsKKwlyZXR1
cm4gcmVzdG9yZU9uZURhdGFiYXNlKGlucHV0RmlsZVNwZWMsIG9wdHMsIG51bVdvcmtlcnMsIGZh
bHNlLCBOVUxMKTsKIH0KIC8qCiAgKiByZXN0b3JlT25lRGF0YWJhc2UKICAqCiAgKiBUaGlzIHdp
bGwgcmVzdG9yZSBvbmUgZGF0YWJhc2UgdXNpbmcgdG9jLmRhdCBmaWxlLgorICogZGJuYW1lIGlz
IHRoZSBjdXJyZW50IHRvIGJlIHJlc3RvcmVkIGRhdGFiYXNlIG5hbWUuCiAgKi8KIHN0YXRpYyBp
bnQKIHJlc3RvcmVPbmVEYXRhYmFzZShjb25zdCBjaGFyICppbnB1dEZpbGVTcGVjLCBSZXN0b3Jl
T3B0aW9ucyAqb3B0cywKLQkJCQkgICBpbnQgbnVtV29ya2VycywgYm9vbCBhcHBlbmRfZGF0YSkK
KwkJCQkgICBpbnQgbnVtV29ya2VycywgYm9vbCBhcHBlbmRfZGF0YSwgY29uc3QgY2hhciAqZGJu
YW1lKQogewogCUFyY2hpdmUJCSpBSDsKIAlpbnQJCQlleGl0X2NvZGU7CkBAIC01NjgsNyArNTcw
LDcgQEAgcmVzdG9yZU9uZURhdGFiYXNlKGNvbnN0IGNoYXIgKmlucHV0RmlsZVNwZWMsIFJlc3Rv
cmVPcHRpb25zICpvcHRzLAogCWVsc2UKIAl7CiAJCVByb2Nlc3NBcmNoaXZlUmVzdG9yZU9wdGlv
bnMoQUgpOwotCQlSZXN0b3JlQXJjaGl2ZShBSCwgYXBwZW5kX2RhdGEpOworCQlSZXN0b3JlQXJj
aGl2ZShBSCwgYXBwZW5kX2RhdGEsIGRibmFtZSk7CiAJfQogCiAJLyogZG9uZSwgcHJpbnQgYSBz
dW1tYXJ5IG9mIGlnbm9yZWQgZXJyb3JzICovCkBAIC0xMTM4LDcgKzExNDAsNyBAQCByZXN0b3Jl
QWxsRGF0YWJhc2VzKFBHY29ubiAqY29ubiwgY29uc3QgY2hhciAqZHVtcGRpcnBhdGgsCiAKIAkJ
cGdfbG9nX2luZm8oInJlc3RvcmluZyBkYXRhYmFzZSBcIiVzXCIiLCBkYm9pZF9jZWxsLT5kYl9u
YW1lKTsKIAotCQlkYmV4aXRfY29kZSA9IHJlc3RvcmVPbmVEYXRhYmFzZShzdWJkaXJwYXRoLCBv
cHRzLCBudW1Xb3JrZXJzLCB0cnVlKTsKKwkJZGJleGl0X2NvZGUgPSByZXN0b3JlT25lRGF0YWJh
c2Uoc3ViZGlycGF0aCwgb3B0cywgbnVtV29ya2VycywgdHJ1ZSwgZGJvaWRfY2VsbC0+ZGJfbmFt
ZSk7CiAKIAkJLyogU3RvcmUgZXhpdF9jb2RlIHRvIHJlcG9ydCBpdCBiYWNrLiAqLwogCQlpZiAo
ZXhpdF9jb2RlID09IDAgJiYgZGJleGl0X2NvZGUgIT0gMCkKLS0gCjIuMzQuMQoK
--000000000000c39581062d4c2819--