From kmail-devel Sun May 14 03:06:28 2000 From: Don Sanders Date: Sun, 14 May 2000 03:06:28 +0000 To: kmail-devel Subject: Re: KMail addressbook broken X-MARC-Message: https://marc.info/?l=kmail-devel&m=95827373904508 MIME-Version: 1 Content-Type: multipart/mixed; boundary="--Boundary-=_QcCFhTZRLPStFqtZMsrMHepbiEAE" --Boundary-=_QcCFhTZRLPStFqtZMsrMHepbiEAE Content-Type: text/plain Content-Transfer-Encoding: 8bit I did unfortunately have to revert Mirko's commits. KMail can't be left in a state where numerous error dialogs pop up every time you start, and breaking existing functionality is discouraged most strenously, even adding new functionality that is not functionally complete is not encouraged. Maybe I can modify and recommit Mirko changes in a way that doesn't have adverse effects. I forgot to include the error dialogs, I was receiving nine of them everytime I started up KMail. Here are the first two. "Cannot find kab's configuration template file kab cannot be configured" "Your local kab configuration file "/home/dsanders/.kde/share/apps/kab/kab.config" could not be created. kab will probably not work correctly without it. Make usre you did not remvoe writing permssion from your local kde directory." I attach a diff of all Mirko's changes so that any one who wants to comment can do so from an informed position. BFN, DOn. On Sun, 14 May 2000, Don Sanders wrote: > Mirko has checked in some changes to cvs that have broken the address book > functionality completely and are causing numerous errors at start up :-( > > I think I'm going to revert his commits. > > Mirko please don't check in stuff that breaks existing functionality. Perhaps > it's better if you just leave the address book stuff to me. > > This is what broke. > > I receive numerous error dialogs at start up (see attached lists). > > Auto-completion of email address is broken. > > Cannot access existing address book GUI (support the existing GUI must be > retained until it ready to be removed, this is the way things were done for > the configuration dialog and the way things are being done for the new pop > account). > > BFN, > Don. --Boundary-=_QcCFhTZRLPStFqtZMsrMHepbiEAE Content-Type: text/plain; name="mirko.diff" Content-Transfer-Encoding: base64 Content-Description: Mirko's changes Content-Disposition: attachment; filename="mirko.diff" SW5kZXg6IE1ha2VmaWxlLmFtCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9ob21lL2tkZS9rZGVuZXR3 b3JrL2ttYWlsL01ha2VmaWxlLmFtLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjg4CnJldHJpZXZp bmcgcmV2aXNpb24gMS44OQpkaWZmIC11IC1yMS44OCAtcjEuODkKLS0tIE1ha2VmaWxlLmFtCTIw MDAvMDUvMTAgMTQ6MTE6MjgJMS44OAorKysgTWFrZWZpbGUuYW0JMjAwMC8wNS8xMyAyMTo0OTo1 NQkxLjg5CkBAIC0xLDcgKzEsNyBAQAogCiBTVUJESVJTID0gcGljcwogSU5DTFVERVMgPSAkKGFs bF9pbmNsdWRlcykKLUxEQURECT0gJChMSUJfS0hUTUwpIC1sa3NwZWxsIC1sbWltZWxpYiAkKExJ Ql9LRklMRSkKK0xEQURECT0gJChMSUJfS0hUTUwpIC1sa3NwZWxsIC1sbWltZWxpYiAtbGthYiAk KExJQl9LRklMRSkKIAogYmluX1BST0dSQU1TID0ga21haWwKIApAQCAtMjYsNyArMjYsOCBAQAog CQlrbXVuZG9zdGFjay5jcHAga21icm9hZGNhc3RzdGF0dXMuY3BwIFwKIAkJa21hY2N0ZXhwcG9w LmNwcCBjb25maWd1cmVkaWFsb2cuY3BwIGNvbG9ybGlzdGJveC5jcHAgXAogICAgICAgICAgICAg ICAgIGtta2VybmVsLmNwcCBrbWFpbElmYWNlLnNrZWwga21haWxJZmFjZS5zdHViIG1haW4uY3Bw IFwKLQkJYWNjb3VudGRpYWxvZy5jcHAKKwkJYWNjb3VudGRpYWxvZy5jcHAgXAorCQlhZGR0b2Fk ZHJlc3Nib29rLmNwcAogCiBNRVRBU09VUkNFUyA9IGttbWFpbndpbi5tb2Mga21mb2xkZXJkaWEu bW9jIGttZm9sZGVyLm1vYyBcCiAJCWttZm9sZGVydHJlZS5tb2Mga21oZWFkZXJzLm1vYyBcCklu ZGV4OiBrbWNvbXBvc2V3aW4uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9ob21lL2tkZS9rZGVu ZXR3b3JrL2ttYWlsL2ttY29tcG9zZXdpbi5jcHAsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMTk3 CnJldHJpZXZpbmcgcmV2aXNpb24gMS4xOTgKZGlmZiAtdSAtcjEuMTk3IC1yMS4xOTgKLS0tIGtt Y29tcG9zZXdpbi5jcHAJMjAwMC8wNS8xMCAxNDoxMToyOAkxLjE5NworKysga21jb21wb3Nld2lu LmNwcAkyMDAwLzA1LzEzIDIxOjQ5OjU1CTEuMTk4CkBAIC0yMCw4ICsyMCwxMSBAQAogI2luY2x1 ZGUgImtidXN5cHRyLmgiCiAjaW5jbHVkZSAia21tc2dwYXJ0ZGxnLmgiCiAjaW5jbHVkZSAia3Bn cC5oIgotI2luY2x1ZGUgImttYWRkcmJvb2tkbGcuaCIKLSNpbmNsdWRlICJrbWFkZHJib29rLmgi CisvLyAtLS0tLSA8bWlya28+OgorLy8gI2luY2x1ZGUgImttYWRkcmJvb2tkbGcuaCIKKy8vICNp bmNsdWRlICJrbWFkZHJib29rLmgiCisjaW5jbHVkZSA8a2FiYXBpLmg+CisvLyAtLS0tLSA8L21p cmtvPgogI2luY2x1ZGUgImtmb250dXRpbHMuaCIKICNpbmNsdWRlICJrbWlkZW50aXR5LmgiCiAK QEAgLTgzLDcgKzg2LDcgQEAKIGV4dGVybiBLQnVzeVB0ciAqa2JwOwogZXh0ZXJuIEtSTlNlbmRl ciAqbXNnU2VuZGVyOwogZXh0ZXJuIEtNSWRlbnRpdHkgKmlkZW50aXR5OwotZXh0ZXJuIEtNQWRk ckJvb2sgKmFkZHJCb29rOworZXh0ZXJuIEthYkFwaSAqYWRkckJvb2s7CiB0eXBlZGVmIFFMaXN0 PFFXaWRnZXQ+IFdpbmRvd0xpc3Q7CiBXaW5kb3dMaXN0KiB3aW5kb3dMaXN0PW5ldyBXaW5kb3dM aXN0OwogI2RlZmluZSBhYm91dFRleHQgIktSTiIKQEAgLTEzMTAsMzEgKzEzMTMsOTMgQEAKIC8v LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0KIHZvaWQgS01Db21wb3NlV2luOjphZGRyQm9va1NlbEludG8o S01MaW5lRWRpdCogYUxpbmVFZGl0KQogewotICBLTUFkZHJCb29rU2VsRGxnIGRsZyhrZXJuZWwt PmFkZHJCb29rKCkpOwotICBRU3RyaW5nIHR4dDsKLQotICAvL2Fzc2VydChhTGluZUVkaXQhPU5V TEwpOwotICBpZighYUxpbmVFZGl0KQorICAvLyAtLS0tLSA8bWlya28+OgorICAvKgorICAgIEtN QWRkckJvb2tTZWxEbGcgZGxnKGtlcm5lbC0+YWRkckJvb2soKSk7CisgICAgUVN0cmluZyB0eHQ7 CisgICAgCisgICAgLy8gYXNzZXJ0KGFMaW5lRWRpdCE9TlVMTCk7CisgICAgaWYoIWFMaW5lRWRp dCkKICAgICB7Ci0gICAgICBkZWJ1ZygiS01Db21wb3NlV2luOjphZGRyQm9va1NlbEludG8oKSA6 IGFMaW5lRWRpdCA9PSBOVUxMXG4iKTsKLSAgICAgIHJldHVybjsKKyAgICBkZWJ1ZygiS01Db21w b3NlV2luOjphZGRyQm9va1NlbEludG8oKSA6IGFMaW5lRWRpdCA9PSBOVUxMXG4iKTsKKyAgICBy ZXR1cm47CiAgICAgfQotICBpZiAoZGxnLmV4ZWMoKT09UURpYWxvZzo6UmVqZWN0ZWQpIHJldHVy bjsKLSAgdHh0ID0gUVN0cmluZyhhTGluZUVkaXQtPnRleHQoKSkuc3RyaXBXaGl0ZVNwYWNlKCk7 Ci0gIGlmICghdHh0LmlzRW1wdHkoKSkKLSAgeworICAgIGlmIChkbGcuZXhlYygpPT1RRGlhbG9n OjpSZWplY3RlZCkgcmV0dXJuOworICAgIHR4dCA9IFFTdHJpbmcoYUxpbmVFZGl0LT50ZXh0KCkp LnN0cmlwV2hpdGVTcGFjZSgpOworICAgIGlmICghdHh0LmlzRW1wdHkoKSkKKyAgICB7CiAgICAg aWYgKHR4dC5yaWdodCgxKS5hdCgwKSE9JywnKSB0eHQgKz0gIiwgIjsKICAgICBlbHNlIHR4dCAr PSAnICc7Ci0gIH0KLSAgYUxpbmVFZGl0LT5zZXRUZXh0KHR4dCArIGRsZy5hZGRyZXNzKCkpOwor ICAgIH0KKyAgICBhTGluZUVkaXQtPnNldFRleHQodHh0ICsgZGxnLmFkZHJlc3MoKSk7CisgICov CisgIGlmKGtlcm5lbC0+YWRkckJvb2soKSE9MCkKKyAgICB7CisgICAgICBpZihrZXJuZWwtPmFk ZHJCb29rKCktPmFkZHJlc3Nib29rKCktPm5vT2ZFbnRyaWVzKCk9PTApCisJeworCSAgS01lc3Nh Z2VCb3g6OmluZm9ybWF0aW9uCisJICAgICh0aGlzLAorCSAgICAgaTE4bigiWW91ciBhZGRyZXNz IGJvb2sgZG9lcyBub3QgY29udGFpbiBlbnRyaWVzLiIpLAorCSAgICAgaTE4bigiTm8gYWRkcmVz c2VzIikpOworCX0gZWxzZSB7CisJICBRU3RyaW5nIGFkZHJlc3M7CisJICBBZGRyZXNzQm9vazo6 RW50cnkgZW50cnk7CisJICBLYWJLZXkga2V5OworCSAgZm9yKDs7KQorCSAgICB7CisJICAgICAg aWYoIWtlcm5lbC0+YWRkckJvb2soKS0+ZXhlYygpKSBicmVhazsgLy8gcmVqZWN0ZWQKKwkgICAg ICBzd2l0Y2goa2VybmVsLT5hZGRyQm9vaygpLT5nZXRFbnRyeShlbnRyeSwga2V5KSkKKwkJewor CQljYXNlIEFkZHJlc3NCb29rOjpOb0Vycm9yOiAvLyBhbiBlbnRyeSBoYXMgYmVlbiBzZWxlY3Rl ZAorCQkgIC8vIC0tLS0tIGEgdGVzdDoKKwkJICBpZihlbnRyeS5lbWFpbHMuaXNFbXB0eSgpKQor CQkgICAgeyAvLyBtYXkgYmUgYWxsb3cgdG8gZW50ZXIgb25lPworCQkgICAgICBLTWVzc2FnZUJv eDo6aW5mb3JtYXRpb24KKwkJCSh0aGlzLAorCQkJIGkxOG4oIlRoaXMgYWRkcmVzcyBoYXMgbm8g ZW1haWwgYWRkcmVzcy5cbiIKKwkJCSAgICAgICJQbGVhc2UgdHJ5IGFub3RoZXIgb25lLiIpLAor CQkJIGkxOG4oIk5vIGVtYWlsIGFkZHJlc3NlcyIpKTsKKwkJICAgICAgY29udGludWU7CisJCSAg ICB9IGVsc2UgeworCQkgICAgICAvLyAtLS0tLSBhc3NlbWJsZSBhZGRyZXNzIHN0cmluZzoKKwkJ ICAgICAgLy8gaGVyZSB5b3Ugc2VlIGhvdyB0byB1c2UgdGhlIEFkZHJlc3NCb29rCisJCSAgICAg IC8vIG9iamVjdCBmcm9tIHRoZSBLYWJBcGk6CisJCSAgICAgIGtlcm5lbC0+YWRkckJvb2soKS0+ YWRkcmVzc2Jvb2soKS0+bGl0ZXJhbE5hbWUKKwkJCShlbnRyeSwgYWRkcmVzcyk7IAorCQkgICAg ICBpZihlbnRyeS5lbWFpbHMuY291bnQoKT4xKQorCQkJeyAvLyBzZWxlY3Qgb25lIG9mIHRoZSBh ZGRyZXNzZXM6CisJCQkgIC8vIC4uLiBXT1JLX1RPX0RPCisJCQkgIC8vIGFwcGVuZCBzZWxlY3Rl ZCBhZGRyZXNzIHRvIGFkZHJlc3M6CisJCQkgIGFkZHJlc3M9YWRkcmVzcyArICIgPCIgKyBlbnRy eS5lbWFpbHMuZmlyc3QoKQorCQkJICAgICsiPiI7CisJCQl9IGVsc2UgeworCQkJICBhZGRyZXNz PWFkZHJlc3MgKyAiIDwiICsgZW50cnkuZW1haWxzLmZpcnN0KCkKKwkJCSAgICArIj4iOworCQkJ fQorCQkgICAgICBhTGluZUVkaXQtPnNldFRleHQoYWRkcmVzcyk7CisJCSAgICB9CisJCSAgYnJl YWs7CisJCWRlZmF1bHQ6CisJCSAgS01lc3NhZ2VCb3g6OmluZm9ybWF0aW9uCisJCSAgICAodGhp cywKKwkJICAgICBpMThuKCJTb21lIGVycm9yIG9jY3VyZWQgd2hpbGUgYnJvd3NpbmcgdGhlIGFk ZHJlc3MgYm9vay4iKSwKKwkJICAgICBpMThuKCJFcnJvciIpKTsKKwkJfQorCSAgICAgIGJyZWFr OworCSAgICB9CisJfQorICAgIH0KKyAgLy8gLS0tLS0gPC9taXJrbz4KIH0KIAogCiAvLy0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tCiB2b2lkIEtNQ29tcG9zZVdpbjo6c2xvdEFkZHJCb29rKCkKIHsKLSAg S01BZGRyQm9va0VkaXREbGcgZGxnKGtlcm5lbC0+YWRkckJvb2soKSk7Ci0gIGRsZy5leGVjKCk7 CisgIC8vIC0tLS0tIDxtaXJrbz46CisgIC8vIEtNQWRkckJvb2tFZGl0RGxnIGRsZyhrZXJuZWwt PmFkZHJCb29rKCkpOworICAvLyBkbGcuZXhlYygpOworICAvLyAtLS0tLSA8L21pcmtvPgogfQog CiAKQEAgLTIyMDYsNiArMjI3MSw3IEBACiAvLy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiB2b2lkIEtN TGluZUVkaXQ6OnNsb3RDb21wbGV0aW9uKCkKIHsKKyAgLyoKICAgUVN0cmluZyB0OwogICBRU3Ry aW5nIE5hbWUobmFtZSgpKTsKIApAQCAtMjI2OSw2ICsyMzM1LDcgQEAKIAogICBzZXRGb2N1cygp OwogICBjdXJzb3JBdEVuZCgpOworICAqLwogfQogCiAvLy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCklu ZGV4OiBrbWtlcm5lbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2hvbWUva2RlL2tkZW5ldHdv cmsva21haWwva21rZXJuZWwuY3BwLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjcKcmV0cmlldmlu ZyByZXZpc2lvbiAxLjgKZGlmZiAtdSAtcjEuNyAtcjEuOAotLS0ga21rZXJuZWwuY3BwCTIwMDAv MDUvMDQgMDc6NTA6MzcJMS43CisrKyBrbWtlcm5lbC5jcHAJMjAwMC8wNS8xMyAyMTo0OTo1NQkx LjgKQEAgLTI4LDcgKzI4LDExIEBACiAjaW5jbHVkZSAia21pZGVudGl0eS5oIgogI2luY2x1ZGUg ImttYWNjdG1nci5oIgogI2luY2x1ZGUgImtidXN5cHRyLmgiCi0jaW5jbHVkZSAia21hZGRyYm9v ay5oIgorLy8gLS0tLS0gPG1pcmtvPjogcmVwbGFjZWQgYnkgS2FiQXBpOgorLy8gS01BZGRyQm9v ayAqdGhlX2FkZHJCb29rOworLy8gI2luY2x1ZGUgImttYWRkcmJvb2suaCIKKyNpbmNsdWRlIDxr YWJhcGkuaD4KKy8vIC0tLS0tIDwvbWlya28+CiAKICNpbmNsdWRlIDxYMTEvWGxpYi5oPgogCkBA IC0zMzAsMTYgKzMzNCwyOSBAQAogICB0aGVfYWNjdE1nciAgID0gbmV3IEtNQWNjdE1ncihhY2N0 UGF0aCk7CiAgIHRoZV9maWx0ZXJNZ3IgPSBuZXcgS01GaWx0ZXJNZ3I7CiAgIHRoZV9maWx0ZXJB Y3Rpb25EaWN0ID0gbmV3IEtNRmlsdGVyQWN0aW9uRGljdDsKLSAgdGhlX2FkZHJCb29rICA9IG5l dyBLTUFkZHJCb29rOwotCisgIC8vIC0tLS0tIDxtaXJrbz46IHJlcGxhY2VkIGJ5IEthYkFwaToK KyAgLy8gdGhlX2FkZHJCb29rICA9IG5ldyBLTUFkZHJCb29rOworICB0aGVfYWRkckJvb2s9bmV3 IEthYkFQSTsgLy8gS2FiQXBpIGlzIGEgZGlhbG9nCisgIENIRUNLX1BUUih0aGVfYWRkckJvb2sp OworICBpZihhZGRyQm9vaygpLT5pbml0KCkhPUFkZHJlc3NCb29rOjpOb0Vycm9yKQorICAgIHsg Ly8gdGhpcyBjb25uZWN0cyB0byB0aGUgZGVmYXVsdCBhZGRyZXNzIGJvb2sgYW5kIG9wZW5zIGl0 OgorICAgICAgS01lc3NhZ2VCb3g6OmluZm9ybWF0aW9uCisJKDAsIGkxOG4oIkVycm9yIGluaXRp YWxpemluZyB0aGUgY29ubmVjdGlvbiB0byB5b3VyIGFkZHJlc3MgYm9vay5cbiIKKwkJICAgICJU aGUgYWRkcmVzcyBib29rIHdpbGwgbm90IGJlIGF2YWlsYWJsZS4iKSwKKwkgaTE4bigiRXJyb3Ii KSk7CisgICAgICB0aGVfYWRkckJvb2s9MDsKKyAgICB9IGVsc2UgeworICAgICAgZGVidWcgKCJL TUtlcm5lbDo6aW5pdDogS2FiQXBpIGluaXRpYWxpemVkLiIpOworICAgIH0KKyAgLy8gLS0tLS0g PC9taXJrbz4KICAgaW5pdEZvbGRlcnMoY2ZnKTsKICAgdGhlX2FjY3RNZ3ItPnJlYWRDb25maWco KTsKICAgdGhlX2ZpbHRlck1nci0+cmVhZENvbmZpZygpOwotICB0aGVfYWRkckJvb2stPnJlYWRD b25maWcoKTsKLSAgaWYodGhlX2FkZHJCb29rLT5sb2FkKCkgPT0gSU9fRmF0YWxFcnJvcikKLSAg ewotICAgICAgS01lc3NhZ2VCb3g6OnNvcnJ5KDAsIGkxOG4oIlRoZSBhZGRyZXNzYm9vayBjb3Vs ZCBub3QgYmUgbG9hZGVkLiIpKTsKLSAgfQorICAvLyB0aGVfYWRkckJvb2stPnJlYWRDb25maWco KTsKKyAgLy8gaWYodGhlX2FkZHJCb29rLT5sb2FkKCkgPT0gSU9fRmF0YWxFcnJvcikKKyAgLy8g eworICAvLyAgICBLTWVzc2FnZUJveDo6c29ycnkoMCwgaTE4bigiVGhlIGFkZHJlc3Nib29rIGNv dWxkIG5vdCBiZSBsb2FkZWQuIikpOworICAvLyB9CiAgIEtNTWVzc2FnZTo6cmVhZENvbmZpZygp OwogICB0aGVfbXNnU2VuZGVyID0gbmV3IEtNU2VuZGVyOwogCkluZGV4OiBrbWtlcm5lbC5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KUkNTIGZpbGU6IC9ob21lL2tkZS9rZGVuZXR3b3JrL2ttYWlsL2tta2VybmVsLmgs dgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMwpyZXRyaWV2aW5nIHJldmlzaW9uIDEuNApkaWZmIC11 IC1yMS4zIC1yMS40Ci0tLSBrbWtlcm5lbC5oCTIwMDAvMDQvMjIgMTM6NTc6MzUJMS4zCisrKyBr bWtlcm5lbC5oCTIwMDAvMDUvMTMgMjE6NDk6NTUJMS40CkBAIC0xOCw3ICsxOCwxMCBAQAogY2xh c3MgS01BY2N0TWdyOwogY2xhc3MgS01GaWx0ZXJNZ3I7CiBjbGFzcyBLTUZpbHRlckFjdGlvbkRp Y3Q7Ci1jbGFzcyBLTUFkZHJCb29rOworLy8gLS0tLS0gPG1pcmtvPjogcmVwbGFjZWQgYnkgS2Fi QXBpOgorLy8gY2xhc3MgS01BZGRyQm9vazsKK2NsYXNzIEthYkFQSTsKKy8vIC0tLS0tIDwvbWly a28+CiBjbGFzcyBLTVNlbmRlcjsKIGNsYXNzIEtNSWRlbnRpdHk7CiBjbGFzcyBLTUtlcm5lbDsK QEAgLTcxLDcgKzc0LDEwIEBACiAgIGlubGluZSBLTUFjY3RNZ3IgKmFjY3RNZ3IoKSB7IHJldHVy biB0aGVfYWNjdE1ncjsgfQogICBpbmxpbmUgS01GaWx0ZXJNZ3IgKmZpbHRlck1ncigpIHsgcmV0 dXJuIHRoZV9maWx0ZXJNZ3I7IH0KICAgaW5saW5lIEtNRmlsdGVyQWN0aW9uRGljdCAqZmlsdGVy QWN0aW9uRGljdCgpIHsgcmV0dXJuIHRoZV9maWx0ZXJBY3Rpb25EaWN0OyB9Ci0gIGlubGluZSBL TUFkZHJCb29rICphZGRyQm9vaygpIHsgcmV0dXJuIHRoZV9hZGRyQm9vazsgfQorICAvLyAtLS0t LSA8bWlya28+OiByZXBsYWNlZCBieSBhIEthYkFwaSBvYmplY3Q6CisgIC8vIGlubGluZSBLTUFk ZHJCb29rICphZGRyQm9vaygpIHsgcmV0dXJuIHRoZV9hZGRyQm9vazsgfQorICBpbmxpbmUgS2Fi QVBJKiBhZGRyQm9vaygpIHsgcmV0dXJuIHRoZV9hZGRyQm9vazsgfQorICAvLyAtLS0tLSA8L21p cmtvPgogICBpbmxpbmUgS01TZW5kZXIgKm1zZ1NlbmRlcigpIHsgcmV0dXJuIHRoZV9tc2dTZW5k ZXI7IH0KIAogICBpbmxpbmUgYm9vbCBmaXJzdFN0YXJ0KCkgeyByZXR1cm4gdGhlX2ZpcnN0U3Rh cnQ7IH0KQEAgLTkxLDcgKzk3LDEwIEBACiAgIEtNQWNjdE1nciAqdGhlX2FjY3RNZ3I7CiAgIEtN RmlsdGVyTWdyICp0aGVfZmlsdGVyTWdyOwogICBLTUZpbHRlckFjdGlvbkRpY3QgKnRoZV9maWx0 ZXJBY3Rpb25EaWN0OwotICBLTUFkZHJCb29rICp0aGVfYWRkckJvb2s7CisgIC8vIC0tLS0tIDxt aXJrbz46IHJlcGxhY2VkIGJ5IEthYkFwaToKKyAgLy8gS01BZGRyQm9vayAqdGhlX2FkZHJCb29r OworICBLYWJBUEkgKnRoZV9hZGRyQm9vazsKKyAgLy8gLS0tLS0gPC9taXJrbz4KICAgS01TZW5k ZXIgKnRoZV9tc2dTZW5kZXI7CiAKICAgYm9vbCB0aGVfZmlyc3RTdGFydDsgICAgICAgICAgLy8g aXMgdGhpcyB0aGUgZmlyc3Qgc3RhcnQ/ICByZWFkIGZyb20gY29uZmlnCg== --Boundary-=_QcCFhTZRLPStFqtZMsrMHepbiEAE--