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

[openldap] / servers / slurpd / args.c

diff --git a/servers/slurpd/args.c b/servers/slurpd/args.c
index ec4f0b52b707a1c7fe59869469805c98f26295e2..76b3cb8b6272a44a5c0d524c3a76a2a07e5c7acd 100644 (file)
--- a/servers/slurpd/args.c
+++ b/servers/slurpd/args.c
@@ -1,3 +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.
@@ -17,26 +22,28 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <string.h>
-#include <time.h>
 
-#include <lber.h>
+#include <ac/stdlib.h>
+#include <ac/string.h>
+#include <ac/time.h>
+#include <ac/unistd.h>
+
 #include <ldap.h>
 
 #include "slurp.h"
 #include "globals.h"
 
 
-static int
+static void
 usage( char *name )
 {
     fprintf( stderr, "usage: %s\t[-d debug-level] [-s syslog-level]\n", name );
     fprintf( stderr, "\t\t[-f slapd-config-file] [-r replication-log-file]\n" );
-#ifdef KERBEROS
+#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND
     fprintf( stderr, "\t\t[-t tmp-dir] [-o] [-k srvtab-file]\n" );
-#else /* KERBEROS */
+#else /* LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND */
     fprintf( stderr, "\t\t[-t tmp-dir] [-o]\n" );
-#endif /* KERBEROS */
+#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND */
 }
 
 
@@ -52,20 +59,20 @@ doargs(
 )
 {
     int                i;
-    extern char        *optarg;
     int                rflag = 0;
 
-    if ( (g->myname = strrchr( argv[0], '/' )) == NULL ) {
+    if ( (g->myname = strrchr( argv[0], LDAP_DIRSEP[0] )) == NULL ) {
        g->myname = strdup( argv[0] );
     } else {
        g->myname = strdup( g->myname + 1 );
     }
 
-    while ( (i = getopt( argc, argv, "hd:f:r:t:k:o" )) != EOF ) {
+    while ( (i = getopt( argc, argv, "d:f:or:t:" )) != EOF ) {
        switch ( i ) {
-#ifdef LDAP_DEBUG
-       case 'd':       /* turn on debugging */
+       case 'd':       /* set debug level and 'do not detach' flag */
+           g->no_detach = 1;
            if ( optarg[0] == '?' ) {
+#ifdef LDAP_DEBUG
                printf( "Debug levels:\n" );
                printf( "\tLDAP_DEBUG_TRACE\t%d\n",
                        LDAP_DEBUG_TRACE );
@@ -85,39 +92,37 @@ doargs(
                        LDAP_DEBUG_ACL );
                printf( "\tLDAP_DEBUG_ANY\t\t%d\n",
                        LDAP_DEBUG_ANY );
+               puts( "\tThe -d flag also prevents slurpd from detaching." );
+#endif /* LDAP_DEBUG */
+               puts( "\tDebugging is disabled.  -d 0 prevents slurpd from detaching." );
                return( -1 );
-           } else {
-               ldap_debug = atoi( optarg );
            }
-           break;
-#else /* LDAP_DEBUG */
-       case 'd':       /* can't enable debugging - not built with debug code */
-           fprintf( stderr, "must compile with LDAP_DEBUG for debugging\n" );
-           break;
+#ifdef LDAP_DEBUG
+           ldap_debug |= atoi( optarg );
+#else /* !LDAP_DEBUG */
+           if ( atoi( optarg ) != 0 )
+               /* can't enable debugging - not built with debug code */
+               fputs( "must compile with LDAP_DEBUG for debugging\n",
+                      stderr );
 #endif /* LDAP_DEBUG */
+           break;
        case 'f':       /* slapd config file */
            g->slapd_configfile = strdup( optarg );
            break;
-       case 'r':       /* slapd replog file */
-           strcpy( g->slapd_replogfile, optarg );
-           rflag++;
-           break;
-       case 't':       /* dir to use for our copies of replogs */
-           g->slurpd_rdir = strdup( optarg );
-           break;
-       case 'k':       /* name of kerberos srvtab file */
-#ifdef KERBEROS
-           g->default_srvtab = strdup( optarg );
-#else /* KERBEROS */
-           fprintf( stderr, "must compile with KERBEROS to use -k option\n" );
-#endif /* KERBEROS */
-           break;
-       case 'h':
-           usage( g->myname );
-           return( -1 );
        case 'o':
            g->one_shot_mode = 1;
            break;
+       case 'r':       /* slapd replog file */
+               snprintf( g->slapd_replogfile, sizeof g->slapd_replogfile,
+                       "%s", optarg );
+           rflag++;
+           break;
+       case 't': {     /* dir to use for our copies of replogs */
+               size_t sz;
+           g->slurpd_rdir = (char *)malloc (sz = (strlen(optarg) + sizeof("/replica")));
+           snprintf(g->slurpd_rdir, sz,
+                       "%s" LDAP_DIRSEP "replica", optarg);
+           } break;
        default:
            usage( g->myname );
            return( -1 );
@@ -131,21 +136,24 @@ doargs(
     }
 
     /* Set location/name of our private copy of the slapd replog file */
-    sprintf( g->slurpd_replogfile, "%s/%s", g->slurpd_rdir,
+    snprintf( g->slurpd_replogfile, sizeof g->slurpd_replogfile,
+               "%s" LDAP_DIRSEP "%s", g->slurpd_rdir,
            DEFAULT_SLURPD_REPLOGFILE );
 
     /* Set location/name of the slurpd status file */
-    sprintf( g->slurpd_status_file, "%s/%s", g->slurpd_rdir,
+    snprintf( g->slurpd_status_file, sizeof g->slurpd_status_file,
+               "%s" LDAP_DIRSEP "%s", g->slurpd_rdir,
            DEFAULT_SLURPD_STATUS_FILE );
 
+       ber_set_option(NULL, LBER_OPT_DEBUG_LEVEL, &ldap_debug);
+       ldap_set_option(NULL, LDAP_OPT_DEBUG_LEVEL, &ldap_debug);
+       ldif_debug = ldap_debug;
+
 #ifdef LOG_LOCAL4
     openlog( g->myname, OPENLOG_OPTIONS, LOG_LOCAL4 );
-#else
+#elif LOG_DEBUG
     openlog( g->myname, OPENLOG_OPTIONS );
 #endif
 
     return 0;
-
 }
-
-