mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

tools log level defaults to "none", so that messages logged with LDAP_DEBUG_ANY show up by default; use "-d 0" to reset (addresses ITS#4044)

Browse Source
This commit is contained in:
Pierangelo Masarati 2005-11-09 11:53:34 +00:00
parent d88ea9d609
commit 6315ac9db6
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
servers/slapd/slapcommon.c
View File

@ -180,6 +180,12 @@ slap_tool_init(
int truncatemode = 0; int truncatemode = 0;
int use_glue = 1; int use_glue = 1;
#ifdef LDAP_DEBUG
/* tools default to "none", so that at least LDAP_DEBUG_ANY
* messages show up; use -d 0 to reset */
ldap_debug = LDAP_DEBUG_NONE;
#endif
#ifdef CSRIMALLOC #ifdef CSRIMALLOC
leakfilename = malloc( strlen( progname ) + STRLENOF( ".leak" ) + 1 ); leakfilename = malloc( strlen( progname ) + STRLENOF( ".leak" ) + 1 );
sprintf( leakfilename, "%s.leak", progname ); sprintf( leakfilename, "%s.leak", progname );
@ -245,11 +251,12 @@ slap_tool_init(
break; break;
case 'd': /* turn on debugging */ case 'd': /* turn on debugging */
{
#ifdef LDAP_DEBUG #ifdef LDAP_DEBUG
int level;
if ( optarg != NULL && optarg[ 0 ] != '-' && !isdigit( optarg[ 0 ] ) ) if ( optarg != NULL && optarg[ 0 ] != '-' && !isdigit( optarg[ 0 ] ) )
{ {
int level;
if ( str2loglevel( optarg, &level ) ) { if ( str2loglevel( optarg, &level ) ) {
fprintf( stderr, fprintf( stderr,
"unrecognized log level " "unrecognized log level "
@ -257,10 +264,7 @@ slap_tool_init(
exit( EXIT_FAILURE ); exit( EXIT_FAILURE );
} }
ldap_debug |= level;
} else { } else {
int level;
char *next = NULL; char *next = NULL;
level = strtol( optarg, &next, 0 ); level = strtol( optarg, &next, 0 );
@ -270,14 +274,20 @@ slap_tool_init(
"\"%s\"\n", optarg ); "\"%s\"\n", optarg );
exit( EXIT_FAILURE ); exit( EXIT_FAILURE );
} }
}
if ( level ) {
ldap_debug |= level; ldap_debug |= level;
} else {
/* allow to reset log level */
ldap_debug = 0;
} }
#else #else
if ( atoi( optarg ) != 0 ) if ( atoi( optarg ) != 0 )
fputs( "must compile with LDAP_DEBUG for debugging\n", fputs( "must compile with LDAP_DEBUG for debugging\n",
stderr ); stderr );
#endif #endif
break; } break;
case 'D': case 'D':
ber_str2bv( optarg, 0, 1, &authcDN ); ber_str2bv( optarg, 0, 1, &authcDN );