mirror of
https://github.com/samba-team/samba.git
synced 2025-11-29 16:23:52 +03:00
s3: Rename new parameter "ldap ref follow" to "ldap follow referral".
This parameter will be introduced with Samba 3.5.0. Karolin
This commit is contained in:
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user