From: Alan T. DeKok <aland@freeradius.org>
Date: Wed, 10 Jun 2015 16:34:25 +0000 (-0400)
Subject: Build OpenDirectory on Apple
X-Git-Tag: release_3_0_9~208
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b84551e199593c03dee7591a3b798371ef497a78;p=thirdparty%2Ffreeradius-server.git

Build OpenDirectory on Apple
---

diff --git a/src/modules/rlm_mschap/rlm_mschap.c b/src/modules/rlm_mschap/rlm_mschap.c
index 30417133a6c..3cf4296d664 100644
--- a/src/modules/rlm_mschap/rlm_mschap.c
+++ b/src/modules/rlm_mschap/rlm_mschap.c
@@ -43,7 +43,7 @@ USES_APPLE_DEPRECATED_API	/* OpenSSL API has been deprecated by Apple */
 #  include	<openssl/rc4.h>
 #endif
 
-#ifdef WITH_OPEN_DIRECTORY
+#ifdef __APPLE__
 int od_mschap_auth(REQUEST *request, VALUE_PAIR *challenge, VALUE_PAIR * usernamepair);
 #endif
 
@@ -557,7 +557,7 @@ static const CONF_PARSER module_config[] = {
 	{ "retry_msg", FR_CONF_OFFSET(PW_TYPE_STRING, rlm_mschap_t, retry_msg), NULL },
 	{ "winbind_username", FR_CONF_OFFSET(PW_TYPE_STRING | PW_TYPE_TMPL, rlm_mschap_t, wb_username), NULL },
 	{ "winbind_domain", FR_CONF_OFFSET(PW_TYPE_STRING | PW_TYPE_TMPL, rlm_mschap_t, wb_domain), NULL },
-#ifdef WITH_OPEN_DIRECTORY
+#ifdef __APPLE__
 	{ "use_open_directory", FR_CONF_OFFSET(PW_TYPE_BOOLEAN, rlm_mschap_t, open_directory), "yes" },
 #endif
 
@@ -1815,7 +1815,7 @@ static rlm_rcode_t CC_HINT(nonnull) mod_authenticate(void * instance, REQUEST *r
 				username->vp_strvalue, response_name->vp_strvalue);
 		}
 
-#ifdef WITH_OPEN_DIRECTORY
+#ifdef __APPLE__
 		/*
 		 *  No "known good" NT-Password attribute.  Try to do
 		 *  OpenDirectory authentication.
diff --git a/src/modules/rlm_mschap/rlm_mschap.h b/src/modules/rlm_mschap/rlm_mschap.h
index 50bf8853de8..1ce1ad4a08c 100644
--- a/src/modules/rlm_mschap/rlm_mschap.h
+++ b/src/modules/rlm_mschap/rlm_mschap.h
@@ -39,7 +39,7 @@ typedef struct rlm_mschap_t {
 	vp_tmpl_t		*wb_username;
 	vp_tmpl_t		*wb_domain;
 	fr_connection_pool_t    *wb_pool;
-#ifdef WITH_OPEN_DIRECTORY
+#ifdef __APPLE__
 	bool			open_directory;
 #endif
 } rlm_mschap_t;