summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorPierre-Yves Ritschard <pyr@cvs.openbsd.org>2007-11-13 10:35:22 +0000
committerPierre-Yves Ritschard <pyr@cvs.openbsd.org>2007-11-13 10:35:22 +0000
commit30da82e4b05ad7a6ec21d199bd63955f7db3dc95 (patch)
treefad0ecb1849e2bc38e1dec452ee80dfdefb85e4c /usr.sbin
parentf94920e49ad571a609fef2dbbb9950f8d7977410 (diff)
relays are dynamic now.
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/hoststated/hoststated.c4
-rw-r--r--usr.sbin/relayd/relayd.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/hoststated/hoststated.c b/usr.sbin/hoststated/hoststated.c
index 4cc84a7f29f..e8fbc97404a 100644
--- a/usr.sbin/hoststated/hoststated.c
+++ b/usr.sbin/hoststated/hoststated.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hoststated.c,v 1.47 2007/11/04 22:09:02 reyk Exp $ */
+/* $OpenBSD: hoststated.c,v 1.48 2007/11/13 10:35:21 pyr Exp $ */
/*
* Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -473,7 +473,7 @@ purge_config(struct hoststated *env, u_int8_t what)
env->services = NULL;
}
- if (what & PURGE_RELAYS) {
+ if (what & PURGE_RELAYS && env->relays != NULL) {
while ((rly = TAILQ_FIRST(env->relays)) != NULL) {
TAILQ_REMOVE(env->relays, rly, entry);
while ((sess = SPLAY_ROOT(&rly->sessions)) != NULL) {
diff --git a/usr.sbin/relayd/relayd.c b/usr.sbin/relayd/relayd.c
index 6bba36e5200..a5b35ee1aec 100644
--- a/usr.sbin/relayd/relayd.c
+++ b/usr.sbin/relayd/relayd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: relayd.c,v 1.47 2007/11/04 22:09:02 reyk Exp $ */
+/* $OpenBSD: relayd.c,v 1.48 2007/11/13 10:35:21 pyr Exp $ */
/*
* Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -473,7 +473,7 @@ purge_config(struct hoststated *env, u_int8_t what)
env->services = NULL;
}
- if (what & PURGE_RELAYS) {
+ if (what & PURGE_RELAYS && env->relays != NULL) {
while ((rly = TAILQ_FIRST(env->relays)) != NULL) {
TAILQ_REMOVE(env->relays, rly, entry);
while ((sess = SPLAY_ROOT(&rly->sessions)) != NULL) {