[SCM] Samba Shared Repository - branch v3-2-test updated -
release-3-2-0pre2-2608-gf62909d
John Terpstra
jht at samba.org
Thu Jun 19 21:33:29 GMT 2008
The branch, v3-2-test has been updated
via f62909d2b457f3494c9536c994a9209f8cc0c331 (commit)
via a9994d4a18f8130525c56a0a946ad1ff3c11696a (commit)
via 8462148c1b7c2d616fe65103c38625890aa50d26 (commit)
via 229d143a4d8b937881d05571d47df00d2090cd97 (commit)
via 2b1e59719872262632cada0291dc634ad06caba0 (commit)
via 6fa097f0534151728be6c76cf04820594bb97dca (commit)
via 4cd08cbdea6e8076fe8878cb931fb0a85f845ecd (commit)
via a3d5bed503d665ebcb2fa09753b8b0d20d43c7d7 (commit)
via 8ca9c188b55c891ac05f3b2d03b353aef9e962bc (commit)
via 5406bc8b791cde841065e5ff98452a68698736ac (commit)
via 8c88a43a2aba2a701e3e8b72ba2c119ea0b842c8 (commit)
via b96c9d54cfd29ec87d59655839a4136977a98032 (commit)
via 5035311af639336fdc51fa9829e984ff281216f9 (commit)
via 78dd88491abe4d7ec2586b1c6e05049051dbfeb6 (commit)
via f8e4a675f9ee4bfa4da15c0d6bfb9b8ad24694c8 (commit)
via bc1475b9b90d3427ef06898fa0b284a862c7d719 (commit)
via 6b83aef5c7360480b0d27a5957328566c554d669 (commit)
via 3a8ea6be389bedbcdb5668664d862768c026f669 (commit)
via 2a953d6ba252e5ba4e28b7fae5979e7c47fe9bd0 (commit)
from 24730f5981efb920811e7929a9483bd72bb0984c (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit f62909d2b457f3494c9536c994a9209f8cc0c331
Author: John H Terpstra <jht at samba.org>
Date: Thu Jun 19 16:11:31 2008 -0500
Fixing net help info.
commit a9994d4a18f8130525c56a0a946ad1ff3c11696a
Merge: 8462148c1b7c2d616fe65103c38625890aa50d26 24730f5981efb920811e7929a9483bd72bb0984c
Author: John H Terpstra <jht at samba.org>
Date: Thu Jun 19 11:12:17 2008 -0500
Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
commit 8462148c1b7c2d616fe65103c38625890aa50d26
Merge: 229d143a4d8b937881d05571d47df00d2090cd97 7c22fc6ebaa1a83213cbb7c08bea108264f89486
Author: John H Terpstra <jht at samba.org>
Date: Fri Jun 13 15:51:19 2008 -0500
Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
commit 229d143a4d8b937881d05571d47df00d2090cd97
Merge: 2b1e59719872262632cada0291dc634ad06caba0 49178f979f14ced834dda3104044bb8a84d4ebdb
Author: John H Terpstra <jht at samba.org>
Date: Wed Jun 11 10:36:37 2008 -0500
Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
commit 2b1e59719872262632cada0291dc634ad06caba0
Merge: 6fa097f0534151728be6c76cf04820594bb97dca 346375cda557a675f8f882ca2ae8edffec725a72
Author: John H Terpstra <jht at samba.org>
Date: Tue Jun 10 13:32:10 2008 -0500
Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
commit 6fa097f0534151728be6c76cf04820594bb97dca
Merge: 4cd08cbdea6e8076fe8878cb931fb0a85f845ecd 2089c692cfe5a4f9bbed1e658c6f73c310dbff57
Author: John H Terpstra <jht at samba.org>
Date: Mon Jun 9 22:47:00 2008 -0500
Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
commit 4cd08cbdea6e8076fe8878cb931fb0a85f845ecd
Merge: a3d5bed503d665ebcb2fa09753b8b0d20d43c7d7 20aa14480e9ae6cea663c67fe9e2d1d3b6fafa7d
Author: John H Terpstra <jht at samba.org>
Date: Sat Jun 7 15:12:25 2008 -0500
Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
commit a3d5bed503d665ebcb2fa09753b8b0d20d43c7d7
Merge: 8ca9c188b55c891ac05f3b2d03b353aef9e962bc be1d0c90440ad9bbe865fbda80a5e9f112c9e0c0
Author: John H Terpstra <jht at samba.org>
Date: Fri Jun 6 14:13:50 2008 -0500
Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
commit 8ca9c188b55c891ac05f3b2d03b353aef9e962bc
Merge: 5406bc8b791cde841065e5ff98452a68698736ac 80c7fbb4edb29b3c670c21baa5f613b942e68e1e
Author: John H Terpstra <jht at samba.org>
Date: Thu Jun 5 12:55:43 2008 -0500
Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
commit 5406bc8b791cde841065e5ff98452a68698736ac
Merge: 8c88a43a2aba2a701e3e8b72ba2c119ea0b842c8 3d13ddd4667c4d5d6677143d661bfa1e781bf6fe
Author: John H Terpstra <jht at samba.org>
Date: Thu Jun 5 10:54:46 2008 -0500
Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
commit 8c88a43a2aba2a701e3e8b72ba2c119ea0b842c8
Merge: b96c9d54cfd29ec87d59655839a4136977a98032 87a3d59dfcb8e6ae7349de55bb9532e9ae1851a5
Author: John H Terpstra <jht at samba.org>
Date: Sat May 31 10:14:59 2008 -0500
Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
commit b96c9d54cfd29ec87d59655839a4136977a98032
Author: John H Terpstra <jht at samba.org>
Date: Wed May 28 11:02:26 2008 -0500
Fixed publishing date info.
commit 5035311af639336fdc51fa9829e984ff281216f9
Author: John H Terpstra <jht at samba.org>
Date: Wed May 28 11:00:49 2008 -0500
Added TDB File documentation requested by some users.
commit 78dd88491abe4d7ec2586b1c6e05049051dbfeb6
Merge: f8e4a675f9ee4bfa4da15c0d6bfb9b8ad24694c8 d03099a438e75167e28ef1492872bdfd139983d7
Author: John H Terpstra <jht at samba.org>
Date: Wed May 28 10:59:44 2008 -0500
Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
commit f8e4a675f9ee4bfa4da15c0d6bfb9b8ad24694c8
Merge: bc1475b9b90d3427ef06898fa0b284a862c7d719 93ca0277e78622081c1a6cab037543187902fd86
Author: John H Terpstra <jht at samba.org>
Date: Fri May 23 08:30:52 2008 -0500
Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
commit bc1475b9b90d3427ef06898fa0b284a862c7d719
Merge: 6b83aef5c7360480b0d27a5957328566c554d669 03a1b791f1ce41f67bf134024bbc8d116b42ea48
Author: John H Terpstra <jht at samba.org>
Date: Wed May 21 15:42:37 2008 -0500
Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
commit 6b83aef5c7360480b0d27a5957328566c554d669
Merge: 3a8ea6be389bedbcdb5668664d862768c026f669 2d06726b7b65a9071a872ac71a09a614270c6b2c
Author: John H Terpstra <jht at samba.org>
Date: Wed May 21 08:46:40 2008 -0500
Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
commit 3a8ea6be389bedbcdb5668664d862768c026f669
Author: John H Terpstra <jht at samba.org>
Date: Mon May 19 13:02:08 2008 -0500
Clarification that hosts resolution is done by winbind only on IRIX, all other systems use libnss_wins.so.
commit 2a953d6ba252e5ba4e28b7fae5979e7c47fe9bd0
Author: John H Terpstra <jht at samba.org>
Date: Mon May 19 13:00:01 2008 -0500
Clarification that hosts resolution is done by winbind only on IRIX, all other systems use libnss_wins.so.
-----------------------------------------------------------------------
Summary of changes:
docs-xml/Samba3-HOWTO/TOSHARG-TDBFiles.xml | 152 ++++++++++++++++++++++++++++
docs-xml/Samba3-HOWTO/index.xml | 2 +
docs-xml/manpages-3/winbindd.8.xml | 13 ++-
source/utils/net_help.c | 7 +-
4 files changed, 167 insertions(+), 7 deletions(-)
create mode 100644 docs-xml/Samba3-HOWTO/TOSHARG-TDBFiles.xml
Changeset truncated at 500 lines:
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-TDBFiles.xml b/docs-xml/Samba3-HOWTO/TOSHARG-TDBFiles.xml
new file mode 100644
index 0000000..13baa57
--- /dev/null
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-TDBFiles.xml
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<chapter id="msdfs">
+
+<chapterinfo>
+ &author.jht;
+
+ <pubdate>May 28, 2008</pubdate>
+</chapterinfo>
+
+<title>Managing TDB Files</title>
+
+<sect1>
+<title>Features and Benefits</title>
+
+ <para>
+<indexterm><primary>tdb</primary></indexterm>
+<indexterm><primary>Trivial Database</primary></indexterm>
+ Samba uses a lightweight database called Trivial Database (tdb) in which it stores persistent and transient data.
+ Some tdb files can be disposed of before restarting Samba, but others are used to store information that is vital
+ to Samba configuration and behavior. The following information is provided to help administrators who are seeking
+ to better manage their Samba installations.
+ </para>
+
+ <para>
+<indexterm><primary>tdb</primary></indexterm>
+<indexterm><primary>currupted</primary></indexterm>
+<indexterm><primary>backup</primary></indexterm>
+<indexterm><primary>restore</primary></indexterm>
+ Those who package Samba for commercial distribution with operating systems and appliances would do well to take
+ note that tdb files can get corrupted, and for this reason ought to be backed up regularly. An appropriate time
+ is at system shutdown (backup) and startup (restore from backup).
+ </para>
+
+<table frame="all" id="TOSH-TDB">
+ <title>Samba's Trivial Database Files</title>
+ <tgroup align="center" cols="2">
+ <thead>
+ <row><entry>File name</entry><entry>Preserve</entry><entry>Description</entry></row>
+ </thead>
+
+ <tbody>
+ <row><entry>account_policy.tdb</entry><entry>Y</entry>
+ <entry><para>NT account policy settings such as pw expiration, etc...</para></entry></row>
+ <row><entry>brlock.tdb</entry><entry>N</entry>
+ <entry><para>Byte range locks.</para></entry></row>
+ <row><entry>browse.dat</entry><entry>N</entry>
+ <entry><para>Browse lists - gets rebuilt automatically.</para></entry></row>
+ <row><entry>connections.tdb</entry><entry>N</entry>
+ <entry><para>Share connections. Used to enforce max connections, etc.</para></entry></row>
+ <row><entry>gencache.tdb</entry><entry>N</entry>
+ <entry><para>Generic caching database.</para></entry></row>
+ <row><entry>group_mapping.tdb</entry><entry>Y</entry>
+ <entry><para>Stores group mapping information. Not used when using LDAP backend.</para></entry></row>
+ <row><entry> lang_en.tdb</entry><entry>Y</entry>
+ <entry><para>Stores language encoding information.</para></entry></row>
+ <row><entry>locking.tdb</entry><entry>N</entry>
+ <entry><para>Stores share mode and oplock information.</para></entry></row>
+ <row><entry>login_cache.tdb</entry><entry>N</entry>
+ <entry><para>Keeps a log of bad pw attempts.</para></entry></row>
+ <row><entry>messages.tdb</entry><entry>N</entry>
+ <entry><para>Used to keep track of Samba internal messaging.</para></entry></row>
+ <row><entry>netsamlogon_cache.tdb</entry><entry>Y</entry>
+ <entry><para>
+ Cache of user net_info_3 struct from <emphasis>net_samlogon()</emphasis>
+ requests from domain member machines.
+ </para></entry></row>
+ <row><entry>ntdrivers.tdb</entry><entry>Y</entry>
+ <entry><para>Stores installed printer driver information.</para></entry></row>
+ <row><entry>ntforms.tdb</entry><entry>Y</entry>
+ <entry><para>Stores installed printer forms information.</para></entry></row>
+ <row><entry>ntprinters.tdb</entry><entry>Y</entry>
+ <entry><para>Stores installed printers information.</para></entry></row>
+ <row><entry>printing directory</entry><entry>Y</entry>
+ <entry><para>Directory containing tdb per print queue of cached lpq output.</para></entry></row>
+ <row><entry>registry.tdb</entry><entry>Y</entry>
+ <entry><para>Windows registry skeleton (connect via regedit.exe).</para></entry></row>
+ <row><entry>sessionid.tdb</entry><entry>N</entry>
+ <entry><para>Session information to support <literal>utmp = yes</literal> capabilities.</para></entry></row>
+ <row><entry>share_info.tdb</entry><entry>Y</entry>
+ <entry><para>Stores share-level ACL configuration settings.
+ Default ACL is <emphasis>Everyone - Full Control</emphasis>.
+ </para></entry></row>
+ <row><entry>unexpected.tdb</entry><entry>N</entry>
+ <entry><para>
+ Unexpected packet queue needed to support windows clients that respond on a
+ different port that the originating reques.
+ </para></entry></row>
+ <row><entry>winbindd_cache.tdb</entry><entry>N</entry>
+ <entry><para>Winbind's cache of user lists.</para></entry></row>
+ <row><entry>winbindd_idmap.tdb</entry><entry>Y</entry>
+ <entry><para>Winbind's local IDMAP database.</para></entry></row>
+ <row><entry>wins.dat</entry><entry>N</entry>
+ <entry><para>
+ WINS database iused only when <parameter>wins support = yes</parameter>
+ has been set. This gets rebuilt or updated at every restart.
+ </para></entry></row>
+ <row><entry>wins.tdb</entry><entry>Y</entry>
+ <entry><para>
+ The working permanent storage for all WINS data. This database is used only
+ when <parameter>wins support = yes</parameter> has been set in the &smb.conf; file.
+ Note: This retains all manually configured WINS entries. Manual setting can be done use the net utility.
+ </para></entry></row>
+ <row><entry>secrets.tdb</entry><entry>Y</entry>
+ <entry><para>
+ This tdb file stores internal settings such as the machine and the domain SID, secret passwords
+ that are used with LDAP, the machine secret token, etc. This is an essential file that is stored
+ in a secure area. Vendors locate this in various folders. Check <command>smbd -b</command> to
+ find its location on your system.
+ </para></entry></row>
+ <row><entry>schannel_store.tdb</entry><entry>Y</entry>
+ <entry><para>
+ This stores secure channel access token information used with SMB signing.
+ </para></entry></row>
+ <row><entry>passdb.tdb</entry><entry>Y</entry>
+ <entry><para>
+ This stores the Samba SAM account information when using a tdbsam password backend.
+ </para></entry></row>
+ </tbody>
+ </tgroup>
+ </table>
+
+</sect1>
+
+<sect1>
+<title>Managing TDB Files</title>
+
+ <para>
+ The <command>tdbbackup</command> utility is a tool that may be used to backup samba tdb files.
+ This tool may also be used to verify the integrity of the tdb files prior to Samba startup or
+ during normal operation. If it finds file damage it will search for a prior backup the backup
+ file from which the damaged tdb file will be restored. The <command>tdbbackup</command>
+ utility can safely be run at any time. It was designed so that it can be used at any time to
+ validate the integrity of tdb files, even during Samba operation.
+ </para>
+
+ <para>
+ It is recommended to backup all tdb files as part of the Samba start-up scripts on a Samba
+ server. The following command syntax can be used:
+ </para>
+<screen>
+myserver# > cd /var/lib/samba
+myserver@ > tdbbackup *.tdb
+</screen>
+ <para>
+ The default extension is <filename>.bak</filename>. Any alternate extension can be specified
+ by executing <literal>tdbbackup -s 'new_extension' *.tdb</literal> as part of your startup script.
+ </para>
+
+</sect1>
+
+</chapter>
diff --git a/docs-xml/Samba3-HOWTO/index.xml b/docs-xml/Samba3-HOWTO/index.xml
index 1253b03..87b0795 100644
--- a/docs-xml/Samba3-HOWTO/index.xml
+++ b/docs-xml/Samba3-HOWTO/index.xml
@@ -193,6 +193,8 @@ The chapters in this part each cover specific Samba features.
<?latex \cleardoublepage ?>
<xi:include href="TOSHARG-Bugs.xml"/>
<?latex \cleardoublepage ?>
+ <xi:include href="TOSHARG-TDBFiles.xml"/>
+ <?latex \cleardoublepage ?>
</part>
diff --git a/docs-xml/manpages-3/winbindd.8.xml b/docs-xml/manpages-3/winbindd.8.xml
index 8e981fd..76622bd 100644
--- a/docs-xml/manpages-3/winbindd.8.xml
+++ b/docs-xml/manpages-3/winbindd.8.xml
@@ -119,12 +119,17 @@
resolve user and group information from <filename>/etc/passwd
</filename> and <filename>/etc/group</filename> and then from the
Windows NT server.
+ </para>
+
<programlisting>
passwd: files winbind
group: files winbind
-## only available on IRIX; Linux users should us libnss_wins.so
-hosts: files dns winbind
-</programlisting></para>
+## only available on IRIX: use winbind to resolve hosts:
+# hosts: files dns winbind
+## All other NSS enabled systems should use libnss_wins.so like this:
+hosts: files dns wins
+
+</programlisting>
<para>The following simple configuration in the
<filename>/etc/nsswitch.conf</filename> file can be used to initially
@@ -470,7 +475,7 @@ auth required /lib/security/pam_unix.so \
<refsect1>
<title>VERSION</title>
- <para>This man page is correct for version 3 of
+ <para>This man page is correct for version 3.0 of
the Samba suite.</para>
</refsect1>
diff --git a/source/utils/net_help.c b/source/utils/net_help.c
index 908be05..c4accf0 100644
--- a/source/utils/net_help.c
+++ b/source/utils/net_help.c
@@ -61,7 +61,7 @@ static int help_usage(int argc, const char **argv)
"Valid functions are:\n"\
" RPC RAP ADS FILE SHARE SESSION SERVER DOMAIN PRINTQ USER GROUP VALIDATE\n"\
" GROUPMEMBER ADMIN SERVICE PASSWORD TIME LOOKUP GETLOCALSID SETLOCALSID\n"\
-" SETDOMAINSID CHANGESCRETPW LOOKUP SAM\n");
+" GETDOMAINSID SETDOMAINSID CHANGESCRETPW LOOKUP SAM\n");
return -1;
}
@@ -228,8 +228,9 @@ static int net_usage(int argc, const char **argv)
" net groupmap\t\tto manage group mappings\n"\
" net join\t\tto join a domain\n"\
" net cache\t\tto operate on cache tdb file\n"\
- " net getlocalsid [NAME]\tto get the SID for local name\n"\
- " net setlocalsid SID\tto set the local domain SID\n"\
+ " net getlocalsid [NAME]\tto get the SID for local machine name\n"\
+ " net setlocalsid SID\tto set the local machine SID\n"\
+ " net getdomainsid the machine SID and the domain SID on the local server\n"\
" net setdomainsid SID\tto set the domain SID on member servers\n"\
" net changesecretpw\tto change the machine password in the local secrets database only\n"\
" \tthis requires the -f flag as a safety barrier\n"\
--
Samba Shared Repository
More information about the samba-cvs
mailing list