summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2001-08-23 20:16:59 +0000
committerJeremy Allison <jra@samba.org>2001-08-23 20:16:59 +0000
commita58f8ff5ec4e20836bef7956619600c4579079e6 (patch)
treeb4c6e88961e0d36235bc4fc4b4da76622095ffb6
parent3fdad17d59cc100366f9819283755d331a6ff58a (diff)
downloadsamba-a58f8ff5ec4e20836bef7956619600c4579079e6.tar.gz
samba-a58f8ff5ec4e20836bef7956619600c4579079e6.tar.xz
samba-a58f8ff5ec4e20836bef7956619600c4579079e6.zip
Fix status32 problem for Thursby clients.
Jeremy.
-rw-r--r--source/msdfs/msdfs.c4
-rw-r--r--source/smbd/ipc.c2
-rw-r--r--source/smbd/reply.c5
3 files changed, 3 insertions, 8 deletions
diff --git a/source/msdfs/msdfs.c b/source/msdfs/msdfs.c
index 9b4993aa460..ba7ac57a762 100644
--- a/source/msdfs/msdfs.c
+++ b/source/msdfs/msdfs.c
@@ -593,9 +593,7 @@ int setup_dfs_referral(char* pathname, int max_referral_level, char** ppdata)
int dfs_path_error(char* inbuf, char* outbuf)
{
- enum remote_arch_types ra_type = get_remote_arch();
- BOOL NT_arch = ((ra_type==RA_WINNT) || (ra_type == RA_WIN2K));
- if(NT_arch && (global_client_caps & (CAP_NT_SMBS | CAP_STATUS32)) ) {
+ if(global_client_caps & CAP_STATUS32) {
SSVAL(outbuf,smb_flg2,SVAL(outbuf,smb_flg2) | FLAGS2_32_BIT_ERROR_CODES);
return(ERROR(0,0xc0000000|NT_STATUS_PATH_NOT_COVERED));
}
diff --git a/source/smbd/ipc.c b/source/smbd/ipc.c
index 76b043c2dac..ec970f86238 100644
--- a/source/smbd/ipc.c
+++ b/source/smbd/ipc.c
@@ -103,7 +103,7 @@ void send_trans_reply(char *outbuf,
if (buffer_too_large)
{
/* issue a buffer size warning. on a DCE/RPC pipe, expect an SMBreadX... */
- if (!(global_client_caps & (CAP_NT_SMBS | CAP_STATUS32 ))) {
+ if (!(global_client_caps & CAP_STATUS32 )) {
/* Win9x version. */
SSVAL(outbuf, smb_err, ERRmoredata);
SCVAL(outbuf, smb_rcls, ERRDOS);
diff --git a/source/smbd/reply.c b/source/smbd/reply.c
index 2ceff9d9d7c..f00926bc482 100644
--- a/source/smbd/reply.c
+++ b/source/smbd/reply.c
@@ -703,10 +703,7 @@ static BOOL check_domain_security(char *orig_user, char *domain, char *unix_user
static int bad_password_error(char *inbuf,char *outbuf)
{
- enum remote_arch_types ra_type = get_remote_arch();
-
- if(((ra_type == RA_WINNT) || (ra_type == RA_WIN2K)) &&
- (global_client_caps & (CAP_NT_SMBS | CAP_STATUS32 ))) {
+ if(global_client_caps & CAP_STATUS32 ) {
SSVAL(outbuf, smb_flg2, SVAL(outbuf, smb_flg2) | FLAGS2_32_BIT_ERROR_CODES);
return(ERROR(0,NT_STATUS_LOGON_FAILURE));
}