Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1qf4gp-009SO5-O2 for pgsql-hackers@arkaria.postgresql.org; Sat, 09 Sep 2023 20:36:24 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.94.2) (envelope-from ) id 1qf4gm-003ffU-N5 for pgsql-hackers@arkaria.postgresql.org; Sat, 09 Sep 2023 20:36:20 +0000 Received: from makus.postgresql.org ([2001:4800:3e1:1::229]) by malur.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1qf4gm-003ffL-4V for pgsql-hackers@lists.postgresql.org; Sat, 09 Sep 2023 20:36:20 +0000 Received: from udcm-wwu2.uni-muenster.de ([128.176.118.28]) by makus.postgresql.org with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1qf4gh-003fFW-Eb for pgsql-hackers@lists.postgresql.org; Sat, 09 Sep 2023 20:36:18 +0000 X-IronPort-AV: E=Sophos;i="6.02,240,1688421600"; d="scan'208,223";a="280775725" Received: from secmail.uni-muenster.de ([128.176.118.4]) by UDCM-RELAY2.UNI-MUENSTER.DE with ESMTP; 09 Sep 2023 22:36:12 +0200 Received: from [192.168.178.27] (unknown [78.48.78.130]) by SECMAIL.UNI-MUENSTER.DE (Postfix) with ESMTPSA id 4963F20EBC4B; Sat, 9 Sep 2023 22:36:11 +0200 (CEST) Content-Type: multipart/mixed; boundary="------------0bToPzQWxTAChfm0z5Q96Wof" Message-ID: Date: Sat, 9 Sep 2023 22:36:10 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.15.0 Subject: Re: [PATCH] Add inline comments to the pg_hba_file_rules view To: David Zhang , PostgreSQL Hackers References: <4d623899-36ac-71b5-311d-2a4672d75736@uni-muenster.de> Content-Language: en-US From: Jim Jones In-Reply-To: List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Archived-At: Precedence: bulk This is a multi-part message in MIME format. --------------0bToPzQWxTAChfm0z5Q96Wof Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Hi David On 09.09.23 01:52, David Zhang wrote: > This is a very useful feature. I applied the patch to the master > branch, and both make check and make check-world passed without any > issues. > Thanks for reviewing this patch! > > Since "only the first #" and "any leading spaces" are removed, IMO, it > can be more accurate to say, > > Text after the first # comment character in the end > of a valid pg_hba.conf entry, if any > I agree. v2 attached includes your suggestion. Thanks! Jim --------------0bToPzQWxTAChfm0z5Q96Wof Content-Type: text/x-patch; charset=UTF-8; name="v2-0001-Add-inline-comments-to-the-pg_hba_file_rules-view.patch" Content-Disposition: attachment; filename*0="v2-0001-Add-inline-comments-to-the-pg_hba_file_rules-view.pa"; filename*1="tch" Content-Transfer-Encoding: base64 RnJvbSBhODE3ZDhiOGZjNDM3ZWYyMGY5YjFmMzk3NzY0ODk1ZTZkMWYyMDA4IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gSm9uZXMgPGppbS5qb25lc0B1bmktbXVlbnN0 ZXIuZGU+CkRhdGU6IFNhdCwgOSBTZXAgMjAyMyAyMjoyMjowOSArMDIwMApTdWJqZWN0OiBb UEFUQ0ggdjJdIEFkZCBpbmxpbmUgY29tbWVudHMgdG8gdGhlIHBnX2hiYV9maWxlX3J1bGVz IHZpZXcKClRoaXMgcGF0Y2ggcHJvcG9zZXMgdGhlIGNvbHVtbiAiY29tbWVudCIgdG8gdGhl IHBnX2hiYV9maWxlX3J1bGVzIHZpZXcuCkl0IGJhc2ljYWxseSBwYXJzZXMgdGhlIGlubGlu ZSBjb21tZW50IChpZiBhbnkpIG9mIGEgdmFsaWQgcGdfaGJhLmNvbmYKZW50cnkgYW5kIGRp c3BsYXlzIGl0IGluIHRoZSBuZXcgY29sdW1uLiBUaGUgcGF0Y2ggc2xpZ2h0bHkgY2hhbmdl cyB0aGUKdGVzdCAwMDRfZmlsZV9pbmNsdXNpb24ucGwgdG8gYWNjb21vZGF0ZSB0aGUgbmV3 IGNvbHVtbiBhbmQgdGhlIGhiYSBjb21tZW50cy4KVGhlIHZpZXcncyBkb2N1bWVudGF0aW9u IGF0IHN5c3RlbS12aWV3cy5zZ21sIGlzIGV4dGVuZGVkIGFjY29yZGluZ2x5LgoKVGhlIGZ1 bmN0aW9uIEdldElubGluZUNvbW1lbnQoKSB3YXMgYWRkZWQgdG8gY29uZmZpbGVzLmMgdG8g YXZvaWQgYWRkaW5nIG1vcmUKY29tcGxleGl0eSBkaXJlY3RseSB0byBoYmEuYy4gSXQgYWxz byBlbmFibGVzIHRoaXMgZmVhdHVyZSB0byBiZSB1c2VkIGJ5IG90aGVyCmNvbmZpZ3VyYXRp b24gZmlsZXMsIGlmIG5lY2Vzc2FyeS4KLS0tCiBkb2Mvc3JjL3NnbWwvc3lzdGVtLXZpZXdz LnNnbWwgICAgICAgICAgICAgICAgfCAgOSArKysrKwogc3JjL2JhY2tlbmQvdXRpbHMvYWR0 L2hiYWZ1bmNzLmMgICAgICAgICAgICAgIHwgMTEgKysrKystCiBzcmMvYmFja2VuZC91dGls cy9taXNjL2NvbmZmaWxlcy5jICAgICAgICAgICAgfCAyNiArKysrKysrKysrKysrCiBzcmMv aW5jbHVkZS9jYXRhbG9nL3BnX3Byb2MuZGF0ICAgICAgICAgICAgICAgfCAgNiArLS0KIHNy Yy9pbmNsdWRlL2xpYnBxL2hiYS5oICAgICAgICAgICAgICAgICAgICAgICB8ICAxICsKIHNy Yy9pbmNsdWRlL3V0aWxzL2NvbmZmaWxlcy5oICAgICAgICAgICAgICAgICB8ICAxICsKIC4u Li9hdXRoZW50aWNhdGlvbi90LzAwNF9maWxlX2luY2x1c2lvbi5wbCAgICB8IDM5ICsrKysr KysrKysrKysrKystLS0KIHNyYy90ZXN0L3JlZ3Jlc3MvZXhwZWN0ZWQvcnVsZXMub3V0ICAg ICAgICAgICB8ICAzICstCiA4IGZpbGVzIGNoYW5nZWQsIDg1IGluc2VydGlvbnMoKyksIDEx IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RvYy9zcmMvc2dtbC9zeXN0ZW0tdmlld3Mu c2dtbCBiL2RvYy9zcmMvc2dtbC9zeXN0ZW0tdmlld3Muc2dtbAppbmRleCAyYjM1YzJmOTFi Li42OGY5ODU3ZGUwIDEwMDY0NAotLS0gYS9kb2Mvc3JjL3NnbWwvc3lzdGVtLXZpZXdzLnNn bWwKKysrIGIvZG9jL3NyYy9zZ21sL3N5c3RlbS12aWV3cy5zZ21sCkBAIC0xMDkwLDYgKzEw OTAsMTUgQEAKICAgICAgIDwvcGFyYT48L2VudHJ5PgogICAgICA8L3Jvdz4KIAorICAgIDxy b3c+CisgICAgICA8ZW50cnkgcm9sZT0iY2F0YWxvZ190YWJsZV9lbnRyeSI+PHBhcmEgcm9s ZT0iY29sdW1uX2RlZmluaXRpb24iPgorICAgICAgIDxzdHJ1Y3RmaWVsZD5jb21tZW50PC9z dHJ1Y3RmaWVsZD4gPHR5cGU+dGV4dDwvdHlwZT4KKyAgICAgIDwvcGFyYT4KKyAgICAgIDxw YXJhPgorICAgICAgIFRleHQgYWZ0ZXIgdGhlIGZpcnN0IDxsaXRlcmFsPiM8L2xpdGVyYWw+ IGNvbW1lbnQgY2hhcmFjdGVyIGluIHRoZSBlbmQgb2YgYSB2YWxpZCA8bGl0ZXJhbD5wZ19o YmEuY29uZjwvbGl0ZXJhbD4gZW50cnksIGlmIGFueQorICAgICAgPC9wYXJhPjwvZW50cnk+ CisgICAgIDwvcm93PgorCiAgICAgIDxyb3c+CiAgICAgICA8ZW50cnkgcm9sZT0iY2F0YWxv Z190YWJsZV9lbnRyeSI+PHBhcmEgcm9sZT0iY29sdW1uX2RlZmluaXRpb24iPgogICAgICAg IDxzdHJ1Y3RmaWVsZD5lcnJvcjwvc3RydWN0ZmllbGQ+IDx0eXBlPnRleHQ8L3R5cGU+CmRp ZmYgLS1naXQgYS9zcmMvYmFja2VuZC91dGlscy9hZHQvaGJhZnVuY3MuYyBiL3NyYy9iYWNr ZW5kL3V0aWxzL2FkdC9oYmFmdW5jcy5jCmluZGV4IDczZDNhZDFkYWQuLjkyOTY3OGU5N2Ug MTAwNjQ0Ci0tLSBhL3NyYy9iYWNrZW5kL3V0aWxzL2FkdC9oYmFmdW5jcy5jCisrKyBiL3Ny Yy9iYWNrZW5kL3V0aWxzL2FkdC9oYmFmdW5jcy5jCkBAIC0yMiw2ICsyMiw3IEBACiAjaW5j bHVkZSAidXRpbHMvYXJyYXkuaCIKICNpbmNsdWRlICJ1dGlscy9idWlsdGlucy5oIgogI2lu Y2x1ZGUgInV0aWxzL2d1Yy5oIgorI2luY2x1ZGUgInV0aWxzL2NvbmZmaWxlcy5oIgogCiAK IHN0YXRpYyBBcnJheVR5cGUgKmdldF9oYmFfb3B0aW9ucyhIYmFMaW5lICpoYmEpOwpAQCAt MTU5LDcgKzE2MCw3IEBAIGdldF9oYmFfb3B0aW9ucyhIYmFMaW5lICpoYmEpCiB9CiAKIC8q IE51bWJlciBvZiBjb2x1bW5zIGluIHBnX2hiYV9maWxlX3J1bGVzIHZpZXcgKi8KLSNkZWZp bmUgTlVNX1BHX0hCQV9GSUxFX1JVTEVTX0FUVFMJIDExCisjZGVmaW5lIE5VTV9QR19IQkFf RklMRV9SVUxFU19BVFRTCSAxMgogCiAvKgogICogZmlsbF9oYmFfbGluZQpAQCAtMTkxLDYg KzE5Miw3IEBAIGZpbGxfaGJhX2xpbmUoVHVwbGVzdG9yZXN0YXRlICp0dXBsZV9zdG9yZSwg VHVwbGVEZXNjIHR1cGRlc2MsCiAJY29uc3QgY2hhciAqYWRkcnN0cjsKIAljb25zdCBjaGFy ICptYXNrc3RyOwogCUFycmF5VHlwZSAgKm9wdGlvbnM7CisJY2hhciAgICAgICAqY29tbWVu dDsKIAogCUFzc2VydCh0dXBkZXNjLT5uYXR0cyA9PSBOVU1fUEdfSEJBX0ZJTEVfUlVMRVNf QVRUUyk7CiAKQEAgLTM0Niw2ICszNDgsMTMgQEAgZmlsbF9oYmFfbGluZShUdXBsZXN0b3Jl c3RhdGUgKnR1cGxlX3N0b3JlLCBUdXBsZURlc2MgdHVwZGVzYywKIAkJCXZhbHVlc1tpbmRl eCsrXSA9IFBvaW50ZXJHZXREYXR1bShvcHRpb25zKTsKIAkJZWxzZQogCQkJbnVsbHNbaW5k ZXgrK10gPSB0cnVlOworCisJCS8qIGNvbW1lbnRzICovCisJCWNvbW1lbnQgPSBHZXRJbmxp bmVDb21tZW50KGhiYS0+cmF3bGluZSk7CisJCWlmKGNvbW1lbnQpCisJCQl2YWx1ZXNbaW5k ZXgrK10gPSBDU3RyaW5nR2V0VGV4dERhdHVtKGNvbW1lbnQpOworCQllbHNlCisJCQludWxs c1tpbmRleCsrXSA9IHRydWU7CiAJfQogCWVsc2UKIAl7CmRpZmYgLS1naXQgYS9zcmMvYmFj a2VuZC91dGlscy9taXNjL2NvbmZmaWxlcy5jIGIvc3JjL2JhY2tlbmQvdXRpbHMvbWlzYy9j b25mZmlsZXMuYwppbmRleCAzNzZhNWM4ODViLi4wZjQxNjlkZWEzIDEwMDY0NAotLS0gYS9z cmMvYmFja2VuZC91dGlscy9taXNjL2NvbmZmaWxlcy5jCisrKyBiL3NyYy9iYWNrZW5kL3V0 aWxzL21pc2MvY29uZmZpbGVzLmMKQEAgLTI1LDYgKzI1LDMyIEBACiAjaW5jbHVkZSAic3Rv cmFnZS9mZC5oIgogI2luY2x1ZGUgInV0aWxzL2NvbmZmaWxlcy5oIgogCisvKgorICogR2V0 SW5saW5lQ29tbWVudAorICoKKyAqIFRoaXMgZnVuY3Rpb24gcmV0dXJucyBjb21tZW50cyBv ZiBhIGdpdmVuIGNvbmZpZyBmaWxlIGxpbmUsCisgKiBpZiB0aGVyZSBpcyBhbnkuIEEgY29t bWVudCBpcyBhbnkgdGV4dCBhZnRlciB0aGUgIyBjaGFyYWN0ZXIuCisgKi8KK2NoYXIgKgor R2V0SW5saW5lQ29tbWVudChjaGFyICpsaW5lKQoreworCXNpemVfdCBsZW47CisJY2hhciAq Y29tbWVudCA9IHN0cmNocihsaW5lLCAnIycpOworCisJaWYoIWNvbW1lbnQpCisJCXJldHVy biBOVUxMOworCisJLyogaWdub3JpbmcgJyMnIGNoYXJhY3RlciwgYXMgd2UgZG9uJ3QgbmVl ZCBpdCBpbiB0aGUgY29tbWVudCBpdHNlbGYuICovCisJY29tbWVudCsrOworCWxlbiA9IHN0 cmxlbihjb21tZW50KTsKKworCS8qIHRyaW0gbGVhZGluZyBhbmQgdHJhaWxpbmcgd2hpdGVz cGFjZXMgKi8KKwl3aGlsZShpc3NwYWNlKGNvbW1lbnRbbGVuIC0gMV0pKSAtLWxlbjsKKwl3 aGlsZSgqY29tbWVudCAmJiBpc3NwYWNlKCpjb21tZW50KSkgKytjb21tZW50LCAtLWxlbjsK KworCXJldHVybiBwbnN0cmR1cChjb21tZW50LCBsZW4pOworfQorCiAvKgogICogQWJzb2x1 dGVDb25maWdMb2NhdGlvbgogICoKZGlmZiAtLWdpdCBhL3NyYy9pbmNsdWRlL2NhdGFsb2cv cGdfcHJvYy5kYXQgYi9zcmMvaW5jbHVkZS9jYXRhbG9nL3BnX3Byb2MuZGF0CmluZGV4IDk4 MDViYzYxMTguLjM2MGY3MWU4ZWYgMTAwNjQ0Ci0tLSBhL3NyYy9pbmNsdWRlL2NhdGFsb2cv cGdfcHJvYy5kYXQKKysrIGIvc3JjL2luY2x1ZGUvY2F0YWxvZy9wZ19wcm9jLmRhdApAQCAt NjI0NCw5ICs2MjQ0LDkgQEAKIHsgb2lkID0+ICczNDAxJywgZGVzY3IgPT4gJ3Nob3cgcGdf aGJhLmNvbmYgcnVsZXMnLAogICBwcm9uYW1lID0+ICdwZ19oYmFfZmlsZV9ydWxlcycsIHBy b3Jvd3MgPT4gJzEwMDAnLCBwcm9yZXRzZXQgPT4gJ3QnLAogICBwcm92b2xhdGlsZSA9PiAn dicsIHByb3JldHR5cGUgPT4gJ3JlY29yZCcsIHByb2FyZ3R5cGVzID0+ICcnLAotICBwcm9h bGxhcmd0eXBlcyA9PiAne2ludDQsdGV4dCxpbnQ0LHRleHQsX3RleHQsX3RleHQsdGV4dCx0 ZXh0LHRleHQsX3RleHQsdGV4dH0nLAotICBwcm9hcmdtb2RlcyA9PiAne28sbyxvLG8sbyxv LG8sbyxvLG8sb30nLAotICBwcm9hcmduYW1lcyA9PiAne3J1bGVfbnVtYmVyLGZpbGVfbmFt ZSxsaW5lX251bWJlcix0eXBlLGRhdGFiYXNlLHVzZXJfbmFtZSxhZGRyZXNzLG5ldG1hc2ss YXV0aF9tZXRob2Qsb3B0aW9ucyxlcnJvcn0nLAorICBwcm9hbGxhcmd0eXBlcyA9PiAne2lu dDQsdGV4dCxpbnQ0LHRleHQsX3RleHQsX3RleHQsdGV4dCx0ZXh0LHRleHQsX3RleHQsdGV4 dCx0ZXh0fScsCisgIHByb2FyZ21vZGVzID0+ICd7byxvLG8sbyxvLG8sbyxvLG8sbyxvLG99 JywKKyAgcHJvYXJnbmFtZXMgPT4gJ3tydWxlX251bWJlcixmaWxlX25hbWUsbGluZV9udW1i ZXIsdHlwZSxkYXRhYmFzZSx1c2VyX25hbWUsYWRkcmVzcyxuZXRtYXNrLGF1dGhfbWV0aG9k LG9wdGlvbnMsY29tbWVudCxlcnJvcn0nLAogICBwcm9zcmMgPT4gJ3BnX2hiYV9maWxlX3J1 bGVzJyB9LAogeyBvaWQgPT4gJzYyNTAnLCBkZXNjciA9PiAnc2hvdyBwZ19pZGVudC5jb25m IG1hcHBpbmdzJywKICAgcHJvbmFtZSA9PiAncGdfaWRlbnRfZmlsZV9tYXBwaW5ncycsIHBy b3Jvd3MgPT4gJzEwMDAnLCBwcm9yZXRzZXQgPT4gJ3QnLApkaWZmIC0tZ2l0IGEvc3JjL2lu Y2x1ZGUvbGlicHEvaGJhLmggYi9zcmMvaW5jbHVkZS9saWJwcS9oYmEuaAppbmRleCAxODlm NmQwZGYyLi41Y2I3MjI0NzEyIDEwMDY0NAotLS0gYS9zcmMvaW5jbHVkZS9saWJwcS9oYmEu aAorKysgYi9zcmMvaW5jbHVkZS9saWJwcS9oYmEuaApAQCAtMTM1LDYgKzEzNSw3IEBAIHR5 cGVkZWYgc3RydWN0IEhiYUxpbmUKIAljaGFyCSAgICpyYWRpdXNpZGVudGlmaWVyc19zOwog CUxpc3QJICAgKnJhZGl1c3BvcnRzOwogCWNoYXIJICAgKnJhZGl1c3BvcnRzX3M7CisJY2hh cgkgICAqY29tbWVudHM7CiB9IEhiYUxpbmU7CiAKIHR5cGVkZWYgc3RydWN0IElkZW50TGlu ZQpkaWZmIC0tZ2l0IGEvc3JjL2luY2x1ZGUvdXRpbHMvY29uZmZpbGVzLmggYi9zcmMvaW5j bHVkZS91dGlscy9jb25mZmlsZXMuaAppbmRleCBlMzg2OGZiYzIzLi5iNjBhZGFlNWZhIDEw MDY0NAotLS0gYS9zcmMvaW5jbHVkZS91dGlscy9jb25mZmlsZXMuaAorKysgYi9zcmMvaW5j bHVkZS91dGlscy9jb25mZmlsZXMuaApAQCAtMjMsNSArMjMsNiBAQCBleHRlcm4gY2hhciAq KkdldENvbmZGaWxlc0luRGlyKGNvbnN0IGNoYXIgKmluY2x1ZGVkaXIsCiAJCQkJCQkJCWNv bnN0IGNoYXIgKmNhbGxpbmdfZmlsZSwKIAkJCQkJCQkJaW50IGVsZXZlbCwgaW50ICpudW1f ZmlsZW5hbWVzLAogCQkJCQkJCQljaGFyICoqZXJyX21zZyk7CitleHRlcm4gY2hhciAqR2V0 SW5saW5lQ29tbWVudChjaGFyICpsaW5lKTsKIAogI2VuZGlmCQkJCQkJCS8qIENPTkZGSUxF U19IICovCmRpZmYgLS1naXQgYS9zcmMvdGVzdC9hdXRoZW50aWNhdGlvbi90LzAwNF9maWxl X2luY2x1c2lvbi5wbCBiL3NyYy90ZXN0L2F1dGhlbnRpY2F0aW9uL3QvMDA0X2ZpbGVfaW5j bHVzaW9uLnBsCmluZGV4IDU1ZDI4YWQ1ODYuLjQ3OTAyYjAxODggMTAwNjQ0Ci0tLSBhL3Ny Yy90ZXN0L2F1dGhlbnRpY2F0aW9uL3QvMDA0X2ZpbGVfaW5jbHVzaW9uLnBsCisrKyBiL3Ny Yy90ZXN0L2F1dGhlbnRpY2F0aW9uL3QvMDA0X2ZpbGVfaW5jbHVzaW9uLnBsCkBAIC02Myw2 ICs2MywyMiBAQCBzdWIgYWRkX2hiYV9saW5lCiAJIyBJbmNyZW1lbnQgcGdfaGJhX2ZpbGVf cnVsZXMucnVsZV9udW1iZXIgYW5kIHNhdmUgaXQuCiAJJGdsb2JsaW5lID0gKyskbGluZV9j b3VudGVyc3snaGJhX3J1bGUnfTsKIAorCW15ICRjb21tZW50OworCW15ICRjb21tZW50X3Bv c2l0aW9uID0gaW5kZXgoJGVudHJ5LCAiIyIpOworCisJIyBJbiBjYXNlIHRoZSBwZ19oYmEg ZW50cnkgaGFzIGEgY29tbWVudCwgd2Ugc3RvcmUgaXQgaW4gJGNvbW1lbnQKKwkjIGFuZCBy ZW1vdmUgaXQgZnJvbSAkZW50cnkuIFRoZSBjb250ZW50IG9mICRjb21tZW50IHdpbGwgYmUg cHVzaGVkCisJIyBpbnRvIEB0b2tlbnMgc2VwYXJhdGFlbHkuIFRoaXMgYXZvaWRzIGhhdmlu ZyB3aGl0ZXNwYWNlcyBpbiAkY29tbWVudAorCSMgYmVpbmcgaW50ZXJwcmV0ZWQgYXMgZWxl bWVudCBzZXBhcmF0b3IgYnkgc3BsaXQoKS4gVGhlIGxlYWRpbmcKKwkjIGFuZCB0cmFpbGlu ZyB3aGl0ZXNwYWNlcyBpbiAkY29tbWVudCBhcmUgcmVtb3ZlZCB0byByZXByb2R1Y2UgdGhl CisJIyBiZWhhdmlvdXIgb2YgR2V0SW5saW5lQ29tbWVudChjaGFyICpsaW5lKS4KKwlpZigk Y29tbWVudF9wb3NpdGlvbiAhPSAtMSkKKwl7CisJCSRjb21tZW50ID0gc3Vic3RyKCRlbnRy eSwgJGNvbW1lbnRfcG9zaXRpb24rMSk7CisJCSRjb21tZW50ID1+IHMvXlxzK3xccyskLy9n OworCQkkZW50cnkgPSBzdWJzdHIoJGVudHJ5LCAwLCAkY29tbWVudF9wb3NpdGlvbi0xKTsK Kwl9CisKIAkjIEdlbmVyYXRlIHRoZSBleHBlY3RlZCBwZ19oYmFfZmlsZV9ydWxlcyBsaW5l CiAJQHRva2VucyA9IHNwbGl0KC8gLywgJGVudHJ5KTsKIAkkdG9rZW5zWzFdID0gJ3snIC4g JHRva2Vuc1sxXSAuICd9JzsgICAgIyBkYXRhYmFzZQpAQCAtNzIsNiArODgsMTYgQEAgc3Vi IGFkZF9oYmFfbGluZQogCXB1c2ggQHRva2VucywgJyc7CiAJcHVzaCBAdG9rZW5zLCAnJzsK IAorCSMgQXBwZW5kIGNvbW1lbnQgaWYgYXBwbGljYWJsZSwgb3RoZXJ3aXNlIGFwcGVuZCBl bXB0eSBzdHJpbmcKKwlpZihub3QgZGVmaW5lZCAkY29tbWVudCkKKwl7CisJCXB1c2ggQHRv a2VucywgJyc7CisJfQorCWVsc2UKKwl7CisJCXB1c2ggQHRva2VucywgJGNvbW1lbnQ7CisJ fQorCiAJIyBGaW5hbCBsaW5lIGV4cGVjdGVkLCBvdXRwdXQgb2YgdGhlIFNRTCBxdWVyeS4K IAkkbGluZSA9ICIiOwogCSRsaW5lIC49ICJcbiIgaWYgKCRnbG9ibGluZSA+IDEpOwpAQCAt MTY3LDE1ICsxOTMsMTUgQEAgbWtkaXIoIiRkYXRhX2Rpci9oYmFfaW5jX2lmIik7CiBta2Rp cigiJGRhdGFfZGlyL2hiYV9wb3MiKTsKIAogIyBGaXJzdCwgbWFrZSBzdXJlIHRoYXQgd2Ug d2lsbCBhbHdheXMgYmUgYWJsZSB0byBjb25uZWN0LgotJGhiYV9leHBlY3RlZCAuPSBhZGRf aGJhX2xpbmUoJG5vZGUsICIkaGJhX2ZpbGUiLCAnbG9jYWwgYWxsIGFsbCB0cnVzdCcpOwor JGhiYV9leHBlY3RlZCAuPSBhZGRfaGJhX2xpbmUoJG5vZGUsICIkaGJhX2ZpbGUiLCAnbG9j YWwgYWxsIGFsbCB0cnVzdCAgICAjICAgI2NvbW1lbnQgY29udGFpbmluZyBsZWFkaW5nL3Ry YWlsaW5nIHdoaXRlc3BhY2VzIGFuZCAiIyIgICAnKTsKIAogIyAiaW5jbHVkZSIuICBOb3Rl IHRoYXQgYXMgJGhiYV9maWxlIGlzIGxvY2F0ZWQgaW4gJGRhdGFfZGlyL3N1YmRpcjEsCiAj IHBnX2hiYV9wcmUuY29uZiBpcyBsb2NhdGVkIGF0IHRoZSByb290IG9mIHRoZSBkYXRhIGRp cmVjdG9yeS4KICRoYmFfZXhwZWN0ZWQgLj0KLSAgYWRkX2hiYV9saW5lKCRub2RlLCAiJGhi YV9maWxlIiwgImluY2x1ZGUgLi4vcGdfaGJhX3ByZS5jb25mIik7CisgIGFkZF9oYmFfbGlu ZSgkbm9kZSwgIiRoYmFfZmlsZSIsICJpbmNsdWRlIC4uL3BnX2hiYV9wcmUuY29uZiNmb28i KTsKICRoYmFfZXhwZWN0ZWQgLj0KICAgYWRkX2hiYV9saW5lKCRub2RlLCAncGdfaGJhX3By ZS5jb25mJywgImxvY2FsIHByZSBhbGwgcmVqZWN0Iik7Ci0kaGJhX2V4cGVjdGVkIC49IGFk ZF9oYmFfbGluZSgkbm9kZSwgIiRoYmFfZmlsZSIsICJsb2NhbCBhbGwgYWxsIHJlamVjdCIp OworJGhiYV9leHBlY3RlZCAuPSBhZGRfaGJhX2xpbmUoJG5vZGUsICIkaGJhX2ZpbGUiLCAi bG9jYWwgYWxsIGFsbCByZWplY3QgI2JhciIpOwogYWRkX2hiYV9saW5lKCRub2RlLCAiJGhi YV9maWxlIiwgImluY2x1ZGUgLi4vaGJhX3Bvcy9wZ19oYmFfcG9zLmNvbmYiKTsKICRoYmFf ZXhwZWN0ZWQgLj0KICAgYWRkX2hiYV9saW5lKCRub2RlLCAnaGJhX3Bvcy9wZ19oYmFfcG9z LmNvbmYnLCAibG9jYWwgcG9zIGFsbCByZWplY3QiKTsKQEAgLTE4NCw3ICsyMTAsNyBAQCAk aGJhX2V4cGVjdGVkIC49CiAkaGJhX2V4cGVjdGVkIC49CiAgIGFkZF9oYmFfbGluZSgkbm9k ZSwgJ2hiYV9wb3MvcGdfaGJhX3Bvcy5jb25mJywgImluY2x1ZGUgcGdfaGJhX3BvczIuY29u ZiIpOwogJGhiYV9leHBlY3RlZCAuPQotICBhZGRfaGJhX2xpbmUoJG5vZGUsICdoYmFfcG9z L3BnX2hiYV9wb3MyLmNvbmYnLCAibG9jYWwgcG9zMiBhbGwgcmVqZWN0Iik7CisgIGFkZF9o YmFfbGluZSgkbm9kZSwgJ2hiYV9wb3MvcGdfaGJhX3BvczIuY29uZicsICJsb2NhbCBwb3My IGFsbCByZWplY3QgI2JhciEjIik7CiAkaGJhX2V4cGVjdGVkIC49CiAgIGFkZF9oYmFfbGlu ZSgkbm9kZSwgJ2hiYV9wb3MvcGdfaGJhX3BvczIuY29uZicsICJsb2NhbCBwb3MzIGFsbCBy ZWplY3QiKTsKIApAQCAtMjE2LDcgKzI0Miw3IEBAICRoYmFfZXhwZWN0ZWQgLj0gIlxuIgog ICAuICRsaW5lX2NvdW50ZXJzeydoYmFfcnVsZSd9IC4gInwiCiAgIC4gYmFzZW5hbWUoJGhi YV9maWxlKSAuICJ8IgogICAuICRsaW5lX2NvdW50ZXJzeyRoYmFfZmlsZX0KLSAgLiAnfGxv Y2FsfHtkYjEsZGIzfXx7YWxsfXxyZWplY3R8fCc7CisgIC4gJ3xsb2NhbHx7ZGIxLGRiM318 e2FsbH18cmVqZWN0fHx8JzsKIAogbm90ZSAiR2VuZXJhdGluZyBpZGVudCBzdHJ1Y3R1cmUg d2l0aCBpbmNsdWRlIGRpcmVjdGl2ZXMiOwogCkBAIC0yNzksNyArMzA1LDggQEAgbXkgJGNv bnRlbnRzID0gJG5vZGUtPnNhZmVfcHNxbCgKICAgdXNlcl9uYW1lLAogICBhdXRoX21ldGhv ZCwKICAgb3B0aW9ucywKLSAgZXJyb3IKKyAgZXJyb3IsCisgIGNvbW1lbnQKICBGUk9NIHBn X2hiYV9maWxlX3J1bGVzIE9SREVSIEJZIHJ1bGVfbnVtYmVyOykpOwogaXMoJGNvbnRlbnRz LCAkaGJhX2V4cGVjdGVkLCAnY2hlY2sgY29udGVudHMgb2YgcGdfaGJhX2ZpbGVfcnVsZXMn KTsKIApkaWZmIC0tZ2l0IGEvc3JjL3Rlc3QvcmVncmVzcy9leHBlY3RlZC9ydWxlcy5vdXQg Yi9zcmMvdGVzdC9yZWdyZXNzL2V4cGVjdGVkL3J1bGVzLm91dAppbmRleCA1MDU4YmU1NDEx Li42YTZjNmY5ZWRkIDEwMDY0NAotLS0gYS9zcmMvdGVzdC9yZWdyZXNzL2V4cGVjdGVkL3J1 bGVzLm91dAorKysgYi9zcmMvdGVzdC9yZWdyZXNzL2V4cGVjdGVkL3J1bGVzLm91dApAQCAt MTM0OCw4ICsxMzQ4LDkgQEAgcGdfaGJhX2ZpbGVfcnVsZXN8IFNFTEVDVCBydWxlX251bWJl ciwKICAgICBuZXRtYXNrLAogICAgIGF1dGhfbWV0aG9kLAogICAgIG9wdGlvbnMsCisgICAg Y29tbWVudCwKICAgICBlcnJvcgotICAgRlJPTSBwZ19oYmFfZmlsZV9ydWxlcygpIGEocnVs ZV9udW1iZXIsIGZpbGVfbmFtZSwgbGluZV9udW1iZXIsIHR5cGUsIGRhdGFiYXNlLCB1c2Vy X25hbWUsIGFkZHJlc3MsIG5ldG1hc2ssIGF1dGhfbWV0aG9kLCBvcHRpb25zLCBlcnJvcik7 CisgICBGUk9NIHBnX2hiYV9maWxlX3J1bGVzKCkgYShydWxlX251bWJlciwgZmlsZV9uYW1l LCBsaW5lX251bWJlciwgdHlwZSwgZGF0YWJhc2UsIHVzZXJfbmFtZSwgYWRkcmVzcywgbmV0 bWFzaywgYXV0aF9tZXRob2QsIG9wdGlvbnMsIGNvbW1lbnQsIGVycm9yKTsKIHBnX2lkZW50 X2ZpbGVfbWFwcGluZ3N8IFNFTEVDVCBtYXBfbnVtYmVyLAogICAgIGZpbGVfbmFtZSwKICAg ICBsaW5lX251bWJlciwKLS0gCjIuMzQuMQoK --------------0bToPzQWxTAChfm0z5Q96Wof--