From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 From: Leigh Scott To: git-commits@fedoraproject.org Subject: [rpms/cinnamon] f45: Improve menu applet fix Date: Sun, 23 Aug 2026 15:38:12 GMT Message-ID: <178749949200.1.624494471882613100.rpms-cinnamon-99f7f1bf48b5@fedoraproject.org> List-ID: X-Git-Repo: rpms/cinnamon X-Git-Branch: f45 X-Git-Rev: 99f7f1bf48b516e23d0f130a3bcb6f4359f0e820 QSBuZXcgY29tbWl0IGhhcyBiZWVuIHB1c2hlZC4KClJlcG8gICA6IHJwbXMvY2lubmFtb24KQnJh bmNoIDogZjQ1CkNvbW1pdCA6IDk5ZjdmMWJmNDhiNTE2ZTIzZDBmMTMwYTNiY2I2ZjQzNTlmMGU4 MjAKQXV0aG9yIDogTGVpZ2ggU2NvdHQgPGxlaWdoMTIzbGludXhAZ21haWwuY29tPgpEYXRlICAg OiAyMDI2LTA4LTIzVDE2OjM3OjU5KzAxOjAwClN0YXRzICA6ICsxMjAvLTg5IGluIDMgZmlsZShz KQpVUkwgICAgOiBodHRwczovL3NyYy5mZWRvcmFwcm9qZWN0Lm9yZy9ycG1zL2Npbm5hbW9uL2Mv OTlmN2YxYmY0OGI1MTZlMjNkMGYxMzBhM2JjYjZmNDM1OWYwZTgyMD9icmFuY2g9ZjQ1CgpMb2c6 CkltcHJvdmUgbWVudSBhcHBsZXQgZml4CgotLS0KZGlmZiAtLWdpdCBhL2Npbm5hbW9uLnNwZWMg Yi9jaW5uYW1vbi5zcGVjCmluZGV4IDFmY2FkNDguLmUzMWY5YWEgMTAwNjQ0Ci0tLSBhL2Npbm5h bW9uLnNwZWMKKysrIGIvY2lubmFtb24uc3BlYwpAQCAtMTAsNyArMTAsNyBAQAogCiBOYW1lOiAg ICAgICAgICAgY2lubmFtb24KIFZlcnNpb246ICAgICAgICA2LjcuNV51bnN0YWJsZQotUmVsZWFz ZTogICAgICAgIDIlez9kaXN0fQorUmVsZWFzZTogICAgICAgIDMlez9kaXN0fQogU3VtbWFyeTog ICAgICAgIFdpbmRvdyBtYW5hZ2VtZW50IGFuZCBhcHBsaWNhdGlvbiBsYXVuY2hpbmcgZm9yIENp bm5hbW9uCiBMaWNlbnNlOiAgICAgICAgR1BMLTIuMC1vci1sYXRlciBBTkQgR1BMLTMuMC1vci1s YXRlciBBTkQgTEdQTC0yLjAtb3ItbGF0ZXIgQU5EIExHUEwtMi4xLW9ubHkgQU5EIExHUEwtMi4x LW9yLWxhdGVyIEFORCBNSVQKIFVSTDogICAgICAgICAgICBodHRwczovL2dpdGh1Yi5jb20vbGlu dXhtaW50LyV7bmFtZX0KQEAgLTIzLDcgKzIzLDcgQEAgUGF0Y2gwOiAgICAgICAgIHNldF93aGVl bC5wYXRjaAogUGF0Y2gxOiAgICAgICAgIGRlZmF1bHRfcGFuYWxfbGF1bmNoZXIucGF0Y2gKIFBh dGNoMjogICAgICAgICByZW1vdmVfY3JhcF9mcm9tX21lbnUucGF0Y2gKIFBhdGNoMzogICAgICAg ICBzZXRfbWVudV9kZWZhdWx0cy5wYXRjaAotUGF0Y2g0OiAgICAgICAgIGdseWNpbl9maXgucGF0 Y2gKK1BhdGNoNDogICAgICAgICAldXJsL3B1bGwvMTM5NDcucGF0Y2gjL2dseWNpbl9yYXRlbGlt aXQucGF0Y2gKIAogRXhjbHVkZUFyY2g6ICAgICV7aXg4Nn0KIApAQCAtMzEzLDYgKzMxMyw5IEBA IHJtIC1yZiAle2J1aWxkcm9vdH0le19tYW5kaXJ9L21hbjEvY2lubmFtb24yZCoKICV7X2RhdGFk aXJ9L2RidXMtMS9zZXJ2aWNlcy9vcmcuJXtuYW1lfS5DYWxlbmRhclNlcnZlci5zZXJ2aWNlCiAK ICVjaGFuZ2Vsb2cKKyogU3VuIEF1ZyAyMyAyMDI2IExlaWdoIFNjb3R0IDxsZWlnaDEyM2xpbnV4 QGdtYWlsLmNvbT4gLSA2LjcuNV51bnN0YWJsZS0zCistIEltcHJvdmUgbWVudSBhcHBsZXQgZml4 CisKICogV2VkIEF1ZyAxOSAyMDI2IExlaWdoIFNjb3R0IDxsZWlnaDEyM2xpbnV4QGdtYWlsLmNv bT4gLSA2LjcuNV51bnN0YWJsZS0yCiAtIEZpeCBtZW51IGFwcGxldCBsb2FkaW5nIGlzc3VlCiAK CmRpZmYgLS1naXQgYS9nbHljaW5fZml4LnBhdGNoIGIvZ2x5Y2luX2ZpeC5wYXRjaApkZWxldGVk IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMjRlYTNkMS4uMDAwMDAwMAotLS0gYS9nbHljaW5fZml4 LnBhdGNoCisrKyAvZGV2L251bGwKQEAgLTEsODcgKzAsMCBAQAotZGlmZiAtdU5ycCBhL3NyYy9z dC9zdC10ZXh0dXJlLWNhY2hlLmMgYi9zcmMvc3Qvc3QtdGV4dHVyZS1jYWNoZS5jCi0tLS0gYS9z cmMvc3Qvc3QtdGV4dHVyZS1jYWNoZS5jCTIwMjYtMDgtMTUgMTE6NDU6NTYuMDAwMDAwMDAwICsw MTAwCi0rKysgYi9zcmMvc3Qvc3QtdGV4dHVyZS1jYWNoZS5jCTIwMjYtMDgtMTkgMTY6MzE6MTYu NzA2MTI4NDk0ICswMTAwCi1AQCAtNjc0LDYgKzY3NCw0NSBAQCBvdXQ6Ci0gICB0ZXh0dXJlX2xv YWRfZGF0YV9mcmVlIChkYXRhKTsKLSB9Ci0gCi0rdHlwZWRlZiBzdHJ1Y3QgewotKyAgQXN5bmNU ZXh0dXJlTG9hZERhdGEgKmRhdGE7Ci0rICBnYm9vbGVhbiBzeW1ib2xpYzsKLSt9IEljb25UaHJl YWREYXRhOwotKwotK3N0YXRpYyBnYm9vbGVhbgotK2ljb25fdGhyZWFkX2ZpbmlzaF9pZGxlIChn cG9pbnRlciB1c2VyX2RhdGEpCi0rewotKyAgSWNvblRocmVhZERhdGEgKml0ZCA9IHVzZXJfZGF0 YTsKLSsgIEFzeW5jVGV4dHVyZUxvYWREYXRhICpkYXRhID0gaXRkLT5kYXRhOwotKyAgR2RrUGl4 YnVmICpwaXhidWYgPSBOVUxMOwotKwotKyAgaWYgKGl0ZC0+c3ltYm9saWMgJiYgZGF0YS0+Y29s b3JzKSB7Ci0rICAgIEdka1JHQkEgZmcsIHN1Y2Nlc3MsIHdhcm5pbmcsIGVycm9yOwotKyAgICBy Z2JhX2Zyb21fY2x1dHRlciAoJmZnLCAmZGF0YS0+Y29sb3JzLT5mb3JlZ3JvdW5kKTsKLSsgICAg cmdiYV9mcm9tX2NsdXR0ZXIgKCZzdWNjZXNzLCAmZGF0YS0+Y29sb3JzLT5zdWNjZXNzKTsKLSsg ICAgcmdiYV9mcm9tX2NsdXR0ZXIgKCZ3YXJuaW5nLCAmZGF0YS0+Y29sb3JzLT53YXJuaW5nKTsK LSsgICAgcmdiYV9mcm9tX2NsdXR0ZXIgKCZlcnJvciwgJmRhdGEtPmNvbG9ycy0+ZXJyb3IpOwot KwotKyAgICBwaXhidWYgPSBndGtfaWNvbl9pbmZvX2xvYWRfc3ltYm9saWMgKGRhdGEtPmljb25f aW5mbywKLSsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAmZmcsICZz dWNjZXNzLAotKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICZ3YXJu aW5nLCAmZXJyb3IsCi0rICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg TlVMTCwgTlVMTCk7Ci0rICB9IGVsc2UgewotKyAgICBwaXhidWYgPSBndGtfaWNvbl9pbmZvX2xv YWRfaWNvbiAoZGF0YS0+aWNvbl9pbmZvLCBOVUxMKTsKLSsgIH0KLSsKLSsgIGZpbmlzaF90ZXh0 dXJlX2xvYWQgKGRhdGEsIHBpeGJ1Zik7Ci0rICBnX2NsZWFyX29iamVjdCAoJnBpeGJ1Zik7Ci0r ICBnX2ZyZWUgKGl0ZCk7Ci0rICByZXR1cm4gR19TT1VSQ0VfUkVNT1ZFOwotK30KLSsKLStzdGF0 aWMgZ3BvaW50ZXIKLStpY29uX3RocmVhZF9mdW5jIChncG9pbnRlciB1c2VyX2RhdGEpCi0rewot KyAgZ19pZGxlX2FkZCAoaWNvbl90aHJlYWRfZmluaXNoX2lkbGUsIHVzZXJfZGF0YSk7Ci0rICBy ZXR1cm4gTlVMTDsKLSt9Ci0gc3RhdGljIHZvaWQKLSBvbl9zeW1ib2xpY19pY29uX2xvYWRlZCAo R09iamVjdCAgICAgICpzb3VyY2UsCi0gICAgICAgICAgICAgICAgICAgICAgICAgIEdBc3luY1Jl c3VsdCAqcmVzdWx0LAotQEAgLTcyMCwzMSArNzU5LDEyIEBAIGxvYWRfdGV4dHVyZV9hc3luYyAo U3RUZXh0dXJlQ2FjaGUKLSAgICAgfQotICAgZWxzZSBpZiAoZGF0YS0+aWNvbl9pbmZvKQotICAg ICB7Ci0tICAgICAgU3RJY29uQ29sb3JzICpjb2xvcnMgPSBkYXRhLT5jb2xvcnM7Ci0tICAgICAg aWYgKGNvbG9ycykKLS0gICAgICAgIHsKLS0gICAgICAgICAgR2RrUkdCQSBmb3JlZ3JvdW5kX2Nv bG9yOwotLSAgICAgICAgICBHZGtSR0JBIHN1Y2Nlc3NfY29sb3I7Ci0tICAgICAgICAgIEdka1JH QkEgd2FybmluZ19jb2xvcjsKLS0gICAgICAgICAgR2RrUkdCQSBlcnJvcl9jb2xvcjsKLS0KLS0g ICAgICAgICAgcmdiYV9mcm9tX2NsdXR0ZXIgKCZmb3JlZ3JvdW5kX2NvbG9yLCAmY29sb3JzLT5m b3JlZ3JvdW5kKTsKLS0gICAgICAgICAgcmdiYV9mcm9tX2NsdXR0ZXIgKCZzdWNjZXNzX2NvbG9y LCAmY29sb3JzLT5zdWNjZXNzKTsKLS0gICAgICAgICAgcmdiYV9mcm9tX2NsdXR0ZXIgKCZ3YXJu aW5nX2NvbG9yLCAmY29sb3JzLT53YXJuaW5nKTsKLS0gICAgICAgICAgcmdiYV9mcm9tX2NsdXR0 ZXIgKCZlcnJvcl9jb2xvciwgJmNvbG9ycy0+ZXJyb3IpOwotLQotLSAgICAgICAgICBndGtfaWNv bl9pbmZvX2xvYWRfc3ltYm9saWNfYXN5bmMgKGRhdGEtPmljb25faW5mbywKLS0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAmZm9yZWdyb3VuZF9jb2xvciwgJnN1 Y2Nlc3NfY29sb3IsCi0tICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgJndhcm5pbmdfY29sb3IsICZlcnJvcl9jb2xvciwKLS0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBjYWNoZS0+cHJpdi0+Y2FuY2VsbGFibGUsCi0tICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgb25fc3ltYm9saWNfaWNvbl9s b2FkZWQsIGRhdGEpOwotLSAgICAgICAgfQotLSAgICAgIGVsc2UKLS0gICAgICAgIHsKLS0gICAg ICAgICAgZ3RrX2ljb25faW5mb19sb2FkX2ljb25fYXN5bmMgKGRhdGEtPmljb25faW5mbywKLS0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNhY2hlLT5wcml2LT5jYW5j ZWxsYWJsZSwKLS0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG9uX2lj b25fbG9hZGVkLCBkYXRhKTsKLS0gICAgICAgIH0KLSsgICAgICBJY29uVGhyZWFkRGF0YSAqaXRk ID0gZ19uZXcwIChJY29uVGhyZWFkRGF0YSwgMSk7Ci0rICAgICAgaXRkLT5kYXRhID0gZGF0YTsK LSsgICAgICBpdGQtPnN5bWJvbGljID0gKGRhdGEtPmNvbG9ycyAhPSBOVUxMKTsKLSsKLSsgICAg ICAvKiBVc2Ugb3VyIG93biB3b3JrZXIgdGhyZWFkIGluc3RlYWQgb2YgdGhlIGdsb2JhbCBHVGFz ayBwb29sICovCi0rICAgICAgZ190aHJlYWRfbmV3ICgiY2lubmFtb24taWNvbi1sb2FkZXIiLCBp Y29uX3RocmVhZF9mdW5jLCBpdGQpOwotICAgICB9Ci0gICBlbHNlCi0gICAgIGdfYXNzZXJ0X25v dF9yZWFjaGVkICgpOwoKZGlmZiAtLWdpdCBhL2dseWNpbl9yYXRlbGltaXQucGF0Y2ggYi9nbHlj aW5fcmF0ZWxpbWl0LnBhdGNoCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjJi ZDg4NWEKLS0tIC9kZXYvbnVsbAorKysgYi9nbHljaW5fcmF0ZWxpbWl0LnBhdGNoCkBAIC0wLDAg KzEsMTE1IEBACitGcm9tIDIyZjA5OTk3ZDVkMzcyY2ZjZGZjODYwZmVjNDU2ODliNDk4ODBlYmMg TW9uIFNlcCAxNyAwMDowMDowMCAyMDAxCitGcm9tOiBMZWlnaCBTY290dCA8bGVpZ2gxMjNsaW51 eEBnbWFpbC5jb20+CitEYXRlOiBTdW4sIDIzIEF1ZyAyMDI2IDEzOjQ5OjQ2ICswMTAwCitTdWJq ZWN0OiBbUEFUQ0hdIHN0OiBMaW1pdCB0ZXh0dXJlIGxvYWRpbmcgdG8gOSBwYXJhbGxlbCBvcGVy YXRpb25zCisKKy0tLQorIHNyYy9zdC9zdC10ZXh0dXJlLWNhY2hlLmMgfCA0MSArKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysKKyAxIGZpbGUgY2hhbmdlZCwgNDEgaW5zZXJ0 aW9ucygrKQorCitkaWZmIC0tZ2l0IGEvc3JjL3N0L3N0LXRleHR1cmUtY2FjaGUuYyBiL3NyYy9z dC9zdC10ZXh0dXJlLWNhY2hlLmMKK2luZGV4IGQzZjY3Mzc0MWMuLmExZDkzOWM3YjkgMTAwNjQ0 CistLS0gYS9zcmMvc3Qvc3QtdGV4dHVyZS1jYWNoZS5jCisrKysgYi9zcmMvc3Qvc3QtdGV4dHVy ZS1jYWNoZS5jCitAQCAtMzUsNiArMzUsMTAgQEAKKyAjZGVmaW5lIENBQ0hFX1BSRUZJWF9GSUxF ICJmaWxlOiIKKyAjZGVmaW5lIENBQ0hFX1BSRUZJWF9GSUxFX0ZPUl9DQUlSTyAiZmlsZS1mb3It Y2Fpcm86IgorIAorKy8qIEFyYml0cmFyeSBjYXAgb24gY29uY3VycmVudCB0ZXh0dXJlIGxvYWRz IGluIGZsaWdodC4gU2VlIGNvbW1lbnQgb24KKysgKiBsb2FkaW5nX3RleHR1cmVzX2NvdW50ZXIg aW4gU3RUZXh0dXJlQ2FjaGVQcml2YXRlIGFib3ZlLiAqLworKyNkZWZpbmUgTUFYX1BBUkFMTEVM X0xPQURfVEFTS1MgOQorKworIHN0cnVjdCBfU3RUZXh0dXJlQ2FjaGVQcml2YXRlCisgeworICAg R3RrSWNvblRoZW1lICppY29uX3RoZW1lOworQEAgLTU2LDExICs2MCwyMiBAQCBzdHJ1Y3QgX1N0 VGV4dHVyZUNhY2hlUHJpdmF0ZQorICAgR0hhc2hUYWJsZSAqaW1hZ2VfdHlwZV90YWJsZTsKKyAK KyAgIEdDYW5jZWxsYWJsZSAqY2FuY2VsbGFibGU7CisrCisrICAvKiBOdW1iZXIgb2YgdGV4dHVy ZXMgY3VycmVudGx5IGxvYWRpbmcsIGFuZCByZXF1ZXN0cyBkZWZlcnJlZCBiZWNhdXNlCisrICAg KiBNQVhfUEFSQUxMRUxfTE9BRF9UQVNLUyB3YXMgcmVhY2hlZC4gUmF0ZS1saW1pdGluZyBjb25j dXJyZW50IGxvYWRzCisrICAgKiBhdm9pZHMgc3RhcnZpbmcgR1Rhc2sncyBkZWZhdWx0IHRocmVh ZCBwb29sIHNjaGVkdWxlciAtLSBub3RhYmx5IGFuCisrICAgKiBpc3N1ZSBub3cgdGhhdCBtb3N0 IGljb24gZm9ybWF0cyBhcmUgbG9hZGVkIHZpYSBnbHljaW4ncyBzYW5kYm94ZWQsCisrICAgKiBw ZXItY2FsbCBJUEMgcm91bmQtdHJpcCByYXRoZXIgdGhhbiBpbi1wcm9jZXNzLCB3aGljaCBpcyBz bG93IGVub3VnaAorKyAgICogcGVyIGNhbGwgdGhhdCBzdWJtaXR0aW5nIGh1bmRyZWRzIG9mIHJl cXVlc3RzIGF0IG9uY2UgKGUuZy4gcG9wdWxhdGluZworKyAgICogYSBsYXJnZSBhcHAgbWVudSkg Y291bGQgbGVhdmUgbWFueSBvZiB0aGVtIG5ldmVyIGNvbXBsZXRpbmcuICovCisrICB1aW50MzJf dCBsb2FkaW5nX3RleHR1cmVzX2NvdW50ZXI7CisrICBHUXVldWUgKnBlbmRpbmdfdGFza3M7Cisg fTsKKyAKKyBzdGF0aWMgdm9pZCBzdF90ZXh0dXJlX2NhY2hlX2Rpc3Bvc2UgKEdPYmplY3QgKm9i amVjdCk7Cisgc3RhdGljIHZvaWQgc3RfdGV4dHVyZV9jYWNoZV9maW5hbGl6ZSAoR09iamVjdCAq b2JqZWN0KTsKKyBzdGF0aWMgdm9pZCBsb2FkX2ltYWdlX3R5cGVfdGFibGUgKFN0VGV4dHVyZUNh Y2hlICpjYWNoZSk7Cisrc3RhdGljIHZvaWQgdGV4dHVyZV9sb2FkX2RhdGFfZnJlZSAoZ3BvaW50 ZXIgcCk7CisgCisgZW51bQorIHsKK0BAIC0yMDQsNiArMjE5LDggQEAgc3RfdGV4dHVyZV9jYWNo ZV9pbml0IChTdFRleHR1cmVDYWNoZSAqc2VsZikKKyAKKyAgIHNlbGYtPnByaXYtPmNhbmNlbGxh YmxlID0gZ19jYW5jZWxsYWJsZV9uZXcgKCk7CisgCisrICBzZWxmLT5wcml2LT5wZW5kaW5nX3Rh c2tzID0gZ19xdWV1ZV9uZXcgKCk7CisrCisgICBvbl9pY29uX3RoZW1lX2NoYW5nZWQgKHNldHRp bmdzLCBOVUxMLCBzZWxmKTsKKyB9CisgCitAQCAtMjE4LDYgKzIzNSwxMiBAQCBzdF90ZXh0dXJl X2NhY2hlX2Rpc3Bvc2UgKEdPYmplY3QgKm9iamVjdCkKKyAgIGdfY2xlYXJfb2JqZWN0ICgmc2Vs Zi0+cHJpdi0+aWNvbl90aGVtZSk7CisgICBnX2NsZWFyX29iamVjdCAoJnNlbGYtPnByaXYtPmNh bmNlbGxhYmxlKTsKKyAKKysgIGlmIChzZWxmLT5wcml2LT5wZW5kaW5nX3Rhc2tzKQorKyAgICB7 CisrICAgICAgZ19xdWV1ZV9mcmVlX2Z1bGwgKHNlbGYtPnByaXYtPnBlbmRpbmdfdGFza3MsIHRl eHR1cmVfbG9hZF9kYXRhX2ZyZWUpOworKyAgICAgIHNlbGYtPnByaXYtPnBlbmRpbmdfdGFza3Mg PSBOVUxMOworKyAgICB9CisrCisgICBnX2NsZWFyX3BvaW50ZXIgKCZzZWxmLT5wcml2LT5rZXll ZF9jYWNoZSwgZ19oYXNoX3RhYmxlX2Rlc3Ryb3kpOworICAgZ19jbGVhcl9wb2ludGVyICgmc2Vs Zi0+cHJpdi0+a2V5ZWRfc3VyZmFjZV9jYWNoZSwgZ19oYXNoX3RhYmxlX2Rlc3Ryb3kpOworICAg Z19jbGVhcl9wb2ludGVyICgmc2VsZi0+cHJpdi0+dXNlZF9zY2FsZXMsIGdfaGFzaF90YWJsZV9k ZXN0cm95KTsKK0BAIC0zNzEsNiArMzk0LDkgQEAgdGV4dHVyZV9sb2FkX2RhdGFfZnJlZSAoZ3Bv aW50ZXIgcCkKKyAgIGdfc2xpY2VfZnJlZSAoQXN5bmNUZXh0dXJlTG9hZERhdGEsIGRhdGEpOwor IH0KKyAKKytzdGF0aWMgdm9pZCBsb2FkX3RleHR1cmVfYXN5bmMgKFN0VGV4dHVyZUNhY2hlICAg ICAgICpjYWNoZSwKKysgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEFzeW5jVGV4dHVy ZUxvYWREYXRhICpkYXRhKTsKKysKKyAvKioKKyAgKiBvbl9pbWFnZV9zaXplX3ByZXBhcmVkOgor ICAqIEBwaXhidWZfbG9hZGVyOiAjR2RrUGl4YnVmTG9hZGVyIGxvYWRpbmcgdGhlIGltYWdlCitA QCAtNjI3LDYgKzY1Myw5IEBAIGZpbmlzaF90ZXh0dXJlX2xvYWQgKEFzeW5jVGV4dHVyZUxvYWRE YXRhICpkYXRhLAorIAorICAgY2FjaGUgPSBkYXRhLT5jYWNoZTsKKyAKKysgIGdfYXNzZXJ0IChj YWNoZS0+cHJpdi0+bG9hZGluZ190ZXh0dXJlc19jb3VudGVyID4gMCk7CisrICBjYWNoZS0+cHJp di0+bG9hZGluZ190ZXh0dXJlc19jb3VudGVyLS07CisrCisgICBnX2hhc2hfdGFibGVfcmVtb3Zl IChjYWNoZS0+cHJpdi0+b3V0c3RhbmRpbmdfcmVxdWVzdHMsIGRhdGEtPmtleSk7CisgCisgICBp ZiAocGl4YnVmID09IE5VTEwpCitAQCAtNjcyLDYgKzcwMSwxMCBAQCBmaW5pc2hfdGV4dHVyZV9s b2FkIChBc3luY1RleHR1cmVMb2FkRGF0YSAqZGF0YSwKKyAKKyBvdXQ6CisgICB0ZXh0dXJlX2xv YWRfZGF0YV9mcmVlIChkYXRhKTsKKysKKysgIGRhdGEgPSBnX3F1ZXVlX3BvcF9oZWFkIChjYWNo ZS0+cHJpdi0+cGVuZGluZ190YXNrcyk7CisrICBpZiAoZGF0YSkKKysgICAgbG9hZF90ZXh0dXJl X2FzeW5jIChjYWNoZSwgZGF0YSk7CisgfQorIAorIHN0YXRpYyB2b2lkCitAQCAtNzExLDYgKzc0 NCwxNCBAQCBzdGF0aWMgdm9pZAorIGxvYWRfdGV4dHVyZV9hc3luYyAoU3RUZXh0dXJlQ2FjaGUg ICAgICAgKmNhY2hlLAorICAgICAgICAgICAgICAgICAgICAgQXN5bmNUZXh0dXJlTG9hZERhdGEg KmRhdGEpCisgeworKyAgaWYgKGNhY2hlLT5wcml2LT5sb2FkaW5nX3RleHR1cmVzX2NvdW50ZXIg Pj0gTUFYX1BBUkFMTEVMX0xPQURfVEFTS1MpCisrICAgIHsKKysgICAgICBnX3F1ZXVlX3B1c2hf dGFpbCAoY2FjaGUtPnByaXYtPnBlbmRpbmdfdGFza3MsIGRhdGEpOworKyAgICAgIHJldHVybjsK KysgICAgfQorKworKyAgY2FjaGUtPnByaXYtPmxvYWRpbmdfdGV4dHVyZXNfY291bnRlcisrOwor KworICAgaWYgKGRhdGEtPmZpbGUpCisgICAgIHsKKyAgICAgICBHVGFzayAqdGFzayA9IGdfdGFz a19uZXcgKGNhY2hlLCBOVUxMLCBvbl9waXhidWZfbG9hZGVkLCBkYXRhKTsK