svn commit: samba r25324 - in branches: SAMBA_3_2/source/smbd SAMBA_3_2_0/source/smbd

[vlendec]

Author: vlendec
Date: 2007-09-25 21:41:39 +0000 (Tue, 25 Sep 2007)
New Revision: 25324

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25324

Log:
Fix "msdfs proxy"

Jeremy, please check!

Modified:
   branches/SAMBA_3_2/source/smbd/msdfs.c
   branches/SAMBA_3_2_0/source/smbd/msdfs.c


Changeset:
Modified: branches/SAMBA_3_2/source/smbd/msdfs.c
===================================================================
--- branches/SAMBA_3_2/source/smbd/msdfs.c      2007-09-25 21:32:49 UTC (rev 
25323)
+++ branches/SAMBA_3_2/source/smbd/msdfs.c      2007-09-25 21:41:39 UTC (rev 
25324)
@@ -771,7 +771,7 @@
                }
        }
 
-       if (!lp_msdfs_root(snum)) {
+       if (!lp_msdfs_root(snum) && (*lp_msdfs_proxy(snum) == '\0')) {
                DEBUG(3,("get_referred_path: |%s| in dfs path %s is not "
                        "a dfs root.\n",
                        pdp->servicename, dfs_path));

Modified: branches/SAMBA_3_2_0/source/smbd/msdfs.c
===================================================================
--- branches/SAMBA_3_2_0/source/smbd/msdfs.c    2007-09-25 21:32:49 UTC (rev 
25323)
+++ branches/SAMBA_3_2_0/source/smbd/msdfs.c    2007-09-25 21:41:39 UTC (rev 
25324)
@@ -771,7 +771,7 @@
                }
        }
 
-       if (!lp_msdfs_root(snum)) {
+       if (!lp_msdfs_root(snum) && (*lp_msdfs_proxy(snum) == '\0')) {
                DEBUG(3,("get_referred_path: |%s| in dfs path %s is not "
                        "a dfs root.\n",
                        pdp->servicename, dfs_path));