The branch, master has been updated
via f9ee6b67e0c doc: add missing "samba-tool ou" entry
via 14070f8d8f3 doc: add missing "samba-tool computer" entry
via f8d3180d8e2 doc: fix typos in samba-tool documentation
via 5131fc5cb95 doc: add missing samba-tool user edit documentation
via 53afa138bbe samba-tool: fix some typos
via ed0060d3f2f selftest: use test smb.conf in provision
from a2b1970a378 acl_read: Fix regression caused by
db15fcfa899e1fe4d6994f68ceb299921b8aa6f1 for empty lists
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit f9ee6b67e0c1007cb831720f09915babdb4adbf2
Author: Björn Baumbach <[email protected]>
Date: Thu Mar 28 15:26:36 2019 +0100
doc: add missing "samba-tool ou" entry
Signed-off-by: Björn Baumbach <[email protected]>
Reviewed-by: Douglas Bagnall <[email protected]>
Autobuild-User(master): Douglas Bagnall <[email protected]>
Autobuild-Date(master): Sat Mar 30 23:33:39 UTC 2019 on sn-devel-144
commit 14070f8d8f3f82dfa259cd7c2f84e867f78bf665
Author: Björn Baumbach <[email protected]>
Date: Thu Mar 28 15:25:01 2019 +0100
doc: add missing "samba-tool computer" entry
Signed-off-by: Björn Baumbach <[email protected]>
Reviewed-by: Douglas Bagnall <[email protected]>
commit f8d3180d8e297577806b51c41e17fff41a8e30a9
Author: Björn Baumbach <[email protected]>
Date: Thu Mar 28 15:18:49 2019 +0100
doc: fix typos in samba-tool documentation
Signed-off-by: Björn Baumbach <[email protected]>
Reviewed-by: Douglas Bagnall <[email protected]>
commit 5131fc5cb95ccf39433e51fc8acca92f82a2aad7
Author: Björn Baumbach <[email protected]>
Date: Thu Mar 28 15:02:08 2019 +0100
doc: add missing samba-tool user edit documentation
Signed-off-by: Björn Baumbach <[email protected]>
Reviewed-by: Douglas Bagnall <[email protected]>
commit 53afa138bbef7a4a2eb9e2b6d183aadde94c132b
Author: Björn Baumbach <[email protected]>
Date: Thu Mar 28 17:24:40 2019 +0100
samba-tool: fix some typos
All command descriptions have a dot '.' at the end.
The ou and visualize command need this too.
...
group - Group management.
ldapcmp - Compare two ldap databases.
ntacl - NT ACLs manipulation.
ou - Organizational Units (OU) management
...
user - User management.
visualize - Produces graphical representations of Samba network state
Signed-off-by: Björn Baumbach <[email protected]>
Reviewed-by: Douglas Bagnall <[email protected]>
commit ed0060d3f2f86837efd5afee6e0b68884765c3c3
Author: Douglas Bagnall <[email protected]>
Date: Fri Mar 29 14:12:49 2019 +1300
selftest: use test smb.conf in provision
Signed-off-by: Douglas Bagnall <[email protected]>
Reviewed-by: Tim Beale <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
docs-xml/manpages/samba-tool.8.xml | 37 +++++++++++++++++++++++++++++++------
python/samba/netcmd/ou.py | 6 +++---
python/samba/netcmd/visualize.py | 2 +-
selftest/target/Samba4.pm | 3 ++-
4 files changed, 37 insertions(+), 11 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/manpages/samba-tool.8.xml
b/docs-xml/manpages/samba-tool.8.xml
index 01f5313abf8..f94864b07c9 100644
--- a/docs-xml/manpages/samba-tool.8.xml
+++ b/docs-xml/manpages/samba-tool.8.xml
@@ -110,6 +110,11 @@
<refsect1>
<title>COMMANDS</title>
+<refsect2>
+ <title>computer</title>
+ <para>Manage computer accounts.</para>
+</refsect2>
+
<refsect3>
<title>computer create <replaceable>computername</replaceable>
[options]</title>
<para>Create a new computer in the Active Directory Domain.</para>
@@ -679,6 +684,11 @@
<para>Reset sysvol ACLs to defaults (including correct ACLs on
GPOs).</para>
</refsect3>
+<refsect2>
+ <title>ou</title>
+ <para>Manage organizational units (OUs).</para>
+</refsect2>
+
<refsect3>
<title>ou create <replaceable>ou_dn</replaceable> [options]</title>
<para>Create an organizational unit.</para>
@@ -865,12 +875,27 @@
<refsect3>
<title>user disable <replaceable>username</replaceable></title>
- <para>Disable an user account.</para>
+ <para>Disable a user account.</para>
+</refsect3>
+
+<refsect3>
+ <title>user edit <replaceable>username</replaceable></title>
+ <para>Edit a user account AD object.</para>
+
+ <variablelist>
+ <varlistentry>
+ <term>--editor=EDITOR</term>
+ <listitem><para>
+ Specifies the editor to use instead of the system default, or 'vi' if no
+ system default is set.
+ </para></listitem>
+ </varlistentry>
+ </variablelist>
</refsect3>
<refsect3>
<title>user enable <replaceable>username</replaceable></title>
- <para>Enable an user account.</para>
+ <para>Enable a user account.</para>
</refsect3>
<refsect3>
@@ -904,23 +929,23 @@
<refsect3>
<title>user password [options]</title>
- <para>Change password for an user account (the one provided in
+ <para>Change password for a user account (the one provided in
authentication).</para>
</refsect3>
<refsect3>
<title>user setexpiry <replaceable>username</replaceable>
[options]</title>
- <para>Set the expiration of an user account.</para>
+ <para>Set the expiration of a user account.</para>
</refsect3>
<refsect3>
<title>user setpassword <replaceable>username</replaceable>
[options]</title>
- <para>Sets or resets the password of an user account.</para>
+ <para>Sets or resets the password of a user account.</para>
</refsect3>
<refsect3>
<title>user getpassword <replaceable>username</replaceable>
[options]</title>
- <para>Gets the password of an user account.</para>
+ <para>Gets the password of a user account.</para>
</refsect3>
<refsect3>
diff --git a/python/samba/netcmd/ou.py b/python/samba/netcmd/ou.py
index f4e01838e6e..38be3cea22e 100644
--- a/python/samba/netcmd/ou.py
+++ b/python/samba/netcmd/ou.py
@@ -1,6 +1,6 @@
-# implement samba_tool ou commands
+# implement samba-tool ou commands
#
-# Copyright Bjoern Baumbach <[email protected]> 2018
+# Copyright Bjoern Baumbach 2018-2019 <[email protected]>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -390,7 +390,7 @@ class cmd_delete(Command):
class cmd_ou(SuperCommand):
- """Organizational Units (OU) management"""
+ """Organizational Units (OU) management."""
subcommands = {}
subcommands["create"] = cmd_create()
diff --git a/python/samba/netcmd/visualize.py b/python/samba/netcmd/visualize.py
index a0eb676eb31..3b99c6c6e02 100644
--- a/python/samba/netcmd/visualize.py
+++ b/python/samba/netcmd/visualize.py
@@ -705,7 +705,7 @@ class cmd_uptodateness(GraphCommand):
class cmd_visualize(SuperCommand):
- """Produces graphical representations of Samba network state"""
+ """Produces graphical representations of Samba network state."""
subcommands = {}
for k, v in globals().items():
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index ec587aae3b4..bc5f885ddd5 100755
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -998,6 +998,7 @@ sub provision_raw_step2($$$)
$ldbmodify .= "KRB5_CONFIG=\"$ret->{KRB5_CONFIG}\" ";
$ldbmodify .= "KRB5CCNAME=\"$ret->{KRB5_CCACHE}\" ";
$ldbmodify .= Samba::bindir_path($self, "ldbmodify");
+ $ldbmodify .= " --configfile=$ctx->{smb_conf}";
my $base_dn = "DC=".join(",DC=", split(/\./, $ctx->{realm}));
if ($ctx->{server_role} ne "domain controller") {
@@ -1098,7 +1099,7 @@ servicePrincipalName: http/testupnspn.$ctx->{dnsname}
$ldbmodify .= "KRB5_CONFIG=\"$ret->{KRB5_CONFIG}\" ";
$ldbmodify .= "KRB5CCNAME=\"$ret->{KRB5_CCACHE}\" ";
$ldbmodify .= Samba::bindir_path($self, "ldbmodify");
-
+ $ldbmodify .= " --configfile=$ctx->{smb_conf}";
my $base_dn = "DC=".join(",DC=", split(/\./, $ctx->{realm}));
my $user_dn = "cn=jane,cn=users,$base_dn";
--
Samba Shared Repository
