X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsrc%2Fverify.c;h=a9ec730d10720de07489d111d14bdf16d8e20062;hb=4c0a7a9cb02f9904c2e890f77ff8ce3a6beb25f4;hp=6c71d7feb2427fedafb4545cfd51c0f10cd49b46;hpb=14de8063d82edc5bf003ed50abdea55ac542679b;p=user%2Fhenk%2Fcode%2Fexim.git

diff --git a/src/src/verify.c b/src/src/verify.c
index 6c71d7feb..a9ec730d1 100644
--- a/src/src/verify.c
+++ b/src/src/verify.c
@@ -68,9 +68,7 @@ int length, expire;
 time_t now;
 dbdata_callout_cache *cache_record;
 
-cache_record = dbfn_read_with_length(dbm_file, key, &length);
-
-if (cache_record == NULL)
+if (!(cache_record = dbfn_read_with_length(dbm_file, key, &length)))
   {
   HDEBUG(D_verify) debug_printf("callout cache: no %s record found for %s\n", type, key);
   return NULL;
@@ -797,12 +795,12 @@ tls_retry_connection:
       if (smtp_write_mail_and_rcpt_cmds(&sx, &yield) == 0)
 	switch(addr->transport_return)
 	  {
-	  case PENDING_OK:
+	  case PENDING_OK:	/* random was accepted, unfortunately */
 	    new_domain_record.random_result = ccache_accept;
-	    yield = OK;		/* Only usable result we can return */
+	    yield = OK;		/* Only usable verify result we can return */
 	    done = TRUE;
 	    goto no_conn;
-	  case FAIL:		/* the preferred result */
+	  case FAIL:		/* rejected: the preferred result */
 	    new_domain_record.random_result = ccache_reject;
 	    sx.avoid_option = 0;
 
@@ -836,6 +834,8 @@ tls_retry_connection:
 	    sx.send_rset = TRUE;
 	    sx.completed_addr = FALSE;
 	    goto tls_retry_connection;
+	  case DEFER:		/* 4xx response to random */
+	    break;		/* Just to be clear. ccache_unknown, !done. */
 	  }
 
       /* Re-setup for main verify, or for the error message when failing */
@@ -993,7 +993,7 @@ no_conn:
 	if (*sx.buffer == 0) Ustrcpy(sx.buffer, US"connection dropped");
 
 	/*XXX test here is ugly; seem to have a split of responsibility for
-	building this message.  Need to reationalise.  Where is it done
+	building this message.  Need to rationalise.  Where is it done
 	before here, and when not?
 	Not == 5xx resp to MAIL on main-verify
 	*/
@@ -1789,16 +1789,16 @@ while (addr_new)
       transport. */
 
       transport_feedback tf = {
-        NULL,                       /* interface (=> any) */
-        US"smtp",                   /* port */
-        US"smtp",                   /* protocol */
-        NULL,                       /* hosts */
-        US"$smtp_active_hostname",  /* helo_data */
-        FALSE,                      /* hosts_override */
-        FALSE,                      /* hosts_randomize */
-        FALSE,                      /* gethostbyname */
-        TRUE,                       /* qualify_single */
-        FALSE                       /* search_parents */
+        .interface =		NULL,                       /* interface (=> any) */
+        .port =			US"smtp",
+        .protocol =		US"smtp",
+        .hosts =		NULL,
+        .helo_data =		US"$smtp_active_hostname",
+        .hosts_override =	FALSE,
+        .hosts_randomize =	FALSE,
+        .gethostbyname =	FALSE,
+        .qualify_single =	TRUE,
+        .search_parents =	FALSE
         };
 
       /* If verification yielded a remote transport, we want to use that