sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

r2803: allow unixuid module to work with foreign security principles

Browse Source 
(This used to be commit f522728728)
This commit is contained in:
Andrew Tridgell 2004-10-03 10:25:06 +00:00 committed by Gerald (Jerry) Carter
parent 830ac69b1d
commit fe3294f7f0
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source4/ntvfs/unixuid/vfs_unixuid.c
View File

@ -41,6 +41,7 @@ static NTSTATUS sid_to_unixuid(struct ntvfs_module_context *ntvfs,
void *ctx;
struct ldb_message **res;
const char *sidstr;
uint_t atype;
ctx = talloc(req, 0);
sidstr = dom_sid_string(ctx, sid);
@ -53,7 +54,8 @@ static NTSTATUS sid_to_unixuid(struct ntvfs_module_context *ntvfs,
}
/* make sure its a user, not a group */
if (samdb_result_uint(res[0], "sAMAccountType", 0) != ATYPE_NORMAL_ACCOUNT) {
atype = samdb_result_uint(res[0], "sAMAccountType", 0);
if (atype && atype != ATYPE_NORMAL_ACCOUNT) {
DEBUG(0,("sid_to_unixuid: sid %s is not ATYPE_NORMAL_ACCOUNT\n", sidstr));
talloc_free(ctx);
return NT_STATUS_ACCESS_DENIED;
@ -95,7 +97,7 @@ static NTSTATUS sid_to_unixuid(struct ntvfs_module_context *ntvfs,
return NT_STATUS_OK;
}
DEBUG(0,("No sAMAccountName for sid %s!?\n", sidstr));
DEBUG(0,("sid_to_unixuid: no unixID, unixName or sAMAccountName for sid %s\n", sidstr));
talloc_free(ctx);
return NT_STATUS_ACCESS_DENIED;
@ -115,6 +117,7 @@ static NTSTATUS sid_to_unixgid(struct ntvfs_module_context *ntvfs,
void *ctx;
struct ldb_message **res;
const char *sidstr;
uint_t atype;
ctx = talloc(req, 0);
sidstr = dom_sid_string(ctx, sid);
@ -127,7 +130,8 @@ static NTSTATUS sid_to_unixgid(struct ntvfs_module_context *ntvfs,
}
/* make sure its not a user */
if (samdb_result_uint(res[0], "sAMAccountType", 0) == ATYPE_NORMAL_ACCOUNT) {
atype = samdb_result_uint(res[0], "sAMAccountType", 0);
if (atype && atype == ATYPE_NORMAL_ACCOUNT) {
DEBUG(0,("sid_to_unixgid: sid %s is a ATYPE_NORMAL_ACCOUNT\n", sidstr));
talloc_free(ctx);
return NT_STATUS_ACCESS_DENIED;
@ -169,7 +173,7 @@ static NTSTATUS sid_to_unixgid(struct ntvfs_module_context *ntvfs,
return NT_STATUS_OK;
}
DEBUG(0,("No sAMAccountName for sid %s!?\n", sidstr));
DEBUG(0,("sid_to_unixgid: no unixID, unixName or sAMAccountName for sid %s\n", sidstr));
talloc_free(ctx);
return NT_STATUS_ACCESS_DENIED;