summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-07-04 17:50:04 +0200
committerVolker Lendecke <vl@samba.org>2010-07-05 11:06:23 +0200
commit9cc52e8411c5b5bda73bbbe58d98a73ebd671b65 (patch)
tree6b4e9cf530fb3aca99af1f2ed42849430e797f36
parenta27bd84bf827fc3f7efe6afb6329d98a20a00389 (diff)
downloadsamba-9cc52e8411c5b5bda73bbbe58d98a73ebd671b65.tar.gz
samba-9cc52e8411c5b5bda73bbbe58d98a73ebd671b65.tar.bz2
samba-9cc52e8411c5b5bda73bbbe58d98a73ebd671b65.zip
s3: Add msg_ctx to smbd_server_connection
It would be obvious to initialize this in smbd_init_globals(), but there the messaging_context can't be initialized yet because we don't have smb.conf loaded yet.
-rw-r--r--source3/smbd/globals.h1
-rw-r--r--source3/smbd/server.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h
index 799cf17be6..435936ea0a 100644
--- a/source3/smbd/globals.h
+++ b/source3/smbd/globals.h
@@ -455,6 +455,7 @@ struct pending_auth_data;
struct smbd_server_connection {
const struct tsocket_address *local_address;
const struct tsocket_address *remote_address;
+ struct messaging_context *msg_ctx;
struct {
bool got_session;
} nbt;
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 3660abb659..7b788e8d1a 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -1013,6 +1013,8 @@ extern void build_options(bool screen);
exit(1);
}
+ smbd_server_conn->msg_ctx = smbd_messaging_context();
+
smbd_setup_sig_term_handler();
smbd_setup_sig_hup_handler();