255465 2010-10-28 01:28:09 +0000 Deleting a folder containing a subfolder does not work 2010-12-23 23:12:11 +0000 1 1 10 Unmaintained KMail Mobile general unspecified Compiled Sources Linux CLOSED FIXED NOR normal --- 1 sabine ervin bjoern.ricks ervin tokoe vkrause 0 oldest_to_newest 1037826 0 sabine 2010-10-28 01:28:09 +0000 Version: unspecified (using Devel) OS: Linux Deleting a folder that contain a subfolder as well as the emails they contain does not seem to work atm. Reproducible: Always Steps to Reproduce: - Launch Kmail-mobile - Click on your Imap inbox - Select an already existing folder containing two emails (ex Folder 2) and copy it into another one also containing 2 emails (ex: folder 1) still within the Imap inbox - Select folder 1 - Open the 'Actions' tab - Click on 'Edit' - Click on 'Delete folder' - A 'Delete folder?' pop up message appears asking: 'Do you really want to delete this folder and all its sub-folders?' - Click on 'Delete' - the Folder view goes back to the Imap server name - Click on your Imap inbox Actual Results: Folder 1 is still displayed but does not contain any email anymore. Its subfolder (Folder 2) is still displayed too and still contains both its emails. Expected Results: Both Folder 1 and 2 as well as their emails should be properly deleted. Note: if 'Folder 2' does not display any email after deleting 'Folder 1' try quitting and then relaunching Kmail-mobile. N900, 4:4.6~20101026.1190044-1maemo1.1189579 1039274 1 bjoern.ricks 2010-11-01 12:32:16 +0000 *** Bug 253240 has been marked as a duplicate of this bug. *** 1056327 2 tokoe 2010-12-10 14:57:18 +0000 This is a problem of the Akonadi server, which does not send remote ids for the anchestor hierarchy. Therefor resources with hierarchical remote identifiers (e.g. the imap resource) can't find the object to delete in the backend. @Volker any idea how to fix this? 1058521 3 54539 tokoe 2010-12-14 08:34:31 +0000 Created attachment 54539 Patch that fixes recursive folder deletion This patch introduces a new class RemoveCollectionRecursiveTask, which deletes a complete folder hierarchy recursively. The resource ignores now itemRemoved()/collectionRemoved() calls for items/collections with parent collections without remote identifier and does a recursive deletion of the uppermost collection to remove. 1062150 4 tokoe 2010-12-20 17:02:50 +0000 SVN commit 1208084 by tokoe: Delete a collection recursive Since Akonadi server does not support hierarchical remote identifiers in delete notifications, we have to ignore the notifications for child collections/items and remove the requested imap folder recursivly on the IMAP server. BUG: 255465 M +1 -0 CMakeLists.txt M +18 -1 imapresource.cpp A removecollectionrecursivetask.cpp [License: LGPL (v2+)] A removecollectionrecursivetask.h [License: LGPL (v2+)] M +112 -0 tests/testremovecollectiontask.cpp WebSVN link: http://websvn.kde.org/?view=rev&revision=1208084 1062258 5 sabine 2010-12-20 21:46:24 +0000 My revision is not recent enough to test this bug so I'll retest it later this week. N900,4:4.6~20101220.1208001-1maemo1.1206430 1063056 6 sabine 2010-12-22 22:16:18 +0000 Could not retest today due to a regression (see bug #261006) N900, 4:4.6~20101222.1208531-1maemo1.1208558 1063525 7 sabine 2010-12-23 23:12:11 +0000 It is corrected now. Both the folder and its subfolder are deleted properly as well as their emails so I am closing this bug. N900, 4:4.6~.20101223.2034.git9cc0c3e-1maemo1.120883 54539 2010-12-14 08:34:31 +0000 2010-12-14 08:34:31 +0000 Patch that fixes recursive folder deletion imapresource.patch text/plain 9501 tokoe SW5kZXg6IHJlbW92ZWNvbGxlY3Rpb25yZWN1cnNpdmV0YXNrLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBy ZW1vdmVjb2xsZWN0aW9ucmVjdXJzaXZldGFzay5jcHAJKHJldmlzaW9uIDApCisrKyByZW1vdmVj b2xsZWN0aW9ucmVjdXJzaXZldGFzay5jcHAJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsMTM4IEBA CisvKgorICAgIENvcHlyaWdodCAoYykgMjAxMCBLbGFyw6RsdmRhbGVucyBEYXRha29uc3VsdCBB QiwKKyAgICAgICAgICAgICAgICAgICAgICAgYSBLREFCIEdyb3VwIGNvbXBhbnkgPGluZm9Aa2Rh Yi5jb20+CisgICAgQXV0aG9yOiBUb2JpYXMgS29lbmlnIDx0b2tvZUBrZGFiLmNvbT4KKworICAg IFRoaXMgbGlicmFyeSBpcyBmcmVlIHNvZnR3YXJlOyB5b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBh bmQvb3IgbW9kaWZ5IGl0CisgICAgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgTGlicmFyeSBH ZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGFzIHB1Ymxpc2hlZCBieQorICAgIHRoZSBGcmVlIFNvZnR3 YXJlIEZvdW5kYXRpb247IGVpdGhlciB2ZXJzaW9uIDIgb2YgdGhlIExpY2Vuc2UsIG9yIChhdCB5 b3VyCisgICAgb3B0aW9uKSBhbnkgbGF0ZXIgdmVyc2lvbi4KKworICAgIFRoaXMgbGlicmFyeSBp cyBkaXN0cmlidXRlZCBpbiB0aGUgaG9wZSB0aGF0IGl0IHdpbGwgYmUgdXNlZnVsLCBidXQgV0lU SE9VVAorICAgIEFOWSBXQVJSQU5UWTsgd2l0aG91dCBldmVuIHRoZSBpbXBsaWVkIHdhcnJhbnR5 IG9mIE1FUkNIQU5UQUJJTElUWSBvcgorICAgIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUiBQVVJQ T1NFLiAgU2VlIHRoZSBHTlUgTGlicmFyeSBHZW5lcmFsIFB1YmxpYworICAgIExpY2Vuc2UgZm9y IG1vcmUgZGV0YWlscy4KKworICAgIFlvdSBzaG91bGQgaGF2ZSByZWNlaXZlZCBhIGNvcHkgb2Yg dGhlIEdOVSBMaWJyYXJ5IEdlbmVyYWwgUHVibGljIExpY2Vuc2UKKyAgICBhbG9uZyB3aXRoIHRo aXMgbGlicmFyeTsgc2VlIHRoZSBmaWxlIENPUFlJTkcuTElCLiAgSWYgbm90LCB3cml0ZSB0byB0 aGUKKyAgICBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb24sIEluYy4sIDUxIEZyYW5rbGluIFN0cmVl dCwgRmlmdGggRmxvb3IsIEJvc3RvbiwgTUEKKyAgICAwMjExMC0xMzAxLCBVU0EuCisqLworCisj aW5jbHVkZSAicmVtb3ZlY29sbGVjdGlvbnJlY3Vyc2l2ZXRhc2suaCIKKworI2luY2x1ZGUgPGFr b25hZGkva21pbWUvbWVzc2FnZWZsYWdzLmg+CisjaW5jbHVkZSA8a2ltYXAvZGVsZXRlam9iLmg+ CisjaW5jbHVkZSA8a2ltYXAvZXhwdW5nZWpvYi5oPgorI2luY2x1ZGUgPGtpbWFwL3NlbGVjdGpv Yi5oPgorI2luY2x1ZGUgPGtpbWFwL3N0b3Jlam9iLmg+CisjaW5jbHVkZSA8a2xvY2FsZS5oPgor CitSZW1vdmVDb2xsZWN0aW9uUmVjdXJzaXZlVGFzazo6UmVtb3ZlQ29sbGVjdGlvblJlY3Vyc2l2 ZVRhc2soIFJlc291cmNlU3RhdGVJbnRlcmZhY2U6OlB0ciByZXNvdXJjZSwgUU9iamVjdCAqcGFy ZW50ICkKKyAgOiBSZXNvdXJjZVRhc2soIENhbmNlbElmTm9TZXNzaW9uLCByZXNvdXJjZSwgcGFy ZW50ICksCisgICAgbVNlc3Npb24oIDAgKSwgbVJ1bm5pbmdEZWxldGVKb2JzKCAwICkKK3sKK30K KworUmVtb3ZlQ29sbGVjdGlvblJlY3Vyc2l2ZVRhc2s6On5SZW1vdmVDb2xsZWN0aW9uUmVjdXJz aXZlVGFzaygpCit7Cit9CisKK3ZvaWQgUmVtb3ZlQ29sbGVjdGlvblJlY3Vyc2l2ZVRhc2s6OmRv U3RhcnQoIEtJTUFQOjpTZXNzaW9uICpzZXNzaW9uICkKK3sKKyAgbVNlc3Npb24gPSBzZXNzaW9u OworCisgIEtJTUFQOjpMaXN0Sm9iICpsaXN0Sm9iID0gbmV3IEtJTUFQOjpMaXN0Sm9iKCBzZXNz aW9uICk7CisgIGxpc3RKb2ItPnNldEluY2x1ZGVVbnN1YnNjcmliZWQoICFpc1N1YnNjcmlwdGlv bkVuYWJsZWQoKSApOworICBsaXN0Sm9iLT5zZXRRdWVyaWVkTmFtZXNwYWNlcyggc2VydmVyTmFt ZXNwYWNlcygpICk7CisgIGNvbm5lY3QoIGxpc3RKb2IsIFNJR05BTCggbWFpbEJveGVzUmVjZWl2 ZWQoIFFMaXN0PEtJTUFQOjpNYWlsQm94RGVzY3JpcHRvcj4sIFFMaXN0PCBRTGlzdDxRQnl0ZUFy cmF5PiA+ICkgKSwKKyAgICAgICAgICAgdGhpcywgU0xPVCggb25NYWlsQm94ZXNSZWNlaXZlZCgg UUxpc3Q8S0lNQVA6Ok1haWxCb3hEZXNjcmlwdG9yPiwgUUxpc3Q8IFFMaXN0PFFCeXRlQXJyYXk+ ID4gKSApICk7CisgIGNvbm5lY3QoIGxpc3RKb2IsIFNJR05BTCggcmVzdWx0KCBLSm9iKiApICks IFNMT1QoIG9uSm9iRG9uZSggS0pvYiogKSApICk7CisgIGxpc3RKb2ItPnN0YXJ0KCk7Cit9CisK K3ZvaWQgUmVtb3ZlQ29sbGVjdGlvblJlY3Vyc2l2ZVRhc2s6Om9uTWFpbEJveGVzUmVjZWl2ZWQo IGNvbnN0IFFMaXN0PCBLSU1BUDo6TWFpbEJveERlc2NyaXB0b3IgPiAmZGVzY3JpcHRvcnMsCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBj b25zdCBRTGlzdDwgUUxpc3Q8UUJ5dGVBcnJheT4gPiYgKQoreworICBjb25zdCBRU3RyaW5nIG1h aWxCb3ggPSBtYWlsQm94Rm9yQ29sbGVjdGlvbiggY29sbGVjdGlvbigpICk7CisKKyAgLy8gV2Ug aGF2ZSB0byBkZWxldGUgdGhlIGRlZXBlc3QtbmVzdGVkIGZvbGRlcnMgZmlyc3QsIHNvCisgIC8v IHdlIHVzZSBhIG1hcCBoZXJlIHRoYXQgaGFzIHRoZSBsZXZlbCBvZiBuZXN0aW5nIGFzIGtleS4K KyAgUU1hcDxpbnQsIFFMaXN0PEtJTUFQOjpNYWlsQm94RGVzY3JpcHRvcj4gPiBmb2xkZXJzVG9E ZWxldGU7CisKKyAgZm9yICggaW50IGkgPSAwOyBpIDwgZGVzY3JpcHRvcnMuc2l6ZSgpOyArK2kg KSB7CisgICAgY29uc3QgS0lNQVA6Ok1haWxCb3hEZXNjcmlwdG9yIGRlc2NyaXB0b3IgPSBkZXNj cmlwdG9yc1sgaSBdOworCisgICAgaWYgKCBkZXNjcmlwdG9yLm5hbWUuc3RhcnRzV2l0aCggbWFp bEJveCApICkgeyAvLyBhIHN1YiBmb2xkZXIgdG8gZGVsZXRlCisgICAgICBjb25zdCBRU3RyaW5n TGlzdCBwYXRoUGFydHMgPSBkZXNjcmlwdG9yLm5hbWUuc3BsaXQoIGRlc2NyaXB0b3Iuc2VwYXJh dG9yICk7CisgICAgICBmb2xkZXJzVG9EZWxldGVbIHBhdGhQYXJ0cy5jb3VudCgpIF0uYXBwZW5k KCBkZXNjcmlwdG9yICk7CisgICAgfQorICB9CisKKyAgLy8gTm93IHN0YXJ0IHRoZSBhY3R1YWwg ZGVsZXRpb24gd29yaworICBRTWFwSXRlcmF0b3I8aW50LCBRTGlzdDxLSU1BUDo6TWFpbEJveERl c2NyaXB0b3I+ID4gaXQoIGZvbGRlcnNUb0RlbGV0ZSApOworICBpdC50b0JhY2soKTsgLy8gd2Ug c3RhcnQgd2l0aCBsYXJnZXN0IG5lc3RpbmcgdmFsdWUgZmlyc3QKKyAgd2hpbGUgKCBpdC5oYXNQ cmV2aW91cygpICkgeworICAgIGl0LnByZXZpb3VzKCk7CisKKyAgICBmb3JlYWNoICggY29uc3Qg S0lNQVA6Ok1haWxCb3hEZXNjcmlwdG9yICZkZXNjcmlwdG9yLCBpdC52YWx1ZSgpICkgeworICAg ICAgLy8gZmlyc3Qgc2VsZWN0IHRoZSBtYWlsYm94CisgICAgICBLSU1BUDo6U2VsZWN0Sm9iICpz ZWxlY3RKb2IgPSBuZXcgS0lNQVA6OlNlbGVjdEpvYiggbVNlc3Npb24gKTsKKyAgICAgIHNlbGVj dEpvYi0+c2V0TWFpbEJveCggZGVzY3JpcHRvci5uYW1lICk7CisgICAgICBjb25uZWN0KCBzZWxl Y3RKb2IsIFNJR05BTCggcmVzdWx0KCBLSm9iKiApICksIFNMT1QoIG9uSm9iRG9uZSggS0pvYiog KSApICk7CisgICAgICBzZWxlY3RKb2ItPnN0YXJ0KCk7CisKKyAgICAgIC8vIG1hcmsgYWxsIGl0 ZW1zIGFzIGRlbGV0ZWQKKyAgICAgIEtJTUFQOjpJbWFwU2V0IGFsbEl0ZW1zOworICAgICAgYWxs SXRlbXMuYWRkKCBLSU1BUDo6SW1hcEludGVydmFsKCAxLCAwICkgKTsgLy8gbWVhbnMgMToqCisg ICAgICBLSU1BUDo6U3RvcmVKb2IgKnN0b3JlSm9iID0gbmV3IEtJTUFQOjpTdG9yZUpvYiggbVNl c3Npb24gKTsKKyAgICAgIHN0b3JlSm9iLT5zZXRTZXF1ZW5jZVNldCggYWxsSXRlbXMgKTsKKyAg ICAgIHN0b3JlSm9iLT5zZXRGbGFncyggS0lNQVA6Ok1lc3NhZ2VGbGFncygpIDw8IEFrb25hZGk6 Ok1lc3NhZ2VGbGFnczo6RGVsZXRlZCApOworICAgICAgc3RvcmVKb2ItPnNldE1vZGUoIEtJTUFQ OjpTdG9yZUpvYjo6QXBwZW5kRmxhZ3MgKTsKKyAgICAgIGNvbm5lY3QoIHN0b3JlSm9iLCBTSUdO QUwoIHJlc3VsdCggS0pvYiogKSApLCBTTE9UKCBvbkpvYkRvbmUoIEtKb2IqICkgKSApOworICAg ICAgc3RvcmVKb2ItPnN0YXJ0KCk7CisKKyAgICAgIC8vIGV4cHVuZ2UgdGhlIG1haWxib3gKKyAg ICAgIEtJTUFQOjpFeHB1bmdlSm9iICpleHB1bmdlSm9iID0gbmV3IEtJTUFQOjpFeHB1bmdlSm9i KCBtU2Vzc2lvbiApOworICAgICAgY29ubmVjdCggZXhwdW5nZUpvYiwgU0lHTkFMKCByZXN1bHQo IEtKb2IqICkgKSwgU0xPVCggb25Kb2JEb25lKCBLSm9iKiApICkgKTsKKyAgICAgIGV4cHVuZ2VK b2ItPnN0YXJ0KCk7CisKKyAgICAgIC8vIGZpbmFsbHkgZGVsZXRlIHRoZSBtYWlsYm94CisgICAg ICBLSU1BUDo6RGVsZXRlSm9iICpkZWxldGVKb2IgPSBuZXcgS0lNQVA6OkRlbGV0ZUpvYiggbVNl c3Npb24gKTsKKyAgICAgIGRlbGV0ZUpvYi0+c2V0TWFpbEJveCggZGVzY3JpcHRvci5uYW1lICk7 CisgICAgICBjb25uZWN0KCBkZWxldGVKb2IsIFNJR05BTCggcmVzdWx0KCBLSm9iKiApICksIFNM T1QoIG9uRGVsZXRlSm9iRG9uZSggS0pvYiogKSApICk7CisgICAgICBtUnVubmluZ0RlbGV0ZUpv YnMrKzsKKyAgICAgIGRlbGV0ZUpvYi0+c3RhcnQoKTsKKyAgICB9CisgIH0KK30KKwordm9pZCBS ZW1vdmVDb2xsZWN0aW9uUmVjdXJzaXZlVGFzazo6b25EZWxldGVKb2JEb25lKCBLSm9iKiBqb2Ig KQoreworICBpZiAoIGpvYi0+ZXJyb3IoKSApIHsKKyAgICBjaGFuZ2VQcm9jZXNzZWQoKTsKKwor ICAgIGtEZWJ1Zyg1MzI3KSA8PCAiRmFpbGVkIHRvIGRlbGV0ZSB0aGUgZm9sZGVyLCByZXN5bmMg dGhlIGZvbGRlciB0cmVlIjsKKyAgICBlbWl0V2FybmluZyggaTE4biggIkZhaWxlZCB0byBkZWxl dGUgdGhlIGZvbGRlciwgcmVzdG9yaW5nIGZvbGRlciBsaXN0LiIgKSApOworICAgIHN5bmNocm9u aXplQ29sbGVjdGlvblRyZWUoKTsKKyAgfSBlbHNlIHsKKyAgICBtUnVubmluZ0RlbGV0ZUpvYnMt LTsKKworICAgIGlmICggbVJ1bm5pbmdEZWxldGVKb2JzID09IDAgKSB7CisgICAgICBjaGFuZ2VQ cm9jZXNzZWQoKTsgLy8gZmluaXNoZWQgam9iCisgICAgfQorICB9Cit9CisKK3ZvaWQgUmVtb3Zl Q29sbGVjdGlvblJlY3Vyc2l2ZVRhc2s6Om9uSm9iRG9uZSggS0pvYiogam9iICkKK3sKKyAgaWYg KCBqb2ItPmVycm9yKCkgKSB7CisgICAgY2hhbmdlUHJvY2Vzc2VkKCk7CisKKyAgICBrRGVidWco NTMyNykgPDwgIkZhaWxlZCB0byBkZWxldGUgdGhlIGZvbGRlciwgcmVzeW5jIHRoZSBmb2xkZXIg dHJlZSI7CisgICAgZW1pdFdhcm5pbmcoIGkxOG4oICJGYWlsZWQgdG8gZGVsZXRlIHRoZSBmb2xk ZXIsIHJlc3RvcmluZyBmb2xkZXIgbGlzdC4iICkgKTsKKyAgICBzeW5jaHJvbml6ZUNvbGxlY3Rp b25UcmVlKCk7CisgIH0KK30KKworI2luY2x1ZGUgInJlbW92ZWNvbGxlY3Rpb25yZWN1cnNpdmV0 YXNrLm1vYyIKSW5kZXg6IHJlbW92ZWNvbGxlY3Rpb25yZWN1cnNpdmV0YXNrLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gcmVtb3ZlY29sbGVjdGlvbnJlY3Vyc2l2ZXRhc2suaAkocmV2aXNpb24gMCkKKysrIHJl bW92ZWNvbGxlY3Rpb25yZWN1cnNpdmV0YXNrLmgJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsNTEg QEAKKy8qCisgICAgQ29weXJpZ2h0IChjKSAyMDEwIEtsYXLDpGx2ZGFsZW5zIERhdGFrb25zdWx0 IEFCLAorICAgICAgICAgICAgICAgICAgICAgICBhIEtEQUIgR3JvdXAgY29tcGFueSA8aW5mb0Br ZGFiLmNvbT4KKyAgICBBdXRob3I6IFRvYmlhcyBLb2VuaWcgPHRva29lQGtkYWIuY29tPgorCisg ICAgVGhpcyBsaWJyYXJ5IGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0 IGFuZC9vciBtb2RpZnkgaXQKKyAgICB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEdOVSBMaWJyYXJ5 IEdlbmVyYWwgUHVibGljIExpY2Vuc2UgYXMgcHVibGlzaGVkIGJ5CisgICAgdGhlIEZyZWUgU29m dHdhcmUgRm91bmRhdGlvbjsgZWl0aGVyIHZlcnNpb24gMiBvZiB0aGUgTGljZW5zZSwgb3IgKGF0 IHlvdXIKKyAgICBvcHRpb24pIGFueSBsYXRlciB2ZXJzaW9uLgorCisgICAgVGhpcyBsaWJyYXJ5 IGlzIGRpc3RyaWJ1dGVkIGluIHRoZSBob3BlIHRoYXQgaXQgd2lsbCBiZSB1c2VmdWwsIGJ1dCBX SVRIT1VUCisgICAgQU5ZIFdBUlJBTlRZOyB3aXRob3V0IGV2ZW4gdGhlIGltcGxpZWQgd2FycmFu dHkgb2YgTUVSQ0hBTlRBQklMSVRZIG9yCisgICAgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSIFBV UlBPU0UuICBTZWUgdGhlIEdOVSBMaWJyYXJ5IEdlbmVyYWwgUHVibGljCisgICAgTGljZW5zZSBm b3IgbW9yZSBkZXRhaWxzLgorCisgICAgWW91IHNob3VsZCBoYXZlIHJlY2VpdmVkIGEgY29weSBv ZiB0aGUgR05VIExpYnJhcnkgR2VuZXJhbCBQdWJsaWMgTGljZW5zZQorICAgIGFsb25nIHdpdGgg dGhpcyBsaWJyYXJ5OyBzZWUgdGhlIGZpbGUgQ09QWUlORy5MSUIuICBJZiBub3QsIHdyaXRlIHRv IHRoZQorICAgIEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbiwgSW5jLiwgNTEgRnJhbmtsaW4gU3Ry ZWV0LCBGaWZ0aCBGbG9vciwgQm9zdG9uLCBNQQorICAgIDAyMTEwLTEzMDEsIFVTQS4KKyovCisK KyNpZm5kZWYgUkVNT1ZFQ09MTEVDVElPTlJFQ1VSU0lWRVRBU0tfSAorI2RlZmluZSBSRU1PVkVD T0xMRUNUSU9OUkVDVVJTSVZFVEFTS19ICisKKyNpbmNsdWRlIDxraW1hcC9saXN0am9iLmg+CisK KyNpbmNsdWRlICJyZXNvdXJjZXRhc2suaCIKKworY2xhc3MgUmVtb3ZlQ29sbGVjdGlvblJlY3Vy c2l2ZVRhc2sgOiBwdWJsaWMgUmVzb3VyY2VUYXNrCit7CisgIFFfT0JKRUNUCisKK3B1YmxpYzoK KyAgZXhwbGljaXQgUmVtb3ZlQ29sbGVjdGlvblJlY3Vyc2l2ZVRhc2soIFJlc291cmNlU3RhdGVJ bnRlcmZhY2U6OlB0ciByZXNvdXJjZSwgUU9iamVjdCAqcGFyZW50ID0gMCApOworICB2aXJ0dWFs IH5SZW1vdmVDb2xsZWN0aW9uUmVjdXJzaXZlVGFzaygpOworCitwcml2YXRlIHNsb3RzOgorICB2 b2lkIG9uTWFpbEJveGVzUmVjZWl2ZWQoIGNvbnN0IFFMaXN0PEtJTUFQOjpNYWlsQm94RGVzY3Jp cHRvcj4gJmRlc2NyaXB0b3JzLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IFFM aXN0PCBRTGlzdDxRQnl0ZUFycmF5PiA+ICZmbGFncyApOworICB2b2lkIG9uRGVsZXRlSm9iRG9u ZSggS0pvYiAqam9iICk7CisgIHZvaWQgb25Kb2JEb25lKCBLSm9iICpqb2IgKTsKKworcHJvdGVj dGVkOgorICB2aXJ0dWFsIHZvaWQgZG9TdGFydCggS0lNQVA6OlNlc3Npb24gKnNlc3Npb24gKTsK KworcHJpdmF0ZToKKyAgS0lNQVA6OlNlc3Npb24gKm1TZXNzaW9uOworICB1aW50IG1SdW5uaW5n RGVsZXRlSm9iczsKK307CisKKyNlbmRpZgpJbmRleDogQ01ha2VMaXN0cy50eHQKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gQ01ha2VMaXN0cy50eHQJKHJldmlzaW9uIDEyMDYxNjEpCisrKyBDTWFrZUxpc3RzLnR4 dAkod29ya2luZyBjb3B5KQpAQCAtMjYsNiArMjYsNyBAQAogICBub3NlbGVjdGF0dHJpYnV0ZS5j cHAKICAgcGFzc3dvcmRyZXF1ZXN0ZXJpbnRlcmZhY2UuY3BwCiAgIHJlbW92ZWNvbGxlY3Rpb250 YXNrLmNwcAorICByZW1vdmVjb2xsZWN0aW9ucmVjdXJzaXZldGFzay5jcHAKICAgcmVtb3ZlaXRl bXRhc2suY3BwCiAgIHJlc291cmNlc3RhdGVpbnRlcmZhY2UuY3BwCiAgIHJlc291cmNldGFzay5j cHAKSW5kZXg6IGltYXByZXNvdXJjZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gaW1hcHJlc291cmNlLmNw cAkocmV2aXNpb24gMTIwNjE2MSkKKysrIGltYXByZXNvdXJjZS5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTY2LDYgKzY2LDcgQEAKICNpbmNsdWRlICJleHB1bmdlY29sbGVjdGlvbnRhc2suaCIKICNp bmNsdWRlICJtb3ZlY29sbGVjdGlvbnRhc2suaCIKICNpbmNsdWRlICJtb3ZlaXRlbXRhc2suaCIK KyNpbmNsdWRlICJyZW1vdmVjb2xsZWN0aW9ucmVjdXJzaXZldGFzay5oIgogI2luY2x1ZGUgInJl bW92ZWNvbGxlY3Rpb250YXNrLmgiCiAjaW5jbHVkZSAicmVtb3ZlaXRlbXRhc2suaCIKICNpbmNs dWRlICJyZXRyaWV2ZWNvbGxlY3Rpb25tZXRhZGF0YXRhc2suaCIKQEAgLTI4NCw2ICsyODUsMTQg QEAKIHZvaWQgSW1hcFJlc291cmNlOjppdGVtUmVtb3ZlZCggY29uc3QgQWtvbmFkaTo6SXRlbSAm aXRlbSApCiB7CiAgIFJlc291cmNlU3RhdGVJbnRlcmZhY2U6OlB0ciBzdGF0ZSA9IDo6UmVzb3Vy Y2VTdGF0ZTo6Y3JlYXRlUmVtb3ZlSXRlbVN0YXRlKCB0aGlzLCBpdGVtICk7CisKKyAgY29uc3Qg UVN0cmluZyBtYWlsQm94ID0gc3RhdGUtPm1haWxCb3hGb3JDb2xsZWN0aW9uKCBpdGVtLnBhcmVu dENvbGxlY3Rpb24oKSApOworICBpZiAoIG1haWxCb3guaXNFbXB0eSgpICkgeworICAgIC8vIHRo aXMgaXRlbSB3aWxsIGJlIHJlbW92ZWQgc29vbiBieSBpdHMgcGFyZW50IGNvbGxlY3Rpb24KKyAg ICBjaGFuZ2VQcm9jZXNzZWQoKTsKKyAgICByZXR1cm47CisgIH0KKwogICBSZW1vdmVJdGVtVGFz ayAqdGFzayA9IG5ldyBSZW1vdmVJdGVtVGFzayggc3RhdGUsIHRoaXMgKTsKICAgdGFzay0+c3Rh cnQoIG1fcG9vbCApOwogICBxdWV1ZVRhc2soIHRhc2sgKTsKQEAgLTM2OCw3ICszNzcsMTUgQEAK IHZvaWQgSW1hcFJlc291cmNlOjpjb2xsZWN0aW9uUmVtb3ZlZCggY29uc3QgQ29sbGVjdGlvbiAm Y29sbGVjdGlvbiApCiB7CiAgIFJlc291cmNlU3RhdGVJbnRlcmZhY2U6OlB0ciBzdGF0ZSA9IDo6 UmVzb3VyY2VTdGF0ZTo6Y3JlYXRlUmVtb3ZlQ29sbGVjdGlvblN0YXRlKCB0aGlzLCBjb2xsZWN0 aW9uICk7Ci0gIFJlbW92ZUNvbGxlY3Rpb25UYXNrICp0YXNrID0gbmV3IFJlbW92ZUNvbGxlY3Rp b25UYXNrKCBzdGF0ZSwgdGhpcyApOworCisgIGNvbnN0IFFTdHJpbmcgbWFpbEJveCA9IHN0YXRl LT5tYWlsQm94Rm9yQ29sbGVjdGlvbiggY29sbGVjdGlvbiApOworICBpZiAoIG1haWxCb3guaXNF bXB0eSgpICkgeworICAgIC8vIHRoaXMgY29sbGVjdGlvbiB3aWxsIGJlIHJlbW92ZWQgc29vbiBi eSBpdHMgcGFyZW50IGNvbGxlY3Rpb24KKyAgICBjaGFuZ2VQcm9jZXNzZWQoKTsKKyAgICByZXR1 cm47CisgIH0KKworICBSZW1vdmVDb2xsZWN0aW9uUmVjdXJzaXZlVGFzayAqdGFzayA9IG5ldyBS ZW1vdmVDb2xsZWN0aW9uUmVjdXJzaXZlVGFzayggc3RhdGUsIHRoaXMgKTsKICAgdGFzay0+c3Rh cnQoIG1fcG9vbCApOwogICBxdWV1ZVRhc2soIHRhc2sgKTsKIH0K