From bc2072228fb35775b27c27d45bd7b6fc4b0730dd Mon Sep 17 00:00:00 2001
From: William Brown <william@blackhats.net.au>
Date: Apr 02 2019 03:06:28 +0000
Subject: Ticket 50310 - fix sasl header include


Bug Description: After the merge of the PKG_CONFIG change, on SUSE
the server fails to build. This is because the pkg-config for
sasl on suse doesn't add the -I include for sasl to the path so
using sasl.h doesn't work.

Fix Description: Change all references to sasl/sasl.h

https://pagure.io/389-ds-base/issue/50310

Author: William Brown <william@blackhats.net.au>

Review by: hmc, mreynolds (thanks!)

---

diff --git a/configure.ac b/configure.ac
index 8845894..5872ed8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -838,8 +838,6 @@ m4_include(m4/mozldap.m4)
 m4_include(m4/db.m4)
 
 PKG_CHECK_MODULES([SASL], [libsasl2])
-# Workaround failure by Mozilla ldapsdk to #include <sasl/sasl.h>
-SASL_CFLAGS="$SASL_CFLAGS -I$includedir/sasl"
 
 PKG_CHECK_MODULES([ICU], [icu-i18n >= 60.2])
 
diff --git a/ldap/servers/slapd/bind.c b/ldap/servers/slapd/bind.c
index b3fe273..b443d9d 100644
--- a/ldap/servers/slapd/bind.c
+++ b/ldap/servers/slapd/bind.c
@@ -39,7 +39,7 @@
 #include "fe.h"
 #include "pratom.h"
 #include "pw_verify.h"
-#include <sasl.h>
+#include <sasl/sasl.h>
 
 static void log_bind_access(
     Slapi_PBlock *pb,
diff --git a/ldap/servers/slapd/connection.c b/ldap/servers/slapd/connection.c
index 8b88568..6582475 100644
--- a/ldap/servers/slapd/connection.c
+++ b/ldap/servers/slapd/connection.c
@@ -22,7 +22,7 @@
 #include "prcvar.h"
 #include "prlog.h" /* for PR_ASSERT */
 #include "fe.h"
-#include <sasl.h>
+#include <sasl/sasl.h>
 #if defined(LINUX)
 #include <netinet/tcp.h> /* for TCP_CORK */
 #endif
diff --git a/ldap/servers/slapd/ldaputil.c b/ldap/servers/slapd/ldaputil.c
index a215e90..94928c7 100644
--- a/ldap/servers/slapd/ldaputil.c
+++ b/ldap/servers/slapd/ldaputil.c
@@ -404,7 +404,7 @@ slapi_ldap_url_parse(const char *url, LDAPURLDesc **ludpp, int require_dn, int *
     return rc;
 }
 
-#include <sasl.h>
+#include <sasl/sasl.h>
 
 int
 slapi_ldap_get_lderrno(LDAP *ld, char **m, char **s)
diff --git a/ldap/servers/slapd/sasl_io.c b/ldap/servers/slapd/sasl_io.c
index 7351148..b889c2c 100644
--- a/ldap/servers/slapd/sasl_io.c
+++ b/ldap/servers/slapd/sasl_io.c
@@ -14,7 +14,7 @@
 #include "slap.h"
 #include "slapi-plugin.h"
 #include "fe.h"
-#include <sasl.h>
+#include <sasl/sasl.h>
 #include <arpa/inet.h>
 #ifndef USE_OPENLDAP
 #include "mozldap.h"
diff --git a/ldap/servers/slapd/saslbind.c b/ldap/servers/slapd/saslbind.c
index 0907c62..2dda589 100644
--- a/ldap/servers/slapd/saslbind.c
+++ b/ldap/servers/slapd/saslbind.c
@@ -20,8 +20,8 @@
 #include <slap.h>
 #include <fe.h>
 #include <pw_verify.h>
-#include <sasl.h>
-#include <saslplug.h>
+#include <sasl/sasl.h>
+#include <sasl/saslplug.h>
 #include <unistd.h>
 
 static char *serverfqdn;
diff --git a/ldap/servers/slapd/tools/ldaptool-sasl.c b/ldap/servers/slapd/tools/ldaptool-sasl.c
index 27c49fc..8c89cc0 100644
--- a/ldap/servers/slapd/tools/ldaptool-sasl.c
+++ b/ldap/servers/slapd/tools/ldaptool-sasl.c
@@ -41,7 +41,7 @@
 #include <ldap.h>
 #include "ldaptool.h"
 #include "ldaptool-sasl.h"
-#include <sasl.h>
+#include <sasl/sasl.h>
 #include <stdio.h>
 
 #if defined(HPUX)
diff --git a/ldap/servers/slapd/tools/ldclt/ldapfct.c b/ldap/servers/slapd/tools/ldclt/ldapfct.c
index 0a9aba8..163ec88 100644
--- a/ldap/servers/slapd/tools/ldclt/ldapfct.c
+++ b/ldap/servers/slapd/tools/ldclt/ldapfct.c
@@ -39,7 +39,7 @@
 #include "ldclt.h"                              /* This tool's include file */
 #include "utils.h" /* Utilities functions */    /*JLS 14-11-00*/
 
-#include <sasl.h>
+#include <sasl/sasl.h>
 #include "ldaptool-sasl.h"
 #if !defined(USE_OPENLDAP)
 #include <ldap_ssl.h> /* ldapssl_init(), etc... */