diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | radsecproxy.c | 6 |
2 files changed, 10 insertions, 1 deletions
@@ -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; |