114985 2005-10-24 11:59:52 +0000 subfolders and included mails lost when moving folder to cachedimap account 2007-09-14 12:17:01 +0000 1 1 10 Unmaintained kmail general 1.8.3 openSUSE Linux RESOLVED FIXED NOR critical --- 1 Johannes.Stamminger pim-bugs-null coolo esigra maze 40 oldest_to_newest 384075 0 Johannes.Stamminger 2005-10-24 11:59:53 +0000 Version: 1.8.3 (using KDE KDE 3.4.91) Installed from: SuSE RPMs OS: Linux Having some folders like Local Folders |-Inbox |-Test1 |-Test2 When moving Test1 to a CACHEDIMAP account, Test2 and all mails contained get lost without any comment/message. Moving back to the local folders area does not bring them back. Same problem when moving from cachedimap account to local folders area. Same problem when moving within the cachedimap account area. 385608 1 a.gungl 2005-10-29 17:32:13 +0000 Confirmed. Serverity raised. 392149 2 13593 a.gungl 2005-11-22 13:57:53 +0000 Created attachment 13593 fix moving of folders containing subfolders from local to dIMAP accounts The patch fixes the moving of folders containing subfolders from local to dIMAP accounts. No messages are lost any longer. It doesn't solve moving from dIMAP to local accounts. 392506 3 a.gungl 2005-11-23 16:53:06 +0000 Johannes, can you tell me how you managed to move nested folders from cachedimap to local accounts or within the cachedimap account area? Nested folders shouldn't have the Move Folder To popup menu item. How can you have lost messages except when moving from the local account to a cachedimap account? (There is a bug which shows this menu item for nested folders which have just been moved to a cachedimap account. However you stated that you could only move one folder and the child folders where lost. So how could you have a child folder then? In fact, you need some additional code like in my patch to see the mentioned bug.) 392508 4 13613 a.gungl 2005-11-23 16:59:05 +0000 Created attachment 13613 fix for moving around nested folders from a local account Okay, here is a patch which allows moving of nested folders from a local account to a cachedimap account. The opposite direction would work as well but is allowed only for leaf folders. I made sure that fresh copies of nested folders have the correct state. So AFAICT it's not possible to move nested folders from within a cachedimap account. In case I've overseen a constellation, the nested folders are moved to a local account w/o data loss though. 393531 5 Johannes.Stamminger 2005-11-28 09:23:21 +0000 > Johannes, can you tell me how you managed to move nested folders from > cachedimap to local accounts or within the cachedimap account area? I used context menue for the toplevel folder (Test1). Today I played again with the moving: I used context menues to create locally a.m. folders. Then I copied some mails into them and again used the context menue item for the toplevel (Test1) folder "Move Folder To" to move the folder to the DIMAP account (placing toplevel). 2nd test was the same but moving to the IMAP account (pointing to the same mailbox as the DIMAP one). 3rd test was to create the folders using a IMAP account. Creation using the DIMAP failed: the DIMAP showed Test2 as subfolder of Test1. But IMAP and subscriptions tell of them to be in parallel. BTW, the IMAP and the DIMAP seem to share the subscriptions! When having created those folders after some time the DIMAP account showed those folders automatically. When unsubscribing using the DIMAP account, the folders first (!) disappeared from the IMAP account and later (!) from the DIMAP one. I do not feel this to be intended behaviour ... ? Due to this there was no need to subscribe separately the DIMAP account for the new folders. Within the DIMAP account I then could use context menue item to move the folders (within the IMAP account the menue item does not exist) to the local folders (toplevel). I just saw a new detail about this last move: sometime after I moved, the IMAP account complained about the missing Test1 folder. Having a look to the subscriptions, Test1 is not subscribed (not in IMAP nor DIMAP) but the Test2 subfolder is (in both). The IMAP account shows both, Test1 (now empty) and below Test2 (still containing the mails), the DIMAP shows none of them. For the DIMAP I then re-subscribed both (unsubscribe Test1, subscribe Test1 and Test2; every step followed by cache refresh from the DIMAP account troubleshooting context menue). Afterwards DIMAP showed the same as the IMAP. And: I was able to move the remaining subfolder seperately to the local folders. Summary: - when moving from local to DIMAP, subfolders and mails contained are lost - when moving from local to IMAP, subfolders and mails contained are lost - when moving from DIMAP to local or to another folder within the DIMAP, no folders or mails are lost but - display is confused - unexpectedly subfolders and their mails are not moved, only mails of the toplevel folder are moved - connecting to an IMAP account both ways, IMAP and DIMAP, in parallel, subscriptions are shared. And the display of one gets confused on changes to the other. - creation of subfolder succeeds only with the parent being synced to the server. When creating within a short time both, parent and subfolder, this leads to two folders in parallel after having synced with the server. - moving from IMAP to local or DIMAP is not possible, no menue entry for doing so 393536 6 a.gungl 2005-11-28 10:22:28 +0000 Am Montag, 28. November 2005 09:23 schrieb Johannes Stamminger: > Summary: Hi Johannes, thanks for your effort. > - when moving from local to DIMAP, subfolders and mails contained are lost > - when moving from local to IMAP, subfolders and mails contained are lost > - when moving from DIMAP to local or to another folder within the DIMAP, no > folders or mails are lost but > - display is confused > - unexpectedly subfolders and their mails are not moved, only mails of > the toplevel folder are moved Well, actually you should only be able to move folders without child folders in an DIMAP account. But this may fail when subscription comes into play. I haven't tested with online IMAP so far. > - connecting to an IMAP account both ways, IMAP and DIMAP, in parallel, > subscriptions are shared. And the display of one gets confused on changes > to the other. This is the way subscription works. The subscription data is stored on the server per account. All clients share this data when accessing an account which is intended. > - creation of subfolder succeeds only with the parent being synced to the > server. When creating within a short time both, parent and subfolder, this > leads to two folders in parallel after having synced with the server. I need to check this, but it will take a while as currently I have no access to a server. > - moving from IMAP to local or DIMAP is not possible, no menue entry > for doing so That's intended AFAIK. 396836 7 jonas 2005-12-08 21:07:43 +0000 I decided to try online IMAP today. Never done that before. Of course I lost ALL OF MY MAIL to my friends 3 years back, because of trying to move several folders at the same time (Kmail willingly allowed it no Hour-glass or anything.) this is moving from local folders to online IMAP folders. The effect: The first folder was large and took about 15 minutes to transfer. I started transferring 5 other folders while waiting. And when activity ended I had the folders I moved on the IMAP server but they were all empty but the first big one. If this is not relevant to this exact bug I'll be happy to report it in a new bug using all caps. :( 396837 8 jonas 2005-12-08 21:08:41 +0000 Forgot to say this is kde 3.5 from svn some days ago, with kmail 1.9 396910 9 a.gungl 2005-12-09 10:15:20 +0000 Jonas, your problem of loosing the content of the child folders is exactly the one which the bug report is about. If you're running a self-compiled KDE, you can apply the patch attached to this report to minimize the chance for a message loss. 396937 10 jonas 2005-12-09 11:52:18 +0000 Thanks, The 13613 patch worked great. kdedev@jw ~/src/kde-svn-3.5/kdepim/kmail $ patch <movenestedfolderspatch.diff patching file renamejob.cpp patching file renamejob.h patching file kmfolder.cpp Reversed (or previously applied) patch detected! Assume -R? [n] Apply anyway? [n] Skipping patch. 1 out of 1 hunk ignored -- saving rejects to file kmfolder.cpp.rej kdedev@jw ~/src/kde-svn-3.5/kdepim/kmail $ I just followed the defaults that patch suggested regarding kmfolder.cpp. Never applied a patch before so I didn't completely understand -R when doing it, but it compiled fine against Revision: 486913 anyway. Big thanks. Is this one of those patches that change too much to get committed to the branch? no? It's IMHO such a serious bug I think it should be committed. (haven't looked at the code though) Thanks. 397054 11 a.gungl 2005-12-09 19:54:50 +0000 > Big thanks. Is this one of those patches that change too much to get > committed to the branch? no? It's IMHO such a serious bug I think it should > be committed. (haven't looked at the code though) Each patch is a risk of it's own. This one has been tested only by me. I haven't got feedback from other people so far (except from you). Anyway, the core developers prefer disabling the move function for folders to be on the safe side. But I haven't got around with that change because I've spent my time on report 113730 which is critical as well. 397145 12 a.gungl 2005-12-10 05:08:23 +0000 SVN commit 487310 by gungl: Disable folders in IMAP and cached IMAP accounts as destination for a folder move to avoid loosing all messages in the subfolders when moving nested folders. Moving to a local destination folder works correct. This is only a workaround for the real problem which is addressed by a patch. It was aggreed on not applying the patch to the KDE 3.5 branch before it's been tested by more people. BUG:114985 M +12 -0 kmfoldertree.cpp --- branches/KDE/3.5/kdepim/kmail/kmfoldertree.cpp #487309:487310 @@ -1780,6 +1780,18 @@ item = item->nextSibling(); continue; } + if ( action == MoveFolder ) { + // FIXME remove in KDE 4 + // skip all but local folders if a folder is to be moved + // because moving of nested folders to IMAP and DIMAP + // looses all messages in the subfolders + if ( fti->protocol() != KFolderTreeItem::Local + && fti->protocol() != KFolderTreeItem::NONE ) + { + item = item->nextSibling(); + continue; + } + } QString label = fti->text( 0 ); label.replace( "&","&&" ); if ( fti->firstChild() ) 457459 13 antik 2006-08-01 18:41:40 +0000 All mail lost after moving folder to cached IMAP folder. After syncronization with server it shows that all folders is syncronized but after system proper shutdown and start kmail lost all mail that is moved to IMAP folder. Worse yet it does not show any mail in pop folder too- with other mail client opera I can see pop mail account mails. Moved cached IMAP folder is empty on server side. KDE Version 1.9.3 (KDE 3.5.3, compiled sources) Application E-Mail Client Operating System FreeBSD (i386) release 6.1-RELEASE-p2 Compiler gcc version 3.4.4 [FreeBSD] 20050518 13593 2005-11-22 13:57:53 +0000 2005-11-23 16:59:05 +0000 fix moving of folders containing subfolders from local to dIMAP accounts kmail-foldermove-dimap.diff text/plain 3771 a.gungl SW5kZXg6IHJlbmFtZWpvYi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gcmVuYW1lam9iLmNwcAkocmV2aXNp b24gNDgxMjc2KQorKysgcmVuYW1lam9iLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTgsNiArNTgs NyBAQAogICAgbVN0b3JhZ2UoIHN0b3JhZ2UgKSwgbU5ld1BhcmVudCggbmV3UGFyZW50ICksCiAg ICBtTmV3TmFtZSggbmV3TmFtZSApLCBtTmV3Rm9sZGVyKCAwICkKIHsKKyAgbVN0b3JhZ2VUZW1w T3BlbmVkID0gMDsKICAgbU9sZE5hbWUgPSBzdG9yYWdlLT5uYW1lKCk7CiAgIGlmICggc3RvcmFn ZS0+Zm9sZGVyVHlwZSgpID09IEtNRm9sZGVyVHlwZUltYXAgKSB7CiAgICAgbU9sZEltYXBQYXRo ID0gc3RhdGljX2Nhc3Q8S01Gb2xkZXJJbWFwKj4oc3RvcmFnZSktPmltYXBQYXRoKCk7CkBAIC0x MzEsNyArMTMyLDEyIEBACiAgICAgICBLTUZvbGRlckNhY2hlZEltYXAqIG5ld1N0b3JhZ2UgPSBz dGF0aWNfY2FzdDxLTUZvbGRlckNhY2hlZEltYXAqPihtTmV3Rm9sZGVyLT5zdG9yYWdlKCkpOwog ICAgICAgS01Gb2xkZXJDYWNoZWRJbWFwKiBvd25lciA9IHN0YXRpY19jYXN0PEtNRm9sZGVyQ2Fj aGVkSW1hcCo+KG1OZXdQYXJlbnQtPm93bmVyKCktPnN0b3JhZ2UoKSk7CiAgICAgICBuZXdTdG9y YWdlLT5pbml0aWFsaXplRnJvbSggb3duZXIgKTsKLSAgICAgIHNsb3RNb3ZlTWVzc2FnZXMoKTsK KyAgICAgIC8vIG1vdmUgY2hpbGQgZm9sZGVycyByZWN1cnNpdmUKKyAgICAgIEtNRm9sZGVyRGly KiBjaGlsZCA9IG1TdG9yYWdlLT5mb2xkZXIoKS0+Y2hpbGQoKTsKKyAgICAgIGlmICggY2hpbGQg KSB7CisgICAgICAgIHNsb3RNb3ZlU3ViRm9sZGVycyggIiIsIHRydWUgKTsKKyAgICAgIH0KKyAg ICAgIGVsc2Ugc2xvdE1vdmVNZXNzYWdlcygpOwogICAgIH0gZWxzZQogICAgIHsKICAgICAgIC8v IGxvY2FsCkBAIC0yMTksNiArMjI1LDggQEAKICAgbVN0b3JhZ2UtPmJsb2NrU2lnbmFscyggdHJ1 ZSApOwogICAvLyBtb3ZlIGFsbCBtZXNzYWdlcyB0byB0aGUgbmV3IGZvbGRlcgogICBRUHRyTGlz dDxLTU1zZ0Jhc2U+IG1zZ0xpc3Q7CisgIGlmICggIW1TdG9yYWdlLT5pc09wZW5lZCgpICkKKyAg ICBtU3RvcmFnZVRlbXBPcGVuZWQgPSBtU3RvcmFnZS0+b3BlbigpID8gbVN0b3JhZ2UgOiAwOwog ICBmb3IgKCBpbnQgaSA9IDA7IGkgPCBtU3RvcmFnZS0+Y291bnQoKTsgaSsrICkKICAgewogICAg IEtNTXNnQmFzZSogbXNnQmFzZSA9IG1TdG9yYWdlLT5nZXRNc2dCYXNlKCBpICk7CkBAIC0yNDAs NiArMjQ4LDEwIEBACiB2b2lkIFJlbmFtZUpvYjo6c2xvdE1vdmVDb21wbGV0ZWQoIEtNQ29tbWFu ZCogY29tbWFuZCApCiB7CiAgIGtkRGVidWcoNTAwNikgPDwga19mdW5jaW5mbyA8PCAoY29tbWFu ZD9jb21tYW5kLT5yZXN1bHQoKTowKSA8PCBlbmRsOworICBpZiAoIG1TdG9yYWdlVGVtcE9wZW5l ZCApIHsKKyAgICBtU3RvcmFnZVRlbXBPcGVuZWQtPmNsb3NlKCk7CisgICAgbVN0b3JhZ2VUZW1w T3BlbmVkID0gMDsKKyAgfQogICBpZiAoIGNvbW1hbmQgKSB7CiAgICAgLy8ganVzdCBtYWtlIHN1 cmUgbm90aGluZyBib3VuY2VzCiAgICAgZGlzY29ubmVjdCggY29tbWFuZCwgU0lHTkFMKCBjb21w bGV0ZWQoIEtNQ29tbWFuZCAqICkgKSwKQEAgLTMxNSw0ICszMjcsMjcgQEAKICAgZGVsZXRlIHRo aXM7CiB9CiAKK3ZvaWQgUmVuYW1lSm9iOjpzbG90TW92ZVN1YkZvbGRlcnMoIFFTdHJpbmcgbmV3 TmFtZSwgYm9vbCBzdWNjZXNzICkKK3sKKyAgaWYgKCAhc3VjY2VzcyApIHsKKyAgICAgIGVtaXQg cmVuYW1lRG9uZSggbU5ld05hbWUsIGZhbHNlICk7CisgIH0gZWxzZSB7CisgICAgS01Gb2xkZXJE aXIqIGNoaWxkID0gbVN0b3JhZ2UtPmZvbGRlcigpLT5jaGlsZCgpOworICAgIGlmICggY2hpbGQg JiYgY2hpbGQtPmZpcnN0KCkgKQorICAgIHsKKyAgICAgIEtNRm9sZGVyTm9kZSogbm9kZSA9IGNo aWxkLT5maXJzdCgpOworICAgICAgeworICAgICAgICBGb2xkZXJTdG9yYWdlKiBjaGlsZFN0b3Jh Z2UgPSBzdGF0aWNfY2FzdDxLTUZvbGRlcio+KG5vZGUpLT5zdG9yYWdlKCk7CisgICAgICAgIGlm ICggIW1OZXdGb2xkZXItPmNoaWxkKCkgKQorICAgICAgICAgIG1OZXdGb2xkZXItPmNyZWF0ZUNo aWxkRm9sZGVyKCk7CisgICAgICAgIFJlbmFtZUpvYiogam9iID0gbmV3IFJlbmFtZUpvYiggY2hp bGRTdG9yYWdlLCBjaGlsZFN0b3JhZ2UtPm5hbWUoKSwgbU5ld0ZvbGRlci0+Y2hpbGQoKSApOwor ICAgICAgICBjb25uZWN0KCBqb2IsIFNJR05BTCggcmVuYW1lRG9uZSggUVN0cmluZywgYm9vbCAp ICksCisgICAgICAgICAgICB0aGlzLCBTTE9UKCBzbG90TW92ZVN1YkZvbGRlcnMoIFFTdHJpbmcs IGJvb2wgKSApICk7CisgICAgICAgIGpvYi0+c3RhcnQoKTsKKyAgICAgIH0KKyAgICB9CisgICAg ZWxzZSBzbG90TW92ZU1lc3NhZ2VzKCk7CisgIH0KK30KKwogI2luY2x1ZGUgInJlbmFtZWpvYi5t b2MiCkluZGV4OiByZW5hbWVqb2IuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSByZW5hbWVqb2IuaAkocmV2aXNp b24gNDgxMjc2KQorKysgcmVuYW1lam9iLmgJKHdvcmtpbmcgY29weSkKQEAgLTczLDEyICs3Mywx NSBAQAogICAvKiogQWxsIG1lc3NhZ2VzIGFyZSBtb3ZlZCBzbyByZW1vdmUgdGhlIG9yaWdpbmFs IGZvbGRlciAqLwogICB2b2lkIHNsb3RNb3ZlQ29tcGxldGVkKCBLTUNvbW1hbmQgKmNvbW1hbmQg KTsKIAorICB2b2lkIHNsb3RNb3ZlU3ViRm9sZGVycyggUVN0cmluZyBuZXdOYW1lLCBib29sIHN1 Y2Nlc3MgKTsKKwogc2lnbmFsczoKICAgLyoqIEVtaXR0ZWQgd2hlbiB0aGUgam9iIGlzIGRvbmUs IGNoZWNrIHRoZSBzdWNjZXNzIGJvb2wgKi8KICAgdm9pZCByZW5hbWVEb25lKCBRU3RyaW5nIG5l d05hbWUsIGJvb2wgc3VjY2VzcyApOwogCiBwcm90ZWN0ZWQ6CiAgIEZvbGRlclN0b3JhZ2UqIG1T dG9yYWdlOworICBGb2xkZXJTdG9yYWdlKiBtU3RvcmFnZVRlbXBPcGVuZWQ7CiAgIEtNRm9sZGVy RGlyKiBtTmV3UGFyZW50OwogICBRU3RyaW5nIG1OZXdOYW1lOwogICBRU3RyaW5nIG1OZXdJbWFw UGF0aDsKSW5kZXg6IGttZm9sZGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBrbWZvbGRlci5jcHAJKHJl dmlzaW9uIDQ4MTI3NikKKysrIGttZm9sZGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjYzLDgg KzI2MywxMyBAQAogICAgIH0KICAgfQogCi0gIG1DaGlsZCA9IG5ldyBLTUZvbGRlckRpciggdGhp cywgcGFyZW50KCksIGNoaWxkTmFtZSwKLSAgICAoZm9sZGVyVHlwZSgpID09IEtNRm9sZGVyVHlw ZUltYXApID8gS01JbWFwRGlyIDogS01TdGFuZGFyZERpcik7CisgIEtNRm9sZGVyRGlyVHlwZSBu ZXdUeXBlID0gS01TdGFuZGFyZERpcjsKKyAgaWYoIGZvbGRlclR5cGUoKSA9PSBLTUZvbGRlclR5 cGVDYWNoZWRJbWFwICkKKyAgICBuZXdUeXBlID0gS01ESW1hcERpcjsKKyAgZWxzZSBpZiggZm9s ZGVyVHlwZSgpID09IEtNRm9sZGVyVHlwZUltYXAgKQorICAgIG5ld1R5cGUgPSBLTUltYXBEaXI7 CisKKyAgbUNoaWxkID0gbmV3IEtNRm9sZGVyRGlyKCB0aGlzLCBwYXJlbnQoKSwgY2hpbGROYW1l LCBuZXdUeXBlICk7CiAgIGlmKCAhbUNoaWxkICkKICAgICByZXR1cm4gMDsKICAgbUNoaWxkLT5y ZWxvYWQoKTsK 13613 2005-11-23 16:59:05 +0000 2005-11-23 16:59:05 +0000 fix for moving around nested folders from a local account kmail-foldermove-dimap-1.diff text/plain 4973 a.gungl SW5kZXg6IHJlbmFtZWpvYi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gcmVuYW1lam9iLmNwcAkocmV2aXNp b24gNDgxMjc2KQorKysgcmVuYW1lam9iLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTgsNiArNTgs NyBAQAogICAgbVN0b3JhZ2UoIHN0b3JhZ2UgKSwgbU5ld1BhcmVudCggbmV3UGFyZW50ICksCiAg ICBtTmV3TmFtZSggbmV3TmFtZSApLCBtTmV3Rm9sZGVyKCAwICkKIHsKKyAgbVN0b3JhZ2VUZW1w T3BlbmVkID0gMDsKICAgbU9sZE5hbWUgPSBzdG9yYWdlLT5uYW1lKCk7CiAgIGlmICggc3RvcmFn ZS0+Zm9sZGVyVHlwZSgpID09IEtNRm9sZGVyVHlwZUltYXAgKSB7CiAgICAgbU9sZEltYXBQYXRo ID0gc3RhdGljX2Nhc3Q8S01Gb2xkZXJJbWFwKj4oc3RvcmFnZSktPmltYXBQYXRoKCk7CkBAIC03 Nyw3ICs3OCw4IEBACiAgICAgLy8gbW92ZSB0aGUgZm9sZGVyIHRvIGEgZGlmZmVyZW50IHBhcmVu dAogICAgIEtNRm9sZGVyVHlwZSB0eXBlID0gbVN0b3JhZ2UtPmZvbGRlclR5cGUoKTsKICAgICBp ZiAoICggdHlwZSA9PSBLTUZvbGRlclR5cGVNYm94IHx8IHR5cGUgPT0gS01Gb2xkZXJUeXBlTWFp bGRpciApICYmCi0gICAgICAgICBtTmV3UGFyZW50LT50eXBlKCkgPT0gS01TdGFuZGFyZERpciAp CisgICAgICAgICBtTmV3UGFyZW50LT50eXBlKCkgPT0gS01TdGFuZGFyZERpciAmJgorICAgICAg ICAgbVN0b3JhZ2UtPmZvbGRlclR5cGUoKSAhPSBLTUZvbGRlclR5cGVDYWNoZWRJbWFwICkKICAg ICB7CiAgICAgICAvLyBsb2NhbCBmb2xkZXJzIGNhbiBoYW5kbGUgdGhpcyBvbiB0aGVpciBvd24K ICAgICAgIG1TdG9yYWdlLT5yZW5hbWUoIG1OZXdOYW1lLCBtTmV3UGFyZW50ICk7CkBAIC0xMzEs NyArMTMzLDExIEBACiAgICAgICBLTUZvbGRlckNhY2hlZEltYXAqIG5ld1N0b3JhZ2UgPSBzdGF0 aWNfY2FzdDxLTUZvbGRlckNhY2hlZEltYXAqPihtTmV3Rm9sZGVyLT5zdG9yYWdlKCkpOwogICAg ICAgS01Gb2xkZXJDYWNoZWRJbWFwKiBvd25lciA9IHN0YXRpY19jYXN0PEtNRm9sZGVyQ2FjaGVk SW1hcCo+KG1OZXdQYXJlbnQtPm93bmVyKCktPnN0b3JhZ2UoKSk7CiAgICAgICBuZXdTdG9yYWdl LT5pbml0aWFsaXplRnJvbSggb3duZXIgKTsKLSAgICAgIHNsb3RNb3ZlTWVzc2FnZXMoKTsKKyAg ICAgIG1vdmVTdWJGb2xkZXJzQmVmb3JlTWVzc2FnZXMoKTsKKyAgICB9IGVsc2UgaWYgKCBtU3Rv cmFnZS0+Zm9sZGVyVHlwZSgpID09IEtNRm9sZGVyVHlwZUNhY2hlZEltYXAgKQorICAgIHsKKyAg ICAgIC8vIGZyb20gKGQpSU1BUCB0byBsb2NhbCBhY2NvdW50CisgICAgICBtb3ZlU3ViRm9sZGVy c0JlZm9yZU1lc3NhZ2VzKCk7CiAgICAgfSBlbHNlCiAgICAgewogICAgICAgLy8gbG9jYWwKQEAg LTIxOSw2ICsyMjUsOCBAQAogICBtU3RvcmFnZS0+YmxvY2tTaWduYWxzKCB0cnVlICk7CiAgIC8v IG1vdmUgYWxsIG1lc3NhZ2VzIHRvIHRoZSBuZXcgZm9sZGVyCiAgIFFQdHJMaXN0PEtNTXNnQmFz ZT4gbXNnTGlzdDsKKyAgaWYgKCAhbVN0b3JhZ2UtPmlzT3BlbmVkKCkgKQorICAgIG1TdG9yYWdl VGVtcE9wZW5lZCA9IG1TdG9yYWdlLT5vcGVuKCkgPyBtU3RvcmFnZSA6IDA7CiAgIGZvciAoIGlu dCBpID0gMDsgaSA8IG1TdG9yYWdlLT5jb3VudCgpOyBpKysgKQogICB7CiAgICAgS01Nc2dCYXNl KiBtc2dCYXNlID0gbVN0b3JhZ2UtPmdldE1zZ0Jhc2UoIGkgKTsKQEAgLTI0MCw2ICsyNDgsMTAg QEAKIHZvaWQgUmVuYW1lSm9iOjpzbG90TW92ZUNvbXBsZXRlZCggS01Db21tYW5kKiBjb21tYW5k ICkKIHsKICAga2REZWJ1Zyg1MDA2KSA8PCBrX2Z1bmNpbmZvIDw8IChjb21tYW5kP2NvbW1hbmQt PnJlc3VsdCgpOjApIDw8IGVuZGw7CisgIGlmICggbVN0b3JhZ2VUZW1wT3BlbmVkICkgeworICAg IG1TdG9yYWdlVGVtcE9wZW5lZC0+Y2xvc2UoKTsKKyAgICBtU3RvcmFnZVRlbXBPcGVuZWQgPSAw OworICB9CiAgIGlmICggY29tbWFuZCApIHsKICAgICAvLyBqdXN0IG1ha2Ugc3VyZSBub3RoaW5n IGJvdW5jZXMKICAgICBkaXNjb25uZWN0KCBjb21tYW5kLCBTSUdOQUwoIGNvbXBsZXRlZCggS01D b21tYW5kICogKSApLApAQCAtMjYzLDYgKzI3NSwxMCBAQAogICAgICAgY29uZmlnLT53cml0ZUVu dHJ5KCBpdC5rZXkoKSwgaXQuZGF0YSgpICk7CiAgICAgfQogICAgIG1OZXdGb2xkZXItPnJlYWRD b25maWcoIGNvbmZpZyApOworICAgIC8vIG1ha2Ugc3VyZSB0aGUgY2hpbGRyZW4gc3RhdGUgaXMg Y29ycmVjdAorICAgIGlmICggbU5ld0ZvbGRlci0+Y2hpbGQoKSAmJgorICAgICAgICAgKCBtTmV3 Rm9sZGVyLT5zdG9yYWdlKCktPmhhc0NoaWxkcmVuKCkgPT0gRm9sZGVyU3RvcmFnZTo6SGFzTm9D aGlsZHJlbiApICkKKyAgICAgIG1OZXdGb2xkZXItPnN0b3JhZ2UoKS0+dXBkYXRlQ2hpbGRyZW5T dGF0ZSgpOwogCiAgICAgLy8gZGVsZXRlIHRoZSBvbGQgZm9sZGVyCiAgICAgbVN0b3JhZ2UtPmJs b2NrU2lnbmFscyggZmFsc2UgKTsKQEAgLTMxNSw0ICszMzEsMzcgQEAKICAgZGVsZXRlIHRoaXM7 CiB9CiAKK3ZvaWQgUmVuYW1lSm9iOjpzbG90TW92ZVN1YkZvbGRlcnMoIFFTdHJpbmcgbmV3TmFt ZSwgYm9vbCBzdWNjZXNzICkKK3sKKyAgaWYgKCAhc3VjY2VzcyApIHsKKyAgICAgIGVtaXQgcmVu YW1lRG9uZSggbmV3TmFtZSwgZmFsc2UgKTsKKyAgfSBlbHNlIHsKKyAgICBLTUZvbGRlckRpciog Y2hpbGQgPSBtU3RvcmFnZS0+Zm9sZGVyKCktPmNoaWxkKCk7CisgICAgaWYgKCBjaGlsZCAmJiBj aGlsZC0+Zmlyc3QoKSApCisgICAgeworICAgICAgS01Gb2xkZXJOb2RlKiBub2RlID0gY2hpbGQt PmZpcnN0KCk7CisgICAgICB7CisgICAgICAgIEZvbGRlclN0b3JhZ2UqIGNoaWxkU3RvcmFnZSA9 IHN0YXRpY19jYXN0PEtNRm9sZGVyKj4obm9kZSktPnN0b3JhZ2UoKTsKKyAgICAgICAgaWYgKCAh bU5ld0ZvbGRlci0+Y2hpbGQoKSApCisgICAgICAgICAgbU5ld0ZvbGRlci0+Y3JlYXRlQ2hpbGRG b2xkZXIoKTsKKyAgICAgICAgUmVuYW1lSm9iKiBqb2IgPSBuZXcgUmVuYW1lSm9iKCBjaGlsZFN0 b3JhZ2UsIGNoaWxkU3RvcmFnZS0+bmFtZSgpLAorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIG1OZXdGb2xkZXItPmNoaWxkKCkgKTsKKyAgICAgICAgY29ubmVjdCggam9i LCBTSUdOQUwoIHJlbmFtZURvbmUoIFFTdHJpbmcsIGJvb2wgKSApLAorICAgICAgICAgICAgdGhp cywgU0xPVCggc2xvdE1vdmVTdWJGb2xkZXJzKCBRU3RyaW5nLCBib29sICkgKSApOworICAgICAg ICBqb2ItPnN0YXJ0KCk7CisgICAgICB9CisgICAgfQorICAgIGVsc2Ugc2xvdE1vdmVNZXNzYWdl cygpOworICB9Cit9CisKK3ZvaWQgUmVuYW1lSm9iOjptb3ZlU3ViRm9sZGVyc0JlZm9yZU1lc3Nh Z2VzKCkKK3sKKyAgLy8gbW92ZSBjaGlsZCBmb2xkZXJzIHJlY3Vyc2l2ZSBpZiBwcmVzZW50IC0g ZWxzZSBzaW1wbHkgbW92ZSB0aGUgbWVzc2FnZXMKKyAgS01Gb2xkZXJEaXIqIGNoaWxkID0gbVN0 b3JhZ2UtPmZvbGRlcigpLT5jaGlsZCgpOworICBpZiAoIGNoaWxkICkKKyAgICBzbG90TW92ZVN1 YkZvbGRlcnMoICIiLCB0cnVlICk7CisgIGVsc2Ugc2xvdE1vdmVNZXNzYWdlcygpOworfQorCiAj aW5jbHVkZSAicmVuYW1lam9iLm1vYyIKSW5kZXg6IHJlbmFtZWpvYi5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IHJlbmFtZWpvYi5oCShyZXZpc2lvbiA0ODEyNzYpCisrKyByZW5hbWVqb2IuaAkod29ya2luZyBj b3B5KQpAQCAtNzMsMTIgKzczLDE3IEBACiAgIC8qKiBBbGwgbWVzc2FnZXMgYXJlIG1vdmVkIHNv IHJlbW92ZSB0aGUgb3JpZ2luYWwgZm9sZGVyICovCiAgIHZvaWQgc2xvdE1vdmVDb21wbGV0ZWQo IEtNQ29tbWFuZCAqY29tbWFuZCApOwogCisgIHZvaWQgc2xvdE1vdmVTdWJGb2xkZXJzKCBRU3Ry aW5nIG5ld05hbWUsIGJvb2wgc3VjY2VzcyApOworCiBzaWduYWxzOgogICAvKiogRW1pdHRlZCB3 aGVuIHRoZSBqb2IgaXMgZG9uZSwgY2hlY2sgdGhlIHN1Y2Nlc3MgYm9vbCAqLwogICB2b2lkIHJl bmFtZURvbmUoIFFTdHJpbmcgbmV3TmFtZSwgYm9vbCBzdWNjZXNzICk7CiAKIHByb3RlY3RlZDoK KyAgdm9pZCBtb3ZlU3ViRm9sZGVyc0JlZm9yZU1lc3NhZ2VzKCk7CisKICAgRm9sZGVyU3RvcmFn ZSogbVN0b3JhZ2U7CisgIEZvbGRlclN0b3JhZ2UqIG1TdG9yYWdlVGVtcE9wZW5lZDsKICAgS01G b2xkZXJEaXIqIG1OZXdQYXJlbnQ7CiAgIFFTdHJpbmcgbU5ld05hbWU7CiAgIFFTdHJpbmcgbU5l d0ltYXBQYXRoOwpJbmRleDoga21mb2xkZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIGttZm9sZGVyLmNw cAkocmV2aXNpb24gNDgxMjc2KQorKysga21mb2xkZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0y NjMsOCArMjYzLDEzIEBACiAgICAgfQogICB9CiAKLSAgbUNoaWxkID0gbmV3IEtNRm9sZGVyRGly KCB0aGlzLCBwYXJlbnQoKSwgY2hpbGROYW1lLAotICAgIChmb2xkZXJUeXBlKCkgPT0gS01Gb2xk ZXJUeXBlSW1hcCkgPyBLTUltYXBEaXIgOiBLTVN0YW5kYXJkRGlyKTsKKyAgS01Gb2xkZXJEaXJU eXBlIG5ld1R5cGUgPSBLTVN0YW5kYXJkRGlyOworICBpZiggZm9sZGVyVHlwZSgpID09IEtNRm9s ZGVyVHlwZUNhY2hlZEltYXAgKQorICAgIG5ld1R5cGUgPSBLTURJbWFwRGlyOworICBlbHNlIGlm KCBmb2xkZXJUeXBlKCkgPT0gS01Gb2xkZXJUeXBlSW1hcCApCisgICAgbmV3VHlwZSA9IEtNSW1h cERpcjsKKworICBtQ2hpbGQgPSBuZXcgS01Gb2xkZXJEaXIoIHRoaXMsIHBhcmVudCgpLCBjaGls ZE5hbWUsIG5ld1R5cGUgKTsKICAgaWYoICFtQ2hpbGQgKQogICAgIHJldHVybiAwOwogICBtQ2hp bGQtPnJlbG9hZCgpOwo=