s4:s3compat Put the s3compat_get_conn() hook with the rest of the globals

diff --git a/source4/s3compat/s3_smbd.c b/source4/s3compat/s3_smbd.c
index 2f97661865ae38c0c7cb3b40ebe4e7b45a57f4bc..8302efa646ec7a6b4dfe6b02974f5e5e153244b8 100644 (file)
--- a/source4/s3compat/s3_smbd.c
+++ b/source4/s3compat/s3_smbd.c
@@ -34,12 +34,6 @@
 #include "s3compat.h"
 #include "s3compat_wrapper.h"
 #include "s3compat_globals.h"
-static struct stream_connection *samba3_conn;
-
-struct stream_connection *s3compat_get_conn(void) 
-{
-       return samba3_conn;
-}
 
 /*
   initialise a server_context from a open socket and register a event handler
@@ -53,7 +47,7 @@ static void s3compat_smb_accept(struct stream_connection *conn)
                sleep(2);
        }
        DEBUG(0,(__location__ ": new s3compat smbd connection\n"));
-       samba3_conn = conn;
+       s3compat_set_conn(conn);
 
        s3compat_set_lp_ctx(conn->lp_ctx);
 

diff --git a/source4/s3compat/s3compat_globals.c b/source4/s3compat/s3compat_globals.c
index 3082d82b9594924ad2b33a6e48bf2ba9d5367725..b4715548663e9895c94caf934257a2d9be43fffa 100644 (file)
--- a/source4/s3compat/s3compat_globals.c
+++ b/source4/s3compat/s3compat_globals.c
@@ -7,6 +7,18 @@
 #include "smbd/service.h"
 #include "lib/socket/socket.h"
 
+static struct stream_connection *samba3_conn;
+
+struct stream_connection *s3compat_get_conn(void) 
+{
+       return samba3_conn;
+}
+
+void s3compat_set_conn(struct stream_connection *conn) 
+{
+       samba3_conn = conn;
+}
+
 static struct loadparm_context *s3compat_lp_ctx;
 void s3compat_set_lp_ctx(struct loadparm_context *lp_ctx)
 {
@@ -43,12 +55,12 @@ struct messaging_context *s3compat_get_msg_ctx(void)
 
 int smbd_server_fd(void) 
 {
-       struct stream_connection *samba3_conn;
-       samba3_conn = s3compat_get_conn();
-       if (samba3_conn == NULL) {
+       struct stream_connection *conn;
+       conn = s3compat_get_conn();
+       if (conn == NULL) {
                return -1;
        }
-       return socket_get_fd(samba3_conn->socket);
+       return socket_get_fd(conn->socket);
 }
 
 int get_client_fd(void)