From f381faa8d6fc2c4205e7d59c91f00324f70ca8b9 Mon Sep 17 00:00:00 2001 From: Karolin Seeger Date: Mon, 26 Oct 2009 12:11:59 +0100 Subject: s3: Rename new parameter "ldap ref follow" to "ldap follow referral". This parameter will be introduced with Samba 3.5.0. Karolin --- source3/param/loadparm.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'source3/param') 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) -- cgit