The branch, v3-3-test has been updated
via 91c78b7d2bbb52015378f2a9752e783df33a6fff (commit)
from a713060a6e36706cfd5b997aa4cbfabf4e180c84 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -----------------------------------------------------------------
commit 91c78b7d2bbb52015378f2a9752e783df33a6fff
Author: Karolin Seeger <[email protected]>
Date: Thu Feb 5 15:55:14 2009 +0100
s3/libads: Change "ldap ssl:ads" parameter to "ldap ssl ads".
This used to be commit 3f9daf43.
Karolin
-----------------------------------------------------------------------
Summary of changes:
source/include/proto.h | 1 +
source/libads/ldap.c | 2 +-
source/param/loadparm.c | 12 ++++++++++++
3 files changed, 14 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/include/proto.h b/source/include/proto.h
index b1e3a08..226f7be 100644
--- a/source/include/proto.h
+++ b/source/include/proto.h
@@ -5688,6 +5688,7 @@ bool lp_passdb_expand_explicit(void);
char *lp_ldap_suffix(void);
char *lp_ldap_admin_dn(void);
int lp_ldap_ssl(void);
+bool lp_ldap_ssl_ads(void);
int lp_ldap_passwd_sync(void);
bool lp_ldap_delete_dn(void);
int lp_ldap_replication_sleep(void);
diff --git a/source/libads/ldap.c b/source/libads/ldap.c
index 5c95d4f..a91f4ac 100644
--- a/source/libads/ldap.c
+++ b/source/libads/ldap.c
@@ -672,7 +672,7 @@ got_connection:
ldap_set_option(ads->ldap.ld, LDAP_OPT_PROTOCOL_VERSION, &version);
- if (lp_parm_bool(-1, "ldap ssl", "ads", false)) {
+ if ( lp_ldap_ssl_ads() ) {
status = ADS_ERROR(smb_ldap_start_tls(ads->ldap.ld, version));
if (!ADS_ERR_OK(status)) {
goto out;
diff --git a/source/param/loadparm.c b/source/param/loadparm.c
index 3058e51..027cd3d 100644
--- a/source/param/loadparm.c
+++ b/source/param/loadparm.c
@@ -250,6 +250,7 @@ struct global {
char *szLdapIdmapSuffix;
char *szLdapGroupSuffix;
int ldap_ssl;
+ bool ldap_ssl_ads;
char *szLdapSuffix;
char *szLdapAdminDn;
int ldap_debug_level;
@@ -3576,6 +3577,15 @@ static struct parm_struct parm_table[] = {
.flags = FLAG_ADVANCED,
},
{
+ .label = "ldap ssl ads",
+ .type = P_BOOL,
+ .p_class = P_GLOBAL,
+ .ptr = &Globals.ldap_ssl_ads,
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
+ },
+ {
.label = "ldap timeout",
.type = P_INTEGER,
.p_class = P_GLOBAL,
@@ -4784,6 +4794,7 @@ static void init_globals(bool first_time_only)
string_set(&Globals.szLdapAdminDn, "");
Globals.ldap_ssl = LDAP_SSL_START_TLS;
+ Globals.ldap_ssl_ads = False;
Globals.ldap_passwd_sync = LDAP_PASSWD_SYNC_OFF;
Globals.ldap_delete_dn = False;
Globals.ldap_replication_sleep = 1000; /* wait 1 sec for replication */
@@ -5107,6 +5118,7 @@ FN_GLOBAL_BOOL(lp_passdb_expand_explicit,
&Globals.bPassdbExpandExplicit)
FN_GLOBAL_STRING(lp_ldap_suffix, &Globals.szLdapSuffix)
FN_GLOBAL_STRING(lp_ldap_admin_dn, &Globals.szLdapAdminDn)
FN_GLOBAL_INTEGER(lp_ldap_ssl, &Globals.ldap_ssl)
+FN_GLOBAL_BOOL(lp_ldap_ssl_ads, &Globals.ldap_ssl_ads)
FN_GLOBAL_INTEGER(lp_ldap_passwd_sync, &Globals.ldap_passwd_sync)
FN_GLOBAL_BOOL(lp_ldap_delete_dn, &Globals.ldap_delete_dn)
FN_GLOBAL_INTEGER(lp_ldap_replication_sleep, &Globals.ldap_replication_sleep)
--
Samba Shared Repository
