[PATCH] small cleanups
Volker Lendecke
Volker.Lendecke at SerNet.DE
Fri Jun 23 06:41:31 UTC 2017
Hi!
Review appreciated!
Thanks, Volker
--
SerNet GmbH, Bahnhofsallee 1b, 37081 Göttingen
phone: +49-551-370000-0, fax: +49-551-370000-9
AG Göttingen, HRB 2816, GF: Dr. Johannes Loxen
http://www.sernet.de, mailto:kontakt at sernet.de
-------------- next part --------------
From b9524d722d9c9d28dba4b9a5d546dd87dd35269a Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl at samba.org>
Date: Thu, 22 Jun 2017 16:10:52 +0200
Subject: [PATCH 1/2] lib: Give util_paths.c its own header
---
lib/ldb-samba/ldb_wrap.c | 1 +
lib/util/modules.c | 1 +
lib/util/samba_util.h | 25 -----------------
lib/util/util_paths.c | 1 +
lib/util/util_paths.h | 54 ++++++++++++++++++++++++++++++++++++
libgpo/gpext/gpext.c | 1 +
source3/intl/lang_tdb.c | 1 +
source4/torture/drs/rpc/dssync.c | 1 +
source4/torture/drs/rpc/msds_intid.c | 1 +
source4/torture/rpc/dsgetinfo.c | 1 +
10 files changed, 62 insertions(+), 25 deletions(-)
create mode 100644 lib/util/util_paths.h
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/lib/util/util_paths.h b/lib/util/util_paths.h
new file mode 100644
index 0000000..80e8aaa
--- /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 at 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 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/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 {
--
2.7.4
From 36976a51352981dd41394a3d33053f32de0d6e14 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl at samba.org>
Date: Fri, 9 Jun 2017 08:48:21 +0200
Subject: [PATCH 2/2] 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 <vl at samba.org>
---
source3/lib/ctdbd_conn.c | 3 +--
source3/lib/dbwrap/dbwrap_ctdb.c | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
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"
--
2.7.4
More information about the samba-technical
mailing list