Author: jerry Date: 2005-05-31 16:09:58 +0000 (Tue, 31 May 2005) New Revision: 7142
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=7142 Log: removing 'ldap filter' smb.conf option Modified: branches/SAMBA_3_0/source/param/loadparm.c branches/SAMBA_3_0/source/passdb/pdb_ldap.c Changeset: Modified: branches/SAMBA_3_0/source/param/loadparm.c =================================================================== --- branches/SAMBA_3_0/source/param/loadparm.c 2005-05-31 14:02:41 UTC (rev 7141) +++ branches/SAMBA_3_0/source/param/loadparm.c 2005-05-31 16:09:58 UTC (rev 7142) @@ -238,7 +238,6 @@ #endif int ldap_ssl; char *szLdapSuffix; - char *szLdapFilter; char *szLdapAdminDn; char *szAclCompat; char *szCupsServer; @@ -1116,7 +1115,6 @@ #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 @@ #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_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) Modified: branches/SAMBA_3_0/source/passdb/pdb_ldap.c =================================================================== --- branches/SAMBA_3_0/source/passdb/pdb_ldap.c 2005-05-31 14:02:41 UTC (rev 7141) +++ branches/SAMBA_3_0/source/passdb/pdb_ldap.c 2005-05-31 16:09:58 UTC (rev 7142) @@ -198,7 +198,7 @@ * 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 @@ 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 @@ 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 *result = NULL; asprintf(&filter, "(&%s(objectclass=sambaSamAccount))", - lp_ldap_filter()); + "(uid=%u)"); if (filter == NULL) goto done; escaped = escape_ldap_string_alloc(username);