From: Alan T. DeKok <aland@freeradius.org>
Date: Fri, 4 Sep 2015 14:20:50 +0000 (-0400)
Subject: Make sure wbclient.h is included when needed.  Fixes #1208
X-Git-Tag: release_3_0_10~167
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c33bbce6a029c972ee1f6526f2c7ef5995a924a;p=thirdparty%2Ffreeradius-server.git

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 f62e2d5d008..304eff40487 100644
--- 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 9ad5a2f771d..83ebd200c78 100644
--- 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 f4387019cf6..d1a6805a0cf 100644
--- 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 */