[SCM] Samba Shared Repository - branch master updated
Jeremy Allison
jra at samba.org
Thu Jun 10 01:18:01 UTC 2021
The branch, master has been updated
via 767287920aa selftest/gdb_backtrace: remove duplicate assignment.
via fe91e643cb5 samba-tool: stick to the point with --version
via 8515973dd87 samba-tool dns zoneoptions --help improvement
via 997b90e0755 idl: two comment typos in two lines
via b54a24049f2 s3:pylibsmb: improve return types (false => NULL)
via ef863de140d s3:pylibsmb: avoid small leaks in cli_notify_get_changes
via 8eb307f22d7 python: remove obsolete samba_external directory
via a9ef5555ba9 samba-tool domain: improve error message when `patch` fails
from 8fa8bbe19e6 s3:tests: Fix the test_smbclient_netbios_aliases
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 767287920aa523512da9f27aec9825bb4972c4ee
Author: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Date: Thu May 27 14:50:55 2021 +1200
selftest/gdb_backtrace: remove duplicate assignment.
See 18 or so lines up.
Signed-off-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Reviewed-by: Jeremy Allison <jra at samba.org>
Autobuild-User(master): Jeremy Allison <jra at samba.org>
Autobuild-Date(master): Thu Jun 10 01:17:52 UTC 2021 on sn-devel-184
commit fe91e643cb5215efa7269edeb91d2f9577c33258
Author: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Date: Tue Jun 1 00:48:24 2021 +0000
samba-tool: stick to the point with --version
We were doing this:
$ bin/samba-tool --version
samba-tool: no such subcommand: --version
4.15.0pre1-DEVELOPERBUILD
$
which is silly. Now we'll just see the version.
Signed-off-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 8515973dd875cecaa4cbdfc0aca52c6dc4e1d622
Author: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Date: Tue Jun 1 12:58:28 2021 +1200
samba-tool dns zoneoptions --help improvement
Signed-off-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 997b90e0755b8fe773985ec2334dc1fcc83b0224
Author: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Date: Fri Apr 23 01:00:56 2021 +1200
idl: two comment typos in two lines
it is the density that got to me.
Signed-off-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit b54a24049f23165b445e79a3124460eed3d71bde
Author: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Date: Thu May 27 15:39:19 2021 +1200
s3:pylibsmb: improve return types (false => NULL)
NULL, a.k.a. (void *)false;
Signed-off-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit ef863de140d2b5243e753f793bd0b0680334df2f
Author: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Date: Thu May 27 15:32:45 2021 +1200
s3:pylibsmb: avoid small leaks in cli_notify_get_changes
Signed-off-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 8eb307f22d7db6d3848b36dd57afaf20942eb315
Author: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Date: Fri May 21 16:50:02 2021 +1200
python: remove obsolete samba_external directory
It seems this was once meant to contain third-party python libraries
that we hoped would already be on the system, of which there was only
ever one candidate, dnspython, which we moved then stopped bundling
years ago.
The ancestor of this directory, 'source4/scripting/python/samba_external/'
was unused since 4bbc3ff037026c72f3249f59c1b5af69a6ad6d69 (2010) and
the current location has never done anything.
Signed-off-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit a9ef5555ba92374f5fae75456bd747134ffb22e0
Author: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Date: Fri May 21 11:41:37 2021 +1200
samba-tool domain: improve error message when `patch` fails
The old message confused even the wisest among us:
https://lists.samba.org/archive/samba/2021-May/236021.html
and while /user/bin/patch might be overly specific, it should point
people in the right direction.
Signed-off-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Reviewed-by: Jeremy Allison <jra at samba.org>
-----------------------------------------------------------------------
Summary of changes:
python/samba/netcmd/__init__.py | 2 +-
python/samba/netcmd/dns.py | 2 +-
python/samba/netcmd/domain.py | 3 ++-
python/samba_external/README | 4 ----
selftest/gdb_backtrace | 1 -
source3/libsmb/pylibsmb.c | 7 +++++--
source4/librpc/idl/irpc.idl | 4 ++--
7 files changed, 11 insertions(+), 12 deletions(-)
delete mode 100644 python/samba_external/README
Changeset truncated at 500 lines:
diff --git a/python/samba/netcmd/__init__.py b/python/samba/netcmd/__init__.py
index 620e3751e7f..62fe1380d52 100644
--- a/python/samba/netcmd/__init__.py
+++ b/python/samba/netcmd/__init__.py
@@ -234,7 +234,7 @@ class SuperCommand(Command):
if subcommand in self.subcommands:
return self.subcommands[subcommand]._run(
"%s %s" % (myname, subcommand), *args)
- elif subcommand not in [ '--help', 'help', None ]:
+ elif subcommand not in [ '--help', 'help', None, '-h', '-V', '--version' ]:
print("%s: no such subcommand: %s\n" % (myname, subcommand))
args = []
diff --git a/python/samba/netcmd/dns.py b/python/samba/netcmd/dns.py
index 46295823503..a1b49cbaad2 100644
--- a/python/samba/netcmd/dns.py
+++ b/python/samba/netcmd/dns.py
@@ -456,7 +456,7 @@ class cmd_zoneoptions(Command):
Option('--client-version', help='Client Version',
default='longhorn', metavar='w2k|dotnet|longhorn',
choices=['w2k', 'dotnet', 'longhorn'], dest='cli_ver'),
- Option('--mark-old-records-static',
+ Option('--mark-old-records-static', metavar="YYYY-MM-DD",
help="Make records older than this (YYYY-MM-DD) static"),
Option('--mark-records-static-regex', metavar="REGEXP",
help="Make records matching this regular expression static"),
diff --git a/python/samba/netcmd/domain.py b/python/samba/netcmd/domain.py
index 6b1e3ba3f7e..91c82297e26 100644
--- a/python/samba/netcmd/domain.py
+++ b/python/samba/netcmd/domain.py
@@ -4182,7 +4182,8 @@ class cmd_domain_schema_upgrade(Command):
stderr=subprocess.PIPE, cwd=temp_folder)
except (OSError, IOError):
shutil.rmtree(temp_folder)
- raise CommandError("Failed to upgrade schema. Check if 'patch' is installed.")
+ raise CommandError("Failed to upgrade schema. "
+ "Is '/usr/bin/patch' missing?")
stdout, stderr = p.communicate()
diff --git a/python/samba_external/README b/python/samba_external/README
deleted file mode 100644
index d6a4dec7b1b..00000000000
--- a/python/samba_external/README
+++ /dev/null
@@ -1,4 +0,0 @@
-This directory is for external python libraries that may not be
-installed on the local system. We always should try to use the
-system version of the library if possible, then use the Samba
-supplied copy if the system copy is unavailable
diff --git a/selftest/gdb_backtrace b/selftest/gdb_backtrace
index 307a4d1e122..0aad62f3233 100755
--- a/selftest/gdb_backtrace
+++ b/selftest/gdb_backtrace
@@ -18,7 +18,6 @@ fi
# we want everything on stderr, so the program is not disturbed
exec 1>&2
-BASENAME=`basename $0`
UNAME=`uname`
PID=$1
diff --git a/source3/libsmb/pylibsmb.c b/source3/libsmb/pylibsmb.c
index 16076485153..b498d3a0f62 100644
--- a/source3/libsmb/pylibsmb.c
+++ b/source3/libsmb/pylibsmb.c
@@ -1330,12 +1330,15 @@ static PyObject *py_cli_notify_get_changes(struct py_cli_notify_state *self,
"name", changes[i].name,
"action", changes[i].action);
if (change == NULL) {
+ Py_XDECREF(result);
TALLOC_FREE(req);
return NULL;
}
ret = PyList_Append(result, change);
+ Py_DECREF(change);
if (ret == -1) {
+ Py_XDECREF(result);
TALLOC_FREE(req);
return NULL;
}
@@ -1754,7 +1757,7 @@ static PyObject *py_smb_get_sd(struct py_cli_state *self, PyObject *args)
req = cli_query_security_descriptor_send(
NULL, self->ev, self->cli, fnum, sinfo);
if (!py_tevent_req_wait_exc(self, req)) {
- return false;
+ return NULL;
}
status = cli_query_security_descriptor_recv(req, NULL, &sd);
PyErr_NTSTATUS_NOT_OK_RAISE(status);
@@ -1787,7 +1790,7 @@ static PyObject *py_smb_set_sd(struct py_cli_state *self, PyObject *args)
req = cli_set_security_descriptor_send(
NULL, self->ev, self->cli, fnum, sinfo, sd);
if (!py_tevent_req_wait_exc(self, req)) {
- return false;
+ return NULL;
}
status = cli_set_security_descriptor_recv(req);
diff --git a/source4/librpc/idl/irpc.idl b/source4/librpc/idl/irpc.idl
index 65ae4b6c5d8..b4517dac00c 100644
--- a/source4/librpc/idl/irpc.idl
+++ b/source4/librpc/idl/irpc.idl
@@ -170,8 +170,8 @@ import "misc.idl", "security.idl", "nbt.idl", "netlogon.idl", "server_id.idl";
******************************************************/
/**
* Force dreplsrv to fefresh internal cache.
- * @param partition_dn Partition to refresh cacheh for.
- * If empy/NULL, refresh all partitions.
+ * @param partition_dn Partition to refresh cache for.
+ * If empty/NULL, refresh all partitions.
*/
WERROR dreplsrv_refresh();
--
Samba Shared Repository
More information about the samba-cvs
mailing list