coding standards

diff --git a/src/src/acl.c b/src/src/acl.c
index b8a4b8865b2a8dd1bedbb11ef0f387de6f6543e5..045535526569b9cb2df0006636d7615b6086e68a 100644 (file)
--- a/src/src/acl.c
+++ b/src/src/acl.c
@@ -3666,35 +3666,30 @@ for (; cb != NULL; cb = cb->next)
       }
     break;
 
-    #ifdef WITH_CONTENT_SCAN
+#ifdef WITH_CONTENT_SCAN
     case ACLC_SPAM:
       {
       /* Separate the regular expression and any optional parameters. */
       const uschar * list = arg;
       uschar *ss = string_nextinlist(&list, &sep, big_buffer, big_buffer_size);
-      /* Run the spam backend. */
+
       rc = spam(CUSS &ss);
       /* Modify return code based upon the existence of options. */
-      while ((ss = string_nextinlist(&list, &sep, big_buffer, big_buffer_size))
-            != NULL) {
+      while ((ss = string_nextinlist(&list, &sep, big_buffer, big_buffer_size)))
         if (strcmpic(ss, US"defer_ok") == 0 && rc == DEFER)
-          {
-          /* FAIL so that the message is passed to the next ACL */
-          rc = FAIL;
-          }
-        }
+          rc = FAIL;   /* FAIL so that the message is passed to the next ACL */
       }
     break;
-    #endif
+#endif
 
-    #ifdef EXPERIMENTAL_SPF
+#ifdef EXPERIMENTAL_SPF
     case ACLC_SPF:
       rc = spf_process(&arg, sender_address, SPF_PROCESS_NORMAL);
     break;
     case ACLC_SPF_GUESS:
       rc = spf_process(&arg, sender_address, SPF_PROCESS_GUESS);
     break;
-    #endif
+#endif
 
     case ACLC_UDPSEND:
     rc = acl_udpsend(arg, log_msgptr);

diff --git a/src/src/spf.c b/src/src/spf.c
index c4c5ef7612030cd754c731661a8120270528c1ac..ffd278af8609f5b3e817929a75ec7d6bb9e3116f 100644 (file)
--- a/src/src/spf.c
+++ b/src/src/spf.c
@@ -33,69 +33,83 @@ SPF_request_t   *spf_request = NULL;
 SPF_response_t  *spf_response = NULL;
 SPF_response_t  *spf_response_2mx = NULL;
 
+
 /* spf_init sets up a context that can be re-used for several
    messages on the same SMTP connection (that come from the
-   same host with the same HELO string) */
+   same host with the same HELO string)
 
-int spf_init(uschar *spf_helo_domain, uschar *spf_remote_addr) {
+Return: Boolean success */
 
-  spf_server = SPF_server_new(SPF_DNS_CACHE, 0);
+BOOL
+spf_init(uschar *spf_helo_domain, uschar *spf_remote_addr)
+{
+spf_server = SPF_server_new(SPF_DNS_CACHE, 0);
 
-  if ( spf_server == NULL ) {
-    debug_printf("spf: SPF_server_new() failed.\n");
-    return 0;
+if (!spf_server)
+  {
+  DEBUG(D_receive) debug_printf("spf: SPF_server_new() failed.\n");
+  return FALSE;
   }
 
-  if (SPF_server_set_rec_dom(spf_server, CS primary_hostname)) {
-    debug_printf("spf: SPF_server_set_rec_dom(\"%s\") failed.\n", primary_hostname);
-    spf_server = NULL;
-    return 0;
+if (SPF_server_set_rec_dom(spf_server, CS primary_hostname))
+  {
+  DEBUG(D_receive) debug_printf("spf: SPF_server_set_rec_dom(\"%s\") failed.\n",
+    primary_hostname);
+  spf_server = NULL;
+  return FALSE;
   }
 
-  spf_request = SPF_request_new(spf_server);
-
-  if (SPF_request_set_ipv4_str(spf_request, CS spf_remote_addr)
-      && SPF_request_set_ipv6_str(spf_request, CS spf_remote_addr)) {
-    debug_printf("spf: SPF_request_set_ipv4_str() and SPF_request_set_ipv6_str() failed [%s]\n", spf_remote_addr);
-    spf_server = NULL;
-    spf_request = NULL;
-    return 0;
+spf_request = SPF_request_new(spf_server);
+
+if (  SPF_request_set_ipv4_str(spf_request, CS spf_remote_addr)
+   && SPF_request_set_ipv6_str(spf_request, CS spf_remote_addr)
+   )
+  {
+  DEBUG(D_receive)
+    debug_printf("spf: SPF_request_set_ipv4_str() and "
+      "SPF_request_set_ipv6_str() failed [%s]\n", spf_remote_addr);
+  spf_server = NULL;
+  spf_request = NULL;
+  return FALSE;
   }
 
-  if (SPF_request_set_helo_dom(spf_request, CS spf_helo_domain)) {
-    debug_printf("spf: SPF_set_helo_dom(\"%s\") failed.\n", spf_helo_domain);
-    spf_server = NULL;
-    spf_request = NULL;
-    return 0;
+if (SPF_request_set_helo_dom(spf_request, CS spf_helo_domain))
+  {
+  DEBUG(D_receive) debug_printf("spf: SPF_set_helo_dom(\"%s\") failed.\n",
+    spf_helo_domain);
+  spf_server = NULL;
+  spf_request = NULL;
+  return FALSE;
   }
 
-  return 1;
+return TRUE;
 }
 
 
 /* spf_process adds the envelope sender address to the existing
    context (if any), retrieves the result, sets up expansion
-   strings and evaluates the condition outcome. */
-
-int spf_process(const uschar **listptr, uschar *spf_envelope_sender, int action) {
-  int sep = 0;
-  const uschar *list = *listptr;
-  uschar *spf_result_id;
-  uschar spf_result_id_buffer[128];
-  int rc = SPF_RESULT_PERMERROR;
-
-  if (!(spf_server && spf_request)) {
-    /* no global context, assume temp error and skip to evaluation */
-    rc = SPF_RESULT_PERMERROR;
-    goto SPF_EVALUATE;
-  };
-
-  if (SPF_request_set_env_from(spf_request, CS spf_envelope_sender)) {
-    /* Invalid sender address. This should be a real rare occurence */
-    rc = SPF_RESULT_PERMERROR;
-    goto SPF_EVALUATE;
-  }
-
+   strings and evaluates the condition outcome.
+   
+Return: OK/FAIL  */
+
+int
+spf_process(const uschar **listptr, uschar *spf_envelope_sender, int action)
+{
+int sep = 0;
+const uschar *list = *listptr;
+uschar *spf_result_id;
+int rc = SPF_RESULT_PERMERROR;
+
+if (!(spf_server && spf_request))
+  /* no global context, assume temp error and skip to evaluation */
+  rc = SPF_RESULT_PERMERROR;
+
+else if (SPF_request_set_env_from(spf_request, CS spf_envelope_sender))
+  /* Invalid sender address. This should be a real rare occurence */
+  rc = SPF_RESULT_PERMERROR;
+
+else
+  {
   /* get SPF result */
   if (action == SPF_PROCESS_FALLBACK)
     SPF_request_query_fallback(spf_request, &spf_response, CS spf_guess);
@@ -109,34 +123,27 @@ int spf_process(const uschar **listptr, uschar *spf_envelope_sender, int action)
   spf_smtp_comment       = US SPF_response_get_smtp_comment(spf_response);
 
   rc = SPF_response_result(spf_response);
+  }
+
+/* We got a result. Now see if we should return OK or FAIL for it */
+DEBUG(D_acl) debug_printf("SPF result is %s (%d)\n", SPF_strresult(rc), rc);
+
+if (action == SPF_PROCESS_GUESS && (!strcmp (SPF_strresult(rc), "none")))
+  return spf_process(listptr, spf_envelope_sender, SPF_PROCESS_FALLBACK);
+
+while ((spf_result_id = string_nextinlist(&list, &sep, NULL, 0)))
+  {
+  BOOL negate, result;
+
+  if ((negate = spf_result_id[0] == '!'))
+    spf_result_id++;
+
+  result = Ustrcmp(spf_result_id, spf_result_id_list[rc].name) == 0;
+  if (negate != result) return OK;
+  }
 
-  /* We got a result. Now see if we should return OK or FAIL for it */
-  SPF_EVALUATE:
-  debug_printf("SPF result is %s (%d)\n", SPF_strresult(rc), rc);
-
-  if (action == SPF_PROCESS_GUESS && (!strcmp (SPF_strresult(rc), "none")))
-    return spf_process(listptr, spf_envelope_sender, SPF_PROCESS_FALLBACK);
-
-  while ((spf_result_id = string_nextinlist(&list, &sep,
-                                     spf_result_id_buffer,
-                                     sizeof(spf_result_id_buffer))) != NULL) {
-    int negate = 0;
-    int result = 0;
-
-    /* Check for negation */
-    if (spf_result_id[0] == '!') {
-      negate = 1;
-      spf_result_id++;
-    };
-
-    /* Check the result identifier */
-    result = Ustrcmp(spf_result_id, spf_result_id_list[rc].name);
-    if (!negate && result==0) return OK;
-    if (negate && result!=0) return OK;
-  };
-
-  /* no match */
-  return FAIL;
+/* no match */
+return FAIL;
 }
 
 #endif

diff --git a/src/src/spf.h b/src/src/spf.h
index 2a7c0409400b965df1fe7e2331583ce14e13a844..0d982f336bcf732aff1f8e864d602821ad70eb54 100644 (file)
--- a/src/src/spf.h
+++ b/src/src/spf.h
@@ -25,8 +25,8 @@ typedef struct spf_result_id {
 } spf_result_id;
 
 /* prototypes */
-int spf_init(uschar *,uschar *);
-int spf_process(const uschar **, uschar *, int);
+BOOL spf_init(uschar *,uschar *);
+int  spf_process(const uschar **, uschar *, int);
 
 #define SPF_PROCESS_NORMAL  0
 #define SPF_PROCESS_GUESS   1