From: Derrick Brashear <shadow@dementia.org>
Date: Wed, 29 Jul 2009 21:23:14 +0000 (-0400)
Subject: macos 10.6 pam support
X-Git-Tag: openafs-devel-1_5_61~10
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=5593ff360c7a8f9f69cebda0cb2e2909ff2f31b4;p=packages%2Fo%2Fopenafs.git

macos 10.6 pam support

Make pam module compile on 10.6. Not tested yet.

Reviewed-on: http://gerrit.openafs.org/249
Tested-by: Derrick Brashear <shadow@dementia.org>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/Makefile.in b/Makefile.in
index 08c7f2181..6f3da121f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -560,7 +560,7 @@ libafsauthent: ubik auth kauth libafsrpc
 # pthread based user space RX library
 shlibafsrpc: rx rxkad des
 	+case ${SYS_NAME} in \
-	alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*) \
+	alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*_darwin_1*) \
 	${COMPILE_PART1} shlibafsrpc ${COMPILE_PART2} ;; \
 	*) \
 		echo Not building shared libafsrpc for ${SYS_NAME} ;; \
@@ -568,7 +568,7 @@ shlibafsrpc: rx rxkad des
 
 shlibafsauthent: ubik auth kauth shlibafsrpc
 	+case ${SYS_NAME} in \
-	alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*) \
+	alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*_darwin_1*) \
 	${COMPILE_PART1} shlibafsauthent ${COMPILE_PART2} ;; \
 	*) \
 		echo Not building shared libafsauthent for ${SYS_NAME} ;; \
diff --git a/src/auth/ktc.c b/src/auth/ktc.c
index 080493927..3cba192bb 100644
--- a/src/auth/ktc.c
+++ b/src/auth/ktc.c
@@ -60,6 +60,9 @@
 #endif
 #endif
 #endif
+#ifdef AFS_DARWIN100_ENV
+#include <crt_externs.h>
+#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
@@ -1667,7 +1670,11 @@ afs_tf_dest_tkt(void)
 int
 ktc_newpag(void)
 {
-    extern char **environ;
+#ifdef AFS_DARWIN100_ENV
+#define environ (*_NSGetEnviron())
+#else
+extern char **environ;
+#endif
 
     afs_uint32 pag;
     struct stat sbuf;
diff --git a/src/cf/osconf.m4 b/src/cf/osconf.m4
index a5fbbbe2b..4a4e69a93 100644
--- a/src/cf/osconf.m4
+++ b/src/cf/osconf.m4
@@ -570,12 +570,14 @@ case $AFS_SYSNAME in
 		AFSD_LDFLAGS="-F/System/Library/PrivateFrameworks -framework DiskArbitration -framework SystemConfiguration -framework IOKit -framework CoreFoundation"
 		LEX="lex -l"
 		MT_CFLAGS='-DAFS_PTHREAD_ENV -D_REENTRANT ${XCFLAGS} ${ARCHFLAGS}'
+		MT_LIBS="-lresolv"
 		KROOT=
 		KINCLUDES='-I$(KROOT)/System/Library/Frameworks/Kernel.framework/Headers'
 		LD="cc"
 		KERN_OPTMZ="-Os"
 		LWP_OPTMZ="-Os"
 		OPTMZ="-Os"
+		PAM_LIBS="-lpam"
 		REGEX_OBJ="regex.o"
 		TXLIBS="-lncurses"
 		EXTRA_VLIBOBJS="fstab.o"