lib: Remove "includes.h" from util_file.c

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 362a46211bcca59367ec27690a5754113fcdcb97..0c15f968206dab3d7ad1af0c10b71c3cd2559dd0 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -449,17 +449,6 @@ bool sid_check_is_builtin(const struct dom_sid *sid);
 bool sid_check_is_in_builtin(const struct dom_sid *sid);
 bool sid_check_is_wellknown_builtin(const struct dom_sid *sid);
 
-/* The following definitions come from lib/util_file.c  */
-
-struct tevent_req *file_pload_send(TALLOC_CTX *mem_ctx,
-                                  struct tevent_context *ev,
-                                  const char *syscmd, size_t maxsize);
-int file_pload_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
-                   uint8_t **buf);
-
-char **file_lines_pload(TALLOC_CTX *mem_ctx, const char *syscmd,
-                       int *numlines);
-
 /* The following definitions come from lib/util_nscd.c  */
 
 void smb_nscd_flush_user_cache(void);

diff --git a/source3/lib/sysquotas.c b/source3/lib/sysquotas.c
index 95051a5c6d1e74a2920ef1238e1cfd57329d4578..102e4580e321965a796b8f57c6d81af715dae8cb 100644 (file)
--- a/source3/lib/sysquotas.c
+++ b/source3/lib/sysquotas.c
@@ -19,6 +19,7 @@
 
 
 #include "includes.h"
+#include "lib/util_file.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_QUOTA

diff --git a/source3/lib/util_file.c b/source3/lib/util_file.c
index e8e9b2756d20433ecfc880eb6efbaba57f619ad8..d3139e55b57eb76417118dd7e2d3d3e9a374715b 100644 (file)
--- a/source3/lib/util_file.c
+++ b/source3/lib/util_file.c
@@ -17,7 +17,10 @@
  * this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "includes.h"
+#include "replace.h"
+#include "lib/util_file.h"
+#include "lib/util/debug.h"
+#include "lib/util/samba_util.h"
 #include "lib/util/sys_rw.h"
 #include "lib/sys_popen.h"
 #include "lib/async_req/async_sock.h"

diff --git a/source3/lib/util_file.h b/source3/lib/util_file.h
new file mode 100644 (file)
index 0000000..9175ed0
--- /dev/null
+++ b/source3/lib/util_file.h
@@ -0,0 +1,35 @@
+/*
+ * Unix SMB/CIFS implementation.
+ * SMB parameters and setup
+ * Copyright (C) Andrew Tridgell 1992-1998 Modified by Jeremy Allison 1995.
+ *
+ * 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_FILE_H__
+#define __LIB_UTIL_FILE_H__
+
+#include "replace.h"
+#include <tevent.h>
+
+struct tevent_req *file_pload_send(TALLOC_CTX *mem_ctx,
+                                  struct tevent_context *ev,
+                                  const char *syscmd, size_t maxsize);
+int file_pload_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
+                   uint8_t **buf);
+
+char **file_lines_pload(TALLOC_CTX *mem_ctx, const char *syscmd,
+                       int *numlines);
+
+#endif

diff --git a/source3/printing/print_svid.c b/source3/printing/print_svid.c
index 3b95539495ae1fd1ed70d0c9ec9e6e20a10f18d8..f041ef482addb4606ad683b42f358b59ac979a62 100644 (file)
--- a/source3/printing/print_svid.c
+++ b/source3/printing/print_svid.c
@@ -33,6 +33,7 @@
 
 #include "includes.h"
 #include "printing/pcap.h"
+#include "lib/util_file.h"
 
 #if defined(SYSV) || defined(HPUX)
 bool sysv_cache_reload(struct pcap_cache **_pcache)

diff --git a/source3/smbd/dfree.c b/source3/smbd/dfree.c
index 188faa2d79a251e167c267abf14ac4c5e3905c3d..fc52e518a48ee615ce30f911a7e8660bb983e1f8 100644 (file)
--- a/source3/smbd/dfree.c
+++ b/source3/smbd/dfree.c
@@ -20,6 +20,7 @@
 #include "includes.h"
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
+#include "lib/util_file.h"
 
 /****************************************************************************
  Normalise for DOS usage.

diff --git a/source3/winbindd/idmap_script.c b/source3/winbindd/idmap_script.c
index fbde6c51a7c0b4ca44983674e239b78fd3192ae8..a929d6e27016916f3af1a827c3f88cb39c7478bf 100644 (file)
--- a/source3/winbindd/idmap_script.c
+++ b/source3/winbindd/idmap_script.c
@@ -35,6 +35,7 @@
 #include "idmap.h"
 #include "idmap_rw.h"
 #include "../libcli/security/dom_sid.h"
+#include "lib/util_file.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_IDMAP