sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00
Code

r5994: proper fix for smbclient and win98 file servers; check the WCT value in the tcon&X reply before setting the cli_state->dfsroot flag

Browse Source
This commit is contained in:
Gerald Carter 2005-03-23 15:36:48 +00:00 committed by Gerald (Jerry) Carter
parent 4e8b868e6e
commit d3822d889d
2 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/libsmb/cliconnect.c
View File

@ -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;

20
source/libsmb/clidfs.c
View File

@ -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 */