Ticket #1: patch_1_fix_s2s.2.patch

s2s/in.c

@@ -139 +139 @@
             xhash_put(s2s->in_accept, pstrdup(xhash_pool(s2s->in_accept),ipport), (void *) in);
 
 #ifdef HAVE_SSL
-            sx_server_init(in->s, S2S_DB_HEADER | ((s2s->local_pemfile != NULL) ? SX_SSL_STARTTLS_OFFER : 0) );
+            sx_server_init(in->s, S2S_DB_HEADER | ((s2s->sx_ssl != NULL) ? SX_SSL_STARTTLS_OFFER : 0) );
 #else
             sx_server_init(in->s, S2S_DB_HEADER);
 #endif

s2s/out.c

@@ -283 +283 @@
 
 #ifdef HAVE_SSL
             /* Send a stream version of 1.0 if we can do STARTTLS */
-            if(out->s2s->sx_ssl != NULL && out->s2s->local_pemfile != NULL) {
+            if(out->s2s->sx_ssl != NULL) {
                 sx_client_init(out->s, S2S_DB_HEADER, uri_SERVER, pkt->to->domain, pkt->from->domain, "1.0");
             } else {
                 sx_client_init(out->s, S2S_DB_HEADER, uri_SERVER, NULL, NULL, NULL);
@@ -617 +617 @@
 
                 /* if no stream version from either side, kick off dialback for each route, */
                 /* otherwise wait for stream features */
-                if ((out->s->res_version==NULL) || (out->s2s->sx_ssl == NULL) || (out->s2s->local_pemfile == NULL)) {
+                if ((out->s->res_version==NULL) || (out->s2s->sx_ssl == NULL)) {
                      log_debug(ZONE, "no stream version, sending dialbacks for %s immediately", out->key);
                      out->online = 1;
                      send_dialbacks(out);
@@ -643 +643 @@
 
 #ifdef HAVE_SSL
                 /* starttls if we can */
-                if(out->s2s->sx_ssl != NULL && out->s2s->local_pemfile != NULL && s->ssf == 0) {
+                if(out->s2s->sx_ssl != NULL && s->ssf == 0) {
                     ns = nad_find_scoped_namespace(nad, uri_TLS, NULL);
                     if(ns >= 0) {
                         elem = nad_find_elem(nad, 0, ns, "starttls", 1);
                         if(elem >= 0) {
                             log_debug(ZONE, "got STARTTLS in stream features");
-                            if(sx_ssl_client_starttls(out->s2s->sx_ssl, s, out->s2s->local_pemfile) == 0) {
+                            if(sx_ssl_client_starttls(out->s2s->sx_ssl, s, NULL) == 0) {
                                 starttls = 1;
                                 nad_free(nad);
                                 return 0;