diff options
| author | Gerald Carter <jerry@samba.org> | 2005-04-07 22:37:03 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:56:31 -0500 |
| commit | 1253a174f376f575819d0c84e8ee10ac43d18725 (patch) | |
| tree | 138c32b8e186294e08ae9a05d25150685cc240e2 /source3/include/msdfs.h | |
| parent | ecc6933a86dfc61b49ce907cf444cc45d2e3f8d5 (diff) | |
| download | samba-1253a174f376f575819d0c84e8ee10ac43d18725.tar.gz samba-1253a174f376f575819d0c84e8ee10ac43d18725.tar.bz2 samba-1253a174f376f575819d0c84e8ee10ac43d18725.zip | |
r6242: after talking to jeremy, we can actually consolidate
the 2 BOOL flags in dfs_redirect() down to one since
they both are used in essentially the same context
(from what we can tell).
Tested Win98SE, WinXP sp 1 & 2, Win2k3 sp1, and WIn2k Sp4.
All dfs operations still seem to work.
(This used to be commit 59ffacf59c98f2f8277d76ec22712e438fd40618)
Diffstat (limited to 'source3/include/msdfs.h')
| -rw-r--r-- | source3/include/msdfs.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/source3/include/msdfs.h b/source3/include/msdfs.h index 80a0c3a4f1..8d6b23bcbf 100644 --- a/source3/include/msdfs.h +++ b/source3/include/msdfs.h @@ -68,21 +68,14 @@ 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, False)) \ - return ERROR_BOTH(NT_STATUS_PATH_NOT_COVERED, \ - ERRSRV, ERRbadpath);; } - -#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, True)) \ + dfs_redirect(name, conn, False)) \ 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)) \ + dfs_redirect(name,conn, True)) \ return ERROR_BOTH(NT_STATUS_PATH_NOT_COVERED, \ ERRSRV, ERRbadpath);; } |