summaryrefslogtreecommitdiffstats
path: root/source/passdb/lookup_sid.c
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2007-04-09 16:04:07 +0000
committerGerald Carter <jerry@samba.org>2007-04-09 16:04:07 +0000
commit7dcb89c1236f9712f9018744bea2e016b5cdfab9 (patch)
tree69b6dd928b31818c82a7368be3cff169cc8b8a61 /source/passdb/lookup_sid.c
parent099d375891d4444320bd451486e8bf7d9afdbe0f (diff)
downloadsamba-7dcb89c1236f9712f9018744bea2e016b5cdfab9.tar.gz
samba-7dcb89c1236f9712f9018744bea2e016b5cdfab9.tar.xz
samba-7dcb89c1236f9712f9018744bea2e016b5cdfab9.zip
r22138: * Sync up with the SAMBA_3_0_25 as of svn r22132.
* Set VERSION to 3.0.25rc1 * Update release notes.
Diffstat (limited to 'source/passdb/lookup_sid.c')
-rw-r--r--source/passdb/lookup_sid.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/source/passdb/lookup_sid.c b/source/passdb/lookup_sid.c
index d76cc07ce1e..ca5970875d1 100644
--- a/source/passdb/lookup_sid.c
+++ b/source/passdb/lookup_sid.c
@@ -466,10 +466,10 @@ static BOOL lookup_rids(TALLOC_CTX *mem_ctx, const DOM_SID *domain_sid,
return False;
}
- become_root_uid_only();
+ become_root();
result = pdb_lookup_rids(domain_sid, num_rids, rids,
*names, *types);
- unbecome_root_uid_only();
+ unbecome_root();
return (NT_STATUS_IS_OK(result) ||
NT_STATUS_EQUAL(result, NT_STATUS_NONE_MAPPED) ||
@@ -1128,9 +1128,9 @@ static void legacy_uid_to_sid(DOM_SID *psid, uid_t uid)
ZERO_STRUCTP(psid);
- become_root_uid_only();
+ become_root();
ret = pdb_uid_to_rid(uid, &rid);
- unbecome_root_uid_only();
+ unbecome_root();
if (ret) {
/* This is a mapped user */
@@ -1161,9 +1161,9 @@ static void legacy_gid_to_sid(DOM_SID *psid, gid_t gid)
ZERO_STRUCTP(psid);
- become_root_uid_only();
+ become_root();
ret = pdb_gid_to_sid(gid, psid);
- unbecome_root_uid_only();
+ unbecome_root();
if (ret) {
/* This is a mapped group */
@@ -1201,9 +1201,9 @@ static BOOL legacy_sid_to_uid(const DOM_SID *psid, uid_t *puid)
union unid_t id;
BOOL ret;
- become_root_uid_only();
+ become_root();
ret = pdb_sid_to_id(psid, &id, &type);
- unbecome_root_uid_only();
+ unbecome_root();
if (ret) {
if (type != SID_NAME_USER) {
@@ -1252,9 +1252,9 @@ static BOOL legacy_sid_to_gid(const DOM_SID *psid, gid_t *pgid)
sid_check_is_in_wellknown_domain(psid))) {
BOOL ret;
- become_root_uid_only();
+ become_root();
ret = pdb_getgrsid(&map, *psid);
- unbecome_root_uid_only();
+ unbecome_root();
if (ret) {
*pgid = map.gid;
@@ -1267,9 +1267,9 @@ static BOOL legacy_sid_to_gid(const DOM_SID *psid, gid_t *pgid)
if (sid_peek_check_rid(get_global_sam_sid(), psid, &rid)) {
BOOL ret;
- become_root_uid_only();
+ become_root();
ret = pdb_sid_to_id(psid, &id, &type);
- unbecome_root_uid_only();
+ unbecome_root();
if (ret) {
if ((type != SID_NAME_DOM_GRP) &&