|
 |
b5a845 |
|
|
|
b5a845 |
Compiler warning fixes.
|
|
|
b5a845 |
|
|
|
b5a845 |
--- mod_auth_kerb-5.4/src/mod_auth_kerb.c.fixes
|
|
|
b5a845 |
+++ mod_auth_kerb-5.4/src/mod_auth_kerb.c
|
|
|
b5a845 |
@@ -677,7 +677,8 @@ end:
|
|
|
b5a845 |
static krb5_error_code
|
|
|
b5a845 |
verify_krb5_user(request_rec *r, krb5_context context, krb5_principal principal,
|
|
|
b5a845 |
const char *password, krb5_principal server,
|
|
|
b5a845 |
- krb5_keytab keytab, int krb_verify_kdc, char *krb_service_name, krb5_ccache *ccache)
|
|
|
b5a845 |
+ krb5_keytab keytab, int krb_verify_kdc,
|
|
|
b5a845 |
+ const char *krb_service_name, krb5_ccache *ccache)
|
|
|
b5a845 |
{
|
|
|
b5a845 |
krb5_creds creds;
|
|
|
b5a845 |
krb5_get_init_creds_opt options;
|
|
|
b5a845 |
@@ -1280,6 +1281,7 @@ get_gss_creds(request_rec *r,
|
|
|
b5a845 |
return 0;
|
|
|
b5a845 |
}
|
|
|
b5a845 |
|
|
|
b5a845 |
+#ifndef GSSAPI_SUPPORTS_SPNEGO
|
|
|
b5a845 |
static int
|
|
|
b5a845 |
cmp_gss_type(gss_buffer_t token, gss_OID oid)
|
|
|
b5a845 |
{
|
|
|
b5a845 |
@@ -1306,6 +1308,7 @@ cmp_gss_type(gss_buffer_t token, gss_OID
|
|
|
b5a845 |
|
|
|
b5a845 |
return memcmp(p, oid->elements, oid->length);
|
|
|
b5a845 |
}
|
|
|
b5a845 |
+#endif
|
|
|
b5a845 |
|
|
|
b5a845 |
static int
|
|
|
b5a845 |
authenticate_user_gss(request_rec *r, kerb_auth_config *conf,
|
|
|
b5a845 |
@@ -1722,7 +1725,7 @@ kerb_authenticate_user(request_rec *r)
|
|
|
b5a845 |
return ret;
|
|
|
b5a845 |
}
|
|
|
b5a845 |
|
|
|
b5a845 |
-int
|
|
|
b5a845 |
+static int
|
|
|
b5a845 |
have_rcache_type(const char *type)
|
|
|
b5a845 |
{
|
|
|
b5a845 |
krb5_error_code ret;
|