[SCM] Samba Shared Repository - branch v4-1-test updated
Karolin Seeger
kseeger at samba.org
Tue Aug 20 05:14:06 MDT 2013
The branch, v4-1-test has been updated
via ef73d4c Man pages for ntdb tools missing
via 3487e49 s3-winbindd: fix fallback to ncacn_np in cm_connect_lsat().
via 7accc37 waf: replace dependency to libintl with samba_intl
via 8400442 waf: consolidate libintl related checks
via 3b23073 waf: add --without-gettext option
via 0f17c8d waf: fix build on AIX7
via 7af0c4f s3:lib/system fix build on AIX 7
via 11954a4 smbd: Fix async echo handler forking (Bug 10086)
via 6bf3319 Fix bug #10097 - MacOSX 10.9 will not follow path-based DFS referrals handed out by Samba.
via f036cee docs: Fix variable list in man vfs_crossrename.
from 2890940 Followup patch for BUG: https://bugzilla.samba.org/show_bug.cgi?id=10082
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-1-test
- Log -----------------------------------------------------------------
commit ef73d4c26866d282e6b84abd5f6a1879e1515ab4
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Thu Aug 15 12:32:06 2013 +0930
Man pages for ntdb tools missing
Copied and modified from tdb man pages. Avoided reproducing API documentation
which is extensively documented in the ntdb.h header already.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=10000
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
Reviewed-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit 3e11421e7476d968a3d550491279d0ad6b6c398f)
Autobuild-User(v4-1-test): Karolin Seeger <kseeger at samba.org>
Autobuild-Date(v4-1-test): Tue Aug 20 13:13:56 CEST 2013 on sn-devel-104
commit 3487e4905771225e493f12acd0e2964ad0a75c74
Author: Günther Deschner <gd at samba.org>
Date: Mon Aug 12 17:23:12 2013 +0200
s3-winbindd: fix fallback to ncacn_np in cm_connect_lsat().
Fallback to lsa named-pipe connection when tcp connection has failed twice (it
could be a trusted domain connection where we cannot setup a secure channel).
Guenther
BUG: https://bugzilla.samba.org/show_bug.cgi?id=9615
BUG: https://bugzilla.samba.org/show_bug.cgi?id=9899
Signed-off-by: Günther Deschner <gd at samba.org>
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
Tested-by: Christof Schmitt <christof.schmitt at us.ibm.com>
Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
Autobuild-Date(master): Tue Aug 13 20:55:33 CEST 2013 on sn-devel-104
commit 7accc37e58b7720370cd60740a20962020462edd
Author: Christian Ambach <ambi at samba.org>
Date: Thu Aug 1 23:00:21 2013 +0200
waf: replace dependency to libintl with samba_intl
Signed-off-by: Christian Ambach <ambi at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Autobuild-User(master): Christian Ambach <ambi at samba.org>
Autobuild-Date(master): Mon Aug 12 00:46:34 CEST 2013 on sn-devel-104
(cherry picked from commit 20b64eae75b8809d67b8c2824616996bb4722612)
The last 5 patches address bug #9911 - Build Samba 4.0.x on AIX with IBM XL
C/C++.
commit 840044247b7ca4de61f3ea93210599c21be09f37
Author: Christian Ambach <ambi at samba.org>
Date: Thu Aug 1 22:28:05 2013 +0200
waf: consolidate libintl related checks
consolidate the dealing with functions from libintl and the
handling of checking if libiconv is required or not
to a common place in lib/replace
also add a new samba_intl subsystem that has dependencies
on the appropriate set of libraries (libintl, libintl+libiconv or none)
that can be used as a general dependency by code that depends
on the internationalization libraries
Signed-off-by: Christian Ambach <ambi at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
(cherry picked from commit 07b3a048724a6b41282e1f673aea5ce2c1202a5e)
commit 3b230734d198602657918ef7d257a21facbb0afd
Author: Christian Ambach <ambi at samba.org>
Date: Tue Jun 25 18:37:35 2013 +0200
waf: add --without-gettext option
Signed-off-by: Christian Ambach <ambi at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
(cherry picked from commit a742e87b39bed97ac59f5ec8bff9bf3cedf8b68a)
commit 0f17c8d4252db7b4956733c2d83dac300417bd92
Author: Christian Ambach <ambi at samba.org>
Date: Thu Jun 20 18:26:04 2013 +0200
waf: fix build on AIX7
the same works for AIX 5,6,7 so leave away the version specifics (as autoconf build did)
Signed-off-by: Christian Ambach <ambi at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
(cherry picked from commit ce8fbdf76ee2792d011d9da4d0116f04d9656886)
commit 7af0c4fb88cced5eebd5680d9b0d4b3e9c79b318
Author: Christian Ambach <ambi at samba.org>
Date: Thu Jun 20 18:27:13 2013 +0200
s3:lib/system fix build on AIX 7
AIX uses struct stat64 with struct timespec64, so direct assignment does
not work any more.
Pair-Programmed-With: Volker Lendecke <vl at samba.org>
Signed-off-by: Christian Ambach <ambi at samba.org>
Autobuild-User(master): Volker Lendecke <vl at samba.org>
Autobuild-Date(master): Fri Aug 2 09:47:43 CEST 2013 on sn-devel-104
(cherry picked from commit ba40d0d9d320e500621a6a8107a2ef0a34aeb6ba)
commit 11954a44d28bd4dd44397dbaab87098d51530116
Author: Volker Lendecke <vl at samba.org>
Date: Wed Aug 14 10:46:46 2013 +0000
smbd: Fix async echo handler forking (Bug 10086)
If SMB3 is chosen via an SMB1 negprot, we forked the echo handler because
set_Protocol is called later, after the full protocol negotiation is done.
Signed-off-by: Volker Lendecke <vl at samba.org>
commit 6bf3319d5328c4395f14af585a69a93fcfc1cd3a
Author: Richard Sharpe <realrichardsharpe at gmail.com>
Date: Sun Aug 18 07:34:31 2013 -0700
Fix bug #10097 - MacOSX 10.9 will not follow path-based DFS referrals handed out by Samba.
Windows overloads the EA Length field in the DIRECTORY INFO leves of FIND FIRST/FIND NEXT.
This field indicates either the REPARSE_TAG if the file/folder has a reparse proint or
the EA Length if it has EAs, and is the fundamental reason you cannot have both on a
file or folder.
Signed-off-by: Richard Sharpe <rsharpe at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit f036cee91db2915ea5ba266e2d931863676f9e8d
Author: Karolin Seeger <kseeger at samba.org>
Date: Tue Aug 13 11:04:50 2013 +0200
docs: Fix variable list in man vfs_crossrename.
The varlist entries need a paragraph, otherwise the list is broken and the list
entries end with ".RE".
Fix bug #10076 - varlist in man vfs_crossrename broken.
Signed-off-by: Karolin Seeger <kseeger at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
Autobuild-User(master): Jeremy Allison <jra at samba.org>
Autobuild-Date(master): Tue Aug 20 04:19:42 CEST 2013 on sn-devel-104
(cherry picked from commit 1808316b1245290fd4a4aa87a801410899e4c1e3)
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafsamba/wscript | 5 +-
docs-xml/manpages/vfs_crossrename.8.xml | 20 ++--
lib/ntdb/man/ntdb.3.xml | 132 ++++++++++++++++++++
.../tdbbackup.8.xml => ntdb/man/ntdbbackup.8.xml} | 55 +++++----
.../man/tdbdump.8.xml => ntdb/man/ntdbdump.8.xml} | 37 +++---
.../man/ntdbrestore.8.xml} | 38 ++++---
.../man/tdbtool.8.xml => ntdb/man/ntdbtool.8.xml} | 46 ++++---
lib/ntdb/wscript | 13 ++-
lib/replace/wscript | 46 ++++++--
nsswitch/wscript_build | 2 +-
source3/include/ntioctl.h | 1 +
source3/lib/system.c | 15 ++-
source3/smbd/dosmode.c | 5 +
source3/smbd/negprot.c | 9 +-
source3/smbd/trans2.c | 19 ++-
source3/winbindd/winbindd_cm.c | 9 +-
source3/wscript | 9 +-
source3/wscript_build | 2 +-
source4/heimdal_build/wscript_build | 4 +-
source4/heimdal_build/wscript_configure | 4 +-
20 files changed, 345 insertions(+), 126 deletions(-)
create mode 100644 lib/ntdb/man/ntdb.3.xml
copy lib/{tdb/man/tdbbackup.8.xml => ntdb/man/ntdbbackup.8.xml} (64%)
copy lib/{tdb/man/tdbdump.8.xml => ntdb/man/ntdbdump.8.xml} (67%)
copy lib/{tdb/man/tdbrestore.8.xml => ntdb/man/ntdbrestore.8.xml} (50%)
copy lib/{tdb/man/tdbtool.8.xml => ntdb/man/ntdbtool.8.xml} (83%)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript
index 17aef27..fe2e515 100755
--- a/buildtools/wafsamba/wscript
+++ b/buildtools/wafsamba/wscript
@@ -82,6 +82,9 @@ def set_options(opt):
help='additional directory to search for gettext',
action='store', dest='gettext_location', default='/usr/local',
match = ['Checking for library intl', 'Checking for header libintl.h'])
+ opt.add_option('--without-gettext',
+ help=("Disable use of gettext"),
+ action="store_true", dest='disable_gettext', default=False)
gr = opt.option_group('developer options')
@@ -322,7 +325,7 @@ def configure(conf):
else:
conf.env.HAVE_LD_VERSION_SCRIPT = False
- if sys.platform == "aix5" or sys.platform == "aix6":
+ if sys.platform.startswith('aix'):
conf.DEFINE('_ALL_SOURCE', 1, add_to_cflags=True)
# Might not be needed if ALL_SOURCE is defined
# conf.DEFINE('_XOPEN_SOURCE', 600, add_to_cflags=True)
diff --git a/docs-xml/manpages/vfs_crossrename.8.xml b/docs-xml/manpages/vfs_crossrename.8.xml
index 898c2b3..3913596 100644
--- a/docs-xml/manpages/vfs_crossrename.8.xml
+++ b/docs-xml/manpages/vfs_crossrename.8.xml
@@ -37,28 +37,30 @@
NT_STATUS_NOT_SAME_DEVICE and the client has to move the file by
manual copy and delete operations. If the rename by copy is done by the
server this can be much more efficient. vfs_crossrename tries to do
- this server-side cross-device rename operation. There are however
- limitations that this module currently does not solve:
+ this server-side cross-device rename operation.
+ </para>
+
+ <para>There are however limitations that this module currently does not
+ solve:</para>
<variablelist>
<varlistentry>
- the ACLs of files are not preserved
+ <para>The ACLs of files are not preserved,</para>
</varlistentry>
<varlistentry>
- meta data in EAs are not preserved
+ <para>meta data in EAs are not preserved,</para>
</varlistentry>
<varlistentry>
- renames of whole subdirectories cannot be done recursively,
+ <para>renames of whole subdirectories cannot be done recursively,
in that case we still return STATUS_NOT_SAME_DEVICE and
- let the client decide what to do
+ let the client decide what to do,</para>
</varlistentry>
<varlistentry>
- rename operations of huge files can cause hangs on the
+ <para>rename operations of huge files can cause hangs on the
client because clients expect a rename operation to
- return fast
+ return fast.</para>
</varlistentry>
</variablelist>
- </para>
<para>This module is stackable.</para>
diff --git a/lib/ntdb/man/ntdb.3.xml b/lib/ntdb/man/ntdb.3.xml
new file mode 100644
index 0000000..79f8937
--- /dev/null
+++ b/lib/ntdb/man/ntdb.3.xml
@@ -0,0 +1,132 @@
+<?xml version="1.0"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<refentry>
+ <refmeta>
+ <refentrytitle>ntdb</refentrytitle>
+ <manvolnum>3</manvolnum>
+ <refmiscinfo class="source">Samba</refmiscinfo>
+ <refmiscinfo class="manual">System Administration tools</refmiscinfo>
+ <refmiscinfo class="version">4.0</refmiscinfo>
+ </refmeta>
+ <refnamediv>
+ <refname>ntdb</refname>
+<refpurpose>A not-so trivial keyword/data database system</refpurpose>
+ </refnamediv>
+ <refsynopsisdiv>
+<synopsis>#include <ntdb.h></synopsis>
+ </refsynopsisdiv>
+ <refsect1><title>DESCRIPTION</title>
+ <para>
+ If you have previously used the tdb library from Samba, much of
+ this will seem familiar, but there are some API changes which a
+ compiler will warn you about if you simply replace 'tdb' with
+ 'ntdb' in your code! The on-disk format for ntdb is
+ incompatible with tdb.
+ </para>
+ <para>
+ tdb's API was based on gdbm, and ntdb continues this tradition,
+ with enhancements. A differences guide is available in the text
+ file <filename>lib/ntdb/doc/TDB_porting.txt</filename> in the
+ SAMBA source tree.
+ </para>
+ </refsect1>
+ <refsect1><title>NTDB API OVERVIEW</title>
+ <para>
+ The complete API is documented in the ntdb.h header, which is
+ kept up-to-date and recommended reading.
+ </para>
+ <para>
+ Normal usage is to call ntdb_open() to create or open an ntdb
+ file. ntdb_store() is used to add records, ntdb_fetch() is used
+ to fetch them. Traversals are supported via callback
+ (ntdb_traverse()) or iteration (ntdb_firstkey() and
+ ntdb_nextkey()). Transactions are supported for batching
+ updates or reads atomically, using ntdb_transaction_start() and
+ ntdb_transaction_commit().
+ </para>
+ <refsect2><title>Use With Talloc</title>
+ <para>
+ ntdb_open() takes an optional linked list of attributes:
+ in particular you can specify an alternate allocator (such as
+ talloc):
+ </para>
+ <programlisting>
+#include <talloc.h>
+#include <ntdb.h>
+
+static void *my_alloc(const void *owner, size_t len, void *priv)
+{
+ return talloc_size(owner, len);
+}
+
+static void *my_expand(void *old, size_t newlen, void *priv)
+{
+ return talloc_realloc_size(NULL, old, newlen);
+}
+
+static void my_free(void *old, void *priv)
+{
+ talloc_free(old);
+}
+
+/* This opens an ntdb file as a talloc object with given parent. */
+struct ntdb_context *ntdb_open_talloc(const void *parent,
+ const char *filename)
+{
+ struct ntdb_context *ntdb;
+ union ntdb_attribute alloc;
+
+ alloc.base.attr = NTDB_ATTRIBUTE_ALLOCATOR;
+ alloc.base.next = NULL;
+ alloc.alloc.alloc = my_alloc;
+ alloc.alloc.expand = my_expand;
+ alloc.alloc.free = my_free;
+
+ ntdb = ntdb_open(filename, NTDB_DEFAULT, O_RDWR|O_CREAT, 0600,
+ &alloc);
+ if (ntdb) {
+ talloc_steal(parent, ntdb);
+ talloc_set_name(ntdb, "%s", filename);
+ }
+ return ntdb;
+}
+</programlisting>
+ </refsect2>
+ </refsect1>
+ <refsect1><title>SEE ALSO</title>
+ <para>
+ <ulink url="http://tdb.samba.org/"/>
+ </para>
+ </refsect1>
+
+ <refsect1><title>AUTHOR</title>
+ <para> The original tdb software was created by Andrew Tridgell, and
+ is now developed by the
+ Samba Team as an Open Source project similar to the way the
+ Linux kernel is developed. ntdb was derived from tdb, but mostly
+ rewritten by Rusty Russell.
+ </para>
+ </refsect1>
+
+ <refsect1><title>COPYRIGHT/LICENSE</title>
+ <para>
+ Copyright (C) Rusty Russell 2013, IBM Corporation
+ </para>
+ <para>
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 3 of the
+ License, or (at your option) any later version.
+ </para>
+ <para>
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+ </para>
+ <para>
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, see http://www.gnu.org/licenses/.
+ </para>
+ </refsect1>
+</refentry>
diff --git a/lib/tdb/man/tdbbackup.8.xml b/lib/ntdb/man/ntdbbackup.8.xml
similarity index 64%
copy from lib/tdb/man/tdbbackup.8.xml
copy to lib/ntdb/man/ntdbbackup.8.xml
index f24202e..977c0f7 100644
--- a/lib/tdb/man/tdbbackup.8.xml
+++ b/lib/ntdb/man/ntdbbackup.8.xml
@@ -1,24 +1,24 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-<refentry id="tdbbackup.8">
+<refentry id="ntdbbackup.8">
<refmeta>
- <refentrytitle>tdbbackup</refentrytitle>
+ <refentrytitle>ntdbbackup</refentrytitle>
<manvolnum>8</manvolnum>
<refmiscinfo class="source">Samba</refmiscinfo>
<refmiscinfo class="manual">System Administration tools</refmiscinfo>
- <refmiscinfo class="version">3.6</refmiscinfo>
+ <refmiscinfo class="version">4.0</refmiscinfo>
</refmeta>
<refnamediv>
- <refname>tdbbackup</refname>
- <refpurpose>tool for backing up and for validating the integrity of samba .tdb files</refpurpose>
+ <refname>ntdbbackup</refname>
+ <refpurpose>tool for backing up and for validating the integrity of samba .ntdb files</refpurpose>
</refnamediv>
<refsynopsisdiv>
<cmdsynopsis>
- <command>tdbbackup</command>
+ <command>ntdbbackup</command>
<arg choice="opt">-s suffix</arg>
<arg choice="opt">-v</arg>
<arg choice="opt">-h</arg>
@@ -31,8 +31,8 @@
<para>This tool is part of the <citerefentry><refentrytitle>samba</refentrytitle>
<manvolnum>1</manvolnum></citerefentry> suite.</para>
- <para><command>tdbbackup</command> 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
+ <para><command>ntdbbackup</command> is a tool that may be used to backup samba .ntdb
+ files. This tool may also be used to verify the integrity of the .ntdb files prior
to samba startup or during normal operation. If it finds file damage and it finds
a prior backup the backup file will be restored.
</para>
@@ -55,7 +55,7 @@
<term>-s suffix</term>
<listitem><para>
The <command>-s</command> option allows the administrator to specify a file
- backup extension. This way it is possible to keep a history of tdb backup
+ backup extension. This way it is possible to keep a history of ntdb backup
files by using a new suffix for each backup.
</para> </listitem>
</varlistentry>
@@ -78,42 +78,42 @@
<para><emphasis>GENERAL INFORMATION</emphasis></para>
<para>
- 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
+ The <command>ntdbbackup</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 ntdb files, even during Samba
operation. Typical usage for the command will be:
</para>
- <para>tdbbackup [-s suffix] *.tdb</para>
+ <para>ntdbbackup [-s suffix] *.ntdb</para>
<para>
- Before restarting samba the following command may be run to validate .tdb files:
+ Before restarting samba the following command may be run to validate .ntdb files:
</para>
- <para>tdbbackup -v [-s suffix] *.tdb</para>
+ <para>ntdbbackup -v [-s suffix] *.ntdb</para>
<para>
- Note that Samba 4 can use .ntdb files instead, so you should
- use <command>ntdbbackup</command> on those files.
+ Note that Samba 4 can use .tdb files instead, so you should
+ use <command>tdbbackup</command> on those files.
</para>
<para>
- Samba .tdb files are stored in various locations, be sure to run backup all
- .tdb file on the system. Important files includes:
+ Samba .tdb and .ntdb files are stored in various locations, be sure to run backup all
+ .(n)tdb files on the system. Important files includes:
</para>
<itemizedlist>
<listitem><para>
- <command>secrets.tdb</command> - usual location is in the /usr/local/samba/private
+ <command>secrets.(n)tdb</command> - usual location is in the /usr/local/samba/private
directory, or on some systems in /etc/samba.
</para></listitem>
<listitem><para>
- <command>passdb.tdb</command> - usual location is in the /usr/local/samba/private
+ <command>passdb.(n)tdb</command> - usual location is in the /usr/local/samba/private
directory, or on some systems in /etc/samba.
</para></listitem>
<listitem><para>
- <command>*.tdb</command> located in the /usr/local/samba/var directory or on some
+ <command>*.tdb</command> and <command>*.ntdb</command> located in the /usr/local/samba/var directory or on some
systems in the /var/cache or /var/lib/samba directories.
</para></listitem>
</itemizedlist>
@@ -123,7 +123,15 @@
<refsect1>
<title>VERSION</title>
- <para>This man page is correct for version 3 of the Samba suite.</para>
+ <para>This man page is correct for version 4 of the Samba suite.</para>
+</refsect1>
+
+<refsect1>
+ <title>SEE ALSO</title>
+
+ <para>
+ tdbbackup(8), ntdbrestore(8)
+ </para>
</refsect1>
<refsect1>
@@ -135,7 +143,8 @@
the Linux kernel is developed.
</para>
- <para>The tdbbackup man page was written by John H Terpstra.</para>
+ <para>The ntdbbackup man page was written by Rusty Russell,
+ based on the tdbbackup man page by John H Terpstra.</para>
</refsect1>
</refentry>
diff --git a/lib/tdb/man/tdbdump.8.xml b/lib/ntdb/man/ntdbdump.8.xml
similarity index 67%
copy from lib/tdb/man/tdbdump.8.xml
copy to lib/ntdb/man/ntdbdump.8.xml
index 25fd432..ee1711a 100644
--- a/lib/tdb/man/tdbdump.8.xml
+++ b/lib/ntdb/man/ntdbdump.8.xml
@@ -1,24 +1,24 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-<refentry id="tdbdump.8">
+<refentry id="ntdbdump.8">
<refmeta>
- <refentrytitle>tdbdump</refentrytitle>
+ <refentrytitle>ntdbdump</refentrytitle>
<manvolnum>8</manvolnum>
<refmiscinfo class="source">Samba</refmiscinfo>
<refmiscinfo class="manual">System Administration tools</refmiscinfo>
- <refmiscinfo class="version">3.6</refmiscinfo>
+ <refmiscinfo class="version">4.0</refmiscinfo>
</refmeta>
<refnamediv>
- <refname>tdbdump</refname>
- <refpurpose>tool for printing the contents of a TDB file</refpurpose>
+ <refname>ntdbdump</refname>
+ <refpurpose>tool for printing the contents of an NTDB file</refpurpose>
</refnamediv>
<refsynopsisdiv>
<cmdsynopsis>
- <command>tdbdump</command>
+ <command>ntdbdump</command>
<arg choice="opt">-k <replaceable>keyname</replaceable></arg>
<arg choice="opt">-e</arg>
<arg choice="opt">-h</arg>
@@ -32,12 +32,12 @@
<para>This tool is part of the <citerefentry><refentrytitle>samba</refentrytitle>
<manvolnum>1</manvolnum></citerefentry> suite.</para>
- <para><command>tdbdump</command> is a very simple utility that 'dumps' the
- contents of a TDB (Trivial DataBase) file to standard output in a
+ <para><command>ntdbdump</command> is a very simple utility that 'dumps' the
+ contents of a NTDB (New Trivial DataBase) file to standard output in a
human-readable format.
</para>
- <para>This tool can be used when debugging problems with TDB files. It is
+ <para>This tool can be used when debugging problems with NTDB files. It is
intended for those who are somewhat familiar with Samba internals.
</para>
</refsect1>
@@ -61,20 +61,21 @@
</para> </listitem>
</varlistentry>
- <varlistentry>
- <term>-e</term>
- <listitem><para>
- The <command>-e</command> tries to dump out from a corrupt database. Naturally, such a dump is unreliable, at best.
- </para></listitem>
- </varlistentry>
-
</variablelist>
</refsect1>
<refsect1>
+ <title>SEE ALSO</title>
+
+ <para>
+ tdbdump(8), ntdbtool(8)
+ </para>
+</refsect1>
+
+<refsect1>
<title>VERSION</title>
- <para>This man page is correct for version 3 of the Samba suite.</para>
+ <para>This man page is correct for version 4 of the Samba suite.</para>
</refsect1>
<refsect1>
@@ -86,7 +87,7 @@
the Linux kernel is developed.
</para>
- <para>The tdbdump man page was written by Jelmer Vernooij.</para>
+ <para>The ntdbdump man page was written by Rusty Russell, base on the tdbdump man page by Jelmer Vernooij.</para>
</refsect1>
</refentry>
diff --git a/lib/tdb/man/tdbrestore.8.xml b/lib/ntdb/man/ntdbrestore.8.xml
similarity index 50%
copy from lib/tdb/man/tdbrestore.8.xml
copy to lib/ntdb/man/ntdbrestore.8.xml
index 64c0ba2..a1f0421 100644
--- a/lib/tdb/man/tdbrestore.8.xml
+++ b/lib/ntdb/man/ntdbrestore.8.xml
@@ -1,25 +1,25 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-<refentry id="tdbrestore.8">
+<refentry id="ntdbrestore.8">
<refmeta>
- <refentrytitle>tdbrestore</refentrytitle>
+ <refentrytitle>ntdbrestore</refentrytitle>
<manvolnum>8</manvolnum>
<refmiscinfo class="source">Samba</refmiscinfo>
<refmiscinfo class="manual">System Administration tools</refmiscinfo>
- <refmiscinfo class="version">3.6</refmiscinfo>
+ <refmiscinfo class="version">4.0</refmiscinfo>
</refmeta>
<refnamediv>
- <refname>tdbrestore</refname>
- <refpurpose>tool for creating a TDB file out of a tdbdump output</refpurpose>
+ <refname>ntdbrestore</refname>
+ <refpurpose>tool for creating a NTDB file out of a ntdbdump output</refpurpose>
</refnamediv>
<refsynopsisdiv>
<cmdsynopsis>
- <command>tdbrestore</command>
- <arg choice="req">tdbfilename</arg>
+ <command>ntdbrestore</command>
+ <arg choice="req">ntdbfilename</arg>
</cmdsynopsis>
</refsynopsisdiv>
@@ -29,15 +29,15 @@
<para>This tool is part of the <citerefentry><refentrytitle>samba</refentrytitle>
<manvolnum>1</manvolnum></citerefentry> suite.</para>
- <para><command>tdbrestore</command> is a very simple utility that 'restores' the
- contents of dump file into TDB (Trivial DataBase) file. The dump file is obtained from the tdbdump
- command.
+ <para><command>ntdbrestore</command> is a very simple utility that 'restores' the
+ contents of dump file into NTDB (New Trivial DataBase) file. The dump file is obtained from the ntdbdump or tdbdump
+ commands.
</para>
- <para>This tool wait on the standard input for the content of the dump and will write the tdb in the tdbfilename
+ <para>This tool wait on the standard input for the content of the dump and will write the ntdb in the ntdbfilename
parameter.
</para>
- <para>This tool can be used for unpacking the content of tdb as backup mean.
+ <para>This tool can be used to translate between ntdb and tdb files by dumping and restoring.
</para>
</refsect1>
@@ -45,7 +45,15 @@
--
Samba Shared Repository
More information about the samba-cvs
mailing list