| author | Jiri Sasek <Jiri.Sasek@Oracle.COM> |
| Wed, 26 Apr 2017 14:53:43 -0700 | |
| changeset 7954 | f5d146a3f5e6 |
| parent 5741 | b943514525d4 |
| permissions | -rw-r--r-- |
|
5055
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
1 |
Developed in-house at Oracle |
|
5741
b943514525d4
PSARC/2016/158 security-related packaging changes for libsasl2
Jan Parcel <jan.parcel@oracle.com>
parents:
5055
diff
changeset
|
2 |
Put our solution into an attachment and comment in cyrus bugzilla: |
|
b943514525d4
PSARC/2016/158 security-related packaging changes for libsasl2
Jan Parcel <jan.parcel@oracle.com>
parents:
5055
diff
changeset
|
3 |
Bug 3705 - cmulocal/sasl2.m4 has broken gssapi logic |
|
b943514525d4
PSARC/2016/158 security-related packaging changes for libsasl2
Jan Parcel <jan.parcel@oracle.com>
parents:
5055
diff
changeset
|
4 |
|
|
5055
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
5 |
|
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
6 |
diff -rupN old/cmulocal/sasl2.m4 new/cmulocal/sasl2.m4 |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
7 |
--- old/cmulocal/sasl2.m4 2015-01-16 15:18:02.047946282 -0800 |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
8 |
+++ new/cmulocal/sasl2.m4 2015-01-16 15:31:22.716646757 -0800 |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
9 |
@@ -73,10 +73,12 @@ if test "$gssapi" != no; then |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
10 |
|
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
11 |
fi |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
12 |
|
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
13 |
-if test "$gssapi" != no; then |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
14 |
- if test "$ac_cv_header_gssapi_h" = "yes" -o "$ac_cv_header_gssapi_gssapi_h" = "yes"; then |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
15 |
- AC_DEFINE(HAVE_GSSAPI_H,,[Define if you have the gssapi.h header file]) |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
16 |
- fi |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
17 |
+ if test "$gssapi" != no; then |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
18 |
+ if test "$ac_cv_header_gssapi_h" = "yes" ; then |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
19 |
+ AC_DEFINE(HAVE_GSSAPI_H,,[Define if you have the gssapi.h header file]) |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
20 |
+ elif test "$ac_cv_header_gssapi_gssapi_h" = "yes"; then |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
21 |
+ AC_DEFINE(HAVE_GSSAPI_GSSAPI_H,,[Define for gssapi/gssapi.h header file]) |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
22 |
+ fi |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
23 |
|
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
24 |
# We need to find out which gssapi implementation we are |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
25 |
# using. Supported alternatives are: MIT Kerberos 5, |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
26 |
diff -rupN old/config.h.in new/config.h.in |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
27 |
--- old/config.h.in 2015-01-16 15:14:54.941649896 -0800 |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
28 |
+++ new/config.h.in 2015-01-16 15:16:16.884212684 -0800 |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
29 |
@@ -122,6 +122,9 @@ |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
30 |
/* Define if you have the gssapi.h header file */ |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
31 |
#undef HAVE_GSSAPI_H |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
32 |
|
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
33 |
+/* Define if you have the gssapi/gssapi.h header file */ |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
34 |
+#undef HAVE_GSSAPI_GSSAPI_H |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
35 |
+ |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
36 |
/* Define to 1 if you have the `gsskrb5_register_acceptor_identity' function. |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
37 |
*/ |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
38 |
#undef HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY |