diff options
Diffstat (limited to 'usr.sbin/smtpd')
| -rw-r--r-- | usr.sbin/smtpd/config.c | 7 | ||||
| -rw-r--r-- | usr.sbin/smtpd/parse.y | 3 | ||||
| -rw-r--r-- | usr.sbin/smtpd/smtpd.h | 3 |
3 files changed, 3 insertions, 10 deletions
diff --git a/usr.sbin/smtpd/config.c b/usr.sbin/smtpd/config.c index 577b09c992e..7cdb79def4d 100644 --- a/usr.sbin/smtpd/config.c +++ b/usr.sbin/smtpd/config.c @@ -1,4 +1,4 @@ -/* $OpenBSD: config.c,v 1.10 2010/04/20 15:34:56 jacekm Exp $ */ +/* $OpenBSD: config.c,v 1.11 2010/05/27 11:17:29 gilles Exp $ */ /* * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -59,7 +59,6 @@ purge_config(struct smtpd *env, u_int8_t what) struct map *m; struct rule *r; struct cond *c; - struct opt *o; struct ssl *s; struct mapel *me; @@ -90,10 +89,6 @@ purge_config(struct smtpd *env, u_int8_t what) TAILQ_REMOVE(&r->r_conditions, c, c_entry); free(c); } - while ((o = TAILQ_FIRST(&r->r_options)) != NULL) { - TAILQ_REMOVE(&r->r_options, o, o_entry); - free(o); - } free(r); } free(env->sc_rules); diff --git a/usr.sbin/smtpd/parse.y b/usr.sbin/smtpd/parse.y index 81df82cc22f..64b94fd28d3 100644 --- a/usr.sbin/smtpd/parse.y +++ b/usr.sbin/smtpd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.57 2010/05/19 20:57:10 gilles Exp $ */ +/* $OpenBSD: parse.y,v 1.58 2010/05/27 11:17:29 gilles Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> @@ -980,7 +980,6 @@ rule : decision on from { free($2); TAILQ_INIT(&rule->r_conditions); - TAILQ_INIT(&rule->r_options); } FOR conditions action tag { TAILQ_INSERT_TAIL(conf->sc_rules, rule, r_entry); diff --git a/usr.sbin/smtpd/smtpd.h b/usr.sbin/smtpd/smtpd.h index a818d43cb70..0b82b0fb827 100644 --- a/usr.sbin/smtpd/smtpd.h +++ b/usr.sbin/smtpd/smtpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: smtpd.h,v 1.182 2010/04/27 10:17:53 gilles Exp $ */ +/* $OpenBSD: smtpd.h,v 1.183 2010/05/27 11:17:29 gilles Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> @@ -348,7 +348,6 @@ struct rule { #define MAXCOMMANDLEN 256 char command[MAXCOMMANDLEN]; } r_value; - TAILQ_HEAD(optlist, opt) r_options; char *r_user; objid_t r_amap; |