param: rename szLdapUserSuffix -> _ldap_user_suffix

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/lib/param/loadparm.h b/lib/param/loadparm.h
index 85afb0860b6871e03372c8a303171a7590eb9b4b..e11104065f0be82fad6a3538e8fcceb4650388a8 100644 (file)
--- a/lib/param/loadparm.h
+++ b/lib/param/loadparm.h
@@ -255,7 +255,7 @@ enum case_handling {CASE_LOWER,CASE_UPPER};
        int CupsEncrypt;                                                \
        int  iPreferredMaster;                                          \
        char *szLdapMachineSuffix;                                      \
-       char *szLdapUserSuffix;                                         \
+       char *_ldap_user_suffix;                                        \
        char *szLdapIdmapSuffix;                                        \
        char *szIdmapUID;                                               \
        char *szIdmapGID;                                               \

diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index f73ef0308a840ff9d78581c690bac609d83f3165..54a70ca7c2655fd01aa3bf329136fe8070f45848 100644 (file)
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -2931,7 +2931,7 @@ struct parm_struct parm_table[] = {
                .label          = "ldap user suffix",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(szLdapUserSuffix),
+               .offset         = GLOBAL_VAR(_ldap_user_suffix),
                .special        = NULL,
                .enum_list      = NULL,
        },

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 07981a11ffcf831af4a61654f7daa8c71a582185..ccb5a571d51a7b71e12f4370b77b8efab4c350a5 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -726,7 +726,7 @@ static void init_globals(struct loadparm_context *lp_ctx, bool reinit_globals)
        string_set(Globals.ctx, &Globals.passdb_backend, "tdbsam");
        string_set(Globals.ctx, &Globals.ldap_suffix, "");
        string_set(Globals.ctx, &Globals.szLdapMachineSuffix, "");
-       string_set(Globals.ctx, &Globals.szLdapUserSuffix, "");
+       string_set(Globals.ctx, &Globals._ldap_user_suffix, "");
        string_set(Globals.ctx, &Globals._ldap_group_suffix, "");
        string_set(Globals.ctx, &Globals.szLdapIdmapSuffix, "");
 
@@ -2369,8 +2369,8 @@ const char *lp_ldap_machine_suffix(TALLOC_CTX *ctx)
 
 const char *lp_ldap_user_suffix(TALLOC_CTX *ctx)
 {
-       if (Globals.szLdapUserSuffix[0])
-               return append_ldap_suffix(ctx, Globals.szLdapUserSuffix);
+       if (Globals._ldap_user_suffix[0])
+               return append_ldap_suffix(ctx, Globals._ldap_user_suffix);
 
        return lp_string(ctx, Globals.ldap_suffix);
 }