Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel

diff --git a/citadel/file_ops.c b/citadel/file_ops.c
index 207a4b19010bb254845a280e3632d22fe7897842..8491948925a970546bb146e3a6040a62fba8964d 100644 (file)
--- a/citadel/file_ops.c
+++ b/citadel/file_ops.c
@@ -81,7 +81,7 @@ int network_talking_to(const char *nodename, long len, int operation) {
                        if ((nttlist == NULL) ||
                            (GetCount(nttlist) == 0))
                                break;
-                       if (!GetHash(nttlist, nodename, len, &vdata))
+                       if (GetHash(nttlist, nodename, len, &vdata))
                                retval ++;
                        syslog(LOG_DEBUG, "nttlist: have [%d] <%s>\n", retval, nodename);
                        break;

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index 5ba6d698e1d00723ee8b00672181a1e766721094..f23af01c8d43302e9c8b2f8ec00c1c3f4e5287c2 100644 (file)
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -4312,6 +4312,7 @@ void free_recipients(struct recptypes *valid) {
        if (valid->display_recp != NULL)        free(valid->display_recp);
        if (valid->bounce_to != NULL)           free(valid->bounce_to);
        if (valid->envelope_from != NULL)       free(valid->envelope_from);
+       if (valid->sending_room != NULL)        free(valid->sending_room);
        free(valid);
 }