Attached is the patch I'm proposing for ubuntu. Let me know if you
would like a Salsa PR as well.

RnJvbSBkNDU0ZjYyYzczZTA2OTE5OWU0YTcwNmRjZDUwYmU1ODBmMDZlNWM3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBTYW0gSmFtZXMgPHNhbUBnZW50b28ub3JnPgpEYXRlOiBTdW4s IDUgTm92IDIwMjMgMjI6MTc6MDIgKzAwMDAKU3ViamVjdDogW1BBVENIXSBsaWJwa2djb25mOiBm aXggLVdhbGxvYy1zaXplCgpHQ0MgMTQgaW50cm9kdWNlcyBhIG5ldyAtV2FsbG9jLXNpemUgaW5j bHVkZWQgaW4gLVdleHRyYSB3aGljaCBnaXZlczoKYGBgCmxpYnBrZ2NvbmYvcGVyc29uYWxpdHku YzoyNjA6MTE6IHdhcm5pbmc6IGFsbG9jYXRpb24gb2YgaW5zdWZmaWNpZW50IHNpemUgJzEnIGZv ciB0eXBlICdwa2djb25mX2Nyb3NzX3BlcnNvbmFsaXR5X3QnIHtha2EgJ3N0cnVjdCBwa2djb25m X2Nyb3NzX3BlcnNvbmFsaXR5Xyd9IHdpdGggc2l6ZSAnNDgnIFstV2FsbG9jLXNpemVdCmxpYnBr Z2NvbmYvcXVldWUuYzo0NjozMzogd2FybmluZzogYWxsb2NhdGlvbiBvZiBpbnN1ZmZpY2llbnQg c2l6ZSAnMScgZm9yIHR5cGUgJ3BrZ2NvbmZfcXVldWVfdCcge2FrYSdzdHJ1Y3QgcGtnY29uZl9x dWV1ZV8nfSB3aXRoIHNpemUgJzE2JyBbLVdhbGxvYy1zaXplXQpsaWJwa2djb25mL2NsaWVudC5j OjE2NDozMzogd2FybmluZzogYWxsb2NhdGlvbiBvZiBpbnN1ZmZpY2llbnQgc2l6ZSAnMScgZm9y IHR5cGUgJ3BrZ2NvbmZfY2xpZW50X3QnIHtha2EgJ3N0cnVjdCBwa2djb25mX2NsaWVudF8nfSB3 aXRoIHNpemUgJzEyMCcgWy1XYWxsb2Mtc2l6ZV0KbGlicGtnY29uZi9wYXRoLmM6MTA1OjE0OiB3 YXJuaW5nOiBhbGxvY2F0aW9uIG9mIGluc3VmZmljaWVudCBzaXplICcxJyBmb3IgdHlwZSAncGtn Y29uZl9wYXRoX3QnIHtha2EgJ3N0cnVjdCBwa2djb25mX3BhdGhfJ30gd2l0aCBzaXplICcyNCcg Wy1XYWxsb2Mtc2l6ZV0KbGlicGtnY29uZi9wYXRoLmM6MjM3OjIyOiB3YXJuaW5nOiBhbGxvY2F0 aW9uIG9mIGluc3VmZmljaWVudCBzaXplICcxJyBmb3IgdHlwZSAncGtnY29uZl9wYXRoX3QnIHth a2EgJ3N0cnVjdCBwa2djb25mX3BhdGhfJ30gd2l0aCBzaXplICcyNCcgWy1XYWxsb2Mtc2l6ZV0K bGlicGtnY29uZi90dXBsZS5jOjIzOTozNDogd2FybmluZzogYWxsb2NhdGlvbiBvZiBpbnN1ZmZp Y2llbnQgc2l6ZSAnMScgZm9yIHR5cGUgJ3BrZ2NvbmZfdHVwbGVfdCcge2FrYSAnc3RydWN0IHBr Z2NvbmZfdHVwbGVfJ30gd2l0aCBzaXplICcyNCcgWy1XYWxsb2Mtc2l6ZV0KbGlicGtnY29uZi9k ZXBlbmRlbmN5LmM6MTMzOjEzOiB3YXJuaW5nOiBhbGxvY2F0aW9uIG9mIGluc3VmZmljaWVudCBz aXplICcxJyBmb3IgdHlwZSAncGtnY29uZl9kZXBlbmRlbmN5X3QnIHtha2EgJ3N0cnVjdCBwa2dj b25mX2RlcGVuZGVuY3lfJ30gd2l0aCBzaXplICc0NCcgWy1XYWxsb2Mtc2l6ZV0KbGlicGtnY29u Zi9kZXBlbmRlbmN5LmM6NDcyOjE3OiB3YXJuaW5nOiBhbGxvY2F0aW9uIG9mIGluc3VmZmljaWVu dCBzaXplICcxJyBmb3IgdHlwZSAncGtnY29uZl9kZXBlbmRlbmN5X3QnIHtha2EgJ3N0cnVjdCBw a2djb25mX2RlcGVuZGVuY3lfJ30gd2l0aCBzaXplICc0NCcgWy1XYWxsb2Mtc2l6ZV0KbGlicGtn Y29uZi9mcmFnbWVudC5jOjE0NjoyMjogd2FybmluZzogYWxsb2NhdGlvbiBvZiBpbnN1ZmZpY2ll bnQgc2l6ZSAnMScgZm9yIHR5cGUgJ3BrZ2NvbmZfZnJhZ21lbnRfdCcge2FrYSAnc3RydWN0IHBr Z2NvbmZfZnJhZ21lbnRfJ30gd2l0aCBzaXplICcyNCcgWy1XYWxsb2Mtc2l6ZV0KbGlicGtnY29u Zi9mcmFnbWVudC5jOjE5NToyMjogd2FybmluZzogYWxsb2NhdGlvbiBvZiBpbnN1ZmZpY2llbnQg c2l6ZSAnMScgZm9yIHR5cGUgJ3BrZ2NvbmZfZnJhZ21lbnRfdCcge2FrYSAnc3RydWN0IHBrZ2Nv bmZfZnJhZ21lbnRfJ30gd2l0aCBzaXplICcyNCcgWy1XYWxsb2Mtc2l6ZV0KbGlicGtnY29uZi9m cmFnbWVudC5jOjM1NjoxNDogd2FybmluZzogYWxsb2NhdGlvbiBvZiBpbnN1ZmZpY2llbnQgc2l6 ZSAnMScgZm9yIHR5cGUgJ3BrZ2NvbmZfZnJhZ21lbnRfdCcge2FrYSAnc3RydWN0IHBrZ2NvbmZf ZnJhZ21lbnRfJ30gd2l0aCBzaXplICcyNCcgWy1XYWxsb2Mtc2l6ZV0KbGlicGtnY29uZi9wa2cu Yzo0MjI6MTM6IHdhcm5pbmc6IGFsbG9jYXRpb24gb2YgaW5zdWZmaWNpZW50IHNpemUgJzEnIGZv ciB0eXBlICdwa2djb25mX3BrZ190JyB7YWthICdzdHJ1Y3QgcGtnY29uZl9wa2dfJ30gd2l0aCBz aXplICcxODgnIFstV2FsbG9jLXNpemVdCmxpYnBrZ2NvbmYvY2xpZW50LmM6MTY0OjMzOiB3YXJu aW5nOiBhbGxvY2F0aW9uIG9mIGluc3VmZmljaWVudCBzaXplICcxJyBmb3IgdHlwZSAncGtnY29u Zl9jbGllbnRfdCcge2FrYSAnc3RydWN0IHBrZ2NvbmZfY2xpZW50Xyd9IHdpdGggc2l6ZSAnMjI0 JyBbLVdhbGxvYy1zaXplXQpsaWJwa2djb25mL3BlcnNvbmFsaXR5LmM6MjYwOjExOiB3YXJuaW5n OiBhbGxvY2F0aW9uIG9mIGluc3VmZmljaWVudCBzaXplICcxJyBmb3IgdHlwZSAncGtnY29uZl9j cm9zc19wZXJzb25hbGl0eV90JyB7YWthICdzdHJ1Y3QgcGtnY29uZl9jcm9zc19wZXJzb25hbGl0 eV8nfSB3aXRoIHNpemUgJzk2JyBbLVdhbGxvYy1zaXplXQpsaWJwa2djb25mL2RlcGVuZGVuY3ku YzoxMzM6MTM6IHdhcm5pbmc6IGFsbG9jYXRpb24gb2YgaW5zdWZmaWNpZW50IHNpemUgJzEnIGZv ciB0eXBlICdwa2djb25mX2RlcGVuZGVuY3lfdCcge2FrYSAnc3RydWN0IHBrZ2NvbmZfZGVwZW5k ZW5jeV8nfSB3aXRoIHNpemUgJzgwJyBbLVdhbGxvYy1zaXplXQpsaWJwa2djb25mL2RlcGVuZGVu Y3kuYzo0NzI6MTc6IHdhcm5pbmc6IGFsbG9jYXRpb24gb2YgaW5zdWZmaWNpZW50IHNpemUgJzEn IGZvciB0eXBlICdwa2djb25mX2RlcGVuZGVuY3lfdCcge2FrYSAnc3RydWN0IHBrZ2NvbmZfZGVw ZW5kZW5jeV8nfSB3aXRoIHNpemUgJzgwJyBbLVdhbGxvYy1zaXplXQpsaWJwa2djb25mL3BhdGgu YzoxMDU6MTQ6IHdhcm5pbmc6IGFsbG9jYXRpb24gb2YgaW5zdWZmaWNpZW50IHNpemUgJzEnIGZv ciB0eXBlICdwa2djb25mX3BhdGhfdCcge2FrYSAnc3RydWN0IHBrZ2NvbmZfcGF0aF8nfSB3aXRo IHNpemUgJzQ4JyBbLVdhbGxvYy1zaXplXQpsaWJwa2djb25mL3BhdGguYzoyMzc6MjI6IHdhcm5p bmc6IGFsbG9jYXRpb24gb2YgaW5zdWZmaWNpZW50IHNpemUgJzEnIGZvciB0eXBlICdwa2djb25m X3BhdGhfdCcge2FrYSAnc3RydWN0IHBrZ2NvbmZfcGF0aF8nfSB3aXRoIHNpemUgJzQ4JyBbLVdh bGxvYy1zaXplXQpsaWJwa2djb25mL3F1ZXVlLmM6NDY6MzM6IHdhcm5pbmc6IGFsbG9jYXRpb24g b2YgaW5zdWZmaWNpZW50IHNpemUgJzEnIGZvciB0eXBlICdwa2djb25mX3F1ZXVlX3QnIHtha2Eg J3N0cnVjdCBwa2djb25mX3F1ZXVlXyd9IHdpdGggc2l6ZSAnMzInIFstV2FsbG9jLXNpemVdCmxp YnBrZ2NvbmYvdHVwbGUuYzoyMzk6MzQ6IHdhcm5pbmc6IGFsbG9jYXRpb24gb2YgaW5zdWZmaWNp ZW50IHNpemUgJzEnIGZvciB0eXBlICdwa2djb25mX3R1cGxlX3QnIHtha2EgJ3N0cnVjdCBwa2dj b25mX3R1cGxlXyd9IHdpdGggc2l6ZSAnNDgnIFstV2FsbG9jLXNpemVdCmxpYnBrZ2NvbmYvZnJh Z21lbnQuYzoxNDY6MjI6IHdhcm5pbmc6IGFsbG9jYXRpb24gb2YgaW5zdWZmaWNpZW50IHNpemUg JzEnIGZvciB0eXBlICdwa2djb25mX2ZyYWdtZW50X3QnIHtha2EgJ3N0cnVjdCBwa2djb25mX2Zy YWdtZW50Xyd9IHdpdGggc2l6ZSAnNDgnIFstV2FsbG9jLXNpemVdCmxpYnBrZ2NvbmYvZnJhZ21l bnQuYzoxOTU6MjI6IHdhcm5pbmc6IGFsbG9jYXRpb24gb2YgaW5zdWZmaWNpZW50IHNpemUgJzEn IGZvciB0eXBlICdwa2djb25mX2ZyYWdtZW50X3QnIHtha2EgJ3N0cnVjdCBwa2djb25mX2ZyYWdt ZW50Xyd9IHdpdGggc2l6ZSAnNDgnIFstV2FsbG9jLXNpemVdCmxpYnBrZ2NvbmYvZnJhZ21lbnQu YzozNTY6MTQ6IHdhcm5pbmc6IGFsbG9jYXRpb24gb2YgaW5zdWZmaWNpZW50IHNpemUgJzEnIGZv ciB0eXBlICdwa2djb25mX2ZyYWdtZW50X3QnIHtha2EgJ3N0cnVjdCBwa2djb25mX2ZyYWdtZW50 Xyd9IHdpdGggc2l6ZSAnNDgnIFstV2FsbG9jLXNpemVdCmxpYnBrZ2NvbmYvcGtnLmM6NDIyOjEz OiB3YXJuaW5nOiBhbGxvY2F0aW9uIG9mIGluc3VmZmljaWVudCBzaXplICcxJyBmb3IgdHlwZSAn cGtnY29uZl9wa2dfdCcge2FrYSAnc3RydWN0IHBrZ2NvbmZfcGtnXyd9IHdpdGggc2l6ZSAnMzYw JyBbLVdhbGxvYy1zaXplXQpgYGAKClRoZSBjYWxsb2MgcHJvdG90eXBlIGlzOgpgYGAKdm9pZCAq Y2FsbG9jKHNpemVfdCBubWVtYiwgc2l6ZV90IHNpemUpOwogICAgYGBgCgpTbywganVzdCBzd2Fw IHRoZSBudW1iZXIgb2YgbWVtYmVycyBhbmQgc2l6ZSBhcmd1bWVudHMgdG8gbWF0Y2ggdGhlIHBy b3RvdHlwZSwgYXMKd2UncmUgaW5pdGlhbGlzaW5nIDEgc3RydWN0IG9mIHNpemUgYHNpemVvZihz dHJ1Y3QgLi4uKWAuIEdDQyB0aGVuIHNlZXMgd2UncmUgbm90CmRvaW5nIGFueXRoaW5nIHdyb25n LgoKVGhlIG9ubHkgZXhjZXB0aW9uIHRoZXJlIGlzIGZvciBhcmd2IHdoaWNoIEkgZml4ZWQgd2hp bGUgYXQgaXQuCgpTaWduZWQtb2ZmLWJ5OiBTYW0gSmFtZXMgPHNhbUBnZW50b28ub3JnPgotLS0K IGxpYnBrZ2NvbmYvYXJndnNwbGl0LmMgICB8IDIgKy0KIGxpYnBrZ2NvbmYvY2xpZW50LmMgICAg ICB8IDIgKy0KIGxpYnBrZ2NvbmYvZGVwZW5kZW5jeS5jICB8IDQgKystLQogbGlicGtnY29uZi9m cmFnbWVudC5jICAgIHwgOCArKysrLS0tLQogbGlicGtnY29uZi9wYXRoLmMgICAgICAgIHwgNCAr Ky0tCiBsaWJwa2djb25mL3BlcnNvbmFsaXR5LmMgfCAyICstCiBsaWJwa2djb25mL3BrZy5jICAg ICAgICAgfCA0ICsrLS0KIGxpYnBrZ2NvbmYvcXVldWUuYyAgICAgICB8IDIgKy0KIGxpYnBrZ2Nv bmYvdHVwbGUuYyAgICAgICB8IDQgKystLQogOSBmaWxlcyBjaGFuZ2VkLCAxNiBpbnNlcnRpb25z KCspLCAxNiBkZWxldGlvbnMoLSkKCk9yaWdpbjogYmFja3BvcnQsIGh0dHBzOi8vZ2l0aHViLmNv bS9wa2djb25mL3BrZ2NvbmYvY29tbWl0L2Q0NTRmNjJjNzNlMDY5MTk5ZTRhNzA2ZGNkNTBiZTU4 MGYwNmU1YzcKQnVnLVVidW50dTogaHR0cHM6Ly9idWdzLmxhdW5jaHBhZC5uZXQvdWJ1bnR1Lytz b3VyY2UvcGtnY29uZi8rYnVnLzIwNzUzNjEKQnVnLURlYmlhbjogaHR0cHM6Ly9idWdzLmRlYmlh bi5vcmcvY2dpLWJpbi9idWdyZXBvcnQuY2dpP2J1Zz0xMDc3NjcxCkxhc3QtVXBkYXRlOiAyMDI0 LTA3LTMxCgotLS0gYS9saWJwa2djb25mL2FyZ3ZzcGxpdC5jCisrKyBiL2xpYnBrZ2NvbmYvYXJn dnNwbGl0LmMKQEAgLTcyLDcgKzcyLDcgQEAKIAogCW1lbXNldChidWYsIDAsIHN0cmxlbihzcmMp ICsgMSk7CiAKLQkqYXJndiA9IGNhbGxvYyhzaXplb2YgKHZvaWQgKiksIGFyZ3Zfc2l6ZSk7CisJ KmFyZ3YgPSBjYWxsb2MoYXJndl9zaXplLCBzaXplb2YgKHZvaWQgKikpOwogCSgqYXJndilbYXJn Y19jb3VudF0gPSBkc3RfaXRlcjsKIAogCXdoaWxlICgqc3JjX2l0ZXIpCi0tLSBhL2xpYnBrZ2Nv bmYvY2xpZW50LmMKKysrIGIvbGlicGtnY29uZi9jbGllbnQuYwpAQCAtMTU5LDcgKzE1OSw3IEBA CiBwa2djb25mX2NsaWVudF90ICoKIHBrZ2NvbmZfY2xpZW50X25ldyhwa2djb25mX2Vycm9yX2hh bmRsZXJfZnVuY190IGVycm9yX2hhbmRsZXIsIHZvaWQgKmVycm9yX2hhbmRsZXJfZGF0YSwgY29u c3QgcGtnY29uZl9jcm9zc19wZXJzb25hbGl0eV90ICpwZXJzb25hbGl0eSkKIHsKLQlwa2djb25m X2NsaWVudF90ICpvdXQgPSBjYWxsb2Moc2l6ZW9mKHBrZ2NvbmZfY2xpZW50X3QpLCAxKTsKKwlw a2djb25mX2NsaWVudF90ICpvdXQgPSBjYWxsb2MoMSwgc2l6ZW9mKHBrZ2NvbmZfY2xpZW50X3Qp KTsKIAlwa2djb25mX2NsaWVudF9pbml0KG91dCwgZXJyb3JfaGFuZGxlciwgZXJyb3JfaGFuZGxl cl9kYXRhLCBwZXJzb25hbGl0eSk7CiAJcmV0dXJuIG91dDsKIH0KLS0tIGEvbGlicGtnY29uZi9k ZXBlbmRlbmN5LmMKKysrIGIvbGlicGtnY29uZi9kZXBlbmRlbmN5LmMKQEAgLTEyMyw3ICsxMjMs NyBAQAogewogCXBrZ2NvbmZfZGVwZW5kZW5jeV90ICpkZXA7CiAKLQlkZXAgPSBjYWxsb2Moc2l6 ZW9mKHBrZ2NvbmZfZGVwZW5kZW5jeV90KSwgMSk7CisJZGVwID0gY2FsbG9jKDEsIHNpemVvZihw a2djb25mX2RlcGVuZGVuY3lfdCkpOwogCWRlcC0+cGFja2FnZSA9IHBrZ2NvbmZfc3RybmR1cChw YWNrYWdlLCBwYWNrYWdlX3N6KTsKIAogCWlmICh2ZXJzaW9uX3N6ICE9IDApCi0tLSBhL2xpYnBr Z2NvbmYvZnJhZ21lbnQuYworKysgYi9saWJwa2djb25mL2ZyYWdtZW50LmMKQEAgLTEzOSw3ICsx MzksNyBAQAogCiAJaWYgKHN0cmxlbihzdHJpbmcpID4gMSAmJiAhcGtnY29uZl9mcmFnbWVudF9p c19zcGVjaWFsKHN0cmluZykpCiAJewotCQlmcmFnID0gY2FsbG9jKHNpemVvZihwa2djb25mX2Zy YWdtZW50X3QpLCAxKTsKKwkJZnJhZyA9IGNhbGxvYygxLCBzaXplb2YocGtnY29uZl9mcmFnbWVu dF90KSk7CiAKIAkJZnJhZy0+dHlwZSA9ICooc3RyaW5nICsgMSk7CiAJCWZyYWctPmRhdGEgPSBw a2djb25mX2ZyYWdtZW50X2NvcHlfbXVuZ2VkKGNsaWVudCwgc3RyaW5nICsgMik7CkBAIC0xODgs NyArMTg4LDcgQEAKIAkJCX0KIAkJfQogCi0JCWZyYWcgPSBjYWxsb2Moc2l6ZW9mKHBrZ2NvbmZf ZnJhZ21lbnRfdCksIDEpOworCQlmcmFnID0gY2FsbG9jKDEsIHNpemVvZihwa2djb25mX2ZyYWdt ZW50X3QpKTsKIAogCQlmcmFnLT50eXBlID0gMDsKIAkJZnJhZy0+ZGF0YSA9IHN0cmR1cChzdHJp bmcpOwpAQCAtMzQ5LDcgKzM0OSw3IEBACiAJZWxzZSBpZiAoIWlzX3ByaXZhdGUgJiYgIXBrZ2Nv bmZfZnJhZ21lbnRfY2FuX21lcmdlX2JhY2soYmFzZSwgY2xpZW50LT5mbGFncywgaXNfcHJpdmF0 ZSkgJiYgKHBrZ2NvbmZfZnJhZ21lbnRfbG9va3VwKGxpc3QsIGJhc2UpICE9IE5VTEwpKQogCQly ZXR1cm47CiAKLQlmcmFnID0gY2FsbG9jKHNpemVvZihwa2djb25mX2ZyYWdtZW50X3QpLCAxKTsK KwlmcmFnID0gY2FsbG9jKDEsIHNpemVvZihwa2djb25mX2ZyYWdtZW50X3QpKTsKIAogCWZyYWct PnR5cGUgPSBiYXNlLT50eXBlOwogCWZyYWctPm1lcmdlZCA9IGJhc2UtPm1lcmdlZDsKQEAgLTQy Myw3ICs0MjMsNyBAQAogCWlmIChmcmFnLT5kYXRhID09IE5VTEwpCiAJCXJldHVybiBOVUxMOwog Ci0Jb3V0ID0gZHN0ID0gY2FsbG9jKG91dGxlbiwgMSk7CisJb3V0ID0gZHN0ID0gY2FsbG9jKDEs IG91dGxlbik7CiAKIAlmb3IgKDsgKnNyYzsgc3JjKyspCiAJewotLS0gYS9saWJwa2djb25mL3Bh dGguYworKysgYi9saWJwa2djb25mL3BhdGguYwpAQCAtMTAyLDcgKzEwMiw3IEBACiAJCXJldHVy bjsKICNlbmRpZgogCi0Jbm9kZSA9IGNhbGxvYyhzaXplb2YocGtnY29uZl9wYXRoX3QpLCAxKTsK Kwlub2RlID0gY2FsbG9jKDEsIHNpemVvZihwa2djb25mX3BhdGhfdCkpOwogCW5vZGUtPnBhdGgg PSBzdHJkdXAocGF0aCk7CiAKICNpZmRlZiBQS0dDT05GX0NBQ0hFX0lOT0RFUwpAQCAtMjM0LDcg KzIzNCw3IEBACiAJewogCQlwa2djb25mX3BhdGhfdCAqc3JjcGF0aCA9IG4tPmRhdGEsICpwYXRo OwogCi0JCXBhdGggPSBjYWxsb2Moc2l6ZW9mKHBrZ2NvbmZfcGF0aF90KSwgMSk7CisJCXBhdGgg PSBjYWxsb2MoMSwgc2l6ZW9mKHBrZ2NvbmZfcGF0aF90KSk7CiAJCXBhdGgtPnBhdGggPSBzdHJk dXAoc3JjcGF0aC0+cGF0aCk7CiAKICNpZmRlZiBQS0dDT05GX0NBQ0hFX0lOT0RFUwotLS0gYS9s aWJwa2djb25mL3BlcnNvbmFsaXR5LmMKKysrIGIvbGlicGtnY29uZi9wZXJzb25hbGl0eS5jCkBA IC0yMjcsNyArMjI3LDcgQEAKIAlpZiAoZiA9PSBOVUxMKQogCQlyZXR1cm4gTlVMTDsKIAotCXAg PSBjYWxsb2Moc2l6ZW9mKHBrZ2NvbmZfY3Jvc3NfcGVyc29uYWxpdHlfdCksIDEpOworCXAgPSBj YWxsb2MoMSwgc2l6ZW9mKHBrZ2NvbmZfY3Jvc3NfcGVyc29uYWxpdHlfdCkpOwogCWlmICh0cmlw bGV0ICE9IE5VTEwpCiAJCXAtPm5hbWUgPSBzdHJkdXAodHJpcGxldCk7CiAJcGtnY29uZl9wYXJz ZXJfcGFyc2UoZiwgcCwgcGVyc29uYWxpdHlfcGFyc2VyX29wcywgcGVyc29uYWxpdHlfd2Fybl9m dW5jLCBwYXRoYnVmKTsKLS0tIGEvbGlicGtnY29uZi9wa2cuYworKysgYi9saWJwa2djb25mL3Br Zy5jCkBAIC0yMjcsNyArMjI3LDcgQEAKIHN0YXRpYyBjaGFyICoKIGNvbnZlcnRfcGF0aF90b192 YWx1ZShjb25zdCBjaGFyICpwYXRoKQogewotCWNoYXIgKmJ1ZiA9IGNhbGxvYygoc3RybGVuKHBh dGgpICsgMSkgKiAyLCAxKTsKKwljaGFyICpidWYgPSBjYWxsb2MoMSwgKHN0cmxlbihwYXRoKSAr IDEpICogMik7CiAJY2hhciAqYnB0ciA9IGJ1ZjsKIAljb25zdCBjaGFyICppOwogCkBAIC0zOTcs NyArMzk3LDcgQEAKIAlwa2djb25mX3BrZ190ICpwa2c7CiAJY2hhciAqaWRwdHI7CiAKLQlwa2cg PSBjYWxsb2Moc2l6ZW9mKHBrZ2NvbmZfcGtnX3QpLCAxKTsKKwlwa2cgPSBjYWxsb2MoMSwgc2l6 ZW9mKHBrZ2NvbmZfcGtnX3QpKTsKIAlwa2ctPm93bmVyID0gY2xpZW50OwogCXBrZy0+ZmlsZW5h bWUgPSBzdHJkdXAoZmlsZW5hbWUpOwogCXBrZy0+cGNfZmlsZWRpciA9IHBrZ19nZXRfcGFyZW50 X2Rpcihwa2cpOwotLS0gYS9saWJwa2djb25mL3F1ZXVlLmMKKysrIGIvbGlicGtnY29uZi9xdWV1 ZS5jCkBAIC00OCw3ICs0OCw3IEBACiB2b2lkCiBwa2djb25mX3F1ZXVlX3B1c2gocGtnY29uZl9s aXN0X3QgKmxpc3QsIGNvbnN0IGNoYXIgKnBhY2thZ2UpCiB7Ci0JcGtnY29uZl9xdWV1ZV90ICpw a2dxID0gY2FsbG9jKHNpemVvZihwa2djb25mX3F1ZXVlX3QpLCAxKTsKKwlwa2djb25mX3F1ZXVl X3QgKnBrZ3EgPSBjYWxsb2MoMSwgc2l6ZW9mKHBrZ2NvbmZfcXVldWVfdCkpOwogCiAJcGtncS0+ cGFja2FnZSA9IHN0cmR1cChwYWNrYWdlKTsKIAlwa2djb25mX25vZGVfaW5zZXJ0X3RhaWwoJnBr Z3EtPml0ZXIsIHBrZ3EsIGxpc3QpOwotLS0gYS9saWJwa2djb25mL3R1cGxlLmMKKysrIGIvbGli cGtnY29uZi90dXBsZS5jCkBAIC0xMzksNyArMTM5LDcgQEAKIHN0YXRpYyBjaGFyICoKIGRlcXVv dGUoY29uc3QgY2hhciAqdmFsdWUpCiB7Ci0JY2hhciAqYnVmID0gY2FsbG9jKChzdHJsZW4odmFs dWUpICsgMSkgKiAyLCAxKTsKKwljaGFyICpidWYgPSBjYWxsb2MoMSwgKHN0cmxlbih2YWx1ZSkg KyAxKSAqIDIpOwogCWNoYXIgKmJwdHIgPSBidWY7CiAJY29uc3QgY2hhciAqaTsKIAljaGFyIHF1 b3RlID0gMDsKQEAgLTE4MCw3ICsxODAsNyBAQAogcGtnY29uZl90dXBsZV9hZGQoY29uc3QgcGtn Y29uZl9jbGllbnRfdCAqY2xpZW50LCBwa2djb25mX2xpc3RfdCAqbGlzdCwgY29uc3QgY2hhciAq a2V5LCBjb25zdCBjaGFyICp2YWx1ZSwgYm9vbCBwYXJzZSkKIHsKIAljaGFyICpkZXF1b3RlX3Zh bHVlOwotCXBrZ2NvbmZfdHVwbGVfdCAqdHVwbGUgPSBjYWxsb2Moc2l6ZW9mKHBrZ2NvbmZfdHVw bGVfdCksIDEpOworCXBrZ2NvbmZfdHVwbGVfdCAqdHVwbGUgPSBjYWxsb2MoMSwgc2l6ZW9mKHBr Z2NvbmZfdHVwbGVfdCkpOwogCiAJcGtnY29uZl90dXBsZV9maW5kX2RlbGV0ZShsaXN0LCBrZXkp OwogCg==

--- SoupGate-Win32 v1.05
* Origin: fsxNet Usenet Gateway (21:1/5)