From: Andy Bavier <acb@cs.princeton.edu>
Date: Tue, 1 May 2012 15:29:15 +0000 (-0400)
Subject: Undo last change, commit actual fix for segfault when setting IPv6 address.
X-Git-Tag: util-vserver-pl-0.3-34~2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=944da41cece3e1deea02736c6699e3f833613962;p=util-vserver-pl.git

Undo last change, commit actual fix for segfault when setting IPv6 address.
---

diff --git a/python/vserverimpl.c b/python/vserverimpl.c
index b3e739c..c9f0379 100644
--- a/python/vserverimpl.c
+++ b/python/vserverimpl.c
@@ -449,7 +449,7 @@ static inline int
 convert_address(const char *str, struct vc_net_addr *addr)
 {
   void *dst;
-  if (inet_pton(AF_INET6, str, &addr->vna_v6_ip.s6_addr) > 0) {
+  if (inet_pton(AF_INET6, str, addr->vna_v6_ip.s6_addr) > 0) {
     addr->vna_type = VC_NXA_TYPE_IPV6;
     return 0;
   }
@@ -492,7 +492,7 @@ get_mask(struct vc_net_addr *addr)
     offset = offsetof(struct sockaddr_in6, sin6_addr.s6_addr);
     ip = addr->vna_v6_ip.s6_addr;
     len = 16;
-    addr->vna_v6_mask.s6_addr32[9] = addr->vna_v6_mask.s6_addr32[1] = 0xffffffff;
+    addr->vna_v6_mask.s6_addr32[0] = addr->vna_v6_mask.s6_addr32[1] = 0xffffffff;
     addr->vna_v6_mask.s6_addr32[2] = addr->vna_v6_mask.s6_addr32[3] = 0x00000000;
     addr->vna_prefix = 64;
     break;