From ffef501d56ae22d9317337eda7d0a73addea6711 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Wed, 2 Jan 2019 15:06:47 +0100 Subject: [PATCH] just nicer --- setns.c | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/setns.c b/setns.c index aa907b0..e8a4302 100644 --- a/setns.c +++ b/setns.c @@ -10,9 +10,11 @@ static PyObject * drop_caps(PyObject *self, PyObject *args) { - unsigned int to_drop[128] = {CAP_NET_ADMIN,CAP_SYS_ADMIN,CAP_SYS_BOOT,CAP_MKNOD,CAP_MAC_ADMIN,CAP_SYS_MODULE}; + unsigned int to_drop[128] + = {CAP_NET_ADMIN, CAP_SYS_ADMIN, CAP_SYS_BOOT, + CAP_MKNOD, CAP_MAC_ADMIN, CAP_SYS_MODULE}; unsigned int i; - for (i = 0;i<6;i++) { + for (i = 0; i<6 ; i++) { if (prctl(PR_CAPBSET_DROP, to_drop[i], 0, 0, 0) == -1) { perror("prctl"); return Py_BuildValue("i", 2); @@ -24,7 +26,7 @@ drop_caps(PyObject *self, PyObject *args) static PyObject * proc_mount(PyObject *self, PyObject *args) { - int sts; + int sts; sts = mount("none","/proc","proc",0,NULL); return Py_BuildValue("i", sts); @@ -33,7 +35,7 @@ proc_mount(PyObject *self, PyObject *args) static PyObject * proc_umount(PyObject *self, PyObject *args) { - int sts; + int sts; sts = umount("/proc"); return Py_BuildValue("i", sts); @@ -53,7 +55,7 @@ chfscontext(PyObject *self, PyObject *args) sts = -errno; goto out; } - + if (setns(fd, 0)) { sts = -errno; } @@ -78,7 +80,7 @@ chcontext(PyObject *self, PyObject *args) sts = -errno; goto out; } - + if (setns(fd, 0)) { sts = -errno; } @@ -91,17 +93,17 @@ out: static PyMethodDef SetnsMethods[] = { - {"proc_mount", proc_mount, METH_VARARGS, "Mount a volume via the mount system call."}, - {"proc_umount", proc_umount, METH_VARARGS, "Umount a volume via the umount system call."}, - {"chcontext", chcontext, METH_VARARGS, "Switch into an lxc container."}, - {"drop_caps", drop_caps, METH_VARARGS, "Drop dangerous capabilities."}, - {"chfscontext", chfscontext, METH_VARARGS, "Switch into an lxc container."}, - {NULL, NULL, 0, NULL} + {"proc_mount", proc_mount, METH_VARARGS, "Mount a volume via the mount system call."}, + {"proc_umount", proc_umount, METH_VARARGS, "Umount a volume via the umount system call."}, + {"chcontext", chcontext, METH_VARARGS, "Switch into an lxc container."}, + {"drop_caps", drop_caps, METH_VARARGS, "Drop dangerous capabilities."}, + {"chfscontext", chfscontext, METH_VARARGS, "Switch into an lxc container."}, + {NULL, NULL, 0, NULL} }; - + PyMODINIT_FUNC - + initsetns(void) { - (void) Py_InitModule("setns", SetnsMethods); + (void) Py_InitModule("setns", SetnsMethods); } -- 2.43.0