sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-15 23:24:37 +03:00
Code

r5521: allow smbclient to follow multiple leveles of dfs referrals (no loop checking currently)

Browse Source
This commit is contained in:
Gerald Carter 2005-02-23 20:00:26 +00:00 committed by Gerald (Jerry) Carter
parent 53d6a5f9d1
commit 3c09b1f30f
1 changed files with 10 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
source/libsmb/clidfs.c
View File

@ -235,53 +235,6 @@ BOOL cli_dfs_get_referral( struct cli_state *cli, const char *path,
return True; return True;
} }
#if 0
/********************************************************************
********************************************************************/
BOOL cli_dfs_handle_referral( struct cli_state *cli, const char *path )
{
struct cli_state *cli_ipc;
pstring fullpath;
CLIENT_DFS_REFERRAL *refs = NULL;
size_t num_refs;
uint16 consumed;
fstring server, share;
if ( !cli_dfs_check_error(cli) )
return False;
if ( !(cli_ipc = cli_cm_open( cli->desthost, "IPC$", False )) )
return False;
make_full_path( fullpath, cli->desthost, cli->share, path );
if ( !cli_dfs_get_referral( cli_ipc, fullpath, &refs, &num_refs, &consumed ) ) {
d_printf("cli_get_dfs_referral() failed!\n");
/* reset the current client connection */
cli_cm_open( cli->desthost, cli->share, False );
return False;
}
/* just pick the first one */
if ( num_refs ) {
split_dfs_path( refs[0].alternate_path, server, share );
if ( cli_cm_open( server, share, False ) == NULL ) {
d_printf("Unable to follow dfs referral [\\\\%s\\%s]\n",
server, share );
cli_cm_open( cli->desthost, cli->share, False );
return False;
}
}
SAFE_FREE( refs );
return True;
}
#endif
/******************************************************************** /********************************************************************
********************************************************************/ ********************************************************************/
@ -295,6 +248,8 @@ BOOL cli_resolve_path( struct cli_state *rootcli, const char *path,
pstring fullpath, cleanpath; pstring fullpath, cleanpath;
int pathlen; int pathlen;
fstring server, share; fstring server, share;
struct cli_state *newcli;
pstring newpath;
SMB_STRUCT_STAT sbuf; SMB_STRUCT_STAT sbuf;
uint32 attributes; uint32 attributes;
@ -351,5 +306,13 @@ BOOL cli_resolve_path( struct cli_state *rootcli, const char *path,
return False; return False;
} }
/* check for another dfs refeerrali, note that we are not
checking for loops here */
if ( cli_resolve_path( *targetcli, targetpath, &newcli, newpath ) ) {
*targetcli = newcli;
pstrcpy( targetpath, newpath );
}
return True; return True;
} }