summaryrefslogtreecommitdiff
path: root/usr.sbin/relayd/relay.c
diff options
context:
space:
mode:
authorReyk Floeter <reyk@cvs.openbsd.org>2008-08-08 22:49:34 +0000
committerReyk Floeter <reyk@cvs.openbsd.org>2008-08-08 22:49:34 +0000
commit6c6bcec1e5b311470799378c970ce1cff6ade984 (patch)
tree2364f38782e4110e33b0c5bf4aaf1ef77d09b079 /usr.sbin/relayd/relay.c
parent9e2a0cb4653079e2ea5d43f489bada0a83cd0892 (diff)
add a variable $SERVER_NAME which is "OpenBSD relayd" by default.
Diffstat (limited to 'usr.sbin/relayd/relay.c')
-rw-r--r--usr.sbin/relayd/relay.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/usr.sbin/relayd/relay.c b/usr.sbin/relayd/relay.c
index 8c02fbfd568..9f1d52764dc 100644
--- a/usr.sbin/relayd/relay.c
+++ b/usr.sbin/relayd/relay.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: relay.c,v 1.100 2008/08/08 20:34:30 reyk Exp $ */
+/* $OpenBSD: relay.c,v 1.101 2008/08/08 22:49:33 reyk Exp $ */
/*
* Copyright (c) 2006, 2007, 2008 Reyk Floeter <reyk@openbsd.org>
@@ -1003,6 +1003,11 @@ relay_expand_http(struct ctl_relay_event *cre, char *val, char *buf, size_t len)
"$SERVER_PORT", ibuf) != 0)
return (NULL);
}
+ if (strstr(val, "$SERVER_NAME") != NULL) {
+ if (expand_string(buf, len,
+ "$SERVER_NAME", RELAYD_SERVERNAME) != 0)
+ return (NULL);
+ }
}
if (strstr(val, "$TIMEOUT") != NULL) {
snprintf(ibuf, sizeof(ibuf), "%lu", rlay->rl_conf.timeout.tv_sec);