[tpop3d-discuss] default-domain

Wild Karl-Heinz Wild Karl-Heinz <kh.wild at wicom.li>
Fri, 8 Feb 2002 15:36:31 +0100


------------FD102303AA83643
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit


I have a need to have a default-domain for
the authentification. This means that when
a user gives only the name and not @domain
I use a default-domain as fallback.

I send the patch. But I'm not good in programming
c! It seems to work. But could someone else look
to the code.

Chris, could you think about adding the code or
better the functionality to the standard source?

tnx kh

ps: this patch is against 1.4.1pre2
------------FD102303AA83643
Content-Type: application/octet-stream; name="patch_default_domain.diff"
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="patch_default_domain.diff"

Q29tbW9uIHN1YmRpcmVjdG9yaWVzOiB0cG9wM2QtMS40LjFwcmUyLm9yaWcvVFBPUDNELUF1dGhE
cml2ZXIgYW5kIHRwb3AzZC0xLjQuMXByZTIvVFBPUDNELUF1dGhEcml2ZXIKZGlmZiB0cG9wM2Qt
MS40LjFwcmUyLm9yaWcvYXV0aF9teXNxbC5jIHRwb3AzZC0xLjQuMXByZTIvYXV0aF9teXNxbC5j
CjM2NGEzNjUKPiAgICAgaXRlbSAqSTsKMzY4LDM3NmMzNjksMzkxCjwgICAgIGRvbWFpbiA9IG5h
bWUgKyBzdHJjc3BuKG5hbWUsICJAJSEiKTsKPCAgICAgaWYgKGRvbWFpbiA9PSBuYW1lIHx8ICEq
ZG9tYWluKSByZXR1cm4gTlVMTDsKPCAgICAgKytkb21haW47CjwgICAgIAo8ICAgICBsb2NhbF9w
YXJ0ID0geG1hbGxvYyhkb21haW4gLSBuYW1lKTsKPCAgICAgaWYgKCFsb2NhbF9wYXJ0KSByZXR1
cm4gTlVMTDsKPCAgICAgbWVtc2V0KGxvY2FsX3BhcnQsIDAsIGRvbWFpbiAtIG5hbWUpOwo8ICAg
ICBzdHJuY3B5KGxvY2FsX3BhcnQsIG5hbWUsIGRvbWFpbiAtIG5hbWUgLSAxKTsKPCAgICAgCi0t
LQo+ICAgICBkb21haW4gPSBuYW1lICsgc3RyY3NwbiggbmFtZSwgIkAlISIpOwo+ICAgICBpZiAo
ZG9tYWluID09IG5hbWUgfHwgISpkb21haW4gKQo+ICAgICB7Cj4gICAgICAgIGlmICgoSSA9IHN0
cmluZ21hcF9maW5kKCBjb25maWcsICJkZWZhdWx0LWRvbWFpbiIpKSkKPiAgICAgICAgewo+ICAg
ICAgICAgICBkb21haW4gPSAoY2hhciopSS0+djsKPiAgICAgICAgICAgbG9nX3ByaW50KExPR19F
UlIsIF8oImF1dGhfbXlzcWxfbmV3X2Fwb3A6IGRvbWFpbi1kZWZhdWx0IGRpcmVjdGl2ZSAlcycg
IiksIChjaGFyKilJLT52KTsKPiAgICAgICAgICAgbG9jYWxfcGFydCA9IHhtYWxsb2MoIHN0cmxl
biggbmFtZSApICk7Cj4gICAgICAgICAgIHN0cmNweSggbG9jYWxfcGFydCwgbmFtZSApOwo+ICAg
ICAgICB9Cj4gICAgICAgIGVsc2Ugewo+ICAgICAgICAgICBsb2dfcHJpbnQoTE9HX1dBUk5JTkcs
IF8oImF1dGhfbXlzcWxfbmV3X2Fwb3A6IG5vIGRvbWFpbi1kZWZhdWx0IGRpcmVjdGl2ZSBpbiBj
b25maWciKSk7Cj4gICAgICAgICAgIHJldHVybiBOVUxMOwo+ICAgICAgICB9Cj4gICAgIH0gZWxz
ZSB7Cj4gICAgICAgICsrZG9tYWluOwo+ICAgICAgICBsb2NhbF9wYXJ0ID0geG1hbGxvYyggZG9t
YWluIC0gbmFtZSApOwo+ICAgICAgICBpZiAoIWxvY2FsX3BhcnQpIHJldHVybiBOVUxMOwo+ICAg
ICAgICBtZW1zZXQobG9jYWxfcGFydCwgMCwgZG9tYWluIC0gbmFtZSApOwo+ICAgICAgICBzdHJu
Y3B5KGxvY2FsX3BhcnQsIG5hbWUsIGRvbWFpbiAtIG5hbWUgLSAxKTsKPiAgICAgfQo+IAo+IAo0
NzdjNDkyCjwgYXV0aGNvbnRleHQgYXV0aF9teXNxbF9uZXdfdXNlcl9wYXNzKGNvbnN0IGNoYXIg
KnVzZXIsIGNvbnN0IGNoYXIgKnBhc3MsIGNvbnN0IGNoYXIgKmhvc3QgLyogdW51c2VkICovKSB7
Ci0tLQo+IGF1dGhjb250ZXh0IGF1dGhfbXlzcWxfbmV3X3VzZXJfcGFzcyhjb25zdCBjaGFyICpu
YW1lLCBjb25zdCBjaGFyICpwYXNzLCBjb25zdCBjaGFyICpob3N0IC8qIHVudXNlZCAqLykgewo0
ODFhNDk3Cj4gICAgIGl0ZW0gKkk7CjQ4NSw0OTJjNTAxLDUyMgo8ICAgICBkb21haW4gPSB1c2Vy
ICsgc3RyY3Nwbih1c2VyLCAiQCUhIik7CjwgICAgIGlmIChkb21haW4gPT0gdXNlciB8fCAhKmRv
bWFpbikgcmV0dXJuIE5VTEw7CjwgICAgICsrZG9tYWluOwo8ICAgICAKPCAgICAgbG9jYWxfcGFy
dCA9IHhtYWxsb2MoZG9tYWluIC0gdXNlcik7CjwgICAgIGlmICghbG9jYWxfcGFydCkgcmV0dXJu
IE5VTEw7CjwgICAgIG1lbXNldChsb2NhbF9wYXJ0LCAwLCBkb21haW4gLSB1c2VyKTsKPCAgICAg
c3RybmNweShsb2NhbF9wYXJ0LCB1c2VyLCBkb21haW4gLSB1c2VyIC0gMSk7Ci0tLQo+ICAgICBk
b21haW4gPSBuYW1lICsgc3RyY3NwbiggbmFtZSwgIkAlISIpOwo+ICAgICBpZiAoZG9tYWluID09
IG5hbWUgfHwgISpkb21haW4gKQo+ICAgICB7Cj4gICAgICAgIGlmICgoSSA9IHN0cmluZ21hcF9m
aW5kKCBjb25maWcsICJkZWZhdWx0LWRvbWFpbiIpKSkKPiAgICAgICAgewo+ICAgICAgICAgICBk
b21haW4gPSAoY2hhciopSS0+djsKPiAgICAgICAgICAgbG9nX3ByaW50KExPR19FUlIsIF8oImF1
dGhfbXlzcWxfbmV3X2Fwb3A6IGRvbWFpbi1kZWZhdWx0IGRpcmVjdGl2ZSAlcycgIiksIChjaGFy
KilJLT52KTsKPiAgICAgICAgICAgbG9jYWxfcGFydCA9IHhtYWxsb2MoIHN0cmxlbiggbmFtZSAp
ICk7Cj4gICAgICAgICAgIHN0cmNweSggbG9jYWxfcGFydCwgbmFtZSApOwo+ICAgICAgICB9Cj4g
ICAgICAgIGVsc2Ugewo+ICAgICAgICAgICBsb2dfcHJpbnQoTE9HX1dBUk5JTkcsIF8oImF1dGhf
bXlzcWxfbmV3X2Fwb3A6IG5vIGRvbWFpbi1kZWZhdWx0IGRpcmVjdGl2ZSBpbiBjb25maWciKSk7
Cj4gICAgICAgICAgIHJldHVybiBOVUxMOwo+ICAgICAgICB9Cj4gICAgIH0gZWxzZSB7Cj4gICAg
ICAgICsrZG9tYWluOwo+ICAgICAgICBsb2NhbF9wYXJ0ID0geG1hbGxvYyggZG9tYWluIC0gbmFt
ZSApOwo+ICAgICAgICBpZiAoIWxvY2FsX3BhcnQpIHJldHVybiBOVUxMOwo+ICAgICAgICBtZW1z
ZXQobG9jYWxfcGFydCwgMCwgZG9tYWluIC0gbmFtZSApOwo+ICAgICAgICBzdHJuY3B5KGxvY2Fs
X3BhcnQsIG5hbWUsIGRvbWFpbiAtIG5hbWUgLSAxKTsKPiAgICAgfQo+IApkaWZmIHRwb3AzZC0x
LjQuMXByZTIub3JpZy9jZmdkaXJlY3RpdmVzLmMgdHBvcDNkLTEuNC4xcHJlMi9jZmdkaXJlY3Rp
dmVzLmMKMjVhMjYKPiAgICAgImRlZmF1bHQtZG9tYWluIiwKQ29tbW9uIHN1YmRpcmVjdG9yaWVz
OiB0cG9wM2QtMS40LjFwcmUyLm9yaWcvY29uZmlnIGFuZCB0cG9wM2QtMS40LjFwcmUyL2NvbmZp
ZwpDb21tb24gc3ViZGlyZWN0b3JpZXM6IHRwb3AzZC0xLjQuMXByZTIub3JpZy9kYXJ3aW4gYW5k
IHRwb3AzZC0xLjQuMXByZTIvZGFyd2luCkNvbW1vbiBzdWJkaXJlY3RvcmllczogdHBvcDNkLTEu
NC4xcHJlMi5vcmlnL2luaXQuZCBhbmQgdHBvcDNkLTEuNC4xcHJlMi9pbml0LmQKZGlmZiB0cG9w
M2QtMS40LjFwcmUyLm9yaWcvcG9wMy5jIHRwb3AzZC0xLjQuMXByZTIvcG9wMy5jCjI4YTI5Cj4g
I2luY2x1ZGUgImNvbmZpZy5oIgozOGMzOSw1Mgo8IGVudW0gY29ubmVjdGlvbl9hY3Rpb24gY29u
bmVjdGlvbl9kbyhjb25uZWN0aW9uIGMsIGNvbnN0IHBvcDNjb21tYW5kIHApIHsKLS0tCj4gZXh0
ZXJuIHN0cmluZ21hcCBjb25maWc7IC8qIGluIG1haW4uYyAqLwo+IAo+IGVudW0gY29ubmVjdGlv
bl9hY3Rpb24gY29ubmVjdGlvbl9kbyhjb25uZWN0aW9uIGMsIGNvbnN0IHBvcDNjb21tYW5kIHAp
IAo+IHsKPiAgICAgY2hhciAqZG9tYWluX25hbWUgPSBOVUxMOwo+ICAgICBpdGVtICpJOwo+ICAg
ICBpbnQgd2l0aF9kZWZhdWx0X2RvbWFpbiA9IDA7Cj4gCj4gICAgIGlmKCAoIEkgPSBzdHJpbmdt
YXBfZmluZCggY29uZmlnLCAiZGVmYXVsdC1kb21haW4iICkgKSApCj4gICAgIHsKPiAgICAgICAg
IGRvbWFpbl9uYW1lID0gKCBjaGFyICopSS0+djsKPiAgICAgICAgIHdpdGhfZGVmYXVsdF9kb21h
aW4gPSAxOwo+ICAgICB9Cj4gCjEzMCwxMzdjMTQ0LDE2NQo8ICAgICAgICAgICAgICAgICBpZiAo
IWMtPmEgJiYgYXBwZW5kX2RvbWFpbiAmJiBjLT5kb21haW4gJiYgc3RyY3NwbihuYW1lLCAiQCUh
IikgPT0gc3RybGVuKG5hbWUpKSB7CjwgICAgICAgICAgICAgICAgICAgICAvKiBPSywgaWYgd2Ug
aGF2ZSBhIGRvbWFpbiBuYW1lLCB0cnkgYXBwZW5kaW5nIHRoYXQuICovCjwgICAgICAgICAgICAg
ICAgICAgICBjaGFyICpubiA9IHhtYWxsb2Moc3RybGVuKG5hbWUpICsgc3RybGVuKGMtPmRvbWFp
bikgKyAyKTsKPCAgICAgICAgICAgICAgICAgICAgIHN0cmNweShubiwgbmFtZSk7CjwgICAgICAg
ICAgICAgICAgICAgICBzdHJjYXQobm4sICJAIik7CjwgICAgICAgICAgICAgICAgICAgICBzdHJj
YXQobm4sIGMtPmRvbWFpbik7CjwgICAgICAgICAgICAgICAgICAgICBjLT5hID0gYXV0aGNvbnRl
eHRfbmV3X2Fwb3Aobm4sIGMtPnRpbWVzdGFtcCwgZGlnZXN0LCBjLT5kb21haW4sIGluZXRfbnRv
YShjLT5zaW4uc2luX2FkZHIpKTsKPCAgICAgICAgICAgICAgICAgICAgIHhmcmVlKG5uKTsKLS0t
Cj4gICAgICAgICAgICAgICAgIGlmICghYy0+YSAmJiBhcHBlbmRfZG9tYWluICkKPiAgICAgICAg
ICAgICAgICAgewo+ICAgICAgICAgICAgICAgICAgICAgaWYoIHdpdGhfZGVmYXVsdF9kb21haW4g
JiYgZG9tYWluX25hbWUgKQo+ICAgICAgICAgICAgICAgICAgICAgewo+ICAgICAgICAgICAgICAg
ICAgICAgICAgY2hhciAqbm4gPSB4bWFsbG9jKCBzdHJsZW4oIG5hbWUgKSArIHN0cmxlbiggZG9t
YWluX25hbWUgKSArIDIgKTsKPiAgICAgICAgICAgICAgICAgICAgICAgIHN0cmNweSggbm4sIG5h
bWUgKTsKPiAgICAgICAgICAgICAgICAgICAgICAgIHN0cmNhdCggbm4sICJAIiApOwo+ICAgICAg
ICAgICAgICAgICAgICAgICAgc3RyY2F0KCBubiwgZG9tYWluX25hbWUgKTsKPiAgICAgICAgICAg
ICAgICAgICAgICAgIGMtPmEgPSBhdXRoY29udGV4dF9uZXdfYXBvcChubiwgYy0+dGltZXN0YW1w
LCBkaWdlc3QsIGMtPmRvbWFpbiwgaW5ldF9udG9hKGMtPnNpbi5zaW5fYWRkcikpOwo+ICAgICAg
ICAgICAgICAgICAgICAgICAgeGZyZWUoIG5uICk7Cj4gICAgICAgICAgICAgICAgICAgICB9Cj4g
ICAgICAgICAgICAgICAgICAgICBlbHNlCj4gICAgICAgICAgICAgICAgICAgICAgICBpZiggYy0+
ZG9tYWluICYmIHN0cmNzcG4obmFtZSwgIkAlISIpID09IHN0cmxlbihuYW1lKSApCj4gICAgICAg
ICAgICAgICAgICAgICAgICB7Cj4gICAgICAgICAgICAgICAgICAgICAgICAgICAvKiBPSywgaWYg
d2UgaGF2ZSBhIGRvbWFpbiBuYW1lLCB0cnkgYXBwZW5kaW5nIHRoYXQuICovCj4gICAgICAgICAg
ICAgICAgICAgICAgICAgICBjaGFyICpubiA9IHhtYWxsb2Moc3RybGVuKG5hbWUpICsgc3RybGVu
KGMtPmRvbWFpbikgKyAyKTsKPiAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0cmNweShubiwg
bmFtZSk7Cj4gICAgICAgICAgICAgICAgICAgICAgICAgICBzdHJjYXQobm4sICJAIik7Cj4gICAg
ICAgICAgICAgICAgICAgICAgICAgICBzdHJjYXQobm4sIGMtPmRvbWFpbik7Cj4gICAgICAgICAg
ICAgICAgICAgICAgICAgICBjLT5hID0gYXV0aGNvbnRleHRfbmV3X2Fwb3Aobm4sIGMtPnRpbWVz
dGFtcCwgZGlnZXN0LCBjLT5kb21haW4sIGluZXRfbnRvYShjLT5zaW4uc2luX2FkZHIpKTsKPiAg
ICAgICAgICAgICAgICAgICAgICAgICAgIHhmcmVlKG5uKTsKPiAgICAgICAgICAgICAgICAgICAg
ICAgIH0KMTk1LDIwMmMyMjMsMjQ1CjwgICAgICAgICAgICAgaWYgKCFjLT5hICYmIGFwcGVuZF9k
b21haW4gJiYgYy0+ZG9tYWluICYmIHN0cmNzcG4oYy0+dXNlciwgIkAlISIpID09IHN0cmxlbihj
LT51c2VyKSkgewo8ICAgICAgICAgICAgICAgICAvKiBPSywgaWYgd2UgaGF2ZSBhIGRvbWFpbiBu
YW1lLCB0cnkgYXBwZW5kaW5nIHRoYXQuICovCjwgICAgICAgICAgICAgICAgIGNoYXIgKm5uID0g
eG1hbGxvYyhzdHJsZW4oYy0+dXNlcikgKyBzdHJsZW4oYy0+ZG9tYWluKSArIDIpOwo8ICAgICAg
ICAgICAgICAgICBzdHJjcHkobm4sIGMtPnVzZXIpOwo8ICAgICAgICAgICAgICAgICBzdHJjYXQo
bm4sICJAIik7CjwgICAgICAgICAgICAgICAgIHN0cmNhdChubiwgYy0+ZG9tYWluKTsKPCAgICAg
ICAgICAgICAgICAgYy0+YSA9IGF1dGhjb250ZXh0X25ld191c2VyX3Bhc3Mobm4sIGMtPnBhc3Ms
IGMtPmRvbWFpbiwgaW5ldF9udG9hKGMtPnNpbi5zaW5fYWRkcikpOwo8ICAgICAgICAgICAgICAg
ICB4ZnJlZShubik7Ci0tLQo+IAo+ICAgICAgICAgICAgIGlmICggISBjLT5hICYmIGFwcGVuZF9k
b21haW4gKQo+ICAgICAgICAgICAgIHsKPiAgICAgICAgICAgICAgICBpZiggd2l0aF9kZWZhdWx0
X2RvbWFpbiAmJiBkb21haW5fbmFtZSApCj4gICAgICAgICAgICAgICAgewo+ICAgICAgICAgICAg
ICAgICAgIGNoYXIgKm5uID0geG1hbGxvYyhzdHJsZW4oIGMtPnVzZXIgKSArIHN0cmxlbiggZG9t
YWluX25hbWUgKSArIDIpOwo+ICAgICAgICAgICAgICAgICAgIHN0cmNweShubiwgYy0+dXNlcik7
Cj4gICAgICAgICAgICAgICAgICAgc3RyY2F0KG5uLCAiQCIpOwo+ICAgICAgICAgICAgICAgICAg
IHN0cmNhdChubiwgZG9tYWluX25hbWUgKTsKPiAgICAgICAgICAgICAgICAgICBjLT5hID0gYXV0
aGNvbnRleHRfbmV3X3VzZXJfcGFzcyggbm4sIGMtPnBhc3MsIGMtPmRvbWFpbiwgaW5ldF9udG9h
KGMtPnNpbi5zaW5fYWRkcikpOwo+ICAgICAgICAgICAgICAgICAgIHhmcmVlKG5uKTsKPiAKPiAg
ICAgICAgICAgICAgICB9IGVsc2UKPiAgICAgICAgICAgICAgICAgICBpZiggYy0+ZG9tYWluICYm
IHN0cmNzcG4oYy0+dXNlciwgIkAlISIgKSA9PSBzdHJsZW4oIGMtPnVzZXIgKSApCj4gICAgICAg
ICAgICAgICAgICAgewo+ICAgICAgICAgICAgICAgICAgICAgIC8qIE9LLCBpZiB3ZSBoYXZlIGEg
ZG9tYWluIG5hbWUsIHRyeSBhcHBlbmRpbmcgdGhhdC4gKi8KPiAgICAgICAgICAgICAgICAgICAg
ICBjaGFyICpubiA9IHhtYWxsb2Moc3RybGVuKGMtPnVzZXIpICsgc3RybGVuKGMtPmRvbWFpbikg
KyAyKTsKPiAgICAgICAgICAgICAgICAgICAgICBzdHJjcHkobm4sIGMtPnVzZXIpOwo+ICAgICAg
ICAgICAgICAgICAgICAgIHN0cmNhdChubiwgIkAiKTsKPiAgICAgICAgICAgICAgICAgICAgICBz
dHJjYXQobm4sIGMtPmRvbWFpbik7Cj4gICAgICAgICAgICAgICAgICAgICAgYy0+YSA9IGF1dGhj
b250ZXh0X25ld191c2VyX3Bhc3Mobm4sIGMtPnBhc3MsIGMtPmRvbWFpbiwgaW5ldF9udG9hKGMt
PnNpbi5zaW5fYWRkcikpOwo+ICAgICAgICAgICAgICAgICAgICAgIHhmcmVlKG5uKTsKPiAgICAg
ICAgICAgICAgICAgICB9Cg==

------------FD102303AA83643--