Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial

[kai/samba.git] / source4 / smb_server / smb_server.h

diff --git a/source4/smb_server/smb_server.h b/source4/smb_server/smb_server.h
index 5aa2e0b6ce0fea98a6e1753a2279d04a52d7a807..776fe1b71b1a50881a64c4f8ab448d88b0b1af62 100644 (file)
--- a/source4/smb_server/smb_server.h
+++ b/source4/smb_server/smb_server.h
@@ -254,8 +254,8 @@ struct smbsrv_request {
        /* the sequence number for signing */
        uint64_t seq_num;
 
-       struct request_buffer in;
-       struct request_buffer out;
+       struct smb_request_buffer in;
+       struct smb_request_buffer out;
 };
 
 enum security_types {SEC_SHARE,SEC_USER};
@@ -291,7 +291,7 @@ struct smbsrv_connection {
        
                /* the negotiatiated protocol */
                enum protocol_types protocol;
-       
+
                /* authentication context for multi-part negprot */
                struct auth_context *auth_context;
        
@@ -374,6 +374,8 @@ struct smbsrv_connection {
        } statistics;
 
        struct share_context *share_context;
+
+       struct loadparm_context *lp_ctx;
 };
 
 struct model_ops;