56 lines
1.7 KiB
Diff
56 lines
1.7 KiB
Diff
|
From 0114d24ea160676b784ef7010c19bbacc67ceea0 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Rob Crittenden <rcritten@redhat.com>
|
||
|
|
Date: Thu, 15 Jul 2021 17:52:54 -0400
|
||
|
|
Subject: [PATCH] ipa-getkeytab: fix compiler warnings
|
||
|
|
|
||
|
|
Make read_ipa_config and filter_keys static to avoid
|
||
|
|
"no previous prototype" warnings.
|
||
|
|
|
||
|
|
Use correct datatype of return value for ber_scanf to
|
||
|
|
correct different signedness comparision.
|
||
|
|
|
||
|
|
Fixed while working on https://pagure.io/freeipa/issue/8478
|
||
|
|
|
||
|
|
Signed-off-by: Rob Crittenden <rcritten@redhat.com>
|
||
|
|
Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
|
||
|
|
Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
|
||
|
|
Reviewed-By: Florence Blanc-Renaud <flo@redhat.com>
|
||
|
|
---
|
||
|
|
client/ipa-getkeytab.c | 6 +++---
|
||
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/client/ipa-getkeytab.c b/client/ipa-getkeytab.c
|
||
|
|
index d3673eb05..309b3c704 100644
|
||
|
|
--- a/client/ipa-getkeytab.c
|
||
|
|
+++ b/client/ipa-getkeytab.c
|
||
|
|
@@ -291,7 +291,7 @@ static int ldap_sasl_interact(LDAP *ld, unsigned flags, void *priv_data, void *s
|
||
|
|
return ret;
|
||
|
|
}
|
||
|
|
|
||
|
|
-int filter_keys(krb5_context krbctx, struct keys_container *keys,
|
||
|
|
+static int filter_keys(krb5_context krbctx, struct keys_container *keys,
|
||
|
|
ber_int_t *enctypes)
|
||
|
|
{
|
||
|
|
struct krb_key_salt *ksdata;
|
||
|
|
@@ -507,7 +507,7 @@ static int ldap_set_keytab(krb5_context krbctx,
|
||
|
|
BerElement *sctrl = NULL;
|
||
|
|
struct berval *control = NULL;
|
||
|
|
LDAPControl **srvctrl = NULL;
|
||
|
|
- int ret;
|
||
|
|
+ ber_tag_t ret;
|
||
|
|
int kvno, i;
|
||
|
|
ber_tag_t rtag;
|
||
|
|
ber_int_t *encs = NULL;
|
||
|
|
@@ -826,7 +826,7 @@ static int config_from_file(struct ini_cfgobj *cfgctx)
|
||
|
|
return 0;
|
||
|
|
}
|
||
|
|
|
||
|
|
-int read_ipa_config(struct ipa_config **ipacfg)
|
||
|
|
+static int read_ipa_config(struct ipa_config **ipacfg)
|
||
|
|
{
|
||
|
|
struct ini_cfgobj *cfgctx = NULL;
|
||
|
|
struct value_obj *obj = NULL;
|
||
|
|
--
|
||
|
|
2.31.1
|
||
|
|
|