Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nrV4e-0004k2-VC for pgsql-hackers@arkaria.postgresql.org; Thu, 19 May 2022 01:35:33 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.92) (envelope-from ) id 1nrV4d-0000dI-Jn for pgsql-hackers@arkaria.postgresql.org; Thu, 19 May 2022 01:35:31 +0000 Received: from makus.postgresql.org ([2001:4800:3e1:1::229]) by malur.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nrV4d-0000d8-16 for pgsql-hackers@lists.postgresql.org; Thu, 19 May 2022 01:35:31 +0000 Received: from oss.nttdata.com ([49.212.34.109]) by makus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nrV4Z-0002lc-Oy for pgsql-hackers@postgresql.org; Thu, 19 May 2022 01:35:30 +0000 Received: from oss.nttdata.com (localhost [127.0.0.1]) by oss.nttdata.com (Postfix) with ESMTPA id 370406053C; Thu, 19 May 2022 10:35:23 +0900 (JST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.6 at oss.nttdata.com MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=_8a333c47851ee7c015943ab6b16e9620" Content-Transfer-Encoding: 8bit Date: Thu, 19 May 2022 10:35:23 +0900 From: Shinya Kato To: =?UTF-8?Q?Przemys=C5=82aw_Sztoch?= Cc: Nathan Bossart , "David G. Johnston" , Robert Haas , Michael Paquier , Kyotaro Horiguchi , Daniel Gustafsson , pgsql-hackers@postgresql.org Subject: Re: Add --{no-,}bypassrls flags to createuser In-Reply-To: References: <850d0579cdad54a37fd777d6b11421ec@oss.nttdata.com> <20220415.153341.594036939490942414.horikyota.ntt@gmail.com> <20220419.105012.1677795152077894444.horikyota.ntt@gmail.com> <20220425201947.GA2935432@nathanxps13> User-Agent: Roundcube Webmail/1.4.11 Message-ID: <4975ec63b73cfe4034867e90edbe16f8@oss.nttdata.com> X-Sender: Shinya11.Kato@oss.nttdata.com List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Archived-At: Precedence: bulk --=_8a333c47851ee7c015943ab6b16e9620 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8; format=flowed Thanks for reviews and comments! On 2022-05-06 07:08, Przemysław Sztoch wrote: > Thanks for the new patch! Would you mind adding some tests for the new > options? I created a new patch to test the new options! However, not all option tests exist, so it may be necessary to consider whether to actually add this test. > Too bad there's no --comment parameter to do COMMENT ON ROLE name IS > 'Comment'; > > As you already make such changes in createuser, I would like to ask > for an additional --comment parameter > that will allow sysadmins to set a comment with additional information > about the new DB user. > psql is scary for some. :-) Since the createuser command is a wrapper for the CREATE ROLE command, I do not think it is appropriate to add options that the CREATE ROLE command does not have. -- Regards, -- Shinya Kato Advanced Computing Technology Center Research and Development Headquarters NTT DATA CORPORATION --=_8a333c47851ee7c015943ab6b16e9620 Content-Transfer-Encoding: base64 Content-Type: text/x-diff; name=v5-add-bypassrls-flag-to-createuser.patch Content-Disposition: attachment; filename=v5-add-bypassrls-flag-to-createuser.patch; size=10389 ZGlmZiAtLWdpdCBhL2RvYy9zcmMvc2dtbC9yZWYvY3JlYXRldXNlci5zZ21sIGIvZG9jL3NyYy9z Z21sL3JlZi9jcmVhdGV1c2VyLnNnbWwKaW5kZXggMTc1NzllNTBhZi4uMTg5Y2E1YmI2NyAxMDA2 NDQKLS0tIGEvZG9jL3NyYy9zZ21sL3JlZi9jcmVhdGV1c2VyLnNnbWwKKysrIGIvZG9jL3NyYy9z Z21sL3JlZi9jcmVhdGV1c2VyLnNnbWwKQEAgLTc2LDYgKzc2LDIwIEBAIFBvc3RncmVTUUwgZG9j dW1lbnRhdGlvbgogICAgICAgPC9saXN0aXRlbT4KICAgICAgPC92YXJsaXN0ZW50cnk+CiAKKyAg ICAgPHZhcmxpc3RlbnRyeT4KKyAgICAgIDx0ZXJtPjxvcHRpb24+LWEgPHJlcGxhY2VhYmxlIGNs YXNzPSJwYXJhbWV0ZXIiPnJvbGU8L3JlcGxhY2VhYmxlPjwvb3B0aW9uPjwvdGVybT4KKyAgICAg IDx0ZXJtPjxvcHRpb24+LS1hZG1pbj08cmVwbGFjZWFibGUgY2xhc3M9InBhcmFtZXRlciI+cm9s ZTwvcmVwbGFjZWFibGU+PC9vcHRpb24+PC90ZXJtPgorICAgICAgPGxpc3RpdGVtPgorICAgICAg IDxwYXJhPgorICAgICAgICAgVGhlIG5ldyByb2xlIHdpbGwgYmUgYWRkZWQgaW1tZWRpYXRlbHkg YXMgYSBtZW1iZXIgd2l0aCBhZG1pbiBvcHRpb24KKyAgICAgICAgIG9mIHRoaXMgcm9sZS4KKyAg ICAgICAgIE11bHRpcGxlIHJvbGVzIHRvIHdoaWNoIG5ldyByb2xlIHdpbGwgYmUgYWRkZWQgYXMg YSBtZW1iZXIgd2l0aCBhZG1pbgorICAgICAgICAgb3B0aW9uIGNhbiBiZSBzcGVjaWZpZWQgYnkg d3JpdGluZyBtdWx0aXBsZQorICAgICAgICAgPG9wdGlvbj4tYTwvb3B0aW9uPiBzd2l0Y2hlcy4K KyAgICAgICAgIDwvcGFyYT4KKyAgICAgIDwvbGlzdGl0ZW0+CisgICAgIDwvdmFybGlzdGVudHJ5 PgorCiAgICAgIDx2YXJsaXN0ZW50cnk+CiAgICAgICA8dGVybT48b3B0aW9uPi1jIDxyZXBsYWNl YWJsZSBjbGFzcz0icGFyYW1ldGVyIj5udW1iZXI8L3JlcGxhY2VhYmxlPjwvb3B0aW9uPjwvdGVy bT4KICAgICAgIDx0ZXJtPjxvcHRpb24+LS1jb25uZWN0aW9uLWxpbWl0PTxyZXBsYWNlYWJsZSBj bGFzcz0icGFyYW1ldGVyIj5udW1iZXI8L3JlcGxhY2VhYmxlPjwvb3B0aW9uPjwvdGVybT4KQEAg LTIwNCw2ICsyMTgsMTkgQEAgUG9zdGdyZVNRTCBkb2N1bWVudGF0aW9uCiAgICAgICA8L2xpc3Rp dGVtPgogICAgICA8L3Zhcmxpc3RlbnRyeT4KIAorICAgICA8dmFybGlzdGVudHJ5PgorICAgICAg PHRlcm0+PG9wdGlvbj4tbSA8cmVwbGFjZWFibGUgY2xhc3M9InBhcmFtZXRlciI+cm9sZTwvcmVw bGFjZWFibGU+PC9vcHRpb24+PC90ZXJtPgorICAgICAgPHRlcm0+PG9wdGlvbj4tLW1lbWJlcj08 cmVwbGFjZWFibGUgY2xhc3M9InBhcmFtZXRlciI+cm9sZTwvcmVwbGFjZWFibGU+PC9vcHRpb24+ PC90ZXJtPgorICAgICAgPGxpc3RpdGVtPgorICAgICAgIDxwYXJhPgorICAgICAgICAgVGhlIG5l dyByb2xlIHdpbGwgYmUgYWRkZWQgaW1tZWRpYXRlbHkgYXMgYSBtZW1iZXIgb2YgdGhpcyByb2xl LgorICAgICAgICAgTXVsdGlwbGUgcm9sZXMgdG8gd2hpY2ggbmV3IHJvbGUgd2lsbCBiZSBhZGRl ZCBhcyBhIG1lbWJlcgorICAgICAgICAgY2FuIGJlIHNwZWNpZmllZCBieSB3cml0aW5nIG11bHRp cGxlCisgICAgICAgICA8b3B0aW9uPi1tPC9vcHRpb24+IHN3aXRjaGVzLgorICAgICAgICAgPC9w YXJhPgorICAgICAgPC9saXN0aXRlbT4KKyAgICAgPC92YXJsaXN0ZW50cnk+CisKICAgICAgPHZh cmxpc3RlbnRyeT4KICAgICAgIDx0ZXJtPjxvcHRpb24+LVA8L29wdGlvbj48L3Rlcm0+CiAgICAg ICA8dGVybT48b3B0aW9uPi0tcHdwcm9tcHQ8L29wdGlvbj48L3Rlcm0+CkBAIC0yNTgsNiArMjg1 LDE3IEBAIFBvc3RncmVTUUwgZG9jdW1lbnRhdGlvbgogICAgICAgPC9saXN0aXRlbT4KICAgICAg PC92YXJsaXN0ZW50cnk+CiAKKyAgICAgPHZhcmxpc3RlbnRyeT4KKyAgICAgIDx0ZXJtPjxvcHRp b24+LXYgPHJlcGxhY2VhYmxlIGNsYXNzPSJwYXJhbWV0ZXIiPnRpbWVzdGFtcDwvcmVwbGFjZWFi bGU+PC9vcHRpb24+PC90ZXJtPgorICAgICAgPHRlcm0+PG9wdGlvbj4tLXZhbGlkLXVudGlsPTxy ZXBsYWNlYWJsZSBjbGFzcz0icGFyYW1ldGVyIj50aW1lc3RhbXA8L3JlcGxhY2VhYmxlPjwvb3B0 aW9uPjwvdGVybT4KKyAgICAgIDxsaXN0aXRlbT4KKyAgICAgICA8cGFyYT4KKyAgICAgICAgU2V0 IGEgdGltZXN0YW1wIGFmdGVyIHdoaWNoIHRoZSByb2xlJ3MgcGFzc3dvcmQgaXMgbm8gbG9uZ2Vy IHZhbGlkLgorICAgICAgICBUaGUgZGVmYXVsdCBpcyB0byBzZXQgbm8gZXhwaXJhdGlvbi4KKyAg ICAgICA8L3BhcmE+CisgICAgICA8L2xpc3RpdGVtPgorICAgICA8L3Zhcmxpc3RlbnRyeT4KKwog ICAgICA8dmFybGlzdGVudHJ5PgogICAgICAgIDx0ZXJtPjxvcHRpb24+LVY8L29wdGlvbj48L3Rl cm0+CiAgICAgICAgPHRlcm0+PG9wdGlvbj4tLXZlcnNpb248L29wdGlvbj48L3Rlcm0+CkBAIC0y OTAsNiArMzI4LDI4IEBAIFBvc3RncmVTUUwgZG9jdW1lbnRhdGlvbgogICAgICAgPC9saXN0aXRl bT4KICAgICAgPC92YXJsaXN0ZW50cnk+CiAKKyAgICAgPHZhcmxpc3RlbnRyeT4KKyAgICAgIDx0 ZXJtPjxvcHRpb24+LS1ieXBhc3NybHM8L29wdGlvbj48L3Rlcm0+CisgICAgICA8bGlzdGl0ZW0+ CisgICAgICAgPHBhcmE+CisgICAgICAgIFRoZSBuZXcgdXNlciB3aWxsIGhhdmUgdGhlIDxsaXRl cmFsPkJZUEFTU1JMUzwvbGl0ZXJhbD4gcHJpdmlsZWdlLAorICAgICAgICB3aGljaCBpcyBkZXNj cmliZWQgbW9yZSBmdWxseSBpbiB0aGUgZG9jdW1lbnRhdGlvbiBmb3IgPHhyZWYKKyAgICAgICAg bGlua2VuZD0ic3FsLWNyZWF0ZXJvbGUiLz4uCisgICAgICAgPC9wYXJhPgorICAgICAgPC9saXN0 aXRlbT4KKyAgICAgPC92YXJsaXN0ZW50cnk+CisKKyAgICAgPHZhcmxpc3RlbnRyeT4KKyAgICAg IDx0ZXJtPjxvcHRpb24+LS1uby1ieXBhc3NybHM8L29wdGlvbj48L3Rlcm0+CisgICAgICA8bGlz dGl0ZW0+CisgICAgICAgPHBhcmE+CisgICAgICAgIFRoZSBuZXcgdXNlciB3aWxsIG5vdCBoYXZl IHRoZSA8bGl0ZXJhbD5CWVBBU1NSTFM8L2xpdGVyYWw+CisgICAgICAgIHByaXZpbGVnZSwgd2hp Y2ggaXMgZGVzY3JpYmVkIG1vcmUgZnVsbHkgaW4gdGhlIGRvY3VtZW50YXRpb24gZm9yIDx4cmVm CisgICAgICAgIGxpbmtlbmQ9InNxbC1jcmVhdGVyb2xlIi8+LgorICAgICAgIDwvcGFyYT4KKyAg ICAgIDwvbGlzdGl0ZW0+CisgICAgIDwvdmFybGlzdGVudHJ5PgorCiAgICAgIDx2YXJsaXN0ZW50 cnk+CiAgICAgICAgPHRlcm0+PG9wdGlvbj4tPzwvb3B0aW9uPjwvdGVybT4KICAgICAgICA8dGVy bT48b3B0aW9uPi0taGVscDwvb3B0aW9uPjwvdGVybT4KZGlmZiAtLWdpdCBhL3NyYy9iaW4vc2Ny aXB0cy9jcmVhdGV1c2VyLmMgYi9zcmMvYmluL3NjcmlwdHMvY3JlYXRldXNlci5jCmluZGV4IGJm YmEwZDA5ZDEuLjczY2QxYjQ3OWUgMTAwNjQ0Ci0tLSBhL3NyYy9iaW4vc2NyaXB0cy9jcmVhdGV1 c2VyLmMKKysrIGIvc3JjL2Jpbi9zY3JpcHRzL2NyZWF0ZXVzZXIuYwpAQCAtNTEsNiArNTEsMTEg QEAgbWFpbihpbnQgYXJnYywgY2hhciAqYXJndltdKQogCQl7ImNvbm5lY3Rpb24tbGltaXQiLCBy ZXF1aXJlZF9hcmd1bWVudCwgTlVMTCwgJ2MnfSwKIAkJeyJwd3Byb21wdCIsIG5vX2FyZ3VtZW50 LCBOVUxMLCAnUCd9LAogCQl7ImVuY3J5cHRlZCIsIG5vX2FyZ3VtZW50LCBOVUxMLCAnRSd9LAor CQl7ImJ5cGFzc3JscyIsIG5vX2FyZ3VtZW50LCBOVUxMLCA0fSwKKwkJeyJuby1ieXBhc3NybHMi LCBub19hcmd1bWVudCwgTlVMTCwgNX0sCisJCXsidmFsaWQtdW50aWwiLCByZXF1aXJlZF9hcmd1 bWVudCwgTlVMTCwgJ3YnfSwKKwkJeyJtZW1iZXIiLCByZXF1aXJlZF9hcmd1bWVudCwgTlVMTCwg J20nfSwKKwkJeyJhZG1pbiIsIHJlcXVpcmVkX2FyZ3VtZW50LCBOVUxMLCAnYSd9LAogCQl7TlVM TCwgMCwgTlVMTCwgMH0KIAl9OwogCkBAIC02OSw2ICs3NCw5IEBAIG1haW4oaW50IGFyZ2MsIGNo YXIgKmFyZ3ZbXSkKIAlpbnQJCQljb25uX2xpbWl0ID0gLTI7CS8qIGxlc3MgdGhhbiBtaW5pbXVt IHZhbGlkIHZhbHVlICovCiAJYm9vbAkJcHdwcm9tcHQgPSBmYWxzZTsKIAljaGFyCSAgICpuZXdw YXNzd29yZCA9IE5VTEw7CisJU2ltcGxlU3RyaW5nTGlzdCBtZW1iZXJzID0ge05VTEwsIE5VTEx9 OworCVNpbXBsZVN0cmluZ0xpc3QgYWRtaW5zID0ge05VTEwsIE5VTEx9OworCWNoYXIJICAgKnRp bWVzdGFtcCA9IE5VTEw7CiAKIAkvKiBUcmktdmFsdWVkIHZhcmlhYmxlcy4gICovCiAJZW51bSB0 cml2YWx1ZSBjcmVhdGVkYiA9IFRSSV9ERUZBVUxULApAQCAtNzYsNyArODQsOCBAQCBtYWluKGlu dCBhcmdjLCBjaGFyICphcmd2W10pCiAJCQkJY3JlYXRlcm9sZSA9IFRSSV9ERUZBVUxULAogCQkJ CWluaGVyaXQgPSBUUklfREVGQVVMVCwKIAkJCQlsb2dpbiA9IFRSSV9ERUZBVUxULAotCQkJCXJl cGxpY2F0aW9uID0gVFJJX0RFRkFVTFQ7CisJCQkJcmVwbGljYXRpb24gPSBUUklfREVGQVVMVCwK KwkJCQlieXBhc3NybHMgPSBUUklfREVGQVVMVDsKIAogCVBRRXhwQnVmZmVyRGF0YSBzcWw7CiAK QEAgLTg5LDcgKzk4LDcgQEAgbWFpbihpbnQgYXJnYywgY2hhciAqYXJndltdKQogCiAJaGFuZGxl X2hlbHBfdmVyc2lvbl9vcHRzKGFyZ2MsIGFyZ3YsICJjcmVhdGV1c2VyIiwgaGVscCk7CiAKLQl3 aGlsZSAoKGMgPSBnZXRvcHRfbG9uZyhhcmdjLCBhcmd2LCAiaDpwOlU6Zzp3V2VkRHNTclJpSWxM YzpQRSIsCisJd2hpbGUgKChjID0gZ2V0b3B0X2xvbmcoYXJnYywgYXJndiwgImg6cDpVOmc6d1dl ZERzU3JSaUlsTGM6UEV2Om06YToiLAogCQkJCQkJCWxvbmdfb3B0aW9ucywgJm9wdGluZGV4KSkg IT0gLTEpCiAJewogCQlzd2l0Y2ggKGMpCkBAIC0xNjUsNiArMTc0LDIxIEBAIG1haW4oaW50IGFy Z2MsIGNoYXIgKmFyZ3ZbXSkKIAkJCWNhc2UgMzoKIAkJCQlpbnRlcmFjdGl2ZSA9IHRydWU7CiAJ CQkJYnJlYWs7CisJCQljYXNlIDQ6CisJCQkJYnlwYXNzcmxzID0gVFJJX1lFUzsKKwkJCQlicmVh azsKKwkJCWNhc2UgNToKKwkJCQlieXBhc3NybHMgPSBUUklfTk87CisJCQkJYnJlYWs7CisJCQlj YXNlICd2JzoKKwkJCQl0aW1lc3RhbXAgPSBwZ19zdHJkdXAob3B0YXJnKTsKKwkJCQlicmVhazsK KwkJCWNhc2UgJ20nOgorCQkJCXNpbXBsZV9zdHJpbmdfbGlzdF9hcHBlbmQoJm1lbWJlcnMsIG9w dGFyZyk7CisJCQkJYnJlYWs7CisJCQljYXNlICdhJzoKKwkJCQlzaW1wbGVfc3RyaW5nX2xpc3Rf YXBwZW5kKCZhZG1pbnMsIG9wdGFyZyk7CisJCQkJYnJlYWs7CiAJCQlkZWZhdWx0OgogCQkJCS8q IGdldG9wdF9sb25nIGFscmVhZHkgZW1pdHRlZCBhIGNvbXBsYWludCAqLwogCQkJCXBnX2xvZ19l cnJvcl9oaW50KCJUcnkgXCIlcyAtLWhlbHBcIiBmb3IgbW9yZSBpbmZvcm1hdGlvbi4iLCBwcm9n bmFtZSk7CkBAIC0zMDQsOCArMzI4LDE0IEBAIG1haW4oaW50IGFyZ2MsIGNoYXIgKmFyZ3ZbXSkK IAkJYXBwZW5kUFFFeHBCdWZmZXJTdHIoJnNxbCwgIiBSRVBMSUNBVElPTiIpOwogCWlmIChyZXBs aWNhdGlvbiA9PSBUUklfTk8pCiAJCWFwcGVuZFBRRXhwQnVmZmVyU3RyKCZzcWwsICIgTk9SRVBM SUNBVElPTiIpOworCWlmIChieXBhc3NybHMgPT0gVFJJX1lFUykKKwkJYXBwZW5kUFFFeHBCdWZm ZXJTdHIoJnNxbCwgIiBCWVBBU1NSTFMiKTsKKwlpZiAoYnlwYXNzcmxzID09IFRSSV9OTykKKwkJ YXBwZW5kUFFFeHBCdWZmZXJTdHIoJnNxbCwgIiBOT0JZUEFTU1JMUyIpOwogCWlmIChjb25uX2xp bWl0ID49IC0xKQogCQlhcHBlbmRQUUV4cEJ1ZmZlcigmc3FsLCAiIENPTk5FQ1RJT04gTElNSVQg JWQiLCBjb25uX2xpbWl0KTsKKwlpZiAodGltZXN0YW1wICE9IE5VTEwpCisJCWFwcGVuZFBRRXhw QnVmZmVyKCZzcWwsICIgVkFMSUQgVU5USUwgJyVzJyIsIHRpbWVzdGFtcCk7CiAJaWYgKHJvbGVz LmhlYWQgIT0gTlVMTCkKIAl7CiAJCVNpbXBsZVN0cmluZ0xpc3RDZWxsICpjZWxsOwpAQCAtMzIw LDYgKzM1MCwzNSBAQCBtYWluKGludCBhcmdjLCBjaGFyICphcmd2W10pCiAJCQkJYXBwZW5kUFFF eHBCdWZmZXJTdHIoJnNxbCwgZm10SWQoY2VsbC0+dmFsKSk7CiAJCX0KIAl9CisJaWYgKG1lbWJl cnMuaGVhZCAhPSBOVUxMKQorCXsKKwkJU2ltcGxlU3RyaW5nTGlzdENlbGwgKmNlbGw7CisKKwkJ YXBwZW5kUFFFeHBCdWZmZXJTdHIoJnNxbCwgIiBST0xFICIpOworCisJCWZvciAoY2VsbCA9IG1l bWJlcnMuaGVhZDsgY2VsbDsgY2VsbCA9IGNlbGwtPm5leHQpCisJCXsKKwkJCWlmIChjZWxsLT5u ZXh0KQorCQkJCWFwcGVuZFBRRXhwQnVmZmVyKCZzcWwsICIlcywiLCBmbXRJZChjZWxsLT52YWwp KTsKKwkJCWVsc2UKKwkJCQlhcHBlbmRQUUV4cEJ1ZmZlclN0cigmc3FsLCBmbXRJZChjZWxsLT52 YWwpKTsKKwkJfQorCX0KKwlpZiAoYWRtaW5zLmhlYWQgIT0gTlVMTCkKKwl7CisJCVNpbXBsZVN0 cmluZ0xpc3RDZWxsICpjZWxsOworCisJCWFwcGVuZFBRRXhwQnVmZmVyU3RyKCZzcWwsICIgQURN SU4gIik7CisKKwkJZm9yIChjZWxsID0gYWRtaW5zLmhlYWQ7IGNlbGw7IGNlbGwgPSBjZWxsLT5u ZXh0KQorCQl7CisJCQlpZiAoY2VsbC0+bmV4dCkKKwkJCQlhcHBlbmRQUUV4cEJ1ZmZlcigmc3Fs LCAiJXMsIiwgZm10SWQoY2VsbC0+dmFsKSk7CisJCQllbHNlCisJCQkJYXBwZW5kUFFFeHBCdWZm ZXJTdHIoJnNxbCwgZm10SWQoY2VsbC0+dmFsKSk7CisJCX0KKwl9CisKIAlhcHBlbmRQUUV4cEJ1 ZmZlckNoYXIoJnNxbCwgJzsnKTsKIAogCWlmIChlY2hvKQpAQCAtMzQ2LDYgKzQwNSw4IEBAIGhl bHAoY29uc3QgY2hhciAqcHJvZ25hbWUpCiAJcHJpbnRmKF8oIlVzYWdlOlxuIikpOwogCXByaW50 ZihfKCIgICVzIFtPUFRJT05dLi4uIFtST0xFTkFNRV1cbiIpLCBwcm9nbmFtZSk7CiAJcHJpbnRm KF8oIlxuT3B0aW9uczpcbiIpKTsKKwlwcmludGYoXygiICAtYSwgLS1hZG1pbj1ST0xFICAgICAg ICAgIHRoaXMgcm9sZSB3aWxsIGJlIGEgbWVtYmVyIG9mIG5ldyByb2xlXG4iCisJCQkgIiAgICAg ICAgICAgICAgICAgICAgICAgICAgICB3aXRoIGFkbWluIG9wdGlvblxuIikpOwogCXByaW50Zihf KCIgIC1jLCAtLWNvbm5lY3Rpb24tbGltaXQ9TiAgY29ubmVjdGlvbiBsaW1pdCBmb3Igcm9sZSAo ZGVmYXVsdDogbm8gbGltaXQpXG4iKSk7CiAJcHJpbnRmKF8oIiAgLWQsIC0tY3JlYXRlZGIgICAg ICAgICAgICByb2xlIGNhbiBjcmVhdGUgbmV3IGRhdGFiYXNlc1xuIikpOwogCXByaW50ZihfKCIg IC1ELCAtLW5vLWNyZWF0ZWRiICAgICAgICAgcm9sZSBjYW5ub3QgY3JlYXRlIGRhdGFiYXNlcyAo ZGVmYXVsdClcbiIpKTsKQEAgLTM1NiwxNiArNDE3LDIwIEBAIGhlbHAoY29uc3QgY2hhciAqcHJv Z25hbWUpCiAJcHJpbnRmKF8oIiAgLUksIC0tbm8taW5oZXJpdCAgICAgICAgICByb2xlIGRvZXMg bm90IGluaGVyaXQgcHJpdmlsZWdlc1xuIikpOwogCXByaW50ZihfKCIgIC1sLCAtLWxvZ2luICAg ICAgICAgICAgICAgcm9sZSBjYW4gbG9naW4gKGRlZmF1bHQpXG4iKSk7CiAJcHJpbnRmKF8oIiAg LUwsIC0tbm8tbG9naW4gICAgICAgICAgICByb2xlIGNhbm5vdCBsb2dpblxuIikpOworCXByaW50 ZihfKCIgIC1tLCAtLW1lbWJlcj1ST0xFICAgICAgICAgdGhpcyByb2xlIHdpbGwgYmUgYSBtZW1i ZXIgb2YgbmV3IHJvbGVcbiIpKTsKIAlwcmludGYoXygiICAtUCwgLS1wd3Byb21wdCAgICAgICAg ICAgIGFzc2lnbiBhIHBhc3N3b3JkIHRvIG5ldyByb2xlXG4iKSk7CiAJcHJpbnRmKF8oIiAgLXIs IC0tY3JlYXRlcm9sZSAgICAgICAgICByb2xlIGNhbiBjcmVhdGUgbmV3IHJvbGVzXG4iKSk7CiAJ cHJpbnRmKF8oIiAgLVIsIC0tbm8tY3JlYXRlcm9sZSAgICAgICByb2xlIGNhbm5vdCBjcmVhdGUg cm9sZXMgKGRlZmF1bHQpXG4iKSk7CiAJcHJpbnRmKF8oIiAgLXMsIC0tc3VwZXJ1c2VyICAgICAg ICAgICByb2xlIHdpbGwgYmUgc3VwZXJ1c2VyXG4iKSk7CiAJcHJpbnRmKF8oIiAgLVMsIC0tbm8t c3VwZXJ1c2VyICAgICAgICByb2xlIHdpbGwgbm90IGJlIHN1cGVydXNlciAoZGVmYXVsdClcbiIp KTsKKwlwcmludGYoXygiICAtdiwgLS12YWxpZC11bnRpbCAgICAgICAgIHBhc3N3b3JkIGV4cGly YXRpb24gdGltZXN0YW1wIGZvciByb2xlXG4iKSk7CiAJcHJpbnRmKF8oIiAgLVYsIC0tdmVyc2lv biAgICAgICAgICAgICBvdXRwdXQgdmVyc2lvbiBpbmZvcm1hdGlvbiwgdGhlbiBleGl0XG4iKSk7 CiAJcHJpbnRmKF8oIiAgLS1pbnRlcmFjdGl2ZSAgICAgICAgICAgICBwcm9tcHQgZm9yIG1pc3Np bmcgcm9sZSBuYW1lIGFuZCBhdHRyaWJ1dGVzIHJhdGhlclxuIgogCQkJICIgICAgICAgICAgICAg ICAgICAgICAgICAgICAgdGhhbiB1c2luZyBkZWZhdWx0c1xuIikpOwogCXByaW50ZihfKCIgIC0t cmVwbGljYXRpb24gICAgICAgICAgICAgcm9sZSBjYW4gaW5pdGlhdGUgcmVwbGljYXRpb25cbiIp KTsKIAlwcmludGYoXygiICAtLW5vLXJlcGxpY2F0aW9uICAgICAgICAgIHJvbGUgY2Fubm90IGlu aXRpYXRlIHJlcGxpY2F0aW9uXG4iKSk7CisJcHJpbnRmKF8oIiAgLS1ieXBhc3NybHMgICAgICAg ICAgICAgICByb2xlIGNhbiBieXBhc3Mgcm93LWxldmVsIHNlY3VyaXR5IChSTFMpIHBvbGljeVxu IikpOworCXByaW50ZihfKCIgIC0tbm8tYnlwYXNzcmxzICAgICAgICAgICAgcm9sZSBjYW5ub3Qg YnlwYXNzIHJvdy1sZXZlbCBzZWN1cml0eSAoUkxTKSBwb2xpY3lcbiIpKTsKIAlwcmludGYoXygi ICAtPywgLS1oZWxwICAgICAgICAgICAgICAgIHNob3cgdGhpcyBoZWxwLCB0aGVuIGV4aXRcbiIp KTsKIAlwcmludGYoXygiXG5Db25uZWN0aW9uIG9wdGlvbnM6XG4iKSk7CiAJcHJpbnRmKF8oIiAg LWgsIC0taG9zdD1IT1NUTkFNRSAgICAgICBkYXRhYmFzZSBzZXJ2ZXIgaG9zdCBvciBzb2NrZXQg ZGlyZWN0b3J5XG4iKSk7CmRpZmYgLS1naXQgYS9zcmMvYmluL3NjcmlwdHMvdC8wNDBfY3JlYXRl dXNlci5wbCBiL3NyYy9iaW4vc2NyaXB0cy90LzA0MF9jcmVhdGV1c2VyLnBsCmluZGV4IDJhMzRi ZTgxY2YuLjVkZjUxMzRhMjYgMTAwNjQ0Ci0tLSBhL3NyYy9iaW4vc2NyaXB0cy90LzA0MF9jcmVh dGV1c2VyLnBsCisrKyBiL3NyYy9iaW4vc2NyaXB0cy90LzA0MF9jcmVhdGV1c2VyLnBsCkBAIC0z Miw2ICszMiwyMiBAQCAkbm9kZS0+aXNzdWVzX3NxbF9saWtlKAogCVsgJ2NyZWF0ZXVzZXInLCAn LXMnLCAncmVncmVzc191c2VyMycgXSwKIAlxci9zdGF0ZW1lbnQ6IENSRUFURSBST0xFIHJlZ3Jl c3NfdXNlcjMgU1VQRVJVU0VSIENSRUFURURCIENSRUFURVJPTEUgSU5IRVJJVCBMT0dJTjsvLAog CSdjcmVhdGUgYSBzdXBlcnVzZXInKTsKKyRub2RlLT5pc3N1ZXNfc3FsX2xpa2UoCisJWyAnY3Jl YXRldXNlcicsICdyZWdyZXNzX3JvbGUyJywgJy1hJywgJ3JlZ3Jlc3NfdXNlcjEnIF0sCisJcXIv c3RhdGVtZW50OiBDUkVBVEUgUk9MRSByZWdyZXNzX3JvbGUyIE5PU1VQRVJVU0VSIE5PQ1JFQVRF REIgTk9DUkVBVEVST0xFIElOSEVSSVQgTE9HSU4gQURNSU4gcmVncmVzc191c2VyMTsvLAorCSdj cmVhdGUgYSByb2xlIGFuZCBhZGQgaXQgdG8gYW5vdGhlciB1c2VyIHdpdGggYWRtaW4gb3B0aW9u Jyk7Ciskbm9kZS0+aXNzdWVzX3NxbF9saWtlKAorCVsgJ2NyZWF0ZXVzZXInLCAncmVncmVzc19y b2xlMycsICctbScsICdyZWdyZXNzX3VzZXIxJyBdLAorCXFyL3N0YXRlbWVudDogQ1JFQVRFIFJP TEUgcmVncmVzc19yb2xlMyBOT1NVUEVSVVNFUiBOT0NSRUFURURCIE5PQ1JFQVRFUk9MRSBJTkhF UklUIExPR0lOIFJPTEUgcmVncmVzc191c2VyMTsvLAorCSdjcmVhdGUgYSByb2xlIGFuZCBhZGQg aXQgdG8gYW5vdGhlciB1c2VyJyk7Ciskbm9kZS0+aXNzdWVzX3NxbF9saWtlKAorCVsgJ2NyZWF0 ZXVzZXInLCAncmVncmVzc191c2VyNCcsICctdicsICcyMDI5MTIzMScgXSwKKwlxci9zdGF0ZW1l bnQ6IENSRUFURSBST0xFIHJlZ3Jlc3NfdXNlcjQgTk9TVVBFUlVTRVIgTk9DUkVBVEVEQiBOT0NS RUFURVJPTEUgSU5IRVJJVCBMT0dJTiBWQUxJRCBVTlRJTCBcJzIwMjkxMjMxXCc7LywKKwknY3Jl YXRlIGEgdXNlciB3aXRoIGEgcGFzc3dvcmQgZXhwaXJhdGlvbiB0aW1lc3RhbXAnKTsKKyRub2Rl LT5pc3N1ZXNfc3FsX2xpa2UoCisJWyAnY3JlYXRldXNlcicsICdyZWdyZXNzX3VzZXI1JywgJy0t YnlwYXNzcmxzJyBdLAorCXFyL3N0YXRlbWVudDogQ1JFQVRFIFJPTEUgcmVncmVzc191c2VyNSBO T1NVUEVSVVNFUiBOT0NSRUFURURCIE5PQ1JFQVRFUk9MRSBJTkhFUklUIExPR0lOIEJZUEFTU1JM UzsvLAorCSdjcmVhdGUgYSBCWVBBU1NSTFMgdXNlcicpOwogCiAkbm9kZS0+Y29tbWFuZF9mYWls cyhbICdjcmVhdGV1c2VyJywgJ3JlZ3Jlc3NfdXNlcjEnIF0sCiAJJ2ZhaWxzIGlmIHJvbGUgYWxy ZWFkeSBleGlzdHMnKTsK --=_8a333c47851ee7c015943ab6b16e9620--