The branch, master has been updated via 38581bc lib: Use ctdb_protocol instead of ctdb_private via a433f1a lib: Give util_paths.c its own header via 5757d9b net: Dump data for net_g_lock dump from 06cdf8d build: fix build of vfs_posix_eadb module
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 38581bc116ebf9d622d99988ca785c2d353c75d6 Author: Volker Lendecke <v...@samba.org> Date: Fri Jun 9 08:48:21 2017 +0200 lib: Use ctdb_protocol instead of ctdb_private ctdb_private is much broader. Right now we implement the protocol ourselves. In the future, we might switch to the native ctdb client implementation defined in ctdb_client.h, but that's a different project :-) Signed-off-by: Volker Lendecke <v...@samba.org> Reviewed-by: Jeremy Allison <j...@samba.org> Autobuild-User(master): Jeremy Allison <j...@samba.org> Autobuild-Date(master): Sat Jun 24 05:33:41 CEST 2017 on sn-devel-144 commit a433f1a75793b192612043147c9cb1ba1eb28b3f Author: Volker Lendecke <v...@samba.org> Date: Thu Jun 22 16:10:52 2017 +0200 lib: Give util_paths.c its own header Signed-off-by: Volker Lendecke <v...@samba.org> Reviewed-by: Jeremy Allison <j...@samba.org> commit 5757d9bf75a5f3ade82c00c98e01c5a8e38aaa28 Author: Volker Lendecke <v...@samba.org> Date: Thu Jun 8 12:51:19 2017 +0200 net: Dump data for net_g_lock dump 4d404f2 added user-data for a g_lock. Print it in net g_lock dump. Signed-off-by: Volker Lendecke <v...@samba.org> Reviewed-by: Jeremy Allison <j...@samba.org> ----------------------------------------------------------------------- Summary of changes: lib/ldb-samba/ldb_wrap.c | 1 + lib/util/modules.c | 1 + lib/util/samba_util.h | 25 --------------- lib/util/util_paths.c | 1 + source3/lib/util_procid.h => lib/util/util_paths.h | 37 ++++++++++++++++------ libgpo/gpext/gpext.c | 1 + source3/intl/lang_tdb.c | 1 + source3/lib/ctdbd_conn.c | 3 +- source3/lib/dbwrap/dbwrap_ctdb.c | 2 +- source3/utils/net_g_lock.c | 1 + source4/torture/drs/rpc/dssync.c | 1 + source4/torture/drs/rpc/msds_intid.c | 1 + source4/torture/rpc/dsgetinfo.c | 1 + 13 files changed, 38 insertions(+), 38 deletions(-) copy source3/lib/util_procid.h => lib/util/util_paths.h (54%) Changeset truncated at 500 lines: diff --git a/lib/ldb-samba/ldb_wrap.c b/lib/ldb-samba/ldb_wrap.c index 838306f..9959b04 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 cf52594..5d49ed9 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 7a74617..0bb04b3 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 0baa680..0473557 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/source3/lib/util_procid.h b/lib/util/util_paths.h similarity index 54% copy from source3/lib/util_procid.h copy to lib/util/util_paths.h index 9637363..80e8aaa 100644 --- a/source3/lib/util_procid.h +++ b/lib/util/util_paths.h @@ -21,17 +21,34 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __LIB_UTIL_PROCID_H__ -#define __LIB_UTIL_PROCID_H__ +#ifndef __LIB_UTIL_PATHS_H__ +#define __LIB_UTIL_PATHS_H__ -#include "replace.h" -#include "librpc/gen_ndr/server_id.h" +#include <talloc.h> -pid_t procid_to_pid(const struct server_id *proc); -void set_my_vnn(uint32_t vnn); -uint32_t get_my_vnn(void); -struct server_id pid_to_procid(pid_t pid); -bool procid_valid(const struct server_id *pid); -bool procid_is_local(const struct server_id *pid); +/** + * @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 782c821..e482798 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 68da8ce..ecdfe1d 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/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c index ce41db9..3adb57d 100644 --- a/source3/lib/ctdbd_conn.c +++ b/source3/lib/ctdbd_conn.c @@ -35,11 +35,10 @@ #include "lib/util/tevent_unix.c" #include "lib/util/sys_rw.h" #include "lib/util/blocking.h" +#include "ctdb/include/ctdb_protocol.h" /* paths to these include files come from --with-ctdb= in configure */ -#include "ctdb_private.h" - struct ctdbd_srvid_cb { uint64_t srvid; int (*cb)(uint32_t src_vnn, uint32_t dst_vnn, diff --git a/source3/lib/dbwrap/dbwrap_ctdb.c b/source3/lib/dbwrap/dbwrap_ctdb.c index 3334eca..8e303e6 100644 --- a/source3/lib/dbwrap/dbwrap_ctdb.c +++ b/source3/lib/dbwrap/dbwrap_ctdb.c @@ -27,7 +27,7 @@ #include "dbwrap/dbwrap_rbt.h" #include "lib/param/param.h" -#include "ctdb_private.h" +#include "ctdb/include/ctdb_protocol.h" #include "ctdbd_conn.h" #include "dbwrap/dbwrap.h" #include "dbwrap/dbwrap_private.h" diff --git a/source3/utils/net_g_lock.c b/source3/utils/net_g_lock.c index 7543fd8..0ec6846 100644 --- a/source3/utils/net_g_lock.c +++ b/source3/utils/net_g_lock.c @@ -123,6 +123,7 @@ static void net_g_lock_dump_fn(const struct g_lock_rec *locks, d_printf("%s: %s\n", server_id_str_buf(l->pid, &idbuf), (l->lock_type & 1) ? "WRITE" : "READ"); } + dump_data_file(data, datalen, true, stdout); } static int net_g_lock_dump(struct net_context *c, int argc, const char **argv) diff --git a/source4/torture/drs/rpc/dssync.c b/source4/torture/drs/rpc/dssync.c index 316fad7..27cc72f 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 3eaa094..1fb5c78 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 141b4de..4e9e583 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 { -- Samba Shared Repository