- rel.3 - fticksVISINST support

Changed files:
    radsecproxy-visinst.patch -> 1.1
    radsecproxy.spec -> 1.19

diff --git a/radsecproxy-visinst.patch b/radsecproxy-visinst.patch
new file mode 100644 (file)
index 0000000..197867c
--- /dev/null
+++ b/radsecproxy-visinst.patch
@@ -0,0 +1,38 @@
+--- ./radsecproxy.c.org        2011-12-20 12:46:01.678987351 +0100
++++ ./radsecproxy.c    2011-12-20 15:44:24.186577784 +0100
+@@ -2690,6 +2690,7 @@ int confclient_cb(struct gconffile **cf,
+           "rewriteattribute", CONF_STR, &conf->confrewriteusername,
+ #if defined(WANT_FTICKS)
+           "fticksVISCOUNTRY", CONF_STR, &conf->fticks_viscountry,
++          "fticksVISINST", CONF_STR, &conf->fticks_visinst,
+ #endif
+           NULL
+           ))
+--- ./radsecproxy.h.org        2011-12-20 12:46:01.685654326 +0100
++++ ./radsecproxy.h    2011-12-20 15:43:05.166261843 +0100
+@@ -131,6 +131,7 @@ struct clsrvconf {
+     struct list *clients;
+     struct server *servers;
+     char *fticks_viscountry;
++    char *fticks_visinst;
+ };
+ 
+ #include "tlscommon.h"
+--- ./fticks.c.org     2011-12-20 12:46:01.678987351 +0100
++++ ./fticks.c 2011-12-20 15:51:30.612937428 +0100
+@@ -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#",
+-               client->conf->name);
++          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.spec b/radsecproxy.spec
index a210bda3ee563f03d47f3636b433f6087bf25cb4..92d5754f7df41e96b56f6d8f021ae671ce03497f 100644 (file)
--- a/radsecproxy.spec
+++ b/radsecproxy.spec
@@ -3,7 +3,7 @@
 Summary:       RADIUS proxy that in addition to to usual RADIUS UDP transport, also supports TLS (RadSec)
 Name:          radsecproxy
 Version:       1.5
-Release:       2
+Release:       3
 License:       GPLv2+ or BSD-like
 Group:         Networking/Daemons/Radius
 Source0:       http://software.uninett.no/radsecproxy/%{name}-%{version}.tar.gz
@@ -14,6 +14,7 @@ Source3:      %{name}.upstart
 Patch0:                %{name}-docbook2x.patch
 ## will be included in 1.6
 Patch1:                %{name}-fticks.patch
+Patch2:                %{name}-visinst.patch
 URL:           http://software.uninett.no/radsecproxy/
 # For manual creation:
 BuildRequires: docbook2X
@@ -47,6 +48,7 @@ Opis zadania Upstart dla %{name}.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__aclocal}