diff options
| author | Gerald Carter <jerry@samba.org> | 2003-07-07 05:11:10 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2003-07-07 05:11:10 +0000 |
| commit | 0b18acb841f6a372b3aa285d4734875e5e35fe3b (patch) | |
| tree | add4afee2b70d87bfd96b7702d9d6a2476ac7e74 /source3/nsswitch/winbindd_passdb.c | |
| parent | b5cd4a8643169b276a3af8a9272d212d76a54dd3 (diff) | |
| download | samba-0b18acb841f6a372b3aa285d4734875e5e35fe3b.tar.gz samba-0b18acb841f6a372b3aa285d4734875e5e35fe3b.tar.bz2 samba-0b18acb841f6a372b3aa285d4734875e5e35fe3b.zip | |
and so it begins....
* remove idmap_XX_to_XX calls from smbd. Move back to the
the winbind_XXX and local_XXX calls used in 2.2
* all uid/gid allocation must involve winbindd now
* move flags field around in winbindd_request struct
* add WBFLAG_QUERY_ONLY option to winbindd_sid_to_[ug]id()
to prevent automatic allocation for unknown SIDs
* add 'winbind trusted domains only' parameter to force a domain member
server to use matching users names from /etc/passwd for its domain
(needed for domain member of a Samba domain)
* rename 'idmap only' to 'enable rid algorithm' for better clarity
(defaults to "yes")
code has been tested on
* domain member of native mode 2k domain
* ads domain member of native mode 2k domain
* domain member of NT4 domain
* domain member of Samba domain
* Samba PDC running winbindd with trusts
Logons tested using 2k clients and smbclient as domain users
and trusted users. Tested both 'winbind trusted domains only = [yes|no]'
This will be a long week of changes. The next item on the list is
winbindd_passdb.c & machine trust accounts not in /etc/passwd (done
via winbindd_passdb)
(This used to be commit 8266dffab4aedba12a33289ff32880037ce950a8)
Diffstat (limited to 'source3/nsswitch/winbindd_passdb.c')
| -rw-r--r-- | source3/nsswitch/winbindd_passdb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/nsswitch/winbindd_passdb.c b/source3/nsswitch/winbindd_passdb.c index 401662b6a7..456b1afeab 100644 --- a/source3/nsswitch/winbindd_passdb.c +++ b/source3/nsswitch/winbindd_passdb.c @@ -175,7 +175,7 @@ static NTSTATUS sid_to_name(struct winbindd_domain *domain, DEBUG(3,("pdb: sid_to_name sid=%s\n", sid_string_static(sid))); - if (NT_STATUS_IS_OK(sid_to_uid(sid, &id))) { /* this is a user */ + if (NT_STATUS_IS_OK(idmap_sid_to_uid(sid, &id, 0))) { /* this is a user */ if (!NT_STATUS_IS_OK(result = pdb_init_sam(&sam_account))) { return result; @@ -197,7 +197,7 @@ static NTSTATUS sid_to_name(struct winbindd_domain *domain, *type = SID_NAME_USER; result = NT_STATUS_OK; - } else if (NT_STATUS_IS_OK(sid_to_gid(sid, &id))) { /* this is a group */ + } else if (NT_STATUS_IS_OK(idmap_sid_to_gid(sid, &id, 0))) { /* this is a group */ DEBUG(3,("pdb: sid_to_name: group support not implemented\n")); result = NT_STATUS_UNSUCCESSFUL; |