From 7183e5811e00b650bd271c765562b9dcea8e2d09 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Mon, 28 Jan 2008 14:47:01 +0100 Subject: Add support for LDAP debug output in Samba log file. Logging of the ldap libraries appears with a [LDAP] prefix inside the samba logs. This is controlled by two new parameters: * "ldap debug level" sets the debug level of the ldap libraries. It is the bit-field as understood by the openldap server. * "ldap debug threshold" is the samba debug level at which ldap logging appears inside the samba logs. This probably needs some configure tests since it makes use of the LBER_OPT_LOG_PRINT_FN option to redirect the debug output of the ldap libraries. Michael (This used to be commit 15c25990bd0bfa3145ab3c26d2bdda72993d005c) --- source3/lib/ldap_debug_handler.c | 52 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 source3/lib/ldap_debug_handler.c (limited to 'source3/lib/ldap_debug_handler.c') diff --git a/source3/lib/ldap_debug_handler.c b/source3/lib/ldap_debug_handler.c new file mode 100644 index 0000000000..88d0c0beec --- /dev/null +++ b/source3/lib/ldap_debug_handler.c @@ -0,0 +1,52 @@ +/* + * Unix SMB/CIFS implementation. + * Intercept libldap debug output. + * Copyright (C) Michael Adam 2008 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation; either version 3 of the License, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, see . + */ + +#include "includes.h" + +#if HAVE_LDAP + +static void samba_ldap_log_print_fn(LDAP_CONST char *data) +{ + DEBUG(lp_ldap_debug_threshold(), ("[LDAP] %s", data)); +} + +#endif + +void init_ldap_debugging(void) +{ +#if HAVE_LDAP + int ret; + int ldap_debug_level = lp_ldap_debug_level(); + + ret = ldap_set_option(NULL, LDAP_OPT_DEBUG_LEVEL, &ldap_debug_level); + if (ret != LDAP_OPT_SUCCESS) { + DEBUG(10, ("Error setting LDAP debug level.\n")); + } + + if (ldap_debug_level == 0) { + return; + } + + ret = ber_set_option(NULL, LBER_OPT_LOG_PRINT_FN, + (void *)samba_ldap_log_print_fn); + if (ret != LBER_OPT_SUCCESS) { + DEBUG(10, ("Error setting LBER log print function.\n")); + } +#endif /* HAVE_LDAP */ +} -- cgit From b7989e2ac76f3cffb30d2b41620a8f7d97d2b70b Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Wed, 6 Feb 2008 18:16:03 +0100 Subject: Add configure check for LBER_LOG_PRINT_FN - to intercept ldap debug. Use the resulting HAVE_LBER_LOG_PRINT_FN to determine whether we can use it in init_ldap_debugging to intercept LDAP debug output and print it out in the samba logs (controlled with "ldap debug level"). Michael (This used to be commit 8dfc389ff678967a7b16ff1d68f00468a9925275) --- source3/lib/ldap_debug_handler.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/lib/ldap_debug_handler.c') diff --git a/source3/lib/ldap_debug_handler.c b/source3/lib/ldap_debug_handler.c index 88d0c0beec..2181ff014d 100644 --- a/source3/lib/ldap_debug_handler.c +++ b/source3/lib/ldap_debug_handler.c @@ -30,7 +30,7 @@ static void samba_ldap_log_print_fn(LDAP_CONST char *data) void init_ldap_debugging(void) { -#if HAVE_LDAP +#if defined(HAVE_LDAP) && defined(HAVE_LBER_LOG_PRINT_FN) int ret; int ldap_debug_level = lp_ldap_debug_level(); @@ -48,5 +48,5 @@ void init_ldap_debugging(void) if (ret != LBER_OPT_SUCCESS) { DEBUG(10, ("Error setting LBER log print function.\n")); } -#endif /* HAVE_LDAP */ +#endif /* HAVE_LDAP && HAVE_LBER_LOG_PRINT_FN */ } -- cgit