3 files changed, 10 insertions, 2 deletions
diff --git a/lib/ldaputil/certmap.c b/lib/ldaputil/certmap.c
index 57d1f910..cea403b6 100644
--- a/lib/ldaputil/certmap.c
+++ b/lib/ldaputil/certmap.c
@@ -55,6 +55,7 @@
 
 #include <key.h>
 #include <cert.h>
+#define DEFINE_LDAPU_STRINGS 1
 #include <ldaputil/certmap.h>
 #include <ldaputil/ldapauth.h>
 #include <ldaputil/errors.h>
@@ -300,7 +301,8 @@ static int ldapu_list_print (LDAPUList_t *list, LDAPUListNodeFn_t print_fn,
     int rv;
 
     while(node) {
-	rv = (int)(*print_fn)(node->info, pinfo);
+	uintptr_t retval = (uintptr_t)(*print_fn)(node->info, pinfo);
+	rv = (int)retval;
 	if (rv != LDAPU_SUCCESS) return rv;
 	node = node->next;
     }
@@ -1691,6 +1693,7 @@ NSAPI_PUBLIC int ldapu_certinfo_save (const char *fname,
     char *ptr;
     int eof;
     int rv;
+    uintptr_t retval;
     LDAPUPrintInfo_t pinfo;
     
 #ifdef XP_WIN32
@@ -1730,7 +1733,8 @@ NSAPI_PUBLIC int ldapu_certinfo_save (const char *fname,
     pinfo.fp = tfp;
     pinfo.arg = default_certmap_info->issuerName;
 
-    rv = (int)ldapu_certinfo_print (default_certmap_info, &pinfo);
+    retval = (uintptr_t)ldapu_certinfo_print (default_certmap_info, &pinfo);
+    rv = (int)retval;
 
     if (rv != LDAPU_SUCCESS) {
 	fclose(tfp);
diff --git a/lib/ldaputil/ldapauth.c b/lib/ldaputil/ldapauth.c
index 0039bae5..b483e42f 100644
--- a/lib/ldaputil/ldapauth.c
+++ b/lib/ldaputil/ldapauth.c
@@ -53,6 +53,7 @@
 #include <ldap.h>
 #include <prprf.h>
 
+#define DEFINE_LDAPU_STRINGS 1
 #include <ldaputil/certmap.h>
 #include <ldaputil/errors.h>
 #include <ldaputil/ldapauth.h>
diff --git a/lib/ldaputil/ldapdb.c b/lib/ldaputil/ldapdb.c
index a126c169..478b4f8c 100644
--- a/lib/ldaputil/ldapdb.c
+++ b/lib/ldaputil/ldapdb.c
@@ -171,7 +171,10 @@ ldapu_gethostbyaddr( const char *addr, int length, int type,
 	LDAPHostEnt *result, char *buffer, int buflen, int *statusp,
 	void *extradata )
 {
+    /* old code did this which was clearly wrong:
     return( (LDAPHostEnt *)PR_GetError() );
+    which leads me to believe this is not used */
+    return( NULL );
 }
 #endif /* LDAP_OPT_DNS_FN_PTRS */