Merge lp:~stewart/percona-pam-for-mysql/bug1012488 into lp:percona-pam-for-mysql

[Stewart Smith]

Include pam_misc or openpam headers based on configure check.

[Alexey Kopytov (akopytov)]

Verified the patch fixes the plugin build on OSX (after adding a workaround for bug #1012498).

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2012-02-13 06:19:11 +0000
+++ CMakeLists.txt	2012-06-13 04:20:23 +0000
@@ -18,6 +18,8 @@
 CHECK_LIBRARY_EXISTS(mysqlclient mysql_init "" HAVE_MYSQLCLIENT) 
 CHECK_SYMBOL_EXISTS(getpwnam_r "pwd.h" HAVE_GETPWNAM_R)
 CHECK_SYMBOL_EXISTS(getgrgid_r "grp.h" HAVE_GETGRGID_R)
+CHECK_INCLUDE_FILES (security/pam_misc.h HAVE_SECURITY_PAM_MISC_H)
+CHECK_INCLUDE_FILES (security/openpam.h HAVE_SECURITY_OPENPAM_H)
 IF(HAVE_PAM AND HAVE_MYSQLCLIENT AND HAVE_GETPWNAM_R AND HAVE_GETGRGID_R)
   SET(AUTH_PAM_COMMON_SOURCES 
     src/auth_pam_common.c src/lib_auth_pam_client.c src/lib_auth_pam_client.h
 
=== modified file 'src/auth_pam_common.h'
--- src/auth_pam_common.h	2012-02-13 06:19:11 +0000
+++ src/auth_pam_common.h	2012-06-13 04:20:23 +0000
@@ -31,7 +31,11 @@
 
 #include <security/pam_appl.h>
 #include <security/pam_modules.h>
+#if HAVE_SECURITY_PAM_MISC_H
 #include <security/pam_misc.h>
+#elif HAVE_SECURITY_OPENPAM_H
+#include <security/openpam.h>
+#endif
 
 #include <mysql/plugin.h>
 #include <mysql/plugin_auth.h>