s4:smb_server: make use of PROTOCOL_SMB2_02

metze

diff --git a/source4/smb_server/smb/negprot.c b/source4/smb_server/smb/negprot.c
index 0a07ab93e2da82d4bdd2f1bc74e2ef6684d60602..378330ff28f73bd589acc3a688d239dfcd889e1e 100644 (file)
--- a/source4/smb_server/smb/negprot.c
+++ b/source4/smb_server/smb/negprot.c
@@ -465,7 +465,7 @@ static const struct {
        void (*proto_reply_fn)(struct smbsrv_request *req, uint16_t choice);
        int protocol_level;
 } supported_protocols[] = {
-       {"SMB 2.002",                   "SMB2",         reply_smb2,     PROTOCOL_SMB2},
+       {"SMB 2.002",                   "SMB2",         reply_smb2,     PROTOCOL_SMB2_02},
        {"NT LANMAN 1.0",               "NT1",          reply_nt1,      PROTOCOL_NT1},
        {"NT LM 0.12",                  "NT1",          reply_nt1,      PROTOCOL_NT1},
        {"LANMAN2.1",                   "LANMAN2",      reply_lanman2,  PROTOCOL_LANMAN2},

diff --git a/source4/smb_server/smb2/negprot.c b/source4/smb_server/smb2/negprot.c
index da60676322a21ae84fab131d6c34918ae61344d4..bc896aa9240869ee3112b38f4b6a39dda2d4c86a 100644 (file)
--- a/source4/smb_server/smb2/negprot.c
+++ b/source4/smb_server/smb2/negprot.c
@@ -113,7 +113,7 @@ static NTSTATUS smb2srv_negprot_backend(struct smb2srv_request *req, struct smb2
                return NT_STATUS_NOT_SUPPORTED;
        }
 
-       req->smb_conn->negotiate.protocol = PROTOCOL_SMB2;
+       req->smb_conn->negotiate.protocol = PROTOCOL_SMB2_02;
 
        current_time = timeval_current(); /* TODO: handle timezone?! */
        boot_time = timeval_current(); /* TODO: fix me */

diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c
index d64a597d31fcab431e39e5b52328506643c9802d..270e107c06e8cdafa780e02914bd33c974e40d2d 100644 (file)
--- a/source4/smb_server/smb_server.c
+++ b/source4/smb_server/smb_server.c
@@ -63,7 +63,7 @@ static NTSTATUS smbsrv_recv_generic_request(void *private_data, DATA_BLOB blob)
                packet_set_callback(smb_conn->packet, smbsrv_recv_smb_request);
                return smbsrv_recv_smb_request(smb_conn, blob);
        case SMB2_MAGIC:
-               if (lpcfg_srv_maxprotocol(smb_conn->lp_ctx) < PROTOCOL_SMB2) break;
+               if (lpcfg_srv_maxprotocol(smb_conn->lp_ctx) < PROTOCOL_SMB2_02) break;
                status = smbsrv_init_smb2_connection(smb_conn);
                NT_STATUS_NOT_OK_RETURN(status);
                packet_set_callback(smb_conn->packet, smbsrv_recv_smb2_request);