From a4b00668e656024ebb2b19e4d93dba1a3d334229 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 22 Apr 2003 23:14:49 +0000 Subject: Remove ldapsam_search_one_user_by_uid from pdb_ldap. sambaAccount requires the rid to be present, and doing this fallback is quite dangerous, becouse it assumes that alorithmic RIDs are in use - which is quite often not the case. Also finish of vl's work on 'use a function pointer, not embedded logic' to tell lower levels that they should/should not attempt to set the user's password into LDAP with the extended operation. Andrew Bartlett (This used to be commit 715d0bd804b6bff4c0b365f98ca196d41ed9c5c4) --- source3/passdb/passdb.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'source3/passdb/passdb.c') diff --git a/source3/passdb/passdb.c b/source3/passdb/passdb.c index 5e6466ff0a..b868d27065 100644 --- a/source3/passdb/passdb.c +++ b/source3/passdb/passdb.c @@ -646,9 +646,8 @@ BOOL local_lookup_sid(DOM_SID *sid, char *name, enum SID_NAME_USE *psid_name_use if (!NT_STATUS_IS_OK(pdb_init_sam(&sam_account))) { return False; } - - /* This now does the 'generic' mapping in pdb_unix */ - /* 'guest' is also handled there */ + + /* see if the passdb can help us with the name of the user */ if (pdb_getsampwsid(sam_account, sid)) { fstrcpy(name, pdb_get_username(sam_account)); *psid_name_use = SID_NAME_USER; -- cgit