Make sure wbclient.h is included when needed. Fixes #1208

diff --git a/src/modules/rlm_mschap/auth_wbclient.c b/src/modules/rlm_mschap/auth_wbclient.c
index f62e2d5d008048d068caef16790d78b0f883eb9f..304eff4048794fcf974c58a95a029a99f731ab37 100644 (file)
--- a/src/modules/rlm_mschap/auth_wbclient.c
+++ b/src/modules/rlm_mschap/auth_wbclient.c
@@ -27,7 +27,6 @@ RCSID("$Id$")
 #include <freeradius-devel/radiusd.h>
 #include <freeradius-devel/rad_assert.h>
 
-#include <wbclient.h>
 #include <core/ntstatus.h>
 
 #include "rlm_mschap.h"

diff --git a/src/modules/rlm_mschap/auth_wbclient.h b/src/modules/rlm_mschap/auth_wbclient.h
index 9ad5a2f771df5b9cb25c2a4dc43e61a81d7d9e8f..83ebd200c78d2d437a8c3d6e39d7c04cd9a5bbc1 100644 (file)
--- a/src/modules/rlm_mschap/auth_wbclient.h
+++ b/src/modules/rlm_mschap/auth_wbclient.h
@@ -5,6 +5,8 @@
 
 RCSIDH(auth_wbclient_h, "$Id$")
 
+#include <wbclient.h>
+
 int do_auth_wbclient(rlm_mschap_t *inst, REQUEST *request,
                     uint8_t const *challenge, uint8_t const *response,
                     uint8_t nthashhash[NT_DIGEST_LENGTH]);

diff --git a/src/modules/rlm_mschap/rlm_mschap.c b/src/modules/rlm_mschap/rlm_mschap.c
index f4387019cf66d8585ef0234741275b3bf7540275..d1a6805a0cf41a0b18e90953f4817986ec745f50 100644 (file)
--- a/src/modules/rlm_mschap/rlm_mschap.c
+++ b/src/modules/rlm_mschap/rlm_mschap.c
@@ -36,7 +36,10 @@ RCSID("$Id$")
 #include "rlm_mschap.h"
 #include "mschap.h"
 #include "smbdes.h"
+
+#ifdef WITH_AUTH_WINBIND
 #include "auth_wbclient.h"
+#endif
 
 #ifdef HAVE_OPENSSL_CRYPTO_H
 USES_APPLE_DEPRECATED_API      /* OpenSSL API has been deprecated by Apple */