summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2010-03-22 08:42:13 +0100
committerStefan Metzmacher <metze@samba.org>2010-03-22 17:15:12 +0100
commit44d655b33fecb7a543ff957940716ba93fec12cd (patch)
tree4c0a08a5aefe7554d2ee7dcc39b401a664444007
parent752240ccdc4dcdce7a2270ee5544e007c44bcf4d (diff)
downloadsamba-44d655b33fecb7a543ff957940716ba93fec12cd.tar.gz
samba-44d655b33fecb7a543ff957940716ba93fec12cd.tar.bz2
samba-44d655b33fecb7a543ff957940716ba93fec12cd.zip
s3:smbd: add echo handler information to struct smbd_server_connection
metze
-rw-r--r--source3/smbd/globals.c3
-rw-r--r--source3/smbd/globals.h19
2 files changed, 22 insertions, 0 deletions
diff --git a/source3/smbd/globals.c b/source3/smbd/globals.c
index a632aa2e9b..0284171bae 100644
--- a/source3/smbd/globals.c
+++ b/source3/smbd/globals.c
@@ -151,4 +151,7 @@ void smbd_init_globals(void)
if (!smbd_server_conn) {
exit_server("failed to create smbd_server_connection");
}
+
+ smbd_server_conn->smb1.echo_handler.trusted_fd = -1;
+ smbd_server_conn->smb1.echo_handler.socket_lock_fd = -1;
}
diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h
index 9bccbadb43..6e5262a991 100644
--- a/source3/smbd/globals.h
+++ b/source3/smbd/globals.h
@@ -435,6 +435,25 @@ struct smbd_server_connection {
bool allow_smb2;
struct {
struct fd_event *fde;
+
+ struct {
+ /*
+ * fd for the fcntl lock mutexing access to smbd_server_fd
+ */
+ int socket_lock_fd;
+
+ /*
+ * fd for the trusted pipe from
+ * echo handler child
+ */
+ int trusted_fd;
+
+ /*
+ * fde for the trusted_fd
+ */
+ struct fd_event *trusted_fde;
+ } echo_handler;
+
uint64_t num_requests;
struct {
bool encrypted_passwords;