From: Steffan Karger <steffan@karger.me>
Date: Wed, 20 Aug 2014 21:00:26 +0000 (+0200)
Subject: Fix clang warning in options.c
X-Git-Tag: v2.4_alpha1~380
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=555b54cc0f0d6495ff427b9f02ecc3bc8ab73141;p=thirdparty%2Fopenvpn.git

Fix clang warning in options.c

fixed warning: expression which evaluates to zero treated as a
null pointer constant of type 'struct addrinfo *'

Seems to be innocent, but clang is correct that this is strange.
init_tun() expects two pointers, but options_string() tried to
feed it two uint32_t values.

Signed-off-by: Steffan Karger <steffan@karger.me>
Acked-by: David Sommerseth <dazo@users.sourceforge.net>
Message-Id: <1408568426-19601-2-git-send-email-steffan@karger.me>
URL: http://article.gmane.org/gmane.network.openvpn.devel/9004
Signed-off-by: Gert Doering <gert@greenie.muc.de>
---

diff --git a/src/openvpn/options.c b/src/openvpn/options.c
index f536daa2f..84eb6ed3a 100644
--- a/src/openvpn/options.c
+++ b/src/openvpn/options.c
@@ -2934,8 +2934,8 @@ options_string (const struct options *o,
 		     o->ifconfig_ipv6_local,
 		     o->ifconfig_ipv6_netbits,
 		     o->ifconfig_ipv6_remote,
-		     (in_addr_t)0,
-		     (in_addr_t)0,
+		     NULL,
+		     NULL,
 		     false,
 		     NULL);
       if (tt)