|
 |
8f2224 |
From d681fe586a4f4258c5d61237511dd19c1fa84904 Mon Sep 17 00:00:00 2001
|
|
|
8f2224 |
From: Robbie Harwood <rharwood@redhat.com>
|
|
|
8f2224 |
Date: Tue, 19 Feb 2019 13:55:12 -0500
|
|
|
8f2224 |
Subject: [PATCH] Fix integer sizes used with ap_set_flag_slot()
|
|
|
8f2224 |
|
|
|
8f2224 |
ap_set_flag_slot() requires a field of type `int`. Previously we
|
|
|
8f2224 |
passed type `bool` in two places, causing test failures on s390x
|
|
|
8f2224 |
because logging was not correctly configured.
|
|
|
8f2224 |
|
|
|
8f2224 |
Signed-off-by: Robbie Harwood <rharwood@redhat.com>
|
|
|
8f2224 |
(cherry picked from commit f89b876be5619d750e6ab4ea6e730a9a26b1cac4)
|
|
|
8f2224 |
(cherry picked from commit 73c690ca9bd1d470c603f5e1ee48d2384941ae55)
|
|
|
8f2224 |
---
|
|
|
8f2224 |
src/mod_auth_gssapi.h | 4 ++--
|
|
|
8f2224 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
8f2224 |
|
|
|
8f2224 |
diff --git a/src/mod_auth_gssapi.h b/src/mod_auth_gssapi.h
|
|
|
8f2224 |
index 71404ff..8c0b972 100644
|
|
|
8f2224 |
--- a/src/mod_auth_gssapi.h
|
|
|
8f2224 |
+++ b/src/mod_auth_gssapi.h
|
|
|
8f2224 |
@@ -79,7 +79,7 @@ struct mag_config {
|
|
|
8f2224 |
gid_t deleg_ccache_gid;
|
|
|
8f2224 |
gss_key_value_set_desc *cred_store;
|
|
|
8f2224 |
bool deleg_ccache_unique;
|
|
|
8f2224 |
- bool s4u2self;
|
|
|
8f2224 |
+ int s4u2self;
|
|
|
8f2224 |
char *ccname_envvar;
|
|
|
8f2224 |
#endif
|
|
|
8f2224 |
struct seal_key *mag_skey;
|
|
|
8f2224 |
@@ -90,7 +90,7 @@ struct mag_config {
|
|
|
8f2224 |
bool negotiate_once;
|
|
|
8f2224 |
struct mag_name_attributes *name_attributes;
|
|
|
8f2224 |
const char *required_na_expr;
|
|
|
8f2224 |
- bool enverrs;
|
|
|
8f2224 |
+ int enverrs;
|
|
|
8f2224 |
gss_name_t acceptor_name;
|
|
|
8f2224 |
bool acceptor_name_from_req;
|
|
|
8f2224 |
};
|