summaryrefslogtreecommitdiff
path: root/source3/smbd/server.c
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>1997-09-04 20:26:07 +0000
committerJeremy Allison <jra@samba.org>1997-09-04 20:26:07 +0000
commitf5302af621d91536a72b437ae2b80f9dedb46920 (patch)
tree7a72ab4e6d1a1cbff79ea9262b82b8e696203e6f /source3/smbd/server.c
parent82290216ad827c9f8f74ffd3aa6a37dca28174e1 (diff)
downloadsamba-f5302af621d91536a72b437ae2b80f9dedb46920.tar.gz
samba-f5302af621d91536a72b437ae2b80f9dedb46920.tar.bz2
samba-f5302af621d91536a72b437ae2b80f9dedb46920.zip
Fixed up determination of client type for PROTOCOL_NT1. Uses client
capabilities bits in session_setup_and_X to decide. Made remote_arch an enum as well as a string, for easier use. Jeremy (jallison@whistle.com) (This used to be commit 99080705a2d0adcb25e1eecbe517a2fac2779baa)
Diffstat (limited to 'source3/smbd/server.c')
-rw-r--r--source3/smbd/server.c22
1 files changed, 10 insertions, 12 deletions
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index a65ffdd81c..e2fe14b0b8 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -1985,10 +1985,10 @@ struct
int new_smb_error;
int old_smb_error;
int protocol_level;
- char *valid_remote_arch;
+ enum remote_arch_types valid_ra_type;
} old_client_errmap[] =
{
- {ERRbaddirectory, ERRbadpath, (int)PROTOCOL_NT1, "WinNT"},
+ {ERRbaddirectory, ERRbadpath, (int)PROTOCOL_NT1, RA_WINNT},
{0,0,0}
};
@@ -1997,7 +1997,6 @@ struct
****************************************************************************/
int unix_error_packet(char *inbuf,char *outbuf,int def_class,uint32 def_code,int line)
{
- extern fstring remote_arch;
int eclass=def_class;
int ecode=def_code;
int i=0;
@@ -2030,7 +2029,7 @@ int unix_error_packet(char *inbuf,char *outbuf,int def_class,uint32 def_code,int
for apps to work correctly, Win95 will break if
these error codes are returned. But they both
negotiate the *same* protocol. So we need to use
- the revolting 'remote_arch' string to tie break.
+ the revolting 'remote_arch' enum to tie break.
There must be a better way of doing this...
*/
@@ -2038,7 +2037,7 @@ int unix_error_packet(char *inbuf,char *outbuf,int def_class,uint32 def_code,int
for(i = 0; old_client_errmap[i].new_smb_error != 0; i++)
{
if(((Protocol < old_client_errmap[i].protocol_level) ||
- !strcsequal( old_client_errmap[i].valid_remote_arch, remote_arch)) &&
+ (old_client_errmap[i].valid_ra_type != get_remote_arch())) &&
(old_client_errmap[i].new_smb_error == ecode))
{
ecode = old_client_errmap[i].old_smb_error;
@@ -3062,7 +3061,6 @@ struct {
****************************************************************************/
static int reply_negprot(char *inbuf,char *outbuf)
{
- extern fstring remote_arch;
int outsize = set_message(outbuf,1,0,True);
int Index=0;
int choice= -1;
@@ -3102,22 +3100,22 @@ static int reply_negprot(char *inbuf,char *outbuf)
switch ( arch ) {
case ARCH_SAMBA:
- strcpy(remote_arch,"Samba");
+ set_remote_arch(RA_SAMBA);
break;
case ARCH_WFWG:
- strcpy(remote_arch,"WfWg");
+ set_remote_arch(RA_WFWG);
break;
case ARCH_WIN95:
- strcpy(remote_arch,"Win95");
+ set_remote_arch(RA_WIN95);
break;
case ARCH_WINNT:
- strcpy(remote_arch,"WinNT");
+ set_remote_arch(RA_WINNT);
break;
case ARCH_OS2:
- strcpy(remote_arch,"OS2");
+ set_remote_arch(RA_OS2);
break;
default:
- strcpy(remote_arch,"UNKNOWN");
+ set_remote_arch(RA_UNKNOWN);
break;
}