git://git.onelab.eu
/
util-vserver-pl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix logging of vserver class into /var/log/nm
[util-vserver-pl.git]
/
python
/
vserverimpl.c
diff --git
a/python/vserverimpl.c
b/python/vserverimpl.c
index
3ac9069
..
b20725c
100644
(file)
--- a/
python/vserverimpl.c
+++ b/
python/vserverimpl.c
@@
-430,7
+430,7
@@
get_mask(struct vc_net_addr *addr)
addr->vna_prefix = 64;
break;
default:
addr->vna_prefix = 64;
break;
default:
- errno =
-
EINVAL;
+ errno = EINVAL;
return -1;
}
return -1;
}
@@
-505,12
+505,13
@@
vserver_net_remove(PyObject *self, PyObject *args)
else {
if (convert_address(ip, &addr) == -1)
return PyErr_Format(PyExc_ValueError, "%s is not a valid IP address", ip);
else {
if (convert_address(ip, &addr) == -1)
return PyErr_Format(PyExc_ValueError, "%s is not a valid IP address", ip);
- addr.vna_type |= VC_NXA_TYPE_ADDR;
- }
- switch (get_mask(&addr)) {
- case -1:
- return PyErr_SetFromErrno(PyExc_OSError);
+ switch (get_mask(&addr)) {
+ case -1:
+ return PyErr_SetFromErrno(PyExc_OSError);
+ }
+
+ addr.vna_type |= VC_NXA_TYPE_ADDR;
}
if (vc_net_remove(nid, &addr) == -1 && errno != ESRCH)
}
if (vc_net_remove(nid, &addr) == -1 && errno != ESRCH)