Use getpassphrase() instead of getpass() if available.

[openldap] / libraries / libldap / srchpref.c

diff --git a/libraries/libldap/srchpref.c b/libraries/libldap/srchpref.c
index aec72a2f9a38c01fc00c390b506b4343ac7c04f1..4b54189c709e0d82c589a4fb9f8cad032c365c1e 100644 (file)
--- a/libraries/libldap/srchpref.c
+++ b/libraries/libldap/srchpref.c
@@ -1,5 +1,6 @@
+/* $OpenLDAP$ */
 /*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /* Portions
@@ -20,7 +21,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #include <ac/ctype.h>
 #include <ac/string.h>
@@ -37,7 +39,7 @@
 #include "ldap-int.h"
 
 static void free_searchobj LDAP_P(( struct ldap_searchobj *so ));
-static int read_next_searchobj LDAP_P(( char **bufp, long *blenp,
+static int read_next_searchobj LDAP_P(( char **bufp, ber_len_t *blenp,
        struct ldap_searchobj **sop, int soversion ));
 
 
@@ -98,7 +100,9 @@ ldap_init_searchprefs( char *file, struct ldap_searchobj **solistp )
 
 
 int
-ldap_init_searchprefs_buf( char *buf, long buflen,
+ldap_init_searchprefs_buf(
+       char *buf,
+       ber_len_t buflen,
        struct ldap_searchobj **solistp )
 {
     int                                rc = -1, version;
@@ -229,7 +233,10 @@ ldap_next_searchobj( struct ldap_searchobj *solist, struct ldap_searchobj *so )
 
 
 static int
-read_next_searchobj( char **bufp, long *blenp, struct ldap_searchobj **sop,
+read_next_searchobj(
+       char **bufp,
+       ber_len_t *blenp,
+       struct ldap_searchobj **sop,
        int soversion )
 {
     int                                i, j, tokcnt;