MIME-Version: 1.0
Content-Type: multipart/mixed;
 boundary="=_2a95e97444331dc0f71f974f6b80407c"
Content-Transfer-Encoding: 7bit
Date: Thu, 26 May 2022 14:16:37 +0900
From: Shinya Kato <Shinya11.Kato@oss.nttdata.com>
To: Michael Paquier <michael@paquier.xyz>
Cc: Kyotaro Horiguchi <horikyota.ntt@gmail.com>, nathandbossart@gmail.com,
 przemyslaw@sztoch.pl, david.g.johnston@gmail.com, robertmhaas@gmail.com,
 daniel@yesql.se, pgsql-hackers@postgresql.org
Subject: Re: Add --{no-,}bypassrls flags to createuser
In-Reply-To: <Yo2m7Oip47raXzfT@paquier.xyz>
References: <Yow+PeCg1bwi63ay@paquier.xyz>
 <0738cb3a8a52e850dd17a0065f2d8e5b@oss.nttdata.com>
 <20220524170910.GA1190535@nathanxps13>
 <20220525.110752.305692011781436338.horikyota.ntt@gmail.com>
 <Yo2m7Oip47raXzfT@paquier.xyz>
User-Agent: Roundcube Webmail/1.4.11
Message-ID: <6a25c0fec85c61c0bb93ab4819fdd619@oss.nttdata.com>
Archived-At: 
 <https://www.postgresql.org/message-id/6a25c0fec85c61c0bb93ab4819fdd619%40oss.nttdata.com>
Precedence: bulk

--=_2a95e97444331dc0f71f974f6b80407c
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset=US-ASCII;
 format=flowed

On 2022-05-25 12:47, Michael Paquier wrote:
> On Wed, May 25, 2022 at 11:07:52AM +0900, Kyotaro Horiguchi wrote:
>> I reproduced the same failure at my hand and identified the
>> cause. Windows' version of getopt_long seems to dislike that
>> non-optional parameters precedes options.
> 
> Tweaking the list of arguments in some commands kicked by the TAP
> tests to satisfy our implementation of getopt_long() has been the
> origin of a couple of portability fixes, like ffd3980.

Thanks! I fixed it.


On 2022-05-25 11:07, Kyotaro Horiguchi wrote:
> At Tue, 24 May 2022 10:09:10 -0700, Nathan Bossart
> <nathandbossart@gmail.com> wrote in
>> We're still missing some "fancier" string patterns in the tests, but 
>> we
>> might just be nitpicking at this point.
> 
> Such "fancier" strings should be properly handled by FmtId() and
> appendStringLiteralConn.  If this is a privilege escalating command,
> we should have ones but this is not.

Sorry, I didn't quite understand the "fancier" pattern. Is a string like 
this patch correct?


-- 
Regards,

--
Shinya Kato
Advanced Computing Technology Center
Research and Development Headquarters
NTT DATA CORPORATION
--=_2a95e97444331dc0f71f974f6b80407c
Content-Transfer-Encoding: base64
Content-Type: text/x-diff;
 name=v9-0001-Add-missing-options-to-createuser.patch
Content-Disposition: attachment;
 filename=v9-0001-Add-missing-options-to-createuser.patch;
 size=10851

ZGlmZiAtLWdpdCBhL2RvYy9zcmMvc2dtbC9yZWYvY3JlYXRldXNlci5zZ21sIGIvZG9jL3NyYy9z
Z21sL3JlZi9jcmVhdGV1c2VyLnNnbWwKaW5kZXggMTc1NzllNTBhZi4uMjdlZmViYmZlMiAxMDA2
NDQKLS0tIGEvZG9jL3NyYy9zZ21sL3JlZi9jcmVhdGV1c2VyLnNnbWwKKysrIGIvZG9jL3NyYy9z
Z21sL3JlZi9jcmVhdGV1c2VyLnNnbWwKQEAgLTc2LDYgKzc2LDIwIEBAIFBvc3RncmVTUUwgZG9j
dW1lbnRhdGlvbgogICAgICAgPC9saXN0aXRlbT4KICAgICAgPC92YXJsaXN0ZW50cnk+CiAKKyAg
ICAgPHZhcmxpc3RlbnRyeT4KKyAgICAgIDx0ZXJtPjxvcHRpb24+LWEgPHJlcGxhY2VhYmxlIGNs
YXNzPSJwYXJhbWV0ZXIiPnJvbGU8L3JlcGxhY2VhYmxlPjwvb3B0aW9uPjwvdGVybT4KKyAgICAg
IDx0ZXJtPjxvcHRpb24+LS1hZG1pbj08cmVwbGFjZWFibGUgY2xhc3M9InBhcmFtZXRlciI+cm9s
ZTwvcmVwbGFjZWFibGU+PC9vcHRpb24+PC90ZXJtPgorICAgICAgPGxpc3RpdGVtPgorICAgICAg
IDxwYXJhPgorICAgICAgICBJbmRpY2F0ZXMgcm9sZSB0aGF0IHdpbGwgYmUgaW1tZWRpYXRlbHkg
YWRkZWQgYXMgYSBtZW1iZXIgb2YgdGhlIG5ldworICAgICAgICByb2xlIHdpdGggYWRtaW4gb3B0
aW9uLCBnaXZpbmcgaXQgdGhlIHJpZ2h0IHRvIGdyYW50IG1lbWJlcnNoaXAgaW4gdGhlCisgICAg
ICAgIG5ldyByb2xlIHRvIG90aGVycy4gIE11bHRpcGxlIHJvbGVzIHRvIGFkZCBhcyBtZW1iZXJz
ICh3aXRoIGFkbWluCisgICAgICAgIG9wdGlvbikgb2YgdGhlIG5ldyByb2xlIGNhbiBiZSBzcGVj
aWZpZWQgYnkgd3JpdGluZyBtdWx0aXBsZQorICAgICAgICA8b3B0aW9uPi1hPC9vcHRpb24+IHN3
aXRjaGVzLgorICAgICAgIDwvcGFyYT4KKyAgICAgIDwvbGlzdGl0ZW0+CisgICAgIDwvdmFybGlz
dGVudHJ5PgorCiAgICAgIDx2YXJsaXN0ZW50cnk+CiAgICAgICA8dGVybT48b3B0aW9uPi1jIDxy
ZXBsYWNlYWJsZSBjbGFzcz0icGFyYW1ldGVyIj5udW1iZXI8L3JlcGxhY2VhYmxlPjwvb3B0aW9u
PjwvdGVybT4KICAgICAgIDx0ZXJtPjxvcHRpb24+LS1jb25uZWN0aW9uLWxpbWl0PTxyZXBsYWNl
YWJsZSBjbGFzcz0icGFyYW1ldGVyIj5udW1iZXI8L3JlcGxhY2VhYmxlPjwvb3B0aW9uPjwvdGVy
bT4KQEAgLTIwNCw2ICsyMTgsMTggQEAgUG9zdGdyZVNRTCBkb2N1bWVudGF0aW9uCiAgICAgICA8
L2xpc3RpdGVtPgogICAgICA8L3Zhcmxpc3RlbnRyeT4KIAorICAgICA8dmFybGlzdGVudHJ5Pgor
ICAgICAgPHRlcm0+PG9wdGlvbj4tbSA8cmVwbGFjZWFibGUgY2xhc3M9InBhcmFtZXRlciI+cm9s
ZTwvcmVwbGFjZWFibGU+PC9vcHRpb24+PC90ZXJtPgorICAgICAgPHRlcm0+PG9wdGlvbj4tLW1l
bWJlcj08cmVwbGFjZWFibGUgY2xhc3M9InBhcmFtZXRlciI+cm9sZTwvcmVwbGFjZWFibGU+PC9v
cHRpb24+PC90ZXJtPgorICAgICAgPGxpc3RpdGVtPgorICAgICAgIDxwYXJhPgorICAgICAgICBJ
bmRpY2F0ZXMgcm9sZSB0aGF0IHdpbGwgYmUgaW1tZWRpYXRlbHkgYWRkZWQgYXMgYSBtZW1iZXIg
b2YgdGhlIG5ldworICAgICAgICByb2xlLiAgTXVsdGlwbGUgcm9sZXMgdG8gYWRkIGFzIG1lbWJl
cnMgb2YgdGhlIG5ldyByb2xlIGNhbiBiZSBzcGVjaWZpZWQKKyAgICAgICAgYnkgd3JpdGluZyBt
dWx0aXBsZSA8b3B0aW9uPi1tPC9vcHRpb24+IHN3aXRjaGVzLgorICAgICAgIDwvcGFyYT4KKyAg
ICAgIDwvbGlzdGl0ZW0+CisgICAgIDwvdmFybGlzdGVudHJ5PgorCiAgICAgIDx2YXJsaXN0ZW50
cnk+CiAgICAgICA8dGVybT48b3B0aW9uPi1QPC9vcHRpb24+PC90ZXJtPgogICAgICAgPHRlcm0+
PG9wdGlvbj4tLXB3cHJvbXB0PC9vcHRpb24+PC90ZXJtPgpAQCAtMjU4LDYgKzI4NCwxNyBAQCBQ
b3N0Z3JlU1FMIGRvY3VtZW50YXRpb24KICAgICAgIDwvbGlzdGl0ZW0+CiAgICAgIDwvdmFybGlz
dGVudHJ5PgogCisgICAgIDx2YXJsaXN0ZW50cnk+CisgICAgICA8dGVybT48b3B0aW9uPi12IDxy
ZXBsYWNlYWJsZSBjbGFzcz0icGFyYW1ldGVyIj50aW1lc3RhbXA8L3JlcGxhY2VhYmxlPjwvb3B0
aW9uPjwvdGVybT4KKyAgICAgIDx0ZXJtPjxvcHRpb24+LS12YWxpZC11bnRpbD08cmVwbGFjZWFi
bGUgY2xhc3M9InBhcmFtZXRlciI+dGltZXN0YW1wPC9yZXBsYWNlYWJsZT48L29wdGlvbj48L3Rl
cm0+CisgICAgICA8bGlzdGl0ZW0+CisgICAgICAgPHBhcmE+CisgICAgICAgIFNldCBhIGRhdGUg
YW5kIHRpbWUgYWZ0ZXIgd2hpY2ggdGhlIHJvbGUncyBwYXNzd29yZCBpcyBubyBsb25nZXIgdmFs
aWQuCisgICAgICAgIFRoZSBkZWZhdWx0IGlzIHRvIHNldCBubyBwYXNzd29yZCBleHBpcnkgZGF0
ZS4KKyAgICAgICA8L3BhcmE+CisgICAgICA8L2xpc3RpdGVtPgorICAgICA8L3Zhcmxpc3RlbnRy
eT4KKwogICAgICA8dmFybGlzdGVudHJ5PgogICAgICAgIDx0ZXJtPjxvcHRpb24+LVY8L29wdGlv
bj48L3Rlcm0+CiAgICAgICAgPHRlcm0+PG9wdGlvbj4tLXZlcnNpb248L29wdGlvbj48L3Rlcm0+
CkBAIC0yOTAsNiArMzI3LDI1IEBAIFBvc3RncmVTUUwgZG9jdW1lbnRhdGlvbgogICAgICAgPC9s
aXN0aXRlbT4KICAgICAgPC92YXJsaXN0ZW50cnk+CiAKKyAgICAgPHZhcmxpc3RlbnRyeT4KKyAg
ICAgIDx0ZXJtPjxvcHRpb24+LS1ieXBhc3NybHM8L29wdGlvbj48L3Rlcm0+CisgICAgICA8bGlz
dGl0ZW0+CisgICAgICAgPHBhcmE+CisgICAgICAgIFRoZSBuZXcgdXNlciB3aWxsIGJ5cGFzcyBl
dmVyeSByb3ctbGV2ZWwgc2VjdXJpdHkgKFJMUykgcG9saWN5LgorICAgICAgIDwvcGFyYT4KKyAg
ICAgIDwvbGlzdGl0ZW0+CisgICAgIDwvdmFybGlzdGVudHJ5PgorCisgICAgIDx2YXJsaXN0ZW50
cnk+CisgICAgICA8dGVybT48b3B0aW9uPi0tbm8tYnlwYXNzcmxzPC9vcHRpb24+PC90ZXJtPgor
ICAgICAgPGxpc3RpdGVtPgorICAgICAgIDxwYXJhPgorICAgICAgICBUaGUgbmV3IHVzZXIgd2ls
bCBub3QgYnlwYXNzIHJvdy1sZXZlbCBzZWN1cml0eSAoUkxTKSBwb2xpY2llcy4gIFRoaXMgaXMK
KyAgICAgICAgdGhlIGRlZmF1bHQuCisgICAgICAgPC9wYXJhPgorICAgICAgPC9saXN0aXRlbT4K
KyAgICAgPC92YXJsaXN0ZW50cnk+CisKICAgICAgPHZhcmxpc3RlbnRyeT4KICAgICAgICA8dGVy
bT48b3B0aW9uPi0/PC9vcHRpb24+PC90ZXJtPgogICAgICAgIDx0ZXJtPjxvcHRpb24+LS1oZWxw
PC9vcHRpb24+PC90ZXJtPgpkaWZmIC0tZ2l0IGEvc3JjL2Jpbi9zY3JpcHRzL2NyZWF0ZXVzZXIu
YyBiL3NyYy9iaW4vc2NyaXB0cy9jcmVhdGV1c2VyLmMKaW5kZXggYmZiYTBkMDlkMS4uN2UzZTYx
YTljOCAxMDA2NDQKLS0tIGEvc3JjL2Jpbi9zY3JpcHRzL2NyZWF0ZXVzZXIuYworKysgYi9zcmMv
YmluL3NjcmlwdHMvY3JlYXRldXNlci5jCkBAIC01MSw2ICs1MSwxMSBAQCBtYWluKGludCBhcmdj
LCBjaGFyICphcmd2W10pCiAJCXsiY29ubmVjdGlvbi1saW1pdCIsIHJlcXVpcmVkX2FyZ3VtZW50
LCBOVUxMLCAnYyd9LAogCQl7InB3cHJvbXB0Iiwgbm9fYXJndW1lbnQsIE5VTEwsICdQJ30sCiAJ
CXsiZW5jcnlwdGVkIiwgbm9fYXJndW1lbnQsIE5VTEwsICdFJ30sCisJCXsiYnlwYXNzcmxzIiwg
bm9fYXJndW1lbnQsIE5VTEwsIDR9LAorCQl7Im5vLWJ5cGFzc3JscyIsIG5vX2FyZ3VtZW50LCBO
VUxMLCA1fSwKKwkJeyJ2YWxpZC11bnRpbCIsIHJlcXVpcmVkX2FyZ3VtZW50LCBOVUxMLCAndid9
LAorCQl7Im1lbWJlciIsIHJlcXVpcmVkX2FyZ3VtZW50LCBOVUxMLCAnbSd9LAorCQl7ImFkbWlu
IiwgcmVxdWlyZWRfYXJndW1lbnQsIE5VTEwsICdhJ30sCiAJCXtOVUxMLCAwLCBOVUxMLCAwfQog
CX07CiAKQEAgLTYyLDYgKzY3LDggQEAgbWFpbihpbnQgYXJnYywgY2hhciAqYXJndltdKQogCWNo
YXIJICAgKnBvcnQgPSBOVUxMOwogCWNoYXIJICAgKnVzZXJuYW1lID0gTlVMTDsKIAlTaW1wbGVT
dHJpbmdMaXN0IHJvbGVzID0ge05VTEwsIE5VTEx9OworCVNpbXBsZVN0cmluZ0xpc3QgbWVtYmVy
cyA9IHtOVUxMLCBOVUxMfTsKKwlTaW1wbGVTdHJpbmdMaXN0IGFkbWlucyA9IHtOVUxMLCBOVUxM
fTsKIAllbnVtIHRyaXZhbHVlIHByb21wdF9wYXNzd29yZCA9IFRSSV9ERUZBVUxUOwogCUNvbm5Q
YXJhbXMJY3BhcmFtczsKIAlib29sCQllY2hvID0gZmFsc2U7CkBAIC02OSw2ICs3Niw3IEBAIG1h
aW4oaW50IGFyZ2MsIGNoYXIgKmFyZ3ZbXSkKIAlpbnQJCQljb25uX2xpbWl0ID0gLTI7CS8qIGxl
c3MgdGhhbiBtaW5pbXVtIHZhbGlkIHZhbHVlICovCiAJYm9vbAkJcHdwcm9tcHQgPSBmYWxzZTsK
IAljaGFyCSAgICpuZXdwYXNzd29yZCA9IE5VTEw7CisJY2hhcgkgICAqcHdleHBpcnkgPSBOVUxM
OwogCiAJLyogVHJpLXZhbHVlZCB2YXJpYWJsZXMuICAqLwogCWVudW0gdHJpdmFsdWUgY3JlYXRl
ZGIgPSBUUklfREVGQVVMVCwKQEAgLTc2LDcgKzg0LDggQEAgbWFpbihpbnQgYXJnYywgY2hhciAq
YXJndltdKQogCQkJCWNyZWF0ZXJvbGUgPSBUUklfREVGQVVMVCwKIAkJCQlpbmhlcml0ID0gVFJJ
X0RFRkFVTFQsCiAJCQkJbG9naW4gPSBUUklfREVGQVVMVCwKLQkJCQlyZXBsaWNhdGlvbiA9IFRS
SV9ERUZBVUxUOworCQkJCXJlcGxpY2F0aW9uID0gVFJJX0RFRkFVTFQsCisJCQkJYnlwYXNzcmxz
ID0gVFJJX0RFRkFVTFQ7CiAKIAlQUUV4cEJ1ZmZlckRhdGEgc3FsOwogCkBAIC04OSw3ICs5OCw3
IEBAIG1haW4oaW50IGFyZ2MsIGNoYXIgKmFyZ3ZbXSkKIAogCWhhbmRsZV9oZWxwX3ZlcnNpb25f
b3B0cyhhcmdjLCBhcmd2LCAiY3JlYXRldXNlciIsIGhlbHApOwogCi0Jd2hpbGUgKChjID0gZ2V0
b3B0X2xvbmcoYXJnYywgYXJndiwgImg6cDpVOmc6d1dlZERzU3JSaUlsTGM6UEUiLAorCXdoaWxl
ICgoYyA9IGdldG9wdF9sb25nKGFyZ2MsIGFyZ3YsICJoOnA6VTpnOndXZWREc1NyUmlJbExjOlBF
djptOmE6IiwKIAkJCQkJCQlsb25nX29wdGlvbnMsICZvcHRpbmRleCkpICE9IC0xKQogCXsKIAkJ
c3dpdGNoIChjKQpAQCAtMTY1LDYgKzE3NCwyMSBAQCBtYWluKGludCBhcmdjLCBjaGFyICphcmd2
W10pCiAJCQljYXNlIDM6CiAJCQkJaW50ZXJhY3RpdmUgPSB0cnVlOwogCQkJCWJyZWFrOworCQkJ
Y2FzZSA0OgorCQkJCWJ5cGFzc3JscyA9IFRSSV9ZRVM7CisJCQkJYnJlYWs7CisJCQljYXNlIDU6
CisJCQkJYnlwYXNzcmxzID0gVFJJX05POworCQkJCWJyZWFrOworCQkJY2FzZSAndic6CisJCQkJ
cHdleHBpcnkgPSBwZ19zdHJkdXAob3B0YXJnKTsKKwkJCQlicmVhazsKKwkJCWNhc2UgJ20nOgor
CQkJCXNpbXBsZV9zdHJpbmdfbGlzdF9hcHBlbmQoJm1lbWJlcnMsIG9wdGFyZyk7CisJCQkJYnJl
YWs7CisJCQljYXNlICdhJzoKKwkJCQlzaW1wbGVfc3RyaW5nX2xpc3RfYXBwZW5kKCZhZG1pbnMs
IG9wdGFyZyk7CisJCQkJYnJlYWs7CiAJCQlkZWZhdWx0OgogCQkJCS8qIGdldG9wdF9sb25nIGFs
cmVhZHkgZW1pdHRlZCBhIGNvbXBsYWludCAqLwogCQkJCXBnX2xvZ19lcnJvcl9oaW50KCJUcnkg
XCIlcyAtLWhlbHBcIiBmb3IgbW9yZSBpbmZvcm1hdGlvbi4iLCBwcm9nbmFtZSk7CkBAIC0zMDQs
OCArMzI4LDE3IEBAIG1haW4oaW50IGFyZ2MsIGNoYXIgKmFyZ3ZbXSkKIAkJYXBwZW5kUFFFeHBC
dWZmZXJTdHIoJnNxbCwgIiBSRVBMSUNBVElPTiIpOwogCWlmIChyZXBsaWNhdGlvbiA9PSBUUklf
Tk8pCiAJCWFwcGVuZFBRRXhwQnVmZmVyU3RyKCZzcWwsICIgTk9SRVBMSUNBVElPTiIpOworCWlm
IChieXBhc3NybHMgPT0gVFJJX1lFUykKKwkJYXBwZW5kUFFFeHBCdWZmZXJTdHIoJnNxbCwgIiBC
WVBBU1NSTFMiKTsKKwlpZiAoYnlwYXNzcmxzID09IFRSSV9OTykKKwkJYXBwZW5kUFFFeHBCdWZm
ZXJTdHIoJnNxbCwgIiBOT0JZUEFTU1JMUyIpOwogCWlmIChjb25uX2xpbWl0ID49IC0xKQogCQlh
cHBlbmRQUUV4cEJ1ZmZlcigmc3FsLCAiIENPTk5FQ1RJT04gTElNSVQgJWQiLCBjb25uX2xpbWl0
KTsKKwlpZiAocHdleHBpcnkgIT0gTlVMTCkKKwl7CisJCWFwcGVuZFBRRXhwQnVmZmVyU3RyKCZz
cWwsICIgVkFMSUQgVU5USUwgIik7CisJCWFwcGVuZFN0cmluZ0xpdGVyYWxDb25uKCZzcWwsIHB3
ZXhwaXJ5LCBjb25uKTsKKwl9CiAJaWYgKHJvbGVzLmhlYWQgIT0gTlVMTCkKIAl7CiAJCVNpbXBs
ZVN0cmluZ0xpc3RDZWxsICpjZWxsOwpAQCAtMzIwLDYgKzM1MywzNSBAQCBtYWluKGludCBhcmdj
LCBjaGFyICphcmd2W10pCiAJCQkJYXBwZW5kUFFFeHBCdWZmZXJTdHIoJnNxbCwgZm10SWQoY2Vs
bC0+dmFsKSk7CiAJCX0KIAl9CisJaWYgKG1lbWJlcnMuaGVhZCAhPSBOVUxMKQorCXsKKwkJU2lt
cGxlU3RyaW5nTGlzdENlbGwgKmNlbGw7CisKKwkJYXBwZW5kUFFFeHBCdWZmZXJTdHIoJnNxbCwg
IiBST0xFICIpOworCisJCWZvciAoY2VsbCA9IG1lbWJlcnMuaGVhZDsgY2VsbDsgY2VsbCA9IGNl
bGwtPm5leHQpCisJCXsKKwkJCWlmIChjZWxsLT5uZXh0KQorCQkJCWFwcGVuZFBRRXhwQnVmZmVy
KCZzcWwsICIlcywiLCBmbXRJZChjZWxsLT52YWwpKTsKKwkJCWVsc2UKKwkJCQlhcHBlbmRQUUV4
cEJ1ZmZlclN0cigmc3FsLCBmbXRJZChjZWxsLT52YWwpKTsKKwkJfQorCX0KKwlpZiAoYWRtaW5z
LmhlYWQgIT0gTlVMTCkKKwl7CisJCVNpbXBsZVN0cmluZ0xpc3RDZWxsICpjZWxsOworCisJCWFw
cGVuZFBRRXhwQnVmZmVyU3RyKCZzcWwsICIgQURNSU4gIik7CisKKwkJZm9yIChjZWxsID0gYWRt
aW5zLmhlYWQ7IGNlbGw7IGNlbGwgPSBjZWxsLT5uZXh0KQorCQl7CisJCQlpZiAoY2VsbC0+bmV4
dCkKKwkJCQlhcHBlbmRQUUV4cEJ1ZmZlcigmc3FsLCAiJXMsIiwgZm10SWQoY2VsbC0+dmFsKSk7
CisJCQllbHNlCisJCQkJYXBwZW5kUFFFeHBCdWZmZXJTdHIoJnNxbCwgZm10SWQoY2VsbC0+dmFs
KSk7CisJCX0KKwl9CisKIAlhcHBlbmRQUUV4cEJ1ZmZlckNoYXIoJnNxbCwgJzsnKTsKIAogCWlm
IChlY2hvKQpAQCAtMzQ2LDYgKzQwOCw4IEBAIGhlbHAoY29uc3QgY2hhciAqcHJvZ25hbWUpCiAJ
cHJpbnRmKF8oIlVzYWdlOlxuIikpOwogCXByaW50ZihfKCIgICVzIFtPUFRJT05dLi4uIFtST0xF
TkFNRV1cbiIpLCBwcm9nbmFtZSk7CiAJcHJpbnRmKF8oIlxuT3B0aW9uczpcbiIpKTsKKwlwcmlu
dGYoXygiICAtYSwgLS1hZG1pbj1ST0xFICAgICAgICAgIHRoaXMgcm9sZSB3aWxsIGJlIGEgbWVt
YmVyIG9mIG5ldyByb2xlIHdpdGggYWRtaW5cbiIKKwkJCSAiICAgICAgICAgICAgICAgICAgICAg
ICAgICAgIG9wdGlvblxuIikpOwogCXByaW50ZihfKCIgIC1jLCAtLWNvbm5lY3Rpb24tbGltaXQ9
TiAgY29ubmVjdGlvbiBsaW1pdCBmb3Igcm9sZSAoZGVmYXVsdDogbm8gbGltaXQpXG4iKSk7CiAJ
cHJpbnRmKF8oIiAgLWQsIC0tY3JlYXRlZGIgICAgICAgICAgICByb2xlIGNhbiBjcmVhdGUgbmV3
IGRhdGFiYXNlc1xuIikpOwogCXByaW50ZihfKCIgIC1ELCAtLW5vLWNyZWF0ZWRiICAgICAgICAg
cm9sZSBjYW5ub3QgY3JlYXRlIGRhdGFiYXNlcyAoZGVmYXVsdClcbiIpKTsKQEAgLTM1NiwxNiAr
NDIwLDIwIEBAIGhlbHAoY29uc3QgY2hhciAqcHJvZ25hbWUpCiAJcHJpbnRmKF8oIiAgLUksIC0t
bm8taW5oZXJpdCAgICAgICAgICByb2xlIGRvZXMgbm90IGluaGVyaXQgcHJpdmlsZWdlc1xuIikp
OwogCXByaW50ZihfKCIgIC1sLCAtLWxvZ2luICAgICAgICAgICAgICAgcm9sZSBjYW4gbG9naW4g
KGRlZmF1bHQpXG4iKSk7CiAJcHJpbnRmKF8oIiAgLUwsIC0tbm8tbG9naW4gICAgICAgICAgICBy
b2xlIGNhbm5vdCBsb2dpblxuIikpOworCXByaW50ZihfKCIgIC1tLCAtLW1lbWJlcj1ST0xFICAg
ICAgICAgdGhpcyByb2xlIHdpbGwgYmUgYSBtZW1iZXIgb2YgbmV3IHJvbGVcbiIpKTsKIAlwcmlu
dGYoXygiICAtUCwgLS1wd3Byb21wdCAgICAgICAgICAgIGFzc2lnbiBhIHBhc3N3b3JkIHRvIG5l
dyByb2xlXG4iKSk7CiAJcHJpbnRmKF8oIiAgLXIsIC0tY3JlYXRlcm9sZSAgICAgICAgICByb2xl
IGNhbiBjcmVhdGUgbmV3IHJvbGVzXG4iKSk7CiAJcHJpbnRmKF8oIiAgLVIsIC0tbm8tY3JlYXRl
cm9sZSAgICAgICByb2xlIGNhbm5vdCBjcmVhdGUgcm9sZXMgKGRlZmF1bHQpXG4iKSk7CiAJcHJp
bnRmKF8oIiAgLXMsIC0tc3VwZXJ1c2VyICAgICAgICAgICByb2xlIHdpbGwgYmUgc3VwZXJ1c2Vy
XG4iKSk7CiAJcHJpbnRmKF8oIiAgLVMsIC0tbm8tc3VwZXJ1c2VyICAgICAgICByb2xlIHdpbGwg
bm90IGJlIHN1cGVydXNlciAoZGVmYXVsdClcbiIpKTsKKwlwcmludGYoXygiICAtdiwgLS12YWxp
ZC11bnRpbCAgICAgICAgIHBhc3N3b3JkIGV4cGlyYXRpb24gZGF0ZSBmb3Igcm9sZVxuIikpOwog
CXByaW50ZihfKCIgIC1WLCAtLXZlcnNpb24gICAgICAgICAgICAgb3V0cHV0IHZlcnNpb24gaW5m
b3JtYXRpb24sIHRoZW4gZXhpdFxuIikpOwogCXByaW50ZihfKCIgIC0taW50ZXJhY3RpdmUgICAg
ICAgICAgICAgcHJvbXB0IGZvciBtaXNzaW5nIHJvbGUgbmFtZSBhbmQgYXR0cmlidXRlcyByYXRo
ZXJcbiIKIAkJCSAiICAgICAgICAgICAgICAgICAgICAgICAgICAgIHRoYW4gdXNpbmcgZGVmYXVs
dHNcbiIpKTsKIAlwcmludGYoXygiICAtLXJlcGxpY2F0aW9uICAgICAgICAgICAgIHJvbGUgY2Fu
IGluaXRpYXRlIHJlcGxpY2F0aW9uXG4iKSk7CiAJcHJpbnRmKF8oIiAgLS1uby1yZXBsaWNhdGlv
biAgICAgICAgICByb2xlIGNhbm5vdCBpbml0aWF0ZSByZXBsaWNhdGlvblxuIikpOworCXByaW50
ZihfKCIgIC0tYnlwYXNzcmxzICAgICAgICAgICAgICAgcm9sZSBjYW4gYnlwYXNzIHJvdy1sZXZl
bCBzZWN1cml0eSAoUkxTKSBwb2xpY3lcbiIpKTsKKwlwcmludGYoXygiICAtLW5vLWJ5cGFzc3Js
cyAgICAgICAgICAgIHJvbGUgY2Fubm90IGJ5cGFzcyByb3ctbGV2ZWwgc2VjdXJpdHkgKFJMUykg
cG9saWN5XG4iKSk7CiAJcHJpbnRmKF8oIiAgLT8sIC0taGVscCAgICAgICAgICAgICAgICBzaG93
IHRoaXMgaGVscCwgdGhlbiBleGl0XG4iKSk7CiAJcHJpbnRmKF8oIlxuQ29ubmVjdGlvbiBvcHRp
b25zOlxuIikpOwogCXByaW50ZihfKCIgIC1oLCAtLWhvc3Q9SE9TVE5BTUUgICAgICAgZGF0YWJh
c2Ugc2VydmVyIGhvc3Qgb3Igc29ja2V0IGRpcmVjdG9yeVxuIikpOwpkaWZmIC0tZ2l0IGEvc3Jj
L2Jpbi9zY3JpcHRzL3QvMDQwX2NyZWF0ZXVzZXIucGwgYi9zcmMvYmluL3NjcmlwdHMvdC8wNDBf
Y3JlYXRldXNlci5wbAppbmRleCAyYTM0YmU4MWNmLi40YTRkNTlkZDkwIDEwMDY0NAotLS0gYS9z
cmMvYmluL3NjcmlwdHMvdC8wNDBfY3JlYXRldXNlci5wbAorKysgYi9zcmMvYmluL3NjcmlwdHMv
dC8wNDBfY3JlYXRldXNlci5wbApAQCAtMzIsNiArMzIsMjYgQEAgJG5vZGUtPmlzc3Vlc19zcWxf
bGlrZSgKIAlbICdjcmVhdGV1c2VyJywgJy1zJywgJ3JlZ3Jlc3NfdXNlcjMnIF0sCiAJcXIvc3Rh
dGVtZW50OiBDUkVBVEUgUk9MRSByZWdyZXNzX3VzZXIzIFNVUEVSVVNFUiBDUkVBVEVEQiBDUkVB
VEVST0xFIElOSEVSSVQgTE9HSU47LywKIAknY3JlYXRlIGEgc3VwZXJ1c2VyJyk7Ciskbm9kZS0+
aXNzdWVzX3NxbF9saWtlKAorCVsgJ2NyZWF0ZXVzZXInLCAnLWEnLCAncmVncmVzc191c2VyMScs
ICctYScsICdyZWdyZXNzX3VzZXIyJywgJ3JlZ3Jlc3MgdXNlciAjNCddLAorCXFyL3N0YXRlbWVu
dDogQ1JFQVRFIFJPTEUgInJlZ3Jlc3MgdXNlciAjNCIgTk9TVVBFUlVTRVIgTk9DUkVBVEVEQiBO
T0NSRUFURVJPTEUgSU5IRVJJVCBMT0dJTiBBRE1JTiByZWdyZXNzX3VzZXIxLHJlZ3Jlc3NfdXNl
cjI7LywKKwknYWRkIGEgcm9sZSBhcyBhIG1lbWJlciB3aXRoIGFkbWluIG9wdGlvbiBvZiB0aGUg
bmV3bHkgY3JlYXRlZCByb2xlJyk7Ciskbm9kZS0+aXNzdWVzX3NxbF9saWtlKAorCVsgJ2NyZWF0
ZXVzZXInLCAnLW0nLCAncmVncmVzc191c2VyMycsICctbScsICdyZWdyZXNzIHVzZXIgIzQnLCAn
UkVHUkVTU19VU0VSNScgXSwKKwlxci9zdGF0ZW1lbnQ6IENSRUFURSBST0xFICJSRUdSRVNTX1VT
RVI1IiBOT1NVUEVSVVNFUiBOT0NSRUFURURCIE5PQ1JFQVRFUk9MRSBJTkhFUklUIExPR0lOIFJP
TEUgcmVncmVzc191c2VyMywicmVncmVzcyB1c2VyICM0IjsvLAorCSdhZGQgYSByb2xlIGFzIGEg
bWVtYmVyIG9mIHRoZSBuZXdseSBjcmVhdGVkIHJvbGUnKTsKKyRub2RlLT5pc3N1ZXNfc3FsX2xp
a2UoCisJWyAnY3JlYXRldXNlcicsICctdicsICcyMDI5MTIzMScsICdyZWdyZXNzX3VzZXI2JyBd
LAorCXFyL3N0YXRlbWVudDogQ1JFQVRFIFJPTEUgcmVncmVzc191c2VyNiBOT1NVUEVSVVNFUiBO
T0NSRUFURURCIE5PQ1JFQVRFUk9MRSBJTkhFUklUIExPR0lOIFZBTElEIFVOVElMIFwnMjAyOTEy
MzFcJzsvLAorCSdjcmVhdGUgYSByb2xlIHdpdGggYSBwYXNzd29yZCBleHBpcmF0aW9uIGRhdGUn
KTsKKyRub2RlLT5pc3N1ZXNfc3FsX2xpa2UoCisJWyAnY3JlYXRldXNlcicsICctLWJ5cGFzc3Js
cycsICdyZWdyZXNzX3VzZXI3JyBdLAorCXFyL3N0YXRlbWVudDogQ1JFQVRFIFJPTEUgcmVncmVz
c191c2VyNyBOT1NVUEVSVVNFUiBOT0NSRUFURURCIE5PQ1JFQVRFUk9MRSBJTkhFUklUIExPR0lO
IEJZUEFTU1JMUzsvLAorCSdjcmVhdGUgYSBCWVBBU1NSTFMgcm9sZScpOworJG5vZGUtPmlzc3Vl
c19zcWxfbGlrZSgKKwlbICdjcmVhdGV1c2VyJywgJy0tbm8tYnlwYXNzcmxzJywgJ3JlZ3Jlc3Nf
dXNlcjgnIF0sCisJcXIvc3RhdGVtZW50OiBDUkVBVEUgUk9MRSByZWdyZXNzX3VzZXI4IE5PU1VQ
RVJVU0VSIE5PQ1JFQVRFREIgTk9DUkVBVEVST0xFIElOSEVSSVQgTE9HSU4gTk9CWVBBU1NSTFM7
LywKKwknY3JlYXRlIGEgcm9sZSB3aXRob3V0IEJZUEFTU1JMUycpOwogCiAkbm9kZS0+Y29tbWFu
ZF9mYWlscyhbICdjcmVhdGV1c2VyJywgJ3JlZ3Jlc3NfdXNlcjEnIF0sCiAJJ2ZhaWxzIGlmIHJv
bGUgYWxyZWFkeSBleGlzdHMnKTsK
--=_2a95e97444331dc0f71f974f6b80407c--