Patches from Apple to build without <membershipPriv.h>

diff --git a/src/modules/rlm_opendirectory/Makefile.in b/src/modules/rlm_opendirectory/Makefile.in
index 5ef8eb3..5475608 100644 (file)
--- a/src/modules/rlm_opendirectory/Makefile.in
+++ b/src/modules/rlm_opendirectory/Makefile.in
@@ -1,7 +1,7 @@
 TARGET     = @targetname@
 SRCS       = rlm_opendirectory.c
 HEADERS    =
-RLM_LDFLAGS = @od_ldflags@
+RLM_LIBS   = @od_ldflags@
 RLM_CFLAGS = @od_cflags@
 
 include ../rules.mak

diff --git a/src/modules/rlm_opendirectory/configure b/src/modules/rlm_opendirectory/configure
index 1c37367..8509faf 100755 (executable)
--- a/src/modules/rlm_opendirectory/configure
+++ b/src/modules/rlm_opendirectory/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.1 .
+# From configure.in Revision: 1.2 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61.
 #
@@ -2795,9 +2795,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-ac_safe=`echo "membershipPriv.h" | sed 'y%./+-%__pm%'`
-{ echo "$as_me:$LINENO: checking for membershipPriv.h" >&5
-echo $ECHO_N "checking for membershipPriv.h... $ECHO_C" >&6; }
+ac_safe=`echo "membership.h" | sed 'y%./+-%__pm%'`
+{ echo "$as_me:$LINENO: checking for membership.h" >&5
+echo $ECHO_N "checking for membership.h... $ECHO_C" >&6; }
 
 old_CFLAGS="$CFLAGS"
 smart_include=
@@ -2813,7 +2813,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-                   #include <membershipPriv.h>
+                   #include <membership.h>
 int
 main ()
 {
@@ -2863,7 +2863,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-                 #include <membershipPriv.h>
+                 #include <membership.h>
 int
 main ()
 {
@@ -2905,7 +2905,7 @@ if test "x$smart_include" = "x"; then
 
 if test "x$LOCATE" != "x"; then
         DIRS=
-  file=membershipPriv.h
+  file=membership.h
 
   for x in `${LOCATE} $file 2>/dev/null`; do
                                         base=`echo $x | sed "s%/${file}%%"`
@@ -2938,7 +2938,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-                   #include <membershipPriv.h>
+                   #include <membership.h>
 int
 main ()
 {
@@ -2991,8 +2991,8 @@ else
 echo "${ECHO_T}no" >&6; }
 fi
 
-       if test "$ac_cv_header_membershippriv_h" != "yes"; then
-         fail="$fail membershipPriv.h"
+       if test "$ac_cv_header_membership_h" != "yes"; then
+         fail="$fail membership.h"
        fi
        targetname=rlm_opendirectory
 else

diff --git a/src/modules/rlm_opendirectory/configure.in b/src/modules/rlm_opendirectory/configure.in
index 193acf6..b315f5e 100644 (file)
--- a/src/modules/rlm_opendirectory/configure.in
+++ b/src/modules/rlm_opendirectory/configure.in
@@ -9,9 +9,9 @@ if test x$with_[]modname != xno; then
 
        od_ldflags="${od_ldflags} -framework DirectoryService" 
        
-       FR_SMART_CHECK_INCLUDE(membershipPriv.h)
-       if test "$ac_cv_header_membershippriv_h" != "yes"; then
-         fail="$fail membershipPriv.h"
+       FR_SMART_CHECK_INCLUDE(membership.h)
+       if test "$ac_cv_header_membership_h" != "yes"; then
+         fail="$fail membership.h"
        fi
        targetname=modname
 else

diff --git a/src/modules/rlm_opendirectory/rlm_opendirectory.c b/src/modules/rlm_opendirectory/rlm_opendirectory.c
index bfc2b81..5f7b560 100644 (file)
--- a/src/modules/rlm_opendirectory/rlm_opendirectory.c
+++ b/src/modules/rlm_opendirectory/rlm_opendirectory.c
@@ -39,7 +39,13 @@
 
 #include <DirectoryService/DirectoryService.h>
 #include <membership.h>
+
+#if HAVE_APPLE_SPI
 #include <membershipPriv.h>
+#else
+int mbr_check_service_membership(const uuid_t user, const char *servicename, int *ismember);
+int mbr_check_membership_refresh(const uuid_t user, uuid_t group, int *ismember);
+#endif
 
 /* RADIUS service ACL constants */
 #define kRadiusSACLName                "com.apple.access_radius"
@@ -393,11 +399,11 @@ int od_authorize(void *instance, REQUEST *request)
        {
                if (rad_client == NULL) {
                        radlog(L_DBG, "rlm_opendirectory: The client record could not be found for host %s.",
-                                       ip_ntoa(host_ipaddr, request->packet->src_ipaddr));
+                                       ip_ntoa(host_ipaddr, request->packet->src_ipaddr.ipaddr.ip4addr.s_addr));
                }
                else {
                        radlog(L_DBG, "rlm_opendirectory: The host %s does not have an access group.",
-                                       ip_ntoa(host_ipaddr, request->packet->src_ipaddr));
+                                       ip_ntoa(host_ipaddr, request->packet->src_ipaddr.ipaddr.ip4addr.s_addr));
                }
        }