X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslurpd%2Fargs.c;h=c3b202065c67ed09a08fb16a134a301ff030665f;hb=9df2f4f4248e1f4de848513cff76efe09c288c2e;hp=fcc7b40bd752ab81b0c80187b211920621387cf6;hpb=b3ac184962ad777904b21689beb8ad3098aae578;p=openldap

diff --git a/servers/slurpd/args.c b/servers/slurpd/args.c
index fcc7b40bd7..c3b202065c 100644
--- a/servers/slurpd/args.c
+++ b/servers/slurpd/args.c
@@ -14,9 +14,14 @@
  * args.c - process command-line arguments, and set appropriate globals.
  */
 
+#include "portable.h"
+
 #include <stdio.h>
-#include <string.h>
-#include <time.h>
+#include <stdlib.h>
+
+#include <ac/string.h>
+#include <ac/time.h>
+#include <ac/unistd.h>
 
 #include <lber.h>
 #include <ldap.h>
@@ -25,16 +30,16 @@
 #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 HAVE_KERBEROS
     fprintf( stderr, "\t\t[-t tmp-dir] [-o] [-k srvtab-file]\n" );
-#else /* KERBEROS */
+#else /* HAVE_KERBEROS */
     fprintf( stderr, "\t\t[-t tmp-dir] [-o]\n" );
-#endif /* KERBEROS */
+#endif /* HAVE_KERBEROS */
 }
 
 
@@ -50,7 +55,6 @@ doargs(
 )
 {
     int		i;
-    extern char	*optarg;
     int		rflag = 0;
 
     if ( (g->myname = strrchr( argv[0], '/' )) == NULL ) {
@@ -104,11 +108,11 @@ doargs(
 	    g->slurpd_rdir = strdup( optarg );
 	    break;
 	case 'k':	/* name of kerberos srvtab file */
-#ifdef KERBEROS
+#ifdef HAVE_KERBEROS
 	    g->default_srvtab = strdup( optarg );
-#else /* KERBEROS */
+#else /* HAVE_KERBEROS */
 	    fprintf( stderr, "must compile with KERBEROS to use -k option\n" );
-#endif /* KERBEROS */
+#endif /* HAVE_KERBEROS */
 	    break;
 	case 'h':
 	    usage( g->myname );