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 | |
| 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)
| -rw-r--r-- | source3/param/loadparm.c | 4 | ||||
| -rw-r--r-- | source3/passdb/pdb_ldap.c | 8 |
2 files changed, 4 insertions, 8 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index aeca0fab43..2c6a93483d 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -238,7 +238,6 @@ typedef struct #endif int ldap_ssl; char *szLdapSuffix; - char *szLdapFilter; char *szLdapAdminDn; char *szAclCompat; char *szCupsServer; @@ -1116,7 +1115,6 @@ static struct parm_struct parm_table[] = { #endif {"ldap admin dn", P_STRING, P_GLOBAL, &Globals.szLdapAdminDn, NULL, NULL, FLAG_ADVANCED}, {"ldap delete dn", P_BOOL, P_GLOBAL, &Globals.ldap_delete_dn, NULL, NULL, FLAG_ADVANCED}, - {"ldap filter", P_STRING, P_GLOBAL, &Globals.szLdapFilter, NULL, NULL, FLAG_ADVANCED}, {"ldap group suffix", P_STRING, P_GLOBAL, &Globals.szLdapGroupSuffix, NULL, NULL, FLAG_ADVANCED}, {"ldap idmap suffix", P_STRING, P_GLOBAL, &Globals.szLdapIdmapSuffix, NULL, NULL, FLAG_ADVANCED}, {"ldap machine suffix", P_STRING, P_GLOBAL, &Globals.szLdapMachineSuffix, NULL, NULL, FLAG_ADVANCED}, @@ -1505,7 +1503,6 @@ static void init_globals(void) #endif /* WITH_LDAP_SAMCONFIG */ string_set(&Globals.szLdapSuffix, ""); - string_set(&Globals.szLdapFilter, "(uid=%u)"); string_set(&Globals.szLdapMachineSuffix, ""); string_set(&Globals.szLdapUserSuffix, ""); string_set(&Globals.szLdapGroupSuffix, ""); @@ -1769,7 +1766,6 @@ FN_GLOBAL_STRING(lp_ldap_server, &Globals.szLdapServer) FN_GLOBAL_INTEGER(lp_ldap_port, &Globals.ldap_port) #endif FN_GLOBAL_STRING(lp_ldap_suffix, &Globals.szLdapSuffix) -FN_GLOBAL_STRING(lp_ldap_filter, &Globals.szLdapFilter) FN_GLOBAL_STRING(lp_ldap_admin_dn, &Globals.szLdapAdminDn) FN_GLOBAL_INTEGER(lp_ldap_ssl, &Globals.ldap_ssl) FN_GLOBAL_INTEGER(lp_ldap_passwd_sync, &Globals.ldap_passwd_sync) 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); |