Changes in protocols/jabber/io.c [96f954d:06b5893]

File:

• protocols/jabber/io.c (modified) (4 diffs)

protocols/jabber/io.c

@@ -276 +276 @@
 }
 
-gboolean jabber_connected_ssl( gpointer data, int returncode, void *source, b_input_condition cond )
+gboolean jabber_connected_ssl( gpointer data, void *source, b_input_condition cond )
 {
         struct im_connection *ic = data;
@@ -292 +292 @@
                 jd->ssl = NULL;
                 
-                if( returncode != 0 )
-                {
-                        char *err = ssl_verify_strerror( returncode );
-                        imcb_error( ic, "Certificate verification problem 0x%x: %s",
-                                    returncode, err ? err : "Unknown" );
-                        g_free( err );
-                        imc_logout( ic, FALSE );
-                }
-                else
-                {
-                        imcb_error( ic, "Could not connect to server" );
-                        imc_logout( ic, TRUE );
-                }
-                
+                imcb_error( ic, "Could not connect to server" );
+                imc_logout( ic, TRUE );
                 return FALSE;
         }
@@ -409 +397 @@
         struct im_connection *ic = data;
         struct jabber_data *jd = ic->proto_data;
-        char *xmlns, *tlsname;
+        char *xmlns;
         
         xmlns = xt_find_attr( node, "xmlns" );
@@ -435 +423 @@
         
         jd->flags |= JFLAG_STARTTLS_DONE;
-
-        /* If the user specified a server for the account, use this server as the 
-         * hostname in the certificate verification. Else we use the domain from 
-         * the username. */
-        if( ic->acc->server && *ic->acc->server )
-                tlsname = ic->acc->server;
-        else
-                tlsname = jd->server;
-        
-        jd->ssl = ssl_starttls( jd->fd, tlsname, set_getbool( &ic->acc->set, "tls_verify" ),
-                                jabber_connected_ssl, ic );
+        jd->ssl = ssl_starttls( jd->fd, jabber_connected_ssl, ic );
         
         return XT_HANDLED;