diff options
| author | Pierre-Yves Ritschard <pyr@cvs.openbsd.org> | 2007-05-28 17:37:17 +0000 |
|---|---|---|
| committer | Pierre-Yves Ritschard <pyr@cvs.openbsd.org> | 2007-05-28 17:37:17 +0000 |
| commit | 981c05949e01fe35ac86359804cd444a2d2e5360 (patch) | |
| tree | e457a29d7312d99fddcd53bc7f09b8fd3c8dd0d1 /usr.sbin | |
| parent | 36c39afaad2c7b0623942a2dfd1de71415e8f152 (diff) | |
store the configuration file's path, this will be useful when reloading.
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/hoststated/hoststated.h | 3 | ||||
| -rw-r--r-- | usr.sbin/hoststated/parse.y | 3 | ||||
| -rw-r--r-- | usr.sbin/relayd/parse.y | 3 | ||||
| -rw-r--r-- | usr.sbin/relayd/relayd.h | 3 |
4 files changed, 8 insertions, 4 deletions
diff --git a/usr.sbin/hoststated/hoststated.h b/usr.sbin/hoststated/hoststated.h index b233c090b1f..789903dccca 100644 --- a/usr.sbin/hoststated/hoststated.h +++ b/usr.sbin/hoststated/hoststated.h @@ -1,4 +1,4 @@ -/* $OpenBSD: hoststated.h,v 1.43 2007/05/27 20:53:10 pyr Exp $ */ +/* $OpenBSD: hoststated.h,v 1.44 2007/05/28 17:37:16 pyr Exp $ */ /* * Copyright (c) 2006, 2007 Pierre-Yves Ritschard <pyr@spootnik.org> @@ -515,6 +515,7 @@ enum { struct hoststated { u_int8_t opts; u_int16_t flags; + const char *confpath; struct pfdata *pf; int tablecount; int servicecount; diff --git a/usr.sbin/hoststated/parse.y b/usr.sbin/hoststated/parse.y index bc02cf5a59a..f824af3dea4 100644 --- a/usr.sbin/hoststated/parse.y +++ b/usr.sbin/hoststated/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.41 2007/05/27 20:53:10 pyr Exp $ */ +/* $OpenBSD: parse.y,v 1.42 2007/05/28 17:37:16 pyr Exp $ */ /* * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@spootnik.org> @@ -1417,6 +1417,7 @@ parse_config(const char *filename, int opts) conf->prefork_relay = RELAY_NUMPROC; conf->statinterval.tv_sec = RELAY_STATINTERVAL; conf->opts = opts; + conf->confpath = filename; if ((fin = fopen(filename, "r")) == NULL) { warn("%s", filename); diff --git a/usr.sbin/relayd/parse.y b/usr.sbin/relayd/parse.y index bc02cf5a59a..f824af3dea4 100644 --- a/usr.sbin/relayd/parse.y +++ b/usr.sbin/relayd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.41 2007/05/27 20:53:10 pyr Exp $ */ +/* $OpenBSD: parse.y,v 1.42 2007/05/28 17:37:16 pyr Exp $ */ /* * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@spootnik.org> @@ -1417,6 +1417,7 @@ parse_config(const char *filename, int opts) conf->prefork_relay = RELAY_NUMPROC; conf->statinterval.tv_sec = RELAY_STATINTERVAL; conf->opts = opts; + conf->confpath = filename; if ((fin = fopen(filename, "r")) == NULL) { warn("%s", filename); diff --git a/usr.sbin/relayd/relayd.h b/usr.sbin/relayd/relayd.h index 1f5a1ca3bd8..e1abb411607 100644 --- a/usr.sbin/relayd/relayd.h +++ b/usr.sbin/relayd/relayd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: relayd.h,v 1.43 2007/05/27 20:53:10 pyr Exp $ */ +/* $OpenBSD: relayd.h,v 1.44 2007/05/28 17:37:16 pyr Exp $ */ /* * Copyright (c) 2006, 2007 Pierre-Yves Ritschard <pyr@spootnik.org> @@ -515,6 +515,7 @@ enum { struct hoststated { u_int8_t opts; u_int16_t flags; + const char *confpath; struct pfdata *pf; int tablecount; int servicecount; |