X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=python%2Fvserverimpl.c;h=1f0d9133c60326ee6cd21ca0c1d482bf42e34051;hb=88e0cf0d3484efdf8d6de1a1c683ce65fe32ba83;hp=2232f732ad0794fc0a7bd76138f692dfc0ff893c;hpb=a6e1134d8bdb41b0146cdac83e4e82909e74cb47;p=util-vserver-pl.git

diff --git a/python/vserverimpl.c b/python/vserverimpl.c
index 2232f73..1f0d913 100644
--- a/python/vserverimpl.c
+++ b/python/vserverimpl.c
@@ -49,7 +49,6 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #include "config.h"
 #include "vserver.h"
-#include "planetlab.h"
 
 static inline PyObject *inc_and_ret_none(void)
 {
@@ -402,7 +401,7 @@ get_mask(struct vc_net_addr *addr)
   if (getifaddrs(&head) == -1)
     return -1;
   for (ifa = head; ifa; ifa = ifa->ifa_next) {
-    if (ifa->ifa_addr->sa_family == family &&
+    if (ifa->ifa_addr && ifa->ifa_addr->sa_family == family &&
         memcmp((char *) ifa->ifa_addr + offset, ip, len) == 0) {
       switch (addr->vna_type) {
       case VC_NXA_TYPE_IPV4:
@@ -734,6 +733,7 @@ initvserverimpl(void)
   /* export limit-related constants */
   PyModule_AddIntConstant(mod, "DLIMIT_KEEP", (int)VC_CDLIM_KEEP);
   PyModule_AddIntConstant(mod, "DLIMIT_INF", (int)VC_CDLIM_INFINITY);
+  PyModule_AddIntConstant(mod, "VC_LIM_INFINITY", (int)VC_LIM_INFINITY);
   PyModule_AddIntConstant(mod, "VC_LIM_KEEP", (int)VC_LIM_KEEP);
 
   PyModule_AddIntConstant(mod, "RLIMIT_CPU", (int)RLIMIT_CPU);