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>
(cherry picked from commit 5593ff360c7a8f9f69cebda0cb2e2909ff2f31b4)
Reviewed-on: http://gerrit.openafs.org/357

diff --git a/Makefile.in b/Makefile.in
index 4dc9649ae60edc695d9509ccd8a03ee8b3dd579c..1b7a4e838a14407f50e8858ce11717b9fa4333db 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -514,7 +514,7 @@ shlibafsrpc: rx rxkad des
        case ${SYS_NAME} in \
        amd64_linux24) \
                echo Skipping shlibafsrpc for amd64_linux24 ;; \
-       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} ;; \
@@ -524,7 +524,7 @@ shlibafsauthent: ubik auth kauth shlibafsrpc
        case ${SYS_NAME} in \
        amd64_linux24) \
                echo Skipping shlibafsauthent for amd64_linux24 ;; \
-       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 6722f33b170eb25f6737f8104f33d91194d538f0..7dc571ac748fc796668bb788b5046b339ad327b7 100644 (file)
--- a/src/auth/ktc.c
+++ b/src/auth/ktc.c
@@ -59,6 +59,9 @@
 #endif
 #endif
 #endif
+#ifdef AFS_DARWIN100_ENV
+#include <crt_externs.h>
+#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
@@ -1665,7 +1668,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 96b81e5fb5958e754853b0613e374caa4dfc78c0..ac9b3f1488e01b1dab1425e7e0769dcd0584ca26 100644 (file)
--- a/src/cf/osconf.m4
+++ b/src/cf/osconf.m4
@@ -552,12 +552,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"