diff options
| author | Gerald Carter <jerry@samba.org> | 2007-04-19 22:26:09 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:19:30 -0500 |
| commit | 36da6cb5847df2754e8f9223e0784da6013c572b (patch) | |
| tree | e0c3e6fe06c658ddae8f0d947482e0bdb3657e6c /source3/nsswitch/winbindd_dual.c | |
| parent | dc90cd89a7fef3b0a744ef1873193cf2c9d75cad (diff) | |
| download | samba-36da6cb5847df2754e8f9223e0784da6013c572b.tar.gz samba-36da6cb5847df2754e8f9223e0784da6013c572b.tar.bz2 samba-36da6cb5847df2754e8f9223e0784da6013c572b.zip | |
r22390: Patchset sent to samba-technical to address the winbind
loop when allocating a new id for a SID:
auth_util.patch Revert create_local_token() to
the 3.0.24 codebase
idmap_type.patch Have the caller fillin the
id_map.xid.type field when
resolving a SID so that if we allocate
a new id, we know what type to use
winbindd_api.patch Remove the WINBINDD_SIDS_TO_XIDS calls
from the public winbindd interface
for the 3.0.25 release
idmap_rid.patch Cleanup the idmap_rid backend to not
call back into winbindd to resolve
the SID in order to verify it's type.
(This used to be commit 3b24dae9e73b244540a68b631b428a4d0f57440b)
Diffstat (limited to 'source3/nsswitch/winbindd_dual.c')
| -rw-r--r-- | source3/nsswitch/winbindd_dual.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source3/nsswitch/winbindd_dual.c b/source3/nsswitch/winbindd_dual.c index 20cf55b51d..8d475e6c9f 100644 --- a/source3/nsswitch/winbindd_dual.c +++ b/source3/nsswitch/winbindd_dual.c @@ -364,7 +364,9 @@ static struct winbindd_child_dispatch_table child_dispatch_table[] = { { WINBINDD_CHECK_MACHACC, winbindd_dual_check_machine_acct, "CHECK_MACHACC" }, { WINBINDD_DUAL_SID2UID, winbindd_dual_sid2uid, "DUAL_SID2UID" }, { WINBINDD_DUAL_SID2GID, winbindd_dual_sid2gid, "DUAL_SID2GID" }, +#if 0 /* DISABLED until we fix the interface in Samba 3.0.26 --jerry */ { WINBINDD_DUAL_SIDS2XIDS, winbindd_dual_sids2xids, "DUAL_SIDS2XIDS" }, +#endif /* end DISABLED */ { WINBINDD_DUAL_UID2SID, winbindd_dual_uid2sid, "DUAL_UID2SID" }, { WINBINDD_DUAL_GID2SID, winbindd_dual_gid2sid, "DUAL_GID2SID" }, { WINBINDD_DUAL_UID2NAME, winbindd_dual_uid2name, "DUAL_UID2NAME" }, @@ -921,9 +923,6 @@ static BOOL fork_domain_child(struct winbindd_child *child) child); } - /* quick hack to avoid a loop in idmap, proper fix later */ - set_idmap_in_own_child(); - while (1) { int ret; |