Skip to contentSkip to conversation

Don’t show the connection profile store in options->ce if there is a connection_list defined.

PATCH New Arne Schwabe 1 participant 1 message Jan 3, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Don’t show the connection profile store in options->ce if there is a connection_list defined.

Entries in options->ce are never used and overwritten by the first usable connection profile on initialisation.

---
 src/openvpn/options.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
src/openvpn/options.c +5 -2
index 26d5aec..aa06c0a 100644
@@ -1406,8 +1406,6 @@ show_connection_entry (const struct connection_entry *o)
 static void
 show_connection_entries (const struct options *o)
 {
-  msg (D_SHOW_PARMS, "Connection profiles [default]:");
-  show_connection_entry (&o->ce);
  if (o->connection_list)
    {
      const struct connection_list *l = o->connection_list;
@@ -1418,6 +1416,11 @@ show_connection_entries (const struct options *o)
 	 show_connection_entry (l->array[i]);
        }
    }
+ else
+   {
+     msg (D_SHOW_PARMS, "Connection profiles [default]:");
+     show_connection_entry (&o->ce);
+   }
   msg (D_SHOW_PARMS, "Connection profiles END");
 }
 
Signature · 1 line
1.8.3.4 (Apple Git-47)