Skip to content

Commit

Permalink
Revert partial fix for RADSECPROXY-69 (47ccc9f).
Browse files Browse the repository at this point in the history
This was potentially making things worse.
  • Loading branch information
Linus Nordberg committed Nov 1, 2016
1 parent 47ccc9f commit 9a565fe
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 10 deletions.
5 changes: 0 additions & 5 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
6 changes: 1 addition & 5 deletions radsecproxy.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 9a565fe

Please sign in to comment.