diff options
Diffstat (limited to 'usr.sbin/smtpd')
| -rw-r--r-- | usr.sbin/smtpd/aliases.c | 32 | ||||
| -rw-r--r-- | usr.sbin/smtpd/forward.c | 12 |
2 files changed, 18 insertions, 26 deletions
diff --git a/usr.sbin/smtpd/aliases.c b/usr.sbin/smtpd/aliases.c index af87edd5a0e..c0b2fcb0c31 100644 --- a/usr.sbin/smtpd/aliases.c +++ b/usr.sbin/smtpd/aliases.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aliases.c,v 1.30 2009/11/09 23:49:34 gilles Exp $ */ +/* $OpenBSD: aliases.c,v 1.31 2009/11/09 23:54:08 gilles Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> @@ -86,7 +86,7 @@ aliases_get(struct smtpd *env, objid_t mapid, struct expandtree *expandtree, cha struct alias alias; struct alias *nextalias; struct map *map; - struct expand_node *expnode; + struct expand_node expnode; map = map_find(env, mapid); if (map == NULL) @@ -124,11 +124,9 @@ aliases_get(struct smtpd *env, objid_t mapid, struct expandtree *expandtree, cha aliases_expand_include(expandtree, alias.u.filename); } else { - expnode = calloc(sizeof(struct expand_node), 1); - if (expnode == NULL) - fatal("aliases_get: calloc"); - alias_to_expand_node(expnode, &alias); - expandtree_increment_node(expandtree, expnode); + bzero(&expnode, sizeof(struct expand_node)); + alias_to_expand_node(&expnode, &alias); + expandtree_increment_node(expandtree, &expnode); } } while (--nbaliases); aliasesdb->close(aliasesdb); @@ -240,7 +238,7 @@ aliases_virtual_get(struct smtpd *env, objid_t mapid, struct alias *nextalias; struct map *map; char strkey[MAX_LINE_SIZE]; - struct expand_node *expnode; + struct expand_node expnode; map = map_find(env, mapid); if (map == NULL) @@ -299,11 +297,9 @@ aliases_virtual_get(struct smtpd *env, objid_t mapid, aliases_expand_include(expandtree, alias.u.filename); } else { - expnode = calloc(sizeof(struct expand_node), 1); - if (expnode== NULL) - fatal("aliases_virtual_get: calloc"); - alias_to_expand_node(expnode, &alias); - expandtree_increment_node(expandtree, expnode); + bzero(&expnode, sizeof(struct expand_node)); + alias_to_expand_node(&expnode, &alias); + expandtree_increment_node(expandtree, &expnode); } } while (--nbaliases); aliasesdb->close(aliasesdb); @@ -319,7 +315,7 @@ aliases_expand_include(struct expandtree *expandtree, char *filename) size_t lineno = 0; char delim[] = { '\\', '#' }; struct alias alias; - struct expand_node *expnode; + struct expand_node expnode; fp = fopen(filename, "r"); if (fp == NULL) { @@ -340,11 +336,9 @@ aliases_expand_include(struct expandtree *expandtree, char *filename) log_warnx("nested inclusion is not supported."); } else { - expnode = calloc(sizeof(struct expand_node), 1); - if (expnode== NULL) - fatal("aliases_virtual_get: calloc"); - alias_to_expand_node(expnode, &alias); - expandtree_increment_node(expandtree, expnode); + bzero(&expnode, sizeof(struct expand_node)); + alias_to_expand_node(&expnode, &alias); + expandtree_increment_node(expandtree, &expnode); } free(line); diff --git a/usr.sbin/smtpd/forward.c b/usr.sbin/smtpd/forward.c index 84d05c87efe..f94a6921340 100644 --- a/usr.sbin/smtpd/forward.c +++ b/usr.sbin/smtpd/forward.c @@ -1,4 +1,4 @@ -/* $OpenBSD: forward.c,v 1.19 2009/11/09 23:49:34 gilles Exp $ */ +/* $OpenBSD: forward.c,v 1.20 2009/11/09 23:54:08 gilles Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> @@ -43,7 +43,7 @@ forwards_get(int fd, struct expandtree *expandtree) size_t len; size_t nbaliases = 0; int quoted; - struct expand_node *expnode; + struct expand_node expnode; fp = fdopen(fd, "r"); if (fp == NULL) @@ -95,11 +95,9 @@ forwards_get(int fd, struct expandtree *expandtree) continue; } - expnode = calloc(sizeof(struct expand_node), 1); - if (expnode == NULL) - fatal("calloc"); - alias_to_expand_node(expnode, &alias); - expandtree_increment_node(expandtree, expnode); + bzero(&expnode, sizeof(struct expand_node)); + alias_to_expand_node(&expnode, &alias); + expandtree_increment_node(expandtree, &expnode); nbaliases++; } while (*cp != '\0'); } |