]> git.ipfire.org Git - thirdparty/openvpn.git/commitdiff
Fix FreeBSD-specific mishandling of gc arena pointer in create_arbitrary_remote()
authorGert Doering <gert@greenie.muc.de>
Tue, 10 Nov 2015 21:17:03 +0000 (22:17 +0100)
committerGert Doering <gert@greenie.muc.de>
Tue, 24 Nov 2015 12:50:12 +0000 (13:50 +0100)
... and while at it, fix warning about losing "const" qualifier on
return.

Signed-off-by: Gert Doering <gert@greenie.muc.de>
Acked-by: Steffan Karger <steffan.karger@fox-it.com>
Message-Id: <1447190223-8065-1-git-send-email-gert@greenie.muc.de>
URL: http://article.gmane.org/gmane.network.openvpn.devel/10478
(cherry picked from commit b33e1355765bbf83f4c8b744c442c7d98df808fa)

src/openvpn/tun.c

index a63b951111369387e7c426250dd57f2ba9442d02..684d734c9556116fc66d07056e06fbde745c4fcd 100644 (file)
@@ -635,7 +635,7 @@ void delete_route_connected_v6_net(struct tuntap * tt,
  * is still point to point and no layer 2 resolution is done...
  */
 
-char *
+const char *
 create_arbitrary_remote( struct tuntap *tt, struct gc_arena * gc )
 {
   in_addr_t remote;
@@ -644,7 +644,7 @@ create_arbitrary_remote( struct tuntap *tt, struct gc_arena * gc )
 
   if ( remote == tt->local ) remote ++;
 
-  return print_in_addr_t (remote, 0, &gc);
+  return print_in_addr_t (remote, 0, gc);
 }
 #endif