s3-msdfs: avoid global inclusion of msdfs.h.

Guenther

diff --git a/source3/include/includes.h b/source3/include/includes.h
index eafecb7fdad0faa205a2e8a43fb6e528f83f0751..83ccf7860b3dd2a9d5b3b27b8e77a3f2dd8cf4d9 100644 (file)
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -559,7 +559,6 @@ extern void *cmdline_lp_ctx;
 #include "../lib/util/byteorder.h"
 #include "mapping.h"
 #include "passdb.h"
-#include "msdfs.h"
 
 #include "auth.h"
 #include "librpc/rpc/dcerpc.h"

diff --git a/source3/include/proto.h b/source3/include/proto.h
index caa2d290464f3f8f7bc7335eb8c8a9b4234cd6a4..7126103b9632fc5f140d9c21c2e9196556880a14 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1652,6 +1652,7 @@ struct cli_state *cli_cm_open(TALLOC_CTX *ctx,
                                int port,
                                int name_type);
 void cli_cm_display(const struct cli_state *c);
+struct client_dfs_referral;
 NTSTATUS cli_dfs_get_referral(TALLOC_CTX *ctx,
                        struct cli_state *cli,
                        const char *path,
@@ -4410,6 +4411,7 @@ void reply_sendend(struct smb_request *req);
 bool is_msdfs_link(connection_struct *conn,
                const char *path,
                SMB_STRUCT_STAT *sbufp);
+struct junction_map;
 NTSTATUS get_referred_path(TALLOC_CTX *ctx,
                        const char *dfs_path,
                        struct junction_map *jucn,

diff --git a/source3/libsmb/clidfs.c b/source3/libsmb/clidfs.c
index a23f47734300e5417a0d4ef66cdfb1552099442a..c6fe67f16abcf1a985a6a7b89c11fc1beadbd63c 100644 (file)
--- a/source3/libsmb/clidfs.c
+++ b/source3/libsmb/clidfs.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "libsmb/clirap.h"
+#include "msdfs.h"
 
 /********************************************************************
  Important point.

diff --git a/source3/rpc_server/dfs/srv_dfs_nt.c b/source3/rpc_server/dfs/srv_dfs_nt.c
index 01ecf792b36ff03439da73797fd74d9dcb7d0406..e8862064bc0239ecbb25b7479f30862672692641 100644 (file)
--- a/source3/rpc_server/dfs/srv_dfs_nt.c
+++ b/source3/rpc_server/dfs/srv_dfs_nt.c
@@ -23,6 +23,7 @@
 
 #include "includes.h"
 #include "../librpc/gen_ndr/srv_dfs.h"
+#include "msdfs.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_MSDFS

diff --git a/source3/smbd/msdfs.c b/source3/smbd/msdfs.c
index c11e66e3b8713d387fe49e38ec7244f400ba5e1c..d5d46fd539a38330b62037a2f9189e4a7cad2868 100644 (file)
--- a/source3/smbd/msdfs.c
+++ b/source3/smbd/msdfs.c
@@ -23,6 +23,7 @@
 #define DBGC_CLASS DBGC_MSDFS
 #include "includes.h"
 #include "smbd/globals.h"
+#include "msdfs.h"
 
 /**********************************************************************
  Parse a DFS pathname of the form \hostname\service\reqpath