cmake: Rewrote FindGSSAPI.cmake.

ConfigureChecks.cmake

@@ -203,9 +203,9 @@ if (WITH_DEBUG_CALLTRACE)
   set(DEBUG_CALLTRACE 1)
 endif (WITH_DEBUG_CALLTRACE)
 
-if (WITH_GSSAPI AND NOT GSSAPI_LIBS)
+if (WITH_GSSAPI AND NOT GSSAPI_FOUND)
     set(WITH_GSSAPI 0)
-endif (WITH_GSSAPI AND NOT GSSAPI_LIBS)
+endif (WITH_GSSAPI AND NOT GSSAPI_FOUND)
 
 # ENDIAN
 if (NOT WIN32)

cmake/Modules/FindGSSAPI.cmake

@@ -1,78 +1,322 @@
-# - Try to detect the GSSAPI support
+# - Try to find GSSAPI
 # Once done this will define
 #
-#  GSSAPI_FOUND - system supports GSSAPI
+#  KRB5_CONFIG - Path to krb5-config
-#  GSSAPI_INCS - the GSSAPI include directory
+#  GSSAPI_ROOT_DIR - Set this variable to the root installation of GSSAPI
-#  GSSAPI_LIBS - the libraries needed to use GSSAPI
+#
-#  GSSAPI_FLAVOR - the type of API - MIT or HEIMDAL
+# Read-Only variables:
-
+#  GSSAPI_FOUND - system has GSSAPI
-# Copyright (c) 2006, Pino Toscano, <toscano.pino@tiscali.it>
+#  GSSAPI_INCLUDE_DIR - the GSSAPI include directory
+#  GSSAPI_LIBRARIES - Link these to use GSSAPI
+#  GSSAPI_DEFINITIONS - Compiler switches required for using GSSAPI
+#
+#=============================================================================
+#  Copyright (c) 2013 Andreas Schneider <asn@cryptomilk.org>
+#
+#  Distributed under the OSI-approved BSD License (the "License");
+#  see accompanying file Copyright.txt for details.
+#
+#  This software is distributed WITHOUT ANY WARRANTY; without even the
+#  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#  See the License for more information.
+#=============================================================================
 #
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
+find_path(GSSAPI_ROOT_DIR
+    NAMES
+        include/gssapi.h
+        include/gssapi/gssapi.h
+    HINTS
+        ${_GSSAPI_ROOT_HINTS}
+    PATHS
+        ${_GSSAPI_ROOT_PATHS}
+)
+mark_as_advanced(GSSAPI_ROOT_DIR)
 
-if(GSSAPI_LIBS AND GSSAPI_FLAVOR)
+if (UNIX)
+    find_program(KRB5_CONFIG
+        NAMES
+            krb5-config
+        PATHS
+            ${GSSAPI_ROOT_DIR}/bin
+            /opt/local/bin)
+    mark_as_advanced(KRB5_CONFIG)
 
-  # in cache already
+    if (KRB5_CONFIG)
-  set(GSSAPI_FOUND TRUE)
+        # Check if we have MIT KRB5
+        execute_process(
+            COMMAND
+                ${KRB5_CONFIG} --vendor
+            RESULT_VARIABLE
+                _GSSAPI_VENDOR_RESULT
+            OUTPUT_VARIABLE
+                _GSSAPI_VENDOR_STRING)
 
-else(GSSAPI_LIBS AND GSSAPI_FLAVOR)
+        if (_GSSAPI_VENDOR_STRING MATCHES ".*Massachusetts.*")
+            set(GSSAPI_FLAVOR_MIT TRUE)
+        else()
+            execute_process(
+                COMMAND
+                    ${KRB5_CONFIG} --libs gssapi
+                RESULT_VARIABLE
+                    _GSSAPI_LIBS_RESULT
+                OUTPUT_VARIABLE
+                    _GSSAPI_LIBS_STRING)
 
-  find_program(KRB5_CONFIG NAMES krb5-config PATHS
+            if (_GSSAPI_LIBS_STRING MATCHES ".*roken.*")
-     /opt/local/bin
+                set(GSSAPI_FLAVOR_HEIMDAL TRUE)
-     ONLY_CMAKE_FIND_ROOT_PATH               # this is required when cross compiling with cmake 2.6 and ignored with cmake 2.4, Alex
+            endif()
-  )
+        endif()
-  mark_as_advanced(KRB5_CONFIG)
-  
-  #reset vars
-  set(GSSAPI_INCS)
-  set(GSSAPI_LIBS)
-  set(GSSAPI_FLAVOR)
-  
-  if(KRB5_CONFIG)
-  
-    set(HAVE_KRB5_GSSAPI TRUE)
-    exec_program(${KRB5_CONFIG} ARGS --libs gssapi RETURN_VALUE _return_VALUE OUTPUT_VARIABLE GSSAPI_LIBS)
-    if(_return_VALUE)
-      message(STATUS "GSSAPI configure check failed.")
-      set(HAVE_KRB5_GSSAPI FALSE)
-    endif(_return_VALUE)
-  
-    exec_program(${KRB5_CONFIG} ARGS --cflags gssapi RETURN_VALUE _return_VALUE OUTPUT_VARIABLE GSSAPI_INCS)
-    string(REGEX REPLACE "(\r?\n)+$" "" GSSAPI_INCS "${GSSAPI_INCS}")
-    string(REGEX REPLACE " *-I" ";" GSSAPI_INCS "${GSSAPI_INCS}")
 
-    exec_program(${KRB5_CONFIG} ARGS --vendor RETURN_VALUE _return_VALUE OUTPUT_VARIABLE gssapi_flavor_tmp)
+        # Get the include dir
-    set(GSSAPI_FLAVOR_MIT)
+        execute_process(
-    if(gssapi_flavor_tmp MATCHES ".*Massachusetts.*")
+            COMMAND
-      set(GSSAPI_FLAVOR "MIT")
+                ${KRB5_CONFIG} --cflags gssapi
-    else(gssapi_flavor_tmp MATCHES ".*Massachusetts.*")
+            RESULT_VARIABLE
-      set(GSSAPI_FLAVOR "HEIMDAL")
+                _GSSAPI_INCLUDE_RESULT
-    endif(gssapi_flavor_tmp MATCHES ".*Massachusetts.*")
+            OUTPUT_VARIABLE
-  
+                _GSSAPI_INCLUDE_STRING)
-    if(NOT HAVE_KRB5_GSSAPI)
+        string(REGEX REPLACE "(\r?\n)+$" "" _GSSAPI_INCLUDE_STRING "${_GSSAPI_INCLUDE_STRING}")
-      if (gssapi_flavor_tmp MATCHES "Sun Microsystems.*")
+        string(REGEX REPLACE " *-I" "" _GSSAPI_INCLUDEDIR "${_GSSAPI_INCLUDE_STRING}")
-         message(STATUS "Solaris Kerberos does not have GSSAPI; this is normal.")
+    endif()
-         set(GSSAPI_LIBS)
-         set(GSSAPI_INCS)
-      else(gssapi_flavor_tmp MATCHES "Sun Microsystems.*")
-         message(WARNING "${KRB5_CONFIG} failed unexpectedly.")
-      endif(gssapi_flavor_tmp MATCHES "Sun Microsystems.*")
-    endif(NOT HAVE_KRB5_GSSAPI)
 
-    if(GSSAPI_LIBS) # GSSAPI_INCS can be also empty, so don't rely on that
+    if (NOT GSSAPI_FLAVOR_MIT AND NOT GSSAPI_FLAVOR_HEIMDAL)
-      set(GSSAPI_FOUND TRUE)
+        # Check for HEIMDAL
-      message(STATUS "Found GSSAPI: ${GSSAPI_LIBS}")
+        find_package(PkgConfig)
+        if (PKG_CONFIG_FOUND)
+            pkg_check_modules(_GSSAPI heimdal-gssapi)
+        endif (PKG_CONFIG_FOUND)
 
-      set(GSSAPI_INCS ${GSSAPI_INCS})
+        if (_GSSAPI_FOUND)
-      set(GSSAPI_LIBS ${GSSAPI_LIBS})
+            set(GSSAPI_FLAVOR_HEIMDAL TRUE)
-      set(GSSAPI_FLAVOR ${GSSAPI_FLAVOR})
+        else()
+            find_path(_GSSAPI_ROKEN
+                NAMES
+                    roken.h
+                PATHS
+                    ${GSSAPI_ROOT_DIR}/include
+                    ${_GSSAPI_INCLUDEDIR})
+            if (_GSSAPI_ROKEN)
+                set(GSSAPI_FLAVOR_HEIMDAL TRUE)
+            endif()
+        endif ()
+    endif()
+endif (UNIX)
 
-      mark_as_advanced(GSSAPI_INCS GSSAPI_LIBS GSSAPI_FLAVOR)
+find_path(GSSAPI_INCLUDE_DIR
+    NAMES
+        gssapi.h
+        gssapi/gssapi.h
+    PATHS
+        ${GSSAPI_ROOT_DIR}/include
+        ${_GSSAPI_INCLUDEDIR}
+)
 
-    endif(GSSAPI_LIBS)
+if (GSSAPI_FLAVOR_MIT)
-  
+    find_library(GSSAPI_LIBRARY
-  endif(KRB5_CONFIG)
+        NAMES
+            gssapi_krb5
+        PATHS
+            ${GSSAPI_ROOT_DIR}/lib
+            ${_GSSAPI_LIBDIR}
+    )
 
-endif(GSSAPI_LIBS AND GSSAPI_FLAVOR)
+    find_library(KRB5_LIBRARY
+        NAMES
+            krb5
+        PATHS
+            ${GSSAPI_ROOT_DIR}/lib
+            ${_GSSAPI_LIBDIR}
+    )
+
+    find_library(K5CRYPTO_LIBRARY
+        NAMES
+            k5crypto
+        PATHS
+            ${GSSAPI_ROOT_DIR}/lib
+            ${_GSSAPI_LIBDIR}
+    )
+
+    find_library(COM_ERR_LIBRARY
+        NAMES
+            com_err
+        PATHS
+            ${GSSAPI_ROOT_DIR}/lib
+            ${_GSSAPI_LIBDIR}
+    )
+
+    if (GSSAPI_LIBRARY)
+        set(GSSAPI_LIBRARIES
+            ${GSSAPI_LIBRARIES}
+            ${GSSAPI_LIBRARY}
+        )
+    endif (GSSAPI_LIBRARY)
+
+    if (KRB5_LIBRARY)
+        set(GSSAPI_LIBRARIES
+            ${GSSAPI_LIBRARIES}
+            ${KRB5_LIBRARY}
+        )
+    endif (KRB5_LIBRARY)
+
+    if (K5CRYPTO_LIBRARY)
+        set(GSSAPI_LIBRARIES
+            ${GSSAPI_LIBRARIES}
+            ${K5CRYPTO_LIBRARY}
+        )
+    endif (K5CRYPTO_LIBRARY)
+
+    if (COM_ERR_LIBRARY)
+        set(GSSAPI_LIBRARIES
+            ${GSSAPI_LIBRARIES}
+            ${COM_ERR_LIBRARY}
+        )
+    endif (COM_ERR_LIBRARY)
+endif (GSSAPI_FLAVOR_MIT)
+
+if (GSSAPI_FLAVOR_HEIMDAL)
+    find_library(GSSAPI_LIBRARY
+        NAMES
+            gssapi
+        PATHS
+            ${GSSAPI_ROOT_DIR}/lib
+            ${_GSSAPI_LIBDIR}
+    )
+
+    find_library(KRB5_LIBRARY
+        NAMES
+            krb5
+        PATHS
+            ${GSSAPI_ROOT_DIR}/lib
+            ${_GSSAPI_LIBDIR}
+    )
+
+    find_library(HCRYPTO_LIBRARY
+        NAMES
+            hcrypto
+        PATHS
+            ${GSSAPI_ROOT_DIR}/lib
+            ${_GSSAPI_LIBDIR}
+    )
+
+    find_library(COM_ERR_LIBRARY
+        NAMES
+            com_err
+        PATHS
+            ${GSSAPI_ROOT_DIR}/lib
+            ${_GSSAPI_LIBDIR}
+    )
+
+    find_library(HEIMNTLM_LIBRARY
+        NAMES
+            heimntlm
+        PATHS
+            ${GSSAPI_ROOT_DIR}/lib
+            ${_GSSAPI_LIBDIR}
+    )
+
+    find_library(HX509_LIBRARY
+        NAMES
+            hx509
+        PATHS
+            ${GSSAPI_ROOT_DIR}/lib
+            ${_GSSAPI_LIBDIR}
+    )
+
+    find_library(ASN1_LIBRARY
+        NAMES
+            asn1
+        PATHS
+            ${GSSAPI_ROOT_DIR}/lib
+            ${_GSSAPI_LIBDIR}
+    )
+
+    find_library(WIND_LIBRARY
+        NAMES
+            wind
+        PATHS
+            ${GSSAPI_ROOT_DIR}/lib
+            ${_GSSAPI_LIBDIR}
+    )
+
+    find_library(ROKEN_LIBRARY
+        NAMES
+            roken
+        PATHS
+            ${GSSAPI_ROOT_DIR}/lib
+            ${_GSSAPI_LIBDIR}
+    )
+
+    if (GSSAPI_LIBRARY)
+        set(GSSAPI_LIBRARIES
+            ${GSSAPI_LIBRARIES}
+            ${GSSAPI_LIBRARY}
+        )
+    endif (GSSAPI_LIBRARY)
+
+    if (KRB5_LIBRARY)
+        set(GSSAPI_LIBRARIES
+            ${GSSAPI_LIBRARIES}
+            ${KRB5_LIBRARY}
+        )
+    endif (KRB5_LIBRARY)
+
+    if (HCRYPTO_LIBRARY)
+        set(GSSAPI_LIBRARIES
+            ${GSSAPI_LIBRARIES}
+            ${HCRYPTO_LIBRARY}
+        )
+    endif (HCRYPTO_LIBRARY)
+
+    if (COM_ERR_LIBRARY)
+        set(GSSAPI_LIBRARIES
+            ${GSSAPI_LIBRARIES}
+            ${COM_ERR_LIBRARY}
+        )
+    endif (COM_ERR_LIBRARY)
+
+    if (HEIMNTLM_LIBRARY)
+        set(GSSAPI_LIBRARIES
+            ${GSSAPI_LIBRARIES}
+            ${HEIMNTLM_LIBRARY}
+        )
+    endif (HEIMNTLM_LIBRARY)
+
+    if (HX509_LIBRARY)
+        set(GSSAPI_LIBRARIES
+            ${GSSAPI_LIBRARIES}
+            ${HX509_LIBRARY}
+        )
+    endif (HX509_LIBRARY)
+
+    if (ASN1_LIBRARY)
+        set(GSSAPI_LIBRARIES
+            ${GSSAPI_LIBRARIES}
+            ${ASN1_LIBRARY}
+        )
+    endif (ASN1_LIBRARY)
+
+    if (WIND_LIBRARY)
+        set(GSSAPI_LIBRARIES
+            ${GSSAPI_LIBRARIES}
+            ${WIND_LIBRARY}
+        )
+    endif (WIND_LIBRARY)
+
+    if (ROKEN_LIBRARY)
+        set(GSSAPI_LIBRARIES
+            ${GSSAPI_LIBRARIES}
+            ${WIND_LIBRARY}
+        )
+    endif (ROKEN_LIBRARY)
+endif (GSSAPI_FLAVOR_HEIMDAL)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(GSSAPI DEFAULT_MSG GSSAPI_LIBRARIES GSSAPI_INCLUDE_DIR)
+
+if (GSSAPI_INCLUDE_DIRS AND GSSAPI_LIBRARIES)
+    set(GSSAPI_FOUND TRUE)
+endif (GSSAPI_INCLUDE_DIRS AND GSSAPI_LIBRARIES)
+
+# show the GSSAPI_INCLUDE_DIRS and GSSAPI_LIBRARIES variables only in the advanced view
+mark_as_advanced(GSSAPI_INCLUDE_DIRS GSSAPI_LIBRARIES)

examples/CMakeLists.txt

@@ -44,13 +44,13 @@ if (UNIX AND NOT WIN32)
         add_executable(samplesshd samplesshd.c)
         target_link_libraries(samplesshd ${LIBSSH_SHARED_LIBRARY} ${ARGP_LIBRARIES})
 
-        if (WITH_GSSAPI)
+        if (WITH_GSSAPI AND GSSAPI_FOUND)
             add_executable(samplesshd-cb samplesshd-cb.c)
             target_link_libraries(samplesshd-cb ${LIBSSH_SHARED_LIBRARY} ${ARGP_LIBRARIES})
 
             add_executable(proxy proxy.c)
             target_link_libraries(proxy ${LIBSSH_SHARED_LIBRARY} ${ARGP_LIBRARIES})
-        endif (WITH_GSSAPI)
+        endif (WITH_GSSAPI AND GSSAPI_FOUND)
 
         add_executable(samplesshd-kbdint samplesshd-kbdint.c)
         target_link_libraries(samplesshd-kbdint ${LIBSSH_SHARED_LIBRARY} ${ARGP_LIBRARIES})

src/CMakeLists.txt

@@ -64,12 +64,17 @@ if (WITH_ZLIB)
   )
 endif (WITH_ZLIB)
 
-if (WITH_GSSAPI AND GSSAPI_LIBS)
+if (WITH_GSSAPI AND GSSAPI_FOUND)
+  set(LIBSSH_PRIVATE_INCLUDE_DIRS
+    ${LIBSSH_PRIVATE_INCLUDE_DIRS}
+    ${GSSAPI_INCLUDE_DIR}
+  )
+
   set(LIBSSH_LINK_LIBRARIES
     ${LIBSSH_LINK_LIBRARIES}
-    ${GSSAPI_LIBS}
+    ${GSSAPI_LIBRARIES}
   )
-endif (WITH_GSSAPI AND GSSAPI_LIBS)
+endif (WITH_GSSAPI AND GSSAPI_FOUND)
 
 set(LIBSSH_LINK_LIBRARIES
   ${LIBSSH_LINK_LIBRARIES}
@@ -180,12 +185,12 @@ if (WITH_ZLIB)
   )
 endif(WITH_ZLIB)
 
-if (WITH_GSSAPI AND GSSAPI_LIBS)
+if (WITH_GSSAPI AND GSSAPI_FOUND)
   set(libssh_SRCS
     ${libssh_SRCS}
     gssapi.c
   )
-endif (WITH_GSSAPI AND GSSAPI_LIBS)
+endif (WITH_GSSAPI AND GSSAPI_FOUND)
 
 include_directories(
   ${LIBSSH_PUBLIC_INCLUDE_DIRS}