From 8baa745ceb1a211e164436fb0a005fd025fe8ddf Mon Sep 17 00:00:00 2001 From: "Gregory P. Smith" Date: Mon, 1 Mar 2010 05:48:57 +0000 Subject: [PATCH] Merged revisions 78546 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r78546 | gregory.p.smith | 2010-02-28 21:43:43 -0800 (Sun, 28 Feb 2010) | 3 lines Fixes issue #7999: os.setreuid() and os.setregid() would refuse to accept a -1 parameter on some platforms such as OS X. ........ --- Lib/test/test_os.py | 2 ++ Misc/NEWS | 3 +++ Modules/posixmodule.c | 26 ++++++++++++++++++++------ 3 files changed, 25 insertions(+), 6 deletions(-) diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py index b3f72f4787f..414da982746 100644 --- a/Lib/test/test_os.py +++ b/Lib/test/test_os.py @@ -643,6 +643,7 @@ if sys.platform != 'win32': self.assertRaises(os.error, os.setreuid, 0, 0) self.assertRaises(OverflowError, os.setreuid, 1<<32, 0) self.assertRaises(OverflowError, os.setreuid, 0, 1<<32) + os.setreuid(-1, -1) # Does nothing, but it needs to accept -1 if hasattr(os, 'setregid'): def test_setregid(self): @@ -650,6 +651,7 @@ if sys.platform != 'win32': self.assertRaises(os.error, os.setregid, 0, 0) self.assertRaises(OverflowError, os.setregid, 1<<32, 0) self.assertRaises(OverflowError, os.setregid, 0, 1<<32) + os.setregid(-1, -1) # Does nothing, but it needs to accept -1 else: class PosixUidGidTests(unittest.TestCase): pass diff --git a/Misc/NEWS b/Misc/NEWS index f71e9bee005..fba04677b6d 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -254,6 +254,9 @@ Extension Modules thread could raise an incorrect RuntimeError about not holding the import lock. The import lock is now reinitialized after fork. +- Issue #7999: os.setreuid() and os.setregid() would refuse to accept a -1 + parameter on some platforms such as OS X. + Build ----- diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c index 50ef80308ed..2ed54e4bdbc 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -5649,9 +5649,16 @@ posix_setreuid (PyObject *self, PyObject *args) uid_t ruid, euid; if (!PyArg_ParseTuple(args, "ll", &ruid_arg, &euid_arg)) return NULL; - ruid = ruid_arg; - euid = euid_arg; - if (euid != euid_arg || ruid != ruid_arg) { + if (ruid_arg == -1) + ruid = (uid_t)-1; /* let the compiler choose how -1 fits */ + else + ruid = ruid_arg; /* otherwise, assign from our long */ + if (euid_arg == -1) + euid = (uid_t)-1; + else + euid = euid_arg; + if ((euid_arg != -1 && euid != euid_arg) || + (ruid_arg != -1 && ruid != ruid_arg)) { PyErr_SetString(PyExc_OverflowError, "user id too big"); return NULL; } @@ -5676,9 +5683,16 @@ posix_setregid (PyObject *self, PyObject *args) gid_t rgid, egid; if (!PyArg_ParseTuple(args, "ll", &rgid_arg, &egid_arg)) return NULL; - rgid = rgid_arg; - egid = egid_arg; - if (egid != egid_arg || rgid != rgid_arg) { + if (rgid_arg == -1) + rgid = (gid_t)-1; /* let the compiler choose how -1 fits */ + else + rgid = rgid_arg; /* otherwise, assign from our long */ + if (egid_arg == -1) + egid = (gid_t)-1; + else + egid = egid_arg; + if ((egid_arg != -1 && egid != egid_arg) || + (rgid_arg != -1 && rgid != rgid_arg)) { PyErr_SetString(PyExc_OverflowError, "group id too big"); return NULL; }