X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslurpd%2Fargs.c;h=9d9a6baa2e3ac7edc4f5ab6fa380319a13dd76b5;hb=d84ffb62a6c7528ef711547194307af629e0d082;hp=fcc7b40bd752ab81b0c80187b211920621387cf6;hpb=b3ac184962ad777904b21689beb8ad3098aae578;p=openldap
diff --git a/servers/slurpd/args.c b/servers/slurpd/args.c
index fcc7b40bd7..9d9a6baa2e 100644
--- a/servers/slurpd/args.c
+++ b/servers/slurpd/args.c
@@ -1,5 +1,18 @@
-/*
- * Copyright (c) 1996 Regents of the University of Michigan.
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 1998-2005 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * .
+ */
+/* Portions Copyright (c) 1996 Regents of the University of Michigan.
* All rights reserved.
*
* Redistribution and use in source and binary forms are permitted
@@ -9,32 +22,42 @@
* software without specific prior written permission. This software
* is provided ``as is'' without express or implied warranty.
*/
+/* ACKNOWLEDGEMENTS:
+ * This work was originally developed by the University of Michigan
+ * (as part of U-MICH LDAP).
+ */
/*
* args.c - process command-line arguments, and set appropriate globals.
*/
+#include "portable.h"
+
#include
-#include
-#include
-#include
+#include
+#include
+#include
+#include
+
#include
+#include
#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 */
+ fprintf( stderr, "\t\t[-n service-name]\n" );
}
@@ -50,20 +73,17 @@ doargs(
)
{
int i;
- extern char *optarg;
int rflag = 0;
- if ( (g->myname = strrchr( argv[0], '/' )) == NULL ) {
- g->myname = strdup( argv[0] );
- } else {
- g->myname = strdup( g->myname + 1 );
- }
+ g->myname = strdup( lutil_progname( "slurpd", argc, argv ));
- while ( (i = getopt( argc, argv, "hd:f:r:t:k:o" )) != EOF ) {
+ while ( (i = getopt( argc, argv, "d:f:n:or:t:V" )) != EOF ) {
switch ( i ) {
-#ifdef LDAP_DEBUG
- case 'd': /* turn on debugging */
+ case 'd': { /* set debug level and 'do not detach' flag */
+ int level;
+ g->no_detach = 1;
if ( optarg[0] == '?' ) {
+#ifdef LDAP_DEBUG
printf( "Debug levels:\n" );
printf( "\tLDAP_DEBUG_TRACE\t%d\n",
LDAP_DEBUG_TRACE );
@@ -83,39 +103,52 @@ 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
+ if ( lutil_atoi( &level, optarg ) != 0 ) {
+ fprintf( stderr, "unable to parse debug flag \"%s\".\n", optarg );
+ usage( g->myname );
+ return( -1 );
+ }
+ ldap_debug |= level;
+#else /* !LDAP_DEBUG */
+ if ( lutil_atoi( &level, optarg ) != 0 || level != 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 */
+ LUTIL_SLASHPATH( optarg );
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 */
+ case 'n': /* NT service name */
+ if ( g->serverName ) free( g->serverName );
+ g->serverName = strdup( optarg );
break;
- case 'h':
- usage( g->myname );
- return( -1 );
case 'o':
g->one_shot_mode = 1;
break;
+ case 'r': /* slapd replog file */
+ LUTIL_SLASHPATH( optarg );
+ 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;
+ LUTIL_SLASHPATH( optarg );
+ g->slurpd_rdir = (char *)malloc (sz = (strlen(optarg) + sizeof(LDAP_DIRSEP "replica")));
+ snprintf(g->slurpd_rdir, sz,
+ "%s" LDAP_DIRSEP "replica", optarg);
+ } break;
+ case 'V':
+ (g->version)++;
+ break;
default:
usage( g->myname );
return( -1 );
@@ -129,21 +162,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;
-
}
-
-