dovecot-1.2: deliver: Changed all EX_CONFIGs to EX_TEMPFAILs to ...
dovecot at dovecot.org
dovecot at dovecot.org
Wed Sep 30 17:10:58 EEST 2009
details: http://hg.dovecot.org/dovecot-1.2/rev/b39175349d08
changeset: 9397:b39175349d08
user: Timo Sirainen <tss at iki.fi>
date: Wed Sep 30 10:10:42 2009 -0400
description:
deliver: Changed all EX_CONFIGs to EX_TEMPFAILs to avoid bounces.
diffstat:
2 files changed, 5 insertions(+), 9 deletions(-)
src/deliver/deliver.c | 10 +++++-----
src/deliver/deliver.h | 4 ----
diffs (60 lines):
diff -r 401e023c8c29 -r b39175349d08 src/deliver/deliver.c
--- a/src/deliver/deliver.c Wed Sep 30 08:52:12 2009 -0400
+++ b/src/deliver/deliver.c Wed Sep 30 10:10:42 2009 -0400
@@ -342,7 +342,7 @@ static void config_file_init(const char
fd = open(path, O_RDONLY);
if (fd < 0)
- i_fatal_status(EX_CONFIG, "open(%s) failed: %m", path);
+ i_fatal_status(EX_TEMPFAIL, "open(%s) failed: %m", path);
input = i_stream_create_fd(fd, 1024, TRUE);
i_stream_set_return_partial_line(input, TRUE);
@@ -382,7 +382,7 @@ static void config_file_init(const char
if (strncmp(line, "!include_try ", 13) == 0)
continue;
if (strncmp(line, "!include ", 9) == 0) {
- i_fatal_status(EX_CONFIG, "Error in config file %s: "
+ i_fatal_status(EX_TEMPFAIL, "Error in config file %s: "
"deliver doesn't support !include directive", path);
}
@@ -917,13 +917,13 @@ int main(int argc, char *argv[])
if (stat(argv[0], &st) < 0) {
fprintf(stderr, "stat(%s) failed: %s\n",
argv[0], strerror(errno));
- return EX_CONFIG;
+ return EX_TEMPFAIL;
} else if ((st.st_mode & 1) != 0) {
fprintf(stderr, "%s must not be both world-executable "
"and setuid-root. This allows root exploits. "
"See http://wiki.dovecot.org/LDA#multipleuids\n",
argv[0]);
- return EX_CONFIG;
+ return EX_TEMPFAIL;
}
}
@@ -1137,7 +1137,7 @@ int main(int argc, char *argv[])
deliver_set->hostname = my_hostname;
deliver_set->postmaster_address = getenv("POSTMASTER_ADDRESS");
if (deliver_set->postmaster_address == NULL) {
- i_fatal_status(EX_CONFIG,
+ i_fatal_status(EX_TEMPFAIL,
"postmaster_address setting not given");
}
deliver_set->sendmail_path = getenv("SENDMAIL_PATH");
diff -r 401e023c8c29 -r b39175349d08 src/deliver/deliver.h
--- a/src/deliver/deliver.h Wed Sep 30 08:52:12 2009 -0400
+++ b/src/deliver/deliver.h Wed Sep 30 10:10:42 2009 -0400
@@ -2,10 +2,6 @@
#define DELIVER_H
#include <sysexits.h>
-
-#ifndef EX_CONFIG
-# define EX_CONFIG 78 /* HP-UX */
-#endif
#include "lib.h"
#include "mail-storage.h"
More information about the dovecot-cvs
mailing list