Add msdfs proxy functionality to HEAD.

(This used to be commit 9df93b1ffc9ce98302540cc3d2cbd66787abc4fd)

3 files changed, 107 insertions, 17 deletions

diff --git a/docs/docbook/manpages/smb.conf.5.sgml b/docs/docbook/manpages/smb.conf.5.sgml
index 13fdb1c6cb..17a1ddf77e 100644
--- a/docs/docbook/manpages/smb.conf.5.sgml
+++ b/docs/docbook/manpages/smb.conf.5.sgml
@@ -1,6 +1,6 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
 <refentry id="smb.conf">
-
+	
 <refmeta>
 	<refentrytitle>smb.conf</refentrytitle>
 	<manvolnum>5</manvolnum>
@@ -869,6 +869,7 @@
 		<listitem><para><link linkend="MAXCONNECTIONS"><parameter>max connections</parameter></link></para></listitem>
 		<listitem><para><link linkend="MAXPRINTJOBS"><parameter>max print jobs</parameter></link></para></listitem>
 		<listitem><para><link linkend="MINPRINTSPACE"><parameter>min print space</parameter></link></para></listitem>
+		<listitem><para><link linkend="MSDFSPROXY"><parameter>msdfs proxy</parameter></link></para></listitem>
 		<listitem><para><link linkend="MSDFSROOT"><parameter>msdfs root</parameter></link></para></listitem>
 		<listitem><para><link linkend="NTACLSUPPORT"><parameter>nt acl support</parameter></link></para></listitem>
 		<listitem><para><link linkend="ONLYGUEST"><parameter>only guest</parameter></link></para></listitem>
@@ -4847,8 +4848,25 @@
 		</varlistentry>
 
 
-		
-		
+		<varlistentry>
+		<term><anchor id="MSDFSPROXY">msdfs proxy (S)</term>
+		<listitem><para>This parameter indicates that the share is a
+		stand-in for another CIFS share whose location is specified by
+		the value of the parameter. When clients attempt to connect to
+		this share, they are redirected to the proxied share using
+		the SMB-Dfs protocol.</para>
+		<para>Only Dfs roots can act as proxy shares. Take a look at the
+		<link linkend="MSDFSROOT"><parameter>msdfs root</parameter></link>
+		and
+		<link linkend="HOSTMSDFS"><parameter>host msdfs</parameter></link>
+		options to find out how to set up a Dfs root share.</para>
+		<para>Example: <command>msdfs proxy = \otherserver\someshare</command></para>
+		</listitem>
+		</varlistentry>
+
+
+
+
 		<varlistentry>
 		<term><anchor id="MSDFSROOT">msdfs root (S)</term>
 		<listitem><para>This boolean parameter is only available if 
@@ -4857,8 +4875,8 @@
 		Samba treats the share as a Dfs root and  allows clients to browse 
 		the distributed file system tree rooted at the share directory. 
 		Dfs links are specified  in  the share directory by symbolic 
-		links of the form <filename>msdfs:serverA\shareA,serverB\shareB
-		</filename> and so on.  For more information on setting up a Dfs tree 
+		links of the form <filename>msdfs:serverA\shareA,serverB\shareB</filename>
+		and so on.  For more information on setting up a Dfs tree 
 		on Samba,  refer to <ulink url="msdfs_setup.html">msdfs_setup.html
 		</ulink>.</para>
 		
diff --git a/docs/htmldocs/smb.conf.5.html b/docs/htmldocs/smb.conf.5.html
index 5e0e9be1e8..84b0920d5b 100644
--- a/docs/htmldocs/smb.conf.5.html
+++ b/docs/htmldocs/smb.conf.5.html
@@ -16,7 +16,9 @@ VLINK="#840084"
 ALINK="#0000FF"
 ><H1
 ><A
-NAME="SMB.CONF">smb.conf</H1
+NAME="SMB.CONF"
+></A
+>smb.conf</H1
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
@@ -3994,6 +3996,18 @@ CLASS="PARAMETER"
 ><LI
 ><P
 ><A
+HREF="#MSDFSPROXY"
+><TT
+CLASS="PARAMETER"
+><I
+>msdfs proxy</I
+></TT
+></A
+></P
+></LI
+><LI
+><P
+><A
 HREF="#MSDFSROOT"
 ><TT
 CLASS="PARAMETER"
@@ -4656,7 +4670,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN1513"
+NAME="AEN1517"
 ></A
 ><H2
 >EXPLANATION OF EACH PARAMETER</H2
@@ -12529,6 +12543,46 @@ CLASS="COMMAND"
 ></DD
 ><DT
 ><A
+NAME="MSDFSPROXY"
+></A
+>msdfs proxy (S)</DT
+><DD
+><P
+>This parameter indicates that the share is a
+		stand-in for another CIFS share whose location is specified by
+		the value of the parameter. When clients attempt to connect to
+		this share, they are redirected to the proxied share using
+		the SMB-Dfs protocol.</P
+><P
+>Only Dfs roots can act as proxy shares. Take a look at the
+		<A
+HREF="#MSDFSROOT"
+><TT
+CLASS="PARAMETER"
+><I
+>msdfs root</I
+></TT
+></A
+>
+		and
+		<A
+HREF="#HOSTMSDFS"
+><TT
+CLASS="PARAMETER"
+><I
+>host msdfs</I
+></TT
+></A
+>
+		options to find out how to set up a Dfs root share.</P
+><P
+>Example: <B
+CLASS="COMMAND"
+>msdfs proxy = \otherserver\someshare</B
+></P
+></DD
+><DT
+><A
 NAME="MSDFSROOT"
 ></A
 >msdfs root (S)</DT
@@ -12547,9 +12601,9 @@ CLASS="CONSTANT"
 		Dfs links are specified  in  the share directory by symbolic 
 		links of the form <TT
 CLASS="FILENAME"
->msdfs:serverA\shareA,serverB\shareB
-		</TT
-> and so on.  For more information on setting up a Dfs tree 
+>msdfs:serverA\shareA,serverB\shareB</TT
+>
+		and so on.  For more information on setting up a Dfs tree 
 		on Samba,  refer to <A
 HREF="msdfs_setup.html"
 TARGET="_top"
@@ -19432,7 +19486,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN6147"
+NAME="AEN6163"
 ></A
 ><H2
 >WARNINGS</H2
@@ -19462,7 +19516,7 @@ TARGET="_top"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN6153"
+NAME="AEN6169"
 ></A
 ><H2
 >VERSION</H2
@@ -19473,7 +19527,7 @@ NAME="AEN6153"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN6156"
+NAME="AEN6172"
 ></A
 ><H2
 >SEE ALSO</H2
@@ -19552,7 +19606,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN6176"
+NAME="AEN6192"
 ></A
 ><H2
 >AUTHOR</H2
diff --git a/docs/manpages/smb.conf.5 b/docs/manpages/smb.conf.5
index a9cf133c8d..a5330e50b6 100644
--- a/docs/manpages/smb.conf.5
+++ b/docs/manpages/smb.conf.5
@@ -3,7 +3,7 @@
 .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "SMB.CONF" "5" "26 November 2002" "" ""
+.TH "SMB.CONF" "5" "29 December 2002" "" ""
 .SH NAME
 smb.conf \- The configuration file for the Samba suite
 .SH "SYNOPSIS"
@@ -1271,6 +1271,9 @@ each parameter for details. Note that some are synonyms.
 \fImin print space\fR
 .TP 0.2i
 \(bu
+\fImsdfs proxy\fR
+.TP 0.2i
+\(bu
 \fImsdfs root\fR
 .TP 0.2i
 \(bu
@@ -4497,14 +4500,29 @@ is 6 hours (21600 seconds).
 
 Default: \fBmin wins ttl = 21600\fR
 .TP
+\fBmsdfs proxy (S)\fR
+This parameter indicates that the share is a
+stand-in for another CIFS share whose location is specified by
+the value of the parameter. When clients attempt to connect to
+this share, they are redirected to the proxied share using
+the SMB-Dfs protocol.
+
+Only Dfs roots can act as proxy shares. Take a look at the
+\fImsdfs root\fR
+and
+\fIhost msdfs\fR
+options to find out how to set up a Dfs root share.
+
+Example: \fBmsdfs proxy = \\otherserver\\someshare\fR
+.TP
 \fBmsdfs root (S)\fR
 This boolean parameter is only available if 
 Samba is configured  and  compiled with the \fB  --with-msdfs\fR option.  If set to yes, 
 Samba treats the share as a Dfs root and  allows clients to browse 
 the distributed file system tree rooted at the share directory. 
 Dfs links are specified  in  the share directory by symbolic 
-links of the form \fImsdfs:serverA\\shareA,serverB\\shareB
-\fR and so on.  For more information on setting up a Dfs tree 
+links of the form \fImsdfs:serverA\\shareA,serverB\\shareB\fR
+and so on.  For more information on setting up a Dfs tree 
 on Samba,  refer to msdfs_setup.html