New option for client block - fticksVISINST

parent ab7c8e7c
......@@ -107,8 +107,13 @@ fticks_log(const struct options *options,
memset(visinst, 0, sizeof(visinst));
if (options->fticks_reporting == RSP_FTICKS_REPORTING_FULL) {
snprintf((char *) visinst, sizeof(visinst), "VISINST=%s#",
if (client->conf->fticks_visinst != NULL ) {
snprintf((char *) visinst, sizeof(visinst), "VISINST=%s#",
client->conf->fticks_visinst);
} else {
snprintf((char *) visinst, sizeof(visinst), "VISINST=%s#",
client->conf->name);
}
}
memset(macout, 0, sizeof(macout));
......
......@@ -2690,6 +2690,7 @@ int confclient_cb(struct gconffile **cf, void *arg, char *block, char *opt, char
"rewriteattribute", CONF_STR, &conf->confrewriteusername,
#if defined(WANT_FTICKS)
"fticksVISCOUNTRY", CONF_STR, &conf->fticks_viscountry,
"fticksVISINST", CONF_STR, &conf->fticks_visinst,
#endif
NULL
))
......
......@@ -480,9 +480,9 @@ blocktype name {
<literal>certificateNameCheck</literal>,
<literal>matchCertificateAttribute</literal>,
<literal>duplicateInterval</literal>, <literal>AddTTL</literal>,
<literal>fticksVISCOUNTRY</literal>, <literal>rewrite</literal>,
<literal>rewriteIn</literal>, <literal>rewriteOut</literal>, and
<literal>rewriteAttribute</literal>.
<literal>fticksVISCOUNTRY</literal>, <literal>fticksVISINST</literal>,
<literal>rewrite</literal>, <literal>rewriteIn</literal>,
<literal>rewriteOut</literal>, and <literal>rewriteAttribute</literal>.
We already discussed the <literal>host</literal> option. The
value of <literal>type</literal> must be one of
......@@ -543,6 +543,11 @@ blocktype name {
clients eligible to F-Ticks logging as defined by the
<literal>FTicksReporting</literal> basic option.
</para>
<para>
The <literal>fticksVISINST</literal> option overwrites
the default <literal>VISINST</literal> value taken from the client
block name.
</para>
<para>
The <literal>rewrite</literal> option is deprecated. Use
<literal>rewriteIn</literal> instead.
......
......@@ -131,6 +131,7 @@ struct clsrvconf {
struct list *clients;
struct server *servers;
char *fticks_viscountry;
char *fticks_visinst;
};
#include "tlscommon.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment