#define NONE inc_and_ret_none()
+#define PL_INSECURE_BCAPS (vc_get_insecurebcaps() | (1 << VC_CAP_NET_BIND_SERVICE))
+
/*
* context create
*/
if (!PyArg_ParseTuple(args, "I|K", &ctx, &bcaps))
return NULL;
- bcaps |= ~(vc_get_insecurebcaps() | (1 << VC_CAP_NET_BIND_SERVICE));
+ bcaps |= ~PL_INSECURE_BCAPS;
if ((ctx_is_new = pl_chcontext(ctx, bcaps, 0)) < 0)
return PyErr_SetFromErrno(PyExc_OSError);
if (!PyArg_ParseTuple(args, "IK", &ctx, &caps.bcaps))
return NULL;
- caps.bmask = vc_get_insecurebcaps();
+ caps.bmask = PL_INSECURE_BCAPS;
caps.cmask = caps.ccaps = 0;
if (vc_set_ccaps(ctx, &caps) == -1 && errno != ESRCH)
return PyErr_SetFromErrno(PyExc_OSError);
return NULL;
if (vc_get_ccaps(ctx, &caps) == -1) {
- if (errno != -ESRCH)
+ if (errno != ESRCH)
return PyErr_SetFromErrno(PyExc_OSError);
else
caps.bcaps = 0;
}
- return Py_BuildValue("K", caps.bcaps & vc_get_insecurebcaps());
+ return Py_BuildValue("K", caps.bcaps & PL_INSECURE_BCAPS);
}
static PyObject *
if (secure_chdir(&dirs, guest, target) == -1)
goto out;
- if (mount(source, ".", type, flags, data) == -1)
+ if (mount(source, ".", type, flags, data) == -1 && errno != EBUSY)
goto out;
restore_dirs(&dirs);
return NONE;
}
+static PyObject *
+vserver_set_name(PyObject *self, PyObject *args)
+{
+ xid_t ctx, slice_id;
+ PyObject *ret;
+
+ if (!PyArg_ParseTuple(args, "II", &ctx, &slice_id))
+ return NULL;
+
+ 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;
+ }
+}
+
+static PyObject *
+vserver_get_name(PyObject *self, PyObject *args)
+{
+ xid_t ctx, slice_id;
+ PyObject *ret;
+
+ if (!PyArg_ParseTuple(args, "I", &ctx))
+ return NULL;
+
+ 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", slice_id);
+ }
+ return ret;
+}
+
static PyMethodDef methods[] = {
{ "chcontext", vserver_chcontext, METH_VARARGS,
"chcontext to vserver with provided flags" },
"Perform the umount2() system call" },
{ "setrunlevel", vserver_set_runlevel, METH_VARARGS,
"Set the runlevel in utmp" },
+ { "setname", vserver_set_name, METH_VARARGS,
+ "Set the vcVHI_CONTEXT for a xid." },
+ { "getname", vserver_get_name, METH_VARARGS,
+ "Get the vcVHI_CONTEXT for a xid." },
{ NULL, NULL, 0, NULL }
};