param: have a single handle_ldap_debug_level function

Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index 8bff6ecc82bb5a6056f9720933228f38a3cc76e5..b7afea6476824ee8abbdf41aaa30cf6aad4dced7 100644 (file)
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -81,7 +81,6 @@ static bool defaults_saved = false;
  * non-source3 code
  */
 #define handle_netbios_aliases NULL
-#define handle_ldap_debug_level NULL
 #define handle_idmap_backend NULL
 #define handle_idmap_uid NULL
 #define handle_idmap_gid NULL
@@ -1288,6 +1287,15 @@ bool handle_printing(struct loadparm_context *lp_ctx, int snum,
        return true;
 }
 
+bool handle_ldap_debug_level(struct loadparm_context *lp_ctx, int snum, const char *pszParmValue, char **ptr)
+{
+       lp_ctx->globals->ldap_debug_level = lp_int(pszParmValue);
+
+       if (lp_ctx->s3_fns) {
+               lp_ctx->s3_fns->init_ldap_debugging();
+       }
+       return true;
+}
 
 /***************************************************************************
  Initialise a copymap.

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 968a87e136f18cb2c5ae0d81404974156814e8e4..ffec45bce9a64c36e06a23eba4d4e481dda57e2d 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -265,7 +265,6 @@ static bool handle_idmap_backend(struct loadparm_context *unused, int snum, cons
 static bool handle_idmap_uid(struct loadparm_context *unused, int snum, const char *pszParmValue, char **ptr);
 static bool handle_idmap_gid(struct loadparm_context *unused, int snum, const char *pszParmValue, char **ptr);
 static bool handle_netbios_aliases(struct loadparm_context *unused, int snum, const char *pszParmValue, char **ptr );
-static bool handle_ldap_debug_level(struct loadparm_context *unused, int snum, const char *pszParmValue, char **ptr);
 
 static void set_allowed_client_auth(void);
 
@@ -2475,13 +2474,6 @@ bool lp_include(struct loadparm_context *unused, int snum, const char *pszParmVa
        return true;
 }
 
-static bool handle_ldap_debug_level(struct loadparm_context *unused, int snum, const char *pszParmValue, char **ptr)
-{
-       Globals.ldap_debug_level = lp_int(pszParmValue);
-       init_ldap_debugging();
-       return true;
-}
-
 /*
  * idmap related parameters
  */