diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2002-11-02 03:47:48 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2002-11-02 03:47:48 +0000 |
| commit | 6d7195d1d79c43f5ccc8dc4a9215c02177d5fa89 (patch) | |
| tree | bd5e6a9c83f8fa55c98750ce555c66f0c109f569 /source3/param | |
| parent | aea57af3e38873e808afc3c742ba46527f686f6f (diff) | |
| download | samba-6d7195d1d79c43f5ccc8dc4a9215c02177d5fa89.tar.gz samba-6d7195d1d79c43f5ccc8dc4a9215c02177d5fa89.tar.bz2 samba-6d7195d1d79c43f5ccc8dc4a9215c02177d5fa89.zip | |
Merge passdb from HEAD -> 3.0
The work here includes:
- metze' set/changed patch, which avoids making changes to ldap on unmodified
attributes.
- volker's group mapping in passdb patch
- volker's samsync stuff
- volkers SAMR changes.
- mezte's connection caching patch
- my recent changes (fix magic root check, ldap ssl)
Andrew Bartlett
(This used to be commit 2044d60bbe0043cdbb9aba931115672bde975d2f)
Diffstat (limited to 'source3/param')
| -rw-r--r-- | source3/param/loadparm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index c54281332b..7c87a51684 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -583,10 +583,12 @@ static struct enum_list enum_printing[] = { }; static struct enum_list enum_ldap_ssl[] = { +#ifdef WITH_LDAP_SAMCONFIG {LDAP_SSL_ON, "Yes"}, {LDAP_SSL_ON, "yes"}, {LDAP_SSL_ON, "on"}, {LDAP_SSL_ON, "On"}, +#endif {LDAP_SSL_OFF, "no"}, {LDAP_SSL_OFF, "No"}, {LDAP_SSL_OFF, "off"}, |