|
Lines 13-20
Link Here
|
| 13 |
# where jid: one or more jabber id separated by a whitespace |
13 |
# where jid: one or more jabber id separated by a whitespace |
| 14 |
if mysettings["PORTAGE_ELOG_JABBERFROM"]: |
14 |
if mysettings["PORTAGE_ELOG_JABBERFROM"]: |
| 15 |
if not ":" in mysettings["PORTAGE_ELOG_JABBERFROM"]: |
15 |
if not ":" in mysettings["PORTAGE_ELOG_JABBERFROM"]: |
| 16 |
raise portage_exception.PortageException("!!! Invalid syntax for PORTAGE_ELOG_JABBERFROM. Use user@host:password") |
16 |
raise portage_exception.PortageException("!!! Invalid syntax for PORTAGE_ELOG_JABBERFROM. Use user@host:password:resource") |
| 17 |
myfrom, mypass = mysettings["PORTAGE_ELOG_JABBERFROM"].split(":") |
17 |
myfrom, mypass, myres = mysettings["PORTAGE_ELOG_JABBERFROM"].split(":") |
| 18 |
mysubject = mysettings["PORTAGE_ELOG_JABBERSUBJECT"] |
18 |
mysubject = mysettings["PORTAGE_ELOG_JABBERSUBJECT"] |
| 19 |
if not mysubject: |
19 |
if not mysubject: |
| 20 |
mysubject = mysettings["PORTAGE_ELOG_MAILSUBJECT"] |
20 |
mysubject = mysettings["PORTAGE_ELOG_MAILSUBJECT"] |
|
Lines 32-38
Link Here
|
| 32 |
if connected <> 'tls': |
32 |
if connected <> 'tls': |
| 33 |
raise portage_exception.PortageException("!!! Warning: unable to estabilish secure connection - TLS failed!") |
33 |
raise portage_exception.PortageException("!!! Warning: unable to estabilish secure connection - TLS failed!") |
| 34 |
|
34 |
|
| 35 |
auth = client.auth(myuser,mypass) |
35 |
auth = client.auth(myuser,mypass,myres) |
| 36 |
if not auth: |
36 |
if not auth: |
| 37 |
raise portage_exception.PortageException("!!! Could not authentificate to %s" %myserver) |
37 |
raise portage_exception.PortageException("!!! Could not authentificate to %s" %myserver) |
| 38 |
if auth <> 'sasl': |
38 |
if auth <> 'sasl': |
