diff options
| author | Maja Gorecka-Wolniewicz <mgw@puma.uci.umk.pl> | 2011-12-21 10:10:33 +0100 |
|---|---|---|
| committer | Maja Gorecka-Wolniewicz <mgw@puma.uci.umk.pl> | 2011-12-21 10:10:33 +0100 |
| commit | 2c70584384ab70cb28477dc9c8fb2179b293fe88 (patch) | |
| tree | f71c7e670b230622bd8991445da1f87e12031ee1 | |
| parent | ab7c8e7cc52f94029a17ec14236ab7ffa95d9bf4 (diff) | |
New option for client block - fticksVISINST
| -rw-r--r-- | fticks.c | 7 | ||||
| -rw-r--r-- | radsecproxy.c | 1 | ||||
| -rw-r--r-- | radsecproxy.conf.5.xml | 11 | ||||
| -rw-r--r-- | radsecproxy.h | 1 |
4 files changed, 16 insertions, 4 deletions
@@ -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)); diff --git a/radsecproxy.c b/radsecproxy.c index d08426e..4d6cc1a 100644 --- a/radsecproxy.c +++ b/radsecproxy.c @@ -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 )) diff --git a/radsecproxy.conf.5.xml b/radsecproxy.conf.5.xml index 4fb9476..3871e06 100644 --- a/radsecproxy.conf.5.xml +++ b/radsecproxy.conf.5.xml @@ -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 @@ -544,6 +544,11 @@ blocktype name { <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. </para> diff --git a/radsecproxy.h b/radsecproxy.h index 385f15b..184231b 100644 --- a/radsecproxy.h +++ b/radsecproxy.h @@ -131,6 +131,7 @@ struct clsrvconf { struct list *clients; struct server *servers; char *fticks_viscountry; + char *fticks_visinst; }; #include "tlscommon.h" |