10 files changed, 62 insertions, 25 deletions
diff --git a/lib/ldb-samba/ldb_wrap.c b/lib/ldb-samba/ldb_wrap.c
index 838306f9908..9959b04ed95 100644
--- a/lib/ldb-samba/ldb_wrap.c
+++ b/lib/ldb-samba/ldb_wrap.c
@@ -35,6 +35,7 @@
 #include "dsdb/samdb/samdb.h"
 #include "param/param.h"
 #include "../lib/util/dlinklist.h"
+#include "lib/util/util_paths.h"
 #include <tdb.h>
 
 #undef DBGC_CLASS
diff --git a/lib/util/modules.c b/lib/util/modules.c
index cf52594f619..5d49ed95df0 100644
--- a/lib/util/modules.c
+++ b/lib/util/modules.c
@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "dynconfig/dynconfig.h"
 #include "lib/util/samba_modules.h"
+#include "lib/util/util_paths.h"
 #include "system/filesys.h"
 #include "system/dir.h"
 
diff --git a/lib/util/samba_util.h b/lib/util/samba_util.h
index 7a74617c64d..0bb04b3567c 100644
--- a/lib/util/samba_util.h
+++ b/lib/util/samba_util.h
@@ -696,31 +696,6 @@ int samba_runcmd_recv(struct tevent_req *req, int *perrno);
 void samba_start_debugger(void);
 #endif
 
-/**
- * @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(TALLOC_CTX *mem_ctx, const char *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(TALLOC_CTX *mem_ctx, const char *name);
-
-/**
- * @brief Returns the platform specific shared library extension.
- *
- * @retval Pointer to a const char * containing the extension.
- **/
-const char *shlib_ext(void);
-
 /*
  * Samba code should use samba_tevent_context_init() instead of
  * tevent_context_init() in order to get the debug output.
diff --git a/lib/util/util_paths.c b/lib/util/util_paths.c
index 0baa6801c54..0473557dfc6 100644
--- a/lib/util/util_paths.c
+++ b/lib/util/util_paths.c
@@ -23,6 +23,7 @@
 
 #include "includes.h"
 #include "dynconfig/dynconfig.h"
+#include "lib/util/util_paths.h"
 
 /**
  * @brief Returns an absolute path to a file in the Samba modules directory.
diff --git a/lib/util/util_paths.h b/lib/util/util_paths.h
new file mode 100644
index 00000000000..80e8aaac6e9
--- /dev/null
+++ b/lib/util/util_paths.h
@@ -0,0 +1,54 @@
+/*
+ * Unix SMB/CIFS implementation.
+ * Samba utility functions
+ * Copyright (C) Andrew Tridgell 1992-1998
+ * Copyright (C) Jeremy Allison 2001-2007
+ * Copyright (C) Simo Sorce 2001
+ * Copyright (C) Jim McDonough <jmcd@us.ibm.com> 2003
+ * Copyright (C) James Peach 2006
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __LIB_UTIL_PATHS_H__
+#define __LIB_UTIL_PATHS_H__
+
+#include <talloc.h>
+
+/**
+ * @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(TALLOC_CTX *mem_ctx, const char *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(TALLOC_CTX *mem_ctx, const char *name);
+
+/**
+ * @brief Returns the platform specific shared library extension.
+ *
+ * @retval Pointer to a const char * containing the extension.
+ **/
+const char *shlib_ext(void);
+
+#endif
diff --git a/libgpo/gpext/gpext.c b/libgpo/gpext/gpext.c
index 782c8217c03..e482798d579 100644
--- a/libgpo/gpext/gpext.c
+++ b/libgpo/gpext/gpext.c
@@ -26,6 +26,7 @@
 #include "libgpo/gpo_proto.h"
 #include "registry.h"
 #include "registry/reg_api.h"
+#include "lib/util/util_paths.h"
 
 static struct gp_extension *extensions = NULL;
 
diff --git a/source3/intl/lang_tdb.c b/source3/intl/lang_tdb.c
index 68da8cee3f5..ecdfe1dc911 100644
--- a/source3/intl/lang_tdb.c
+++ b/source3/intl/lang_tdb.c
@@ -21,6 +21,7 @@
 #include "system/filesys.h"
 #include "intl/lang_tdb.h"
 #include "util_tdb.h"
+#include "lib/util/util_paths.h"
 
 static TDB_CONTEXT *tdb;
 
diff --git a/source4/torture/drs/rpc/dssync.c b/source4/torture/drs/rpc/dssync.c
index 316fad75249..27cc72f5613 100644
--- a/source4/torture/drs/rpc/dssync.c
+++ b/source4/torture/drs/rpc/dssync.c
@@ -34,6 +34,7 @@
 #include "torture/drs/proto.h"
 #include "lib/tsocket/tsocket.h"
 #include "libcli/resolve/resolve.h"
+#include "lib/util/util_paths.h"
 
 struct DsSyncBindInfo {
 	struct dcerpc_pipe *drs_pipe;
diff --git a/source4/torture/drs/rpc/msds_intid.c b/source4/torture/drs/rpc/msds_intid.c
index 3eaa094b9db..1fb5c782bdf 100644
--- a/source4/torture/drs/rpc/msds_intid.c
+++ b/source4/torture/drs/rpc/msds_intid.c
@@ -33,6 +33,7 @@
 #include "torture/drs/proto.h"
 #include "lib/tsocket/tsocket.h"
 #include "libcli/resolve/resolve.h"
+#include "lib/util/util_paths.h"
 
 struct DsSyncBindInfo {
 	struct dcerpc_pipe *drs_pipe;
diff --git a/source4/torture/rpc/dsgetinfo.c b/source4/torture/rpc/dsgetinfo.c
index 141b4de586d..4e9e5833f02 100644
--- a/source4/torture/rpc/dsgetinfo.c
+++ b/source4/torture/rpc/dsgetinfo.c
@@ -31,6 +31,7 @@
 #include "dsdb/samdb/samdb.h"
 #include "torture/rpc/torture_rpc.h"
 #include "torture/drs/proto.h"
+#include "lib/util/util_paths.h"
 
 
 struct DsGetinfoBindInfo {