summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre-Yves Ritschard <pyr@cvs.openbsd.org>2007-05-31 18:58:10 +0000
committerPierre-Yves Ritschard <pyr@cvs.openbsd.org>2007-05-31 18:58:10 +0000
commit0ffb416dc97b3a9e9fb8f417075d38b9a49ec1c4 (patch)
treed6726f30ed05c8216668711d3a382d6aac877cf9
parentbf3466842677cb5ecdeab18104da1db27310a07c (diff)
do not forget to store table and backup table ids in the service
configuration struct.
-rw-r--r--usr.sbin/hoststated/parse.y4
-rw-r--r--usr.sbin/relayd/parse.y4
2 files changed, 6 insertions, 2 deletions
diff --git a/usr.sbin/hoststated/parse.y b/usr.sbin/hoststated/parse.y
index d8e83e9a49e..637b76175ed 100644
--- a/usr.sbin/hoststated/parse.y
+++ b/usr.sbin/hoststated/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.48 2007/05/31 18:20:03 pyr Exp $ */
+/* $OpenBSD: parse.y,v 1.49 2007/05/31 18:58:09 pyr Exp $ */
/*
* Copyright (c) 2006 Pierre-Yves Ritschard <pyr@spootnik.org>
@@ -334,6 +334,7 @@ serviceoptsl : TABLE STRING dstport {
free($2);
service->table = tb;
+ service->conf.table_id = tb->conf.id;
service->table->conf.serviceid = service->conf.id;
service->table->conf.flags |= F_USED;
}
@@ -357,6 +358,7 @@ serviceoptsl : TABLE STRING dstport {
free($3);
service->backup = tb;
+ service->conf.backup_id = tb->conf.id;
service->backup->conf.serviceid = service->conf.id;
service->backup->conf.flags |= (F_USED|F_BACKUP);
}
diff --git a/usr.sbin/relayd/parse.y b/usr.sbin/relayd/parse.y
index d8e83e9a49e..637b76175ed 100644
--- a/usr.sbin/relayd/parse.y
+++ b/usr.sbin/relayd/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.48 2007/05/31 18:20:03 pyr Exp $ */
+/* $OpenBSD: parse.y,v 1.49 2007/05/31 18:58:09 pyr Exp $ */
/*
* Copyright (c) 2006 Pierre-Yves Ritschard <pyr@spootnik.org>
@@ -334,6 +334,7 @@ serviceoptsl : TABLE STRING dstport {
free($2);
service->table = tb;
+ service->conf.table_id = tb->conf.id;
service->table->conf.serviceid = service->conf.id;
service->table->conf.flags |= F_USED;
}
@@ -357,6 +358,7 @@ serviceoptsl : TABLE STRING dstport {
free($3);
service->backup = tb;
+ service->conf.backup_id = tb->conf.id;
service->backup->conf.serviceid = service->conf.id;
service->backup->conf.flags |= (F_USED|F_BACKUP);
}