Reflect recent changes to Mailutils.

git-svn-id: file:///svnroot/mailfromd/trunk@1534 7a8a7f39-df28-0410-adc6-e0d955640f24

1 files changed, 64 insertions, 65 deletions

diff --git a/src/main.c b/src/main.c
index 3798ca3f..f09f34ec 100644
--- a/src/main.c
+++ b/src/main.c
@@ -39,6 +39,2 @@
 # include <mailutils/argp.h>
-typedef struct {
-	char *file;
-	int line;
-} mu_cfg_locus_t;
 #else
@@ -244,3 +240,3 @@ log_status(sfsistat status, SMFICTX *ctx)
 static void
-mf_error_on_locus(mu_cfg_locus_t *locus, const char *fmt, ...)
+mf_error_on_locus(mu_debug_t err, const char *fmt, ...)
 {
@@ -249,7 +245,8 @@ mf_error_on_locus(mu_cfg_locus_t *locus, const char *fmt, ...)
 	va_start(ap, fmt);
-	if (locus) {
-		char *newfmt = NULL;
-		asprintf(&newfmt, "%s:%d: %s", locus->file, locus->line, fmt);
-		mu_verror(newfmt, ap);
+#if MAILUTILS_VERSION_NUMBER >= 1290
+	if (err) {
+		mu_debug_vprintf(err, 0, fmt, ap);
+		mu_debug_printf(err, 0, "\n");
 	} else
+#endif
 		mu_verror(fmt, ap);
@@ -272,3 +269,3 @@ compare_string(const void *item, const void *value)
 int
-read_domain_file(mu_cfg_locus_t *locus, char *name)
+read_domain_file(mu_debug_t err, char *name)
 {
@@ -280,3 +277,3 @@ read_domain_file(mu_cfg_locus_t *locus, char *name)
 	if (!fp) {
-		mf_error_on_locus(locus, _("Cannot open file `%s': %s"),
+		mf_error_on_locus(err, _("Cannot open file `%s': %s"),
 				  name, mu_strerror(errno));
@@ -386,3 +383,3 @@ gid_comp(const void *item, const void *data)
 static int
-mf_option_group(mu_cfg_locus_t *locus, char *arg)
+mf_option_group(mu_debug_t err, char *arg)
 {
@@ -393,3 +390,3 @@ mf_option_group(mu_cfg_locus_t *locus, char *arg)
 			if (rc) {
-				mf_error_on_locus(locus,
+				mf_error_on_locus(err,
 						  _("Cannot create list: %s"),
@@ -402,3 +399,3 @@ mf_option_group(mu_cfg_locus_t *locus, char *arg)
 	} else {
-		mf_error_on_locus(locus, _("Unknown group: %s"), arg);
+		mf_error_on_locus(err, _("Unknown group: %s"), arg);
 		return 1;
@@ -409,3 +406,3 @@ mf_option_group(mu_cfg_locus_t *locus, char *arg)
 static int
-mf_option_mailfrom(mu_cfg_locus_t *locus, char *arg)
+mf_option_mailfrom(mu_debug_t err, char *arg)
 {
@@ -416,3 +413,3 @@ mf_option_mailfrom(mu_cfg_locus_t *locus, char *arg)
 	if (rc) {
-		mf_error_on_locus(locus, _("Cannot create address `%s': %s"),
+		mf_error_on_locus(err, _("Cannot create address `%s': %s"),
 				  arg, mu_strerror(rc));
@@ -426,3 +423,3 @@ mf_option_mailfrom(mu_cfg_locus_t *locus, char *arg)
 static int
-mf_option_state_directory(mu_cfg_locus_t *locus, char *arg)
+mf_option_state_directory(mu_debug_t err, char *arg)
 {
@@ -430,3 +427,3 @@ mf_option_state_directory(mu_cfg_locus_t *locus, char *arg)
 	if (stat(arg, &st)) {
-		mf_error_on_locus(locus, _("Cannot stat file `%s': %s"),
+		mf_error_on_locus(err, _("Cannot stat file `%s': %s"),
 				  arg,
@@ -436,3 +433,3 @@ mf_option_state_directory(mu_cfg_locus_t *locus, char *arg)
 	if (!S_ISDIR(st.st_mode)) {
-		mf_error_on_locus(locus, _("`%s' is not a directory"), arg);
+		mf_error_on_locus(err, _("`%s' is not a directory"), arg);
 		return 1;
@@ -440,3 +437,3 @@ mf_option_state_directory(mu_cfg_locus_t *locus, char *arg)
 	if (arg[0] != '/') {
-		mf_error_on_locus(locus,
+		mf_error_on_locus(err,
 				  _("State directory `%s' is not an absolute file name"),
@@ -450,3 +447,3 @@ mf_option_state_directory(mu_cfg_locus_t *locus, char *arg)
 static int
-mf_option_source_ip(mu_cfg_locus_t *locus, char *arg, unsigned long *pval)
+mf_option_source_ip(mu_debug_t err, char *arg, unsigned long *pval)
 {
@@ -456,3 +453,3 @@ mf_option_source_ip(mu_cfg_locus_t *locus, char *arg, unsigned long *pval)
 		if (!phe) {
-			mf_error_on_locus(locus, _("Cannot resolve `%s'"),
+			mf_error_on_locus(err, _("Cannot resolve `%s'"),
 					  arg);
@@ -1460,3 +1457,3 @@ static struct argp argp = {
 int
-cb_timeout(time_t *pinterval, mu_cfg_locus_t *locus, void *data, char *arg)
+cb_timeout(time_t *pinterval, mu_debug_t err, void *data, char *arg)
 {
@@ -1464,3 +1461,3 @@ cb_timeout(time_t *pinterval, mu_cfg_locus_t *locus, void *data, char *arg)
 	if (parse_time_interval(arg, pinterval, &endp)) {
-		mf_error_on_locus(locus,
+		mf_error_on_locus(err,
 				  _("unrecognized time format (near `%s')"),
@@ -1473,3 +1470,3 @@ cb_timeout(time_t *pinterval, mu_cfg_locus_t *locus, void *data, char *arg)
 int
-cb_milter_timeout(mu_cfg_locus_t *locus, void *data, char *arg)
+cb_milter_timeout(mu_debug_t err, void *data, char *arg)
 {
@@ -1477,6 +1474,6 @@ cb_milter_timeout(mu_cfg_locus_t *locus, void *data, char *arg)
 
-	if (cb_timeout(&interval, locus, data, arg))
+	if (cb_timeout(&interval, err, data, arg))
 		return 1;
 	if (smfi_settimeout(interval) == MI_FAILURE) {
-		mf_error_on_locus(locus,
+		mf_error_on_locus(err,
 				  _("%s:%d: Invalid milter timeout: %lu"),
@@ -1490,5 +1487,5 @@ cb_milter_timeout(mu_cfg_locus_t *locus, void *data, char *arg)
 int
-cb_io_timeout(mu_cfg_locus_t *locus, void *data, char *arg)
+cb_io_timeout(mu_debug_t err, void *data, char *arg)
 {
-	if (cb_timeout(&io_timeout, locus, data, arg))
+	if (cb_timeout(&io_timeout, err, data, arg))
 		return 1;
@@ -1498,5 +1495,5 @@ cb_io_timeout(mu_cfg_locus_t *locus, void *data, char *arg)
 int
-cb_connect_timeout(mu_cfg_locus_t *locus, void *data, char *arg)
+cb_connect_timeout(mu_debug_t err, void *data, char *arg)
 {
-	if (cb_timeout(&connect_timeout, locus, data, arg))
+	if (cb_timeout(&connect_timeout, err, data, arg))
 		return 1;
@@ -1506,5 +1503,5 @@ cb_connect_timeout(mu_cfg_locus_t *locus, void *data, char *arg)
 int
-cb_initial_response_timeout(mu_cfg_locus_t *locus, void *data, char *arg)
+cb_initial_response_timeout(mu_debug_t err, void *data, char *arg)
 {
-	if (cb_timeout(&response_timeout, locus, data, arg))
+	if (cb_timeout(&response_timeout, err, data, arg))
 		return 1;
@@ -1514,5 +1511,5 @@ cb_initial_response_timeout(mu_cfg_locus_t *locus, void *data, char *arg)
 int
-cb_lock_retry_timeout(mu_cfg_locus_t *locus, void *data, char *arg)
+cb_lock_retry_timeout(mu_debug_t err, void *data, char *arg)
 {
-	if (cb_timeout(&lock_retry_timeout_option, locus, data, arg))
+	if (cb_timeout(&lock_retry_timeout_option, err, data, arg))
 		return 1;
@@ -1522,3 +1519,3 @@ cb_lock_retry_timeout(mu_cfg_locus_t *locus, void *data, char *arg)
 int
-cb_set_variable(mu_cfg_locus_t *locus, void *data, char *arg)
+cb_set_variable(mu_debug_t err, void *data, char *arg)
 {
@@ -1529,3 +1526,3 @@ cb_set_variable(mu_cfg_locus_t *locus, void *data, char *arg)
 		if (!*p) {
-			mf_error_on_locus(locus, _("missing value"));
+			mf_error_on_locus(err, _("missing value"));
 			return 1;
@@ -1535,3 +1532,3 @@ cb_set_variable(mu_cfg_locus_t *locus, void *data, char *arg)
 		if (!*p) {
-			mf_error_on_locus(locus, _("missing value"));
+			mf_error_on_locus(err, _("missing value"));
 			return 1;
@@ -1553,3 +1550,3 @@ cb_set_variable(mu_cfg_locus_t *locus, void *data, char *arg)
 int
-cb_ehlo_domain(mu_cfg_locus_t *locus, void *data, char *arg)
+cb_ehlo_domain(mu_debug_t err, void *data, char *arg)
 {
@@ -1560,5 +1557,5 @@ cb_ehlo_domain(mu_cfg_locus_t *locus, void *data, char *arg)
 int
-cb_mail_from_address(mu_cfg_locus_t *locus, void *data, char *arg)
+cb_mail_from_address(mu_debug_t err, void *data, char *arg)
 {
-	return mf_option_mailfrom(locus, arg);
+	return mf_option_mailfrom(err, arg);
 }
@@ -1566,3 +1563,3 @@ cb_mail_from_address(mu_cfg_locus_t *locus, void *data, char *arg)
 int
-cb_debug(mu_cfg_locus_t *locus, void *data, char *arg)
+cb_debug(mu_debug_t err, void *data, char *arg)
 {
@@ -1574,5 +1571,5 @@ cb_debug(mu_cfg_locus_t *locus, void *data, char *arg)
 int
-cb_group(mu_cfg_locus_t *locus, void *data, char *arg)
+cb_group(mu_debug_t err, void *data, char *arg)
 {
-	return mf_option_group(locus, arg);
+	return mf_option_group(err, arg);
 }
@@ -1580,5 +1577,5 @@ cb_group(mu_cfg_locus_t *locus, void *data, char *arg)
 int
-cb_state_directory(mu_cfg_locus_t *locus, void *data, char *arg)
+cb_state_directory(mu_debug_t err, void *data, char *arg)
 {
-	return mf_option_state_directory(locus, arg);
+	return mf_option_state_directory(err, arg);
 }
@@ -1586,5 +1583,5 @@ cb_state_directory(mu_cfg_locus_t *locus, void *data, char *arg)
 int
-cb_relay_file(mu_cfg_locus_t *locus, void *data, char *arg)
+cb_relay_file(mu_debug_t err, void *data, char *arg)
 {
-	return read_domain_file(locus, arg);
+	return read_domain_file(err, arg);
 }
@@ -1592,5 +1589,5 @@ cb_relay_file(mu_cfg_locus_t *locus, void *data, char *arg)
 int
-cb_source_ip(mu_cfg_locus_t *locus, void *data, char *arg)
+cb_source_ip(mu_debug_t err, void *data, char *arg)
 {
-	return mf_option_source_ip(locus, arg, &source_address);
+	return mf_option_source_ip(err, arg, &source_address);
 }
@@ -1598,3 +1595,3 @@ cb_source_ip(mu_cfg_locus_t *locus, void *data, char *arg)
 int
-cb_include_path(mu_cfg_locus_t *locus, void *data, char *arg)
+cb_include_path(mu_debug_t err, void *data, char *arg)
 {
@@ -1609,18 +1606,20 @@ cb_include_path(mu_cfg_locus_t *locus, void *data, char *arg)
 struct mu_cfg_param mf_cfg_param[] = {
-	{ "connect-timeout", mu_cfg_callback, NULL, cb_connect_timeout },
-	{ "debug", mu_cfg_callback, NULL, cb_debug },
-	{ "ehlo-domain", mu_cfg_callback, NULL, cb_ehlo_domain },
-	{ "group", mu_cfg_callback, NULL, cb_group },
-	{ "include-path", mu_cfg_callback, NULL, cb_include_path },
-	{ "initial-response-timeout", mu_cfg_callback, NULL,
+	{ "connect-timeout", mu_cfg_callback, NULL, 0, cb_connect_timeout },
+	{ "debug", mu_cfg_callback, NULL, 0, cb_debug },
+	{ "ehlo-domain", mu_cfg_callback, NULL, 0, cb_ehlo_domain },
+	{ "group", mu_cfg_callback, NULL, 0, cb_group },
+	{ "include-path", mu_cfg_callback, NULL, 0, cb_include_path },
+	{ "initial-response-timeout", mu_cfg_callback, NULL, 0,
 	  cb_initial_response_timeout },
-	{ "io-timeout", mu_cfg_callback, NULL, cb_io_timeout },
+	{ "io-timeout", mu_cfg_callback, NULL, 0, cb_io_timeout },
 	{ "lock-retry-count", mu_cfg_size, &lock_retry_count_option },
-	{ "lock-retry-timeout", mu_cfg_callback, NULL,
+	{ "lock-retry-timeout", mu_cfg_callback, NULL, 0,
 	  cb_lock_retry_timeout },
-	{ "mail-from-address", mu_cfg_callback, NULL, cb_mail_from_address },
-	{ "milter-timeout", mu_cfg_callback, NULL, cb_milter_timeout },
+	{ "mail-from-address", mu_cfg_callback, NULL, 0,
+	  cb_mail_from_address },
+	{ "milter-timeout", mu_cfg_callback, NULL, 0,
+	  cb_milter_timeout },
 	{ "pidfile", mu_cfg_string, &pidfile },
-	{ "relay-file", mu_cfg_callback, NULL, cb_relay_file },
-	{ "setvar", mu_cfg_callback, NULL, cb_set_variable },
+	{ "relay-file", mu_cfg_callback, NULL, 0, cb_relay_file },
+	{ "setvar", mu_cfg_callback, NULL, 0, cb_set_variable },
 	{ "script-file", mu_cfg_string, &script_file },
@@ -1628,5 +1627,5 @@ struct mu_cfg_param mf_cfg_param[] = {
 	/* FIXME: Could have used mu_cfg_ipv4 here, but... */
-	{ "source-ip", mu_cfg_callback, NULL, cb_source_ip },
+	{ "source-ip", mu_cfg_callback, NULL, 0, cb_source_ip },
 	{ "stack-trace", mu_cfg_bool, &stack_trace_option },
-	{ "state-directory", mu_cfg_callback, NULL, cb_state_directory },
+	{ "state-directory", mu_cfg_callback, NULL, 0, cb_state_directory },
 	{ "user", mu_cfg_string, &user },