The branch, master has been updated
via f2472f48f53 s3/pdb: fix debug message typos
via 5e9a25ae28f ctdb/doc: fix some double-word typos
from c3ba556f52b libcli:auth: Use generate_secret_buffer() for netlogon
challenge
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit f2472f48f536daa5a21ba2787c342fceb3b400d3
Author: David Disseldorp <dd...@samba.org>
Date: Mon Aug 12 14:35:37 2019 +0200
s3/pdb: fix debug message typos
Signed-off-by: David Disseldorp <dd...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
Autobuild-User(master): Jeremy Allison <j...@samba.org>
Autobuild-Date(master): Tue Aug 13 00:42:09 UTC 2019 on sn-devel-184
commit 5e9a25ae28f465fb47f18184983cc74d75e15353
Author: David Disseldorp <dd...@samba.org>
Date: Mon Aug 12 14:32:47 2019 +0200
ctdb/doc: fix some double-word typos
Signed-off-by: David Disseldorp <dd...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
ctdb/doc/ctdb-statistics.7.xml | 2 +-
ctdb/doc/ctdb-tunables.7.xml | 2 +-
ctdb/doc/ctdb.1.xml | 4 ++--
ctdb/doc/ctdb.conf.5.xml | 2 +-
source3/passdb/pdb_samba_dsdb.c | 22 ++++++++++------------
5 files changed, 15 insertions(+), 17 deletions(-)
Changeset truncated at 500 lines:
diff --git a/ctdb/doc/ctdb-statistics.7.xml b/ctdb/doc/ctdb-statistics.7.xml
index 0cef102e5dd..4b152423f3c 100644
--- a/ctdb/doc/ctdb-statistics.7.xml
+++ b/ctdb/doc/ctdb-statistics.7.xml
@@ -123,7 +123,7 @@ Statistics collected since : (000 01:49:20) Fri Sep 12
11:43:12 2014
<refsect2>
<title>frozen</title>
<para>
- 1 if the the databases are currently frozen, 0 otherwise.
+ 1 if the databases are currently frozen, 0 otherwise.
</para>
</refsect2>
diff --git a/ctdb/doc/ctdb-tunables.7.xml b/ctdb/doc/ctdb-tunables.7.xml
index 71cb0e31142..191bcaffe46 100644
--- a/ctdb/doc/ctdb-tunables.7.xml
+++ b/ctdb/doc/ctdb-tunables.7.xml
@@ -81,7 +81,7 @@ MonitorInterval=20
</para>
<para>
For version checking, CTDB uses major and minor version.
- For example, CTDB 4.6.1 and CTDB CTDB 4.6.2 are matching versions;
+ For example, CTDB 4.6.1 and CTDB 4.6.2 are matching versions;
CTDB 4.5.x and CTDB 4.6.y do not match.
</para>
<para>
diff --git a/ctdb/doc/ctdb.1.xml b/ctdb/doc/ctdb.1.xml
index 355547af41e..acb8f88691e 100644
--- a/ctdb/doc/ctdb.1.xml
+++ b/ctdb/doc/ctdb.1.xml
@@ -235,7 +235,7 @@
</para>
<para>
- Note: If the the queried node is INACTIVE then the status
+ Note: If the queried node is INACTIVE then the status
might not be current.
</para>
@@ -403,7 +403,7 @@ pnn:1 10.0.0.31 OK
</para>
<para>
- Note: If the the queried node is INACTIVE then the status
+ Note: If the queried node is INACTIVE then the status
might not be current.
</para>
</refsect2>
diff --git a/ctdb/doc/ctdb.conf.5.xml b/ctdb/doc/ctdb.conf.5.xml
index 01c09bf53be..f4ef9599d9c 100644
--- a/ctdb/doc/ctdb.conf.5.xml
+++ b/ctdb/doc/ctdb.conf.5.xml
@@ -442,7 +442,7 @@
</para>
<para>
To allow the node to take part in the cluster it must be
- manually continued with the the <command>ctdb
+ manually continued with the <command>ctdb
continue</command> command.
</para>
<para>
diff --git a/source3/passdb/pdb_samba_dsdb.c b/source3/passdb/pdb_samba_dsdb.c
index 0753d38b5f6..351881722e6 100644
--- a/source3/passdb/pdb_samba_dsdb.c
+++ b/source3/passdb/pdb_samba_dsdb.c
@@ -2238,17 +2238,16 @@ static bool pdb_samba_dsdb_get_trusteddom_pw(struct
pdb_methods *m,
trust_direction_flags = ldb_msg_find_attr_as_int(msg, "trustDirection",
0);
if (!(trust_direction_flags & LSA_TRUST_DIRECTION_OUTBOUND)) {
- DEBUG(2, ("Trusted domain %s is is not an outbound trust.\n",
- domain));
+ DBG_WARNING("Trusted domain %s is not an outbound trust.\n",
+ domain);
TALLOC_FREE(tmp_ctx);
return false;
}
trust_type = ldb_msg_find_attr_as_int(msg, "trustType", 0);
if (trust_type == LSA_TRUST_TYPE_MIT) {
- DEBUG(1, ("Trusted domain %s is is not an AD trust "
- "(trustType == LSA_TRUST_TYPE_MIT).\n",
- domain));
+ DBG_WARNING("Trusted domain %s is not an AD trust "
+ "(trustType == LSA_TRUST_TYPE_MIT).\n", domain);
TALLOC_FREE(tmp_ctx);
return false;
}
@@ -2393,17 +2392,16 @@ static NTSTATUS
pdb_samba_dsdb_get_trusteddom_creds(struct pdb_methods *m,
trust_direction_flags = ldb_msg_find_attr_as_int(msg, "trustDirection",
0);
if (!(trust_direction_flags & LSA_TRUST_DIRECTION_OUTBOUND)) {
- DEBUG(2, ("Trusted domain %s is is not an outbound trust.\n",
- domain));
+ DBG_WARNING("Trusted domain %s is not an outbound trust.\n",
+ domain);
TALLOC_FREE(tmp_ctx);
return NT_STATUS_CANT_ACCESS_DOMAIN_INFO;
}
trust_type = ldb_msg_find_attr_as_int(msg, "trustType", 0);
if (trust_type == LSA_TRUST_TYPE_MIT) {
- DEBUG(1, ("Trusted domain %s is is not an AD trust "
- "(trustType == LSA_TRUST_TYPE_MIT).\n",
- domain));
+ DBG_WARNING("Trusted domain %s is not an AD trust "
+ "(trustType == LSA_TRUST_TYPE_MIT).\n", domain);
TALLOC_FREE(tmp_ctx);
return NT_STATUS_CANT_ACCESS_DOMAIN_INFO;
}
@@ -2680,8 +2678,8 @@ static bool pdb_samba_dsdb_set_trusteddom_pw(struct
pdb_methods *m,
trust_direction_flags = ldb_msg_find_attr_as_int(msg, "trustDirection",
0);
if (!(trust_direction_flags & LSA_TRUST_DIRECTION_OUTBOUND)) {
- DEBUG(2, ("Trusted domain %s is is not an outbound trust, can't
set a password.\n",
- domain));
+ DBG_WARNING("Trusted domain %s is not an outbound trust, can't
set a password.\n",
+ domain);
TALLOC_FREE(tmp_ctx);
ldb_transaction_cancel(state->ldb);
return false;
--
Samba Shared Repository
