Fix bug in ctdlload import of email addresses.

[citadel.git] / citadel / server / modules / smtp / dkim_bindings.c

diff --git a/citadel/server/modules/smtp/dkim_bindings.c b/citadel/server/modules/smtp/dkim_bindings.c
index e762ecf65173394230954264b984fc730fd8dec5..e7491c15468c52da4897802eb747e822fc47d505 100644 (file)
--- a/citadel/server/modules/smtp/dkim_bindings.c
+++ b/citadel/server/modules/smtp/dkim_bindings.c
@@ -137,8 +137,8 @@ void dkim_check_advisory(char *inetcfg_in) {
                StrBuf *message = NewStrBuf();
                StrBufAppendBufPlain(message, HKEY(
                        "Content-type: text/plain\r\n"
-                       "\r\n"
-                       "Your domain configuration may have changed.\r\n"
+                       "\r\n\r\n"
+                       "Your domain configuration may have changed.\r\n\r\n"
                        "To allow the DKIM signatures of outbound mail to be verified,\r\n"
                        "please ensure that the following DNS records are created:\r\n"
                        "\r\n"
@@ -154,11 +154,14 @@ void dkim_check_advisory(char *inetcfg_in) {
                                StrBufAppendPrintf(message, "Record type: TXT\r\n");
                                StrBufAppendBufPlain(message, HKEY("Value      : v=DKIM1;k=rsa;p="), 0);
 
-                               // figure out the public key and get it
+                               // FIXME calculate the public key and add it here
 
-                               StrBufAppendPrintf(message, "\r\n");
+                               StrBufAppendPrintf(message, "\r\n\r\n");
+                       }
+                       ptr = strchr(ptr, '\n');
+                       if (ptr) {
+                               ++ptr;
                        }
-                       if (ptr) ++ptr;
                }
 
                quickie_message("Citadel",
@@ -167,7 +170,7 @@ void dkim_check_advisory(char *inetcfg_in) {
                        AIDEROOM,                       // room
                        ChrPtr(message),                // text
                        FMT_RFC822,                     // format
-                       "DKIM records"                  // subject
+                       "Confirm your DKIM records"     // subject
                );
                FreeStrBuf(&message);
        }