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

r6237: fix my breakage of WinXP sp2 msdfs support.

Browse Source 
We did need the special case for RESOLVE_DFSPATH
in the findfirst() code.

Jeremy, please verify I haven't broken the allow_wcard
code you added to resolve_dfs_path()
(This used to be commit 29983398e2)
This commit is contained in:
Gerald Carter 2005-04-07 19:43:19 +00:00 committed by Gerald (Jerry) Carter
parent e79e98a9f6
commit b751f95a25
3 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source3/include/msdfs.h
View File

@ -68,14 +68,21 @@ struct dfs_path
#define RESOLVE_DFSPATH(name, conn, inbuf, outbuf) \ #define RESOLVE_DFSPATH(name, conn, inbuf, outbuf) \
{ if ((SVAL(inbuf,smb_flg2) & FLAGS2_DFS_PATHNAMES) && \ { if ((SVAL(inbuf,smb_flg2) & FLAGS2_DFS_PATHNAMES) && \
lp_host_msdfs() && lp_msdfs_root(SNUM(conn)) && \ lp_host_msdfs() && lp_msdfs_root(SNUM(conn)) && \
dfs_redirect(name,conn,False)) \ dfs_redirect(name, conn, False, False)) \
return ERROR_BOTH(NT_STATUS_PATH_NOT_COVERED, \ return ERROR_BOTH(NT_STATUS_PATH_NOT_COVERED, \
ERRSRV, ERRbadpath);; } ERRSRV, ERRbadpath);; }
#define RESOLVE_DFSPATH_WCARD(name, conn, inbuf, outbuf) \ #define RESOLVE_FINDFIRST_DFSPATH(name, conn, inbuf, outbuf) \
{ if ((SVAL(inbuf,smb_flg2) & FLAGS2_DFS_PATHNAMES) && \ { if ((SVAL(inbuf,smb_flg2) & FLAGS2_DFS_PATHNAMES) && \
lp_host_msdfs() && lp_msdfs_root(SNUM(conn)) && \ lp_host_msdfs() && lp_msdfs_root(SNUM(conn)) && \
dfs_redirect(name,conn,True)) \ dfs_redirect(name, conn, True, True)) \
return ERROR_BOTH(NT_STATUS_PATH_NOT_COVERED, \
ERRSRV, ERRbadpath);; }
#define RESOLVE_DFSPATH_WCARD(name, conn, inbuf, outbuf) \
{ if ((SVAL(inbuf,smb_flg2) & FLAGS2_DFS_PATHNAMES) && \
lp_host_msdfs() && lp_msdfs_root(SNUM(conn)) && \
dfs_redirect(name,conn, False, True)) \
return ERROR_BOTH(NT_STATUS_PATH_NOT_COVERED, \ return ERROR_BOTH(NT_STATUS_PATH_NOT_COVERED, \
ERRSRV, ERRbadpath);; } ERRSRV, ERRbadpath);; }

21
source3/smbd/msdfs.c
View File

@ -269,7 +269,9 @@ BOOL is_msdfs_link(connection_struct* conn, char * path,
Used by other functions to decide if a dfs path is remote, Used by other functions to decide if a dfs path is remote,
and to get the list of referred locations for that remote path. and to get the list of referred locations for that remote path.
allow_wcards: Should we allow wildcards when parsing paths. findfirst_flag: For findfirsts, dfs links themselves are not
redirected, but paths beyond the links are. For normal smb calls,
even dfs links need to be redirected.
self_referralp: clients expect a dfs referral for the same share when self_referralp: clients expect a dfs referral for the same share when
they request referrals for dfs roots on a server. they request referrals for dfs roots on a server.
@ -281,7 +283,7 @@ should try the remaining path on the redirected server.
static BOOL resolve_dfs_path(pstring dfspath, struct dfs_path* dp, static BOOL resolve_dfs_path(pstring dfspath, struct dfs_path* dp,
connection_struct* conn, connection_struct* conn,
BOOL allow_wcards, BOOL findfirst_flag, BOOL allow_wcards,
struct referral** reflistpp, int* refcntp, struct referral** reflistpp, int* refcntp,
BOOL* self_referralp, int* consumedcntp) BOOL* self_referralp, int* consumedcntp)
{ {
@ -313,6 +315,12 @@ static BOOL resolve_dfs_path(pstring dfspath, struct dfs_path* dp,
/* check if need to redirect */ /* check if need to redirect */
if (is_msdfs_link(conn, localpath, reflistpp, refcntp, NULL)) { if (is_msdfs_link(conn, localpath, reflistpp, refcntp, NULL)) {
if (findfirst_flag) {
DEBUG(6,("resolve_dfs_path (FindFirst) No redirection "
"for dfs link %s.\n", dfspath));
return False;
}
DEBUG(6,("resolve_dfs_path: %s resolves to a valid Dfs link.\n", dfspath)); DEBUG(6,("resolve_dfs_path: %s resolves to a valid Dfs link.\n", dfspath));
if (consumedcntp) if (consumedcntp)
*consumedcntp = strlen(dfspath); *consumedcntp = strlen(dfspath);
@ -326,6 +334,7 @@ static BOOL resolve_dfs_path(pstring dfspath, struct dfs_path* dp,
*p = '\0'; *p = '\0';
pstrcpy(localpath, reqpath); pstrcpy(localpath, reqpath);
if (is_msdfs_link(conn, localpath, reflistpp, refcntp, NULL)) { if (is_msdfs_link(conn, localpath, reflistpp, refcntp, NULL)) {
DEBUG(4, ("resolve_dfs_path: Redirecting %s because parent %s is dfs link\n", dfspath, localpath)); DEBUG(4, ("resolve_dfs_path: Redirecting %s because parent %s is dfs link\n", dfspath, localpath));
/* To find the path consumed, we truncate the original /* To find the path consumed, we truncate the original
@ -333,6 +342,7 @@ static BOOL resolve_dfs_path(pstring dfspath, struct dfs_path* dp,
component. The length of the resulting string is component. The length of the resulting string is
the path consumed the path consumed
*/ */
if (consumedcntp) { if (consumedcntp) {
char *q; char *q;
pstring buf; pstring buf;
@ -361,7 +371,8 @@ static BOOL resolve_dfs_path(pstring dfspath, struct dfs_path* dp,
If not, the pathname is converted to a tcon-relative local unix path If not, the pathname is converted to a tcon-relative local unix path
*****************************************************************/ *****************************************************************/
BOOL dfs_redirect(pstring pathname, connection_struct* conn, BOOL allow_wcards) BOOL dfs_redirect( pstring pathname, connection_struct* conn,
BOOL findfirst_flag, BOOL allow_wcards )
{ {
struct dfs_path dp; struct dfs_path dp;
@ -380,7 +391,7 @@ BOOL dfs_redirect(pstring pathname, connection_struct* conn, BOOL allow_wcards)
if (!strequal(dp.servicename, lp_servicename(SNUM(conn)) )) if (!strequal(dp.servicename, lp_servicename(SNUM(conn)) ))
return False; return False;
if (resolve_dfs_path(pathname, &dp, conn, allow_wcards, if (resolve_dfs_path(pathname, &dp, conn, findfirst_flag, allow_wcards,
NULL, NULL, NULL, NULL)) { NULL, NULL, NULL, NULL)) {
DEBUG(3,("dfs_redirect: Redirecting %s\n", pathname)); DEBUG(3,("dfs_redirect: Redirecting %s\n", pathname));
return True; return True;
@ -518,7 +529,7 @@ BOOL get_referred_path(char *pathname, struct junction_map *jucn,
return False; return False;
/* If not remote & not a self referral, return False */ /* If not remote & not a self referral, return False */
if (!resolve_dfs_path(pathname, &dp, conn, False, if (!resolve_dfs_path(pathname, &dp, conn, False, False,
&jucn->referral_list, &jucn->referral_count, &jucn->referral_list, &jucn->referral_count,
self_referralp, consumedcntp)) { self_referralp, consumedcntp)) {
if (!*self_referralp) { if (!*self_referralp) {

2
source3/smbd/trans2.c
View File

@ -1626,7 +1626,7 @@ close_if_end = %d requires_resume_key = %d level = 0x%x, max_data_bytes = %d\n",
return ERROR_NT(ntstatus); return ERROR_NT(ntstatus);
} }
RESOLVE_DFSPATH_WCARD(directory, conn, inbuf, outbuf); RESOLVE_FINDFIRST_DFSPATH(directory, conn, inbuf, outbuf);
unix_convert(directory,conn,0,&bad_path,&sbuf); unix_convert(directory,conn,0,&bad_path,&sbuf);
if (bad_path) { if (bad_path) {