BUG#261

3 files changed, 3 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 290aaaf..47ae36b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,7 @@ $Id$
 	  implementation
 	* fix for BUG#207: if ldap_start_tls_s() fails
 	  return PAM_AUTHINFO_UNAVAIL
+	* fix for BUG#261: sslpath example wrong
 
 180	Luke Howard <lukeh@padl.com>
 
diff --git a/ldap.conf b/ldap.conf
index 1bcdb5d..d715f8f 100644
--- a/ldap.conf
+++ b/ldap.conf
@@ -249,7 +249,7 @@ base dc=padl,dc=com
 #ssl on
 
 # Netscape SDK SSL options
-#sslpath /etc/ssl/certs/cert7.db
+#sslpath /etc/ssl/certs
 
 # OpenLDAP SSL mechanism
 # start_tls mechanism uses the normal LDAP port, LDAPS typically 636
diff --git a/pam_ldap.c b/pam_ldap.c
index fbda42b..8c99375 100644
--- a/pam_ldap.c
+++ b/pam_ldap.c
@@ -2490,7 +2490,7 @@ _get_user_info (pam_ldap_session_t * session, const char *user)
       ssd->next = NULL;
     }
 nxt:
-  if ((session->conf->filter != NULL) && (ssd->filter != NULL))
+  if (session->conf->filter != NULL && ssd->filter != NULL)
     {
       snprintf (filter, sizeof filter, "(&(%s)(%s)(%s=%s))",
 		ssd->filter, session->conf->filter, session->conf->userattr,