From 2752bfb1d0cf5f1c62662d0885cbbc44620f46e5 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Wed, 30 Sep 2015 00:44:31 -0500
Subject: Fix FTBFS on ancient Heimdal versions

---
 src/Makefile.am    | 1 +
 src/libtdeldap.cpp | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/src/Makefile.am b/src/Makefile.am
index 5d5b855..6a64b3d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,6 +7,7 @@ lib_LTLIBRARIES = libtdeldap.la
 include_HEADERS = libtdeldap.h ldappasswddlg.h
 
 libtdeldap_la_SOURCES = libtdeldap.cpp ldaplogindlgbase.ui ldaplogindlg.cpp ldappasswddlg.cpp
+libtdeldap_la_CPPFLAGS = -fpermissive
 libtdeldap_la_LIBADD = -ltdeio $(LIB_TDEUI) -lldap $(LIB_QT) $(LIB_TDECORE) -ltdesu -llber -lkadm5clnt -lkadm5srv
 libtdeldap_la_LDFLAGS = -version-info $(lt_current):$(lt_revision):$(lt_age) -no-undefined \
 	$(all_libraries)
diff --git a/src/libtdeldap.cpp b/src/libtdeldap.cpp
index bc6890b..0549759 100644
--- a/src/libtdeldap.cpp
+++ b/src/libtdeldap.cpp
@@ -51,6 +51,8 @@
 #include <sys/un.h>
 
 extern "C" {
+	#include <krb5.h>
+	#include <krb5_asn1.h>
 	#include <hdb.h>
 	#include <hdb_asn1.h>
 	#include <kadm5/admin.h>
@@ -1089,6 +1091,7 @@ int LDAPManager::updateUserInfo(LDAPUserInfo user, TQString *errstr) {
 		}
 		TQByteArray acl_asn1_data;
 		if (pkinit_acl_subject != "") {
+#if HDB_INTERFACE_VERSION > 4
 			krb5_error_code krb5_ret;
 			HDB_extension extended_attributes;
 			memset(&extended_attributes, 0, sizeof(extended_attributes));
@@ -1110,6 +1113,7 @@ int LDAPManager::updateUserInfo(LDAPUserInfo user, TQString *errstr) {
 			}
 			free(pkinit_acl->val);
 			free(asn1_encoding_buf);
+#endif
 		}
 
 		// Assemble the LDAPMod structure
-- 
cgit v1.2.3