percona-pam-for-mysql

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

  1. bug1012488
  2. Merge into percona-pam-for-mysql
Proposed by Stewart Smith
Status: Merged
Approved by: Alexey Kopytov
Approved revision: 27
Merged at revision: 28
Proposed branch: lp:~stewart/percona-pam-for-mysql/bug1012488
Merge into: lp:percona-pam-for-mysql
Diff against target: 28 lines (+6/-0)
2 files modified
CMakeLists.txt (+2/-0)
src/auth_pam_common.h (+4/-0)
To merge this branch: bzr merge lp:~stewart/percona-pam-for-mysql/bug1012488
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) Approve
Review via email: mp+109978@code.launchpad.net

Description of the change

Include pam_misc or openpam headers based on configure check.

To post a comment you must log in.
Revision history for this message
Alexey Kopytov (akopytov) wrote :

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

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2012-02-13 06:19:11 +0000
3+++ CMakeLists.txt 2012-06-13 04:20:23 +0000
4@@ -18,6 +18,8 @@
5 CHECK_LIBRARY_EXISTS(mysqlclient mysql_init "" HAVE_MYSQLCLIENT)
6 CHECK_SYMBOL_EXISTS(getpwnam_r "pwd.h" HAVE_GETPWNAM_R)
7 CHECK_SYMBOL_EXISTS(getgrgid_r "grp.h" HAVE_GETGRGID_R)
8+CHECK_INCLUDE_FILES (security/pam_misc.h HAVE_SECURITY_PAM_MISC_H)
9+CHECK_INCLUDE_FILES (security/openpam.h HAVE_SECURITY_OPENPAM_H)
10 IF(HAVE_PAM AND HAVE_MYSQLCLIENT AND HAVE_GETPWNAM_R AND HAVE_GETGRGID_R)
11 SET(AUTH_PAM_COMMON_SOURCES
12 src/auth_pam_common.c src/lib_auth_pam_client.c src/lib_auth_pam_client.h
13
14=== modified file 'src/auth_pam_common.h'
15--- src/auth_pam_common.h 2012-02-13 06:19:11 +0000
16+++ src/auth_pam_common.h 2012-06-13 04:20:23 +0000
17@@ -31,7 +31,11 @@
18
19 #include <security/pam_appl.h>
20 #include <security/pam_modules.h>
21+#if HAVE_SECURITY_PAM_MISC_H
22 #include <security/pam_misc.h>
23+#elif HAVE_SECURITY_OPENPAM_H
24+#include <security/openpam.h>
25+#endif
26
27 #include <mysql/plugin.h>
28 #include <mysql/plugin_auth.h>

Subscribers

People subscribed via source and target branches