summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-05-30 12:32:56 +1000
committerAndrew Bartlett <abartlet@samba.org>2012-06-05 04:27:36 +0200
commit9db04c481d981ee0ab285e0e34f32c49a7e84641 (patch)
tree1d97727b894618a9e54d7c3f6a088dd0a5bc25b2 /source3
parent3a1358121ab0d0d950252a0ec770a08bdda90809 (diff)
downloadsamba-9db04c481d981ee0ab285e0e34f32c49a7e84641.tar.gz
samba-9db04c481d981ee0ab285e0e34f32c49a7e84641.tar.bz2
samba-9db04c481d981ee0ab285e0e34f32c49a7e84641.zip
s3-smbd: Remove support for protocols before LANMAN1
This falls out of the removal of security=share, because we now require that a session setup has been performed before (essentially) all other operations. Andrew Bartlett
Diffstat (limited to 'source3')
-rw-r--r--source3/param/loadparm.c2
-rw-r--r--source3/smbd/negprot.c35
2 files changed, 1 insertions, 36 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 1c78b5831c..f9d14cdac1 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -4781,7 +4781,7 @@ static void init_globals(bool reinit_globals)
Globals.max_open_files = max_open_files();
Globals.open_files_db_hash_size = SMB_OPEN_DATABASE_TDB_HASH_SIZE;
Globals.srv_maxprotocol = PROTOCOL_SMB2_02;
- Globals.srv_minprotocol = PROTOCOL_CORE;
+ Globals.srv_minprotocol = PROTOCOL_LANMAN1;
Globals.security = SEC_USER;
Globals.paranoid_server_security = true;
Globals.bEncryptPasswords = true;
diff --git a/source3/smbd/negprot.c b/source3/smbd/negprot.c
index a55a7c336c..6d533334dd 100644
--- a/source3/smbd/negprot.c
+++ b/source3/smbd/negprot.c
@@ -57,39 +57,6 @@ static void get_challenge(struct smbd_server_connection *sconn, uint8 buff[8])
}
/****************************************************************************
- Reply for the core protocol.
-****************************************************************************/
-
-static void reply_corep(struct smb_request *req, uint16 choice)
-{
- reply_outbuf(req, 1, 0);
- SSVAL(req->outbuf, smb_vwv0, choice);
-
- smbXsrv_connection_init_tables(req->sconn->conn, PROTOCOL_CORE);
-}
-
-/****************************************************************************
- Reply for the coreplus protocol.
-****************************************************************************/
-
-static void reply_coreplus(struct smb_request *req, uint16 choice)
-{
- int raw = (lp_readraw()?1:0) | (lp_writeraw()?2:0);
-
- reply_outbuf(req, 13, 0);
-
- SSVAL(req->outbuf,smb_vwv0,choice);
- SSVAL(req->outbuf,smb_vwv5,raw); /* tell redirector we support
- readbraw and writebraw (possibly) */
- /* Reply, SMBlockread, SMBwritelock supported. */
- SCVAL(req->outbuf,smb_flg,FLAG_REPLY|FLAG_SUPPORT_LOCKREAD);
- SSVAL(req->outbuf,smb_vwv1,0x1); /* user level security, don't
- * encrypt */
-
- smbXsrv_connection_init_tables(req->sconn->conn, PROTOCOL_COREPLUS);
-}
-
-/****************************************************************************
Reply for the lanman 1.0 protocol.
****************************************************************************/
@@ -529,8 +496,6 @@ static const struct {
{"DOS LM1.2X002", "LANMAN2", reply_lanman2, PROTOCOL_LANMAN2},
{"LANMAN1.0", "LANMAN1", reply_lanman1, PROTOCOL_LANMAN1},
{"MICROSOFT NETWORKS 3.0", "LANMAN1", reply_lanman1, PROTOCOL_LANMAN1},
- {"MICROSOFT NETWORKS 1.03", "COREPLUS", reply_coreplus, PROTOCOL_COREPLUS},
- {"PC NETWORK PROGRAM 1.0", "CORE", reply_corep, PROTOCOL_CORE},
{NULL,NULL,NULL,0},
};