The branch, master has been updated
via f092ac5 Update help text for dbcheck
via 7ab4cef auth/kerberos: Fix typo in error message regarding fetching
PAC using Heimdal
via 8e60505 bugfix memory leak. partition_dn is only used to search and
compare and is not freed at the function end.
from 3451a03 ctdb-scripts: Drop CTDBD_CONF internal test variable
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit f092ac5b6ebbe3a717498fea08d8f4503e3259dc
Author: Jonathan Hunter <jh-...@ninja.org.uk>
Date: Mon Feb 19 07:38:37 2018 +0000
Update help text for dbcheck
Update the help text for dbcheck, to make its behaviour clear (in
particular with reference to the difference between specifying "--yes"
on the command line, and answering "yes"/"all" to each individual
question)
Signed-off-by: Andrew Bartlett <abart...@samba.org>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
Reviewed-by: Garming Sam <garm...@catalyst.net.nz>
Autobuild-User(master): Andrew Bartlett <abart...@samba.org>
Autobuild-Date(master): Mon Mar 19 12:39:12 CET 2018 on sn-devel-144
commit 7ab4ceffb48e8f82057eea9b2eb2eb09d8bc5ddc
Author: Matt Selsky <matthew.sel...@twosigma.com>
Date: Wed Feb 28 01:00:04 2018 -0500
auth/kerberos: Fix typo in error message regarding fetching PAC using
Heimdal
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13311
Signed-off-by: Matt Selsky <matthew.sel...@twosigma.com>
Reviewed-by: Garming Sam <garm...@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
commit 8e6050587bc35601093ac9b71aae8fdbeddbcb73
Author: Andrej Gessel <andrej.ges...@janztec.com>
Date: Wed Apr 12 15:12:49 2017 +0200
bugfix memory leak. partition_dn is only used to search and compare and is
not freed at the function end.
Signed-off-by: Andrej Gessel <andrej.ges...@janztec.com>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
Reviewed-by: Garming Sam <garm...@catalyst.net.nz>
-----------------------------------------------------------------------
Summary of changes:
auth/kerberos/gssapi_pac.c | 2 +-
python/samba/netcmd/dbcheck.py | 2 +-
source4/libnet/libnet_vampire.c | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/auth/kerberos/gssapi_pac.c b/auth/kerberos/gssapi_pac.c
index b695671..e4dad18 100644
--- a/auth/kerberos/gssapi_pac.c
+++ b/auth/kerberos/gssapi_pac.c
@@ -165,7 +165,7 @@ NTSTATUS gssapi_obtain_pac_blob(TALLOC_CTX *mem_ctx,
DEBUG(1, ("unable to obtain a PAC against this GSSAPI library.
"
"GSSAPI secured connections are available only with
Heimdal or MIT Kerberos >= 1.8\n"));
} else if (gss_maj != 0) {
- DEBUG(2, ("obtaining PAC via GSSAPI
gss_inqiure_sec_context_by_oid (Heimdal OID) failed: %s\n",
+ DEBUG(2, ("obtaining PAC via GSSAPI
gss_inquire_sec_context_by_oid (Heimdal OID) failed: %s\n",
gssapi_error_string(mem_ctx, gss_maj, gss_min,
gss_mech_krb5)));
} else {
if (set == GSS_C_NO_BUFFER_SET) {
diff --git a/python/samba/netcmd/dbcheck.py b/python/samba/netcmd/dbcheck.py
index 2217366..aec45d2 100644
--- a/python/samba/netcmd/dbcheck.py
+++ b/python/samba/netcmd/dbcheck.py
@@ -61,7 +61,7 @@ class cmd_dbcheck(Command):
Option("--fix", dest="fix", default=False, action='store_true',
help='Fix any errors found'),
Option("--yes", action='callback', callback=process_yes,
- help="don't confirm changes, just do them all as a single
transaction"),
+ help="don't confirm changes individually. Applies all as a
single transaction (will not succeed if any errors are found)"),
Option("--cross-ncs", dest="cross_ncs", default=False,
action='store_true',
help="cross naming context boundaries"),
Option("-v", "--verbose", dest="verbose", action="store_true",
default=False,
diff --git a/source4/libnet/libnet_vampire.c b/source4/libnet/libnet_vampire.c
index 2871a68..c4ef608 100644
--- a/source4/libnet/libnet_vampire.c
+++ b/source4/libnet/libnet_vampire.c
@@ -694,7 +694,7 @@ WERROR libnet_vampire_cb_store_chunk(void *private_data,
}
s->total_objects += object_count;
- partition_dn = ldb_dn_new(s, s->ldb, c->partition->nc.dn);
+ partition_dn = ldb_dn_new(s_dsa, s->ldb, c->partition->nc.dn);
if (partition_dn == NULL) {
DEBUG(0,("Failed to parse partition DN from DRS.\n"));
return WERR_INVALID_PARAMETER;
@@ -710,7 +710,7 @@ WERROR libnet_vampire_cb_store_chunk(void *private_data,
DEBUG(0,("Exop on[%s] objects[%u] linked_values[%u]\n",
c->partition->nc.dn, s->total_objects,
linked_attributes_count));
}
- ret = dsdb_find_nc_root(s->ldb, s,
+ ret = dsdb_find_nc_root(s->ldb, s_dsa,
partition_dn, &nc_root);
if (ret != LDB_SUCCESS) {
DEBUG(0,(__location__ ": Failed to find nc_root for
%s\n",
--
Samba Shared Repository
