syntax cleanup internet_addressing.c

[citadel.git] / citadel / modules / smtp / serv_smtp.c

diff --git a/citadel/modules/smtp/serv_smtp.c b/citadel/modules/smtp/serv_smtp.c
index d4da34c0fe42e64fc99e959811a4c45a22834125..a698065941b5b541ea0ee1a2861cf132c7284bd7 100644 (file)
--- a/citadel/modules/smtp/serv_smtp.c
+++ b/citadel/modules/smtp/serv_smtp.c
@@ -693,7 +693,7 @@ void smtp_rcpt(long offset, long flags)
 {
        struct CitContext *CCC = CC;
        char message_to_spammer[SIZ];
-       recptypes *valid = NULL;
+       struct recptypes *valid = NULL;
        citsmtp *sSMTP = SMTP;
 
        if (StrLength(sSMTP->from) == 0) {
@@ -792,7 +792,7 @@ void smtp_data(long offset, long flags)
        struct CtdlMessage *msg = NULL;
        long msgnum = (-1L);
        char nowstamp[SIZ];
-       recptypes *valid;
+       struct recptypes *valid;
        int scan_errors;
        int i;
        citsmtp *sSMTP = SMTP;
@@ -891,10 +891,12 @@ void smtp_data(long offset, long flags)
                        CM_SetField(msg, eAuthor, CCC->user.fullname, strlen(CCC->user.fullname));
 
                if (!validemail) {
-                       if (sSMTP->preferred_sender_email != NULL)
+                       if (sSMTP->preferred_sender_email != NULL) {
                                CM_SetField(msg, erFc822Addr, SKEY(sSMTP->preferred_sender_email));
-                       else
+                       }
+                       else {
                                CM_SetField(msg, erFc822Addr, CCC->cs_inet_email, strlen(CCC->cs_inet_email));
+                       }
                }
        }