diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2013-02-20 14:59:42 +1030 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2013-02-20 07:09:19 +0100 |
| commit | 2f4b21bb57c4f96c5f5b57a69d022c142d8088d5 (patch) | |
| tree | ccc1865699e47eaf9702953ae9a59f746fe4afa2 /docs-xml/smbdotconf | |
| parent | 3c9c3029f2bcf10ef614dd9f923d02232db3ac8d (diff) | |
| download | samba-2f4b21bb57c4f96c5f5b57a69d022c142d8088d5.tar.gz samba-2f4b21bb57c4f96c5f5b57a69d022c142d8088d5.tar.bz2 samba-2f4b21bb57c4f96c5f5b57a69d022c142d8088d5.zip | |
ntdb: switch between secrets.tdb and secrets.ntdb depending on 'use ntdb'
Since we open with dbwrap, it auto-converts old tdbs (which it will
rename to secrets.tdb.bak once it's done).
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Rusty Russell <rusty@rustcorp.com.au>
Autobuild-Date(master): Wed Feb 20 07:09:19 CET 2013 on sn-devel-104
Diffstat (limited to 'docs-xml/smbdotconf')
| -rw-r--r-- | docs-xml/smbdotconf/domain/machinepasswordtimeout.xml | 2 | ||||
| -rw-r--r-- | docs-xml/smbdotconf/ldap/ldapadmindn.xml | 2 | ||||
| -rw-r--r-- | docs-xml/smbdotconf/security/kerberosmethod.xml | 4 | ||||
| -rw-r--r-- | docs-xml/smbdotconf/security/privatedir.xml | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/docs-xml/smbdotconf/domain/machinepasswordtimeout.xml b/docs-xml/smbdotconf/domain/machinepasswordtimeout.xml index a8e312ba36..4f55e81f00 100644 --- a/docs-xml/smbdotconf/domain/machinepasswordtimeout.xml +++ b/docs-xml/smbdotconf/domain/machinepasswordtimeout.xml @@ -9,7 +9,7 @@ If a Samba server is a member of a Windows NT Domain (see the <smbconfoption name="security">domain</smbconfoption> parameter) then periodically a running smbd process will try and change the MACHINE ACCOUNT PASSWORD stored in the TDB called <filename moreinfo="none">private/secrets.tdb - </filename>. This parameter specifies how often this password will be changed, in seconds. The default is one + </filename> (or <filename moreinfo="none">private/secrets.ntdb</filename>). This parameter specifies how often this password will be changed, in seconds. The default is one week (expressed in seconds), the same as a Windows NT Domain member server. </para> diff --git a/docs-xml/smbdotconf/ldap/ldapadmindn.xml b/docs-xml/smbdotconf/ldap/ldapadmindn.xml index 442d242679..b5fe0fbca0 100644 --- a/docs-xml/smbdotconf/ldap/ldapadmindn.xml +++ b/docs-xml/smbdotconf/ldap/ldapadmindn.xml @@ -8,7 +8,7 @@ <para> The <smbconfoption name="ldap admin dn"/> defines the Distinguished Name (DN) name used by Samba to contact the ldap server when retreiving user account information. The <smbconfoption name="ldap admin dn"/> is used - in conjunction with the admin dn password stored in the <filename moreinfo="none">private/secrets.tdb</filename> + in conjunction with the admin dn password stored in the <filename moreinfo="none">private/secrets.tdb</filename> (or <filename moreinfo="none">private/secrets.ntdb</filename>) file. See the <citerefentry><refentrytitle>smbpasswd</refentrytitle> <manvolnum>8</manvolnum></citerefentry> man page for more information on how to accomplish this. </para> diff --git a/docs-xml/smbdotconf/security/kerberosmethod.xml b/docs-xml/smbdotconf/security/kerberosmethod.xml index 3a11e06be9..cc8a69bc70 100644 --- a/docs-xml/smbdotconf/security/kerberosmethod.xml +++ b/docs-xml/smbdotconf/security/kerberosmethod.xml @@ -8,7 +8,7 @@ <para>Valid options are:</para> <itemizedlist> - <listitem><para>secrets only - use only the secrets.tdb for + <listitem><para>secrets only - use only the secrets.(n)tdb for ticket verification (default)</para></listitem> <listitem><para>system keytab - use only the system keytab @@ -17,7 +17,7 @@ <listitem><para>dedicated keytab - use a dedicated keytab for ticket verification</para></listitem> - <listitem><para>secrets and keytab - use the secrets.tdb + <listitem><para>secrets and keytab - use the secrets.(n)tdb first, then the system keytab</para></listitem> </itemizedlist> diff --git a/docs-xml/smbdotconf/security/privatedir.xml b/docs-xml/smbdotconf/security/privatedir.xml index 46d4a8297c..2f4b5766de 100644 --- a/docs-xml/smbdotconf/security/privatedir.xml +++ b/docs-xml/smbdotconf/security/privatedir.xml @@ -7,7 +7,7 @@ <description> <para>This parameters defines the directory smbd will use for storing such files as <filename moreinfo="none">smbpasswd</filename> - and <filename moreinfo="none">secrets.tdb</filename>. + and <filename moreinfo="none">secrets.tdb</filename> (or <filename moreinfo="none">secrets.ntdb</filename>). </para> </description> |