s3-sessionid: avoid global include of sessionid.h

Guenther

Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Wed Mar  2 12:58:12 CET 2011 on sn-devel-104

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 4894b6cbb857a498909cba42b193dff83d113de1..79145840ce514df9e9f6de4c5fbf3e54cda7bd7f 100644 (file)
--- 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 96317b9e7f7f836ccf56d83b6665112a47d70e8e..bfbf8401907e41c520d48307bd13d6df114d62e6 100644 (file)
--- 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 fe67681d189802b14c8ec7f8bfae225227877098..1a91c047523ea6805ee8a86579912ee0139b254b 100644 (file)
--- 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 40687a0e4ef892ce82d726e6cc62a6e532149b42..4bfe5bb1647b742b9817a2001bfe34d5f16bd405 100644 (file)
--- 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 205f7601e1c44487ccb9fd5b6d79f739218c2507..67089c9411228a0be7165a1f5595684ec6883cb5 100644 (file)
--- 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 93cfba3b05f7fb943f8363be4bc05b90dc02f682..1b391f3b8be1259d33ed49a8ba0dcd576779d6a6 100644 (file)
--- 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 b2172da0388bb151801e42a377e60b3cb65178d8..08a1a7f298bc04ad0bc016b3a6ea0828f957987f 100644 (file)
--- 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 54ad7864364bdf45b9a583276771043e676d62cc..335920195ec0ad5df09b52d35f2e30558d5ab0d7 100644 (file)
--- 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 1ad2e9b1094d91e0f5c5326435aa96a066d3765f..dd7f7ea68678082728c3c3bcd220f868a3a2c551 100644 (file)
--- 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 */