mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-03-31 14:50:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

allow descriptions in -d for tools as well; test as much as possible about pid/args files in slaptest

Browse Source
This commit is contained in:
Pierangelo Masarati 2005-10-31 18:48:12 +00:00
parent e3b9448bd7
commit e725c8488a
2 changed files with 91 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
servers/slapd/slapcommon.c
View File

@ -245,7 +245,38 @@ slap_tool_init(
break;
case 'd': /* turn on debugging */
ldap_debug += atoi( optarg );
#ifdef LDAP_DEBUG
if ( optarg != NULL && optarg[ 0 ] != '-' && !isdigit( optarg[ 0 ] ) )
{
int level;
if ( str2loglevel( optarg, &level ) ) {
fprintf( stderr,
"unrecognized log level "
"\"%s\"\n", optarg );
exit( EXIT_FAILURE );
}
ldap_debug |= level;
} else {
int level;
char *next = NULL;
level = strtol( optarg, &next, 0 );
if ( next == NULL || next[ 0 ] != '\0' ) {
fprintf( stderr,
"unrecognized log level "
"\"%s\"\n", optarg );
exit( EXIT_FAILURE );
}
ldap_debug |= level;
}
#else
if ( atoi( optarg ) != 0 )
fputs( "must compile with LDAP_DEBUG for debugging\n",
stderr );
#endif
break;
case 'D':

59
servers/slapd/slaptest.c
View File

@ -26,7 +26,10 @@
#include <ac/ctype.h>
#include <ac/string.h>
#include <ac/socket.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <ac/unistd.h>
#include <ac/errno.h>
#include <lber.h>
#include <ldif.h>
@ -34,6 +37,50 @@
#include "slapcommon.h"
static int
test_file( const char *fname, const char *ftype )
{
struct stat st;
int save_errno;
switch ( stat( fname, &st ) ) {
case 0:
if ( !( st.st_mode & S_IWUSR ) ) {
Debug( LDAP_DEBUG_ANY, "%s file "
"\"%s\" exists, but user does not have access\n",
ftype, fname, 0 );
return -1;
}
break;
case -1:
default:
save_errno = errno;
if ( save_errno == ENOENT ) {
FILE *fp = fopen( fname, "w" );
if ( fp == NULL ) {
save_errno = errno;
Debug( LDAP_DEBUG_ANY, "unable to open file "
"\"%s\": %d (%s)\n",
fname,
save_errno, strerror( save_errno ) );
return -1;
}
unlink( fname );
break;
}
Debug( LDAP_DEBUG_ANY, "unable to stat file "
"\"%s\": %d (%s)\n",
slapd_pid_file,
save_errno, strerror( save_errno ) );
return -1;
}
}
int
slaptest( int argc, char **argv )
{
@ -42,6 +89,18 @@ slaptest( int argc, char **argv )
slap_tool_init( progname, SLAPTEST, argc, argv );
if ( slapd_pid_file != NULL ) {
if ( test_file( slapd_pid_file, "pid" ) ) {
return EXIT_FAILURE;
}
}
if ( slapd_args_file != NULL ) {
if ( test_file( slapd_args_file, "args" ) ) {
return EXIT_FAILURE;
}
}
fprintf( stderr, "config file testing succeeded\n");
slap_tool_destroy();