From de46ad9084aff4384f33660acf91da3b81554a88 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 6 Jun 2011 14:37:06 +1000
Subject: lib/util use modules_path(), data_path() and shlib_ext() from source3

This brings these helpful utility functions in common, as they are not
based on either loadparm system.

(The 'modules dir' parameter from Samba4 will shortly be removed, so
there is no loss in functionality)

Andrew Bartlett
---
 source3/lib/module.c |  8 ++++----
 source3/lib/util.c   | 37 -------------------------------------
 2 files changed, 4 insertions(+), 41 deletions(-)

(limited to 'source3/lib')

diff --git a/source3/lib/module.c b/source3/lib/module.c
index de13668009..bec4fddefd 100644
--- a/source3/lib/module.c
+++ b/source3/lib/module.c
@@ -117,10 +117,10 @@ NTSTATUS smb_probe_module(const char *subsystem, const char *module)
 	}
 
 	full_path = talloc_asprintf(ctx,
-			"%s/%s.%s",
-			modules_path(subsystem),
-			module,
-			shlib_ext());
+				    "%s/%s.%s",
+				    modules_path(ctx, subsystem),
+				    module,
+				    shlib_ext());
 	if (!full_path) {
 		TALLOC_FREE(ctx);
 		return NT_STATUS_NO_MEMORY;
diff --git a/source3/lib/util.c b/source3/lib/util.c
index dc91fa06a1..a596385bfb 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -1513,32 +1513,6 @@ char *pid_path(const char *name)
 	return xx_path(name, lp_piddir());
 }
 
-/**
- * @brief Returns an absolute path to a file in the Samba modules directory.
- *
- * @param name File to find, relative to MODULESDIR.
- *
- * @retval Pointer to a string containing the full path.
- **/
-
-char *modules_path(const char *name)
-{
-	return talloc_asprintf(talloc_tos(), "%s/%s", get_dyn_MODULESDIR(), name);
-}
-
-/**
- * @brief Returns an absolute path to a file in the Samba data directory.
- *
- * @param name File to find, relative to CODEPAGEDIR.
- *
- * @retval Pointer to a talloc'ed string containing the full path.
- **/
-
-char *data_path(const char *name)
-{
-	return talloc_asprintf(talloc_tos(), "%s/%s", get_dyn_CODEPAGEDIR(), name);
-}
-
 /**
  * @brief Returns an absolute path to a file in the Samba state directory.
  *
@@ -1565,17 +1539,6 @@ char *cache_path(const char *name)
 	return xx_path(name, lp_cachedir());
 }
 
-/**
- * @brief Returns the platform specific shared library extension.
- *
- * @retval Pointer to a const char * containing the extension.
- **/
-
-const char *shlib_ext(void)
-{
-	return get_dyn_SHLIBEXT();
-}
-
 /*******************************************************************
  Given a filename - get its directory name
 ********************************************************************/
-- 
cgit