MIME-Version: 1.0
References: <3f22a8bb-29e8-40cc-97a1-309181da2c13@dunslane.net>
 <CAC6VRoYWPQZeLDuKVNeMz5z-iiVnv0zWyBwWhxdm4UQO17-AUQ@mail.gmail.com>
 <CAKYtNAoNi8O1wbSZx0a1oSi-YzQtprxqpfZqryRq39hXn_p-OA@mail.gmail.com>
 <CAC6VRoYCqJq=0q3GF+vfDVbY4JUehqsuxYhcmVi7A=1hfNzSJg@mail.gmail.com>
 <CAKYtNApm8nA6hVMNkSjeNPiwTZBWYkhJKU7haQghUZdw74tYxA@mail.gmail.com>
 <CACJufxHc5Rp2roGyJOVnCk=Mx8_42_9vCGJSCFpLB5=AFQqHTQ@mail.gmail.com>
 <CAKYtNAoz-Sz2X1ipkQ5x1Sh08AMyy1kDRGfeRW3P1W-QoN+WOg@mail.gmail.com>
 <CAC6VRoZU2L2GX7+bXpsZ6bo+NuxBOe1dTGDPzKobUL4KVdm46A@mail.gmail.com>
 <CAKYtNApq+6Riz26So1nmXkRpL_7o868+r6i=wxQ+AgGQ4oSLig@mail.gmail.com>
 <CAC6VRoZbP=-=a+a78RoWcs2L4=4VEDZqJMg+7SyUAcSHATyDAQ@mail.gmail.com>
 <CAC6VRoY-1WC_O5UDwKzNc18LXLwjuTFb+qMNY3gaF3cCov6M6g@mail.gmail.com>
 <CAKYtNArc3j8Akb+nB1QyJLKic7ej7vKZqKnv_mbB+iQAJRzLnA@mail.gmail.com>
 <CAC6VRoat6NPcS6vfGrPrwaQB3G1JHLSqDeAkf1AJ7npWrwhnUQ@mail.gmail.com>
 <CAKYtNAp=TFEZWQbTRZso3kNaD9BH=-JPNQ30mT60cJN_04hEog@mail.gmail.com>
 <4022765f-38ee-48a3-b246-615b3f8e1c23@dunslane.net> <CAKYtNAq73_UeL4-0wgu9rawctHdS2zhpzWtqVuOChCS3M+2Ymg@mail.gmail.com>
In-Reply-To: <CAKYtNAq73_UeL4-0wgu9rawctHdS2zhpzWtqVuOChCS3M+2Ymg@mail.gmail.com>
From: jian he <jian.universality@gmail.com>
Date: Sat, 21 Feb 2026 10:15:44 +0800
Message-ID: <CACJufxFs9NXXTeb78i2MD+pnZootayAtiGcNHNeU35SmQgMjbA@mail.gmail.com>
Subject: Re: Non-text mode for pg_dumpall
To: Mahendra Singh Thalor <mahi6run@gmail.com>
Cc: Andrew Dunstan <andrew@dunslane.net>, tushar <tushar.ahuja@enterprisedb.com>, 
	Vaibhav Dalvi <vaibhav.dalvi@enterprisedb.com>, pgsql-hackers@lists.postgresql.org
Content-Type: multipart/mixed; boundary="000000000000a71953064b4c1faa"
Archived-At: <https://www.postgresql.org/message-id/CACJufxFs9NXXTeb78i2MD%2BpnZootayAtiGcNHNeU35SmQgMjbA%40mail.gmail.com>
Precedence: bulk

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

Hi.

        RestoreOptions *tmpopts =3D (RestoreOptions *)
pg_malloc0(sizeof(RestoreOptions));
need change to
        RestoreOptions *tmpopts =3D pg_malloc0_object(RestoreOptions);

+  <para>
+   If the dump was taken in a non-plain-text format, use
+   <application>pg_restore</application> to restore the databases:
+<screen>
+<prompt>$</prompt> <userinput>pg_restore db.out -d postgres -C</userinput>
+</screen>
+   This will restore all databases. To restore only some databases, use
+   the <option>--exclude-database</option> option to skip those not wanted=
.
+  </para>

The change above was added to pg_dumpall.sgml, which seems inappropriate;
it would be more correct to place it in pg_restore.sgml.

+     <varlistentry>
+      <term><option>-g</option></term>
+      <term><option>--globals-only</option></term>
+      <listitem>
+       <para>
+        Restore only global objects (roles and tablespaces), no databases.
+       </para>
+       <para>
+        This option is only relevant when restoring from an archive
made using <application>pg_dumpall</application>.
+        Note: <option>--globals-only</option> cannot be used with
<option>--exit-on-error</option>,
+              <option>--single-transaction</option>,
<option>--clean</option>, or <option>--transaction-size</option>.
+       </para>
+      </listitem>
+     </varlistentry>
+
<option>--globals-only</option> cannot be used with --data-only,
--schema-only, --statistics-only, --statistics.
We should also mention that.

In doc/src/sgml/ref/pg_restore.sgml
"when restoring from an archive made using pg_dumpall."
It  would be better using
"when restoring from a non-plain-text archive made using pg_dumpall."
that would be aligned with pg_dumpall.sgml.

      <varlistentry>
       <term><option>-g</option></term>
       <term><option>--globals-only</option></term>
       <listitem>
        <para>
         Dump only global objects (roles and tablespaces), no databases.
+        Note: <option>--globals-only</option> cannot be used with
+        <option>--clean</option> with non-text dump format.
        </para>
Elsewhere, we use the term =E2=80=9Cnon-plain-text,=E2=80=9D so we should u=
se
=E2=80=9Cnon-plain-text=E2=80=9D here as well instead of =E2=80=9Cnon-text,=
=E2=80=9D for consistency.

In doc/src/sgml/ref/pg_restore.sgml, We did not mention that many
options cannot be used with pg_restore when performing a
non-plain-text restore.
Like:
"-l/--list"
"-L/--use-list"
"--strict-names"
"--no-schema"
"-a/--data-only"
"--statistics-only"
--section does not include "--pre-data"

pg_restore --clean --format=3Ddirectory will produce DROP DATABASE will
process global objects,
it will also produce DROP DATABASE when processing each individual database=
.
To prevent errors during a subsequent restore, we can require
pg_restore --clean option must be used together with --if-exists when
restoring a non-plain-text dump.


--
jian
https://www.enterprisedb.com

--000000000000a71953064b4c1faa
Content-Type: text/x-patch; charset="US-ASCII"; name="v17-0001-misc-review-for-v17.patch"
Content-Disposition: attachment; 
	filename="v17-0001-misc-review-for-v17.patch"
Content-Transfer-Encoding: base64
Content-ID: <f_mlvosp0j0>
X-Attachment-Id: f_mlvosp0j0

RnJvbSA3MzA3OTcwMmU1MTM0NzFkMzVmZDA0MjMzNTA1MDM2NDRjZjI3ZTBmIE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBqaWFuIGhlIDxqaWFuLnVuaXZlcnNhbGl0eUBnbWFpbC5jb20+
CkRhdGU6IFNhdCwgMjEgRmViIDIwMjYgMTA6MDk6NTYgKzA4MDAKU3ViamVjdDogW1BBVENIIHYx
NyAxLzFdIG1pc2MgcmV2aWV3IGZvciB2MTcKCmJhc2VkIG9uIHYxN18xOTAyMjAyNi1Ob24tdGV4
dC1tb2Rlcy1mb3ItcGdfZHVtcGFsbC1jb3JyZXNwb25kaW5nbHktY2hhbmdlLnBhdGNoCi0tLQog
ZG9jL3NyYy9zZ21sL3JlZi9wZ19kdW1wYWxsLnNnbWwgICAgfCAxMiArLS0tLS0tLS0tLS0KIGRv
Yy9zcmMvc2dtbC9yZWYvcGdfcmVzdG9yZS5zZ21sICAgIHwgMjUgKysrKysrKysrKysrKysrKysr
KysrKy0tLQogc3JjL2Jpbi9wZ19kdW1wL3BnX3Jlc3RvcmUuYyAgICAgICAgfCAxMCArKysrKysr
LS0tCiBzcmMvYmluL3BnX2R1bXAvdC8wMDdfcGdfZHVtcGFsbC5wbCB8ICAxICsKIDQgZmlsZXMg
Y2hhbmdlZCwgMzEgaW5zZXJ0aW9ucygrKSwgMTcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv
ZG9jL3NyYy9zZ21sL3JlZi9wZ19kdW1wYWxsLnNnbWwgYi9kb2Mvc3JjL3NnbWwvcmVmL3BnX2R1
bXBhbGwuc2dtbAppbmRleCA0OWU1Yzk5YjA5ZS4uOTRhNjc0Yzk1MDEgMTAwNjQ0Ci0tLSBhL2Rv
Yy9zcmMvc2dtbC9yZWYvcGdfZHVtcGFsbC5zZ21sCisrKyBiL2RvYy9zcmMvc2dtbC9yZWYvcGdf
ZHVtcGFsbC5zZ21sCkBAIC0yMjUsNyArMjI1LDcgQEAgUG9zdGdyZVNRTCBkb2N1bWVudGF0aW9u
CiAgICAgICAgPHBhcmE+CiAgICAgICAgIER1bXAgb25seSBnbG9iYWwgb2JqZWN0cyAocm9sZXMg
YW5kIHRhYmxlc3BhY2VzKSwgbm8gZGF0YWJhc2VzLgogICAgICAgICBOb3RlOiA8b3B0aW9uPi0t
Z2xvYmFscy1vbmx5PC9vcHRpb24+IGNhbm5vdCBiZSB1c2VkIHdpdGgKLSAgICAgICAgPG9wdGlv
bj4tLWNsZWFuPC9vcHRpb24+IHdpdGggbm9uLXRleHQgZHVtcCBmb3JtYXQuCisgICAgICAgIDxv
cHRpb24+LS1jbGVhbjwvb3B0aW9uPiB3aXRoIG5vbi1wbGFpbi10ZXh0IGR1bXAgZm9ybWF0Lgog
ICAgICAgIDwvcGFyYT4KICAgICAgIDwvbGlzdGl0ZW0+CiAgICAgIDwvdmFybGlzdGVudHJ5PgpA
QCAtMTA0OSwxNiArMTA0OSw2IEBAIGV4Y2x1ZGUgZGF0YWJhc2UgPHJlcGxhY2VhYmxlIGNsYXNz
PSJwYXJhbWV0ZXIiPlBBVFRFUk48L3JlcGxhY2VhYmxlPgogICAgdGhlIHNjcmlwdCB3aWxsIGF0
dGVtcHQgdG8gZHJvcCBvdGhlciBkYXRhYmFzZXMgaW1tZWRpYXRlbHksIGFuZCB0aGF0CiAgICB3
aWxsIGZhaWwgZm9yIHRoZSBkYXRhYmFzZSB5b3UgYXJlIGNvbm5lY3RlZCB0by4KICAgPC9wYXJh
PgotCi0gIDxwYXJhPgotICAgSWYgdGhlIGR1bXAgd2FzIHRha2VuIGluIGEgbm9uLXBsYWluLXRl
eHQgZm9ybWF0LCB1c2UKLSAgIDxhcHBsaWNhdGlvbj5wZ19yZXN0b3JlPC9hcHBsaWNhdGlvbj4g
dG8gcmVzdG9yZSB0aGUgZGF0YWJhc2VzOgotPHNjcmVlbj4KLTxwcm9tcHQ+JDwvcHJvbXB0PiA8
dXNlcmlucHV0PnBnX3Jlc3RvcmUgZGIub3V0IC1kIHBvc3RncmVzIC1DPC91c2VyaW5wdXQ+Ci08
L3NjcmVlbj4KLSAgIFRoaXMgd2lsbCByZXN0b3JlIGFsbCBkYXRhYmFzZXMuICBUbyByZXN0b3Jl
IG9ubHkgc29tZSBkYXRhYmFzZXMsIHVzZQotICAgdGhlIDxvcHRpb24+LS1leGNsdWRlLWRhdGFi
YXNlPC9vcHRpb24+IG9wdGlvbiB0byBza2lwIHRob3NlIG5vdCB3YW50ZWQuCi0gIDwvcGFyYT4K
ICA8L3JlZnNlY3QxPgogCiAgPHJlZnNlY3QxPgpkaWZmIC0tZ2l0IGEvZG9jL3NyYy9zZ21sL3Jl
Zi9wZ19yZXN0b3JlLnNnbWwgYi9kb2Mvc3JjL3NnbWwvcmVmL3BnX3Jlc3RvcmUuc2dtbAppbmRl
eCBiMDU4MzI2YjNjOS4uOTI0MDc3MDVmYTkgMTAwNjQ0Ci0tLSBhL2RvYy9zcmMvc2dtbC9yZWYv
cGdfcmVzdG9yZS5zZ21sCisrKyBiL2RvYy9zcmMvc2dtbC9yZWYvcGdfcmVzdG9yZS5zZ21sCkBA
IC01OCw2ICs1OCwxMSBAQCBQb3N0Z3JlU1FMIGRvY3VtZW50YXRpb24KICAgIFdoZW4gcmVzdG9y
aW5nIGZyb20gYSBkdW1wIG1hZGUgYnkgPGFwcGxpY2F0aW9uPnBnX2R1bXBhbGw8L2FwcGxpY2F0
aW9uPiwKICAgIGVhY2ggZGF0YWJhc2Ugd2lsbCBiZSBjcmVhdGVkIGFuZCB0aGVuIHRoZSByZXN0
b3JhdGlvbiB3aWxsIGJlIHJ1biBpbiB0aGF0CiAgICBkYXRhYmFzZS4KKyAgIE5vdCBhbGwgb3B0
aW9ucyBhcmUgc3VwcG9ydGVkIHdoZW4gcmVzdG9yaW5nIGZyb20gYSBkdW1wIGNyZWF0ZWQgYnkg
PGFwcGxpY2F0aW9uPnBnX2R1bXBhbGw8L2FwcGxpY2F0aW9uPi4KKyAgIFRoZSBmb2xsb3dpbmcg
b3B0aW9ucyBhcmUgbm90IHN1cHBvcnRlZDoKKyAgIDxvcHRpb24+LWwvLS1saXN0PC9vcHRpb24+
LCA8b3B0aW9uPi1MLy0tdXNlLWxpc3Q8L29wdGlvbj4sIDxvcHRpb24+LS1zdHJpY3QtbmFtZXM8
L29wdGlvbj4sIDxvcHRpb24+LS1uby1zY2hlbWE8L29wdGlvbj4sCisgICA8b3B0aW9uPi1hLy0t
ZGF0YS1vbmx5PC9vcHRpb24+LDxvcHRpb24+LS1zdGF0aXN0aWNzLW9ubHk8L29wdGlvbj4KKyAg
IEluIGFkZGl0aW9uLCA8b3B0aW9uPi0tc2VjdGlvbjwvb3B0aW9uPiBtdXN0IGluY2x1ZGUgdmFs
dWU8b3B0aW9uPi0tcHJlLWRhdGE8L29wdGlvbj4uCiAKICAgIE90aGVyd2lzZSwgd2hlbiBhIGRh
dGFiYXNlIG5hbWUgaXMgbm90IHNwZWNpZmllZCwgYSBzY3JpcHQgY29udGFpbmluZyB0aGUgU1FM
CiAgICBjb21tYW5kcyBuZWNlc3NhcnkgdG8gcmVidWlsZCB0aGUgZGF0YWJhc2Ugb3IgY2x1c3Rl
ciBpcyBjcmVhdGVkIGFuZCB3cml0dGVuCkBAIC0xMzgsNiArMTQzLDggQEAgUG9zdGdyZVNRTCBk
b2N1bWVudGF0aW9uCiAgICAgICAgIElmIGFueSBvZiB0aGUgb2JqZWN0cyBkbyBub3QgZXhpc3Qg
aW4gdGhlIGRlc3RpbmF0aW9uIGRhdGFiYXNlLAogICAgICAgICBpZ25vcmFibGUgZXJyb3IgbWVz
c2FnZXMgd2lsbCBiZSByZXBvcnRlZCwKICAgICAgICAgdW5sZXNzIDxvcHRpb24+LS1pZi1leGlz
dHM8L29wdGlvbj4gaXMgYWxzbyBzcGVjaWZpZWQuCisgICAgICAgIElmIDxvcHRpb24+LS1jbGVh
bjwvb3B0aW9uPiBpcyBzcGVjaWZpZWQsIHRoZW4gPG9wdGlvbj4tLWlmLWV4aXN0czwvb3B0aW9u
PiBtdXN0IGFsc28gYmUgc3BlY2lmaWVkCisgICAgICAgIHdoZW4gcmVzdG9yaW5nIG11bHRpcGxl
IGRhdGFiYXNlcyBmcm9tIGFuIGFyY2hpdmUgY3JlYXRlZCBieSA8YXBwbGljYXRpb24+cGdfZHVt
cGFsbDwvYXBwbGljYXRpb24+LgogICAgICAgIDwvcGFyYT4KICAgICAgIDwvbGlzdGl0ZW0+CiAg
ICAgIDwvdmFybGlzdGVudHJ5PgpAQCAtMjY2LDggKzI3Myw5IEBAIFBvc3RncmVTUUwgZG9jdW1l
bnRhdGlvbgogICAgICAgICBSZXN0b3JlIG9ubHkgZ2xvYmFsIG9iamVjdHMgKHJvbGVzIGFuZCB0
YWJsZXNwYWNlcyksIG5vIGRhdGFiYXNlcy4KICAgICAgICA8L3BhcmE+CiAgICAgICAgPHBhcmE+
Ci0gICAgICAgIFRoaXMgb3B0aW9uIGlzIG9ubHkgcmVsZXZhbnQgd2hlbiByZXN0b3JpbmcgZnJv
bSBhbiBhcmNoaXZlIG1hZGUgdXNpbmcgPGFwcGxpY2F0aW9uPnBnX2R1bXBhbGw8L2FwcGxpY2F0
aW9uPi4KLSAgICAgICAgTm90ZTogPG9wdGlvbj4tLWdsb2JhbHMtb25seTwvb3B0aW9uPiBjYW5u
b3QgYmUgdXNlZCB3aXRoIDxvcHRpb24+LS1leGl0LW9uLWVycm9yPC9vcHRpb24+LAorICAgICAg
ICBUaGlzIG9wdGlvbiBpcyBvbmx5IHJlbGV2YW50IHdoZW4gcmVzdG9yaW5nIGZyb20gYSBub24t
cGxhaW4tdGV4dCBhcmNoaXZlIG1hZGUgdXNpbmcgPGFwcGxpY2F0aW9uPnBnX2R1bXBhbGw8L2Fw
cGxpY2F0aW9uPi4KKyAgICAgICAgTm90ZTogPG9wdGlvbj4tLWdsb2JhbHMtb25seTwvb3B0aW9u
PiBjYW5ub3QgYmUgdXNlZCB3aXRoIDxvcHRpb24+LS1kYXRhLW9ubHk8L29wdGlvbj4sIDxvcHRp
b24+LS1leGl0LW9uLWVycm9yPC9vcHRpb24+LAorICAgICAgICAgICAgICA8b3B0aW9uPi0tc2No
ZW1hLW9ubHk8L29wdGlvbj4sIDxvcHRpb24+LS1zdGF0aXN0aWNzLW9ubHk8L29wdGlvbj4sIDxv
cHRpb24+LS1zdGF0aXN0aWNzPC9vcHRpb24+LAogICAgICAgICAgICAgICA8b3B0aW9uPi0tc2lu
Z2xlLXRyYW5zYWN0aW9uPC9vcHRpb24+LCA8b3B0aW9uPi0tY2xlYW48L29wdGlvbj4sIG9yIDxv
cHRpb24+LS10cmFuc2FjdGlvbi1zaXplPC9vcHRpb24+LgogICAgICAgIDwvcGFyYT4KICAgICAg
IDwvbGlzdGl0ZW0+CkBAIC02MjQsNyArNjMyLDcgQEAgUG9zdGdyZVNRTCBkb2N1bWVudGF0aW9u
CiAgICAgICAgIHF1b3RlIHRoZSBwYXR0ZXJuIGlmIG5lZWRlZCB0byBwcmV2ZW50IHNoZWxsIHdp
bGRjYXJkIGV4cGFuc2lvbi4KICAgICAgICA8L3BhcmE+CiAgICAgICAgPHBhcmE+Ci0gICAgICAg
IFRoaXMgb3B0aW9uIGlzIG9ubHkgcmVsZXZhbnQgd2hlbiByZXN0b3JpbmcgZnJvbSBhbiBhcmNo
aXZlIG1hZGUgdXNpbmcgPGFwcGxpY2F0aW9uPnBnX2R1bXBhbGw8L2FwcGxpY2F0aW9uPi4KKyAg
ICAgICAgVGhpcyBvcHRpb24gaXMgb25seSByZWxldmFudCB3aGVuIHJlc3RvcmluZyBmcm9tIGEg
bm9uLXBsYWluLXRleHQgYXJjaGl2ZSBtYWRlIHVzaW5nIDxhcHBsaWNhdGlvbj5wZ19kdW1wYWxs
PC9hcHBsaWNhdGlvbj4uCiAgICAgICAgPC9wYXJhPgogICAgICAgPC9saXN0aXRlbT4KICAgICAg
PC92YXJsaXN0ZW50cnk+CkBAIC0xMjM0LDYgKzEyNDIsMTcgQEAgQ1JFQVRFIERBVEFCQVNFIGZv
byBXSVRIIFRFTVBMQVRFIHRlbXBsYXRlMDsKICAgIGluaXRpYWxseSBlbXB0eS4KICAgPC9wYXJh
PgogCisgIDxwYXJhPgorICBTdXBwb3NlIHdlIGhhdmUgdXNlZCA8YXBwbGljYXRpb24+cGdfZHVt
cGFsbDwvYXBwbGljYXRpb24+IG5vbi1wbGFpbi10ZXh0CisgIGZvcm1hdCBkdW1wZWQgYWxsIHRo
ZSBkYXRhYmFzZSBpbiBhIGNsdXN0ZXIgdG8gZGlyZWN0b3J5IDxsaXRlcmFsPmRiLmRpcjwvbGl0
ZXJhbD4sCisgIHVzZSA8YXBwbGljYXRpb24+cGdfcmVzdG9yZTwvYXBwbGljYXRpb24+IHRvIHJl
c3RvcmUgdGhlIGRhdGFiYXNlczoKKzxzY3JlZW4+Cis8cHJvbXB0PiQ8L3Byb21wdD4gPHVzZXJp
bnB1dD5wZ19yZXN0b3JlIGRiLmRpciAtZCBwb3N0Z3JlcyAtQzwvdXNlcmlucHV0PgorPC9zY3Jl
ZW4+CisgICBUaGlzIHdpbGwgcmVzdG9yZSBhbGwgZGF0YWJhc2VzLiAgVG8gcmVzdG9yZSBvbmx5
IHNvbWUgZGF0YWJhc2VzLCB1c2UKKyAgIHRoZSA8b3B0aW9uPi0tZXhjbHVkZS1kYXRhYmFzZTwv
b3B0aW9uPiBvcHRpb24gdG8gc2tpcCB0aG9zZSBub3Qgd2FudGVkLgorICA8L3BhcmE+CisKICAg
PHBhcmE+CiAgICBUbyByZW9yZGVyIGRhdGFiYXNlIGl0ZW1zLCBpdCBpcyBmaXJzdCBuZWNlc3Nh
cnkgdG8gZHVtcCB0aGUgdGFibGUgb2YKICAgIGNvbnRlbnRzIG9mIHRoZSBhcmNoaXZlOgpkaWZm
IC0tZ2l0IGEvc3JjL2Jpbi9wZ19kdW1wL3BnX3Jlc3RvcmUuYyBiL3NyYy9iaW4vcGdfZHVtcC9w
Z19yZXN0b3JlLmMKaW5kZXggYjM1MWIyOWQyZTQuLmYxOTdmZjgxZjIwIDEwMDY0NAotLS0gYS9z
cmMvYmluL3BnX2R1bXAvcGdfcmVzdG9yZS5jCisrKyBiL3NyYy9iaW4vcGdfZHVtcC9wZ19yZXN0
b3JlLmMKQEAgLTU2MiwxMiArNTYyLDE2IEBAIG1haW4oaW50IGFyZ2MsIGNoYXIgKiphcmd2KQog
CQkoZmlsZV9leGlzdHNfaW5fZGlyZWN0b3J5KGlucHV0RmlsZVNwZWMsICJ0b2MuZ2xvIikpKQog
CXsKIAkJY2hhcgkJZ2xvYmFsX3BhdGhbTUFYUEdQQVRIXTsKLQkJUmVzdG9yZU9wdGlvbnMgKnRt
cG9wdHMgPSAoUmVzdG9yZU9wdGlvbnMgKikgcGdfbWFsbG9jMChzaXplb2YoUmVzdG9yZU9wdGlv
bnMpKTsKKwkJUmVzdG9yZU9wdGlvbnMgKnRtcG9wdHMgPSBwZ19tYWxsb2MwX29iamVjdChSZXN0
b3JlT3B0aW9ucyk7CiAKIAkJb3B0cy0+Zm9ybWF0ID0gYXJjaFVua25vd247CiAKIAkJbWVtY3B5
KHRtcG9wdHMsIG9wdHMsIHNpemVvZihSZXN0b3JlT3B0aW9ucykpOwogCisJCWlmIChvcHRzLT5k
cm9wU2NoZW1hICYmICFpZl9leGlzdHMpCisJCQlwZ19mYXRhbCgib3B0aW9uICVzIG11c3QgYWxz
byBiZSBzcGVjaWZpZWQgaWYgb3B0aW9uICVzIGlzIHNwZWNpZmllZCB3aGVuIHJlc3RvcmluZyBh
biBhcmNoaXZlIGNyZWF0ZWQgYnkgcGdfZHVtcGFsbCIsCisJCQkJCSItLWlmLWV4aXN0cyIsICIt
Yy8tLWNsZWFuIik7CisKIAkJLyoKIAkJICogQ2FuIG9ubHkgdXNlIC0tbGlzdCBvciAtLXVzZS1s
aXN0IG9wdGlvbnMgd2l0aCBhIHNpbmdsZSBkYXRhYmFzZQogCQkgKiBkdW1wLgpAQCAtMTE4Miw4
ICsxMTg2LDggQEAgcmVzdG9yZV9hbGxfZGF0YWJhc2VzKGNvbnN0IGNoYXIgKmlucHV0RmlsZVNw
ZWMsCiAJaW50CQkJbl9lcnJvcnNfdG90YWwgPSAwOwogCWNoYXIJICAgKmNvbm5lY3RlZF9kYiA9
IE5VTEw7CiAJUEdjb25uCSAgICpjb25uID0gTlVMTDsKLQlSZXN0b3JlT3B0aW9ucyAqb3JpZ2lu
YWxfb3B0cyA9IChSZXN0b3JlT3B0aW9ucyAqKSBwZ19tYWxsb2MwKHNpemVvZihSZXN0b3JlT3B0
aW9ucykpOwotCVJlc3RvcmVPcHRpb25zICp0bXBvcHRzID0gKFJlc3RvcmVPcHRpb25zICopIHBn
X21hbGxvYzAoc2l6ZW9mKFJlc3RvcmVPcHRpb25zKSk7CisJUmVzdG9yZU9wdGlvbnMgKm9yaWdp
bmFsX29wdHMgPSBwZ19tYWxsb2MwX29iamVjdChSZXN0b3JlT3B0aW9ucyk7CisJUmVzdG9yZU9w
dGlvbnMgKnRtcG9wdHMgPSBwZ19tYWxsb2MwX29iamVjdChSZXN0b3JlT3B0aW9ucyk7CiAKIAlt
ZW1jcHkob3JpZ2luYWxfb3B0cywgb3B0cywgc2l6ZW9mKFJlc3RvcmVPcHRpb25zKSk7CiAKZGlm
ZiAtLWdpdCBhL3NyYy9iaW4vcGdfZHVtcC90LzAwN19wZ19kdW1wYWxsLnBsIGIvc3JjL2Jpbi9w
Z19kdW1wL3QvMDA3X3BnX2R1bXBhbGwucGwKaW5kZXggMzA5ZjQyYmVhYmIuLjg0ZTUzN2M5MTM2
IDEwMDY0NAotLS0gYS9zcmMvYmluL3BnX2R1bXAvdC8wMDdfcGdfZHVtcGFsbC5wbAorKysgYi9z
cmMvYmluL3BnX2R1bXAvdC8wMDdfcGdfZHVtcGFsbC5wbApAQCAtNDA5LDYgKzQwOSw3IEBAICRu
b2RlLT5jb21tYW5kX2ZhaWxzX2xpa2UoCiAJCSIkdGVtcGRpci9mb3JtYXRfY3VzdG9tIiwgJy1D
JywKIAkJJy0tZm9ybWF0JyA9PiAnY3VzdG9tJywKIAkJJy0tY2xlYW4nLAorCQknLS1pZi1leGlz
dHMnLAogCQknLS1nbG9iYWxzLW9ubHknLAogCQknLS1maWxlJyA9PiAiJHRlbXBkaXIvZXJyb3Jf
dGVzdC5zcWwiLAogCV0sCi0tIAoyLjM0LjEKCg==
--000000000000a71953064b4c1faa--