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