summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-10-03 10:25:06 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:59:35 -0500
commitfe3294f7f02c7ed57aab8ea17f0072f721284a8c (patch)
treec49169d58be0621e80ef56cd3934b055b22a222d /source4
parent830ac69b1d69a38b160a8c226ede2ce489e7de39 (diff)
downloadsamba-fe3294f7f02c7ed57aab8ea17f0072f721284a8c.tar.gz
samba-fe3294f7f02c7ed57aab8ea17f0072f721284a8c.tar.bz2
samba-fe3294f7f02c7ed57aab8ea17f0072f721284a8c.zip
r2803: allow unixuid module to work with foreign security principles
(This used to be commit f522728728fa523ce7d9e73c93b27e71f3757d50)
Diffstat (limited to 'source4')
-rw-r--r--source4/ntvfs/unixuid/vfs_unixuid.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/source4/ntvfs/unixuid/vfs_unixuid.c b/source4/ntvfs/unixuid/vfs_unixuid.c
index de759f6e5f..ae29fd7bea 100644
--- a/source4/ntvfs/unixuid/vfs_unixuid.c
+++ b/source4/ntvfs/unixuid/vfs_unixuid.c
@@ -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;