diff options
author | Luke Leighton <lkcl@samba.org> | 1998-12-07 21:37:17 +0000 |
---|---|---|
committer | Luke Leighton <lkcl@samba.org> | 1998-12-07 21:37:17 +0000 |
commit | 2c438c86cbb38833b3abd4fbead6324687633b25 (patch) | |
tree | fff63c7a117c21722c952b6e1ca2cb1ea24b56ec /source/param | |
parent | 8a85d7abed317fd06e3e0026d4b9e088311eede4 (diff) | |
download | samba-2c438c86cbb38833b3abd4fbead6324687633b25.tar.gz samba-2c438c86cbb38833b3abd4fbead6324687633b25.tar.xz samba-2c438c86cbb38833b3abd4fbead6324687633b25.zip |
matthew chapman's ldap code, to date. plus docs!
Diffstat (limited to 'source/param')
-rw-r--r-- | source/param/loadparm.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/source/param/loadparm.c b/source/param/loadparm.c index 871fc774a5c..df5a584aaba 100644 --- a/source/param/loadparm.c +++ b/source/param/loadparm.c @@ -146,11 +146,12 @@ typedef struct char *szDomainOtherSIDs; char *szDriverFile; char *szNameResolveOrder; +#ifdef WITH_LDAP char *szLdapServer; char *szLdapSuffix; - char *szLdapFilter; - char *szLdapRoot; - char *szLdapRootPassword; + char *szLdapBindAs; + char *szLdapPasswdFile; +#endif /* WITH_LDAP */ char *szPanicAction; int max_log_size; int mangled_stack; @@ -742,9 +743,8 @@ static struct parm_struct parm_table[] = {"ldap server", P_STRING, P_GLOBAL, &Globals.szLdapServer, NULL, NULL, 0}, {"ldap port", P_INTEGER, P_GLOBAL, &Globals.ldap_port, NULL, NULL, 0}, {"ldap suffix", P_STRING, P_GLOBAL, &Globals.szLdapSuffix, NULL, NULL, 0}, - {"ldap filter", P_STRING, P_GLOBAL, &Globals.szLdapFilter, NULL, NULL, 0}, - {"ldap root", P_STRING, P_GLOBAL, &Globals.szLdapRoot, NULL, NULL, 0}, - {"ldap root passwd", P_STRING, P_GLOBAL, &Globals.szLdapRootPassword,NULL, NULL, 0}, + {"ldap bind as", P_STRING, P_GLOBAL, &Globals.szLdapBindAs, NULL, NULL, 0}, + {"ldap passwd file", P_STRING, P_GLOBAL, &Globals.szLdapPasswdFile, NULL, NULL, 0}, #endif /* WITH_LDAP */ @@ -1156,9 +1156,8 @@ FN_GLOBAL_STRING(lp_panic_action,&Globals.szPanicAction) #ifdef WITH_LDAP FN_GLOBAL_STRING(lp_ldap_server,&Globals.szLdapServer); FN_GLOBAL_STRING(lp_ldap_suffix,&Globals.szLdapSuffix); -FN_GLOBAL_STRING(lp_ldap_filter,&Globals.szLdapFilter); -FN_GLOBAL_STRING(lp_ldap_root,&Globals.szLdapRoot); -FN_GLOBAL_STRING(lp_ldap_rootpasswd,&Globals.szLdapRootPassword); +FN_GLOBAL_STRING(lp_ldap_bind_as,&Globals.szLdapBindAs); +FN_GLOBAL_STRING(lp_ldap_passwd_file,&Globals.szLdapPasswdFile); #endif /* WITH_LDAP */ #ifdef WITH_SSL |