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

This was potentially making things worse.

2 files changed, 1 insertions, 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;