[SCM] Samba Shared Repository - branch master updated
Michael Adam
obnox at samba.org
Tue Jan 15 08:32:03 MST 2013
The branch, master has been updated
via 6bb7bf9 test: dbwrap_tool requires --persistent for the registry now
via 7f65434 docs: document the "--persistent" option in dbwrap_tool(1)
via 770b1aa s3:dbwrap_tool: add --persistent switch and mode for non-persistent DBs
via 11850e4 dbwrap: add dbwrap_is_persistent()
via d67911b docs: document the command line options in dbwrap_tool(1)
via f3f878f docs: use the popt.common.samba.client entity in samba-tool(8)
via cdc18f9 docs: use the entities popt.common.samba.server and stdarg.help in samba(8)
via 2d30e5d docs: add popt.common.samba.server and popt.common.samba.client entities
via 2ab3a96 docs: fix the stdarg.configfile entity to print a "=" sign after the long option
via e3db3db docs: use the stdarg.option entity in the popt.common.samba entity
via c9b95eb docs: add an entity stdarg.option for the "--option" command line parameter
via d61d2af wafsamba: use additional xml catalog file (bug #9512)
via 07660ac smb.conf(5): client min protocol: add hint at list of available protocols
via d6ec1ef smb.conf(5): server min protocol: add hint at list of available protocols
via 41955b7 build(waf)-libreplace: remove redundant check for flistea function
via cabc89a ntlm_auth(1): fix many format issues and and make examples visible
via b7a091e build(waf): docs-xml: build new dbwrap_tool.8 manual page
via 8d6104f docs-xml: add dbwrap_tool.1 manual page
from 065c0ec dsdb: Add test for modification of two attributes, one permitted, one denied (bug #9554 - CVE-2013-0172)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 6bb7bf9ebb0671be19419ba54955dd929494c8e8
Author: Volker Lendecke <vl at samba.org>
Date: Tue Jan 15 11:22:49 2013 +0100
test: dbwrap_tool requires --persistent for the registry now
Reviewed-by: Michael Adam <obnox at samba.org>
Autobuild-User(master): Michael Adam <obnox at samba.org>
Autobuild-Date(master): Tue Jan 15 16:31:35 CET 2013 on sn-devel-104
commit 7f65434559ca241a3b8c2cb7969f63f6512a9ff7
Author: Michael Adam <obnox at samba.org>
Date: Mon Jan 14 17:22:05 2013 +0100
docs: document the "--persistent" option in dbwrap_tool(1)
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 770b1aafa0e6557d9de2aace26dae4191eb01568
Author: Michael Adam <obnox at samba.org>
Date: Wed Jan 2 01:12:58 2013 +0100
s3:dbwrap_tool: add --persistent switch and mode for non-persistent DBs
This changes the default for dbwrap_tool to open a DB as non-persistent.
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 11850e4605bc50e0b4aa07f8c46154fc01504646
Author: Michael Adam <obnox at samba.org>
Date: Wed Jan 2 01:02:56 2013 +0100
dbwrap: add dbwrap_is_persistent()
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit d67911bafc0d098e67c8ad8d9b4bc49f184ff832
Author: Michael Adam <obnox at samba.org>
Date: Mon Jan 14 17:15:08 2013 +0100
docs: document the command line options in dbwrap_tool(1)
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit f3f878f7a06e067bcc973014b2ef6b6830273de7
Author: Michael Adam <obnox at samba.org>
Date: Mon Jan 14 17:55:51 2013 +0100
docs: use the popt.common.samba.client entity in samba-tool(8)
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit cdc18f92cca2f14a6e59aa50f2c2a9f076ea9faa
Author: Michael Adam <obnox at samba.org>
Date: Mon Jan 14 17:23:37 2013 +0100
docs: use the entities popt.common.samba.server and stdarg.help in samba(8)
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 2d30e5deaf731839402b47751683d2c0e32d2bc7
Author: Michael Adam <obnox at samba.org>
Date: Mon Jan 14 17:08:30 2013 +0100
docs: add popt.common.samba.server and popt.common.samba.client entities
These are comprised by the popt.common.samba entity and the stdarg.server.debug
or the stdarg.client.debut entity, respectively.
The difference is only in the default value of the debug level setting.
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 2ab3a96d262f60d26a8cd16dded3296889ab7f3f
Author: Michael Adam <obnox at samba.org>
Date: Mon Jan 14 17:12:51 2013 +0100
docs: fix the stdarg.configfile entity to print a "=" sign after the long option
This makes the appearance equal to the other options like --debuglevel or
--log-basename.
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit e3db3db784085bb2fedbf3063154b7cd77630e59
Author: Michael Adam <obnox at samba.org>
Date: Mon Jan 14 17:06:03 2013 +0100
docs: use the stdarg.option entity in the popt.common.samba entity
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit c9b95eb205abbdb77960eb0419937512358f7e64
Author: Michael Adam <obnox at samba.org>
Date: Mon Jan 14 17:05:05 2013 +0100
docs: add an entity stdarg.option for the "--option" command line parameter
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit d61d2af3727a19cc4ddc88ec2faa8aafff9c7422
Author: Björn Baumbach <bb at sernet.de>
Date: Thu Dec 20 10:01:43 2012 +0100
wafsamba: use additional xml catalog file (bug #9512)
Add additional "/usr/local/share/xml/catalog" catalog file
platforms (used by freebsd).
Fix manual page build on freebsd.
Signed-off-by: Björn Baumbach <bb at sernet.de>
Reviewed-by: Michael Adam <obnox at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 07660ac01acf4fd4b03436dd0f597a246948a590
Author: Björn Baumbach <bb at sernet.de>
Date: Tue Oct 16 10:14:55 2012 +0200
smb.conf(5): client min protocol: add hint at list of available protocols
And fix the format.
Signed-off-by: Björn Baumbach <bb at sernet.de>
Reviewed-by: Michael Adam <obnox at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit d6ec1ef6cc679c94a6a83fad11711bae27db6ff7
Author: Björn Baumbach <bb at sernet.de>
Date: Tue Dec 11 13:46:38 2012 +0100
smb.conf(5): server min protocol: add hint at list of available protocols
And fix the format.
Signed-off-by: Björn Baumbach <bb at sernet.de>
Reviewed-by: Michael Adam <obnox at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 41955b711f48ee2c8fe70a7e9967a2a96adf8a3d
Author: Björn Baumbach <bb at sernet.de>
Date: Mon Dec 10 11:52:08 2012 +0100
build(waf)-libreplace: remove redundant check for flistea function
Signed-off-by: Björn Baumbach <bb at sernet.de>
Reviewed-by: Michael Adam <obnox at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit cabc89a1e72fc95300d4b6f8d480a7d666221b8b
Author: Björn Baumbach <bb at sernet.de>
Date: Tue Dec 4 10:54:05 2012 +0100
ntlm_auth(1): fix many format issues and and make examples visible
"<example>" is no child of "<para>". So these examples were not visible.
Using a varlist instead may be not the best way but it does look nice.
Signed-off-by: Björn Baumbach <bb at sernet.de>
Reviewed-by: Michael Adam <obnox at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit b7a091ecf48963e2a0d1757d0faf131ad8d940fa
Author: Björn Baumbach <bb at sernet.de>
Date: Mon Oct 15 17:20:07 2012 +0200
build(waf): docs-xml: build new dbwrap_tool.8 manual page
Signed-off-by: Björn Baumbach <bb at sernet.de>
Reviewed-by: Michael Adam <obnox at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 8d6104f02d9ab879efe7867fec53cbe5cc408ded
Author: Björn Baumbach <bb at sernet.de>
Date: Mon Oct 15 17:17:29 2012 +0200
docs-xml: add dbwrap_tool.1 manual page
Signed-off-by: Björn Baumbach <bb at sernet.de>
Reviewed-by: Michael Adam <obnox at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafsamba/wafsamba.py | 3 +-
docs-xml/build/DTD/samba.entities | 26 +++-
docs-xml/manpages/dbwrap_tool.1.xml | 172 +++++++++++++++++
docs-xml/manpages/ntlm_auth.1.xml | 195 +++++++++++---------
docs-xml/manpages/samba-tool.8.xml | 28 +---
docs-xml/manpages/samba.8.xml | 33 +---
docs-xml/smbdotconf/protocol/clientminprotocol.xml | 21 ++-
docs-xml/smbdotconf/protocol/serverminprotocol.xml | 17 +-
docs-xml/wscript_build | 1 +
lib/dbwrap/dbwrap.c | 5 +
lib/dbwrap/dbwrap.h | 1 +
lib/replace/wscript | 2 +-
source3/script/tests/test_net_registry_check.sh | 2 +-
source3/script/tests/test_registry_upgrade.sh | 2 +-
source3/utils/dbwrap_tool.c | 57 +++++--
15 files changed, 387 insertions(+), 178 deletions(-)
create mode 100644 docs-xml/manpages/dbwrap_tool.1.xml
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 6ef0b57..dcbb047 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -790,7 +790,8 @@ def SAMBAMANPAGES(bld, manpages):
'''build and install manual pages'''
bld.env.SAMBA_EXPAND_XSL = bld.srcnode.abspath() + '/docs-xml/xslt/expand-sambadoc.xsl'
bld.env.SAMBA_MAN_XSL = bld.srcnode.abspath() + '/docs-xml/xslt/man.xsl'
- bld.env.SAMBA_CATALOGS = 'file:///etc/xml/catalog file://' + bld.srcnode.abspath() + '/bin/default/docs-xml/build/catalog.xml'
+ bld.env.SAMBA_CATALOGS = 'file:///etc/xml/catalog file:///usr/local/share/xml/catalog file://' + bld.srcnode.abspath() + '/bin/default/docs-xml/build/catalog.xml'
+
for m in manpages.split():
source = m + '.xml'
bld.SAMBA_GENERATOR(m,
diff --git a/docs-xml/build/DTD/samba.entities b/docs-xml/build/DTD/samba.entities
index c7e46c2..c9c6744 100644
--- a/docs-xml/build/DTD/samba.entities
+++ b/docs-xml/build/DTD/samba.entities
@@ -214,7 +214,7 @@ in the &smb.conf; file.</para>
<!ENTITY stdarg.configfile '
<varlistentry>
-<term>-s|--configfile <configuration file></term>
+<term>-s|--configfile=<configuration file></term>
<listitem><para>The file specified contains the
configuration details required by the server. The
information in this file includes server-specific
@@ -241,12 +241,36 @@ log.smbd, etc...). The log file is never removed by the client.
</para></listitem>
</varlistentry>'>
+<!ENTITY stdarg.option '
+<varlistentry>
+<term>--option=<name>=<value></term>
+<listitem><para>Set the
+<citerefentry><refentrytitle>smb.conf</refentrytitle>
+<manvolnum>5</manvolnum></citerefentry>
+option "<name>" to value "<value>" from the command line.
+This overrides compiled-in defaults and options read from the configuration
+file.
+</para></listitem>
+</varlistentry>'>
+
<!ENTITY popt.common.samba '
&stdarg.version;
&stdarg.configfile;
&stdarg.log-basename;
+&stdarg.option;
'>
+<!ENTITY popt.common.samba.client '
+&stdarg.client.debug;
+&popt.common.samba;
+'>
+
+<!ENTITY popt.common.samba.server '
+&stdarg.server.debug;
+&popt.common.samba;
+'>
+
+
<!ENTITY stdarg.resolve.order '
<varlistentry>
<term>-R|--name-resolve <name resolve order></term>
diff --git a/docs-xml/manpages/dbwrap_tool.1.xml b/docs-xml/manpages/dbwrap_tool.1.xml
new file mode 100644
index 0000000..59ef968
--- /dev/null
+++ b/docs-xml/manpages/dbwrap_tool.1.xml
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<refentry id="dbwrap_tool.1">
+
+<refmeta>
+ <refentrytitle>dbwrap_tool</refentrytitle>
+ <manvolnum>1</manvolnum>
+ <refmiscinfo class="source">Samba</refmiscinfo>
+ <refmiscinfo class="manual">System Administration tools</refmiscinfo>
+ <refmiscinfo class="version">4.0</refmiscinfo>
+</refmeta>
+
+
+<refnamediv>
+ <refname>dbwrap_tool</refname>
+ <refpurpose>low level TDB/CTDB manipulation tool using the dbwrap interface</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+ <cmdsynopsis>
+ <command>dbwrap_tool</command>
+ <arg choice="opt">--persistent</arg>
+ <arg choice="opt">-d <debug level></arg>
+ <arg choice="opt">-s <config file></arg>
+ <arg choice="opt">-l <log file base></arg>
+ <arg choice="opt">-V</arg>
+ <arg choice="opt">--option=<name>=<value></arg>
+ <arg choice="req"><database></arg>
+ <arg choice="req"><operation></arg>
+ <arg choice="opt"><key>
+ <arg choice="opt"><type>
+ <arg choice="opt"><value></arg>
+ </arg>
+ </arg>
+ </cmdsynopsis>
+</refsynopsisdiv>
+
+<refsect1>
+ <title>DESCRIPTION</title>
+
+ <para>This tool is part of the <citerefentry><refentrytitle>samba</refentrytitle>
+ <manvolnum>7</manvolnum></citerefentry> suite.</para>
+
+ <para>The dbwrap_tool program is used to read and manipulate
+ TDB/CTDB databases using the dbwrap interface.</para>
+
+ <para>The following database operations are available:
+ <itemizedlist>
+ <listitem><para>fetch: fetch a record</para></listitem>
+ <listitem><para>store: create or modify a record</para></listitem>
+ <listitem><para>delete: remove a record</para></listitem>
+ <listitem><para>erase: remove all records</para></listitem>
+ <listitem><para>listkeys: list all available records</para></listitem>
+ <listitem><para>listwatchers: list processes, which are waiting for changes in a record</para></listitem>
+ </itemizedlist>
+ </para>
+ <para>The following types are available:
+ <itemizedlist>
+ <listitem><para>int32: signed 32bit integer</para></listitem>
+ <listitem><para>uint32: unsigned 32bit integer</para></listitem>
+ <listitem><para>string: "hello world"</para></listitem>
+ <listitem><para>hex: hex strings like "68656C6C6F20776F726C6400" ("hello world")</para></listitem>
+ </itemizedlist>
+ </para>
+</refsect1>
+
+<refsect1>
+ <title>OPTIONS</title>
+
+ <variablelist>
+ <varlistentry>
+ <term>--persistent</term>
+ <listitem><para>Open the database as a persistent database.
+ If this option is not specified, the database is opened as
+ non-persistent.
+ </para></listitem>
+ </varlistentry>
+ &popt.common.samba.client;
+ &stdarg.help;
+ </variablelist>
+</refsect1>
+
+<refsect1>
+ <title>COMMANDS</title>
+ <refsect2>
+ <title>fetch</title>
+ <cmdsynopsis>
+ <command>dbwrap_tool</command> <database> fetch <key> <type>
+ </cmdsynopsis>
+ </refsect2>
+ <refsect2>
+ <title>store</title>
+ <cmdsynopsis>
+ <command>dbwrap_tool</command> <database> store <key> <type> <value>
+ </cmdsynopsis>
+ </refsect2>
+ <refsect2>
+ <title>delete</title>
+ <cmdsynopsis>
+ <command>dbwrap_tool</command> <database> delete <key>
+ </cmdsynopsis>
+ </refsect2>
+ <refsect2>
+ <title>erase</title>
+ <cmdsynopsis>
+ <command>dbwrap_tool</command> <database> erase </cmdsynopsis>
+ </refsect2>
+ <refsect2>
+ <title>listkeys</title>
+ <cmdsynopsis>
+ <command>dbwrap_tool</command> <database> listkeys
+ </cmdsynopsis>
+ </refsect2>
+ <refsect2>
+ <title>listwatchers</title>
+ <cmdsynopsis>
+ <command>dbwrap_tool</command> <database> listwatchers
+ </cmdsynopsis>
+ </refsect2>
+</refsect1>
+
+<refsect1>
+ <title>EXAMPLES</title>
+ <variablelist>
+ <varlistentry><term>List all keys from winbindd_idmap.tdb</term>
+ <listitem><para><command>dbwrap_tool</command> --persistent winbindd_idmap.tdb listkeys</para></listitem>
+ </varlistentry>
+ <varlistentry><term>Fetch record with key "USER HWM" as uint32</term>
+ <listitem><para><command>dbwrap_tool</command> --persistent winbindd_idmap.tdb fetch "USER HWM" uint32</para></listitem>
+ </varlistentry>
+ <varlistentry><term>Remove record with key "USER HWM"</term>
+ <listitem><para><command>dbwrap_tool</command> --persistent winbindd_idmap.tdb remove "USER HWM"</para></listitem>
+ </varlistentry>
+ <varlistentry><term>Store and overwrite record "USER HWM" with value 214</term>
+ <listitem><para>uint32: <command>dbwrap_tool</command> --persistent winbindd_idmap.tdb store "USER HWM" uint32 214</para></listitem>
+ <listitem><para>hex: <command>dbwrap_tool</command> --persistent winbindd_idmap.tdb store "USER HWM" hex D6000000</para></listitem>
+ </varlistentry>
+ </variablelist>
+</refsect1>
+
+<refsect1>
+ <title>NOTES</title>
+
+ <para>Use with caution!</para>
+</refsect1>
+
+
+<refsect1>
+ <title>VERSION</title>
+
+ <para>This man page is correct for version 3 of the Samba suite.</para>
+</refsect1>
+
+<refsect1>
+ <title>SEE ALSO</title>
+ <para><citerefentry><refentrytitle>smbd</refentrytitle>
+ <manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>samba</refentrytitle>
+ <manvolnum>7</manvolnum></citerefentry></para>
+</refsect1>
+
+<refsect1>
+ <title>AUTHOR</title>
+
+ <para>The original Samba software and related utilities
+ were created by Andrew Tridgell. Samba is now developed
+ by the Samba Team as an Open Source project similar
+ to the way the Linux kernel is developed.</para>
+
+ <para>The dbwrap_tool manpage was written by Bjoern Baumbach.</para>
+</refsect1>
+
+</refentry>
diff --git a/docs-xml/manpages/ntlm_auth.1.xml b/docs-xml/manpages/ntlm_auth.1.xml
index 8bd77bd..619e713 100644
--- a/docs-xml/manpages/ntlm_auth.1.xml
+++ b/docs-xml/manpages/ntlm_auth.1.xml
@@ -160,111 +160,132 @@
external program to the helper are:</para>
<variablelist>
<varlistentry>
- <term>Username</term>
-
- <listitem><para>The username, expected to be in
- Samba's <smbconfoption name="unix charset"/>.
- </para>
-
- <para><example>Username: bob</example></para>
- <para><example>Username:: Ym9i</example></para>
- </listitem></varlistentry>
+ <term>Username</term>
+ <listitem><para>The username, expected to be in
+ Samba's <smbconfoption name="unix charset"/>.
+ </para>
+ <varlistentry>
+ <term>Examples:</term>
+ <para>Username: bob</para>
+ <para>Username:: Ym9i</para>
+ </varlistentry>
+ </listitem>
+ </varlistentry>
<varlistentry>
- <term>NT-Domain</term>
- <listitem><para>The user's domain, expected to be in
- Samba's <smbconfoption name="unix charset"/>.
- </para>
-
- <para><example>NT-Domain: WORKGROUP</example></para>
- <para><example>NT-Domain:: V09SS0dST1VQ</example></para>
- </listitem></varlistentry>
+ <term>NT-Domain</term>
+ <listitem><para>The user's domain, expected to be in
+ Samba's <smbconfoption name="unix charset"/>.
+ </para>
+
+ <varlistentry>
+ <term>Examples:</term>
+ <para>NT-Domain: WORKGROUP</para>
+ <para>NT-Domain:: V09SS0dST1VQ</para>
+ </varlistentry>
+ </listitem>
+ </varlistentry>
<varlistentry>
- <term>Full-Username</term>
- <listitem><para>The fully qualified username, expected to be in
- Samba's <smbconfoption name="unix charset"/> and qualified with the
- <smbconfoption name="winbind separator"/>.
- </para>
-
- <para><example>Full-Username: WORKGROUP\bob</example></para>
- <para><example>Full-Username:: V09SS0dST1VQYm9i</example></para>
- </listitem></varlistentry>
+ <term>Full-Username</term>
+ <listitem><para>The fully qualified username, expected to be
+ in Samba's <smbconfoption name="unix charset"/> and qualified
+ with the <smbconfoption name="winbind separator"/>.</para>
+ <varlistentry>
+ <term>Examples:</term>
+ <para>Full-Username: WORKGROUP\bob</para>
+ <para>Full-Username:: V09SS0dST1VQYm9i</para>
+ </varlistentry>
+ </listitem>
+ </varlistentry>
<varlistentry>
- <term>LANMAN-Challenge</term>
-
- <listitem><para>The 8 byte <command>LANMAN Challenge</command> value,
- generated randomly by the server, or (in cases such as
- MSCHAPv2) generated in some way by both the server and
- the client.
- </para>
- <para><example>LANMAN-Challenge: 0102030405060708</example></para>
- </listitem></varlistentry>
+ <term>LANMAN-Challenge</term>
+ <listitem><para>The 8 byte <command>LANMAN Challenge</command>
+ value, generated randomly by the server, or (in cases such
+ as MSCHAPv2) generated in some way by both the server and
+ the client.</para>
+ <varlistentry>
+ <term>Examples:</term>
+ <para>LANMAN-Challenge: 0102030405060708</para>
+ </varlistentry>
+ </listitem>
+ </varlistentry>
<varlistentry>
- <term>LANMAN-Response</term>
-
- <listitem><para>The 24 byte <command>LANMAN Response</command> value,
- calculated from the user's password and the supplied
- <command>LANMAN Challenge</command>. Typically, this
- is provided over the network by a client wishing to authenticate.
- </para>
- <para><example>LANMAN-Response: 0102030405060708090A0B0C0D0E0F101112131415161718</example></para>
-
- </listitem></varlistentry>
+ <term>LANMAN-Response</term>
+ <listitem><para>The 24 byte <command>LANMAN Response</command> value,
+ calculated from the user's password and the supplied
+ <command>LANMAN Challenge</command>. Typically, this
+ is provided over the network by a client wishing to authenticate.
+ </para>
+ <varlistentry>
+ <term>Examples:</term>
+ <para>LANMAN-Response: 0102030405060708090A0B0C0D0E0F101112131415161718</para>
+ </varlistentry>
+ </listitem>
+ </varlistentry>
<varlistentry>
- <term>NT-Response</term>
- <listitem><para>The >= 24 byte <command>NT Response</command>
- calculated from the user's password and the supplied
- <command>LANMAN Challenge</command>. Typically, this is
- provided over the network by a client wishing to authenticate.
- </para>
- <para><example>NT-Response: 0102030405060708090A0B0C0D0E0F101112131415161718</example></para>
-
- </listitem></varlistentry>
+ <term>NT-Response</term>
+ <listitem><para>The >= 24 byte <command>NT Response</command>
+ calculated from the user's password and the supplied
+ <command>LANMAN Challenge</command>. Typically, this is
+ provided over the network by a client wishing to authenticate.
+ </para>
+ <varlistentry>
+ <term>Examples:</term>
+ <para>NT-Response: 0102030405060708090A0B0C0D0E0F10111213141516171</para>
+ </varlistentry>
+ </listitem>
+ </varlistentry>
<varlistentry>
- <term>Password</term>
- <listitem><para>The user's password. This would be
- provided by a network client, if the helper is being
- used in a legacy situation that exposes plaintext
- passwords in this way.
- </para>
- <para><example>Password: samba2</example></para>
- <para><example>Password:: c2FtYmEy</example></para>
-
- </listitem></varlistentry>
+ <term>Password</term>
+ <listitem><para>The user's password. This would be
+ provided by a network client, if the helper is being
+ used in a legacy situation that exposes plaintext
+ passwords in this way.</para>
+ <varlistentry>
+ <term>Examples:</term>
+ <para>Password: samba2</para>
+ <para>Password:: c2FtYmEy</para>
+ </varlistentry>
+ </listitem>
+ </varlistentry>
<varlistentry>
- <term>Request-User-Session-Key</term>
- <listitem><para>Upon successful authenticaiton, return
- the user session key associated with the login.
- </para>
- <para><example>Request-User-Session-Key: Yes</example></para>
-
- </listitem></varlistentry>
+ <term>Request-User-Session-Key</term>
+ <listitem><para>Upon successful authenticaiton, return
+ the user session key associated with the login.</para>
+ <varlistentry>
+ <term>Examples:</term>
+ <para>Request-User-Session-Key: Yes</para>
+ </varlistentry>
+ </listitem>
+ </varlistentry>
<varlistentry>
- <term>Request-LanMan-Session-Key</term>
- <listitem><para>Upon successful authenticaiton, return
- the LANMAN session key associated with the login.
- </para>
- <para><example>Request-LanMan-Session-Key: Yes</example></para>
-
- </listitem></varlistentry>
-
- <para><warning>Implementers should take care to base64 encode
- any data (such as usernames/passwords) that may contain malicous user data, such as
- a newline. They may also need to decode strings from
- the helper, which likewise may have been base64 encoded.</warning></para>
- </variablelist>
-
+ <term>Request-LanMan-Session-Key</term>
+ <listitem><para>Upon successful authenticaiton, return
+ the LANMAN session key associated with the login.
+ </para>
+ <varlistentry>
+ <term>Examples:</term>
+ <para>Request-LanMan-Session-Key: Yes</para>
+ </varlistentry>
+ </listitem>
+ </varlistentry>
+
+ </variablelist>
</listitem>
</varlistentry>
- </variablelist>
- </listitem>
+ </variablelist>
+ <warning><para>Implementers should take care to base64 encode
+ any data (such as usernames/passwords) that may contain malicous user data, such as
+ a newline. They may also need to decode strings from
+ the helper, which likewise may have been base64 encoded.</para></warning>
+ </listitem>
</varlistentry>
<varlistentry>
diff --git a/docs-xml/manpages/samba-tool.8.xml b/docs-xml/manpages/samba-tool.8.xml
index a8f2afe..3e845a2 100644
--- a/docs-xml/manpages/samba-tool.8.xml
+++ b/docs-xml/manpages/samba-tool.8.xml
@@ -47,27 +47,6 @@
</varlistentry>
<varlistentry>
- <term>-s FILE|--configfile=FILE</term>
- <listitem><para>
- Configuration file
- </para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>-d DEBUGLEVEL|--debuglevel=DEBUGLEVEL</term>
- <listitem><para>
- Debug Level
- </para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>--option=OPTION</term>
- <listitem><para>
- Set smb.conf option from command line
- </para></listitem>
- </varlistentry>
-
- <varlistentry>
<term>--realm=REALM</term>
<listitem><para>
Set the realm name
@@ -123,12 +102,7 @@
</para></listitem>
--
Samba Shared Repository
More information about the samba-cvs
mailing list