Use autoconf headers.

diff --git a/clients/tools/ldapdelete.c b/clients/tools/ldapdelete.c
index 3054cfb54fe52aacc397d621398c0fb2f6187a86..8ce9adf7f19e1e6ab4e351205fc9ffbc50d3dcc2 100644 (file)
--- a/clients/tools/ldapdelete.c
+++ b/clients/tools/ldapdelete.c
@@ -1,17 +1,22 @@
 /* ldapdelete.c - simple program to delete an entry using LDAP */
 
+#define DISABLE_BRIDGE
+#include "portable.h"
+
 #include <stdio.h>
-#include <string.h>
+#include <ac/string.h>
 #include <stdlib.h>
 #include <ctype.h>
+#include <ac/time.h>
+
 #include <lber.h>
 #include <ldap.h>
 
 #include "ldapconfig.h"
 
 static char    *binddn = LDAPDELETE_BINDDN;
+static char    *passwd = LDAPDELETE_BIND_CRED;
 static char    *base = LDAPDELETE_BASE;
-static char    *passwd = NULL;
 static char    *ldaphost = LDAPHOST;
 static int     ldapport = LDAP_PORT;
 static int     not, verbose, contoper;

diff --git a/clients/tools/ldapmodify.c b/clients/tools/ldapmodify.c
index 056eb2e331a36d05a6c31ed71f621daf938455fa..a6e3c0ab9e8ecaf8958bea780ba229c39fbacdf9 100644 (file)
--- a/clients/tools/ldapmodify.c
+++ b/clients/tools/ldapmodify.c
@@ -11,9 +11,8 @@
 #include <sys/stat.h>
 #include <sys/file.h>
 #include <fcntl.h>
-#ifndef VMS
-#include <unistd.h>
-#endif /* VMS */
+
+#include <ac/unistd.h>
 
 #include <lber.h>
 #include <ldap.h>

diff --git a/clients/tools/ldapmodrdn.c b/clients/tools/ldapmodrdn.c
index 69d99e7f5a469a9f58a2b34ee677427a86148b3c..d5f578f5944d095407cd095722ea9c740b7b31e0 100644 (file)
--- a/clients/tools/ldapmodrdn.c
+++ b/clients/tools/ldapmodrdn.c
@@ -1,17 +1,22 @@
 /* ldapmodrdn.c - generic program to modify an entry's RDN using LDAP */
 
+#define DISABLE_BRIDGE
+#include "portable.h"
+
 #include <stdio.h>
-#include <string.h>
+#include <ac/string.h>
 #include <stdlib.h>
 #include <ctype.h>
+#include <ac/time.h>
+
 #include <lber.h>
 #include <ldap.h>
 
 #include "ldapconfig.h"
 
 static char    *binddn = LDAPMODRDN_BINDDN;
+static char    *passwd = LDAPMODRDN_BIND_CRED;
 static char    *base = LDAPMODRDN_BASE;
-static char    *passwd = NULL;
 static char    *ldaphost = LDAPHOST;
 static int     ldapport = LDAP_PORT;
 static int     not, verbose, contoper;

diff --git a/clients/tools/ldapsearch.c b/clients/tools/ldapsearch.c
index d96aff131711ea7bc85bde1ed6194a246c2d7afc..3423aba9416185e3e23d1cbb378b313d76c02269 100644 (file)
--- a/clients/tools/ldapsearch.c
+++ b/clients/tools/ldapsearch.c
@@ -1,6 +1,11 @@
+#define DISABLE_BRIDGE
+#include "portable.h"
+
 #include <stdio.h>
-#include <string.h>
+#include <ac/string.h>
 #include <ctype.h>
+#include <ac/time.h>
+
 #include <lber.h>
 #include <ldap.h>
 #include <ldif.h>
@@ -52,7 +57,7 @@ char  *s;
 }
 
 static char    *binddn = LDAPSEARCH_BINDDN;
-static char    *passwd = NULL;
+static char    *passwd = LDAPSEARCH_BIND_CRED;
 static char    *base = LDAPSEARCH_BASE;
 static char    *ldaphost = LDAPHOST;
 static int     ldapport = LDAP_PORT;