summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorKarolin Seeger <kseeger@samba.org>2009-10-26 12:11:59 +0100
committerKarolin Seeger <kseeger@samba.org>2009-10-26 12:11:59 +0100
commitf381faa8d6fc2c4205e7d59c91f00324f70ca8b9 (patch)
treeb8045086dff2d2eedd02a0dfc63f6834c2473dae /source3
parent35dc481289c28a77f354dd76193d6298de32c66d (diff)
downloadsamba-f381faa8d6fc2c4205e7d59c91f00324f70ca8b9.tar.gz
samba-f381faa8d6fc2c4205e7d59c91f00324f70ca8b9.tar.bz2
samba-f381faa8d6fc2c4205e7d59c91f00324f70ca8b9.zip
s3: Rename new parameter "ldap ref follow" to "ldap follow referral".
This parameter will be introduced with Samba 3.5.0. Karolin
Diffstat (limited to 'source3')
-rw-r--r--source3/include/proto.h2
-rw-r--r--source3/lib/smbldap.c4
-rw-r--r--source3/param/loadparm.c10
3 files changed, 8 insertions, 8 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 4f33a4adf6..dd87ef0766 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -3985,7 +3985,7 @@ 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_ref_follow(void);
+int lp_ldap_follow_referral(void);
int lp_ldap_passwd_sync(void);
bool lp_ldap_delete_dn(void);
int lp_ldap_replication_sleep(void);
diff --git a/source3/lib/smbldap.c b/source3/lib/smbldap.c
index 7287e3d998..f7ca1c167b 100644
--- a/source3/lib/smbldap.c
+++ b/source3/lib/smbldap.c
@@ -724,9 +724,9 @@ int smb_ldap_setup_conn(LDAP **ldap_struct, const char *uri)
return rc;
}
- if (lp_ldap_ref_follow() != Auto) {
+ if (lp_ldap_follow_referral() != Auto) {
rc = ldap_set_option(*ldap_struct, LDAP_OPT_REFERRALS,
- lp_ldap_ref_follow() ? LDAP_OPT_ON : LDAP_OPT_OFF);
+ lp_ldap_follow_referral() ? LDAP_OPT_ON : LDAP_OPT_OFF);
if (rc != LDAP_SUCCESS)
DEBUG(0, ("Failed to set LDAP_OPT_REFERRALS: %s\n",
ldap_err2string(rc)));
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index fa0577ba96..049b5e928a 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -260,7 +260,7 @@ struct global {
char *szLdapGroupSuffix;
int ldap_ssl;
bool ldap_ssl_ads;
- int ldap_ref_follow;
+ int ldap_follow_referral;
char *szLdapSuffix;
char *szLdapAdminDn;
int ldap_debug_level;
@@ -3672,10 +3672,10 @@ static struct parm_struct parm_table[] = {
.flags = FLAG_ADVANCED,
},
{
- .label = "ldap ref follow",
+ .label = "ldap follow referral",
.type = P_ENUM,
.p_class = P_GLOBAL,
- .ptr = &Globals.ldap_ref_follow,
+ .ptr = &Globals.ldap_follow_referral,
.special = NULL,
.enum_list = enum_bool_auto,
.flags = FLAG_ADVANCED,
@@ -5052,7 +5052,7 @@ static void init_globals(bool first_time_only)
Globals.ldap_passwd_sync = LDAP_PASSWD_SYNC_OFF;
Globals.ldap_delete_dn = False;
Globals.ldap_replication_sleep = 1000; /* wait 1 sec for replication */
- Globals.ldap_ref_follow = Auto;
+ Globals.ldap_follow_referral = Auto;
Globals.ldap_timeout = LDAP_DEFAULT_TIMEOUT;
Globals.ldap_connection_timeout = LDAP_CONNECTION_DEFAULT_TIMEOUT;
Globals.ldap_page_size = LDAP_PAGE_SIZE;
@@ -5402,7 +5402,7 @@ 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_ref_follow, &Globals.ldap_ref_follow)
+FN_GLOBAL_INTEGER(lp_ldap_follow_referral, &Globals.ldap_follow_referral)
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)