-- apply r513 and r514 to the trunk. i apologize if this messes anything up when we go to merge branch!

src/agents/smtp/smtpd.c

@@ -1853,7 +1853,7 @@ DeliverSMTPMessage (ConnectionStruct * Client, unsigned char *Sender,
             }
         }
         else if (Recips[0].Flags & DSN_HEADER) {
-            if (ConnWrite(Client->remotesmtp.conn, "RET=HDRS", 9) < 1) {
+            if (ConnWrite(Client->remotesmtp.conn, " RET=HDRS", 9) < 1) {
                 DELIVER_ERROR (DELIVER_TRY_LATER);
             }
         }

src/libs/nmap/bongoagent.c

@@ -130,7 +130,7 @@ SetBongoConfigItem(BongoConfigItem *schema, BongoJsonNode *node) {
 			break;
 		case BONGO_JSON_STRING: {
 			char **dest = (char **)schema->destination;
-			*dest = BongoJsonNodeAsString(node);
+			*dest = MemStrdup(BongoJsonNodeAsString(node));
 			}
 			break;
 		case BONGO_JSON_ARRAY: {