Commit 9a565fe0 authored by Linus Nordberg's avatar Linus Nordberg
Browse files

Revert partial fix for RADSECPROXY-69 (47ccc9ff).

This was potentially making things worse.
parent 47ccc9ff
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 2016-09-21 1.6.8
Bug fixes: Bug fixes:
- Stop waiting on writable when reading a TCP socket. - Stop waiting on writable when reading a TCP socket.
......
...@@ -777,14 +777,10 @@ int hasdynamicserver(struct list *srvconfs) { ...@@ -777,14 +777,10 @@ int hasdynamicserver(struct list *srvconfs) {
for (entry = list_first(srvconfs); entry; entry = list_next(entry)) for (entry = list_first(srvconfs); entry; entry = list_next(entry))
#if defined ENABLE_EXPERIMENTAL_DYNDISC #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 if (((struct clsrvconf *)entry->data)->dynamiclookupcommand
|| ((struct clsrvconf *)entry->data)->servers->in_use) || ((struct clsrvconf *)entry->data)->servers->in_use)
#else #else
if (((struct clsrvconf *)entry->data)->servers->dynamiclookuparg) if (((struct clsrvconf *)entry->data)->dynamiclookupcommand)
#endif #endif
return 1; return 1;
return 0; return 0;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment