|
1 On Solaris, pam_appl.h must be included to use pam_modules.h. |
|
2 Additionally, for platforms that have the pam header files in a different |
|
3 location, the include paths need to be based on the result of configure. |
|
4 |
|
5 Need to file upstream bug |
|
6 |
|
7 --- gnome-keyring-3.16.0/configure.ac 2015-04-08 05:09:11.000000000 -0700 |
|
8 +++ gnome-keyring-3.16.0/configure.ac 2015-07-06 13:41:06.760980131 -0700 |
|
9 @@ -254,7 +254,15 @@ |
|
10 |
|
11 pam_status="no" |
|
12 if test "$enable_pam" != "no"; then |
|
13 - AC_CHECK_HEADERS(security/pam_modules.h pam/pam_modules.h, [have_pam=yes; break], have_pam=no) |
|
14 + AC_CHECK_HEADERS(security/pam_appl.h pam/pam_appl.h) |
|
15 + AC_CHECK_HEADERS(security/pam_modules.h pam/pam_modules.h, [have_pam=yes; break], have_pam=no, |
|
16 +[#ifdef HAVE_SECURITY_PAM_APPL_H |
|
17 +#include <security/pam_appl.h> |
|
18 +#endif |
|
19 +#ifdef HAVE_PAM_PAM_APPL_H |
|
20 +#include <pam/pam_appl.h> |
|
21 +#endif |
|
22 +]) |
|
23 if test "$enable_pam" = "yes" -a "$have_pam" = "no"; then |
|
24 AC_MSG_ERROR(The PAM headers are missing) |
|
25 elif test "$have_pam" = "yes"; then |
|
26 --- gnome-keyring-3.16.0/pam/gkr-pam-module.c 2014-09-23 00:45:13.000000000 -0700 |
|
27 +++ gnome-keyring-3.16.0/pam/gkr-pam-module.c 2015-07-06 13:46:40.611562409 -0700 |
|
28 @@ -32,8 +32,13 @@ |
|
29 |
|
30 #include "daemon/control/gkd-control-codes.h" |
|
31 |
|
32 +#ifdef HAVE_PAM_PAM_APPL_H |
|
33 +#include <pam/pam_appl.h> |
|
34 +#include <pam/pam_modules.h> |
|
35 +#else |
|
36 #include <security/pam_appl.h> |
|
37 #include <security/pam_modules.h> |
|
38 +#endif |
|
39 |
|
40 #include <sys/types.h> |
|
41 #include <sys/stat.h> |
|
42 --- gnome-keyring-3.16.0/pam/mock-pam.c 2014-09-23 00:45:13.000000000 -0700 |
|
43 +++ gnome-keyring-3.16.0/pam/mock-pam.c 2015-07-06 13:46:19.879319092 -0700 |
|
44 @@ -20,8 +20,13 @@ |
|
45 |
|
46 #include "config.h" |
|
47 |
|
48 +#ifdef HAVE_PAM_PAM_APPL_H |
|
49 +#include <pam/pam_appl.h> |
|
50 +#include <pam/pam_modules.h> |
|
51 +#else |
|
52 #include <security/pam_appl.h> |
|
53 #include <security/pam_modules.h> |
|
54 +#endif |
|
55 |
|
56 #include <stdlib.h> |
|
57 #include <string.h> |
|
58 --- gnome-keyring-3.16.0/pam/test-pam.c 2014-10-14 08:55:45.000000000 -0700 |
|
59 +++ gnome-keyring-3.16.0/pam/test-pam.c 2015-07-06 13:46:16.817220995 -0700 |
|
60 @@ -26,7 +26,11 @@ |
|
61 #include "egg/egg-testing.h" |
|
62 #include "egg/egg-secure-memory.h" |
|
63 |
|
64 +#ifdef HAVE_PAM_PAM_APPL_H |
|
65 +#include <pam/pam_appl.h> |
|
66 +#else |
|
67 #include <security/pam_appl.h> |
|
68 +#endif |
|
69 |
|
70 #include <glib.h> |
|
71 #include <glib/gstdio.h> |