X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=python%2Fvserverimpl.c;h=cb30228a8fa23e1d6bb1041cf3b2f7de1ac61689;hb=e379ba6692e5f9c38087249ccaa4d4b978593147;hp=409899e9df25faecf1c52361e6c14f758f73d808;hpb=44199eaea05bd9ac96d656516f1e1200880cc77b;p=util-vserver-pl.git

diff --git a/python/vserverimpl.c b/python/vserverimpl.c
index 409899e..cb30228 100644
--- a/python/vserverimpl.c
+++ b/python/vserverimpl.c
@@ -337,7 +337,7 @@ vserver_get_bcaps(PyObject *self, PyObject *args)
     return NULL;
 
   if (vc_get_ccaps(ctx, &caps) == -1) {
-    if (errno != -ESRCH)
+    if (errno != ESRCH)
       return PyErr_SetFromErrno(PyExc_OSError);
     else
       caps.bcaps = 0;
@@ -670,15 +670,12 @@ static PyObject *
 vserver_set_name(PyObject *self, PyObject *args)
 {
   xid_t       ctx, slice_id;
-  char        buf[sizeof(long int)*3+2];
   PyObject    *ret;
 
   if (!PyArg_ParseTuple(args, "II", &ctx, &slice_id))
     return NULL;
 
-  snprintf(buf, sizeof(buf), "%d", slice_id); 
-
-  if (vc_set_vhi_name(ctx, vcVHI_SYSNAME, buf, sizeof(buf)) != 0) {
+  if (vc_set_vhi_name(ctx, vcVHI_CONTEXT, (char *)&slice_id, sizeof(slice_id)) != 0 && errno != ESRCH) {
     return PyErr_SetFromErrno(PyExc_OSError);
   } else {
     return NONE;
@@ -688,17 +685,16 @@ vserver_set_name(PyObject *self, PyObject *args)
 static PyObject *
 vserver_get_name(PyObject *self, PyObject *args)
 {
-  xid_t       ctx;
-  char        buf[sizeof(long int)*3+2];
+  xid_t       ctx, slice_id;
   PyObject    *ret;
 
   if (!PyArg_ParseTuple(args, "I", &ctx))
     return NULL;
 
-  if (vc_get_vhi_name(ctx, vcVHI_SYSNAME, buf, sizeof(buf)) !=0 ) {
+  if (vc_get_vhi_name(ctx, vcVHI_CONTEXT, (char *)&slice_id, sizeof(slice_id)) != 0) {
     ret = PyErr_SetFromErrno(PyExc_OSError);
   } else {
-    ret = Py_BuildValue("i", atoi(buf));
+    ret = Py_BuildValue("i", slice_id);
   }
   return ret;
 }
@@ -743,9 +739,9 @@ static PyMethodDef  methods[] = {
   { "setrunlevel", vserver_set_runlevel, METH_VARARGS,
     "Set the runlevel in utmp" },
   { "setname", vserver_set_name, METH_VARARGS,
-    "Set the vcVHI_SYSNAME for a xid." },
+    "Set the vcVHI_CONTEXT for a xid." },
   { "getname", vserver_get_name, METH_VARARGS,
-    "Get the vcVHI_SYSNAME for a xid." },
+    "Get the vcVHI_CONTEXT for a xid." },
   { NULL, NULL, 0, NULL }
 };