The branch, master has been updated
via eaed0cd9403 s3:lib: Fix a typo in MACRO
via 471163e512c libnet: Fix debug text
via 47f552c6880 s3:librpc: Fix a typo in DEBUG text
via 3e98649aa13 python:tests: Fix spelling in to
test_samba_dnsupdate_no_change
via 20e8e7062cd docs-xml: Mention winbind consistently in
samba-dcerpcd.8
from 8ba8fef8ac4 ctdb-tests: Correctly handle adding a deleted node at
the end
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit eaed0cd940388a37225e76921a0f6836072c20f0
Author: Pavel Filipenský <pfilipen...@samba.org>
Date: Tue Jan 23 10:01:35 2024 +0100
s3:lib: Fix a typo in MACRO
DEBUG_PASSWORDS --> DEBUG_PASSWORD
Signed-off-by: Pavel Filipenský <pfilipen...@samba.org>
Reviewed-by: Reviewed-by: Martin Schwenke <mar...@meltin.net>
Autobuild-User(master): Pavel Filipensky <pfilipen...@samba.org>
Autobuild-Date(master): Wed Jul 17 08:49:46 UTC 2024 on atb-devel-224
commit 471163e512cb37aa00f710f875c310cc11319934
Author: Pavel Filipenský <pfilipen...@samba.org>
Date: Tue Mar 26 21:48:58 2024 +0100
libnet: Fix debug text
Signed-off-by: Pavel Filipenský <pfilipen...@samba.org>
Reviewed-by: Reviewed-by: Martin Schwenke <mar...@meltin.net>
commit 47f552c6880f8b49abe619a59f38e6afe379eb7a
Author: Pavel Filipenský <pfilipen...@samba.org>
Date: Wed Nov 22 13:59:20 2023 +0100
s3:librpc: Fix a typo in DEBUG text
Signed-off-by: Pavel Filipenský <pfilipen...@samba.org>
Reviewed-by: Reviewed-by: Martin Schwenke <mar...@meltin.net>
commit 3e98649aa13df0c5d14c7d75e1ea3a20b4639161
Author: Pavel Filipenský <pfilipen...@samba.org>
Date: Mon Jul 15 10:31:18 2024 +0200
python:tests: Fix spelling in to test_samba_dnsupdate_no_change
Signed-off-by: Pavel Filipenský <pfilipen...@samba.org>
Reviewed-by: Reviewed-by: Martin Schwenke <mar...@meltin.net>
commit 20e8e7062cd3ab81ae3d4f07ade2c2fbaf01dce2
Author: Pavel Filipenský <pfilipen...@samba.org>
Date: Sun May 26 09:04:17 2024 +0200
docs-xml: Mention winbind consistently in samba-dcerpcd.8
Signed-off-by: Pavel Filipenský <pfilipen...@samba.org>
Reviewed-by: Reviewed-by: Martin Schwenke <mar...@meltin.net>
-----------------------------------------------------------------------
Summary of changes:
docs-xml/manpages/samba-dcerpcd.8.xml | 3 ++-
python/samba/tests/blackbox/samba_dnsupdate.py | 4 ++--
source3/lib/smbldap.c | 8 ++++----
source3/librpc/crypto/gse_krb5.c | 4 ++--
source4/libnet/libnet_export_keytab.c | 5 +++--
5 files changed, 13 insertions(+), 11 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/manpages/samba-dcerpcd.8.xml
b/docs-xml/manpages/samba-dcerpcd.8.xml
index 2df4f27c206..38183d31099 100644
--- a/docs-xml/manpages/samba-dcerpcd.8.xml
+++ b/docs-xml/manpages/samba-dcerpcd.8.xml
@@ -190,7 +190,8 @@
<varlistentry>
<term>--ready-signal-fd=<fd></term>
<listitem><para>Report service readiness via this fd
- to <command>smbd</command>. Only for internal use.
+ to <command>smbd</command> or <command>winbind</command>.
+ Only for internal use.
</para></listitem>
</varlistentry>
</variablelist>
diff --git a/python/samba/tests/blackbox/samba_dnsupdate.py
b/python/samba/tests/blackbox/samba_dnsupdate.py
index e326fbb592b..e2c1e1450ee 100644
--- a/python/samba/tests/blackbox/samba_dnsupdate.py
+++ b/python/samba/tests/blackbox/samba_dnsupdate.py
@@ -39,14 +39,14 @@ class SambaDnsUpdateTests(samba.tests.BlackboxTestCase):
except samba.tests.BlackboxProcessError:
pass
- def test_samba_dnsupate_no_change(self):
+ def test_samba_dnsupdate_no_change(self):
try:
out = self.check_output("samba_dnsupdate --verbose")
except samba.tests.BlackboxProcessError as e:
self.fail("Error calling samba_dnsupdate: %s" % e)
self.assertTrue(b"No DNS updates needed" in out, out)
- def test_samba_dnsupate_set_ip(self):
+ def test_samba_dnsupdate_set_ip(self):
try:
out = self.check_output("samba_dnsupdate --verbose
--current-ip=10.0.0.1")
self.assertTrue(b" DNS updates and" in out, out)
diff --git a/source3/lib/smbldap.c b/source3/lib/smbldap.c
index c0d6884a783..9c29aadad59 100644
--- a/source3/lib/smbldap.c
+++ b/source3/lib/smbldap.c
@@ -113,7 +113,7 @@ void smbldap_set_bind_callback(struct smbldap_state *state,
}
ldap_value_free(values);
-#ifdef DEBUG_PASSWORDS
+#ifdef DEBUG_PASSWORD
DEBUG (100, ("smbldap_get_single_attribute: [%s] = [%s]\n", attribute,
value));
#endif
return True;
@@ -153,7 +153,7 @@ void smbldap_set_bind_callback(struct smbldap_state *state,
ldap_value_free(values);
-#ifdef DEBUG_PASSWORDS
+#ifdef DEBUG_PASSWORD
DEBUG (100, ("smbldap_get_single_attribute: [%s] = [%s]\n",
attribute, result));
#endif
@@ -187,7 +187,7 @@ void smbldap_set_bind_callback(struct smbldap_state *state,
ldap_value_free(values);
-#ifdef DEBUG_PASSWORDS
+#ifdef DEBUG_PASSWORD
DEBUG (100, ("smbldap_get_first_attribute: [%s] = [%s]\n",
attribute, result));
#endif
@@ -243,7 +243,7 @@ void smbldap_set_bind_callback(struct smbldap_state *state,
ldap_value_free(values);
-#ifdef DEBUG_PASSWORDS
+#ifdef DEBUG_PASSWORD
DEBUG (100, ("smbldap_get_single_attribute: [%s] = [%s]\n",
attribute, result));
#endif
diff --git a/source3/librpc/crypto/gse_krb5.c b/source3/librpc/crypto/gse_krb5.c
index 0ea3f5b09b8..8e719e1ae0c 100644
--- a/source3/librpc/crypto/gse_krb5.c
+++ b/source3/librpc/crypto/gse_krb5.c
@@ -458,8 +458,8 @@ static krb5_error_code
fill_mem_keytab_from_system_keytab(krb5_context krbctx,
ret = krb5_kt_add_entry(krbctx, *mkeytab, &kt_entry);
if (ret) {
- DEBUG(1, (__location__ ": smb_krb5_unparse_name
"
- "failed (%s)\n", error_message(ret)));
+ DBG_WARNING("krb5_kt_add_entry failed (%s)\n",
+ error_message(ret));
goto out;
}
}
diff --git a/source4/libnet/libnet_export_keytab.c
b/source4/libnet/libnet_export_keytab.c
index 4a5f9268a17..7db14cea128 100644
--- a/source4/libnet/libnet_export_keytab.c
+++ b/source4/libnet/libnet_export_keytab.c
@@ -209,8 +209,9 @@ static NTSTATUS sdb_kt_copy(TALLOC_CTX *mem_ctx,
*error_string =
smb_get_krb5_error_message(context,
code,
mem_ctx);
- DEBUG(0, ("smb_krb5_kt_add_entry failed
code=%d, error = %s\n",
- code, *error_string));
+ DBG_ERR("krb5_kt_add_entry failed "
+ "code=%d, error = %s\n",
+ code, *error_string);
goto done;
}
keys_exported = true;
--
Samba Shared Repository
