The branch, master has been updated
via 3d2dd6296d5 lib util asn1: modernize debug calls
via 79b371da805 s4 ldap_server: modernize debug calls
from 04da0c344ea test: Make local.event.*.fd1 a bit less flapping
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 3d2dd6296d51f8ee21e5836aae39f7f4a38c0604
Author: Gary Lockyer <g...@catalyst.net.nz>
Date: Wed May 6 09:11:55 2020 +1200
lib util asn1: modernize debug calls
Replace DEBUG(0 with DBG_ERR(
Signed-off-by: Gary Lockyer <g...@catalyst.net.nz>
Reviewed-by: Volker Lendecke <v...@samba.org>
Autobuild-User(master): Gary Lockyer <g...@samba.org>
Autobuild-Date(master): Wed May 6 22:53:02 UTC 2020 on sn-devel-184
commit 79b371da805af305d51aa324eaa1a9c318158515
Author: Gary Lockyer <g...@catalyst.net.nz>
Date: Wed May 6 09:10:32 2020 +1200
s4 ldap_server: modernize debug calls
Replace DEBUG(0 with DBG_ERR(
Signed-off-by: Gary Lockyer <g...@catalyst.net.nz>
Reviewed-by: Volker Lendecke <v...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
lib/util/asn1.c | 2 +-
source4/ldap_server/ldap_server.c | 32 ++++++++++++++++----------------
2 files changed, 17 insertions(+), 17 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/util/asn1.c b/lib/util/asn1.c
index dc3f43f33f4..397f6b3c271 100644
--- a/lib/util/asn1.c
+++ b/lib/util/asn1.c
@@ -45,7 +45,7 @@ struct asn1_data *asn1_init(TALLOC_CTX *mem_ctx, unsigned
max_depth)
{
struct asn1_data *ret = talloc_zero(mem_ctx, struct asn1_data);
if (ret == NULL) {
- DEBUG(0,("asn1_init failed! out of memory\n"));
+ DBG_ERR("asn1_init failed! out of memory\n");
return ret;
}
ret->max_depth = max_depth;
diff --git a/source4/ldap_server/ldap_server.c
b/source4/ldap_server/ldap_server.c
index a9b162b284e..ee82a30912f 100644
--- a/source4/ldap_server/ldap_server.c
+++ b/source4/ldap_server/ldap_server.c
@@ -256,7 +256,7 @@ static int ldapsrv_load_limits(struct ldapsrv_connection
*conn)
return 0;
failed:
- DEBUG(0, ("Failed to load ldap server query policies\n"));
+ DBG_ERR("Failed to load ldap server query policies\n");
talloc_free(tmp_ctx);
return -1;
}
@@ -1116,8 +1116,8 @@ static NTSTATUS add_socket(struct task_server *task,
lpcfg_socket_options(lp_ctx),
ldap_service, task->process_context);
if (!NT_STATUS_IS_OK(status)) {
- DEBUG(0,("ldapsrv failed to bind to %s:%u - %s\n",
- address, port, nt_errstr(status)));
+ DBG_ERR("ldapsrv failed to bind to %s:%u - %s\n",
+ address, port, nt_errstr(status));
return status;
}
@@ -1132,8 +1132,8 @@ static NTSTATUS add_socket(struct task_server *task,
ldap_service,
task->process_context);
if (!NT_STATUS_IS_OK(status)) {
- DEBUG(0,("ldapsrv failed to bind to %s:%u - %s\n",
- address, port, nt_errstr(status)));
+ DBG_ERR("ldapsrv failed to bind to %s:%u - %s\n",
+ address, port, nt_errstr(status));
return status;
}
}
@@ -1159,8 +1159,8 @@ static NTSTATUS add_socket(struct task_server *task,
ldap_service,
task->process_context);
if (!NT_STATUS_IS_OK(status)) {
- DEBUG(0,("ldapsrv failed to bind to %s:%u - %s\n",
- address, port, nt_errstr(status)));
+ DBG_ERR("ldapsrv failed to bind to %s:%u - %s\n",
+ address, port, nt_errstr(status));
return status;
}
if (tstream_tls_params_enabled(ldap_service->tls_params)) {
@@ -1174,8 +1174,8 @@ static NTSTATUS add_socket(struct task_server *task,
ldap_service,
task->process_context);
if (!NT_STATUS_IS_OK(status)) {
- DEBUG(0,("ldapsrv failed to bind to %s:%u -
%s\n",
- address, port, nt_errstr(status)));
+ DBG_ERR("ldapsrv failed to bind to %s:%u -
%s\n",
+ address, port, nt_errstr(status));
return status;
}
}
@@ -1244,8 +1244,8 @@ static NTSTATUS ldapsrv_task_init(struct task_server
*task)
lpcfg_tls_priority(task->lp_ctx),
&ldap_service->tls_params);
if (!NT_STATUS_IS_OK(status)) {
- DEBUG(0,("ldapsrv failed tstream_tls_params_server - %s\n",
- nt_errstr(status)));
+ DBG_ERR("ldapsrv failed tstream_tls_params_server - %s\n",
+ nt_errstr(status));
goto failed;
}
@@ -1279,7 +1279,7 @@ static NTSTATUS ldapsrv_task_init(struct task_server
*task)
size_t num_binds = 0;
wcard = iface_list_wildcard(task);
if (wcard == NULL) {
- DEBUG(0,("No wildcard addresses available\n"));
+ DBG_ERR("No wildcard addresses available\n");
status = NT_STATUS_UNSUCCESSFUL;
goto failed;
}
@@ -1310,8 +1310,8 @@ static NTSTATUS ldapsrv_task_init(struct task_server
*task)
ldap_service, task->process_context);
talloc_free(ldapi_path);
if (!NT_STATUS_IS_OK(status)) {
- DEBUG(0,("ldapsrv failed to bind to %s - %s\n",
- ldapi_path, nt_errstr(status)));
+ DBG_ERR("ldapsrv failed to bind to %s - %s\n",
+ ldapi_path, nt_errstr(status));
}
#ifdef WITH_LDAPI_PRIV_SOCKET
@@ -1344,8 +1344,8 @@ static NTSTATUS ldapsrv_task_init(struct task_server
*task)
task->process_context);
talloc_free(ldapi_path);
if (!NT_STATUS_IS_OK(status)) {
- DEBUG(0,("ldapsrv failed to bind to %s - %s\n",
- ldapi_path, nt_errstr(status)));
+ DBG_ERR("ldapsrv failed to bind to %s - %s\n",
+ ldapi_path, nt_errstr(status));
}
#endif
--
Samba Shared Repository
