summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Nordberg <linus@nordu.net>2011-12-22 10:04:24 +0100
committerLinus Nordberg <linus@nordu.net>2011-12-22 10:04:24 +0100
commit68d851156019f743618b39d31f7674981ed18a71 (patch)
tree138003319a37bba2e64cb5d0ba5c898798cb7c71
parentd7ffa5730f6fd4fe9ac9c6e3db224d5d93ef71a5 (diff)
parent2c70584384ab70cb28477dc9c8fb2179b293fe88 (diff)
Merge remote-tracking branch 'maja/master'
-rw-r--r--fticks.c7
-rw-r--r--radsecproxy.c1
-rw-r--r--radsecproxy.conf.5.xml11
-rw-r--r--radsecproxy.h1
4 files changed, 16 insertions, 4 deletions
diff --git a/fticks.c b/fticks.c
index e2dee19..ed7d0b4 100644
--- a/fticks.c
+++ b/fticks.c
@@ -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"