--- a/src/eldap.c	Mon Aug 13 10:24:47 2007 +0200
+++ b/src/eldap.c	Mon Aug 13 10:25:37 2007 +0200
@@ -1,5 +1,5 @@
 /* LDAP client interface for XEmacs.
-   Copyright (C) ***FIXME***
+   Copyright (C) 1998 Free Software Foundation, Inc.
 
 This file is part of XEmacs.
 
@@ -38,6 +38,8 @@
 
 #include "lisp.h"
 
+#include <errno.h>
+
 #include "eldap.h"
 #include <lber.h>
 #include <ldap.h>
@@ -293,14 +295,15 @@
      check what happens inside that lib. Anyway this should be harmless to
      XEmacs and makes things work. */
 #if defined (HAVE_UMICH_LDAP)
-  Fgarbage_collect ();
+  garbage_collect_1 ();
 #endif
 
   /* Connect to the server and bind */
   message ("Connecting to %s...", ldap_host);
   if ( (ld = ldap_open (ldap_host, LDAP_PORT)) == NULL )
-     signal_simple_error ("Failed connecting to host",
-                          build_string (ldap_host));
+     signal_simple_error_2 ("Failed connecting to host",
+                            build_string (ldap_host),
+                            lisp_strerror (errno));
 
 #if HAVE_LDAP_SET_OPTION
   if (ldap_set_option (ld, LDAP_OPT_DEREF, (void *)&ldap_deref) != LDAP_SUCCESS)