diff options
| author | Günther Deschner <gd@samba.org> | 2011-02-24 22:58:08 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2011-03-16 16:56:46 +0100 |
| commit | 1ce4d2d83a21b89a2ca8ad5a601b181feafc18e7 (patch) | |
| tree | fa22ac1f71efea47662af0edb2f731993bd3768f | |
| parent | 97addd8fc2ce9e9cf187a2ccfa442f329b2a80f6 (diff) | |
| download | samba-1ce4d2d83a21b89a2ca8ad5a601b181feafc18e7.tar.gz samba-1ce4d2d83a21b89a2ca8ad5a601b181feafc18e7.tar.bz2 samba-1ce4d2d83a21b89a2ca8ad5a601b181feafc18e7.zip | |
s3-msdfs: avoid global inclusion of msdfs.h.
Guenther
| -rw-r--r-- | source3/include/includes.h | 1 | ||||
| -rw-r--r-- | source3/include/proto.h | 2 | ||||
| -rw-r--r-- | source3/libsmb/clidfs.c | 1 | ||||
| -rw-r--r-- | source3/rpc_server/dfs/srv_dfs_nt.c | 1 | ||||
| -rw-r--r-- | source3/smbd/msdfs.c | 1 |
5 files changed, 5 insertions, 1 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index eafecb7fda..83ccf7860b 100644 --- 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 caa2d29046..7126103b96 100644 --- 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 a23f477343..c6fe67f16a 100644 --- 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 01ecf792b3..e8862064bc 100644 --- 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 c11e66e3b8..d5d46fd539 100644 --- 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 |