summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/dosmode.c2
-rw-r--r--source3/smbd/server.c11
-rw-r--r--source3/smbd/trans2.c15
3 files changed, 14 insertions, 14 deletions
diff --git a/source3/smbd/dosmode.c b/source3/smbd/dosmode.c
index 26fd2aff14..5b077110bb 100644
--- a/source3/smbd/dosmode.c
+++ b/source3/smbd/dosmode.c
@@ -138,7 +138,7 @@ int dos_mode(connection_struct *conn,char *path,SMB_STRUCT_STAT *sbuf)
if (S_ISDIR(sbuf->st_mode))
result = aDIR | (result & aRONLY);
-
+
#ifdef S_ISLNK
#if LINKS_READ_ONLY
if (S_ISLNK(sbuf->st_mode) && S_ISDIR(sbuf->st_mode))
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 622251b375..a8e7540d28 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -318,14 +318,6 @@ BOOL reload_services(BOOL test)
ret = lp_load(servicesf,False,False,True);
-#ifdef MS_DFS
- /* load the dfs maps of all the services having
- a dfs_map parameter
- we don't want to do this in lp_load because we want just the smbd
- server to load up the dfs maps into msdfs.tdb. not nmbd, swat etc*/
- load_dfsmaps();
-#endif
-
load_printers();
/* perhaps the config filename is now set */
@@ -455,9 +447,6 @@ void exit_server(char *reason)
}
locking_end();
-#ifdef MS_DFS
- msdfs_end();
-#endif
DEBUG(3,("Server exit (%s)\n", (reason ? reason : "")));
exit(0);
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index e0156c083d..18452158c8 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -405,8 +405,19 @@ static BOOL get_lanman2_dir_entry(connection_struct *conn,
pstrcat(pathreal,dname);
if (conn->vfs_ops.stat(dos_to_unix(pathreal,False),&sbuf) != 0)
{
- DEBUG(5,("get_lanman2_dir_entry:Couldn't stat [%s] (%s)\n",pathreal,strerror(errno)));
- continue;
+ /* Needed to show the msdfs symlinks as directories */
+ if(!lp_host_msdfs() || !lp_msdfs_root(SNUM(conn))
+ || !is_msdfs_volume(conn, pathreal))
+ {
+ DEBUG(5,("get_lanman2_dir_entry:Couldn't stat [%s] (%s)\n",
+ pathreal,strerror(errno)));
+ continue;
+ }
+ else
+ {
+ DEBUG(5,("get_lanman2_dir_entry: Masquerading msdfs link %s as a directory\n", pathreal));
+ sbuf.st_mode = (sbuf.st_mode & 0xFFF) | S_IFDIR;
+ }
}
mode = dos_mode(conn,pathreal,&sbuf);