From 830acce3792f318a2b3bd013737ed0d9c194fc80 Mon Sep 17 00:00:00 2001 From: Jakub Jelen Date: Mar 06 2018 14:15:03 +0000 Subject: revert part of the nss removal from LDAP --- diff --git a/openssh-6.7p1-ldap.patch b/openssh-6.7p1-ldap.patch index 9ae2ffa..1caa0a6 100644 --- a/openssh-6.7p1-ldap.patch +++ b/openssh-6.7p1-ldap.patch @@ -272,11 +272,11 @@ diff -up openssh-6.8p1/configure.ac.ldap openssh-6.8p1/configure.ac + fi + + if test -z "$found_ldap_lib" -a \( $with_ldap_lib = auto -o $with_ldap_lib = netscape5 \); then -+ AC_CHECK_LIB(ldap50, main, LDAPLIBS="-lldap50 -lssldap50 -lssl3 -lprldap50 -lplc4 -lplds4 $LDAPLIBS" found_ldap_lib=yes) ++ AC_CHECK_LIB(ldap50, main, LDAPLIBS="-lldap50 -lssldap50 -lssl3 -lnss3 -lnspr4 -lprldap50 -lplc4 -lplds4 $LDAPLIBS" found_ldap_lib=yes) + fi + + if test -z "$found_ldap_lib" -a \( $with_ldap_lib = auto -o $with_ldap_lib = netscape4 \); then -+ AC_CHECK_LIB(ldapssl41, main, LDAPLIBS="-lldapssl41 -lplc3 -lplds3 $LDAPLIBS" found_ldap_lib=yes) ++ AC_CHECK_LIB(ldapssl41, main, LDAPLIBS="-lldapssl41 -lplc3 -lplds3 -lnspr3 $LDAPLIBS" found_ldap_lib=yes) + if test -z "$found_ldap_lib"; then + AC_CHECK_LIB(ldapssl40, main, LDAPLIBS="-lldapssl40 $LDAPLIBS" found_ldap_lib=yes) + fi