--- usr/portage/net-nds/openldap/openldap-2.3.35-r1.ebuild	2007-04-25 06:40:08.000000000 +0000
+++ usr/local/portage/net-nds/openldap/openldap-2.3.35-r2.ebuild	2007-05-01 08:26:32.000000000 +0000
@@ -211,7 +211,7 @@
 	# patch contrib modules
 	if ! use minimal ; then
 		cd "${S}"/contrib
-		epatch "${FILESDIR}"/${PN}-2.3.24-contrib-smbk5pwd.patch
+		epatch "${FILESDIR}"/${PN}-2.3.35-contrib-smbk5pwd.patch
 	fi
 }
 
@@ -302,6 +302,7 @@
 			einfo "Building contributed pw-kerberos"
 			cd "${S}"/contrib/slapd-modules/passwd/ && \
 			${CC} -shared -I../../../include ${CFLAGS} -fPIC \
+			`krb5-config --cflags` `krb5-config --libs` \
 			-DHAVE_KRB5 -o pw-kerberos.so kerberos.c || \
 			die "failed to compile kerberos password module"
 		fi
@@ -319,11 +320,14 @@
 			einfo "Building contributed smbk5pwd"
 			local mydef
 			local mykrb5inc
+			local mykrb5lib
 			mydef="-DDO_SAMBA -DDO_KRB5"
-			mykrb5inc="-I/usr/include/heimdal/"
+			mykrb5inc="`krb5-config --cflags`"
+			mykrb5lib="`krb5-config --libs`"
 			cd "${S}"/contrib/slapd-modules/smbk5pwd && \
 			libexecdir="/usr/$(get_libdir)/openldap" \
-			DEFS="${mydef}" KRB5_INC="${mykrb5inc}" emake || \
+			DEFS="${mydef}" KRB5_INC="${mykrb5inc}" \
+			KRB5_LIB="${mykrb5lib}" emake || \
 			die "failed to compile smbk5pwd module"
 		fi
 		# addrdnvalues