X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fsrc%2Fverify.c;h=2634e755275b92b28aeb49193391c8dad42e4155;hb=80fea873648ca2ab2e592999a336c59cf054ab55;hp=6aa425a5490df5e1fc59f36a1f2371584ccd6192;hpb=f9334a281c155709bd269771c11fc5bbf687c17b;p=user%2Fhenk%2Fcode%2Fexim.git

diff --git a/src/src/verify.c b/src/src/verify.c
index 6aa425a54..2634e7552 100644
--- a/src/src/verify.c
+++ b/src/src/verify.c
@@ -2,7 +2,7 @@
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
-/* Copyright (c) University of Cambridge 1995 - 2015 */
+/* Copyright (c) University of Cambridge 1995 - 2016 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Functions concerned with verifying things. The original code for callout
@@ -458,7 +458,7 @@ can do it there for the non-rcpt-verify case.  For this we keep an addresscount.
 	     && port == cutthrough.host.port
 	     )
 	    {
-	    uschar * resp;
+	    uschar * resp = NULL;
 
 	    /* Match!  Send the RCPT TO, append the addr, set done */
 	    done =
@@ -485,7 +485,7 @@ can do it there for the non-rcpt-verify case.  For this we keep an addresscount.
 	    else
 	      {
 	      cancel_cutthrough_connection("recipient rejected");
-	      if (errno == ETIMEDOUT)
+	      if (!resp || errno == ETIMEDOUT)
 		{
 		HDEBUG(D_verify) debug_printf("SMTP timeout\n");
 		}
@@ -3191,9 +3191,9 @@ if (iplookup)
   /* Now do the actual lookup; note that there is no search_close() because
   of the caching arrangements. */
 
-  handle = search_open(filename, search_type, 0, NULL, NULL);
-  if (handle == NULL) log_write(0, LOG_MAIN|LOG_PANIC_DIE, "%s",
-    search_error_message);
+  if (!(handle = search_open(filename, search_type, 0, NULL, NULL)))
+    log_write(0, LOG_MAIN|LOG_PANIC_DIE, "%s", search_error_message);
+
   result = search_find(handle, filename, key, -1, NULL, 0, 0, NULL);
   if (valueptr != NULL) *valueptr = result;
   return (result != NULL)? OK : search_find_defer? DEFER: FAIL;