1
0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00

lib: Give util_paths.c its own header

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Volker Lendecke 2017-06-22 16:10:52 +02:00 committed by Jeremy Allison
parent 5757d9bf75
commit a433f1a757
10 changed files with 62 additions and 25 deletions

View File

@ -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

View File

@ -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"

View File

@ -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.

View File

@ -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.

54
lib/util/util_paths.h Normal file
View File

@ -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

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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 {