projects / packages / radsecproxy.git / blame
| Commit | Line | Data |
|---|---|---|
| 60f7c37f PG |
1 | --- ./radsecproxy.c.org 2011-12-20 12:46:01.678987351 +0100 |
| 2 | +++ ./radsecproxy.c 2011-12-20 15:44:24.186577784 +0100 | |
| 3 | @@ -2690,6 +2690,7 @@ int confclient_cb(struct gconffile **cf, | |
| 4 | "rewriteattribute", CONF_STR, &conf->confrewriteusername, | |
| 5 | #if defined(WANT_FTICKS) | |
| 6 | "fticksVISCOUNTRY", CONF_STR, &conf->fticks_viscountry, | |
| 7 | + "fticksVISINST", CONF_STR, &conf->fticks_visinst, | |
| 8 | #endif | |
| 9 | NULL | |
| 10 | )) | |
| 11 | --- ./radsecproxy.h.org 2011-12-20 12:46:01.685654326 +0100 | |
| 12 | +++ ./radsecproxy.h 2011-12-20 15:43:05.166261843 +0100 | |
| 13 | @@ -131,6 +131,7 @@ struct clsrvconf { | |
| 14 | struct list *clients; | |
| 15 | struct server *servers; | |
| 16 | char *fticks_viscountry; | |
| 17 | + char *fticks_visinst; | |
| 18 | }; | |
| 19 | ||
| 20 | #include "tlscommon.h" | |
| 21 | --- ./fticks.c.org 2011-12-20 12:46:01.678987351 +0100 | |
| 22 | +++ ./fticks.c 2011-12-20 15:51:30.612937428 +0100 | |
| 23 | @@ -107,8 +107,13 @@ fticks_log(const struct options *options | |
| 24 | ||
| 25 | memset(visinst, 0, sizeof(visinst)); | |
| 26 | if (options->fticks_reporting == RSP_FTICKS_REPORTING_FULL) { | |
| 27 | - snprintf((char *) visinst, sizeof(visinst), "VISINST=%s#", | |
| 28 | - client->conf->name); | |
| 29 | + if (client->conf->fticks_visinst != NULL ) { | |
| 30 | + snprintf((char *) visinst, sizeof(visinst), "VISINST=%s#", | |
| 31 | + client->conf->fticks_visinst); | |
| 32 | + } else { | |
| 33 | + snprintf((char *) visinst, sizeof(visinst), "VISINST=%s#", | |
| 34 | + client->conf->name); | |
| 35 | + } | |
| 36 | } | |
| 37 | ||
| 38 | memset(macout, 0, sizeof(macout)); | |
| e985cb9c PG |
39 | --- ./radsecproxy.conf-example.org 2011-12-20 12:46:01.682320839 +0100 |
| 40 | +++ ./radsecproxy.conf-example 2011-12-20 16:32:38.963596053 +0100 | |
| 41 | @@ -36,7 +36,7 @@ | |
| 42 | # Full -- Do log in F-Ticks format and do log VISINST. | |
| 43 | # Please note that in order to get F-Ticks logging for a given client, | |
| 44 | # its matching client configuration block has to contain the | |
| 45 | -# fticksVISCOUNTRY option. | |
| 46 | +# fticksVISCOUNTRY option and it can contain the fticksVISINST option. | |
| 47 | ||
| 48 | # You can optionally specify FTicksMAC in order to determine if and | |
| 49 | # how Calling-Station-Id (users Ethernet MAC address) is being logged. | |
| 50 | --- ./radsecproxy.conf.5.xml.org 2011-12-20 16:26:32.610010659 +0100 | |
| 51 | +++ ./radsecproxy.conf.5.xml 2011-12-20 16:32:01.411861864 +0100 | |
| 52 | @@ -479,9 +479,9 @@ blocktype name { | |
| 53 | <literal>certificateNameCheck</literal>, | |
| 54 | <literal>matchCertificateAttribute</literal>, | |
| 55 | <literal>duplicateInterval</literal>, <literal>AddTTL</literal>, | |
| 56 | - <literal>fticksVISCOUNTRY</literal>, <literal>rewrite</literal>, | |
| 57 | - <literal>rewriteIn</literal>, <literal>rewriteOut</literal>, and | |
| 58 | - <literal>rewriteAttribute</literal>. | |
| 59 | + <literal>fticksVISCOUNTRY</literal>, <literal>fticksVISINST</literal>, | |
| 60 | + <literal>rewrite</literal>, <literal>rewriteIn</literal>, | |
| 61 | + <literal>rewriteOut</literal>, and <literal>rewriteAttribute</literal>. | |
| 62 | ||
| 63 | We already discussed the <literal>host</literal> option. The | |
| 64 | value of <literal>type</literal> must be one of | |
| 65 | @@ -543,6 +543,10 @@ blocktype name { | |
| 66 | <literal>FTicksReporting</literal> basic option. | |
| 67 | </para> | |
| 68 | <para> | |
| 69 | + The <literal>fticksVISINST</literal> option overwrites | |
| 70 | + <literal>VISINST</literal> value. | |
| 71 | + </para> | |
| 72 | + <para> | |
| 73 | The <literal>rewrite</literal> option is deprecated. Use | |
| 74 | <literal>rewriteIn</literal> instead. | |
| 75 | </para> |