diff options
| author | Gerald Carter <jerry@samba.org> | 2005-04-07 19:43:19 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:56:31 -0500 |
| commit | b751f95a256e0309f878ef93e6da9003fbde92d2 (patch) | |
| tree | 4ca55fbe676b19efac03415a0709eac42faab89d /source3/include/msdfs.h | |
| parent | e79e98a9f6d5a3e619d454259a6affa2428e0ea9 (diff) | |
| download | samba-b751f95a256e0309f878ef93e6da9003fbde92d2.tar.gz samba-b751f95a256e0309f878ef93e6da9003fbde92d2.tar.bz2 samba-b751f95a256e0309f878ef93e6da9003fbde92d2.zip | |
r6237: fix my breakage of WinXP sp2 msdfs support.
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 29983398e2f7f1dc609d4d981e20f594918243bb)
Diffstat (limited to 'source3/include/msdfs.h')
| -rw-r--r-- | source3/include/msdfs.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/source3/include/msdfs.h b/source3/include/msdfs.h index a856f5d1ab..80a0c3a4f1 100644 --- a/source3/include/msdfs.h +++ b/source3/include/msdfs.h @@ -68,14 +68,21 @@ struct dfs_path #define RESOLVE_DFSPATH(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)) \ + dfs_redirect(name, conn, False, False)) \ return ERROR_BOTH(NT_STATUS_PATH_NOT_COVERED, \ 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) && \ 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, \ ERRSRV, ERRbadpath);; } |