pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mail/spamdyke Apply patch from joerg@ to build with cl...
details: https://anonhg.NetBSD.org/pkgsrc/rev/a22b0305c626
branches: trunk
changeset: 310993:a22b0305c626
user: schmonz <schmonz%pkgsrc.org@localhost>
date: Sun Jul 29 08:41:18 2018 +0000
description:
Apply patch from joerg@ to build with clang (by removing anonymous inner
functions). Bump PKGREVISION.
diffstat:
mail/spamdyke/Makefile | 7 +-
mail/spamdyke/distinfo | 7 +-
mail/spamdyke/patches/patch-configuration.c | 516 ++++++++++++++++++++++++++++
mail/spamdyke/patches/patch-configure | 112 ++++++
mail/spamdyke/patches/patch-configure.ac | 44 ++
mail/spamdyke/patches/patch-spamdyke.h | 28 +-
6 files changed, 706 insertions(+), 8 deletions(-)
diffs (truncated from 766 to 300 lines):
diff -r 667e33f7364d -r a22b0305c626 mail/spamdyke/Makefile
--- a/mail/spamdyke/Makefile Sun Jul 29 07:40:06 2018 +0000
+++ b/mail/spamdyke/Makefile Sun Jul 29 08:41:18 2018 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.36 2017/07/09 16:16:32 schmonz Exp $
+# $NetBSD: Makefile,v 1.37 2018/07/29 08:41:18 schmonz Exp $
#
DISTNAME= spamdyke-5.0.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= mail
MASTER_SITES= ${HOMEPAGE}releases/
EXTRACT_SUFX= .tgz
@@ -19,9 +19,6 @@
MAKE_FLAGS+= CFLAGS=${CFLAGS:Q}
MAKE_FLAGS+= LDFLAGS=${LDFLAGS:Q}
-# anonymous inner functions
-ONLY_FOR_COMPILER= gcc
-
SUBST_CLASSES+= paths
SUBST_FILES.paths= spamdyke.h
SUBST_SED.paths= -e 's,@PREFIX@,${PREFIX:Q},g'
diff -r 667e33f7364d -r a22b0305c626 mail/spamdyke/distinfo
--- a/mail/spamdyke/distinfo Sun Jul 29 07:40:06 2018 +0000
+++ b/mail/spamdyke/distinfo Sun Jul 29 08:41:18 2018 +0000
@@ -1,8 +1,11 @@
-$NetBSD: distinfo,v 1.32 2017/07/09 16:16:32 schmonz Exp $
+$NetBSD: distinfo,v 1.33 2018/07/29 08:41:18 schmonz Exp $
SHA1 (spamdyke-5.0.1.tgz) = 4de76158a98b3ee33e7002160446ae36de7c96d2
RMD160 (spamdyke-5.0.1.tgz) = 7237108ebf0ff2a5c02b7e305985a11e93720f8d
SHA512 (spamdyke-5.0.1.tgz) = a022c8a8d4a8d74f5249f8e2d901d3de423ee853bbaffaf7e86cece1d19880d9039135892ef6ccb8a2a0fb11532c487402dc97a8dd6d89c9de431752c55f6eb9
Size (spamdyke-5.0.1.tgz) = 383720 bytes
+SHA1 (patch-configuration.c) = 81548b8a7cc557446d3ecfca3546a129b04a2173
+SHA1 (patch-configure) = 0ff7ecd6b73445664243918001368a73186159b3
+SHA1 (patch-configure.ac) = 5b932db1992c268e80fced15d032d369d1dc40ce
SHA1 (patch-md5.c) = f61cd888b6739c014a6de72d55589672d65c25cc
-SHA1 (patch-spamdyke.h) = fe76ef41ba4e1ce231d578368642a18fbca12050
+SHA1 (patch-spamdyke.h) = 689d4774d78b60a4dd2fbb62a99b218aca9b500b
diff -r 667e33f7364d -r a22b0305c626 mail/spamdyke/patches/patch-configuration.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/spamdyke/patches/patch-configuration.c Sun Jul 29 08:41:18 2018 +0000
@@ -0,0 +1,516 @@
+$NetBSD: patch-configuration.c,v 1.1 2018/07/29 08:41:18 schmonz Exp $
+
+Remove anonymous inner functions to build with clang.
+
+--- configuration.c.orig 2018-07-08 20:20:10.283510612 +0000
++++ configuration.c
+@@ -359,6 +359,140 @@ int copy_base_options(struct filter_sett
+ * Return value:
+ * exit value for main()
+ */
++CONFIG_ACTION_PREDEF(smtp_auth_level, if (((current_settings->current_options->smtp_auth_level & SMTP_AUTH_LEVEL_MASK) != SMTP_AUTH_LEVEL_VALUE_NONE) &&
(current_settings->current_options->filter_grace < FILTER_GRACE_AFTER_FROM)) current_settings->current_options->filter_grace = FILTER_GRACE_AFTER_FROM)
++CONFIG_ACTION_PREDEF(smtp_auth_verification, if (((current_settings->current_options->smtp_auth_level & SMTP_AUTH_SET_MASK) == SMTP_AUTH_SET_VALUE_UNSET) &&
(current_settings->current_options->smtp_auth_command != NULL) && (current_settings->current_options->smtp_auth_command[0] != NULL)) { current_settings->current_options->smtp_auth_level =
SMTP_AUTH_LEVEL_VALUE_ON_DEMAND | SMTP_AUTH_SET_VALUE_SET; if (current_settings->current_options->filter_grace < FILTER_GRACE_AFTER_FROM) current_settings->current_options->filter_grace =
FILTER_GRACE_AFTER_FROM; })
++CONFIG_ACCESSOR_STRING_ARRAY_PREDEF(blacklist_sender)
++CONFIG_ACCESSOR_STRING_ARRAY_PREDEF(blacklist_sender_file)
++CONFIG_ACCESSOR_STRING_ARRAY_PREDEF(whitelist_sender)
++CONFIG_ACCESSOR_STRING_ARRAY_PREDEF(whitelist_sender_file)
++CONFIG_ACCESSOR_STRING_ARRAY_PREDEF(smtp_auth_command)
++CONFIG_ACCESSOR_INTEGER_PREDEF(smtp_auth_level)
++CONFIG_ACCESSOR_STRING_PREDEF(tls_certificate_file)
++CONFIG_ACCESSOR_STRING_PREDEF(tls_cipher_list)
++CONFIG_ACCESSOR_STRING_PREDEF(tls_dhparams_file)
++CONFIG_ACCESSOR_INTEGER_PREDEF(tls_level)
++CONFIG_ACCESSOR_STRING_PREDEF(tls_privatekey_file)
++CONFIG_ACCESSOR_STRING_PREDEF(tls_privatekey_password)
++CONFIG_ACCESSOR_STRING_PREDEF(tls_privatekey_password_file)
++CONFIG_ACCESSOR_STRING_PREDEF(run_user)
++CONFIG_ACCESSOR_INTEGER_PREDEF(relay_level)
++CONFIG_ACCESSOR_STRING_ARRAY_PREDEF(rhsbl_fqdn)
++CONFIG_ACCESSOR_STRING_ARRAY_PREDEF(rhsbl_fqdn_file)
++CONFIG_ACCESSOR_STRING_ARRAY_PREDEF(rhswl_fqdn)
++CONFIG_ACCESSOR_STRING_ARRAY_PREDEF(rhswl_fqdn_file)
++CONFIG_ACCESSOR_STRING_PREDEF(local_server_name)
++CONFIG_ACCESSOR_STRING_PREDEF(local_server_name_command)
++CONFIG_ACCESSOR_STRING_PREDEF(local_server_name_file)
++CONFIG_ACCESSOR_INTEGER_PREDEF(timeout_command)
++CONFIG_ACCESSOR_STRING_ARRAY_PREDEF(blacklist_ip)
++CONFIG_ACCESSOR_STRING_ARRAY_PREDEF(blacklist_ip_file)
++CONFIG_ACCESSOR_STRING_ARRAY_PREDEF(blacklist_rdns_keyword)
++CONFIG_ACCESSOR_STRING_ARRAY_PREDEF(blacklist_rdns_keyword_file)
++CONFIG_ACCESSOR_STRING_ARRAY_PREDEF(whitelist_rdns_keyword)
++CONFIG_ACCESSOR_STRING_ARRAY_PREDEF(whitelist_rdns_keyword_file)
++CONFIG_ACCESSOR_STRING_ARRAY_PREDEF(relay_ip)
++CONFIG_ACCESSOR_STRING_ARRAY_PREDEF(relay_ip_file)
++CONFIG_ACCESSOR_STRING_ARRAY_PREDEF(whitelist_ip)
++CONFIG_ACCESSOR_STRING_ARRAY_PREDEF(whitelist_ip_file)
++CONFIG_ACCESSOR_INTEGER_PREDEF(log_level)
++CONFIG_ACCESSOR_INTEGER_PREDEF(check_earlytalker)
++CONFIG_ACCESSOR_INTEGER_PREDEF(configuration_dir_search)
++CONFIG_ACCESSOR_INTEGER_PREDEF(filter_level)
++CONFIG_ACCESSOR_INTEGER_PREDEF(graylist_level)
++CONFIG_ACCESSOR_INTEGER_PREDEF(graylist_max_secs)
++CONFIG_ACCESSOR_INTEGER_PREDEF(graylist_min_secs)
++CONFIG_ACCESSOR_INTEGER_PREDEF(nihdns_attempts_primary)
++CONFIG_ACCESSOR_INTEGER_PREDEF(nihdns_attempts_total)
++CONFIG_ACCESSOR_INTEGER_PREDEF(nihdns_level)
++CONFIG_ACCESSOR_INTEGER_PREDEF(nihdns_query_type_a)
++CONFIG_ACCESSOR_INTEGER_PREDEF(nihdns_query_type_mx)
++CONFIG_ACCESSOR_INTEGER_PREDEF(nihdns_query_type_ptr)
++CONFIG_ACCESSOR_INTEGER_PREDEF(nihdns_query_type_rbl)
++CONFIG_ACCESSOR_INTEGER_PREDEF(nihdns_spoof)
++CONFIG_ACCESSOR_INTEGER_PREDEF(nihdns_tcp)
++CONFIG_ACCESSOR_INTEGER_PREDEF(nihdns_timeout_total_secs_parameter)
++CONFIG_ACCESSOR_INTEGER_PREDEF(timeout_connection)
++CONFIG_ACCESSOR_STRING_ARRAY_PREDEF(config_file)
++CONFIG_ACCESSOR_STRING_ARRAY_PREDEF(configuration_dir)
++CONFIG_ACCESSOR_STRING_ARRAY_PREDEF(dnsrbl_fqdn)
++CONFIG_ACCESSOR_STRING_ARRAY_PREDEF(dnsrbl_fqdn_file)
++CONFIG_ACCESSOR_STRING_ARRAY_PREDEF(dnsrwl_fqdn)
++CONFIG_ACCESSOR_STRING_ARRAY_PREDEF(dnsrwl_fqdn_file)
++CONFIG_ACCESSOR_STRING_ARRAY_PREDEF(graylist_dir)
++CONFIG_ACCESSOR_STRING_ARRAY_PREDEF(graylist_exception_ip)
++CONFIG_ACCESSOR_STRING_ARRAY_PREDEF(graylist_exception_ip_file)
++CONFIG_ACCESSOR_STRING_ARRAY_PREDEF(graylist_exception_rdns)
++CONFIG_ACCESSOR_STRING_ARRAY_PREDEF(graylist_exception_rdns_dir)
++CONFIG_ACCESSOR_STRING_ARRAY_PREDEF(graylist_exception_rdns_file)
++CONFIG_ACCESSOR_STRING_ARRAY_PREDEF(nihdns_primary_server_list)
++CONFIG_ACCESSOR_STRING_ARRAY_PREDEF(nihdns_resolv_conf)
++CONFIG_ACCESSOR_STRING_ARRAY_PREDEF(nihdns_secondary_server_list)
++CONFIG_ACCESSOR_STRING_PREDEF(log_dir)
++CONFIG_ACCESSOR_STRING_PREDEF(test_smtp_auth_password)
++CONFIG_ACCESSOR_STRING_PREDEF(test_smtp_auth_username)
++CONFIG_SET_ACTION_PREDEF(loglevel, if (current_settings->current_options->log_level == 0) current_settings->current_options->log_level = LOG_LEVEL_ERROR)
++CONFIG_SET_ACTION_PREDEF(relay_level_unset, if (current_settings->current_options->relay_level == RELAY_LEVEL_UNSET) current_settings->current_options->relay_level = RELAY_LEVEL_NORMAL;)
++CONFIG_SET_ACTION_PREDEF(strlen_policy_location, current_settings->current_options->strlen_policy_location = (current_settings->current_options->policy_location != NULL) ?
strlen(current_settings->current_options->policy_location) : 0)
++CONFIG_SET_ACTION_PREDEF(strlen_tls_privatekey_password, current_settings->current_options->strlen_tls_privatekey_password = (current_settings->current_options->tls_privatekey_password != NULL) ?
strlen(current_settings->current_options->tls_privatekey_password) : 0)
++CONFIG_SET_ACTION_PREDEF(usage_brief, usage(current_settings, USAGE_LEVEL_BRIEF, NULL))
++CONFIG_SET_ACTION_PREDEF(usage_long, usage(current_settings, USAGE_LEVEL_LONG, NULL))
++CONFIG_SET_ACTION_PREDEF(usage_short, usage(current_settings, USAGE_LEVEL_SHORT, NULL))
++CONFIG_ACCESSOR_INTEGER_PREDEF(log_target)
++CONFIG_ACCESSOR_INTEGER_PREDEF(max_rcpt_to)
++CONFIG_ACCESSOR_STRING_PREDEF(policy_location)
++CONFIG_ACCESSOR_STRING_ARRAY_PREDEF(qmail_morercpthosts_cdb)
++CONFIG_ACCESSOR_STRING_ARRAY_PREDEF(qmail_rcpthosts_file)
++CONFIG_ACCESSOR_STRING_ARRAY_PREDEF(blacklist_rdns_dir)
++CONFIG_ACCESSOR_STRING_ARRAY_PREDEF(blacklist_rdns)
++CONFIG_ACCESSOR_STRING_ARRAY_PREDEF(blacklist_rdns_file)
++CONFIG_ACCESSOR_STRING_ARRAY_PREDEF(relay_rdns)
++CONFIG_ACCESSOR_STRING_ARRAY_PREDEF(relay_rdns_file)
++CONFIG_ACCESSOR_STRING_ARRAY_PREDEF(whitelist_rdns_dir)
++CONFIG_ACCESSOR_STRING_ARRAY_PREDEF(whitelist_rdns)
++CONFIG_ACCESSOR_STRING_ARRAY_PREDEF(whitelist_rdns_file)
++CONFIG_ACCESSOR_STRING_ARRAY_PREDEF(blacklist_recipient)
++CONFIG_ACCESSOR_STRING_ARRAY_PREDEF(blacklist_recipient_file)
++CONFIG_ACCESSOR_STRING_ARRAY_PREDEF(whitelist_recipient)
++CONFIG_ACCESSOR_STRING_ARRAY_PREDEF(whitelist_recipient_file)
++CONFIG_ACCESSOR_INTEGER_PREDEF(check_rdns_exist)
++CONFIG_ACCESSOR_INTEGER_PREDEF(check_ip_in_rdns_cc)
++CONFIG_ACCESSOR_INTEGER_PREDEF(reject_recipient)
++CONFIG_ACCESSOR_INTEGER_PREDEF(reject_sender)
++CONFIG_ACCESSOR_INTEGER_PREDEF(check_rdns_resolve)
++CONFIG_ACCESSOR_STRING_ARRAY_PREDEF(recipient_validation_command)
++CONFIG_ACCESSOR_STRING_ARRAY_MEMBER_PREDEF(rejection_text, REJECTION_SMTP_AUTH_FAILURE)
++CONFIG_ACCESSOR_STRING_ARRAY_MEMBER_PREDEF(rejection_text, REJECTION_SMTP_AUTH_UNKNOWN)
++CONFIG_ACCESSOR_STRING_ARRAY_MEMBER_PREDEF(rejection_text, REJECTION_RBL)
++CONFIG_ACCESSOR_STRING_ARRAY_MEMBER_PREDEF(rejection_text, REJECTION_EARLYTALKER)
++CONFIG_ACCESSOR_STRING_ARRAY_MEMBER_PREDEF(rejection_text, REJECTION_RDNS_MISSING)
++CONFIG_ACCESSOR_STRING_ARRAY_MEMBER_PREDEF(rejection_text, REJECTION_GRAYLISTED)
++CONFIG_ACCESSOR_STRING_ARRAY_MEMBER_PREDEF(rejection_text, REJECTION_HEADER_BLACKLISTED)
++CONFIG_ACCESSOR_STRING_ARRAY_MEMBER_PREDEF(rejection_text, REJECTION_BLACKLIST_IP)
++CONFIG_ACCESSOR_STRING_ARRAY_MEMBER_PREDEF(rejection_text, REJECTION_IP_IN_NAME_CC)
++CONFIG_ACCESSOR_STRING_ARRAY_MEMBER_PREDEF(rejection_text, REJECTION_IP_IN_NAME)
++CONFIG_ACCESSOR_STRING_ARRAY_MEMBER_PREDEF(rejection_text, REJECTION_RCPT_TO_LOCAL)
++CONFIG_ACCESSOR_STRING_ARRAY_MEMBER_PREDEF(rejection_text, REJECTION_RCPT_TO)
++CONFIG_ACCESSOR_STRING_ARRAY_MEMBER_PREDEF(rejection_text, REJECTION_BLACKLIST_NAME)
++CONFIG_ACCESSOR_STRING_ARRAY_MEMBER_PREDEF(rejection_text, REJECTION_RECIPIENT_BLACKLISTED)
++CONFIG_ACCESSOR_STRING_ARRAY_MEMBER_PREDEF(rejection_text, REJECTION_INVALID_RECIPIENT)
++CONFIG_ACCESSOR_STRING_ARRAY_MEMBER_PREDEF(rejection_text, REJECTION_IDENTICAL_FROM_TO)
++CONFIG_ACCESSOR_STRING_ARRAY_MEMBER_PREDEF(rejection_text, REJECTION_UNAVAILABLE_RECIPIENT)
++CONFIG_ACCESSOR_STRING_ARRAY_MEMBER_PREDEF(rejection_text, REJECTION_UNCONDITIONAL)
++CONFIG_ACCESSOR_STRING_ARRAY_MEMBER_PREDEF(rejection_text, REJECTION_RELAYING_DENIED)
++CONFIG_ACCESSOR_STRING_ARRAY_MEMBER_PREDEF(rejection_text, REJECTION_RHSBL)
++CONFIG_ACCESSOR_STRING_ARRAY_MEMBER_PREDEF(rejection_text, REJECTION_SENDER_NOT_AUTH)
++CONFIG_ACCESSOR_STRING_ARRAY_MEMBER_PREDEF(rejection_text, REJECTION_SENDER_BLACKLISTED)
++CONFIG_ACCESSOR_STRING_ARRAY_MEMBER_PREDEF(rejection_text, REJECTION_SENDER_NO_MX)
++CONFIG_ACCESSOR_STRING_ARRAY_MEMBER_PREDEF(rejection_text, REJECTION_SENDER_NOT_LOCAL)
++CONFIG_ACCESSOR_STRING_ARRAY_MEMBER_PREDEF(rejection_text, REJECTION_AUTH_REQUIRED)
++CONFIG_ACCESSOR_STRING_ARRAY_MEMBER_PREDEF(rejection_text, REJECTION_TIMEOUT)
++CONFIG_ACCESSOR_STRING_ARRAY_MEMBER_PREDEF(rejection_text, FAILURE_TLS)
++CONFIG_ACCESSOR_STRING_ARRAY_MEMBER_PREDEF(rejection_text, REJECTION_RDNS_RESOLVE)
++CONFIG_ACCESSOR_STRING_ARRAY_MEMBER_PREDEF(rejection_text, REJECTION_ZERO_RECIPIENTS)
++
++static char ***predef_access_string_array_blacklist_header(struct option_set *current_options, int current_options_only) { return(current_options_only ? NULL :
¤t_options->container->blacklist_header); }
++static char ***predef_access_string_array_blacklist_header_file(struct option_set *current_options, int current_options_only) { return(current_options_only ? NULL :
¤t_options->container->blacklist_header_file); }
++
+ int prepare_settings(int argc, char *argv[], char *envp[], int (*main_function)(struct filter_settings *, int, char **))
+ {
+ int return_value;
+@@ -706,7 +840,7 @@ int prepare_settings(int argc, char *arg
+ FILTER_DECISION_CONFIG_TEST,
+ FILTER_GRACE_NONE,
+ NULL,
+- CONFIG_SET_ACTION(if (current_settings->current_options->log_level == 0) current_settings->current_options->log_level = LOG_LEVEL_ERROR),
++ CONFIG_SET_ACTION(loglevel, if (current_settings->current_options->log_level == 0) current_settings->current_options->log_level = LOG_LEVEL_ERROR),
+ NULL,
+ NULL,
+ "Tests the configuration as much as possible and reports any errors that can be discovered without actually accepting an incoming message."
+@@ -1436,7 +1570,7 @@ int prepare_settings(int argc, char *arg
+ { "header-blacklist-entry", required_argument, NULL, -1 },
+ { .string_value = NULL },
+ { .string_value = NULL },
+- { .get_string_array = ({ char ***access_string_array(struct option_set *current_options, int current_options_only) { return(current_options_only ? NULL :
¤t_options->container->blacklist_header); } &access_string_array; }) },
++ { .get_string_array = predef_access_string_array_blacklist_header },
+ { .max_strlen = 0 },
+ FILTER_DECISION_UNDECIDED,
+ FILTER_GRACE_NONE,
+@@ -1453,7 +1587,7 @@ int prepare_settings(int argc, char *arg
+ { "header-blacklist-file", required_argument, NULL, -1 },
+ { .string_value = NULL },
+ { .string_value = NULL },
+- { .get_string_array = ({ char ***access_string_array(struct option_set *current_options, int current_options_only) { return(current_options_only ? NULL :
¤t_options->container->blacklist_header_file); } &access_string_array; }) },
++ { .get_string_array = predef_access_string_array_blacklist_header_file },
+ { .max_strlen = 0 },
+ FILTER_DECISION_UNDECIDED,
+ FILTER_GRACE_NONE,
+@@ -1475,7 +1609,7 @@ int prepare_settings(int argc, char *arg
+ FILTER_DECISION_ERROR,
+ FILTER_GRACE_NONE,
+ NULL,
+- CONFIG_SET_ACTION(usage(current_settings, USAGE_LEVEL_BRIEF, NULL)),
++ CONFIG_SET_ACTION(usage_brief, usage(current_settings, USAGE_LEVEL_BRIEF, NULL)),
+ NULL,
+ NULL,
+ "Displays a (shorter) option summary and exits."
+@@ -1802,7 +1936,7 @@ int prepare_settings(int argc, char *arg
+ FILTER_DECISION_ERROR,
+ FILTER_GRACE_NONE,
+ NULL,
+- CONFIG_SET_ACTION(usage(current_settings, USAGE_LEVEL_LONG, NULL)),
++ CONFIG_SET_ACTION(usage_long, usage(current_settings, USAGE_LEVEL_LONG, NULL)),
+ NULL,
+ NULL,
+ "Displays this help screen and exits."
+@@ -1819,7 +1953,7 @@ int prepare_settings(int argc, char *arg
+ FILTER_DECISION_UNDECIDED,
+ FILTER_GRACE_NONE,
+ NULL,
+- CONFIG_SET_ACTION(current_settings->current_options->strlen_policy_location = (current_settings->current_options->policy_location != NULL) ?
strlen(current_settings->current_options->policy_location) : 0),
++ CONFIG_SET_ACTION(strlen_policy_location, current_settings->current_options->strlen_policy_location = (current_settings->current_options->policy_location != NULL) ?
strlen(current_settings->current_options->policy_location) : 0),
+ NULL,
+ "URL",
+ "Append URL to the rejection message to explain why the rejection occurred. NOTE: most servers hide rejection messages from their users and most users don't read bounce messages."
+@@ -1837,7 +1971,7 @@ int prepare_settings(int argc, char *arg
+ FILTER_DECISION_UNDECIDED,
+ FILTER_GRACE_NONE,
+ &config_test_cdb,
+- CONFIG_SET_ACTION(if (current_settings->current_options->relay_level == RELAY_LEVEL_UNSET) current_settings->current_options->relay_level = RELAY_LEVEL_NORMAL;),
++ CONFIG_SET_ACTION(relay_level_unset, if (current_settings->current_options->relay_level == RELAY_LEVEL_UNSET) current_settings->current_options->relay_level = RELAY_LEVEL_NORMAL;),
+ NULL,
+ "CDB",
+ "Search CDB to determine if mail for a domain is accepted here. NOTE: In order for recipient validation to work correctly, spamdyke needs to use the same input"
+@@ -1855,7 +1989,7 @@ int prepare_settings(int argc, char *arg
+ FILTER_DECISION_UNDECIDED,
+ FILTER_GRACE_NONE,
+ &config_test_qmail_option,
+- CONFIG_SET_ACTION(if (current_settings->current_options->relay_level == RELAY_LEVEL_UNSET) current_settings->current_options->relay_level = RELAY_LEVEL_NORMAL;),
++ CONFIG_SET_ACTION(relay_level_unset, if (current_settings->current_options->relay_level == RELAY_LEVEL_UNSET) current_settings->current_options->relay_level = RELAY_LEVEL_NORMAL;),
+ NULL,
+ "FILE",
+ "Search FILE to determine if mail for a domain is accepted here. NOTE: In order for recipient validation to work correctly, spamdyke needs to use the same input"
+@@ -2196,7 +2330,7 @@ int prepare_settings(int argc, char *arg
+ { "rejection-text-auth-failure", required_argument, NULL, -1 },
+ { .string_value = NULL },
+ { .string_value = NULL },
+- { .get_string = CONFIG_ACCESSOR_STRING(rejection_text[REJECTION_SMTP_AUTH_FAILURE]) },
++ { .get_string = CONFIG_ACCESSOR_STRING_ARRAY_MEMBER(rejection_text, REJECTION_SMTP_AUTH_FAILURE) },
+ { .max_strlen = 100 },
+ FILTER_DECISION_UNDECIDED,
+ FILTER_GRACE_NONE,
+@@ -2213,7 +2347,7 @@ int prepare_settings(int argc, char *arg
+ { "rejection-text-auth-unknown", required_argument, NULL, -1 },
+ { .string_value = NULL },
+ { .string_value = NULL },
+- { .get_string = CONFIG_ACCESSOR_STRING(rejection_text[REJECTION_SMTP_AUTH_UNKNOWN]) },
++ { .get_string = CONFIG_ACCESSOR_STRING_ARRAY_MEMBER(rejection_text, REJECTION_SMTP_AUTH_UNKNOWN) },
+ { .max_strlen = 100 },
+ FILTER_DECISION_UNDECIDED,
+ FILTER_GRACE_NONE,
+@@ -2231,7 +2365,7 @@ int prepare_settings(int argc, char *arg
+ { "rejection-text-dns-blacklist", required_argument, NULL, -1 },
+ { .string_value = NULL },
+ { .string_value = NULL },
+- { .get_string = CONFIG_ACCESSOR_STRING(rejection_text[REJECTION_RBL]) },
++ { .get_string = CONFIG_ACCESSOR_STRING_ARRAY_MEMBER(rejection_text, REJECTION_RBL) },
+ { .max_strlen = 100 },
+ FILTER_DECISION_UNDECIDED,
+ FILTER_GRACE_NONE,
+@@ -2249,7 +2383,7 @@ int prepare_settings(int argc, char *arg
+ { "rejection-text-earlytalker", required_argument, NULL, -1 },
+ { .string_value = NULL },
+ { .string_value = NULL },
+- { .get_string = CONFIG_ACCESSOR_STRING(rejection_text[REJECTION_EARLYTALKER]) },
++ { .get_string = CONFIG_ACCESSOR_STRING_ARRAY_MEMBER(rejection_text, REJECTION_EARLYTALKER) },
+ { .max_strlen = 100 },
+ FILTER_DECISION_UNDECIDED,
+ FILTER_GRACE_NONE,
Home |
Main Index |
Thread Index |
Old Index