pythongh-48511: Make pwd and grp recognizing that NULL also can mean …

…an error
arhadthedev · Jul 12, 2022 · 46c34b6 · 46c34b6
1 parent cfafd3a
commit 46c34b6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/Misc/NEWS.d/next/Library/2022-07-12-10-40-39.gh-issue-123456.R3nUGr.rst b/Misc/NEWS.d/next/Library/2022-07-12-10-40-39.gh-issue-123456.R3nUGr.rst
@@ -0,0 +1,4 @@
+:func:`pwd.getpwuid` and :func:`pwd.getpwall` now differentiate between a
+lack of record (:data:`None` is returned) and a database access error
+(:exc:`OSException` is risen) to be consistent with :func:`pwd.getpwnam`.
+Path by Oleg Iarygin.
diff --git a/Modules/pwdmodule.c b/Modules/pwdmodule.c
@@ -264,10 +264,13 @@ pwd_getpwnam_impl(PyObject *module, PyObject *name)
         if (nomem == 1) {
             PyErr_NoMemory();
         }
-        else {
+        else if (errno == 0) {
             PyErr_Format(PyExc_KeyError,
                          "getpwnam(): name not found: %R", name);
         }
+        else {
+            PyErr_SetFromErrno(PyExc_OSError)
+        }
         goto out;
     }
     retval = mkpwent(module, p);
@@ -306,6 +309,10 @@ pwd_getpwall_impl(PyObject *module)
         Py_DECREF(v);
     }
     endpwent();
+    if (p == NULL) {
+        PyErr_SetFromErrno(PyExc_OSError)
+        return NULL
+    }
     return d;
 }
 #endif