1
0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00

s3-passdb: Allow pdb_sid_to_id to work on any SID

This is needed so that pdb_samba4 can map any SID during a provision.

At runtime, winbindd will be asked first, but this shortcut direct to the
ldb file makes it possible to set the permissions on the sysvol share at
provision time.

Andrew Bartlett
This commit is contained in:
Andrew Bartlett 2012-08-21 14:56:45 +10:00
parent d963aaf73b
commit 02e25b2a43
3 changed files with 19 additions and 13 deletions

View File

@ -1084,18 +1084,14 @@ static void legacy_gid_to_sid(struct dom_sid *psid, gid_t gid)
static bool legacy_sid_to_unixid(const struct dom_sid *psid, struct unixid *id)
{
GROUP_MAP *map;
if (sid_check_is_in_our_sam(psid)) {
bool ret;
bool ret;
become_root();
ret = pdb_sid_to_id(psid, id);
unbecome_root();
become_root();
ret = pdb_sid_to_id(psid, id);
unbecome_root();
if (ret) {
goto done;
}
/* This was ours, but it was not mapped. Fail */
if (ret) {
goto done;
}
if ((sid_check_is_in_builtin(psid) ||

View File

@ -1429,6 +1429,11 @@ static bool pdb_default_sid_to_id(struct pdb_methods *methods,
uint32_t rid;
id->id = -1;
if (!sid_check_is_in_our_sam(sid)) {
/* Not our SID */
return False;
}
mem_ctx = talloc_new(NULL);
if (mem_ctx == NULL) {

View File

@ -4938,6 +4938,11 @@ static bool ldapsam_sid_to_id(struct pdb_methods *methods,
TALLOC_CTX *mem_ctx;
if (!sid_check_is_in_our_sam(sid)) {
/* Not our SID */
return False;
}
mem_ctx = talloc_new(NULL);
if (mem_ctx == NULL) {
DEBUG(0, ("talloc_new failed\n"));