Ticket #1: patch_1_fix_s2s.patch

c2s/c2s.c

@@ -597 +597 @@
     char from[1024];
     sess_t sess;
     union xhashv xhv;
+    char *key;
 
     if((attr = nad_find_attr(nad, 0, -1, "from", NULL)) < 0) {
         nad_free(nad);
@@ -611 +612 @@
 
         log_debug(ZONE, "sm for serviced domain '%s' online", from);
 
-        xhash_put(c2s->sm_avail, pstrdup(xhash_pool(c2s->sm_avail), from), (void *) 1);
+        if (xhash_get(c2s->sm_avail, from) == NULL) {
+            key = pstrdup(xhash_pool(c2s->sm_avail), from);
+            xhash_put(c2s->sm_avail, key, key);
+        }
 
         nad_free(nad);
         return;
@@ -624 +628 @@
 
     log_debug(ZONE, "component unavailable from '%s'", from);
 
-    if(xhash_get(c2s->sm_avail, from) != NULL) {
+    key = xhash_get(c2s->sm_avail, from);
+    if(key != NULL) {
         log_debug(ZONE, "sm for serviced domain '%s' offline", from);
 
         if(xhash_iter_first(c2s->sessions))
@@ -639 +644 @@
                     sx_close(sess->s);
                 }
             } while(xhash_iter_next(c2s->sessions));
-        
+
         xhash_zap(c2s->sm_avail, from);
+        free(key);
     }
 }
 

configure.ac

@@ -383 +383 @@
                 AC_CHECK_LIB(gsasl, gsasl_check_version)
             fi
             if test "x-$ac_cv_lib_gsasl_gsasl_check_version" = "x-yes" ; then
-                AC_MSG_CHECKING(for GnuSASL version >= 0.2.26)
+                AC_MSG_CHECKING(for GnuSASL version >= 0.2.21)
                 AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <gsasl.h>]],
-                                               [[return !(gsasl_check_version("0.2.26"))]])],
+                                               [[return !(gsasl_check_version("0.2.21"))]])],
                               [AC_MSG_RESULT(yes)
                                 sasl_backend='gsasl'],
                               AC_MSG_RESULT(no))

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;