summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>1996-07-03 01:58:27 +0000
committerAndrew Tridgell <tridge@samba.org>1996-07-03 01:58:27 +0000
commit07fcf2df0349d5e1294c92de8d982b62d11175a4 (patch)
tree21a92b1657fd4efe80aeff71e254e9c095916f02
parent7ca58ce114b4eafb2bb05d9e9699fe9effd8d9ec (diff)
downloadsamba-07fcf2df0349d5e1294c92de8d982b62d11175a4.tar.gz
samba-07fcf2df0349d5e1294c92de8d982b62d11175a4.tar.bz2
samba-07fcf2df0349d5e1294c92de8d982b62d11175a4.zip
- moved the protocol defs in the client to keep sill C compilers happy
- added change for cnum range in reply_tdis() (This used to be commit 609c3a5e1e3a8d9ba380a802ab3ecf6f47093846)
-rw-r--r--source3/client/client.c31
-rw-r--r--source3/smbd/reply.c5
2 files changed, 20 insertions, 16 deletions
diff --git a/source3/client/client.c b/source3/client/client.c
index fbd208f91a..2eb4be7d13 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -2874,6 +2874,21 @@ static BOOL send_session_request(char *inbuf,char *outbuf)
return(True);
}
+static struct {
+ int prot;
+ char *name;
+} prots[] = {
+ {PROTOCOL_CORE,"PC NETWORK PROGRAM 1.0"},
+ {PROTOCOL_COREPLUS,"MICROSOFT NETWORKS 1.03"},
+ {PROTOCOL_LANMAN1,"MICROSOFT NETWORKS 3.0"},
+ {PROTOCOL_LANMAN1,"LANMAN1.0"},
+ {PROTOCOL_LANMAN2,"LM1.2X002"},
+ {PROTOCOL_LANMAN2,"Samba"},
+ {PROTOCOL_NT1,"NT LM 0.12"},
+ {PROTOCOL_NT1,"NT LANMAN 1.0"},
+ {-1,NULL}
+};
+
/****************************************************************************
send a login command
@@ -2887,22 +2902,6 @@ static BOOL send_login(char *inbuf,char *outbuf,BOOL start_session,BOOL use_setu
int sec_mode=0;
int crypt_len;
int max_vcs=0;
- struct {
- int prot;
- char *name;
- }
- prots[] =
- {
- {PROTOCOL_CORE,"PC NETWORK PROGRAM 1.0"},
- {PROTOCOL_COREPLUS,"MICROSOFT NETWORKS 1.03"},
- {PROTOCOL_LANMAN1,"MICROSOFT NETWORKS 3.0"},
- {PROTOCOL_LANMAN1,"LANMAN1.0"},
- {PROTOCOL_LANMAN2,"LM1.2X002"},
- {PROTOCOL_LANMAN2,"Samba"},
- {PROTOCOL_NT1,"NT LM 0.12"},
- {PROTOCOL_NT1,"NT LANMAN 1.0"},
- {-1,NULL}
- };
char *pass = NULL;
pstring dev;
char *p;
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 4cfa001ec2..13cc8efe5d 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -2062,6 +2062,11 @@ int reply_tdis(char *inbuf,char *outbuf)
cnum = SVAL(inbuf,smb_tid);
uid = SVAL(inbuf,smb_uid);
+ if (!OPEN_CNUM(cnum)) {
+ DEBUG(4,("Invalid cnum in tdis (%d)\n",cnum));
+ return(ERROR(ERRSRV,ERRinvnid));
+ }
+
Connections[cnum].used = False;
close_cnum(cnum,uid);