From ea29261186a7a65e73d84802a607315a50050614 Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Thu, 24 Feb 2011 23:14:15 +0100
Subject: s3-sessionid: avoid global include of sessionid.h
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Guenther

Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Wed Mar  2 12:58:12 CET 2011 on sn-devel-104
---
 source3/include/includes.h                | 1 -
 source3/include/proto.h                   | 2 +-
 source3/lib/sessionid_tdb.c               | 1 +
 source3/rpc_server/srvsvc/srv_srvsvc_nt.c | 1 +
 source3/rpc_server/wkssvc/srv_wkssvc_nt.c | 1 +
 source3/smbd/session.c                    | 1 +
 source3/utils/net_serverid.c              | 1 +
 source3/utils/net_status.c                | 1 +
 source3/utils/status.c                    | 1 +
 9 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 4894b6cbb8..79145840ce 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -625,7 +625,6 @@ extern void *cmdline_lp_ctx;
 #include "librpc/rpc/dcerpc.h"
 #include "client.h"
 
-#include "session.h"
 #include "module.h"
 #include "packet.h"
 #include "../lib/util/talloc_stack.h"
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 96317b9e7f..bfbf840190 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5159,7 +5159,7 @@ connection_struct *make_connection(struct smbd_server_connection *sconn,
 void close_cnum(connection_struct *conn, uint16 vuid);
 
 /* The following definitions come from smbd/session.c  */
-
+struct sessionid;
 bool session_init(void);
 bool session_claim(struct smbd_server_connection *sconn, user_struct *vuser);
 void session_yield(user_struct *vuser);
diff --git a/source3/lib/sessionid_tdb.c b/source3/lib/sessionid_tdb.c
index fe67681d18..1a91c04752 100644
--- a/source3/lib/sessionid_tdb.c
+++ b/source3/lib/sessionid_tdb.c
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "dbwrap.h"
+#include "session.h"
 
 static struct db_context *session_db_ctx(void)
 {
diff --git a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
index 40687a0e4e..4bfe5bb164 100644
--- a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
+++ b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
@@ -29,6 +29,7 @@
 #include "../libcli/security/security.h"
 #include "../librpc/gen_ndr/ndr_security.h"
 #include "dbwrap.h"
+#include "session.h"
 
 extern const struct generic_mapping file_generic_mapping;
 
diff --git a/source3/rpc_server/wkssvc/srv_wkssvc_nt.c b/source3/rpc_server/wkssvc/srv_wkssvc_nt.c
index 205f7601e1..67089c9411 100644
--- a/source3/rpc_server/wkssvc/srv_wkssvc_nt.c
+++ b/source3/rpc_server/wkssvc/srv_wkssvc_nt.c
@@ -28,6 +28,7 @@
 #include "../libcli/auth/libcli_auth.h"
 #include "../librpc/gen_ndr/srv_wkssvc.h"
 #include "../libcli/security/security.h"
+#include "session.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV
diff --git a/source3/smbd/session.c b/source3/smbd/session.c
index 93cfba3b05..1b391f3b8b 100644
--- a/source3/smbd/session.c
+++ b/source3/smbd/session.c
@@ -29,6 +29,7 @@
 #include "includes.h"
 #include "smbd/globals.h"
 #include "dbwrap.h"
+#include "session.h"
 
 /********************************************************************
  called when a session is created
diff --git a/source3/utils/net_serverid.c b/source3/utils/net_serverid.c
index b2172da038..08a1a7f298 100644
--- a/source3/utils/net_serverid.c
+++ b/source3/utils/net_serverid.c
@@ -21,6 +21,7 @@
 #include "utils/net.h"
 #include "dbwrap.h"
 #include "serverid.h"
+#include "session.h"
 
 static int net_serverid_list_fn(const struct server_id *id,
 				uint32_t msg_flags, void *priv)
diff --git a/source3/utils/net_status.c b/source3/utils/net_status.c
index 54ad786436..335920195e 100644
--- a/source3/utils/net_status.c
+++ b/source3/utils/net_status.c
@@ -18,6 +18,7 @@
 
 #include "includes.h"
 #include "utils/net.h"
+#include "session.h"
 
 int net_status_usage(struct net_context *c, int argc, const char **argv)
 {
diff --git a/source3/utils/status.c b/source3/utils/status.c
index 1ad2e9b109..dd7f7ea686 100644
--- a/source3/utils/status.c
+++ b/source3/utils/status.c
@@ -34,6 +34,7 @@
 #include "popt_common.h"
 #include "dbwrap.h"
 #include "../libcli/security/security.h"
+#include "session.h"
 
 #define SMB_MAXPIDS		2048
 static uid_t 		Ucrit_uid = 0;               /* added by OH */
-- 
cgit