[SCM] Samba Shared Repository - branch v4-1-stable updated
Karolin Seeger
kseeger at samba.org
Fri Jan 10 01:18:07 MST 2014
The branch, v4-1-stable has been updated
via b6d7cae VERSION: Disable git snapshots for the 4.1.4 release.
via a6b86bf WHATSNEW: Add release notes for Samba 4.1.4.
via c765c2a s3:winbindd fix use of uninitialized variables
via 9c78cc3 vfs_glusterfs: Enable per client log file
via 5438b48 ldb: bad if test in ldb_comparison_fold()
via 80c09fc s3-lib: Fix %G substitution for domain users in smbd
via 3d62925 smbtorture: New torture test for bug #9870.
via c9b6d8c smbd - allow updates on directory write times on open handles.
via e440444 s3-winbindd: Fix DEBUG statement in winbind_msg_offline().
via a15ca71 smbd: Fix a panic when a smb2 brlock times out
via c89fb8b selftest: Remove samba3.smb2.lock.*.rw-exclusive from flapping file
via 52db703 selftest: Run smb2.lock tests also against AIO share
via e9503d4 selftest: Introduce share for testing AIO
via 6f46103 s3: Return correct error code from SMB2 AIO read failure
via 53bdc43 s3-aio: Use correct locking context for SMB2
via 723d74f s3:smb2_server: avoid calling set_current_user_info() for each request
via 2eb171f s3:smb2_server: generate a header blob for the sendfile path
via a399931 s3:smb2_server: allocate smbd_smb2_request on talloc_tos()
via 79c54dc s3:smb2_server: use tevent_req_notify_callback() in smbd_smb2_request_pending_queue()
via 1b3cf43 s3:smb2_server: for performance reasons we use tevent_fd and readv/writev directly
via dc55266 s3:smb2_server: fix drain_socket error handling
via aa79211 smbd: Always use UCF_PREP_CREATEFILE for filename_convert calls to resolve a path for open.
via 564fe6c smbd: change flag name from UCF_CREATING_FILE to UCF_PREP_CREATEFILE
via 9859090 smbd: Fix regression for the dropbox case.
via 3641751 lib/util: use proper include for struct stat
via 180bca8 VERSION: Bump version up to 4.1.4.
via ff99526 Merge tag 'samba-4.1.3' into v4-1-test
via bfdf098 smbd: Fix bug 10284
via 9d44b17 s3-libnet: Use a const char for realm.
via c0eb9ee s3-vfs: Make glfs_set_preopened() static.
via 8875b80 s3-vfs: Remove unused variable in vfs_glusterfs.
via e0bd27b examples: Fix scanf format in perf_writer_disk.
via 8c059c0 s3-libsmb: Fix scanf format in parse_ace().
via 41fc4a4 s3-utils: Fix scanf format in sharesec.
via 25ba5fb s3-utils: Fix scanf format in smbacls.
via eabee6b testsuit: Fix fprintf format.
via e1826b8 s3-libsmb: Use the right macro to set uint16_t attr.
via 03f9a7a printing: always store sytem job-ID in queue state
via 15cd0e0 spoolss: return the spoolss job ID in notifications
via eb9fde4 s3-winbind: Pass the group name to fillup_pw_field().
via 1788e66 s3-lib: Add grpname to talloc_sub_specified().
via e99d701 spoolss: accept XPS_PASS datatype used by Windows 8
via e668a11 docs: remove duplicate "used" from smb.conf manpage.
via a68ab7b docs: remove duplicate "line" from smb.conf manpage.
via e28f390 docs: remove duplicate "must" from smb.conf manpage.
via 576e5af docs: remove duplicate "on" from smb.conf manpage.
via 7d1b124 docs: remove duplicate "or" from smb.conf manpage.
via d17b1c1 docs: remove duplicate "not" from smb.conf manpage.
via 5965734 docs: remove duplicate "to" from smb.conf manpage.
via 75186f4 docs: remove duplicate "the" from smb.conf manpage.
via 8a93864 docs: remove duplicate "a" from vfs_cacheprime manpage.
via 2dbe943 docs: document remaining undocumented options in net manpage.
via cfc9d1e docs: add net registry import specific options in net manpage.
via c6d953e docs: add net rpc registry check specific options in net manpage.
via aaee748 docs: add net groupmap set specific options in net manpage.
via 1176b53 docs: add net rpc share migrate specific options in net manpage.
via de44156 docs: add net idmap specific options in net manpage.
via b14e1bc docs: add net rpc vampire specific options in net manpage.
via d24edcd docs: mention more options in net manpage.
via 5def0e7 docs: use popt.autohelp entity in samba.8 manpage.
via 9358b50 docs: use popt.autohelp entity in smbd manpage.
via 943d390 docs: use popt.autohelp entity in winbindd manpage.
via 8d7651b docs: use popt.autohelp entity in nmbd manpage.
via 4013bbf docs: fix ntlm_auth manpage.
via 8e29981 docs: fix smbcontrol manpage.
via 0b313d5 docs: use &popt.autohelp entity in pdbedit manpage.
via 1d10487 docs: fix testparm manpage.
via 72ca1f4 docs: use popt.autohelp entity in dbwrap-tools manpage.
via dc0cf1b docs: document all long option names in nmblookup manpage.
via 6dca50e docs: remove unsupported -h option and use popt.autohelp entity in rpcclient manpage.
via 58390e2 docs: mention --sddl and --domain-sid in smbcacls manpage.
via 167d949 docs: mention --query-security-info|--set-security-info in smbcacls manpage.
via 90bc0ff docs: remove duplicate -e option from smbcacls manpage.
via a98a3a4 docs: use popt.autohelp entity in smbcacls manpage.
via 05538b2 docs: remove unsupported -h option from smbcacls manpage.
via 6659b3a docs: use popt.autohelp and remove duplicate -e option from smbclient manpage.
via 000e7e6 docs: better document -e|--encrypt option globally.
via 2f20e1f docs: mention -B|--browse to smbclient manpage.
via d0813f4 docs: mention more long option names in smbcquotas manpage.
via 153739e docs: mention --update and --encrypt in smbget manpage.
via f6a0f1d docs: use popt.autohelp in smbtree manpage.
via 84bf0c0 docs: use popt.samba.common entity in profiles manpage.
via 2461695 docs: mention --change-sid|--new-sid in profiles manpage.
via 62c7754 docs: add new popt.autohelp entity.
via c5b9170 docs: remove more duplicate options from samba-regedit manpage.
via 10010b2 docs: add missing &popt.common.connection entity to smbcacls manpage.
via 40c6634 docs: add missing &popt.common.samba entity to smbcontrol manpage.
via 3f8f99a docs: remove now duplicate mention for 4 credential options in samba-regedit manpage.
via a93845f docs: bring samba entity popt.common.credentials in line with popt_common_credentials.
via bfd76d2 docs: mention -p in dbwrap-tool manpage.
via fca415d docs: mention -V|--viewsddl in sharesec manpage.
via 84c8fd7 docs: mention -S|--setsddl in sharesec manpage.
via 72e8aca docs: mention -R|--profile-rates in smbstatus manpage.
via 0f94260 docs: mention --numeric in smbstatus manpage.
via e791b70 docs: mention many more options in smbd options.
via 4982ce1 docs: remove unsupported options from smbd manpage.
via 967851a docs: mention --port in nmbd manpage.
via def1dd1 docs: mention --no-process-group in nmbd manpage.
via 290e5b6 docs: mention --log-stdout in nmbd manpage.
via 0791928 docs: mention --interactive in nmbd manpage.
via dfb6c60 docs: mention --hosts in nmbd manpage.
via bcffd67 docs: mention --foreground in nmbd manpage.
via 9c850a7 docs: mention --daemon in nmbd manpage.
via 34a2a3d docs: remove unsupported options from nmbd manpage.
via 015156b docs: mention --sids-to-unix-ids in wbinfo manpage.
via 225a315 docs: mention --sequence in wbinfo manpage.
via 20cfa16 docs: mention --set-gid-mapping/--set-uid-mapping in wbinfo manpage.
via 6bacf83 docs: mention --remove-gid-mapping/--remove-uid-mapping in wbinfo manpage.
via 4e09571 docs: mention --pam-logon in wbinfo manpage.
via 7f9119f docs: mention --lookup-sids in wbinfo manpage.
via 887c7d4 docs: mention logoff options in wbinfo manpage.
via 23cb76b docs: mention --krb5ccname option in wbinfo manpage.
via bddf55d docs: mention --dc-info in wbinfo manpage.
via 2b6bea4 docs: mention --no-process-group in winbindd manpage.
via df6929d docs: mention more options in winbindd manpage.
via 27e44c9 docs: remove duplicate word "the" from net manpage.
via 64aee7a docs: remove duplicate word "trust" from net manpage.
via 1770078 docs: remove duplicate mention of "smbta-util" in smbta-util manpage.
via 1539a74 docs: remove duplicate mention of "ntdbtool" in ntdbtool manpage.
via bdcc343 docs: remove duplicate mention of "smbtorture" in smbtorture manpage.
via 31b80a0 docs: remove duplicate word "the" in winbindd manpage.
via cfa4c5d docs: remove duplicate arguments listing in regdiff manpage.
via 0bd714a docs: remove duplicate word "name" in nmblookup4 manpage.
via 4d34c92 docs: remove duplicate word "name" in nmblookup manpage.
via 117497c docs: remove duplicate word "the" in idmap_ad manpage.
via 097f3c1 Fix typos in man-pages
via 7b13739 s3-libnetjoin: Fix Bug #10262: use upper-case realm when composing default upn.
via 8c73aae s3-client: smbclient shows no error if deleting a directory with del failed
via b0ce9bc s3-lib: smbclient shows no error if deleting a directory with del failed
via 845055c s3-smbd: smbclient shows no error if deleting a directory with del failed
via 3c83eaa smbd: Fix a talloc hierarchy problem in msg_channel
via c61910b VERSION: Bump version number up to 4.1.3...
from 6898c4d VERSION: Disable git snapshots for the 4.1.3 release.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-1-stable
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
VERSION | 2 +-
WHATSNEW.txt | 106 +++-
docs-xml/build/DTD/samba.entities | 64 ++-
docs-xml/manpages/dbwrap_tool.1.xml | 8 +-
docs-xml/manpages/idmap_ad.8.xml | 2 +-
docs-xml/manpages/idmap_autorid.8.xml | 2 +-
docs-xml/manpages/net.8.xml | 280 ++++++-
docs-xml/manpages/nmbd.8.xml | 36 +-
docs-xml/manpages/nmblookup.1.xml | 43 +-
docs-xml/manpages/ntlm_auth.1.xml | 42 +-
docs-xml/manpages/pdbedit.8.xml | 4 +-
docs-xml/manpages/profiles.1.xml | 10 +-
docs-xml/manpages/rpcclient.1.xml | 3 +-
docs-xml/manpages/samba-regedit.8.xml | 27 +-
docs-xml/manpages/samba.7.xml | 2 +-
docs-xml/manpages/samba.8.xml | 2 +-
docs-xml/manpages/sharesec.1.xml | 18 +-
docs-xml/manpages/smbcacls.1.xml | 46 +-
docs-xml/manpages/smbclient.1.xml | 20 +-
docs-xml/manpages/smbcontrol.1.xml | 14 +-
docs-xml/manpages/smbcquotas.1.xml | 32 +-
docs-xml/manpages/smbd.8.xml | 33 +-
docs-xml/manpages/smbget.1.xml | 9 +
docs-xml/manpages/smbpasswd.5.xml | 2 +-
docs-xml/manpages/smbstatus.1.xml | 20 +-
docs-xml/manpages/smbta-util.8.xml | 4 -
docs-xml/manpages/smbtree.1.xml | 2 +-
docs-xml/manpages/testparm.1.xml | 38 +-
docs-xml/manpages/vfs_cacheprime.8.xml | 2 +-
docs-xml/manpages/vfs_smb_traffic_analyzer.8.xml | 2 +-
docs-xml/manpages/wbinfo.1.xml | 97 +++
docs-xml/manpages/winbindd.8.xml | 31 +-
docs-xml/smbdotconf/filename/manglingmethod.xml | 2 +-
.../smbdotconf/misc/directorynamecachesize.xml | 2 +-
.../smbdotconf/misc/fakedirectorycreatetimes.xml | 2 +-
docs-xml/smbdotconf/misc/rpcserver.xml | 2 +-
.../smbdotconf/protocol/aclallowexecutealways.xml | 2 +-
docs-xml/smbdotconf/protocol/ntaclsupport.xml | 2 +-
docs-xml/smbdotconf/security/aclgroupcontrol.xml | 2 +-
docs-xml/smbdotconf/security/smbencrypt.xml | 2 +-
docs-xml/smbdotconf/security/usernamemapscript.xml | 2 +-
docs-xml/smbdotconf/winbind/idmapconfig.xml | 2 +-
examples/perfcounter/perf_writer_disk.c | 8 +-
lib/ldb/common/attrib_handlers.c | 2 +-
lib/ntdb/man/ntdbtool.8.xml | 4 -
lib/util/samba_util.h | 4 +-
libcli/nbt/man/nmblookup4.1.xml | 2 +-
selftest/flapping | 1 -
selftest/knownfail | 1 +
selftest/target/Samba3.pm | 4 +
source3/include/printing.h | 1 +
source3/include/proto.h | 2 +
source3/lib/msg_channel.c | 100 +--
source3/lib/substitute.c | 43 +-
source3/lib/util.c | 42 +
source3/libnet/libnet_join.c | 17 +-
source3/libsmb/cli_smb2_fnum.c | 31 +-
source3/libsmb/cli_smb2_fnum.h | 1 +
source3/libsmb/clilist.c | 2 +-
source3/libsmb/libsmb_xattr.c | 6 +-
source3/modules/vfs_glusterfs.c | 52 +-
source3/passdb/passdb.c | 8 +-
source3/passdb/pdb_ldap.c | 24 +-
source3/printing/printing.c | 45 +-
source3/rpc_server/spoolss/srv_spoolss_nt.c | 40 +-
source3/selftest/tests.py | 4 +
source3/smbd/aio.c | 4 +-
source3/smbd/dir.c | 28 +-
source3/smbd/filename.c | 10 +-
source3/smbd/globals.h | 31 +-
source3/smbd/nttrans.c | 6 +-
source3/smbd/open.c | 9 +-
source3/smbd/process.c | 5 +-
source3/smbd/proto.h | 1 -
source3/smbd/reply.c | 14 +-
source3/smbd/smb2_create.c | 3 +-
source3/smbd/smb2_lock.c | 2 +-
source3/smbd/smb2_read.c | 12 +-
source3/smbd/smb2_server.c | 886 ++++++++++----------
source3/smbd/smbd.h | 2 +-
source3/torture/torture.c | 2 +-
source3/utils/net_sam.c | 2 +
source3/utils/sharesec.c | 6 +-
source3/utils/smbcacls.c | 6 +-
source3/winbindd/wb_fill_pwent.c | 73 +-
source3/winbindd/winbindd_cache.c | 13 +
source3/winbindd/winbindd_dual.c | 2 +-
source4/lib/registry/man/regdiff.1.xml | 3 -
source4/torture/basic/delaywrite.c | 95 +++
source4/torture/man/smbtorture.1.xml | 4 -
testsuite/nsswitch/getgrent_r.c | 2 +-
91 files changed, 1752 insertions(+), 936 deletions(-)
Changeset truncated at 500 lines:
diff --git a/VERSION b/VERSION
index 981edc6..bfb23b8 100644
--- a/VERSION
+++ b/VERSION
@@ -25,7 +25,7 @@
########################################################
SAMBA_VERSION_MAJOR=4
SAMBA_VERSION_MINOR=1
-SAMBA_VERSION_RELEASE=3
+SAMBA_VERSION_RELEASE=4
########################################################
# If a official release has a serious bug #
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 75db247..b864e8a 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,4 +1,106 @@
=============================
+ Release Notes for Samba 4.1.4
+ January 10, 2014
+ =============================
+
+
+This is the latest stable release of Samba 4.1.
+
+Major enhancements in Samba 4.1.4 include:
+
+o Fix segfault in smbd (bug #10284).
+o Fix SMB2 server panic when a smb2 brlock times out (bug #10311).
+
+
+Changes since 4.1.3:
+--------------------
+
+o Jeremy Allison <jra at samba.org>
+ * BUG 9870: smbd: Allow updates on directory write times on open handles.
+ * BUG 10260: smbclient shows no error if deleting a directory with del
+ failed.
+ * BUG 10297: smbd: Fix writing to a directory with -wx permissions
+ on a share.
+ * BUG 10305: ldb: bad if test in ldb_comparison_fold().
+
+
+o Christian Ambach <ambi at samba.org>
+ * BUG 10276: Fix waf build error on AIX with IBM XL C/C++.
+ * BUG 10280: s3:winbindd fix use of uninitialized variables.
+
+
+o Michele Baldessari <michele at acksyn.org>
+ * BUG 10281: Fix typos in man pages.
+
+
+o Jan Brummer <jan.brummer at tabos.org>
+ * BUG 10285: s3-winbindd: Fix DEBUG statement in winbind_msg_offline().
+
+
+o Günther Deschner <gd at samba.org>
+ * BUG 10262: s3-libnetjoin: Use upper-case realm when composing default
+ upn.
+ * BUG 10281: Fix numerous typos in man pages.
+
+
+o David Disseldorp <ddiss at samba.org>
+ * BUG 10271: Send correct job-ID in print job notifications.
+
+
+o Poornima Gurusiddaiah <pgurusid at redhat.com>
+ * BUG 10337: vfs_glusterfs: Enable per client log file.
+
+
+o Volker Lendecke <vl at samba.org>
+ * BUG 10250: smbd: Fix a talloc hierarchy problem in msg_channel.
+ * BUG 10284: smbd: Fix segfaults.
+ * BUG 10297: smbd: Fix writing to a directory with -wx permissions
+ on a share.
+ * BUG 10311: Fix SMB2 server panic when a smb2 brlock times out.
+
+
+o Stefan Metzmacher <metze at samba.org>
+ * BUG 10298: Reduce smb2_server processing overhead.
+
+
+o Arvid Requate <requate at univention.de>
+ * BUG 10267: Fix printing via local printer drivers with Windows 8.
+
+
+o Christof Schmitt <cs at samba.org>
+ * BUG 10310: Fix AIO with SMB2 and locks.
+
+
+o Andreas Schneider <asn at samba.org>
+ * BUG 2191: Fix %G/%g substitution in 'template homedir'.
+ * BUG 10274: Fix several issues and warnings from analyzer tools.
+ * BUG 10286: s3-lib: Fix %G substitution for domain users in smbd.
+
+
+#######################################
+Reporting bugs & Development Discussion
+#######################################
+
+Please discuss this release on the samba-technical mailing list or by
+joining the #samba-technical IRC channel on irc.freenode.net.
+
+If you do report problems then please try to send high quality
+feedback. If you don't provide vital information to help us track down
+the problem then you will probably be ignored. All bug reports should
+be filed under the Samba 4.1 product in the project's Bugzilla
+database (https://bugzilla.samba.org/).
+
+
+======================================================================
+== Our Code, Our Bugs, Our Responsibility.
+== The Samba Team
+======================================================================
+
+
+Release notes for older releases follow:
+----------------------------------------
+
+ =============================
Release Notes for Samba 4.1.3
December 9, 2013
=============================
@@ -88,8 +190,8 @@ database (https://bugzilla.samba.org/).
======================================================================
-Release notes for older releases follow:
-----------------------------------------
+----------------------------------------------------------------------
+
=============================
Release Notes for Samba 4.1.2
diff --git a/docs-xml/build/DTD/samba.entities b/docs-xml/build/DTD/samba.entities
index c9c6744..1e852ec 100644
--- a/docs-xml/build/DTD/samba.entities
+++ b/docs-xml/build/DTD/samba.entities
@@ -464,13 +464,44 @@ Try to use the credentials cached by winbind.
</varlistentry>
'>
+<!ENTITY stdarg.signing '
+<varlistentry>
+<term>-S|--signing on|off|required</term>
+<listitem><para>Set the client signing state.
+</para></listitem>
+</varlistentry>
+'>
-<!ENTITY stdarg.help '
+<!ENTITY stdarg.machinepass '
<varlistentry>
-<term>-?|--help</term>
-<listitem><para>Print a summary of command line options.
+<term>-P|--machine-pass</term>
+<listitem><para>Use stored machine account password.
</para></listitem>
-</varlistentry>'>
+</varlistentry>
+'>
+
+<!ENTITY stdarg.encrypt '
+<varlistentry>
+<term>-e|--encrypt</term>
+<listitem><para>
+This command line parameter requires the remote
+server support the UNIX extensions or that the SMB3 protocol has been selected.
+Requests that the connection be encrypted. Negotiates SMB encryption using either
+SMB3 or POSIX extensions via GSSAPI. Uses the given credentials for
+the encryption negotiation (either kerberos or NTLMv1/v2 if given
+domain/username/password triple. Fails the connection if encryption
+cannot be negotiated.
+</para></listitem>
+</varlistentry>
+'>
+
+<!ENTITY stdarg.pwnthash '
+<varlistentry>
+<term>--pw-nt-hash</term>
+<listitem><para>The supplied password is the NT hash.
+</para></listitem>
+</varlistentry>
+'>
<!ENTITY popt.common.credentials '
&stdarg.nopass;
@@ -478,6 +509,31 @@ Try to use the credentials cached by winbind.
&stdarg.useccache;
&stdarg.authfile;
&stdarg.username;
+&stdarg.signing;
+&stdarg.machinepass;
+&stdarg.encrypt;
+&stdarg.pwnthash;
+'>
+
+<!ENTITY stdarg.help '
+<varlistentry>
+<term>-?|--help</term>
+<listitem><para>Print a summary of command line options.
+</para></listitem>
+</varlistentry>
+'>
+
+<!ENTITY stdarg.usage '
+<varlistentry>
+<term>--usage</term>
+<listitem><para>Display brief usage message.
+</para></listitem>
+</varlistentry>
+'>
+
+<!ENTITY popt.autohelp '
+&stdarg.help;
+&stdarg.usage;
'>
<!-- Entities for the various programs -->
diff --git a/docs-xml/manpages/dbwrap_tool.1.xml b/docs-xml/manpages/dbwrap_tool.1.xml
index e2b2cee..074d819 100644
--- a/docs-xml/manpages/dbwrap_tool.1.xml
+++ b/docs-xml/manpages/dbwrap_tool.1.xml
@@ -19,7 +19,7 @@
<refsynopsisdiv>
<cmdsynopsis>
<command>dbwrap_tool</command>
- <arg choice="opt">--persistent</arg>
+ <arg choice="opt">-p|--persistent</arg>
<arg choice="opt">-d <debug level></arg>
<arg choice="opt">-s <config file></arg>
<arg choice="opt">-l <log file base></arg>
@@ -49,7 +49,7 @@
<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>exists: test for existance of a record</para></listitem>
+ <listitem><para>exists: test for existence of 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>
@@ -70,14 +70,14 @@
<variablelist>
<varlistentry>
- <term>--persistent</term>
+ <term>-p|--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;
+ &popt.autohelp;
</variablelist>
</refsect1>
diff --git a/docs-xml/manpages/idmap_ad.8.xml b/docs-xml/manpages/idmap_ad.8.xml
index 0e33b77..87be2de 100644
--- a/docs-xml/manpages/idmap_ad.8.xml
+++ b/docs-xml/manpages/idmap_ad.8.xml
@@ -31,7 +31,7 @@
<para>
Currently, the <parameter>ad</parameter> backend
- does not work as the the default idmap backend, but one has
+ does not work as the default idmap backend, but one has
to configure it separately for each domain for which one wants
to use it, using disjoint ranges. One usually needs to configure
a writeable default idmap range, using for example the
diff --git a/docs-xml/manpages/idmap_autorid.8.xml b/docs-xml/manpages/idmap_autorid.8.xml
index c35f903..7446d53 100644
--- a/docs-xml/manpages/idmap_autorid.8.xml
+++ b/docs-xml/manpages/idmap_autorid.8.xml
@@ -109,7 +109,7 @@
<title>EXAMPLES</title>
<para>
This example shows you the minimal configuration that will
- work for the principial domain and 19 trusted domains / range
+ work for the principal domain and 19 trusted domains / range
extensions.
</para>
diff --git a/docs-xml/manpages/net.8.xml b/docs-xml/manpages/net.8.xml
index dd5b3ab..5417054 100644
--- a/docs-xml/manpages/net.8.xml
+++ b/docs-xml/manpages/net.8.xml
@@ -22,20 +22,25 @@
<cmdsynopsis>
<command>net</command>
<arg choice="req"><ads|rap|rpc></arg>
- <arg choice="opt">-h</arg>
- <arg choice="opt">-w workgroup</arg>
- <arg choice="opt">-W myworkgroup</arg>
- <arg choice="opt">-U user</arg>
- <arg choice="opt">-I ip-address</arg>
- <arg choice="opt">-p port</arg>
+ <arg choice="opt">-h|--help</arg>
+ <arg choice="opt">-w|--workgroup workgroup</arg>
+ <arg choice="opt">-W|--myworkgroup myworkgroup</arg>
+ <arg choice="opt">-U|--user user</arg>
+ <arg choice="opt">-I|--ipaddress ip-address</arg>
+ <arg choice="opt">-p|--port port</arg>
<arg choice="opt">-n myname</arg>
<arg choice="opt">-s conffile</arg>
- <arg choice="opt">-S server</arg>
- <arg choice="opt">-l</arg>
- <arg choice="opt">-P</arg>
+ <arg choice="opt">-S|--server server</arg>
+ <arg choice="opt">-l|--long</arg>
+ <arg choice="opt">-v|--verbose</arg>
+ <arg choice="opt">-f|--force</arg>
+ <arg choice="opt">-P|--machine-pass</arg>
<arg choice="opt">-d debuglevel</arg>
<arg choice="opt">-V</arg>
<arg choice="opt">--request-timeout seconds</arg>
+ <arg choice="opt">-t|--timeout seconds</arg>
+ <arg choice="opt">-i|--stdin</arg>
+ <arg choice="opt">--tallocreport</arg>
</cmdsynopsis>
</refsynopsisdiv>
@@ -64,7 +69,7 @@
&stdarg.kerberos;
<varlistentry>
- <term>-w target-workgroup</term>
+ <term>-w|--workgroup target-workgroup</term>
<listitem><para>
Sets target workgroup or domain. You have to specify
either this option or the IP address or the name of a server.
@@ -72,21 +77,21 @@
</varlistentry>
<varlistentry>
- <term>-W workgroup</term>
+ <term>-W|--myworkgroup workgroup</term>
<listitem><para>
Sets client workgroup or domain
</para></listitem>
</varlistentry>
<varlistentry>
- <term>-U user</term>
+ <term>-U|--user user</term>
<listitem><para>
User name to use
</para></listitem>
</varlistentry>
<varlistentry>
- <term>-I ip-address</term>
+ <term>-I|--ipaddress ip-address</term>
<listitem><para>
IP address of target server to use. You have to
specify either this option or a target workgroup or
@@ -95,7 +100,7 @@
</varlistentry>
<varlistentry>
- <term>-p port</term>
+ <term>-p|--port port</term>
<listitem><para>
Port on the target server to connect to (usually 139 or 445).
Defaults to trying 445 first, then 139.
@@ -106,7 +111,7 @@
&stdarg.configfile;
<varlistentry>
- <term>-S server</term>
+ <term>-S|--server server</term>
<listitem><para>
Name of target server. You should specify either
this option or a target workgroup or a target IP address.
@@ -114,14 +119,28 @@
</varlistentry>
<varlistentry>
- <term>-l</term>
+ <term>-l|--long</term>
<listitem><para>
When listing data, give more information on each item.
</para></listitem>
</varlistentry>
<varlistentry>
- <term>-P</term>
+ <term>-v|--verbose</term>
+ <listitem><para>
+ When listing data, give more verbose information on each item.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-f|--force</term>
+ <listitem><para>
+ Enforcing a net command.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-P|--machine-pass</term>
<listitem><para>
Make queries to the external server using the machine account of the local server.
</para></listitem>
@@ -135,7 +154,226 @@
</para></listitem>
</varlistentry>
- &stdarg.server.debug;
+ <varlistentry>
+ <term>-t|--timeout 30</term>
+ <listitem><para>
+ Set timeout for client operations to 30 seconds.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--use-ccache</term>
+ <listitem><para>
+ Try to use the credentials cached by winbind.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-i|--stdin</term>
+ <listitem><para>
+ Take input for net commands from standard input.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--tallocreport</term>
+ <listitem><para>
+ Generate a talloc report while processing a net
+ command.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-T|--test</term>
+ <listitem><para>Only test command sequence, dry-run.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-F|--flags FLAGS</term>
+ <listitem><para>Pass down integer flags to a net subcommand.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-C|--comment COMMENT</term>
+ <listitem><para>Pass down a comment string to a net subcommand.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-n|--myname MYNAME</term>
+ <listitem><para>Use MYNAME as a requester name for a net subcommand.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-c|--container CONTAINER</term>
+ <listitem><para>Use a specific AD container for net ads operations.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-M|--maxusers MAXUSERS</term>
+ <listitem><para>Fill in the maxusers field in net rpc share operations.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-r|--reboot</term>
+ <listitem><para>Reboot a remote machine after a command has been successfully executed (e.g. in remote join operations).
+ </para></listitem>
+ </varlistentry>
+
+ <!-- Options for net rpc vampire -->
+
+ <varlistentry>
+ <term>--force-full-repl</term>
+ <listitem><para>
+ When calling "net rpc vampire keytab" this option
+ enforces a full re-creation of the generated keytab file.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--single-obj-repl</term>
+ <listitem><para>
+ When calling "net rpc vampire keytab" this option
+ allows to replicate just a single object to the generated keytab file.
+ </para></listitem>
+ </varlistentry>
--
Samba Shared Repository
More information about the samba-cvs
mailing list