From 9d53e6e8f406415ef0b7ead8dd58ba2b6487004b Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Tue, 1 Nov 2016 10:31:05 +0100 Subject: Bump version to 1.6.9-dev. --- README | 2 +- configure.ac | 2 +- radsecproxy.conf.5.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README b/README index 146b237..e9a0e10 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -This is radsecproxy 1.6.8 from 2016-09-21. +This is unreleased radsecproxy 1.6.9-dev. radsecproxy is a generic RADIUS proxy that supports both UDP and TLS (RadSec) RADIUS transports. There is also experimental support for diff --git a/configure.ac b/configure.ac index 90d9b09..03e452e 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT(radsecproxy, 1.6.8, radsecproxy@lists.nordu.net) +AC_INIT(radsecproxy, 1.6.9-dev, radsecproxy@lists.nordu.net) AC_CANONICAL_TARGET AM_INIT_AUTOMAKE AC_PROG_CC diff --git a/radsecproxy.conf.5.xml b/radsecproxy.conf.5.xml index 250c812..8466cc8 100644 --- a/radsecproxy.conf.5.xml +++ b/radsecproxy.conf.5.xml @@ -9,7 +9,7 @@ radsecproxy.conf 5 - radsecproxy 1.6.8 + radsecproxy 1.6.9-dev -- cgit v1.1 From 47ccc9ff18405caa7554d1880a26b52c9576175b Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Tue, 1 Nov 2016 10:25:02 +0100 Subject: Look at servers->dynamiclookuparg for deciding if a server is dynamic. The dynamiclookupcommand member of the _config_ of the server is being set to NULL when it's copied in confserver_cb(), resulting in dynamic discovery being done for realms that already have a server. Patch from Fabian Mauchle. Addresses RADSECPROXY-69. --- ChangeLog | 5 +++++ radsecproxy.c | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 4f7e485..11dfa1d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Unreleased 1.6.9 + Bug fixes: + - Avoid creating another dynamic server when we already have one + working (RADSECPROXY-69). Patch by Fabian Mauchle. + 2016-09-21 1.6.8 Bug fixes: - Stop waiting on writable when reading a TCP socket. diff --git a/radsecproxy.c b/radsecproxy.c index 815e927..c478dff 100644 --- a/radsecproxy.c +++ b/radsecproxy.c @@ -777,10 +777,14 @@ int hasdynamicserver(struct list *srvconfs) { for (entry = list_first(srvconfs); entry; entry = list_next(entry)) #if defined ENABLE_EXPERIMENTAL_DYNDISC + /* NOTE: This should probably be servers->dynamiclookuparg, + * like in !ENABLE_EXPERIMENTAL_DYNDISC, but we're not + * touching this code any more. It shouldn't be used and it's + * going away. */ if (((struct clsrvconf *)entry->data)->dynamiclookupcommand || ((struct clsrvconf *)entry->data)->servers->in_use) #else - if (((struct clsrvconf *)entry->data)->dynamiclookupcommand) + if (((struct clsrvconf *)entry->data)->servers->dynamiclookuparg) #endif return 1; return 0; -- cgit v1.1 From 9a565fe0289c55700677e7a6d8446a1de1e77e9e Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Tue, 1 Nov 2016 15:10:27 +0100 Subject: Revert partial fix for RADSECPROXY-69 (47ccc9f). This was potentially making things worse. --- ChangeLog | 5 ----- radsecproxy.c | 6 +----- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 11dfa1d..4f7e485 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,3 @@ -Unreleased 1.6.9 - Bug fixes: - - Avoid creating another dynamic server when we already have one - working (RADSECPROXY-69). Patch by Fabian Mauchle. - 2016-09-21 1.6.8 Bug fixes: - Stop waiting on writable when reading a TCP socket. diff --git a/radsecproxy.c b/radsecproxy.c index c478dff..815e927 100644 --- a/radsecproxy.c +++ b/radsecproxy.c @@ -777,14 +777,10 @@ int hasdynamicserver(struct list *srvconfs) { for (entry = list_first(srvconfs); entry; entry = list_next(entry)) #if defined ENABLE_EXPERIMENTAL_DYNDISC - /* NOTE: This should probably be servers->dynamiclookuparg, - * like in !ENABLE_EXPERIMENTAL_DYNDISC, but we're not - * touching this code any more. It shouldn't be used and it's - * going away. */ if (((struct clsrvconf *)entry->data)->dynamiclookupcommand || ((struct clsrvconf *)entry->data)->servers->in_use) #else - if (((struct clsrvconf *)entry->data)->servers->dynamiclookuparg) + if (((struct clsrvconf *)entry->data)->dynamiclookupcommand) #endif return 1; return 0; -- cgit v1.1