Changes in protocols/jabber/io.c [96f954d:06b5893]
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
protocols/jabber/io.c
r96f954d r06b5893 276 276 } 277 277 278 gboolean jabber_connected_ssl( gpointer data, int returncode,void *source, b_input_condition cond )278 gboolean jabber_connected_ssl( gpointer data, void *source, b_input_condition cond ) 279 279 { 280 280 struct im_connection *ic = data; … … 292 292 jd->ssl = NULL; 293 293 294 if( returncode != 0 ) 295 { 296 char *err = ssl_verify_strerror( returncode ); 297 imcb_error( ic, "Certificate verification problem 0x%x: %s", 298 returncode, err ? err : "Unknown" ); 299 g_free( err ); 300 imc_logout( ic, FALSE ); 301 } 302 else 303 { 304 imcb_error( ic, "Could not connect to server" ); 305 imc_logout( ic, TRUE ); 306 } 307 294 imcb_error( ic, "Could not connect to server" ); 295 imc_logout( ic, TRUE ); 308 296 return FALSE; 309 297 } … … 409 397 struct im_connection *ic = data; 410 398 struct jabber_data *jd = ic->proto_data; 411 char *xmlns , *tlsname;399 char *xmlns; 412 400 413 401 xmlns = xt_find_attr( node, "xmlns" ); … … 435 423 436 424 jd->flags |= JFLAG_STARTTLS_DONE; 437 438 /* If the user specified a server for the account, use this server as the 439 * hostname in the certificate verification. Else we use the domain from 440 * the username. */ 441 if( ic->acc->server && *ic->acc->server ) 442 tlsname = ic->acc->server; 443 else 444 tlsname = jd->server; 445 446 jd->ssl = ssl_starttls( jd->fd, tlsname, set_getbool( &ic->acc->set, "tls_verify" ), 447 jabber_connected_ssl, ic ); 425 jd->ssl = ssl_starttls( jd->fd, jabber_connected_ssl, ic ); 448 426 449 427 return XT_HANDLED;
Note: See TracChangeset
for help on using the changeset viewer.