summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoreric <eric@openbsd.org>2011-05-09 09:36:55 +0000
committereric <eric@openbsd.org>2011-05-09 09:36:55 +0000
commit05b93c6ea76cac659b9fea0b4c6df72c6a0f6396 (patch)
tree7ad0d9c411d5bd680bf2416ece066d2a39d56868
parentAdd signature read/write functions for i386 hibernate. (diff)
downloadwireguard-openbsd-05b93c6ea76cac659b9fea0b4c6df72c6a0f6396.tar.xz
wireguard-openbsd-05b93c6ea76cac659b9fea0b4c6df72c6a0f6396.zip
fix segfault in newaliases after global env move.
spotted by Christopher Zimmermann ok gilles@
-rw-r--r--usr.sbin/smtpd/makemap.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/usr.sbin/smtpd/makemap.c b/usr.sbin/smtpd/makemap.c
index b8d92d1a7fb..31ab5f994c5 100644
--- a/usr.sbin/smtpd/makemap.c
+++ b/usr.sbin/smtpd/makemap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: makemap.c,v 1.30 2011/05/01 12:57:11 eric Exp $ */
+/* $OpenBSD: makemap.c,v 1.31 2011/05/09 09:36:55 eric Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org>
@@ -388,12 +388,11 @@ error:
char *
conf_aliases(char *cfgpath)
{
- struct smtpd smtpd;
struct map *map;
char *path;
char *p;
- if (parse_config(&smtpd, cfgpath, 0))
+ if (parse_config(env, cfgpath, 0))
exit(1);
map = map_findbyname("aliases");