diff options
| author | Gerald Carter <jerry@samba.org> | 2005-05-31 16:09:58 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2005-05-31 16:09:58 +0000 |
| commit | 318efc4c6cd2b83f02b43d4c8e5a1392f2bd9e32 (patch) | |
| tree | 70c6bce12a821010bc68e22c1664dead1002e257 /source/param | |
| parent | f4eecd6816c0056485f158368ed5abfac02eb735 (diff) | |
| download | samba-318efc4c6cd2b83f02b43d4c8e5a1392f2bd9e32.tar.gz samba-318efc4c6cd2b83f02b43d4c8e5a1392f2bd9e32.tar.xz samba-318efc4c6cd2b83f02b43d4c8e5a1392f2bd9e32.zip | |
r7142: removing 'ldap filter' smb.conf option
Diffstat (limited to 'source/param')
| -rw-r--r-- | source/param/loadparm.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/source/param/loadparm.c b/source/param/loadparm.c index aeca0fab437..2c6a93483d5 100644 --- a/source/param/loadparm.c +++ b/source/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) |