MIME-Version: 1.0
References: <20260630023308.c7.noahmisch@microsoft.com>
 <2453089.1782789061@sss.pgh.pa.us>
 <CAExHW5tz+ufmneS+gYTNrYLbi=bF=D2Xp5rvr12cuLYoNn80kg@mail.gmail.com>
In-Reply-To: 
 <CAExHW5tz+ufmneS+gYTNrYLbi=bF=D2Xp5rvr12cuLYoNn80kg@mail.gmail.com>
From: Ashutosh Bapat <ashutosh.bapat.oss@gmail.com>
Date: Fri, 3 Jul 2026 16:09:20 +0530
Message-ID: 
 <CAExHW5va66cEd6uXvj16F0dGRfikWXf7jzRULrqV3OQ99EPsXg@mail.gmail.com>
Subject: Re: PROPERTY GRAPH pg_dump ACL minimization
To: Tom Lane <tgl@sss.pgh.pa.us>
Cc: Noah Misch <noah@leadboat.com>, pgsql-hackers@postgresql.org
Content-Type: multipart/mixed; boundary="000000000000542eac0655b28a6d"
Archived-At: 
 <https://www.postgresql.org/message-id/CAExHW5va66cEd6uXvj16F0dGRfikWXf7jzRULrqV3OQ99EPsXg%40mail.gmail.com>
Precedence: bulk

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

On Wed, Jul 1, 2026 at 9:51=E2=80=AFPM Ashutosh Bapat
<ashutosh.bapat.oss@gmail.com> wrote:
>
> I wondered whether we are missing special handling for PROPGRAPH at
> other places. I looked at other places where we handle OBJECT_SEQUENCE
> separately in acl related files. I discovered following missing cases
>
> 1. ExecGrant_Relation: I think we should clip the extra privileges
> with a warning when GRANT ... TABLE syntax is used to grant privileges
> on a property graph, just like sequences. To me it looks like we
> should prohibit GRANT ... TABLE on property graph altogether. But
> haven't done so to keep it in sync with sequences. The backward
> compatibility comment,  "For backward compatibility, just ... " should
> not be applicable in case of property graph since we can introduce
> whatever behaviour we expect from GRANT ... TABLE right from the first
> release which introduced property graph. But I am not sure if that's
> the only backward compatibility we are talking about here. Those
> commits go more than a few decades back and commit message itself
> doesn't help me much. Maybe someone with a better historical
> perspective may help. I have also added a test scenario for a
> non-property graph privilege to be added using GRANT ... TABLE syntax.
>

Since property graphs share the namespace with regular tables, I think
GRANT ... TABLE should be supported on property graphs, but restrict
it to only the privileges applicable to property graphs. Done that way
in the attached patch.

> The second change in this function seems necessary but without it, I
> couldn't find a visible bug. Mostly it's masked because the privileges
> available on a table are a superset of privileges available on a
> property graph.
>

This change is needed so that we can provide a correct error message.

Here's a revised patch set.
0010 is your patch without any changes
0011 is my changes described above.


--=20
Best Wishes,
Ashutosh Bapat

--000000000000542eac0655b28a6d
Content-Type: text/x-patch; charset="US-ASCII";
	name="v20260703-0010-Fix-pg_dump-ACL-minimization-for-PROPERTY-.patch"
Content-Disposition: attachment;
	filename="v20260703-0010-Fix-pg_dump-ACL-minimization-for-PROPERTY-.patch"
Content-Transfer-Encoding: base64
Content-ID: <f_mr4swsh41>
X-Attachment-Id: f_mr4swsh41

RnJvbSA0M2EyN2U3YTI3OGQ3YjhhMjNiYjc5NjdjNjBhZWM1YTIyNmEzZWJiIE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBOb2FoIE1pc2NoIDxub2FoQGxlYWRib2F0LmNvbT4KRGF0ZTog
V2VkLCAxIEp1bCAyMDI2IDExOjU5OjMzICswNTMwClN1YmplY3Q6IFtQQVRDSCB2MjAyNjA3MDMg
MTAvMTNdIEZpeCBwZ19kdW1wIEFDTCBtaW5pbWl6YXRpb24gZm9yIFBST1BFUlRZCiBHUkFQSC4K
CkFkZGluZyBhIEdSQU5UIGNhdXNlZCBwZ19kdW1wIHRvIGVtaXQgYSB1c2VsZXNzIFJFVk9LRSAr
IEdSQU5UIG9mIG93bmVyCnByaXZpbGVnZXMsIGFzIHNlZW4gaW4gYSBkdW1wIG9mIHRoZSByZWdy
ZXNzaW9uIGRhdGFiYXNlOgoKICBSRVZPS0UgQUxMIE9OIFBST1BFUlRZIEdSQVBIIGdyYXBoX3Js
c19zY2hlbWEuY2FiaW5ldCBGUk9NIG5tOwogIEdSQU5UIEFMTCBPTiBQUk9QRVJUWSBHUkFQSCBn
cmFwaF9ybHNfc2NoZW1hLmNhYmluZXQgVE8gbm07CiAgR1JBTlQgQUxMIE9OIFBST1BFUlRZIEdS
QVBIIGdyYXBoX3Jsc19zY2hlbWEuY2FiaW5ldCBUTyBQVUJMSUM7CgpGb3Igbm9ybWFsIGR1bXBz
LCB0aGlzIGhhcyBubyBmdW5jdGlvbmFsIGNvbnNlcXVlbmNlcy4gIEZvciAtLW5vLW93bmVyCnJl
c3RvcmVzLCB0aGUgZXh0cmEgc3RhdGVtZW50cyBtYXkgZmFpbCBvciBsb2NhdGUgdW5yZWxhdGVk
IHVzZXJzIG9mIHRoZQpkZXN0aW5hdGlvbiBjbHVzdGVyLgoKVGhlIHByb2JsZW0gd2FzIHBnX2R1
bXAgYXNzdW1pbmcgTlVMTCByZWxhY2wgaW1wbGllcyBhY2xkZWZhdWx0KCdyJyksCnRoZSBkZWZh
dWx0IGZvciBUQUJMRS4gIEZpeCBieSB0ZWFjaGluZyBhY2xkZWZhdWx0KCkgdG8gcmV0cmlldmUg
dGhlClBST1BFUlRZIEdSQVBIIGRlZmF1bHQgQUNMLiAgU28gcGdfZHVtcCBjYW4gc3RpbGwgZHVt
cCBmcm9tIDE5YmV0YTEsIHVzZQphY2xkZWZhdWx0KCdnJykgZm9yIHYyMCsgb25seS4gIEZvciB2
MTksIHVzZSBhIGhhcmQtY29kZWQgc25hcHNob3Qgb2YKdGhlIHYxOSBkZWZhdWx0LgoKaW5mb3Jt
YXRpb25fc2NoZW1hLnBnX3Byb3BlcnR5X2dyYXBoX3ByaXZpbGVnZXMgYWxzbyBtaXN1c2VkCmFj
bGRlZmF1bHQoJ3InKSwgYnV0IGl0cyAiYy5wcnR5cGUgSU4gKCdTRUxFQ1QnKSIgcHJlZGljYXRl
IGNvbXBlbnNhdGVkCmZvciBpdC4gIFN3aXRjaCB0byB0aGUgbmV3IGFjbGRlZmF1bHQoJ2cnKSBm
b3IgY2xhcml0eS4gIEJ1bXAgY2F0dmVyc2lvbgpzaW5jZSBhIG5ldyB2aWV3IHdvbid0IHdvcmsg
d2l0aCBvbGQgYmluYXJpZXMuICBCYWNrLXBhdGNoIHRvIHYxOSwgd2hpY2gKaW50cm9kdWNlZCBQ
Uk9QRVJUWSBHUkFQSC4KClJldmlld2VkLWJ5OiBGSVhNRQpEaXNjdXNzaW9uOiBodHRwczovL3Bv
c3Rnci5lcy9tL0ZJWE1FCkJhY2twYXRjaC10aHJvdWdoOiAxOQotLS0KIHNyYy9iYWNrZW5kL2Nh
dGFsb2cvaW5mb3JtYXRpb25fc2NoZW1hLnNxbCB8ICAyICstCiBzcmMvYmFja2VuZC91dGlscy9h
ZHQvYWNsLmMgICAgICAgICAgICAgICAgfCAgMyArKwogc3JjL2Jpbi9wZ19kdW1wL3BnX2R1bXAu
YyAgICAgICAgICAgICAgICAgIHwgMzcgKysrKysrKysrKysrKysrKysrKystLQogMyBmaWxlcyBj
aGFuZ2VkLCAzOCBpbnNlcnRpb25zKCspLCA0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3Ny
Yy9iYWNrZW5kL2NhdGFsb2cvaW5mb3JtYXRpb25fc2NoZW1hLnNxbCBiL3NyYy9iYWNrZW5kL2Nh
dGFsb2cvaW5mb3JtYXRpb25fc2NoZW1hLnNxbAppbmRleCA0ZjBlMjQ5MjkzNy4uNjI0ZDUzOGE1
YzAgMTAwNjQ0Ci0tLSBhL3NyYy9iYWNrZW5kL2NhdGFsb2cvaW5mb3JtYXRpb25fc2NoZW1hLnNx
bAorKysgYi9zcmMvYmFja2VuZC9jYXRhbG9nL2luZm9ybWF0aW9uX3NjaGVtYS5zcWwKQEAgLTMz
MjgsNyArMzMyOCw3IEBAIENSRUFURSBWSUVXIHBnX3Byb3BlcnR5X2dyYXBoX3ByaXZpbGVnZXMg
QVMKICAgICAgICAgICAgICAgICAgIFRIRU4gJ1lFUycgRUxTRSAnTk8nIEVORCBBUyB5ZXNfb3Jf
bm8pIEFTIGlzX2dyYW50YWJsZQogCiAgICAgRlJPTSAoCi0gICAgICAgICAgICBTRUxFQ1Qgb2lk
LCByZWxuYW1lLCByZWxuYW1lc3BhY2UsIHJlbGtpbmQsIHJlbG93bmVyLCAoYWNsZXhwbG9kZShj
b2FsZXNjZShyZWxhY2wsIGFjbGRlZmF1bHQoJ3InLCByZWxvd25lcikpKSkuKiBGUk9NIHBnX2Ns
YXNzCisgICAgICAgICAgICBTRUxFQ1Qgb2lkLCByZWxuYW1lLCByZWxuYW1lc3BhY2UsIHJlbGtp
bmQsIHJlbG93bmVyLCAoYWNsZXhwbG9kZShjb2FsZXNjZShyZWxhY2wsIGFjbGRlZmF1bHQoJ2cn
LCByZWxvd25lcikpKSkuKiBGUk9NIHBnX2NsYXNzCiAgICAgICAgICApIEFTIGMgKG9pZCwgcmVs
bmFtZSwgcmVsbmFtZXNwYWNlLCByZWxraW5kLCByZWxvd25lciwgZ3JhbnRvciwgZ3JhbnRlZSwg
cHJ0eXBlLCBncmFudGFibGUpLAogICAgICAgICAgcGdfbmFtZXNwYWNlIG5jLAogICAgICAgICAg
cGdfYXV0aGlkIHVfZ3JhbnRvciwKZGlmZiAtLWdpdCBhL3NyYy9iYWNrZW5kL3V0aWxzL2FkdC9h
Y2wuYyBiL3NyYy9iYWNrZW5kL3V0aWxzL2FkdC9hY2wuYwppbmRleCAwMWNhYTEyZWNhNy4uZTI1
NDdkNzE5ZWQgMTAwNjQ0Ci0tLSBhL3NyYy9iYWNrZW5kL3V0aWxzL2FkdC9hY2wuYworKysgYi9z
cmMvYmFja2VuZC91dGlscy9hZHQvYWNsLmMKQEAgLTk1Niw2ICs5NTYsOSBAQCBhY2xkZWZhdWx0
X3NxbChQR19GVU5DVElPTl9BUkdTKQogCQljYXNlICdjJzoKIAkJCW9ianR5cGUgPSBPQkpFQ1Rf
Q09MVU1OOwogCQkJYnJlYWs7CisJCWNhc2UgJ2cnOgorCQkJb2JqdHlwZSA9IE9CSkVDVF9QUk9Q
R1JBUEg7CisJCQlicmVhazsKIAkJY2FzZSAncic6CiAJCQlvYmp0eXBlID0gT0JKRUNUX1RBQkxF
OwogCQkJYnJlYWs7CmRpZmYgLS1naXQgYS9zcmMvYmluL3BnX2R1bXAvcGdfZHVtcC5jIGIvc3Jj
L2Jpbi9wZ19kdW1wL3BnX2R1bXAuYwppbmRleCBmNjdkYWY4NTkxMS4uNGQ2NjBkMTRiNGMgMTAw
NjQ0Ci0tLSBhL3NyYy9iaW4vcGdfZHVtcC9wZ19kdW1wLmMKKysrIGIvc3JjL2Jpbi9wZ19kdW1w
L3BnX2R1bXAuYwpAQCAtNzIzMSw4ICs3MjMxLDE3IEBAIGdldFRhYmxlcyhBcmNoaXZlICpmb3V0
LCBpbnQgKm51bVRhYmxlcykKIAkJCQkJCSAiYy5yZWxoYXN0cmlnZ2VycywgYy5yZWxwZXJzaXN0
ZW5jZSwgIgogCQkJCQkJICJjLnJlbG9mdHlwZSwgIgogCQkJCQkJICJjLnJlbGFjbCwgIgotCQkJ
CQkJICJhY2xkZWZhdWx0KENBU0UgV0hFTiBjLnJlbGtpbmQgPSAiIENwcEFzU3RyaW5nMihSRUxL
SU5EX1NFUVVFTkNFKQotCQkJCQkJICIgVEhFTiAncyc6OlwiY2hhclwiIEVMU0UgJ3InOjpcImNo
YXJcIiBFTkQsIGMucmVsb3duZXIpIEFTIGFjbGRlZmF1bHQsICIKKwkJCQkJCSAiYWNsZGVmYXVs
dChDQVNFIgorCQkJCQkJICIgV0hFTiBjLnJlbGtpbmQgPSAiIENwcEFzU3RyaW5nMihSRUxLSU5E
X1BST1BHUkFQSCkpOworCS8qIDE5YmV0YTEgZGlkbid0IHN1cHBvcnQgYWNsZGVmYXVsdCgnZycp
LCBzbyB3ZSdsbCBmaXggdGhhdCBiZWxvdyAqLworCWFwcGVuZFBRRXhwQnVmZmVyU3RyKHF1ZXJ5
LAorCQkJCQkJIGZvdXQtPnJlbW90ZVZlcnNpb24gPj0gMjAwMDAwID8KKwkJCQkJCSAiIFRIRU4g
J2cnOjpcImNoYXJcIiIgOgorCQkJCQkJICIgVEhFTiBOVUxMIik7CisJYXBwZW5kUFFFeHBCdWZm
ZXJTdHIocXVlcnksCisJCQkJCQkgIiBXSEVOIGMucmVsa2luZCA9ICIgQ3BwQXNTdHJpbmcyKFJF
TEtJTkRfU0VRVUVOQ0UpCisJCQkJCQkgIiBUSEVOICdzJzo6XCJjaGFyXCIiCisJCQkJCQkgIiBF
TFNFICdyJzo6XCJjaGFyXCIgRU5ELCBjLnJlbG93bmVyKSBBUyBhY2xkZWZhdWx0LCAiCiAJCQkJ
CQkgIkNBU0UgV0hFTiBjLnJlbGtpbmQgPSAiIENwcEFzU3RyaW5nMihSRUxLSU5EX0ZPUkVJR05f
VEFCTEUpICIgVEhFTiAiCiAJCQkJCQkgIihTRUxFQ1QgZnRzZXJ2ZXIgRlJPTSBwZ19jYXRhbG9n
LnBnX2ZvcmVpZ25fdGFibGUgV0hFUkUgZnRyZWxpZCA9IGMub2lkKSAiCiAJCQkJCQkgIkVMU0Ug
MCBFTkQgQVMgZm9yZWlnbnNlcnZlciwgIgpAQCAtNzQxOCw3ICs3NDI3LDcgQEAgZ2V0VGFibGVz
KEFyY2hpdmUgKmZvdXQsIGludCAqbnVtVGFibGVzKQogCQl0YmxpbmZvW2ldLmRvYmoubmFtZXNw
YWNlID0KIAkJCWZpbmROYW1lc3BhY2UoYXRvb2lkKFBRZ2V0dmFsdWUocmVzLCBpLCBpX3JlbG5h
bWVzcGFjZSkpKTsKIAkJdGJsaW5mb1tpXS5kYWNsLmFjbCA9IHBnX3N0cmR1cChQUWdldHZhbHVl
KHJlcywgaSwgaV9yZWxhY2wpKTsKLQkJdGJsaW5mb1tpXS5kYWNsLmFjbGRlZmF1bHQgPSBwZ19z
dHJkdXAoUFFnZXR2YWx1ZShyZXMsIGksIGlfYWNsZGVmYXVsdCkpOworCQkvKiBhY2xkZWZhdWx0
IGNvbXB1dGVkIGJlbG93ICovCiAJCXRibGluZm9baV0uZGFjbC5wcml2dHlwZSA9IDA7CiAJCXRi
bGluZm9baV0uZGFjbC5pbml0cHJpdnMgPSBOVUxMOwogCQl0YmxpbmZvW2ldLnJlbGtpbmQgPSAq
KFBRZ2V0dmFsdWUocmVzLCBpLCBpX3JlbGtpbmQpKTsKQEAgLTc0NzAsNiArNzQ3OSwyOCBAQCBn
ZXRUYWJsZXMoQXJjaGl2ZSAqZm91dCwgaW50ICpudW1UYWJsZXMpCiAJCXRibGluZm9baV0uaXNf
aWRlbnRpdHlfc2VxdWVuY2UgPSAoc3RyY21wKFBRZ2V0dmFsdWUocmVzLCBpLCBpX2lzX2lkZW50
aXR5X3NlcXVlbmNlKSwgInQiKSA9PSAwKTsKIAkJdGJsaW5mb1tpXS5pc3BhcnRpdGlvbiA9IChz
dHJjbXAoUFFnZXR2YWx1ZShyZXMsIGksIGlfaXNwYXJ0aXRpb24pLCAidCIpID09IDApOwogCisJ
CWlmICh0YmxpbmZvW2ldLnJlbGtpbmQgPT0gUkVMS0lORF9QUk9QR1JBUEggJiYKKwkJCSEoZm91
dC0+cmVtb3RlVmVyc2lvbiA+PSAyMDAwMDApKQorCQl7CisJCQlQUUV4cEJ1ZmZlciBhY2xhcnJh
eSA9IGNyZWF0ZVBRRXhwQnVmZmVyKCk7CisJCQlQUUV4cEJ1ZmZlciBhY2xpdGVtID0gY3JlYXRl
UFFFeHBCdWZmZXIoKTsKKworCQkJLyogU3RhbmRhcmQgQUNMIGFzIG9mIHYxOSBpcyB7b3duZXI9
ci9vd25lcn0gKi8KKwkJCWFwcGVuZFBRRXhwQnVmZmVyQ2hhcihhY2xhcnJheSwgJ3snKTsKKwkJ
CXF1b3RlQWNsVXNlck5hbWUoYWNsaXRlbSwgdGJsaW5mb1tpXS5yb2xuYW1lKTsKKwkJCWFwcGVu
ZFBRRXhwQnVmZmVyU3RyKGFjbGl0ZW0sICI9ci8iKTsKKwkJCXF1b3RlQWNsVXNlck5hbWUoYWNs
aXRlbSwgdGJsaW5mb1tpXS5yb2xuYW1lKTsKKwkJCWFwcGVuZFBHQXJyYXkoYWNsYXJyYXksIGFj
bGl0ZW0tPmRhdGEpOworCQkJYXBwZW5kUFFFeHBCdWZmZXJDaGFyKGFjbGFycmF5LCAnfScpOwor
CisJCQl0YmxpbmZvW2ldLmRhY2wuYWNsZGVmYXVsdCA9IHBzdHJkdXAoYWNsYXJyYXktPmRhdGEp
OworCisJCQlkZXN0cm95UFFFeHBCdWZmZXIoYWNsYXJyYXkpOworCQkJZGVzdHJveVBRRXhwQnVm
ZmVyKGFjbGl0ZW0pOworCQl9CisJCWVsc2UKKwkJCXRibGluZm9baV0uZGFjbC5hY2xkZWZhdWx0
ID0gcGdfc3RyZHVwKFBRZ2V0dmFsdWUocmVzLCBpLCBpX2FjbGRlZmF1bHQpKTsKKwogCQkvKiBv
dGhlciBmaWVsZHMgd2VyZSB6ZXJvZWQgYWJvdmUgKi8KIAogCQkvKgotLSAKMi4zNC4xCgo=
--000000000000542eac0655b28a6d
Content-Type: text/x-patch; charset="US-ASCII";
	name="v20260703-0011-Fix-GRANT-.-TABLE-on-a-property-graph.patch"
Content-Disposition: attachment;
	filename="v20260703-0011-Fix-GRANT-.-TABLE-on-a-property-graph.patch"
Content-Transfer-Encoding: base64
Content-ID: <f_mr4swsgz0>
X-Attachment-Id: f_mr4swsgz0

RnJvbSBiMjFlZDQyNTUwMGM4YmQ0OTJlZDdhY2Q2MTU3MTVjOWQzMmFlM2E3IE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBBc2h1dG9zaCBCYXBhdCA8YXNodXRvc2guYmFwYXQub3NzQGdt
YWlsLmNvbT4KRGF0ZTogV2VkLCAxIEp1bCAyMDI2IDIxOjM0OjQ4ICswNTMwClN1YmplY3Q6IFtQ
QVRDSCB2MjAyNjA3MDMgMTEvMTNdIEZpeCBHUkFOVCAuLi4gVEFCTEUgb24gYSBwcm9wZXJ0eSBn
cmFwaAoKQSBwcm9wZXJ0eSBncmFwaCBvbmx5IHN1cHBvcnRzIHRoZSBTRUxFQ1QgcHJpdmlsZWdl
cy4gUHJpdmlsZWdlcyBjYW4gYmUKZ3JhbnRlZCB1c2luZyBlaXRoZXIgR1JBTlQgLi4uIFBST1BF
UlRZIEdSQVBIIG9yIEdSQU5UIC4uLiBUQUJMRS4gIFdoZW4KdGhlIEdSQU5UIC4uLiBUQUJMRSBm
b3JtIGlzIHVzZWQsIGlnbm9yZSBhbnkgcHJpdmlsZWdlcyBvdGhlciB0aGFuIFNFTEVDVAphbmQg
ZW1pdCBhIHdhcm5pbmcsIGFzIHdlIGFscmVhZHkgZG8gZm9yIHNlcXVlbmNlcy4KCldoaWxlIGhl
cmUsIGFkZCB0aGUgbWlzc2luZyBSRUxLSU5EX1BST1BHUkFQSCBjYXNlcyBpbiBwZ19jbGFzc19h
Y2xtYXNrX2V4dCgpCmFuZCBpbiB0aGUgb2JqZWN0LXR5cGUgc3dpdGNoIGluIEV4ZWNHcmFudF9S
ZWxhdGlvbigpIHNvIHRoYXQgdGhlIGRlZmF1bHQgQUNMCmFuZCB0aGUgb2JqdHlwZSBwYXNzZWQg
dG8gcmVzdHJpY3RfYW5kX2NoZWNrX2dyYW50KCkgYXJlIGNvcnJlY3QuCgpBdXRob3I6IEFzaHV0
b3NoIEJhcGF0IDxhc2h1dG9zaC5iYXBhdC5vc3NAZ21haWwuY29tPgpEaXNjdXNzaW9uOiBodHRw
czovL3d3dy5wb3N0Z3Jlc3FsLm9yZy9tZXNzYWdlLWlkLzIwMjYwNjMwMDIzMzA4LmM3Lm5vYWht
aXNjaEBtaWNyb3NvZnQuY29tCi0tLQogc3JjL2JhY2tlbmQvY2F0YWxvZy9hY2xjaGsuYyAgICAg
ICAgICAgICAgICAgIHwgMzEgKysrKysrKysrKysrKysrKysrLQogLi4uL2V4cGVjdGVkL2NyZWF0
ZV9wcm9wZXJ0eV9ncmFwaC5vdXQgICAgICAgIHwgIDIgKysKIC4uLi9yZWdyZXNzL3NxbC9jcmVh
dGVfcHJvcGVydHlfZ3JhcGguc3FsICAgICB8ICAxICsKIDMgZmlsZXMgY2hhbmdlZCwgMzMgaW5z
ZXJ0aW9ucygrKSwgMSBkZWxldGlvbigtKQoKZGlmZiAtLWdpdCBhL3NyYy9iYWNrZW5kL2NhdGFs
b2cvYWNsY2hrLmMgYi9zcmMvYmFja2VuZC9jYXRhbG9nL2FjbGNoay5jCmluZGV4IDE0MGNkMTMw
MmY1Li41NGI1OTg5MmM0MyAxMDA2NDQKLS0tIGEvc3JjL2JhY2tlbmQvY2F0YWxvZy9hY2xjaGsu
YworKysgYi9zcmMvYmFja2VuZC9jYXRhbG9nL2FjbGNoay5jCkBAIC0xNzg0LDcgKzE3ODQsNyBA
QCBFeGVjR3JhbnRfQXR0cmlidXRlKEludGVybmFsR3JhbnQgKmlzdG10LCBPaWQgcmVsT2lkLCBj
b25zdCBjaGFyICpyZWxuYW1lLAogfQogCiAvKgotICoJVGhpcyBwcm9jZXNzZXMgYm90aCBzZXF1
ZW5jZXMgYW5kIG5vbi1zZXF1ZW5jZXMuCisgKiBUaGlzIHByb2Nlc3NlcyBhbGwgcGdfY2xhc3Mg
ZW50cmllcyBpbmNsdWRpbmcgc2VxdWVuY2VzIGFuZCBwcm9wZXJ0eSBncmFwaHMuCiAgKi8KIHN0
YXRpYyB2b2lkCiBFeGVjR3JhbnRfUmVsYXRpb24oSW50ZXJuYWxHcmFudCAqaXN0bXQpCkBAIC0x
ODkxLDYgKzE4OTEsMjkgQEAgRXhlY0dyYW50X1JlbGF0aW9uKEludGVybmFsR3JhbnQgKmlzdG10
KQogCQkJCQl0aGlzX3ByaXZpbGVnZXMgJj0gKEFjbE1vZGUpIEFDTF9BTExfUklHSFRTX1NFUVVF
TkNFOwogCQkJCX0KIAkJCX0KKwkJCWVsc2UgaWYgKHBnX2NsYXNzX3R1cGxlLT5yZWxraW5kID09
IFJFTEtJTkRfUFJPUEdSQVBIKQorCQkJeworCQkJCS8qCisJCQkJICogUGVyIHRoZSBTUUwgc3Rh
bmRhcmQsIHByb3BlcnR5IGdyYXBocyBzaGFyZSB0aGUgbmFtZXNwYWNlCisJCQkJICogd2l0aCB0
YWJsZXMsIHNvIEdSQU5UIC4uLiBPTiBUQUJMRSBhbHNvIHdvcmtzIG9uIGEgcHJvcGVydHkKKwkJ
CQkgKiBncmFwaC4gQSBwcm9wZXJ0eSBncmFwaCBvbmx5IHN1cHBvcnRzIFNFTEVDVCwgc28gbWFz
ayBvZmYKKwkJCQkgKiBhbnkgb3RoZXIgcmVxdWVzdGVkIHByaXZpbGVnZXMgYW5kIGVtaXQgYSB3
YXJuaW5nLCBhcyB3ZSBkbworCQkJCSAqIGZvciBzZXF1ZW5jZXMuCisJCQkJICovCisJCQkJaWYg
KHRoaXNfcHJpdmlsZWdlcyAmIH4oKEFjbE1vZGUpIEFDTF9BTExfUklHSFRTX1BST1BHUkFQSCkp
CisJCQkJeworCQkJCQkvKgorCQkJCQkgKiBNZW50aW9uIHRoZSBvYmplY3QgbmFtZSBiZWNhdXNl
IHRoZSB1c2VyIG5lZWRzIHRvIGtub3cKKwkJCQkJICogd2hpY2ggb3BlcmF0aW9ucyBzdWNjZWVk
ZWQuICBUaGlzIGlzIHJlcXVpcmVkIGJlY2F1c2UKKwkJCQkJICogV0FSTklORyBhbGxvd3MgdGhl
IGNvbW1hbmQgdG8gY29udGludWUuCisJCQkJCSAqLworCQkJCQllcmVwb3J0KFdBUk5JTkcsCisJ
CQkJCQkJKGVycmNvZGUoRVJSQ09ERV9JTlZBTElEX0dSQU5UX09QRVJBVElPTiksCisJCQkJCQkJ
IGVycm1zZygicHJvcGVydHkgZ3JhcGggXCIlc1wiIG9ubHkgc3VwcG9ydHMgU0VMRUNUIHByaXZp
bGVnZXMiLAorCQkJCQkJCQkJTmFtZVN0cihwZ19jbGFzc190dXBsZS0+cmVsbmFtZSkpKSk7CisJ
CQkJCXRoaXNfcHJpdmlsZWdlcyAmPSAoQWNsTW9kZSkgQUNMX0FMTF9SSUdIVFNfUFJPUEdSQVBI
OworCQkJCX0KKwkJCX0KIAkJCWVsc2UKIAkJCXsKIAkJCQlpZiAodGhpc19wcml2aWxlZ2VzICYg
figoQWNsTW9kZSkgQUNMX0FMTF9SSUdIVFNfUkVMQVRJT04pKQpAQCAtMTk5Niw2ICsyMDE5LDkg
QEAgRXhlY0dyYW50X1JlbGF0aW9uKEludGVybmFsR3JhbnQgKmlzdG10KQogCQkJCWNhc2UgUkVM
S0lORF9TRVFVRU5DRToKIAkJCQkJb2JqdHlwZSA9IE9CSkVDVF9TRVFVRU5DRTsKIAkJCQkJYnJl
YWs7CisJCQkJY2FzZSBSRUxLSU5EX1BST1BHUkFQSDoKKwkJCQkJb2JqdHlwZSA9IE9CSkVDVF9Q
Uk9QR1JBUEg7CisJCQkJCWJyZWFrOwogCQkJCWRlZmF1bHQ6CiAJCQkJCW9ianR5cGUgPSBPQkpF
Q1RfVEFCTEU7CiAJCQkJCWJyZWFrOwpAQCAtMzM4OSw2ICszNDE1LDkgQEAgcGdfY2xhc3NfYWNs
bWFza19leHQoT2lkIHRhYmxlX29pZCwgT2lkIHJvbGVpZCwgQWNsTW9kZSBtYXNrLAogCQkJY2Fz
ZSBSRUxLSU5EX1NFUVVFTkNFOgogCQkJCWFjbCA9IGFjbGRlZmF1bHQoT0JKRUNUX1NFUVVFTkNF
LCBvd25lcklkKTsKIAkJCQlicmVhazsKKwkJCWNhc2UgUkVMS0lORF9QUk9QR1JBUEg6CisJCQkJ
YWNsID0gYWNsZGVmYXVsdChPQkpFQ1RfUFJPUEdSQVBILCBvd25lcklkKTsKKwkJCQlicmVhazsK
IAkJCWRlZmF1bHQ6CiAJCQkJYWNsID0gYWNsZGVmYXVsdChPQkpFQ1RfVEFCTEUsIG93bmVySWQp
OwogCQkJCWJyZWFrOwpkaWZmIC0tZ2l0IGEvc3JjL3Rlc3QvcmVncmVzcy9leHBlY3RlZC9jcmVh
dGVfcHJvcGVydHlfZ3JhcGgub3V0IGIvc3JjL3Rlc3QvcmVncmVzcy9leHBlY3RlZC9jcmVhdGVf
cHJvcGVydHlfZ3JhcGgub3V0CmluZGV4IGU5ZjkxZjc3ZWU5Li43MTM5NjZlOGE5ZSAxMDA2NDQK
LS0tIGEvc3JjL3Rlc3QvcmVncmVzcy9leHBlY3RlZC9jcmVhdGVfcHJvcGVydHlfZ3JhcGgub3V0
CisrKyBiL3NyYy90ZXN0L3JlZ3Jlc3MvZXhwZWN0ZWQvY3JlYXRlX3Byb3BlcnR5X2dyYXBoLm91
dApAQCAtMjUxLDYgKzI1MSw4IEBAIFNFVCBST0xFIHJlZ3Jlc3NfZ3JhcGhfdXNlcjE7CiBHUkFO
VCBTRUxFQ1QgT04gUFJPUEVSVFkgR1JBUEggZzEgVE8gcmVncmVzc19ncmFwaF91c2VyMjsKIEdS
QU5UIFVQREFURSBPTiBQUk9QRVJUWSBHUkFQSCBnMSBUTyByZWdyZXNzX2dyYXBoX3VzZXIyOyAg
LS0gZmFpbAogRVJST1I6ICBpbnZhbGlkIHByaXZpbGVnZSB0eXBlIFVQREFURSBmb3IgcHJvcGVy
dHkgZ3JhcGgKK0dSQU5UIFVQREFURSBPTiBUQUJMRSBnMSBUTyByZWdyZXNzX2dyYXBoX3VzZXIy
OyAgLS0gd2FybmluZworV0FSTklORzogIHByb3BlcnR5IGdyYXBoICJnMSIgb25seSBzdXBwb3J0
cyBTRUxFQ1QgcHJpdmlsZWdlcwogUkVTRVQgUk9MRTsKIC0tIGNvbGxhdGlvbgogQ1JFQVRFIFRB
QkxFIHRjMSAoYSBpbnQsIGIgdGV4dCk7CmRpZmYgLS1naXQgYS9zcmMvdGVzdC9yZWdyZXNzL3Nx
bC9jcmVhdGVfcHJvcGVydHlfZ3JhcGguc3FsIGIvc3JjL3Rlc3QvcmVncmVzcy9zcWwvY3JlYXRl
X3Byb3BlcnR5X2dyYXBoLnNxbAppbmRleCAwODM0MWUxM2E1MC4uNTMyNWQyMjIwNmUgMTAwNjQ0
Ci0tLSBhL3NyYy90ZXN0L3JlZ3Jlc3Mvc3FsL2NyZWF0ZV9wcm9wZXJ0eV9ncmFwaC5zcWwKKysr
IGIvc3JjL3Rlc3QvcmVncmVzcy9zcWwvY3JlYXRlX3Byb3BlcnR5X2dyYXBoLnNxbApAQCAtMTk3
LDYgKzE5Nyw3IEBAIEFMVEVSIFBST1BFUlRZIEdSQVBIIGcxIE9XTkVSIFRPIHJlZ3Jlc3NfZ3Jh
cGhfdXNlcjE7CiBTRVQgUk9MRSByZWdyZXNzX2dyYXBoX3VzZXIxOwogR1JBTlQgU0VMRUNUIE9O
IFBST1BFUlRZIEdSQVBIIGcxIFRPIHJlZ3Jlc3NfZ3JhcGhfdXNlcjI7CiBHUkFOVCBVUERBVEUg
T04gUFJPUEVSVFkgR1JBUEggZzEgVE8gcmVncmVzc19ncmFwaF91c2VyMjsgIC0tIGZhaWwKK0dS
QU5UIFVQREFURSBPTiBUQUJMRSBnMSBUTyByZWdyZXNzX2dyYXBoX3VzZXIyOyAgLS0gd2Fybmlu
ZwogUkVTRVQgUk9MRTsKIAogLS0gY29sbGF0aW9uCi0tIAoyLjM0LjEKCg==
--000000000000542eac0655b28a6d--