X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fsrc%2Ffunctions.h;h=34767257961df792126690ed2c8354d0b143b9e8;hb=d6e35dd0017bc6f84aa7123fec76fcf507a04d01;hp=ba4760f7ac433a8fafcd0070e020d4ed5f0ef2f4;hpb=774ef2d7d0f7fffbfd114271b8567e36485898dc;p=exim.git diff --git a/src/src/functions.h b/src/src/functions.h index ba4760f7a..347672579 100644 --- a/src/src/functions.h +++ b/src/src/functions.h @@ -67,12 +67,10 @@ extern void tls_version_report(FILE *); extern BOOL tls_openssl_options_parse(uschar *, long *); # endif extern uschar * tls_field_from_dn(uschar *, uschar *); -# ifdef EXPERIMENTAL_CERTNAMES extern BOOL tls_is_name_for_cert(uschar *, void *); -# endif # ifdef EXPERIMENTAL_DANE -extern int tlsa_lookup(host_item *, dns_answer *, BOOL, BOOL *); +extern int tlsa_lookup(const host_item *, dns_answer *, BOOL, BOOL *); # endif #endif /*SUPPORT_TLS*/ @@ -146,10 +144,10 @@ extern BOOL dkim_transport_write_message(address_item *, int, int, extern dns_address *dns_address_from_rr(dns_answer *, dns_record *); extern void dns_build_reverse(uschar *, uschar *); extern void dns_init(BOOL, BOOL, BOOL); -extern int dns_basic_lookup(dns_answer *, uschar *, int); -extern BOOL dns_is_secure(dns_answer *); -extern int dns_lookup(dns_answer *, uschar *, int, uschar **); -extern int dns_special_lookup(dns_answer *, uschar *, int, uschar **); +extern int dns_basic_lookup(dns_answer *, const uschar *, int); +extern BOOL dns_is_secure(const dns_answer *); +extern int dns_lookup(dns_answer *, const uschar *, int, uschar **); +extern int dns_special_lookup(dns_answer *, const uschar *, int, uschar **); extern dns_record *dns_next_rr(dns_answer *, dns_scan *, int); extern uschar *dns_text_type(int); extern void dscp_list_to_stream(FILE *); @@ -158,13 +156,16 @@ extern BOOL dscp_lookup(const uschar *, int, int *, int *, int *); extern void enq_end(uschar *); extern BOOL enq_start(uschar *); #ifdef EXPERIMENTAL_EVENT -extern int event_raise(uschar *, uschar *, uschar *); +extern uschar *event_raise(uschar *, uschar *, uschar *); #endif extern void exim_exit(int); extern void exim_nullstd(void); extern void exim_setugid(uid_t, gid_t, BOOL, uschar *); extern int exim_tvcmp(struct timeval *, struct timeval *); extern void exim_wait_tick(struct timeval *, int); +extern int exp_bool(address_item *addr, + uschar *mtype, uschar *mname, unsigned dgb_opt, uschar *oname, BOOL bvalue, + uschar *svalue, BOOL *rvalue); extern BOOL expand_check_condition(uschar *, uschar *, uschar *); extern uschar *expand_string(uschar *); extern uschar *expand_string_copy(uschar *); @@ -203,7 +204,7 @@ extern int host_scan_for_local_hosts(host_item *, host_item **, BOOL *); extern void invert_address(uschar *, uschar *); extern int ip_bind(int, int, uschar *, int); -extern int ip_connect(int, int, uschar *, int, int); +extern int ip_connect(int, int, const uschar *, int, int); extern int ip_connectedsocket(int, const uschar *, int, int, int, host_item *, uschar **); extern int ip_get_address_family(int); @@ -224,8 +225,8 @@ extern int match_address_list(uschar *, BOOL, BOOL, uschar **, unsigned int *, int, int, uschar **); extern int match_check_list(uschar **, int, tree_node **, unsigned int **, int(*)(void *, uschar *, uschar **, uschar **), void *, int, - uschar *, uschar **); -extern int match_isinlist(uschar *, uschar **, int, tree_node **, + const uschar *, uschar **); +extern int match_isinlist(const uschar *, uschar **, int, tree_node **, unsigned int *, int, BOOL, uschar **); extern int match_check_string(uschar *, uschar *, int, BOOL, BOOL, BOOL, uschar **); @@ -302,7 +303,7 @@ extern void receive_swallow_smtp(void); #ifdef WITH_CONTENT_SCAN extern int regex(uschar **); #endif -extern BOOL regex_match_and_setup(const pcre *, uschar *, int, int); +extern BOOL regex_match_and_setup(const pcre *, const uschar *, int, int); extern const pcre *regex_must_compile(uschar *, BOOL, BOOL); extern void retry_add_item(address_item *, uschar *, int); extern BOOL retry_check_address(uschar *, host_item *, uschar *, BOOL, @@ -392,7 +393,7 @@ extern uschar *string_base62(unsigned long int); extern uschar *string_cat(uschar *, int *, int *, const uschar *, int); extern uschar *string_copy_dnsdomain(uschar *); extern uschar *string_copy_malloc(uschar *); -extern uschar *string_copylc(uschar *); +extern uschar *string_copylc(const uschar *); extern uschar *string_copynlc(uschar *, int); extern uschar *string_dequote(uschar **); extern BOOL string_format(uschar *, int, const char *, ...) ALMOST_PRINTF(3,4); @@ -449,6 +450,7 @@ extern int verify_check_headers(uschar **); extern int verify_check_header_names_ascii(uschar **); extern int verify_check_host(uschar **); extern int verify_check_notblind(void); +extern int verify_check_given_host(uschar **, host_item *); extern int verify_check_this_host(uschar **, unsigned int *, uschar*, uschar *, uschar **); extern address_item *verify_checked_sender(uschar *);