summaryrefslogtreecommitdiff
path: root/usr.sbin/smtpd
diff options
context:
space:
mode:
Diffstat (limited to 'usr.sbin/smtpd')
-rw-r--r--usr.sbin/smtpd/Makefile4
-rw-r--r--usr.sbin/smtpd/parse.y23
-rw-r--r--usr.sbin/smtpd/queue.c5
-rw-r--r--usr.sbin/smtpd/smtp_session.c4
-rw-r--r--usr.sbin/smtpd/smtpd.c4
-rw-r--r--usr.sbin/smtpd/smtpd.h18
-rw-r--r--usr.sbin/smtpd/ssl_privsep.c14
7 files changed, 35 insertions, 37 deletions
diff --git a/usr.sbin/smtpd/Makefile b/usr.sbin/smtpd/Makefile
index b59093c6236..0d4de3c3cd9 100644
--- a/usr.sbin/smtpd/Makefile
+++ b/usr.sbin/smtpd/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.1 2008/11/01 21:35:28 gilles Exp $
+# $OpenBSD: Makefile,v 1.2 2008/11/10 17:24:24 deraadt Exp $
PROG= smtpd
-SRCS= parse.y atomic.c log.c config.c buffer.c imsg.c \
+SRCS= parse.y atomic.c log.c config.c buffer.c imsg.c \
smtpd.c lka.c mfa.c queue.c mta.c mda.c control.c \
smtp.c smtp_session.c store.c debug.c \
ssl.c ssl_privsep.c dns.c aliases.c forward.c \
diff --git a/usr.sbin/smtpd/parse.y b/usr.sbin/smtpd/parse.y
index 3e50fde4e00..d8a1b7cb55a 100644
--- a/usr.sbin/smtpd/parse.y
+++ b/usr.sbin/smtpd/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.6 2008/11/10 02:13:40 gilles Exp $ */
+/* $OpenBSD: parse.y,v 1.7 2008/11/10 17:24:24 deraadt Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org>
@@ -45,7 +45,7 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-
+
#include "smtpd.h"
TAILQ_HEAD(files, file) files = TAILQ_HEAD_INITIALIZER(files);
@@ -184,9 +184,8 @@ interval : NUMBER quantifier {
$$.tv_usec = 0;
$$.tv_sec = $1 * $2;
}
-
-port : PORT STRING {
+port : PORT STRING {
struct servent *servent;
servent = getservbyname($2, "tcp");
@@ -198,7 +197,7 @@ port : PORT STRING {
$$ = servent->s_port;
free($2);
}
- | PORT NUMBER {
+ | PORT NUMBER {
if ($2 <= 0 || $2 >= (int)USHRT_MAX) {
yyerror("invalid port: %d", $2);
YYERROR;
@@ -222,7 +221,7 @@ ssmtp : SSMTP { $$ = 1; }
| /* empty */ { $$ = 0; }
;
-main : QUEUE INTERVAL interval {
+main : QUEUE INTERVAL interval {
conf->sc_qintval = $3;
}
| ssmtp LISTEN ON STRING port certname {
@@ -257,7 +256,7 @@ main : QUEUE INTERVAL interval {
if (host($4, &conf->sc_listeners,
MAX_LISTEN, $5, flags) <= 0) {
- yyerror("invalid virtual ip: %s", $4);
+ yyerror("invalid virtual ip: %s", $4);
free($6);
free($4);
YYERROR;
@@ -284,7 +283,7 @@ maptype : SINGLE { map->m_type = T_SINGLE; }
mapsource : DNS { map->m_src = S_DNS; }
| TFILE { map->m_src = S_FILE; }
- | DB STRING {
+ | DB STRING {
map->m_src = S_DB;
if (strlcpy(map->m_config, $2, MAXPATHLEN)
>= MAXPATHLEN)
@@ -352,7 +351,7 @@ keyval : STRING ARROW STRING {
if ((me = calloc(1, sizeof(*me))) == NULL)
fatal("out of memory");
-
+
if (strlcpy(me->me_key.med_string, $1,
sizeof(me->me_key.med_string)) >=
sizeof(me->me_key.med_string) ||
@@ -516,7 +515,7 @@ mapref : STRING {
TAILQ_INSERT_TAIL(conf->sc_maps, m, m_entry);
$$ = m->m_id;
}
- | '(' {
+ | '(' {
struct map *m;
int spret;
@@ -543,7 +542,7 @@ mapref : STRING {
TAILQ_INSERT_TAIL(conf->sc_maps, map, m_entry);
$$ = map->m_id;
}
- | '{' {
+ | '{' {
struct map *m;
int spret;
@@ -674,7 +673,7 @@ from : FROM mapref {
struct sockaddr_in *ssin;
struct sockaddr_in6 *ssin6;
int spret;
-
+
if ((m = calloc(1, sizeof(*m))) == NULL)
fatal("out of memory");
m->m_id = last_map_id++;
diff --git a/usr.sbin/smtpd/queue.c b/usr.sbin/smtpd/queue.c
index c7e999739e4..e6ee6c38f29 100644
--- a/usr.sbin/smtpd/queue.c
+++ b/usr.sbin/smtpd/queue.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: queue.c,v 1.5 2008/11/10 03:16:02 gilles Exp $ */
+/* $OpenBSD: queue.c,v 1.6 2008/11/10 17:24:24 deraadt Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org>
@@ -815,7 +815,6 @@ queue_record_submission(struct message *message)
}
spoolsz = strlen(spool);
-
spret = snprintf(pathname, MAXPATHLEN, "%s/%s", PATH_MESSAGES,
message->message_id);
if (spret == -1 || spret >= MAXPATHLEN)
@@ -1199,7 +1198,7 @@ queue_record_daemon(struct message *message)
fclose(fp);
break;
}
-
+
return 1;
}
diff --git a/usr.sbin/smtpd/smtp_session.c b/usr.sbin/smtpd/smtp_session.c
index 616d9742406..10879a0edc2 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.2 2008/11/05 12:14:45 sobrado Exp $ */
+/* $OpenBSD: smtp_session.c,v 1.3 2008/11/10 17:24:24 deraadt Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org>
@@ -168,7 +168,7 @@ session_rfc4954_auth_handler(struct session *s, char *args)
}
req.session_id = s->s_id;
- if (strlcpy(req.buffer, eom, sizeof(req.buffer)) >=
+ if (strlcpy(req.buffer, eom, sizeof(req.buffer)) >=
sizeof(req.buffer)) {
evbuffer_add_printf(s->s_bev->output,
"501 Syntax error\r\n");
diff --git a/usr.sbin/smtpd/smtpd.c b/usr.sbin/smtpd/smtpd.c
index fbf33417620..16cbd5cc4cb 100644
--- a/usr.sbin/smtpd/smtpd.c
+++ b/usr.sbin/smtpd/smtpd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: smtpd.c,v 1.5 2008/11/10 03:41:53 gilles Exp $ */
+/* $OpenBSD: smtpd.c,v 1.6 2008/11/10 17:24:24 deraadt Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org>
@@ -472,7 +472,7 @@ parent_sig_handler(int sig, short event, void *p)
}
} while (pid > 0 || (pid == -1 && errno == EINTR));
- /**/
+ /**/
break;
default:
fatalx("unexpected signal");
diff --git a/usr.sbin/smtpd/smtpd.h b/usr.sbin/smtpd/smtpd.h
index 47db0295ccb..da87fefff86 100644
--- a/usr.sbin/smtpd/smtpd.h
+++ b/usr.sbin/smtpd/smtpd.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: smtpd.h,v 1.3 2008/11/10 00:22:05 gilles Exp $ */
+/* $OpenBSD: smtpd.h,v 1.4 2008/11/10 17:24:24 deraadt Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org>
@@ -403,13 +403,13 @@ enum message_flags {
F_MESSAGE_COMPLETE = 0x1,
F_MESSAGE_RESOLVED = 0x2,
F_MESSAGE_READY = 0x4,
- F_MESSAGE_EXPIRED = 0x8,
+ F_MESSAGE_EXPIRED = 0x8,
F_MESSAGE_PROCESSING = 0x10
};
struct message {
SPLAY_ENTRY(message) nodes;
- TAILQ_ENTRY(message) entry;
+ TAILQ_ENTRY(message) entry;
enum message_type type;
@@ -471,11 +471,11 @@ struct mdaproc {
};
struct batch {
- SPLAY_ENTRY(batch) b_nodes;
+ SPLAY_ENTRY(batch) b_nodes;
- u_int64_t id;
+ u_int64_t id;
enum batch_type type;
- enum batch_flags flags;
+ enum batch_flags flags;
struct rule rule;
@@ -588,8 +588,8 @@ struct session {
};
struct smtpd {
-#define SMTPD_OPT_VERBOSE 0x00000001
-#define SMTPD_OPT_NOACTION 0x00000002
+#define SMTPD_OPT_VERBOSE 0x00000001
+#define SMTPD_OPT_NOACTION 0x00000002
u_int32_t sc_opts;
#define SMTPD_CONFIGURING 0x00000001
#define SMTPD_EXITING 0x00000002
@@ -696,7 +696,7 @@ pid_t smtp(struct smtpd *);
void smtp_listener_setup(struct smtpd *, struct listener *);
/* smtp_session.c */
-void session_init(struct listener *, struct session *);
+void session_init(struct listener *, struct session *);
void session_read(struct bufferevent *, void *);
void session_write(struct bufferevent *, void *);
void session_error(struct bufferevent *, short, void *);
diff --git a/usr.sbin/smtpd/ssl_privsep.c b/usr.sbin/smtpd/ssl_privsep.c
index e2f90b794fa..bb52c1dd644 100644
--- a/usr.sbin/smtpd/ssl_privsep.c
+++ b/usr.sbin/smtpd/ssl_privsep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_privsep.c,v 1.1 2008/11/01 21:35:28 gilles Exp $ */
+/* $OpenBSD: ssl_privsep.c,v 1.2 2008/11/10 17:24:24 deraadt Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
@@ -6,21 +6,21 @@
* This package is an SSL implementation written
* by Eric Young (eay@cryptsoft.com).
* The implementation was written so as to conform with Netscapes SSL.
- *
+ *
* This library is free for commercial and non-commercial use as long as
* the following conditions are aheared to. The following conditions
* apply to all code found in this distribution, be it the RC4, RSA,
* lhash, DES, etc., code; not just the SSL code. The SSL documentation
* included with this distribution is covered by the same copyright terms
* except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
+ *
* Copyright remains Eric Young's, and as such any Copyright notices in
* the code are not to be removed.
* If this package is used in a product, Eric Young should be given attribution
* as the author of the parts of the library used.
* This can be in the form of a textual message at program startup or
* in documentation (online or textual) provided with the package.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@@ -35,10 +35,10 @@
* Eric Young (eay@cryptsoft.com)"
* The word 'cryptographic' can be left out if the rouines from the library
* being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
+ * 4. If you include any Windows specific code (or a derivative thereof) from
* the apps directory (application code) you must include an acknowledgement:
* "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
+ *
* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -50,7 +50,7 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
- *
+ *
* The licence and distribution terms for any publically available version or
* derivative of this code cannot be changed. i.e. this code cannot simply be
* copied and put under another distribution licence
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-11 09:31:22 +0000