diff options
| author | Martin Pool <mbp@samba.org> | 2003-02-18 07:15:52 +0000 |
|---|---|---|
| committer | Martin Pool <mbp@samba.org> | 2003-02-18 07:15:52 +0000 |
| commit | 185d858dd2161a42cc35d318415844561531f4a4 (patch) | |
| tree | 3a3aec6f9b08cfcb68c1c6ff8e85135bc80e0ba3 | |
| parent | 188c5195ede9825f30845f4aab549390ac67887e (diff) | |
| download | samba-185d858dd2161a42cc35d318415844561531f4a4.tar.gz samba-185d858dd2161a42cc35d318415844561531f4a4.tar.xz samba-185d858dd2161a42cc35d318415844561531f4a4.zip | |
Check return code of string_to_sid. (Merge from HEAD)
(This used to be commit 606bb47f241d2916d039b38f48b50474a3e0dadc)
| -rw-r--r-- | source3/nsswitch/wb_client.c | 9 | ||||
| -rw-r--r-- | source3/python/py_lsa.c | 10 |
2 files changed, 14 insertions, 5 deletions
diff --git a/source3/nsswitch/wb_client.c b/source3/nsswitch/wb_client.c index 9ac1515d7d3..62c9686960d 100644 --- a/source3/nsswitch/wb_client.c +++ b/source3/nsswitch/wb_client.c @@ -56,7 +56,8 @@ BOOL winbind_lookup_name(const char *dom_name, const char *name, DOM_SID *sid, if ((result = winbindd_request(WINBINDD_LOOKUPNAME, &request, &response)) == NSS_STATUS_SUCCESS) { - string_to_sid(sid, response.data.sid.sid); + if (!string_to_sid(sid, response.data.sid.sid)) + return False; *name_type = (enum SID_NAME_USE)response.data.sid.type; } @@ -158,7 +159,8 @@ BOOL winbind_uid_to_sid(DOM_SID *sid, uid_t uid) /* Copy out result */ if (result == NSS_STATUS_SUCCESS) { - string_to_sid(sid, response.data.sid.sid); + if (!string_to_sid(sid, response.data.sid.sid)) + return False; } else { sid_copy(sid, &global_sid_NULL); } @@ -224,7 +226,8 @@ BOOL winbind_gid_to_sid(DOM_SID *sid, gid_t gid) /* Copy out result */ if (result == NSS_STATUS_SUCCESS) { - string_to_sid(sid, response.data.sid.sid); + if (!string_to_sid(sid, response.data.sid.sid)) + return False; } else { sid_copy(sid, &global_sid_NULL); } diff --git a/source3/python/py_lsa.c b/source3/python/py_lsa.c index 31706af6840..22db29665a0 100644 --- a/source3/python/py_lsa.c +++ b/source3/python/py_lsa.c @@ -235,7 +235,10 @@ static PyObject *lsa_lookup_sids(PyObject *self, PyObject *args, for (i = 0; i < num_sids; i++) { PyObject *obj = PyList_GetItem(py_sids, i); - string_to_sid(&sids[i], PyString_AsString(obj)); + if (!string_to_sid(&sids[i], PyString_AsString(obj))) { + PyErr_SetString(PyExc_ValueError, "string_to_sid failed"); + return NULL; + } } } else { @@ -245,7 +248,10 @@ static PyObject *lsa_lookup_sids(PyObject *self, PyObject *args, num_sids = 1; sids = (DOM_SID *)talloc(hnd->mem_ctx, sizeof(DOM_SID)); - string_to_sid(&sids[0], PyString_AsString(py_sids)); + if (!string_to_sid(&sids[0], PyString_AsString(py_sids))) { + PyErr_SetString(PyExc_ValueError, "string_to_sid failed"); + return NULL; + } } ntstatus = cli_lsa_lookup_sids(hnd->cli, hnd->mem_ctx, &hnd->pol, |