summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorGilles Chehade <gilles@cvs.openbsd.org>2009-01-29 15:40:36 +0000
committerGilles Chehade <gilles@cvs.openbsd.org>2009-01-29 15:40:36 +0000
commit2a64b6e53581700c02b15ff2cf5e38f46d94ceab (patch)
tree687ea708ca0f29e3c16c6fdbce5f53471737e98f /usr.sbin
parent58f230fcb0be6bf85c48fdb952c363f4faa83ade (diff)
missing prototype for session_respond() in mta, move session_respond()'s
prototype to smtpd.h spotted and diff from Oleg Safiullin <form@pdp-11.org.ru>
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/smtpd/mta.c5
-rw-r--r--usr.sbin/smtpd/smtp_session.c4
-rw-r--r--usr.sbin/smtpd/smtpd.h5
3 files changed, 6 insertions, 8 deletions
diff --git a/usr.sbin/smtpd/mta.c b/usr.sbin/smtpd/mta.c
index db5c089a73e..4d9e6b51973 100644
--- a/usr.sbin/smtpd/mta.c
+++ b/usr.sbin/smtpd/mta.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mta.c,v 1.25 2009/01/29 15:20:34 gilles Exp $ */
+/* $OpenBSD: mta.c,v 1.26 2009/01/29 15:40:34 gilles Exp $ */
/*
* Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -54,9 +54,6 @@ void mta_error_handler(struct bufferevent *, short, void *);
int mta_reply_handler(struct bufferevent *, void *);
void mta_batch_update_queue(struct batch *);
void mta_expand_mxarray(struct session *);
-void session_respond(struct session *, char *, ...)
- __attribute__ ((format (printf, 2, 3)));
-
void ssl_client_init(struct session *);
void
diff --git a/usr.sbin/smtpd/smtp_session.c b/usr.sbin/smtpd/smtp_session.c
index 63fcd333105..3e6e5fdf0f2 100644
--- a/usr.sbin/smtpd/smtp_session.c
+++ b/usr.sbin/smtpd/smtp_session.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: smtp_session.c,v 1.45 2009/01/29 15:27:34 gilles Exp $ */
+/* $OpenBSD: smtp_session.c,v 1.46 2009/01/29 15:40:35 gilles Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org>
@@ -71,8 +71,6 @@ void session_msg_submit(struct session *);
void session_command(struct session *, char *, char *);
int session_set_path(struct path *, char *);
void session_timeout(int, short, void *);
-void session_respond(struct session *, char *, ...)
- __attribute__ ((format (printf, 2, 3)));
void session_cleanup(struct session *);
struct session_timeout {
diff --git a/usr.sbin/smtpd/smtpd.h b/usr.sbin/smtpd/smtpd.h
index 0199cbbfc1e..a1a49696ace 100644
--- a/usr.sbin/smtpd/smtpd.h
+++ b/usr.sbin/smtpd/smtpd.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: smtpd.h,v 1.60 2009/01/29 15:20:34 gilles Exp $ */
+/* $OpenBSD: smtpd.h,v 1.61 2009/01/29 15:40:35 gilles Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org>
@@ -795,6 +795,9 @@ void session_init(struct listener *, struct session *);
int session_cmp(struct session *, struct session *);
void session_pickup(struct session *, struct submit_status *);
void session_destroy(struct session *);
+void session_respond(struct session *, char *, ...)
+ __attribute__ ((format (printf, 2, 3)));
+
SPLAY_PROTOTYPE(sessiontree, session, s_nodes, session_cmp);
/* store.c */