-/*
- * Copyright (c) 1996 Regents of the University of Michigan.
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2003 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
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* Portions Copyright (c) 1996 Regents of the University of Michigan.
* All rights reserved.
*
* Redistribution and use in source and binary forms are permitted
* 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 <ac/time.h>
#include <ac/unistd.h>
-#include <lber.h>
#include <ldap.h>
#include "slurp.h"
{
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 HAVE_KERBEROS
+#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND
fprintf( stderr, "\t\t[-t tmp-dir] [-o] [-k srvtab-file]\n" );
-#else /* HAVE_KERBEROS */
+#else /* LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND */
fprintf( stderr, "\t\t[-t tmp-dir] [-o]\n" );
-#endif /* HAVE_KERBEROS */
+#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND */
+ fprintf( stderr, "\t\t[-n service-name]\n" );
}
int i;
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:n:or:t:" )) != EOF ) {
switch ( i ) {
case 'd': /* set debug level and 'do not detach' flag */
g->no_detach = 1;
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 );
+ case 'n': /* NT service name */
+ if ( g->serverName ) free( g->serverName );
+ g->serverName = strdup( optarg );
break;
- case 'k': /* name of kerberos srvtab file */
-#ifdef HAVE_KERBEROS
- g->default_srvtab = strdup( optarg );
-#else /* HAVE_KERBEROS */
- fprintf( stderr, "must compile with KERBEROS to use -k option\n" );
-#endif /* HAVE_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 );
}
/* 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);
#ifdef LOG_LOCAL4
openlog( g->myname, OPENLOG_OPTIONS, LOG_LOCAL4 );
-#else
+#elif LOG_DEBUG
openlog( g->myname, OPENLOG_OPTIONS );
#endif
return 0;
-
}
-
-