Include ldif.h to pickup declaration of str_getline()

Fix pointer truncation to int by including prototypes in forward declarations.

diff --git a/servers/slapd/tools/ldif2id2children.c b/servers/slapd/tools/ldif2id2children.c
index 67be503f64b446e14ba63686dda94c0cdbf1f96a..ee128855a86baa9274c5e06b65dcb70eaca693ee 100644 (file)
--- a/servers/slapd/tools/ldif2id2children.c
+++ b/servers/slapd/tools/ldif2id2children.c
@@ -9,15 +9,14 @@
 #include "../back-ldbm/back-ldbm.h"
 
 #include "ldapconfig.h"
+#include "ldif.h"
 
 #define MAXARGS                100
 
 extern struct dbcache  *ldbm_cache_open();
 extern void            attr_index_config();
-extern char            *str_getline();
 extern char            *dn_parent();
 extern char            *dn_normalize_case();
-extern int             strcasecmp();
 extern int             nbackends;
 extern Backend         *backends;
 extern int             ldap_debug;
@@ -43,8 +42,6 @@ pthread_mutex_t       replog_mutex;
 pthread_mutex_t        ops_mutex;
 pthread_mutex_t        regex_mutex;
 
-static int     make_index();
-
 static char    *tailorfile;
 static char    *inputfile;
  

diff --git a/servers/slapd/tools/ldif2index.c b/servers/slapd/tools/ldif2index.c
index 2e4ba0c4397696132952db67f7455715838b5de5..9995dea664fa3b5f88fd40e3a9e553cf0014f00d 100644 (file)
--- a/servers/slapd/tools/ldif2index.c
+++ b/servers/slapd/tools/ldif2index.c
@@ -8,11 +8,11 @@
 #include "../slap.h"
 
 #include "ldapconfig.h"
+#include "ldif.h"
 
 #define MAXARGS                100
 
 extern void    attr_index_config();
-extern char    *str_getline();
 extern char    *attr_normalize();
 extern int     nbackends;
 extern Backend *backends;

diff --git a/servers/slapd/tools/ldif2ldbm.c b/servers/slapd/tools/ldif2ldbm.c
index d1da293c0985b7ff4e58bd8408ed639625cedd89..01ae4fbd2165730d7311ea5872efe224231a8e99 100644 (file)
--- a/servers/slapd/tools/ldif2ldbm.c
+++ b/servers/slapd/tools/ldif2ldbm.c
@@ -10,17 +10,15 @@
 #include "../slap.h"
 #include "../back-ldbm/back-ldbm.h"
 #include "ldapconfig.h"
+#include "ldif.h"
 
 #define INDEXCMD               "ldif2index"
 #define ID2ENTRYCMD            "ldif2id2entry"
 #define ID2CHILDRENCMD         "ldif2id2children"
 #define MAXARGS                100
 
-extern void            attr_index_config();
-extern char            *str_getline();
-extern int             strcasecmp();
 extern int             nbackends;
-extern Backend         *backends;
+extern Backend *backends;
 extern int             ldap_debug;
 
 int            ldap_debug;
@@ -43,8 +41,8 @@ pthread_mutex_t       replog_mutex;
 pthread_mutex_t        ops_mutex;
 pthread_mutex_t        regex_mutex;
 
-static void    fork_child();
-static void    wait4kids();
+static void fork_child( char *prog, char *args[] );
+static void    wait4kids( int nkidval );
 
 static char    *indexcmd;
 static char    *tailorfile;