[SCM] Samba Shared Repository - branch master updated

Douglas Bagnall dbagnall at samba.org
Thu Aug 17 06:00:03 UTC 2017


The branch, master has been updated
       via  beeec1f tests: replace traffic_summary test with python blackbox test
       via  7057abc scripts: Scripts to replay and generate samba traffic
       via  74ebcf6 blackbox tests: method to check specific exit codes
       via  e12dbc7 traffic_summary: avoid uninitialised variable warning
      from  5473a27 lib: talloc: Use the system <talloc.h> include.

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit beeec1ff7c8b1461c265d9143de8221e2ec9b70a
Author: Gary Lockyer <gary at catalyst.net.nz>
Date:   Mon Aug 7 10:08:28 2017 +1200

    tests: replace traffic_summary test with python blackbox test
    
    Replace the shell subunit test for script/traffic_summary.pl with a
    python black box test.
    
    This involves moving the test files to more standard locations.
    
    Signed-off-by: Gary Lockyer <gary at catalyst.net.nz>
    Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
    Reviewed-by: Garming Sam <garming at catalyst.net.nz>
    
    Autobuild-User(master): Douglas Bagnall <dbagnall at samba.org>
    Autobuild-Date(master): Thu Aug 17 07:59:38 CEST 2017 on sn-devel-144

commit 7057abcfcde4a7059448719e9abe08d18c9ec149
Author: Gary Lockyer <gary at catalyst.net.nz>
Date:   Thu Jun 29 11:08:37 2017 +1200

    scripts: Scripts to replay and generate samba traffic
    
    Scripts to generate representative network traffic and replay this to a
    samba instance.  For load testing, performance profiling and capacity
    planning.
    
    traffic_learner  process a file generated by traffic_summary and
                     generate a model that can be used by traffic_replay to
                     generate samba network traffic.
    
    traffic_replay   Replay a summary file generated by traffic_summary, or
                     use a model created by traffic_learner to generate
                     network traffic.
    
    Signed-off-by: Gary Lockyer <gary at catalyst.net.nz>
    Signed-off-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
    
    Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
    Reviewed-by: Garming Sam <garming at catalyst.net.nz>
    Pair-programmed-with: Garming Sam <garming at catalyst.net.nz>
    Pair-programmed-with: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
    Pair-Programmed-With: Andrew Bartlett <abartlet at samba.org>
    Pair-Programmed-With: Tim Beale <timbeale at catalyst.net.nz>

commit 74ebcf6dfc84b6aab6838fa99e12808eb6b913d9
Author: Gary Lockyer <gary at catalyst.net.nz>
Date:   Wed Aug 16 13:52:25 2017 +1200

    blackbox tests: method to check specific exit codes
    
    Signed-off-by: Gary Lockyer <gary at catalyst.net.nz>
    Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
    Reviewed-by: Garming Sam <garming at catalyst.net.nz>

commit e12dbc7307802667d401be28f7bdc0086da3b147
Author: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Date:   Fri Jun 23 14:16:53 2017 +1200

    traffic_summary: avoid uninitialised variable warning
    
    Signed-off-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 docs-xml/manpages/traffic_learner.7.xml            |  200 ++
 docs-xml/manpages/traffic_replay.7.xml             |  566 ++++++
 docs-xml/wscript_build                             |    2 +
 .../samba/{tests/blackbox => emulate}/__init__.py  |    9 +-
 python/samba/emulate/traffic.py                    | 2019 ++++++++++++++++++++
 python/samba/emulate/traffic_packets.py            |  935 +++++++++
 python/samba/tests/__init__.py                     |   15 +-
 .../testdata/traffic-sample-very-short.model       |   60 +
 .../testdata/traffic-sample-very-short.txt         |   50 +
 .../blackbox/testdata/traffic_learner.expected     |   60 +
 .../blackbox/testdata/traffic_replay.expected      |   10 +
 .../blackbox}/testdata/traffic_summary.expected    |    0
 .../tests/blackbox}/testdata/traffic_summary.pdml  |    0
 python/samba/tests/blackbox/traffic_learner.py     |   62 +
 python/samba/tests/blackbox/traffic_replay.py      |  106 +
 python/samba/tests/blackbox/traffic_summary.py     |   66 +
 .../samba/tests/{blackbox => emulate}/__init__.py  |    8 +-
 python/samba/tests/emulate/traffic.py              |  160 ++
 python/samba/tests/emulate/traffic_packet.py       |  724 +++++++
 script/tests/test_traffic_summary.sh               |   47 -
 script/traffic_learner                             |   63 +
 script/traffic_replay                              |  362 ++++
 script/traffic_summary.pl                          |    2 +-
 selftest/tests.py                                  |    4 -
 source4/selftest/tests.py                          |   15 +
 testdata/traffic-sample-very-short.model           |   60 +
 testdata/traffic-sample-very-short.txt             |   50 +
 27 files changed, 5591 insertions(+), 64 deletions(-)
 create mode 100644 docs-xml/manpages/traffic_learner.7.xml
 create mode 100644 docs-xml/manpages/traffic_replay.7.xml
 copy python/samba/{tests/blackbox => emulate}/__init__.py (88%)
 create mode 100644 python/samba/emulate/traffic.py
 create mode 100644 python/samba/emulate/traffic_packets.py
 create mode 100644 python/samba/tests/blackbox/testdata/traffic-sample-very-short.model
 create mode 100644 python/samba/tests/blackbox/testdata/traffic-sample-very-short.txt
 create mode 100644 python/samba/tests/blackbox/testdata/traffic_learner.expected
 create mode 100644 python/samba/tests/blackbox/testdata/traffic_replay.expected
 rename {script => python/samba/tests/blackbox}/testdata/traffic_summary.expected (100%)
 rename {script => python/samba/tests/blackbox}/testdata/traffic_summary.pdml (100%)
 create mode 100644 python/samba/tests/blackbox/traffic_learner.py
 create mode 100644 python/samba/tests/blackbox/traffic_replay.py
 create mode 100644 python/samba/tests/blackbox/traffic_summary.py
 copy python/samba/tests/{blackbox => emulate}/__init__.py (88%)
 create mode 100644 python/samba/tests/emulate/traffic.py
 create mode 100644 python/samba/tests/emulate/traffic_packet.py
 delete mode 100755 script/tests/test_traffic_summary.sh
 create mode 100755 script/traffic_learner
 create mode 100755 script/traffic_replay
 create mode 100644 testdata/traffic-sample-very-short.model
 create mode 100644 testdata/traffic-sample-very-short.txt


Changeset truncated at 500 lines:

diff --git a/docs-xml/manpages/traffic_learner.7.xml b/docs-xml/manpages/traffic_learner.7.xml
new file mode 100644
index 0000000..4082ce0
--- /dev/null
+++ b/docs-xml/manpages/traffic_learner.7.xml
@@ -0,0 +1,200 @@
+<?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="traffic_learner.7">
+
+<refmeta>
+	<refentrytitle>traffic_learner</refentrytitle>
+	<manvolnum>7</manvolnum>
+	<refmiscinfo class="source">Samba</refmiscinfo>
+	<refmiscinfo class="manual">User Commands</refmiscinfo>
+	<refmiscinfo class="version">4.7</refmiscinfo>
+</refmeta>
+
+
+<refnamediv>
+	<refname>traffic_learner</refname>
+	<refpurpose>Samba tool to assist with traffic generation.
+	</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+	<cmdsynopsis>
+		<command>traffic_learner</command>
+		<arg choice="req">-o OUTPUT_FILE ...</arg>
+		<arg choice="opt">-h</arg>
+		<arg choice="opt">--dns-mode {inline|count}</arg>
+		<arg choice="opt">SUMMARY_FILE</arg>
+		<arg choice="opt">SUMMARY_FILE ...</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>This tool assists with generation of Samba traffic.
+	It takes a traffic-summary file (produced by
+	<command>traffic_summary.pl</command>) as input and produces a
+	traffic-model file that can be used by <command>traffic_replay</command>
+	for traffic generation.</para>
+
+	<para>The model file summarizes the types of traffic ('conversations'
+	between a host and a Samba DC) that occur on a network. The model file
+	describes the traffic in a way that allows it to be scaled so that
+	either more (or fewer) packets get sent, and the packets can be sent at
+	a faster (or slower) rate than that seen in the network.</para>
+</refsect1>
+
+<refsect1>
+	<title>OPTIONS</title>
+
+	<variablelist>
+
+	<varlistentry>
+	<term>-h|--help</term>
+	<listitem><para>
+	Print a summary of command line options.
+	</para></listitem>
+	</varlistentry>
+
+	<varlistentry>
+	<term>SUMMARY_FILE</term>
+	<listitem><para>
+	File containing a network traffic-summary. The traffic-summary file
+	should be generated by <command>traffic_summary.pl</command> from a
+	packet capture of actual network traffic.
+	More than one file can be specified, in which case the traffic will
+	be combined into a single traffic-model. If no SUMMARY_FILE is
+	specified, this tool will read the traffic-summary from STDIN, i.e.
+	you can pipe the output from traffic_summary.pl directly to this tool.
+	</para></listitem>
+	</varlistentry>
+
+	<varlistentry>
+	<term>-o|--out OUTPUT_FILE</term>
+	<listitem><para>
+	The traffic-model that is produced will be written to this file. The
+	OUTPUT_FILE can then be passed to <command>traffic_replay</command>
+	to generate (and manipulate) Samba network traffic.
+	</para></listitem>
+	</varlistentry>
+
+	<varlistentry>
+	<term>--dns-mode [inline|count]</term>
+	<listitem><para>
+	How DNS traffic should be handled by the model.
+	</para></listitem>
+	</varlistentry>
+
+	</variablelist>
+</refsect1>
+
+<refsect1>
+	<title>EXAMPLES</title>
+
+	<para>To take a traffic-summary file and produce a traffic-model
+	file, use:</para>
+
+	<para><command>traffic_learner traffic-summary.txt
+	-o traffic-model.txt</command></para>
+
+	<para>To generate a traffic-model from a packet capture, you can
+	pipe the traffic summary to STDIN using:</para>
+
+	<para><command>tshark -r capture.pcapng -T pdml |
+	traffic_summary.pl | traffic_learner -o traffic-model.txt</command></para>
+</refsect1>
+
+<refsect1>
+	<title>OUTPUT FILE FORMAT</title>
+
+	<para>The output model file describes a Markov model estimating the
+	probability of a packet occurring given the last two packets.</para>
+
+	<para>The count of each continuation after a pair of
+	successive packets is stored, and the ratios of these counts
+	is used to calculate probabilities for the next packet.
+	</para>
+
+	<para>The model is stored in JSON format, and also contains
+	information about the conversation rate and DNS traffic
+	rate.</para>
+
+
+<refsect2>
+	<title>Example ngram listing</title>
+	<para>The following listing shows a contrived example of a single ngram entry.
+        </para>
+
+        <programlisting>
+          "ngrams": {
+             "ldap:0\tdcerpc:11": {
+                 "lsarpc:77": 1,
+                 "ldap:2": 370,
+                 "ldap:3": 62,
+                 "wait:3": 2,
+                 "-": 1
+             }, <lineannotation>[...]</lineannotation>
+          }
+        </programlisting>
+        <para> This counts the observed continuations after an ldap
+        packet with opcode 0 (a bind) followed by a dcerpc packet with
+        opcode 11 (also a bind). The most common next packet is
+        "<code>ldap:2</code>" which is an unbind, so this is the most
+        likely packet type to be selected in replay. At the other
+        extreme, lsarpc opcode 77 (lookup names) has been seen only
+        once, and it is unlikely but possible that this will be
+        selected in replay.
+        </para>
+        <para> There are two special packet types here.
+        "<code>wait:3</code>" refers to a temporary pause in the
+        conversation, where the "<code>3</code>" pseudo-opcode indicates
+        the length of the wait on an exponential scale. That is, a
+        "<code>wait:4</code>" pause would be about 2.7 times longer that
+        a "<code>wait:3</code>", which in turn would be similarly longer
+        than a "<code>wait:2</code>".
+        </para>
+
+	<para>The other special packet is "-", which represents the
+	limit of the conversation. In the example, this indicates that
+	one observed conversation ended after this particular ngram.
+	This special opcode is also used at the beginning of
+	conversations, which are indicated by the ngram "<code>-\t-</code>".
+	</para>
+
+
+</refsect2>
+</refsect1>
+
+<refsect1>
+	<title>VERSION</title>
+
+	<para>This man page is complete for version 4 of the Samba
+	suite.</para>
+</refsect1>
+
+<refsect1>
+	<title>SEE ALSO</title>
+	<para>
+	<citerefentry>
+	<refentrytitle>traffic_replay</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 traffic_learner tool was developed by the Samba team at
+	Catalyst IT Ltd.</para>
+
+	<para>The traffic_learner manpage was written by Tim Beale.</para>
+</refsect1>
+
+</refentry>
diff --git a/docs-xml/manpages/traffic_replay.7.xml b/docs-xml/manpages/traffic_replay.7.xml
new file mode 100644
index 0000000..7fdb790
--- /dev/null
+++ b/docs-xml/manpages/traffic_replay.7.xml
@@ -0,0 +1,566 @@
+<?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="traffic_replay.7">
+
+<refmeta>
+	<refentrytitle>traffic_replay</refentrytitle>
+	<manvolnum>7</manvolnum>
+	<refmiscinfo class="source">Samba</refmiscinfo>
+	<refmiscinfo class="manual">User Commands</refmiscinfo>
+	<refmiscinfo class="version">4.7</refmiscinfo>
+</refmeta>
+
+
+<refnamediv>
+	<refname>traffic_replay</refname>
+	<refpurpose>Samba traffic generation tool.
+	</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+	<cmdsynopsis>
+		<command>traffic_replay</command>
+		<arg choice="opt">-F, --fixed-password <test-password></arg>
+		<arg choice="opt">-S, --scale-traffic <scale by factor></arg>
+		<arg choice="opt">-r, --replay-rate <scale by factor></arg>
+		<arg choice="opt">-D, --duration <seconds></arg>
+		<arg choice="opt">--traffic-summary <output file></arg>
+		<arg choice="opt">-I, --instance-id <id></arg>
+		<arg choice="opt">-K, --prefer-kerberos</arg>
+		<arg choice="opt">-B, --badpassword-frequency <frequency></arg>
+		<arg choice="opt">--dns-rate <rate></arg>
+		<arg choice="opt">-t, --timing-data <file></arg>
+		<arg choice="opt">-U, --username user</arg>
+		<arg choice="opt">--password <password></arg>
+		<arg choice="opt">-W --workgroup <workgroup></arg>
+		<arg choice="opt">--realm <realm></arg>
+		<arg choice="opt">-s, --config-file <file></arg>
+		<arg choice="opt">-k, --kerberos <kerberos></arg>
+		<arg choice="opt">--ipaddress <address></arg>
+		<arg choice="opt">-P, --machine-pass</arg>
+		<arg choice="opt">--option <option></arg>
+		<arg choice="opt">-d, --debuglevel <debug level></arg>
+		<arg choice="req">summary-file</arg>
+		<arg choice="req">dns-hostname</arg>
+	</cmdsynopsis>
+
+	<cmdsynopsis>
+		<command>traffic_replay</command>
+		<arg choice="opt">-G, --generate-users-only</arg>
+		<arg choice="opt">-F, --fixed-password <test-password></arg>
+		<arg choice="opt">-n, --number-of-users <total users></arg>
+		<arg choice="opt">--number-of-groups <total groups></arg>
+		<arg choice="opt">--average-groups-per-user <average number></arg>
+		<arg choice="opt">--group-memberships <total memberships></arg>
+		<arg choice="req">dns-hostname</arg>
+	</cmdsynopsis>
+
+	<cmdsynopsis>
+		<command>traffic_replay</command>
+		<arg choice="req">-c|--clean-up</arg>
+		<arg choice="req">dns-hostname</arg>
+	</cmdsynopsis>
+
+	<cmdsynopsis>
+		<command>traffic_replay</command>
+		<arg choice="opt">-h, --help</arg>
+		<arg choice="opt">-V, --version</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>This tool generates traffic in order to measure the performance
+	of a Samba DC, and to test how well Samba will scale as a network
+	increases in size. It can simulate multiple different hosts making
+	multiple different types of requests to a DC.</para>
+
+	<para>This tool is intended to run against a dedicated test DC (rather
+	than a live DC that is handling real network traffic).</para>
+
+	<para>Note that a side-effect of running this tool is that user
+	accounts will be created on the DC, in order to test various Samba
+	operations. As creating accounts can be very time-consuming, these
+	users will remain on the DC by default. To remove these accounts, use
+	the --clean-up option.
+	</para>
+</refsect1>
+
+<refsect1>
+	<title>OPTIONS</title>
+
+	<variablelist>
+
+	<varlistentry>
+	<term>-h|--help</term>
+	<listitem><para>
+	Print a summary of command line options.
+	</para></listitem>
+	</varlistentry>
+
+	<varlistentry>
+	<term>summary-file</term>
+	<listitem><para>
+	File containing the network traffic to replay. This should either be
+	a traffic-summary (generated by <command>traffic_summary.pl</command>)
+	or a traffic-model (generated by <command>traffic_learner</command>).
+	Based on this file, this tool will generate 'conversations' which
+	represent Samba activity between a network host and the DC.
+	</para></listitem>
+	</varlistentry>
+
+	<varlistentry>
+	<term>dns-hostname</term>
+	<listitem><para>
+	The full DNS hostname of the DC that's being tested. The Samba activity
+	in the summary-file will be replicated and directed at this DC. It's
+	recommended that you use a dedicated DC for testing and don't try to run
+	this tool against a DC that's processing live network traffic.
+	</para></listitem>
+	</varlistentry>
+
+	<varlistentry>
+	<term>-F|--fixed-password <test-password></term>
+	<listitem><para>
+	Test users are created when this tool is run, so that actual Samba
+	activity, such as authorizing users, can be mimicked. This option
+	specifies the password that will be used for any test users that are
+	created.</para>
+
+	<para>Note that any users created by this tool will remain on the DC
+	until you run the --clean-up option. Therefore, the fixed-password
+	option needs to be the same each time the tool is run, otherwise the
+	test users won't authenticate correctly.
+	</para></listitem>
+	</varlistentry>
+
+	<varlistentry>
+	<term>Traffic Model Options</term>
+	<listitem><para>
+	When the summary-file is a traffic-model (produced by
+	<command>traffic_learner</command>), use these options to alter the
+	traffic that gets generated.</para>
+	<itemizedlist>
+		<varlistentry>
+		<term>-D|--duration <seconds></term>
+		<listitem><para>
+		Specifies the approximate duration in seconds to generate
+		traffic for. The default is 60 seconds.
+		</para></listitem>
+		</varlistentry>
+
+		<varlistentry>
+		<term>-r|--replay-rate <factor></term>
+		<listitem><para>
+		Replays the traffic faster by this factor. This option won't
+		affect the number of conversations (which is based on the
+		traffic model), but the rate at which the packets are sent will
+		be increased.
+		</para></listitem>
+		</varlistentry>
+
+		<varlistentry>
+		<term>-S|--scale-traffic <factor></term>
+		<listitem><para>
+		Increases the number of conversations by this factor. This
+		option won't affect the rate at which packets get sent (which
+		is still based on the traffic model), but it will mean more
+		conversations get replayed.
+		</para></listitem>
+		</varlistentry>
+
+		<varlistentry>
+		<term>--traffic-summary <output-file></term>
+		<listitem><para>
+		Instead of replaying a traffic-model, this option generates a
+		traffic-summary file based on what traffic would be sent. Using
+		a traffic-model allows you to scale the packet rate and number
+		of packets sent. However, using a traffic-model introduces
+		some randomness into the traffic generation. So running the
+		same traffic_replay command multiple times using a model file
+		may result in some differences in the actual traffic sent.
+		However, running the same traffic_replay command multiple times
+		with a traffic-summary file will always result in the same
+		traffic being sent. </para>
+		<para>
+		For taking performance measurements over several test runs,
+		it's recommended to use this option and replay the traffic from
+		a traffic-summary file.
+		</para></listitem>
+		</varlistentry>
+	</itemizedlist>
+	</listitem>
+	</varlistentry>
+
+	<varlistentry>
+	<term>--generate-users-only</term>
+	<listitem><para>Add extra user/groups on the DC to increase the DB
+	size. By default, this tool automatically creates test users that map
+	to the traffic conversations being generated. This option allows extra
+	users to be created on top of this. Note that these extra users may
+	not actually used for traffic generation - the traffic generation is
+	still based on the number of conversations from the model/summary file.
+	</para>
+	
+	<para>
+	Generating a large number of users can take a long time, so it this
+	option allows this to be done only once.</para>
+
+	<para>Note that the users created will remain on the DC until the
+	tool is run with the --clean-up option. This means that it is best to
+	only assign group memberships once, i.e. run --clean-up before
+	assigning a different allocation of group memberships.</para>
+	<itemizedlist>
+
+		<varlistentry>
+		<term>-n|--number-of-users <total-users></term>
+		<listitem><para>
+		Specifies the total number of test users to create (excluding
+		any machine accounts required for the traffic). Note that these
+		extra users simply populate the DC's DB - the actual user
+		traffic generated is still based on the summary-file.
+		</para></listitem>
+		</varlistentry>
+
+		<varlistentry>
+		<term>--number-of-groups <total-groups></term>
+		<listitem><para>
+		Creates the specified number of groups, for assigning the test
+		users to. Note that users are not automatically assigned to
+		groups - use either --average-groups-per-user or
+		--group-membership to do this.
+		</para></listitem>
+		</varlistentry>
+
+		<varlistentry>
+		<term>--average-groups-per-user <average-groups></term>
+		<listitem><para>
+		Randomly assigns the test users to the test groups created.
+		The group memberships are distributed so that the overall
+		average groups that a user is member of matches this number.
+		Some users will belong to more groups and some users will
+		belong to fewer groups. This option is incompatible with
+		the --group-membership option.
+		</para></listitem>
+		</varlistentry>
+
+		<varlistentry>
+		<term>--group-memberships <total-memberships></term>
+		<listitem><para>
+		Randomly assigns the test users to the test groups created.
+		The group memberships are distributed so that the total
+		groups that a user is member of, across all users, matches
+		this number. For example, with 100 users and 10 groups,
+		--group-memberships=300 would assign a user to 3 groups
+		on average. Some users will belong to more groups and some
+		users will belong to fewer groups, but the total of all
+		member linked attributes would be 300. This option is
+		incompatible with the --group-membership option.
+		</para></listitem>
+		</varlistentry>
+	</itemizedlist>
+	</listitem>
+	</varlistentry>
+
+	<varlistentry>
+	<term>--clean-up</term>
+	<listitem><para>
+	Cleans up any users and groups that were created by previously running
+	this tool. It is recommended you always clean up after running the tool.
+	</para></listitem>
+	</varlistentry>
+
+	<varlistentry>
+	<term>-I|--instance-id <id></term>
+	<listitem><para>
+	Use this option to run multiple instances of the tool on the same DC at
+	the same time. This adds a prefix to the test users generated to keep
+	them separate on the DC.
+	</para></listitem>
+	</varlistentry>
+
+	<varlistentry>
+	<term>-K|--prefer-kerberos</term>
+	<listitem><para>
+	Use Kerberos to authenticate the test users.
+	</para></listitem>


-- 
Samba Shared Repository



More information about the samba-cvs mailing list