diff options
| author | Gerald Carter <jerry@samba.org> | 2005-05-31 16:09:58 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:57:03 -0500 |
| commit | 27ccf6ba6abd6815212b7520a986b904e9b27669 (patch) | |
| tree | 042b7a51d8d470d11b9aa2d86239bb27d35db382 /source3/passdb/pdb_ldap.c | |
| parent | 049d6714cb5aa0811624666335995b4b3fd28254 (diff) | |
| download | samba-27ccf6ba6abd6815212b7520a986b904e9b27669.tar.gz samba-27ccf6ba6abd6815212b7520a986b904e9b27669.tar.bz2 samba-27ccf6ba6abd6815212b7520a986b904e9b27669.zip | |
r7142: removing 'ldap filter' smb.conf option
(This used to be commit e2f8eeb4e26e8f7bec4d9dc820b86a7b548f82da)
Diffstat (limited to 'source3/passdb/pdb_ldap.c')
| -rw-r--r-- | source3/passdb/pdb_ldap.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c index eb459f963b..d688a04dc4 100644 --- a/source3/passdb/pdb_ldap.c +++ b/source3/passdb/pdb_ldap.c @@ -198,7 +198,7 @@ int ldapsam_search_suffix_by_name(struct ldapsam_privates *ldap_state, * in the filter expression, replace %u with the real name * so in ldap filter, %u MUST exist :-) */ - pstr_sprintf(filter, "(&%s%s)", lp_ldap_filter(), + pstr_sprintf(filter, "(&%s%s)", "(uid=%u)", get_objclass_filter(ldap_state->schema_ver)); /* @@ -1210,7 +1210,7 @@ static NTSTATUS ldapsam_setsampwent(struct pdb_methods *my_methods, BOOL update, const char **attr_list; BOOL machine_mask = False, user_mask = False; - pstr_sprintf( filter, "(&%s%s)", lp_ldap_filter(), + pstr_sprintf( filter, "(&%s%s)", "(uid=%u)", get_objclass_filter(ldap_state->schema_ver)); all_string_sub(filter, "%u", "*", sizeof(pstring)); @@ -1806,7 +1806,7 @@ static NTSTATUS ldapsam_add_sam_account(struct pdb_methods *my_methods, SAM_ACCO we need to return the samba attributes here */ escape_user = escape_ldap_string_alloc( username ); - pstrcpy( filter, lp_ldap_filter() ); + pstrcpy( filter, "(uid=%u)" ); all_string_sub( filter, "%u", escape_user, sizeof(filter) ); SAFE_FREE( escape_user ); @@ -3328,7 +3328,7 @@ char *get_ldap_filter(TALLOC_CTX *mem_ctx, const char *username) char *result = NULL; asprintf(&filter, "(&%s(objectclass=sambaSamAccount))", - lp_ldap_filter()); + "(uid=%u)"); if (filter == NULL) goto done; escaped = escape_ldap_string_alloc(username); |