The branch, master has been updated via 171750e s3/wscript: remove test, that we do in lib/replace via 9be8ef1 docs-xml:samba-tool.8: fix wrong default computer container name via e45b504 samba-tool computer: fix wrong computer container in help message from d444221 traffic: improve add_short_packet by avoiding dict.get
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 171750e966e040493c8631fcdd65478ab35e6f2e Author: Björn Jacke <bja...@samba.org> Date: Mon Mar 12 19:13:04 2018 +0100 s3/wscript: remove test, that we do in lib/replace Signed-off-by: Bjoern Jacke <bja...@samba.org> Reviewed-by: Björn Baumbach <b...@sernet.de> Autobuild-User(master): Björn Baumbach <bbaumb...@samba.org> Autobuild-Date(master): Mon May 14 21:15:21 CEST 2018 on sn-devel-144 commit 9be8ef19553069593c3766177f065d3b9ce06bba Author: Björn Baumbach <b...@sernet.de> Date: Tue May 8 10:21:10 2018 +0200 docs-xml:samba-tool.8: fix wrong default computer container name CN=Users --> CN=Computers Signed-off-by: Björn Baumbach <b...@sernet.de> Reviewed-by: Björn Jacke <bja...@samba.org> commit e45b5047b94c3f0c812fe7d4931610bcf45bd437 Author: Björn Baumbach <b...@sernet.de> Date: Mon May 7 15:00:17 2018 +0200 samba-tool computer: fix wrong computer container in help message CN=Users --> CN=Computers Signed-off-by: Björn Baumbach <b...@sernet.de> Reviewed-by: Björn Jacke <bja...@samba.org> ----------------------------------------------------------------------- Summary of changes: docs-xml/manpages/samba-tool.8.xml | 2 +- python/samba/netcmd/computer.py | 4 ++-- source3/wscript | 2 +- 3 files changed, 4 insertions(+), 4 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 3cde4c5..3173083 100644 --- a/docs-xml/manpages/samba-tool.8.xml +++ b/docs-xml/manpages/samba-tool.8.xml @@ -121,7 +121,7 @@ <term>--computerou=COMPUTEROU</term> <listitem><para> DN of alternative location (with or without domainDN counterpart) to - default CN=Users in which new computer object will be created. + default CN=Computers in which new computer object will be created. E.g. 'OU=OUname'. </para></listitem> </varlistentry> diff --git a/python/samba/netcmd/computer.py b/python/samba/netcmd/computer.py index 9ca8904..7a913b4 100644 --- a/python/samba/netcmd/computer.py +++ b/python/samba/netcmd/computer.py @@ -208,8 +208,8 @@ Example3 shows how to create a new computer in the OrgUnit organizational unit. type=str, metavar="URL", dest="H"), Option("--computerou", help=("DN of alternative location (with or without domainDN " - "counterpart) to default CN=Users in which new computer " - "object will be created. E. g. 'OU=<OU name>'"), + "counterpart) to default CN=Computers in which new " + "computer object will be created. E.g. 'OU=<OU name>'"), type=str), Option("--description", help="Computers's description", type=str), Option("--prepare-oldjoin", diff --git a/source3/wscript b/source3/wscript index ab64e80..e6d9936 100644 --- a/source3/wscript +++ b/source3/wscript @@ -386,7 +386,7 @@ DNSServiceRegister _dup __dup _dup2 __dup2 endmntent execl _facl __facl _fchdir __fchdir fchmod fchown _fcntl __fcntl fcvt fcvtl fdatasync _fork __fork fseeko -fsetxattr _fstat __fstat fsync +_fstat __fstat fsync futimens futimes __fxstat getauthuid getcwd _getcwd __getcwd getdents __getdents getdirentries getgrent getgrnam getgrouplist getgrset getmntent getpagesize -- Samba Shared Repository