Don't ignore group on a router when the transport has no user/group

[exim.git] / src / src / moan.c

diff --git a/src/src/moan.c b/src/src/moan.c
index 8591281999c8f270566a8c9c347c2fa9db85bbb6..f1d08bde1460d600904a9acd8803828585971bf2 100644 (file)
--- a/src/src/moan.c
+++ b/src/src/moan.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/moan.c,v 1.2 2005/01/04 10:00:42 ph10 Exp $ */
+/* $Cambridge: exim/src/src/moan.c,v 1.4 2005/11/14 13:56:49 ph10 Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -61,7 +61,7 @@ else DEBUG(D_any) debug_printf("Child process %d for sending message\n", pid);
 
 f = fdopen(fd, "wb");
 if (errors_reply_to != NULL) fprintf(f, "Reply-To: %s\n", errors_reply_to);
-fprintf(f, "Auto_submitted: auto-generated\n");
+fprintf(f, "Auto-Submitted: auto-replied\n");
 fprintf(f, "From: Mail Delivery System <Mailer-Daemon@%s>\n",
   qualify_domain_sender);
 fprintf(f, "To: %s\n", recipient);
@@ -248,7 +248,7 @@ if (message_file != NULL)
 /* Close the file, which should send an EOF to the child process
 that is receiving the message. Wait for it to finish, without a timeout. */
 
-fclose(f);
+(void)fclose(f);
 status = child_close(pid, 0);  /* Waits for child to close */
 if (status != 0)
   {
@@ -414,7 +414,7 @@ if (pid < 0)
   }
 
 f = fdopen(fd, "wb");
-fprintf(f, "Auto_submitted: auto-generated\n");
+fprintf(f, "Auto-Submitted: auto-replied\n");
 fprintf(f, "From: Mail Delivery System <Mailer-Daemon@%s>\n",
   qualify_domain_sender);
 fprintf(f, "To: %s\n", who);
@@ -437,7 +437,7 @@ if (addr != NULL)
     }
   }
 
-fclose(f);
+(void)fclose(f);
 child_close(pid, 0);  /* Waits for child to close; no timeout */
 }
 
@@ -658,7 +658,7 @@ if (pid < 0)
   }
 
 f = fdopen(fd, "wb");
-fprintf(f, "Auto_submitted: auto-generated\n");
+fprintf(f, "Auto-Submitted: auto-replied\n");
 fprintf(f, "From: Mail Delivery System <Mailer-Daemon@%s>\n",
   qualify_domain_sender);
 fprintf(f, "To: %s\n", s);
@@ -692,7 +692,7 @@ if (some)
 else
   fprintf(f, "No valid addresses were generated.\n");
 
-fclose(f);
+(void)fclose(f);
 child_close(pid, 0);  /* Waits for child to close; no timeout */
 
 return TRUE;