diff options
Diffstat (limited to 'smtpd/smtpd.h')
| -rw-r--r-- | smtpd/smtpd.h | 34 |
1 files changed, 1 insertions, 33 deletions
diff --git a/smtpd/smtpd.h b/smtpd/smtpd.h index 39f9e136..1456a5fc 100644 --- a/smtpd/smtpd.h +++ b/smtpd/smtpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: smtpd.h,v 1.534 2017/08/04 14:38:49 gilles Exp $ */ +/* $OpenBSD: smtpd.h,v 1.536 2017/09/08 16:51:22 eric Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org> @@ -46,8 +46,6 @@ #define MAX_HOPS_COUNT 100 #define DEFAULT_MAX_BODY_SIZE (35*1024*1024) -#define MAX_FILTER_NAME 32 -#define MAX_FILTER_ARGS 255 #define EXPAND_BUFFER 1024 @@ -325,7 +323,6 @@ enum smtp_proc_type { PROC_PONY, PROC_CA, - PROC_FILTER, PROC_CLIENT, }; @@ -635,11 +632,6 @@ struct smtpd { struct dict *sc_limits_dict; - struct dict sc_filters; - uint32_t filtermask; - - char sc_enqueue_filter[PATH_MAX]; - char *sc_tls_ciphers; char *sc_subaddressing_delim; @@ -685,16 +677,6 @@ struct deliver { struct userinfo userinfo; }; -#define MAX_FILTER_PER_CHAIN 16 -struct filter_conf { - int chain; - int done; - int argc; - char *name; - char *argv[MAX_FILTER_ARGS + 1]; - char *path; -}; - struct mta_host { SPLAY_ENTRY(mta_host) entry; struct sockaddr *sa; @@ -1200,18 +1182,6 @@ int expand_to_text(struct expand *, char *, size_t); RB_PROTOTYPE(expandtree, expandnode, nodes, expand_cmp); -/* filter.c */ -void filter_postfork(void); -void filter_configure(void); -void filter_connect(uint64_t, const struct sockaddr *, - const struct sockaddr *, const char *, const char *); -void filter_mailaddr(uint64_t, int, const struct mailaddr *); -void filter_line(uint64_t, int, const char *); -void filter_eom(uint64_t, int, size_t); -void filter_event(uint64_t, int); -void filter_build_fd_chain(uint64_t, int); - - /* forward.c */ int forwards_get(int, struct expand *); @@ -1395,8 +1365,6 @@ void smtp_collect(void); int smtp_session(struct listener *, int, const struct sockaddr_storage *, const char *); void smtp_session_imsg(struct mproc *, struct imsg *); -void smtp_filter_response(uint64_t, int, int, uint32_t, const char *); -void smtp_filter_fd(uint64_t, int); /* smtpf_session.c */ |