upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-03 05:30:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix compilation without debugging (ITS#4245)

Browse source
This commit is contained in:
Pierangelo Masarati 2005-12-05 10:39:38 +00:00
parent 3165691cbf
commit 2422e6aaab
2 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
servers/slapd/main.c
View file

@ -389,22 +389,27 @@ int main( int argc, char **argv )
LDAP_STAILQ_INSERT_TAIL( &slap_sync_cookie, scp, sc_next );
break;
case 'd': /* set debug level and 'do not detach' flag */
case 'd': { /* set debug level and 'do not detach' flag */
int level = 0;
no_detach = 1;
#ifdef LDAP_DEBUG
if ( optarg != NULL && optarg[ 0 ] != '-' && !isdigit( optarg[ 0 ] ) )
{
int level, i, goterr = 0;
int i, goterr = 0;
char **levels;
levels = ldap_str2charray( optarg, "," );
for ( i = 0; levels[ i ] != NULL; i++ ) {
level = 0;
if ( str2loglevel( levels[ i ], &level ) ) {
fprintf( stderr,
"unrecognized log level "
"\"%s\"\n", levels[ i ] );
goterr = 1;
/* but keep parsing... */
} else {
slap_debug |= level;
@ -418,8 +423,6 @@ int main( int argc, char **argv )
}
} else {
int level;
if ( lutil_atoix( &level, optarg, 0 ) != 0 ) {
fprintf( stderr,
"unrecognized log level "
@ -433,7 +436,7 @@ int main( int argc, char **argv )
fputs( "must compile with LDAP_DEBUG for debugging\n",
stderr );
#endif
break;
} break;
case 'f': /* read config file */
configfile = ch_strdup( optarg );

19
servers/slapd/slapcommon.c
View file

@ -262,25 +262,31 @@ slap_tool_init(
continuemode++;
break;
case 'd': /* turn on debugging */
case 'd': { /* turn on debugging */
int level = 0;
#ifdef LDAP_DEBUG
if ( optarg != NULL && optarg[ 0 ] != '-' && !isdigit( optarg[ 0 ] ) )
{
int level, i, goterr = 0;
int i, goterr = 0;
char **levels;
levels = ldap_str2charray( optarg, "," );
for ( i = 0; levels[ i ] != NULL; i++ ) {
level = 0;
if ( str2loglevel( levels[ i ], &level ) ) {
fprintf( stderr,
"unrecognized log level "
"\"%s\"\n", levels[ i ] );
goterr = 1;
/* but keep parsing... */
} else {
if ( level ) {
if ( level != 0 ) {
slap_debug |= level;
} else {
/* allow to reset log level */
slap_debug = 0;
@ -295,8 +301,6 @@ slap_tool_init(
}
} else {
int level;
if ( lutil_atoix( &level, optarg, 0 ) != 0 ) {
fprintf( stderr,
"unrecognized log level "
@ -304,8 +308,9 @@ slap_tool_init(
usage( tool, progname );
}
if ( level ) {
if ( level != 0 ) {
slap_debug |= level;
} else {
/* allow to reset log level */
slap_debug = 0;
@ -316,7 +321,7 @@ slap_tool_init(
fputs( "must compile with LDAP_DEBUG for debugging\n",
stderr );
#endif
break;
} break;
case 'D':
ber_str2bv( optarg, 0, 1, &authcDN );