summaryrefslogtreecommitdiff
path: root/source3/passdb
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-03-23 17:30:34 +1100
committerMichael Adam <obnox@samba.org>2012-05-02 12:45:30 +0200
commitac97f151ed18351bf648b00e358cfb127f261826 (patch)
tree1d2e645635dab5bedc60ea0df4fff3e50a5ecffb /source3/passdb
parent2d5df933f421602276c3dfc04852911d91f631fc (diff)
downloadsamba-ac97f151ed18351bf648b00e358cfb127f261826.tar.gz
samba-ac97f151ed18351bf648b00e358cfb127f261826.tar.bz2
samba-ac97f151ed18351bf648b00e358cfb127f261826.zip
s3-passdb: Use struct unixid in sids_to_unix_ids
This avoids the union in the struct wbcUnixId and moves us to using only struct unixid internally. Andrew Bartlett Signed-off-by: Michael Adam <obnox@samba.org>
Diffstat (limited to 'source3/passdb')
-rw-r--r--source3/passdb/lookup_sid.c48
-rw-r--r--source3/passdb/lookup_sid.h2
2 files changed, 32 insertions, 18 deletions
diff --git a/source3/passdb/lookup_sid.c b/source3/passdb/lookup_sid.c
index a70d31791f..a4af677714 100644
--- a/source3/passdb/lookup_sid.c
+++ b/source3/passdb/lookup_sid.c
@@ -1253,7 +1253,7 @@ void gid_to_sid(struct dom_sid *psid, gid_t gid)
}
bool sids_to_unix_ids(const struct dom_sid *sids, uint32_t num_sids,
- struct wbcUnixId *ids)
+ struct unixid *ids)
{
struct wbcDomainSid *wbc_sids = NULL;
struct wbcUnixId *wbc_ids = NULL;
@@ -1274,29 +1274,29 @@ bool sids_to_unix_ids(const struct dom_sid *sids, uint32_t num_sids,
if (sid_peek_check_rid(&global_sid_Unix_Users,
&sids[i], &rid)) {
- ids[i].type = WBC_ID_TYPE_UID;
- ids[i].id.uid = rid;
+ ids[i].type = ID_TYPE_UID;
+ ids[i].id = rid;
continue;
}
if (sid_peek_check_rid(&global_sid_Unix_Groups,
&sids[i], &rid)) {
- ids[i].type = WBC_ID_TYPE_GID;
- ids[i].id.gid = rid;
+ ids[i].type = ID_TYPE_GID;
+ ids[i].id = rid;
continue;
}
- if (idmap_cache_find_sid2uid(&sids[i], &ids[i].id.uid,
+ if (idmap_cache_find_sid2uid(&sids[i], &ids[i].id,
&expired)
&& !expired) {
- ids[i].type = WBC_ID_TYPE_UID;
+ ids[i].type = ID_TYPE_UID;
continue;
}
- if (idmap_cache_find_sid2gid(&sids[i], &ids[i].id.gid,
+ if (idmap_cache_find_sid2gid(&sids[i], &ids[i].id,
&expired)
&& !expired) {
- ids[i].type = WBC_ID_TYPE_GID;
+ ids[i].type = ID_TYPE_GID;
continue;
}
- ids[i].type = WBC_ID_TYPE_NOT_SPECIFIED;
+ ids[i].type = ID_TYPE_NOT_SPECIFIED;
memcpy(&wbc_sids[num_not_cached], &sids[i],
ndr_size_dom_sid(&sids[i], 0));
num_not_cached += 1;
@@ -1320,22 +1320,36 @@ bool sids_to_unix_ids(const struct dom_sid *sids, uint32_t num_sids,
num_not_cached = 0;
for (i=0; i<num_sids; i++) {
- if (ids[i].type == WBC_ID_TYPE_NOT_SPECIFIED) {
- ids[i] = wbc_ids[num_not_cached];
+ if (ids[i].type == ID_TYPE_NOT_SPECIFIED) {
+ switch (wbc_ids[num_not_cached].type) {
+ case ID_TYPE_UID:
+ ids[i].type = WBC_ID_TYPE_UID;
+ ids[i].id = wbc_ids[num_not_cached].id.uid;
+ break;
+ case ID_TYPE_GID:
+ ids[i].type = WBC_ID_TYPE_GID;
+ ids[i].id = wbc_ids[num_not_cached].id.gid;
+ break;
+ default:
+ /* The types match, and wbcUnixId -> id is a union anyway */
+ ids[i].type = wbc_ids[num_not_cached].type;
+ ids[i].id = wbc_ids[num_not_cached].id.gid;
+ break;
+ }
num_not_cached += 1;
}
}
for (i=0; i<num_sids; i++) {
- if (ids[i].type != WBC_ID_TYPE_NOT_SPECIFIED) {
+ if (ids[i].type != ID_TYPE_NOT_SPECIFIED) {
continue;
}
- if (legacy_sid_to_gid(&sids[i], &ids[i].id.gid)) {
- ids[i].type = WBC_ID_TYPE_GID;
+ if (legacy_sid_to_gid(&sids[i], &ids[i].id)) {
+ ids[i].type = ID_TYPE_GID;
continue;
}
- if (legacy_sid_to_uid(&sids[i], &ids[i].id.uid)) {
- ids[i].type = WBC_ID_TYPE_UID;
+ if (legacy_sid_to_uid(&sids[i], &ids[i].id)) {
+ ids[i].type = ID_TYPE_UID;
continue;
}
}
diff --git a/source3/passdb/lookup_sid.h b/source3/passdb/lookup_sid.h
index 65444c39a6..068e499664 100644
--- a/source3/passdb/lookup_sid.h
+++ b/source3/passdb/lookup_sid.h
@@ -87,7 +87,7 @@ bool sid_to_uid(const struct dom_sid *psid, uid_t *puid);
bool sid_to_gid(const struct dom_sid *psid, gid_t *pgid);
struct wbcUnixId;
bool sids_to_unix_ids(const struct dom_sid *sids, uint32_t num_sids,
- struct wbcUnixId *ids);
+ struct unixid *ids);
NTSTATUS get_primary_group_sid(TALLOC_CTX *mem_ctx,
const char *username,
struct passwd **_pwd,