Fix loading of message template; cut'n'paste code from webcit. Fix leak.

[citadel.git] / citadel / locate_host.c

diff --git a/citadel/locate_host.c b/citadel/locate_host.c
index e04ce71cb4f233747fc66dbc2743e5cc15fc1bf5..39309e943c6dd7b8ab5f30d276395bbc08366cd5 100644 (file)
--- a/citadel/locate_host.c
+++ b/citadel/locate_host.c
@@ -62,6 +62,10 @@
 #define NS_INT16SZ INT16SZ
 #define NS_INT32SZ INT32SZ
 #endif
+#ifndef NS_GET16
+#  define NS_GET16 GETSHORT
+#endif
+
 /** END:some missing macros on OpenBSD 3.9 */
 
 /*
@@ -142,7 +146,7 @@ int rblcheck_backend(char *domain, char *txtbuf, int txtbufsize) {
                if( len == -1 ) {
                        if (txtbuf != NULL) {
                                snprintf(txtbuf, txtbufsize,
-                                       "Message rejected due to known spammer source IP address");
+                                        "Message rejected due to known spammer source IP address");
                        }
                        if (need_to_free_answer) free(answer);
                        return(1);
@@ -180,7 +184,7 @@ int rblcheck_backend(char *domain, char *txtbuf, int txtbufsize) {
        {
                if (txtbuf != NULL) {
                        snprintf(txtbuf, txtbufsize,
-                               "Message rejected due to known spammer source IP address");
+                                "Message rejected due to known spammer source IP address");
                }
                if (need_to_free_answer) free(answer);
                free(result);
@@ -231,11 +235,17 @@ int rblcheck_backend(char *domain, char *txtbuf, int txtbufsize) {
        }
        *rp = '\0';
        if (txtbuf != NULL) {
-               snprintf(txtbuf, txtbufsize, "%s", result);
-       }
-       /* Remove nonprintable characters */
-       for (p=txtbuf; *p; ++p) {
-               if (!isprint(*p)) strcpy(p, p+1);
+               long len;
+               len = snprintf(txtbuf, txtbufsize, "%s", result);
+       
+               /* Remove nonprintable characters */
+               for (p = txtbuf; *p != '\0'; p++) {
+                       if (!isprint(*p)) {
+                               memmove (p,
+                                        p + 1,
+                                        len - (p - txtbuf) - 1);
+                       }
+               }
        }
        if (need_to_free_answer) free(answer);
        free(result);