fix -h option example for multi-URI handling (as suggested by Roland Bauerschmidt...

[openldap] / servers / slurpd / sanity.c

diff --git a/servers/slurpd/sanity.c b/servers/slurpd/sanity.c
index 56886ff420ccef02d05a09bdfbf58b8b59d49cb4..85103257336cff478078f745207bdc0fc8720a4c 100644 (file)
--- a/servers/slurpd/sanity.c
+++ b/servers/slurpd/sanity.c
@@ -1,4 +1,8 @@
 /* $OpenLDAP$ */
+/*
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 /*
  * Copyright (c) 1996 Regents of the University of Michigan.
  * All rights reserved.
@@ -23,6 +27,7 @@
 
 #include <stdio.h>
 
+#include <ac/stdlib.h>
 #include <ac/unistd.h>
 #include <ac/string.h>
 
@@ -66,7 +71,7 @@ sanity( void )
      * Are there any replicas listed in the slapd config file?
      */
     if ( sglob->replicas == NULL ) {
-       fprintf( stderr, "No replicas in slapd config file \"%s\"!\n",
+       fprintf( stderr, "No replicas in slapd.conf file \"%s\"!\n",
            sglob->slapd_configfile );
        err++;
     }
@@ -76,20 +81,24 @@ sanity( void )
      * that the slapd replogfile is readable, if it exists.
      */
     if ( sglob->slapd_replogfile == NULL ) {
-       fprintf( stderr, "Fatal error: no \"replogfile\" directive given\n" );
+       fprintf( stderr, "Fatal error: no \"replogfile\" "
+               "slapd.conf directive given\n" );
        err++;
     } else {
        rc = filecheck( sglob->slapd_replogfile );
        if ( rc & FC_DIRBAD ) {
-           fprintf( stderr, "Error: %s: directory does not exist\n", 
+           fprintf( stderr, "Error: %s: directory specified in "
+                       "\"replogfile\" slapd.conf directive does not exist\n", 
                    sglob->slapd_replogfile );
            err++;
        } else if ( rc & FC_DIRUNREAD ) {
-           fprintf( stderr, "Error: %s: directory not readable\n", 
+           fprintf( stderr, "Error: %s: directory specified in "
+                       "\"replogfile\" slapd.conf directive is not readable\n", 
                    sglob->slapd_replogfile );
            err++;
        } else if (!( rc & FC_FILEBAD) && ( rc & FC_FILEUNREAD )) {
-           fprintf( stderr, "Error: %s: file not readable\n", 
+           fprintf( stderr, "Error: %s: file specified in "
+                       "\"replogfile\" slapd.conf directive is not readable\n", 
                    sglob->slapd_replogfile );
            err++;
        }
@@ -105,19 +114,21 @@ sanity( void )
     } else {
        rc = filecheck( sglob->slurpd_replogfile );
        if ( rc & FC_DIRBAD ) {
-           fprintf( stderr, "Error: %s: directory does not exist\n", 
+           fprintf( stderr, "Error: %s: slurpd \"replogfile\" "
+                       "directory does not exist\n", 
                    sglob->slurpd_replogfile );
            err++;
        } else if ( rc & FC_DIRUNREAD ) {
-           fprintf( stderr, "Error: %s: directory not readable\n", 
+           fprintf( stderr, "Error: %s: slurpd \"replogfile\" "
+                       "directory not readable\n", 
                    sglob->slurpd_replogfile );
            err++;
        } else if ( !( rc & FC_FILEBAD ) && ( rc & FC_FILEUNREAD )) {
-           fprintf( stderr, "Error: %s: file not readable\n", 
+           fprintf( stderr, "Error: %s: slurpd \"replogfile\" not readable\n", 
                    sglob->slurpd_replogfile );
            err++;
        } else if ( !( rc & FC_FILEBAD ) && ( rc & FC_FILEUNWRITE )) {
-           fprintf( stderr, "Error: %s: file not writeable\n", 
+           fprintf( stderr, "Error: %s: slurpd \"replogfile\" not writeable\n", 
                    sglob->slurpd_replogfile );
            err++;
        }
@@ -129,19 +140,19 @@ sanity( void )
      */
     rc = filecheck( sglob->slurpd_status_file );
     if ( rc & FC_DIRBAD ) {
-       fprintf( stderr, "Error: %s: directory does not exist\n", 
+       fprintf( stderr, "Error: %s: status directory does not exist\n", 
                sglob->slurpd_status_file );
        err++;
     } else if ( rc & FC_DIRUNREAD ) {
-       fprintf( stderr, "Error: %s: directory not readable\n", 
+       fprintf( stderr, "Error: %s: status directory not readable\n", 
                sglob->slurpd_status_file );
        err++;
     } else if ( !( rc & FC_FILEBAD ) && ( rc & FC_FILEUNREAD )) {
-       fprintf( stderr, "Error: %s: file not readable\n", 
+       fprintf( stderr, "Error: %s: status file not readable\n", 
                sglob->slurpd_status_file );
        err++;
     } else if ( !( rc & FC_FILEBAD ) && ( rc & FC_FILEUNWRITE )) {
-       fprintf( stderr, "Error: %s: file not writeable\n", 
+       fprintf( stderr, "Error: %s: status file not writeable\n", 
                sglob->slurpd_status_file );
        err++;
     }
@@ -174,8 +185,8 @@ filecheck(
     char               *p;
     unsigned int       ret = 0;
 
-    strcpy( dir, sglob->slapd_replogfile );
-    p = strrchr( dir, '/' );
+       snprintf( dir, sizeof dir, "%s", f );
+    p = strrchr( dir, LDAP_DIRSEP[0] );
     if ( p != NULL ) {
        *p = '\0';
     }