X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslurpd%2Fargs.c;h=9c4df43346d534d2d2840488022104bbab6edccd;hb=616d409817888294f748ea657b759edb5a30886a;hp=81b45df4eb68e2ae55afc5a711ec494d80a3e9f0;hpb=403f4479bc9f9a864122d4aeecf7284408918302;p=openldap

diff --git a/servers/slurpd/args.c b/servers/slurpd/args.c
index 81b45df4eb..9c4df43346 100644
--- a/servers/slurpd/args.c
+++ b/servers/slurpd/args.c
@@ -1,4 +1,8 @@
 /* $OpenLDAP$ */
+/*
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 /*
  * Copyright (c) 1996 Regents of the University of Michigan.
  * All rights reserved.
@@ -24,7 +28,6 @@
 #include <ac/time.h>
 #include <ac/unistd.h>
 
-#include <lber.h>
 #include <ldap.h>
 
 #include "slurp.h"
@@ -36,11 +39,11 @@ 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 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 */
 }
 
 
@@ -64,7 +67,7 @@ doargs(
 	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 ) {
 	case 'd':	/* set debug level and 'do not detach' flag */
 	    g->no_detach = 1;
@@ -106,25 +109,18 @@ doargs(
 	case 'f':	/* slapd config file */
 	    g->slapd_configfile = strdup( optarg );
 	    break;
+	case 'o':
+	    g->one_shot_mode = 1;
+	    break;
 	case 'r':	/* slapd replog file */
-	    strcpy( g->slapd_replogfile, optarg );
+	    strncpy( g->slapd_replogfile, optarg,
+			sizeof(g->slapd_replogfile)-1 );
+		g->slapd_replogfile[sizeof(g->slapd_replogfile)-1] = '\0';
 	    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 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;
+	    g->slurpd_rdir = (char *)malloc (strlen(optarg) + strlen("/replica") + 1);
+	    sprintf(g->slurpd_rdir, "%s/replica", optarg);
 	    break;
 	default:
 	    usage( g->myname );
@@ -152,12 +148,9 @@ doargs(
 
 #ifdef LOG_LOCAL4
     openlog( g->myname, OPENLOG_OPTIONS, LOG_LOCAL4 );
-#else
+#elif LOG_DEBUG
     openlog( g->myname, OPENLOG_OPTIONS );
 #endif
 
     return 0;
-
 }
-
-