summaryrefslogtreecommitdiffstats
path: root/src/openvpn/options.c
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2014-03-21 14:18:40 +0100
committerGert Doering <gert@greenie.muc.de>2014-03-23 20:23:14 +0100
commit98e24cc7e8ce3dafada43e46aef32a3d6a7a4f27 (patch)
tree1436f5f46be359f575b6fb96ccef6e2e6aeb94c4 /src/openvpn/options.c
parent45184804c477aed2ae91ce23d6606da1bfccbaa7 (diff)
downloadopenvpn-98e24cc7e8ce3dafada43e46aef32a3d6a7a4f27.tar.gz
openvpn-98e24cc7e8ce3dafada43e46aef32a3d6a7a4f27.tar.xz
openvpn-98e24cc7e8ce3dafada43e46aef32a3d6a7a4f27.zip
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. Acked-by: Gert Doering <gert@greenie.muc.de> Message-Id: <1395407925-25518-8-git-send-email-arne@rfc2549.org> URL: http://article.gmane.org/gmane.network.openvpn.devel/8377 Signed-off-by: Gert Doering <gert@greenie.muc.de>
Diffstat (limited to 'src/openvpn/options.c')
-rw-r--r--src/openvpn/options.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/openvpn/options.c b/src/openvpn/options.c
index cb2cf95..c5746c5 100644
--- a/src/openvpn/options.c
+++ b/src/openvpn/options.c
@@ -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");
}