diff options
| -rw-r--r-- | usr.sbin/smtpd/lka.c | 24 | ||||
| -rw-r--r-- | usr.sbin/smtpd/smtpd.h | 4 |
2 files changed, 12 insertions, 16 deletions
diff --git a/usr.sbin/smtpd/lka.c b/usr.sbin/smtpd/lka.c index 74a91ace74b..b0aabe17c18 100644 --- a/usr.sbin/smtpd/lka.c +++ b/usr.sbin/smtpd/lka.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lka.c,v 1.76 2009/11/03 22:57:41 gilles Exp $ */ +/* $OpenBSD: lka.c,v 1.77 2009/11/05 10:27:24 gilles Exp $ */ /* * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -51,24 +51,18 @@ void lka_dispatch_runner(int, short, void *); void lka_dispatch_mta(int, short, void *); void lka_setup_events(struct smtpd *); void lka_disable_events(struct smtpd *); -int lka_verify_mail(struct smtpd *, struct path *); -int lka_forward_file(struct passwd *); -size_t lka_expand(char *, size_t, struct path *); +void lka_expand_rcpt(struct smtpd *, struct aliaseslist *, struct lkasession *); int lka_resolve_alias(struct smtpd *, char *tag, struct path *, struct alias *); -int lka_parse_include(char *); -int lka_check_source(struct smtpd *, struct map *, struct sockaddr_storage *); -int lka_match_mask(struct sockaddr_storage *, struct netaddr *); +int lka_verify_mail(struct smtpd *, struct path *); +struct rule *ruleset_match(struct smtpd *, char *, struct path *, struct sockaddr_storage *); int lka_resolve_path(struct smtpd *, struct path *); -void lka_expand_rcpt(struct smtpd *, struct aliaseslist *, struct lkasession *); -int lka_expand_rcpt_iteration(struct smtpd *, struct aliaseslist *, struct lkasession *); -void lka_rcpt_action(struct smtpd *, char *, struct path *); -void lka_clear_aliaseslist(struct aliaseslist *); -int lka_encode_credentials(char *, size_t, char *); struct lkasession *lka_session_init(struct smtpd *, struct submit_status *); void lka_request_forwardfile(struct smtpd *, struct lkasession *, char *); -struct rule *ruleset_match(struct smtpd *, char *, struct path *, struct sockaddr_storage *); -void queue_submit_envelope(struct smtpd *, struct message *); -void queue_commit_envelopes(struct smtpd *, struct message*); +void lka_clear_aliaseslist(struct aliaseslist *); +int lka_encode_credentials(char *, size_t, char *); +size_t lka_expand(char *, size_t, struct path *); +void lka_rcpt_action(struct smtpd *, char *, struct path *); +int lka_expand_rcpt_iteration(struct smtpd *, struct aliaseslist *, struct lkasession *); void lka_sig_handler(int sig, short event, void *p) diff --git a/usr.sbin/smtpd/smtpd.h b/usr.sbin/smtpd/smtpd.h index d84af1cbd63..6a220a84ad4 100644 --- a/usr.sbin/smtpd/smtpd.h +++ b/usr.sbin/smtpd/smtpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: smtpd.h,v 1.152 2009/11/03 22:57:41 gilles Exp $ */ +/* $OpenBSD: smtpd.h,v 1.153 2009/11/05 10:27:24 gilles Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> @@ -837,6 +837,8 @@ u_int64_t queue_generate_id(void); int queue_load_envelope(struct message *, char *); int queue_update_envelope(struct message *); int queue_remove_envelope(struct message *); +void queue_submit_envelope(struct smtpd *, struct message *); +void queue_commit_envelopes(struct smtpd *, struct message*); int batch_cmp(struct batch *, struct batch *); struct batch *batch_by_id(struct smtpd *, u_int64_t); u_int16_t queue_hash(char *); |