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