DSN: fix null deref when bounce is due to conn-timeout. Bug 1630

diff --git a/src/src/deliver.c b/src/src/deliver.c
index 2ee71f502d2e49663acaa205f28abe260624df74..ec030fefb347d0c1ca061f91c329305f8f0b3c37 100644 (file)
--- a/src/src/deliver.c
+++ b/src/src/deliver.c
@@ -4876,17 +4876,8 @@ if (s)
   s += 2;  /* skip ": " */
   fprintf(f, "Diagnostic-Code: smtp; ");
   }
   s += 2;  /* skip ": " */
   fprintf(f, "Diagnostic-Code: smtp; ");
   }

-/* user_message set? use it instead */
-else if ((s = addr->user_message))
-  {
-  DEBUG(D_deliver)
-    debug_printf("DSN Diagnostic-Code: addr->user_message = %s\n", s);
-  /* local errors like timeout get 426 */
-  fprintf(f, "Diagnostic-Code: smtp; 426 ");
-  }

 /* no message available. do nothing */
 /* no message available. do nothing */

-else
-  return;
+else return;

 
 while (*s)
   if (*s == '\\' && s[1] == 'n')
 
 while (*s)
   if (*s == '\\' && s[1] == 'n')