Add libtool support based upon patch by Bart Hartgers <Hartgers@kfm1.phys.tue.nl>

[openldap] / libraries / libldap / error.c

diff --git a/libraries/libldap/error.c b/libraries/libldap/error.c
index 80dcd809fa594013de04a4402a5c4f83f92d30a4..4fe8f855c62d49a7963ba2912a127b1c668a9534 100644 (file)
--- a/libraries/libldap/error.c
+++ b/libraries/libldap/error.c
@@ -7,8 +7,7 @@
 #include <ac/string.h>
 #include <ac/time.h>
 
-#include "lber.h"
-#include "ldap.h"
+#include "ldap-int.h"
 
 struct ldaperror {
        int     e_code;
@@ -80,10 +79,10 @@ ldap_err2string( int err )
        return( "Unknown error" );
 }
 
-#ifndef NO_USERINTERFACE
 void
 ldap_perror( LDAP *ld, char *s )
 {
+#ifdef LDAP_LIBUI
        int     i;
 
        Debug( LDAP_DEBUG_TRACE, "ldap_perror\n", 0, 0, 0 );
@@ -110,25 +109,16 @@ ldap_perror( LDAP *ld, char *s )
 
        fprintf( stderr, "%s: Not an LDAP errno %d\n", s, ld->ld_errno );
        fflush( stderr );
+#endif /* !LDAP_LIBUI */
 }
 
-#else
-
-void
-ldap_perror( LDAP *ld, char *s )
-{
-}
-
-#endif /* NO_USERINTERFACE */
-
-
 int
 ldap_result2error( LDAP *ld, LDAPMessage *r, int freeit )
 {
        LDAPMessage     *lm;
        BerElement      ber;
        long            along;
-       int             rc;
+       unsigned long   rc;
 
        Debug( LDAP_DEBUG_TRACE, "ldap_result2error\n", 0, 0, 0 );
 
@@ -165,3 +155,14 @@ ldap_result2error( LDAP *ld, LDAPMessage *r, int freeit )
 
        return( ld->ld_errno );
 }
+
+
+int 
+ldap_get_lderrno(LDAP *ld, char **matched, char **msg)
+{
+        if ( matched )
+                *matched = ld->ld_matched;
+        if ( msg )
+                *msg = NULL;
+        return( ld->ld_errno );
+}