This commit was manufactured by cvs2svn to create branch 'SAMBA_3_0'.(This used to be commit 8fa5862a443f3126e410e0e2f2f12770a113792f)

2 files changed, 142 insertions, 0 deletions

diff --git a/docs/docbook/smbdotconf/security/passdbbackend.xml b/docs/docbook/smbdotconf/security/passdbbackend.xml
new file mode 100644
index 0000000000..d755cfc313
--- /dev/null
+++ b/docs/docbook/smbdotconf/security/passdbbackend.xml
@@ -0,0 +1,93 @@
+<samba:parameter name="passdb backend"
+                 context="G"
+                 advanced="1" developer="1"
+		 xmlns:samba="http://samba.org/common">
+<listitem>
+
+    <para>This option allows the administrator to chose which backends
+    to retrieve and store passwords with. This allows (for example) both 
+    smbpasswd and tdbsam to be used without a recompile. Multiple
+    backends can be specified, separated by spaces. The backends will be
+    searched in the order they are specified. New users are always added
+	to the first backend specified. </para>
+
+    <para>This parameter is in two parts, the backend's name, and a 'location'
+    string that has meaning only to that particular backed.  These are separated
+    by a : character.</para>
+
+    <para>Available backends can include:
+	<itemizedlist>
+	    <listitem>
+		<para><command moreinfo="none">smbpasswd</command> - The default smbpasswd
+		backend. Takes a path to the smbpasswd file as an optional argument.
+		</para>
+	    </listitem>
+			
+	    <listitem>
+		<para><command moreinfo="none">smbpasswd_nua</command> - The smbpasswd
+                backend, but with support for 'not unix accounts'.  
+                Takes a path to the smbpasswd file as an optional argument.</para>
+		
+                <para>See also <link linkend="NONUNIXACCOUNTRANGE">
+                <parameter moreinfo="none">non unix account range</parameter></link></para>
+	    </listitem>
+
+	    <listitem>
+		<para><command moreinfo="none">tdbsam</command> - The TDB based password storage
+                backend.  Takes a path to the TDB as an optional argument (defaults to passdb.tdb 
+                in the <link linkend="PRIVATEDIR">
+                <parameter moreinfo="none">private dir</parameter></link> directory.</para>
+	    </listitem>
+			
+	    <listitem>
+		<para><command moreinfo="none">tdbsam_nua</command> - The TDB based password storage
+                backend, with non unix account support.  Takes a path to the TDB as an optional argument (defaults to passdb.tdb 
+                in the <link linkend="PRIVATEDIR">
+                <parameter moreinfo="none">private dir</parameter></link> directory.</para>
+		
+                <para>See also <link linkend="NONUNIXACCOUNTRANGE">
+                <parameter moreinfo="none">non unix account range</parameter></link></para>
+	    </listitem>
+			
+	    <listitem>
+		<para><command moreinfo="none">ldapsam</command> - The LDAP based passdb 
+                backend.  Takes an LDAP URL as an optional argument (defaults to 
+                <command moreinfo="none">ldap://localhost</command>)</para>
+	    </listitem>
+			
+	    <listitem>
+		<para><command moreinfo="none">ldapsam_nua</command> - The LDAP based passdb 
+                backend, with non unix account support.  Takes an LDAP URL as an optional argument (defaults to 
+                <command moreinfo="none">ldap://localhost</command>)</para>
+
+		<para>Note:  In this module, any account without a matching POSIX account is regarded
+                as 'non unix'.  </para>
+
+		<para>See also <link linkend="NONUNIXACCOUNTRANGE">
+		<parameter moreinfo="none">non unix account range</parameter></link></para>
+	                
+		<para>LDAP connections should be secured where possible.  This may be done using either
+                Start-TLS (see <link linkend="LDAPSSL"><parameter moreinfo="none">ldap ssl</parameter></link>) or by
+                specifying <parameter moreinfo="none">ldaps://</parameter> in
+                the URL argument. </para>
+	    </listitem>
+			
+	    <listitem>
+		<para><command moreinfo="none">nisplussam</command> -
+		The NIS+ based passdb backend. Takes name NIS domain as
+		an optional argument. Only works with sun NIS+ servers.
+		</para>
+	    </listitem>
+
+	</itemizedlist>
+    </para>
+
+    <para>Default: <command moreinfo="none">passdb backend = smbpasswd unixsam</command></para>
+
+    <para>Example: <command moreinfo="none">passdb backend = tdbsam:/etc/samba/private/passdb.tdb smbpasswd:/etc/samba/smbpasswd guest</command></para>
+
+	<para>Example: <command moreinfo="none">passdb backend = ldapsam_nua:ldaps://ldap.example.com guest</command></para>
+
+    <para>Example: <command moreinfo="none">passdb backend = mysql:my_plugin_args tdbsam:/etc/samba/private/passdb.tdb</command></para>
+</listitem>
+</samba:parameter>
diff --git a/testsuite/build_farm/template/basicsmb.smb.conf b/testsuite/build_farm/template/basicsmb.smb.conf
new file mode 100644
index 0000000000..234419b688
--- /dev/null
+++ b/testsuite/build_farm/template/basicsmb.smb.conf
@@ -0,0 +1,49 @@
+[global]
+    netbios name = BUILDFARM
+    workgroup = TESTWG
+    log level = LOGLEVEL
+    debug timestamp = no
+    encrypt passwords = yes
+    server string = Samba %v Build Farm Tests
+    name resolve order = lmhosts
+    guest account = WHOAMI
+    domain logons = yes
+
+    strict locking = yes
+
+    include = PREFIX/lib/smb.conf.%L
+
+    add machine script = useradd %u -d /dev/null -s /bin/false
+
+    panic action = /bin/sh BUILD_FARM/samba/testsuite/build_farm/backtrace %d
+
+    passdb backend = smbpasswd
+
+    idmap uid = 10000-200000
+    map hidden = yes
+    create mask = 0777
+
+[test]
+    path = PREFIX/testdir
+    read only = no
+
+[samba]
+    path = BUILD_FARM/samba
+    read only = yes
+    comment = Samba HEAD Sources
+
+[samba_2_2]
+    path = BUILD_FARM/samba_2_2
+    read only = yes
+    comment = Samba 2.2. Sources
+
+[rsync]
+    path = BUILD_FARM/rsync
+    read only = yes
+    comment = Rsync Sources
+
+[guest_share]
+    path = PREFIX
+    guest ok = yes
+    read only = yes
+    comment = Unauthenticated share for use in share level test