1 | diff -rc imap/Makefile imap/Makefile |
---|
2 | *** imap/Makefile 2008-06-04 19:43:35.000000000 +0100 |
---|
3 | --- imap/Makefile 2009-09-02 10:55:38.000000000 +0100 |
---|
4 | *************** |
---|
5 | *** 418,424 **** |
---|
6 | $(TOUCH) ip6 |
---|
7 | $(BUILD) BUILDTYPE=osx IP=$(IP6) EXTRAAUTHENTICATORS="$(EXTRAAUTHENTICATORS) gss" \ |
---|
8 | PASSWDTYPE=pam \ |
---|
9 | - EXTRACFLAGS="$(EXTRACFLAGS) -DMAC_OSX_KLUDGE=1" \ |
---|
10 | SPECIALS="SSLINCLUDE=/usr/include/openssl SSLLIB=/usr/lib SSLCERTS=/System/Library/OpenSSL/certs SSLKEYS=/System/Library/OpenSSL/private GSSINCLUDE=/usr/include GSSLIB=/usr/lib PAMDLFLAGS=-lpam" |
---|
11 | |
---|
12 | osx: osxok an |
---|
13 | --- 418,423 ---- |
---|
14 | diff -rc imap/src/osdep/unix/ckp_pam.c imap/src/osdep/unix/ckp_pam.c |
---|
15 | *** imap/src/osdep/unix/ckp_pam.c 2008-06-04 19:18:34.000000000 +0100 |
---|
16 | --- imap/src/osdep/unix/ckp_pam.c 2009-09-02 10:56:36.000000000 +0100 |
---|
17 | *************** |
---|
18 | *** 27,37 **** |
---|
19 | */ |
---|
20 | |
---|
21 | |
---|
22 | - #ifdef MAC_OSX_KLUDGE /* why can't Apple be compatible? */ |
---|
23 | - #include <pam/pam_appl.h> |
---|
24 | - #else |
---|
25 | #include <security/pam_appl.h> |
---|
26 | - #endif |
---|
27 | |
---|
28 | struct checkpw_cred { |
---|
29 | char *uname; /* user name */ |
---|
30 | --- 27,33 ---- |
---|