diff options
| author | Sergey A. Osokin <osa@FreeBSD.org> | 2022-07-14 08:41:20 -0400 |
|---|---|---|
| committer | Sergey A. Osokin <osa@FreeBSD.org> | 2022-07-14 09:04:34 -0400 |
| commit | 0019e69cb98de8981a18d5ec1222ebedec3df8cd (patch) | |
| tree | e0b3bd11091b907e895ffc967b7b3dca83be5f35 /www/nginx-devel/files | |
| parent | audio/spotify-qt: Update to 3.9 (diff) | |
www/nginx-devel: fix segfaults in the third-party spnego module
Reported by: pluknet
Patch from: pluknet
Bump PORTREVISION.
Diffstat (limited to 'www/nginx-devel/files')
| -rw-r--r-- | www/nginx-devel/files/extra-patch-ngx_http_auth_spnego_module.c | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/www/nginx-devel/files/extra-patch-ngx_http_auth_spnego_module.c b/www/nginx-devel/files/extra-patch-ngx_http_auth_spnego_module.c new file mode 100644 index 000000000000..40aea7e6e875 --- /dev/null +++ b/www/nginx-devel/files/extra-patch-ngx_http_auth_spnego_module.c @@ -0,0 +1,52 @@ +--- ../spnego-http-auth-nginx-module-c626163/ngx_http_auth_spnego_module.c.orig ++++ ../spnego-http-auth-nginx-module-c626163/ngx_http_auth_spnego_module.c +@@ -502,6 +502,7 @@ ngx_http_auth_spnego_headers_basic_only(ngx_http_request_t *r, + } + + r->headers_out.www_authenticate->hash = 1; ++ r->headers_out.www_authenticate->next = NULL; + r->headers_out.www_authenticate->key.len = sizeof("WWW-Authenticate") - 1; + r->headers_out.www_authenticate->key.data = (u_char *)"WWW-Authenticate"; + r->headers_out.www_authenticate->value.len = value.len; +@@ -538,6 +539,7 @@ ngx_http_auth_spnego_headers(ngx_http_request_t *r, + } + + r->headers_out.www_authenticate->hash = 1; ++ r->headers_out.www_authenticate->next = NULL; + r->headers_out.www_authenticate->key.len = sizeof("WWW-Authenticate") - 1; + r->headers_out.www_authenticate->key.data = (u_char *)"WWW-Authenticate"; + r->headers_out.www_authenticate->value.len = value.len; +@@ -559,6 +561,7 @@ ngx_http_auth_spnego_headers(ngx_http_request_t *r, + } + + r->headers_out.www_authenticate->hash = 2; ++ r->headers_out.www_authenticate->next = NULL; + r->headers_out.www_authenticate->key.len = + sizeof("WWW-Authenticate") - 1; + r->headers_out.www_authenticate->key.data = +@@ -758,6 +761,12 @@ ngx_http_auth_spnego_store_delegated_creds(ngx_http_request_t *r, + char *ccname = NULL; + char *escaped = NULL; + ++ if ((kerr = krb5_init_context(&kcontext))) { ++ spnego_log_error("Kerberos error: Cannot initialize kerberos context"); ++ spnego_log_krb5_error(kcontext, kerr); ++ goto done; ++ } ++ + if (!delegated_creds.data) { + spnego_log_error( + "ngx_http_auth_spnego_store_delegated_creds() NULL credentials"); +@@ -766,12 +775,6 @@ ngx_http_auth_spnego_store_delegated_creds(ngx_http_request_t *r, + goto done; + } + +- if ((kerr = krb5_init_context(&kcontext))) { +- spnego_log_error("Kerberos error: Cannot initialize kerberos context"); +- spnego_log_krb5_error(kcontext, kerr); +- goto done; +- } +- + if ((kerr = krb5_parse_name(kcontext, (char *)principal_name->data, + &principal))) { + spnego_log_error("Kerberos error: Cannot parse principal %s", |