Attachment #109412 for bug #165638

Lines 84-89 Link Here

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

Lines 2730-2736 Link Here

(-)nss_ldap-254.orig/configure (-1 / +1 lines)
2730	fi	2730	fi
2731	done	2731	done
2732		2732
2733	for ac_hdr in gssapi/gssapi_krb5.h gssapi.h	2733	for ac_hdr in gssapi/gssapi_krb5.h gssapi/gssapi.h gssapi.h
2734	do	2734	do
2735	ac_safe=`echo "$ac_hdr" \| sed 'y%./+-%__p_%'`	2735	ac_safe=`echo "$ac_hdr" \| sed 'y%./+-%__p_%'`
2736	echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6	2736	echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6

Lines 180-186 Link Here

(-)nss_ldap-254.orig/configure.in (-1 / +1 lines)
180	AC_CHECK_HEADERS(strings.h)	180	AC_CHECK_HEADERS(strings.h)
181	AC_CHECK_HEADERS(gssldap.h)	181	AC_CHECK_HEADERS(gssldap.h)
182	AC_CHECK_HEADERS(gsssasl.h)	182	AC_CHECK_HEADERS(gsssasl.h)
183	AC_CHECK_HEADERS(gssapi/gssapi_krb5.h gssapi.h)	183	AC_CHECK_HEADERS(gssapi/gssapi_krb5.h gssapi/gssapi.h gssapi.h)
184		184
185	AC_CHECK_LIB(resolv, main)	185	AC_CHECK_LIB(resolv, main)
186	AC_CHECK_LIB(nsl, main)	186	AC_CHECK_LIB(nsl, main)

Lines 82-91 Link Here

(-)nss_ldap-254.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>
		91	#endif
88	#endif	92	#endif
89		93
90	#include "ldap-nss.h"	94	#include "ldap-nss.h"
91	#include "ltf.h"	95	#include "ltf.h"

Return to bug 165638