From 0fd556115af6899df930f5e991f785cb8f2a58b5 Mon Sep 17 00:00:00 2001 From: Eduardo Chappa Date: Wed, 4 Jul 2018 02:52:06 -0600 Subject: * Kerberos was included twice in OSX due to a double definition of gss coming from the configure script and imap/Makefile. Remove the double definition from imap/Makefile. Reported and patched by Wang Kang. --- imap/Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'imap') diff --git a/imap/Makefile b/imap/Makefile index f696afba..c98d48dd 100644 --- a/imap/Makefile +++ b/imap/Makefile @@ -417,21 +417,20 @@ osi: an oxp: an $(TOUCH) ip6 - $(BUILD) BUILDTYPE=osx IP=$(IP6) EXTRAAUTHENTICATORS="$(EXTRAAUTHENTICATORS) gss" \ + $(BUILD) BUILDTYPE=osx IP=$(IP6) \ PASSWDTYPE=pam \ EXTRACFLAGS="$(EXTRACFLAGS) -DMAC_OSX_KLUDGE=1" \ SPECIALS="GSSINCLUDE=/usr/include GSSLIB=/usr/lib PAMDLFLAGS=-lpam" oxs: an $(TOUCH) ip6 - $(BUILD) BUILDTYPE=osx IP=$(IP6) EXTRAAUTHENTICATORS="$(EXTRAAUTHENTICATORS) gss" \ + $(BUILD) BUILDTYPE=osx IP=$(IP6) \ PASSWDTYPE=pam \ - EXTRACFLAGS="$(EXTRACFLAGS)" \ SPECIALS="GSSINCLUDE=/usr/include GSSLIB=/usr/lib PAMDLFLAGS=-lpam" osx: osxok an $(TOUCH) ip6 - $(BUILD) BUILDTYPE=$@ IP=$(IP6) EXTRAAUTHENTICATORS="$(EXTRAAUTHENTICATORS) gss" \ + $(BUILD) BUILDTYPE=$@ IP=$(IP6) \ SPECIALS="GSSINCLUDE=/usr/include GSSLIB=/usr/lib" osxok: -- cgit v1.2.3-54-g00ecf