sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-12-16 00:23:52 +03:00
Code Activity

Check return code of string_to_sid. (Merge from HEAD)

Browse Source
This commit is contained in:
Martin Pool
-
parent 5d09aea6f7
commit 606bb47f24
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/nsswitch/wb_client.c
View File

@@ -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, if ((result = winbindd_request(WINBINDD_LOOKUPNAME, &request,
&response)) == NSS_STATUS_SUCCESS) { &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; *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 */ /* Copy out result */
if (result == NSS_STATUS_SUCCESS) { 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 { } else {
sid_copy(sid, &global_sid_NULL); sid_copy(sid, &global_sid_NULL);
} }
@@ -224,7 +226,8 @@ BOOL winbind_gid_to_sid(DOM_SID *sid, gid_t gid)
/* Copy out result */ /* Copy out result */
if (result == NSS_STATUS_SUCCESS) { 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 { } else {
sid_copy(sid, &global_sid_NULL); sid_copy(sid, &global_sid_NULL);
} }

10
source/python/py_lsa.c
View File

@@ -235,7 +235,10 @@ static PyObject *lsa_lookup_sids(PyObject *self, PyObject *args,
for (i = 0; i < num_sids; i++) { for (i = 0; i < num_sids; i++) {
PyObject *obj = PyList_GetItem(py_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 { } else {
@@ -245,7 +248,10 @@ static PyObject *lsa_lookup_sids(PyObject *self, PyObject *args,
num_sids = 1; num_sids = 1;
sids = (DOM_SID *)talloc(hnd->mem_ctx, sizeof(DOM_SID)); 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, ntstatus = cli_lsa_lookup_sids(hnd->cli, hnd->mem_ctx, &hnd->pol,