[SPAM] valias remove alias
Drew Wells <[email protected]> Tue, 15 Sep 2015 10:22:23 +0100
| Newsgroups | gmane.mail.vpopmail |
|---|---|
| Message-ID | <[email protected]> |
This is a multi-part message in MIME format. --------------090802030307000705060705 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit In vpopmail-5.5.0 (and I think all 5.4.x) there seems to be no way of removing an alias_line using valias, I've added this functionality. Patch attached. !DSPAM:55f7e35241555071313485! --------------090802030307000705060705 Content-Type: text/plain; charset=UTF-8; name="vpopmail-5.5.0-valias.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="vpopmail-5.5.0-valias.patch" ZGlmZiAtdVByIHZwb3BtYWlsLTUuNS4wLm9yaWcvdmFsaWFzLmMgdnBvcG1haWwtNS41LjAv dmFsaWFzLmMKLS0tIHZwb3BtYWlsLTUuNS4wLm9yaWcvdmFsaWFzLmMJMjAxMC0xMS0wNSAx ODozNzoyMi4wMDAwMDAwMDAgKzAwMDAKKysrIHZwb3BtYWlsLTUuNS4wL3ZhbGlhcy5jCTIw MTUtMDktMDQgMTI6Mzk6MzQuOTk5MDk0NjY4ICswMTAwCkBAIC0zOCw4ICszOCw5IEBACiAK ICNkZWZpbmUgVkFMSUFTX1NFTEVDVCAwCiAjZGVmaW5lIFZBTElBU19JTlNFUlQgMQotI2Rl ZmluZSBWQUxJQVNfREVMRVRFIDIKLSNkZWZpbmUgVkFMSUFTX05BTUVTICAzCisjZGVmaW5l IFZBTElBU19SRU1PVkUgMgorI2RlZmluZSBWQUxJQVNfREVMRVRFIDMKKyNkZWZpbmUgVkFM SUFTX05BTUVTICA0CiAKIGludCBBbGlhc0FjdGlvbjsKIGludCBBbGlhc0V4aXN0czsKQEAg LTExOSw2ICsxMjAsMjMgQEAKIAkJfQogCQlicmVhazsKIAorCWNhc2UgVkFMSUFTX1JFTU9W RToKKwkJLyogY2hlY2sgdG8gc2VlIGlmIGl0IGFscmVhZHkgZXhpc3RzICovCisJCUFsaWFz RXhpc3RzID0gMDsKKwkJdG1wYWxpYXMgPSB2YWxpYXNfc2VsZWN0KCBBbGlhcywgRG9tYWlu ICk7CisJCXdoaWxlICh0bXBhbGlhcyAhPSBOVUxMICkgeworCQkJaWYgKHN0cmNtcCAodG1w YWxpYXMsIEFsaWFzTGluZSkgPT0gMCkgQWxpYXNFeGlzdHMgPSAxOworCQkJdG1wYWxpYXMg PSB2YWxpYXNfc2VsZWN0X25leHQoKTsKKwkJfQorCQlpZiAoQWxpYXNFeGlzdHMpIHsKKwkJ CXZhbGlhc19yZW1vdmUoIEFsaWFzLCBEb21haW4sIEFsaWFzTGluZSApOworCQl9IGVsc2Ug eworCQkJZnByaW50ZiAoc3RkZXJyLCAiRXJyb3I6IGFsaWFzICVzIC0+ICVzIGRvZXMgbm90 IGV4aXN0LlxuIiwKKwkJCQlFbWFpbCwgQWxpYXNMaW5lKTsKKwkJCXZleGl0KC0xKTsKKwkJ fQorCQlicmVhazsKKwogCWNhc2UgVkFMSUFTX0RFTEVURToKIAkJdmFsaWFzX2RlbGV0ZSgg QWxpYXMsIERvbWFpbiApOwogCQlicmVhazsKQEAgLTEzOSw2ICsxNTcsNyBAQAogCXByaW50 ZigiICAgICAgICAgLXMgKCBzaG93IGFsaWFzZXMsIGNhbiB1c2UganVzdCBkb21haW4gKVxu Iik7CiAJcHJpbnRmKCIgICAgICAgICAtZCAoIGRlbGV0ZSBhbGlhcyApXG4iKTsKIAlwcmlu dGYoIiAgICAgICAgIC1pIGFsaWFzX2xpbmUgKGluc2VydCBhbGlhcyBsaW5lKVxuIik7CisJ cHJpbnRmKCIgICAgICAgICAtciBhbGlhc19saW5lIChyZW1vdmUgYWxpYXMgbGluZSlcbiIp OwogCXByaW50ZigiXG4iKTsKIAlwcmludGYoIkV4YW1wbGU6IHZhbGlhcyAtaSBmcmVkQGlu dGVyNy5jb20gYm9iQGludGVyNy5jb21cbiIpOwogCXByaW50ZigiICAgICAgICAgKGFkZHMg YWxpYXMgZnJvbSBib2JAaW50ZXI3LmNvbSB0byBmcmVkQGludGVyNy5jb21cbiIpOwpAQCAt MTU3LDcgKzE3Niw3IEBACiAJbWVtc2V0KEFsaWFzTGluZSwgMCwgc2l6ZW9mKEFsaWFzTGlu ZSkpOwogCUFsaWFzQWN0aW9uID0gVkFMSUFTX1NFTEVDVDsKIAotICAgIAl3aGlsZSggKGM9 Z2V0b3B0KGFyZ2MsYXJndiwidm5zZGk6IikpICE9IC0xICkgeworICAgIAl3aGlsZSggKGM9 Z2V0b3B0KGFyZ2MsYXJndiwidm5zcjpkaToiKSkgIT0gLTEgKSB7CiAJCXN3aXRjaChjKSB7 CiAJCWNhc2UgJ3YnOgogCQkJcHJpbnRmKCJ2ZXJzaW9uOiAlc1xuIiwgVkVSU0lPTik7CkBA IC0xNjgsNiArMTg3LDEwIEBACiAJCWNhc2UgJ3MnOgogCQkJQWxpYXNBY3Rpb24gPSBWQUxJ QVNfU0VMRUNUOwogCQkJYnJlYWs7CisJCWNhc2UgJ3InOgorCQkJQWxpYXNBY3Rpb24gPSBW QUxJQVNfUkVNT1ZFOworCQkJc25wcmludGYoQWxpYXNMaW5lLCBzaXplb2YoQWxpYXNMaW5l KSwgIiVzIiwgb3B0YXJnKTsKKwkJCWJyZWFrOwogCQljYXNlICdkJzoKIAkJCUFsaWFzQWN0 aW9uID0gVkFMSUFTX0RFTEVURTsKIAkJCWJyZWFrOwo= --------------090802030307000705060705--