summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
Diffstat (limited to 'source3')
-rw-r--r--source3/libsmb/cliconnect.c8
-rw-r--r--source3/libsmb/clidfs.c20
2 files changed, 7 insertions, 21 deletions
diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index c5154827c6..4208d6378d 100644
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -982,8 +982,12 @@ BOOL cli_send_tconX(struct cli_state *cli,
cli->win95 = True;
}
- if ( cli->protocol >= PROTOCOL_LANMAN2 )
- cli->dfsroot = (SVAL( cli->inbuf, smb_vwv2 ) & SMB_SHARE_IN_DFS);
+ /* Make sure that we have the optional support 16-bit field. WCT > 2 */
+ /* Avoids issues when connecting to Win9x boxes sharing files */
+
+ cli->dfsroot = False;
+ if ( (CVAL(cli->inbuf, smb_wct))>2 && cli->protocol >= PROTOCOL_LANMAN2 )
+ cli->dfsroot = (SVAL( cli->inbuf, smb_vwv2 ) & SMB_SHARE_IN_DFS) ? True : False;
cli->cnum = SVAL(cli->inbuf,smb_tid);
return True;
diff --git a/source3/libsmb/clidfs.c b/source3/libsmb/clidfs.c
index e2456800dd..21046cd380 100644
--- a/source3/libsmb/clidfs.c
+++ b/source3/libsmb/clidfs.c
@@ -595,26 +595,8 @@ BOOL cli_resolve_path( const char *mountpt, struct cli_state *rootcli, const cha
/* we got an error, check for DFS referral */
- if ( !cli_dfs_check_error(rootcli) ) {
- /* Check for Win98 server - doesn't support this call. */
- uint32 flgs2 = SVAL(rootcli->inbuf,smb_flg2);
-
- /* only deal with DS when we negotiated NT_STATUS codes and UNICODE */
-
- if ( !( (flgs2&FLAGS2_32_BIT_ERROR_CODES) && (flgs2&FLAGS2_UNICODE_STRINGS) ) ) {
- uint8 eclass = 0;
- uint32 ecode = 0;
- cli_dos_error(rootcli, &eclass, &ecode);
- if ((eclass == ERRDOS) && (ecode == ERRbadfunc)) {
- rootcli->dfsroot = 0;
- *targetcli = rootcli;
- pstrcpy( targetpath, path );
- return True;
- }
- }
-
+ if ( !cli_dfs_check_error(rootcli) )
return False;
- }
/* check for the referral */