summaryrefslogtreecommitdiff
path: root/usr.sbin/smtpd
diff options
context:
space:
mode:
authorGilles Chehade <gilles@cvs.openbsd.org>2008-12-05 17:31:55 +0000
committerGilles Chehade <gilles@cvs.openbsd.org>2008-12-05 17:31:55 +0000
commit710b5024c22d537804189cc634d9a2104032d24c (patch)
tree1a32955d5529f6bb67dbe9b09f0fc8e1b040a3aa /usr.sbin/smtpd
parenta825464e16b64e43fda636611c9e4e335864c063 (diff)
- err -> fatal(), old diff from Jacek Masiulaniec <jacekm@dobremiasto.net>
Diffstat (limited to 'usr.sbin/smtpd')
-rw-r--r--usr.sbin/smtpd/aliases.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/usr.sbin/smtpd/aliases.c b/usr.sbin/smtpd/aliases.c
index ff086bb452a..e5a783a8767 100644
--- a/usr.sbin/smtpd/aliases.c
+++ b/usr.sbin/smtpd/aliases.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aliases.c,v 1.7 2008/11/25 23:01:00 gilles Exp $ */
+/* $OpenBSD: aliases.c,v 1.8 2008/12/05 17:31:54 gilles Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org>
@@ -24,7 +24,6 @@
#include <ctype.h>
#include <db.h>
-#include <err.h>
#include <errno.h>
#include <event.h>
#include <fcntl.h>
@@ -132,7 +131,7 @@ aliases_get(struct smtpd *env, struct aliaseslist *aliases, char *username)
else {
aliasp = calloc(1, sizeof(struct alias));
if (aliasp == NULL)
- err(1, "calloc");
+ fatal("aliases_get: calloc");
*aliasp = alias;
TAILQ_INSERT_HEAD(aliases, aliasp, entry);
}
@@ -266,7 +265,7 @@ aliases_virtual_get(struct smtpd *env, struct aliaseslist *aliases,
else {
aliasp = calloc(1, sizeof(struct alias));
if (aliasp == NULL)
- err(1, "calloc");
+ fatal("aliases_virtual_get: calloc");
*aliasp = alias;
TAILQ_INSERT_HEAD(aliases, aliasp, entry);
}
@@ -307,7 +306,7 @@ aliases_expand_include(struct aliaseslist *aliases, char *filename)
else {
aliasp = calloc(1, sizeof(struct alias));
if (aliasp == NULL)
- err(1, "calloc");
+ fatal("aliases_expand_include: calloc");
*aliasp = alias;
TAILQ_INSERT_TAIL(aliases, aliasp, entry);
}