diff options
| author | Eric Faurot <eric@cvs.openbsd.org> | 2013-05-24 17:03:15 +0000 |
|---|---|---|
| committer | Eric Faurot <eric@cvs.openbsd.org> | 2013-05-24 17:03:15 +0000 |
| commit | 2e9aedcac52e52c6811fcb9385c3afed4d9521c3 (patch) | |
| tree | 841da5f86ad60262c3d85a52a96599096a7d9a94 /usr.sbin/smtpd/config.c | |
| parent | 4c1642b4756fcf57a9dd4b45a0aa37feee1230a9 (diff) | |
sync with OpenSMTPD 5.3.2
ok gilles@
Diffstat (limited to 'usr.sbin/smtpd/config.c')
| -rw-r--r-- | usr.sbin/smtpd/config.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/usr.sbin/smtpd/config.c b/usr.sbin/smtpd/config.c index e553c5bef96..c647a479b69 100644 --- a/usr.sbin/smtpd/config.c +++ b/usr.sbin/smtpd/config.c @@ -1,4 +1,4 @@ -/* $OpenBSD: config.c,v 1.19 2013/01/26 09:37:23 gilles Exp $ */ +/* $OpenBSD: config.c,v 1.20 2013/05/24 17:03:14 eric Exp $ */ /* * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -19,7 +19,6 @@ #include <sys/types.h> #include <sys/queue.h> #include <sys/tree.h> -#include <sys/param.h> #include <sys/socket.h> #include <event.h> @@ -54,12 +53,10 @@ purge_config(uint8_t what) env->sc_listeners = NULL; } if (what & PURGE_TABLES) { - while (tree_root(env->sc_tables_tree, NULL, (void **)&t)) + while (dict_root(env->sc_tables_dict, NULL, (void **)&t)) table_destroy(t); free(env->sc_tables_dict); - free(env->sc_tables_tree); env->sc_tables_dict = NULL; - env->sc_tables_tree = NULL; } if (what & PURGE_RULES) { while ((r = TAILQ_FIRST(env->sc_rules)) != NULL) { |