Rename lp_smb_perfcount_module() to lp_perfcount_module() to match the parameter...

diff --git a/source3/include/proto.h b/source3/include/proto.h
index bfbf972be703bf7c6879bc2afa389dd1359e6790..8a5d649b48512b6c5c6b97143e648a3fc7bd8202 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -4395,7 +4395,7 @@ void lp_set_posix_pathnames(void);
 enum brl_flavour lp_posix_cifsu_locktype(files_struct *fsp);
 void lp_set_posix_default_cifsx_readwrite_locktype(enum brl_flavour val);
 int lp_min_receive_file_size(void);
-char* lp_smb_perfcount_module(void);
+char* lp_perfcount_module(void);
 
 
 /* The following definitions come from param/params.c  */

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index a127ec53948e3470b79369188de1de21c5e0fb9a..a9f2809f8b748a3da7df3231efeb9305bd496fd7 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -5185,7 +5185,7 @@ FN_GLOBAL_STRING(lp_utmpdir, &Globals.szUtmpDir)
 FN_GLOBAL_STRING(lp_wtmpdir, &Globals.szWtmpDir)
 FN_GLOBAL_BOOL(lp_utmp, &Globals.bUtmp)
 FN_GLOBAL_STRING(lp_rootdir, &Globals.szRootdir)
-FN_GLOBAL_STRING(lp_smb_perfcount_module, &Globals.szSMBPerfcountModule)
+FN_GLOBAL_STRING(lp_perfcount_module, &Globals.szSMBPerfcountModule)
 FN_GLOBAL_STRING(lp_defaultservice, &Globals.szDefaultService)
 FN_GLOBAL_STRING(lp_msg_command, &Globals.szMsgCommand)
 FN_GLOBAL_STRING(lp_get_quota_command, &Globals.szGetQuota)

diff --git a/source3/smbd/perfcount.c b/source3/smbd/perfcount.c
index 90aaac2f458aabfa82a54ae4e6da5d69cbf42af1..a0ba0a5f8e753dc72e89ed340486e4a58682e828 100644 (file)
--- a/source3/smbd/perfcount.c
+++ b/source3/smbd/perfcount.c
@@ -175,7 +175,7 @@ bool smb_perfcount_init(void)
 {
        char *perfcount_object;
 
-       perfcount_object = lp_smb_perfcount_module();
+       perfcount_object = lp_perfcount_module();
 
        /* don't init */
        if (!perfcount_object || !perfcount_object[0])