diff -r -u -x configure nss-pam-ldapd-0.8.1-FCS/configure.ac nss-pam-ldapd-0.8.1/configure.ac
--- nss-pam-ldapd-0.8.1-FCS/configure.ac	2011-03-11 07:46:18.000000000 +1100
+++ nss-pam-ldapd-0.8.1/configure.ac	2011-03-12 15:11:48.963070282 +1100
@@ -550,6 +550,7 @@
   fi
 
   # checks for availability of system libraries for nslcd
+  AC_SEARCH_LIBS(hstrerror,resolv)
   AC_SEARCH_LIBS(gethostbyname,nsl socket)
   AC_SEARCH_LIBS(socket,socket)
   AC_SEARCH_LIBS(dlopen,dl)
diff -r -u -x configure nss-pam-ldapd-0.8.1-FCS/nslcd/cfg.c nss-pam-ldapd-0.8.1/nslcd/cfg.c
--- nss-pam-ldapd-0.8.1-FCS/nslcd/cfg.c	2011-03-11 07:37:43.000000000 +1100
+++ nss-pam-ldapd-0.8.1/nslcd/cfg.c	2011-03-12 07:51:20.260596801 +1100
@@ -58,6 +58,10 @@
 #include "cfg.h"
 #include "attmap.h"
 
+#ifndef HOST_NAME_MAX
+#define HOST_NAME_MAX 255
+#endif /* not HOST_NAME_MAX */
+
 struct ldap_config *nslcd_cfg=NULL;
 
 /* the maximum line length in the configuration file */
diff -r -u -x configure nss-pam-ldapd-0.8.1-FCS/tests/test_getpeercred.c nss-pam-ldapd-0.8.1/tests/test_getpeercred.c
--- nss-pam-ldapd-0.8.1-FCS/tests/test_getpeercred.c	2010-10-05 06:42:16.000000000 +1100
+++ nss-pam-ldapd-0.8.1/tests/test_getpeercred.c	2011-03-12 15:18:13.546610045 +1100
@@ -47,6 +47,9 @@
    ? (void) (0) \
    : __assertok_fail(__STRING(expr),__FILE__,__LINE__,__ASSERT_FUNCTION))
 
+/* for Solaris: */
+#define __assert_fail(assertion,file,line,function) __assert(assertion,file,line)
+
 static void __assertok_fail(const char *expr,const char *file,
                           int line,const char *function)
 {
diff -r -u -x configure nss-pam-ldapd-0.8.1-FCS/tests/test_tio.c nss-pam-ldapd-0.8.1/tests/test_tio.c
--- nss-pam-ldapd-0.8.1-FCS/tests/test_tio.c	2010-10-05 06:42:17.000000000 +1100
+++ nss-pam-ldapd-0.8.1/tests/test_tio.c	2011-03-12 15:17:44.699199465 +1100
@@ -45,6 +45,9 @@
    ? (void) (0) \
    : __assertok_fail(__STRING(expr),__FILE__,__LINE__,__ASSERT_FUNCTION))
 
+/* for Solaris: */
+#define __assert_fail(assertion,file,line,function) __assert(assertion,file,line)
+
 static void __assertok_fail(const char *expr,const char *file,
                           int line,const char *function)
 {