s3: Rename new parameter "ldap ref follow" to "ldap follow referral".

This parameter will be introduced with Samba 3.5.0.

Karolin

diff --git a/docs-xml/smbdotconf/ldap/ldapreffollow.xml b/docs-xml/smbdotconf/ldap/ldapfollowreferral.xml
similarity index 90%
rename from docs-xml/smbdotconf/ldap/ldapreffollow.xml
rename to docs-xml/smbdotconf/ldap/ldapfollowreferral.xml
index f059f15f15fa54b8f838e0c9bfcf3404f20bc036..4c43b5bb50c35431c385e7bcd8296b991490af25 100644 (file)
--- a/docs-xml/smbdotconf/ldap/ldapreffollow.xml
+++ b/docs-xml/smbdotconf/ldap/ldapfollowreferral.xml
@@ -1,4 +1,4 @@
-<samba:parameter name="ldap ref follow" context="G" type="enum"
+<samba:parameter name="ldap follow referral" context="G" type="enum"
        advanced="1" developer="1"
        xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 4f33a4adf69fefbd464f213d4d1e9e338a9263c8..dd87ef0766ff9c9afa700064e0df2cedc8afc895 100644 (file)
--- 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 7287e3d9986a7698a0d40350a1eac71788edac70..f7ca1c167bdc82623bef3c05e548b93e75f040e2 100644 (file)
--- 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 fa0577ba967015ebca320b8e43bdd745080b19f0..049b5e928a62b464cad7a9d14cf8d038749354a7 100644 (file)
--- 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)