s3:smbd: pass smbXsrv_connection to reply_special()

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>

diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 31a6e01f6b7153133d7a1059f26f87372f9207bc..5f07275f15f04581f35f96235572ca167f9965b2 100644 (file)
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -1870,7 +1870,7 @@ static void process_smb(struct smbXsrv_connection *xconn,
                /*
                 * NetBIOS session request, keepalive, etc.
                 */
-               reply_special(sconn, (char *)inbuf, nread);
+               reply_special(xconn, (char *)inbuf, nread);
                goto done;
        }
 

diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index efabfad331b5aabd5c9cfe1fd362eab6bd68a460..74c9950bed61529a6e0dbc0c281c680157622ea1 100644 (file)
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -836,7 +836,7 @@ bool check_fsp(connection_struct *conn, struct smb_request *req,
               files_struct *fsp);
 bool check_fsp_ntquota_handle(connection_struct *conn, struct smb_request *req,
                              files_struct *fsp);
-void reply_special(struct smbd_server_connection *sconn, char *inbuf, size_t inbuf_len);
+void reply_special(struct smbXsrv_connection *xconn, char *inbuf, size_t inbuf_size);
 void reply_tcon(struct smb_request *req);
 void reply_tcon_and_X(struct smb_request *req);
 void reply_unknown_new(struct smb_request *req, uint8 type);

diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 9f9683cce0f3578ba5e6de5e16663b281d3b43f9..e8b1038175d93d8535d176b2bb57f3442c4abe01 100644 (file)
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -532,9 +532,9 @@ static void reply_called_name_not_present(char *outbuf)
  Reply to a (netbios-level) special message. 
 ****************************************************************************/
 
-void reply_special(struct smbd_server_connection *sconn, char *inbuf, size_t inbuf_size)
+void reply_special(struct smbXsrv_connection *xconn, char *inbuf, size_t inbuf_size)
 {
-       struct smbXsrv_connection *xconn = sconn->conn;
+       struct smbd_server_connection *sconn = xconn->sconn;
        int msg_type = CVAL(inbuf,0);
        int msg_flags = CVAL(inbuf,1);
        /*
@@ -627,7 +627,7 @@ void reply_special(struct smbd_server_connection *sconn, char *inbuf, size_t inb
                        if (sconn->remote_hostname == NULL) {
                                exit_server_cleanly("could not copy remote name");
                        }
-                       sconn->conn->remote_hostname = sconn->remote_hostname;
+                       xconn->remote_hostname = sconn->remote_hostname;
                }
 
                DEBUG(2,("netbios connect: local=%s remote=%s, name type = %x\n",