X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslurpd%2Fargs.c;h=9d9a6baa2e3ac7edc4f5ab6fa380319a13dd76b5;hb=d84ffb62a6c7528ef711547194307af629e0d082;hp=ff28e0bb4f215ef6c9460bad6b1a5f05a04eb134;hpb=32bdecbb5fb9fc8bb9163574fee6e6ef40a6cbc6;p=openldap

diff --git a/servers/slurpd/args.c b/servers/slurpd/args.c
index ff28e0bb4f..9d9a6baa2e 100644
--- a/servers/slurpd/args.c
+++ b/servers/slurpd/args.c
@@ -1,6 +1,18 @@
 /* $OpenLDAP$ */
-/*
- * Copyright (c) 1996 Regents of the University of Michigan.
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * 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
+ * <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
@@ -10,6 +22,10 @@
  * 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.
@@ -24,8 +40,8 @@
 #include <ac/time.h>
 #include <ac/unistd.h>
 
-#include <lber.h>
 #include <ldap.h>
+#include <lutil.h>
 
 #include "slurp.h"
 #include "globals.h"
@@ -41,6 +57,7 @@ usage( char *name )
 #else /* LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND */
     fprintf( stderr, "\t\t[-t tmp-dir] [-o]\n" );
 #endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND */
+    fprintf( stderr, "\t\t[-n service-name]\n" );
 }
 
 
@@ -58,15 +75,12 @@ doargs(
     int		i;
     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 ) {
-	case 'd':	/* set debug level and 'do not detach' flag */
+	case 'd': {	/* set debug level and 'do not detach' flag */
+	    int level;
 	    g->no_detach = 1;
 	    if ( optarg[0] == '?' ) {
 #ifdef LDAP_DEBUG
@@ -95,38 +109,46 @@ doargs(
 		return( -1 );
 	    }
 #ifdef LDAP_DEBUG
-	    ldap_debug |= atoi( optarg );
+	    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 ( atoi( optarg ) != 0 )
+	    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;
+	    } 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 = (char *)malloc (strlen(optarg) + strlen("/replica") + 1);
-	    sprintf(g->slurpd_rdir, "%s/replica", 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 LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND
-	    g->default_srvtab = strdup( optarg );
-#else /* LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND */
-	    fprintf( stderr, "must compile with KERBEROS to use -k option\n" );
-#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND */
-	    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 );
@@ -140,11 +162,13 @@ 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);
@@ -158,7 +182,4 @@ doargs(
 #endif
 
     return 0;
-
 }
-
-