Attachment #134217 for bug #165638

Lines 87-92 Link Here

(-)nss_ldap-257.2.orig/config.h.in (+3 lines)
87	/* Define to 1 if you have the <gssapi/gssapi_krb5.h> header file. */	87	/* Define to 1 if you have the <gssapi/gssapi_krb5.h> header file. */
88	#undef HAVE_GSSAPI_GSSAPI_KRB5_H	88	#undef HAVE_GSSAPI_GSSAPI_KRB5_H
89		89
		90	/* Define to 1 if you have the <gssapi/gssapi.h> header file. */
		91	#undef HAVE_GSSAPI_GSSAPI_H
		92
90	/* Define to 1 if you have the <gssapi.h> header file. */	93	/* Define to 1 if you have the <gssapi.h> header file. */
91	#undef HAVE_GSSAPI_H	94	#undef HAVE_GSSAPI_H
92		95

Lines 8409-8415 Link Here

(-)nss_ldap-257.2.orig/configure (-1 / +1 lines)
8409		8409
8410		8410
8411		8411
8412	for ac_header in gssapi/gssapi_krb5.h gssapi.h	8412	for ac_header in gssapi/gssapi_krb5.h gssapi/gssapi.h gssapi.h
8413	do	8413	do
8414	as_ac_Header=`echo "ac_cv_header_$ac_header" \| $as_tr_sh`	8414	as_ac_Header=`echo "ac_cv_header_$ac_header" \| $as_tr_sh`
8415	if eval "test \"\${$as_ac_Header+set}\" = set"; then	8415	if eval "test \"\${$as_ac_Header+set}\" = set"; then

Lines 182-188 Link Here

(-)nss_ldap-257.2.orig/configure.in (-1 / +1 lines)
182	AC_CHECK_HEADERS(strings.h)	182	AC_CHECK_HEADERS(strings.h)
183	AC_CHECK_HEADERS(gssldap.h)	183	AC_CHECK_HEADERS(gssldap.h)
184	AC_CHECK_HEADERS(gsssasl.h)	184	AC_CHECK_HEADERS(gsssasl.h)
185	AC_CHECK_HEADERS(gssapi/gssapi_krb5.h gssapi.h)	185	AC_CHECK_HEADERS(gssapi/gssapi_krb5.h gssapi/gssapi.h gssapi.h)
186	AC_CHECK_HEADERS(krb5.h)	186	AC_CHECK_HEADERS(krb5.h)
187		187
188	AC_CHECK_LIB(resolv, main)	188	AC_CHECK_LIB(resolv, main)

Lines 82-91 Link Here

(-)nss_ldap-257.2.orig/ldap-nss.c (-1 / +5 lines)
82	#endif	82	#endif
83	#ifdef HAVE_GSSAPI_H	83	#ifdef HAVE_GSSAPI_H
84	#include <gssapi.h>	84	#include <gssapi.h>
85	#elif defined(HAVE_GSSAPI_GSSAPI_KRB5_H)	85	#else
		86	#ifdef HAVE_GSSAPI_GSSAPI_H
86	#include <gssapi/gssapi.h>	87	#include <gssapi/gssapi.h>
		88	#endif
		89	#ifdef HAVE_GSSAPI_GSSAPI_KRB5_H
87	#include <gssapi/gssapi_krb5.h>	90	#include <gssapi/gssapi_krb5.h>
88	#endif	91	#endif
		92	#endif
89	#ifdef CONFIGURE_KRB5_CCNAME	93	#ifdef CONFIGURE_KRB5_CCNAME
90	#include <krb5.h>	94	#include <krb5.h>
91	#endif	95	#endif

Return to bug 165638