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

s3-winbindd: add support for idmap type WBC_ID_TYPE_BOTH

Browse Source 
this allows the s3 code to understand and cache responses from the s4
winbindd which may include a single SID mapped to both a uid and a gid

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

Signed-off-by: Michael Adam <obnox@samba.org>

Autobuild-User: Michael Adam <obnox@samba.org>
Autobuild-Date: Fri Sep 23 01:47:54 CEST 2011 on sn-devel-104
This commit is contained in:
Andrew Tridgell 2011-07-26 11:07:12 +10:00 committed by Michael Adam
parent dbbb69e572
commit f236c539ad
4 changed files with 66 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source3/auth/auth_util.c
View File

@ -608,7 +608,8 @@ NTSTATUS create_local_token(TALLOC_CTX *mem_ctx,
for (i=1; i<t->num_sids; i++) {
if (ids[i].type != WBC_ID_TYPE_GID) {
if (ids[i].type != WBC_ID_TYPE_GID &&
ids[i].type != WBC_ID_TYPE_BOTH) {
DEBUG(10, ("Could not convert SID %s to gid, "
"ignoring it\n",
sid_string_dbg(&t->sids[i])));

57
source3/lib/idmap_cache.c
View File

@ -261,7 +261,54 @@ void idmap_cache_set_sid2gid(const struct dom_sid *sid, gid_t gid)
}
}
/**
* Store a mapping in the idmap cache
* @param[in] sid the sid to map
* @param[in] uid/gid the uid/gid to map
*
* If both parameters are valid values, then a positive mapping in both
* directions is stored. If "is_null_sid(sid)" is true, then this will be a
* negative mapping of gid, we want to cache that for this id we could not
* find anything. Likewise if "id==-1", then we want to cache that we did not
* find a mapping for the sid passed here.
*/
void idmap_cache_set_sid2both(const struct dom_sid *sid, uid_t id)
{
time_t now = time(NULL);
time_t timeout;
fstring sidstr, key, value;
if (!is_null_sid(sid)) {
fstr_sprintf(key, "IDMAP/SID2BOTH/%s",
sid_to_fstring(sidstr, sid));
fstr_sprintf(value, "%d", (int)id);
timeout = (id == -1)
? lp_idmap_negative_cache_time()
: lp_idmap_cache_time();
gencache_set(key, value, now + timeout);
}
if (id != -1) {
fstr_sprintf(key, "IDMAP/BOTH2SID/%d", (int)id);
if (is_null_sid(sid)) {
/* negative id mapping */
fstrcpy(value, "-");
timeout = lp_idmap_negative_cache_time();
}
else {
sid_to_fstring(value, sid);
timeout = lp_idmap_cache_time();
}
gencache_set(key, value, now + timeout);
}
}
static char* key_xid2sid_str(TALLOC_CTX* mem_ctx, char t, const char* id) {
if (t == 'B') {
return talloc_asprintf(mem_ctx, "IDMAP/BOTH2SID/%s", id);
}
return talloc_asprintf(mem_ctx, "IDMAP/%cID2SID/%s", t, id);
}
@ -272,6 +319,9 @@ static char* key_xid2sid(TALLOC_CTX* mem_ctx, char t, int id) {
}
static char* key_sid2xid_str(TALLOC_CTX* mem_ctx, char t, const char* sid) {
if (t == 'B') {
return talloc_asprintf(mem_ctx, "IDMAP/SID2BOTH/%s", sid);
}
return talloc_asprintf(mem_ctx, "IDMAP/SID2%cID/%s", t, sid);
}
@ -328,6 +378,10 @@ bool idmap_cache_del_gid(gid_t gid) {
return idmap_cache_del_xid('G', gid);
}
bool idmap_cache_del_both(uid_t id) {
return idmap_cache_del_xid('B', id);
}
static bool idmap_cache_del_sid2xid(TALLOC_CTX* mem_ctx, char t, const char* sid)
{
const char* sid_key = key_sid2xid_str(mem_ctx, t, sid);
@ -367,7 +421,8 @@ bool idmap_cache_del_sid(const struct dom_sid *sid)
bool ret = true;
if (!idmap_cache_del_sid2xid(mem_ctx, 'U', sid_str) &&
!idmap_cache_del_sid2xid(mem_ctx, 'G', sid_str))
!idmap_cache_del_sid2xid(mem_ctx, 'G', sid_str) &&
!idmap_cache_del_sid2xid(mem_ctx, 'B', sid_str))
{
DEBUG(3, ("no entry: %s\n", key_xid2sid_str(mem_ctx, '?', sid_str)));
ret = false;

2
source3/lib/idmap_cache.h
View File

@ -31,9 +31,11 @@ bool idmap_cache_find_sid2gid(const struct dom_sid *sid, gid_t *pgid,
bool *expired);
bool idmap_cache_find_gid2sid(gid_t gid, struct dom_sid *sid, bool *expired);
void idmap_cache_set_sid2gid(const struct dom_sid *sid, gid_t gid);
void idmap_cache_set_sid2both(const struct dom_sid *sid, uid_t id);
bool idmap_cache_del_uid(uid_t uid);
bool idmap_cache_del_gid(gid_t gid);
bool idmap_cache_del_both(uid_t uid);
bool idmap_cache_del_sid(const struct dom_sid *sid);
#endif /* _LIB_IDMAP_CACHE_H_ */

6
source3/winbindd/winbindd_sids_to_xids.c
View File

@ -284,6 +284,12 @@ NTSTATUS winbindd_sids_to_xids_recv(struct tevent_req *req,
&state->non_cached[num_non_cached],
unix_id);
break;
case WBC_ID_TYPE_BOTH:
type = 'B';
idmap_cache_set_sid2both(
&state->non_cached[num_non_cached],
unix_id);
break;
default:
found = false;
}