add upstream crashfix patch
This commit is contained in:
parent
a04da4baa4
commit
a134a66915
37
krb5-1.10-crashfix.patch
Normal file
37
krb5-1.10-crashfix.patch
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
diff --git a/src/kdc/do_as_req.c b/src/kdc/do_as_req.c
|
||||||
|
index 5e69653..4651b72 100644
|
||||||
|
--- a/src/kdc/do_as_req.c
|
||||||
|
+++ b/src/kdc/do_as_req.c
|
||||||
|
@@ -102,6 +102,7 @@ struct as_req_state {
|
||||||
|
loop_respond_fn respond;
|
||||||
|
void *arg;
|
||||||
|
|
||||||
|
+ krb5_principal_data client_princ;
|
||||||
|
krb5_enc_tkt_part enc_tkt_reply;
|
||||||
|
krb5_enc_kdc_rep_part reply_encpart;
|
||||||
|
krb5_ticket ticket_reply;
|
||||||
|
@@ -458,7 +459,6 @@ process_as_req(krb5_kdc_req *request, krb5_data *req_pkt,
|
||||||
|
krb5_error_code errcode;
|
||||||
|
krb5_timestamp rtime;
|
||||||
|
unsigned int s_flags = 0;
|
||||||
|
- krb5_principal_data client_princ;
|
||||||
|
krb5_data encoded_req_body;
|
||||||
|
krb5_enctype useenctype;
|
||||||
|
struct as_req_state *state;
|
||||||
|
@@ -680,13 +680,13 @@ process_as_req(krb5_kdc_req *request, krb5_data *req_pkt,
|
||||||
|
|
||||||
|
state->enc_tkt_reply.session = &state->session_key;
|
||||||
|
if (isflagset(state->c_flags, KRB5_KDB_FLAG_CANONICALIZE)) {
|
||||||
|
- client_princ = *(state->client->princ);
|
||||||
|
+ state->client_princ = *(state->client->princ);
|
||||||
|
} else {
|
||||||
|
- client_princ = *(state->request->client);
|
||||||
|
+ state->client_princ = *(state->request->client);
|
||||||
|
/* The realm is always canonicalized */
|
||||||
|
- client_princ.realm = state->client->princ->realm;
|
||||||
|
+ state->client_princ.realm = state->client->princ->realm;
|
||||||
|
}
|
||||||
|
- state->enc_tkt_reply.client = &client_princ;
|
||||||
|
+ state->enc_tkt_reply.client = &state->client_princ;
|
||||||
|
state->enc_tkt_reply.transited.tr_type = KRB5_DOMAIN_X500_COMPRESS;
|
||||||
|
state->enc_tkt_reply.transited.tr_contents = empty_string;
|
@ -15,7 +15,7 @@
|
|||||||
Summary: The Kerberos network authentication system
|
Summary: The Kerberos network authentication system
|
||||||
Name: krb5
|
Name: krb5
|
||||||
Version: 1.10
|
Version: 1.10
|
||||||
Release: 0%{?dist}.beta1.1
|
Release: 1%{?dist}.beta1.1
|
||||||
# Maybe we should explode from the now-available-to-everybody tarball instead?
|
# Maybe we should explode from the now-available-to-everybody tarball instead?
|
||||||
# http://web.mit.edu/kerberos/dist/krb5/1.10/krb5-1.10-beta1-signed.tar
|
# http://web.mit.edu/kerberos/dist/krb5/1.10/krb5-1.10-beta1-signed.tar
|
||||||
Source0: krb5-%{version}-beta1.tar.gz
|
Source0: krb5-%{version}-beta1.tar.gz
|
||||||
@ -61,6 +61,7 @@ Patch100: krb5-trunk-7046.patch
|
|||||||
Patch101: krb5-trunk-7047.patch
|
Patch101: krb5-trunk-7047.patch
|
||||||
Patch102: krb5-trunk-7048.patch
|
Patch102: krb5-trunk-7048.patch
|
||||||
Patch103: krb5-1.10-gcc47.patch
|
Patch103: krb5-1.10-gcc47.patch
|
||||||
|
Patch104: krb5-1.10-crashfix.patch
|
||||||
|
|
||||||
License: MIT
|
License: MIT
|
||||||
URL: http://web.mit.edu/kerberos/www/
|
URL: http://web.mit.edu/kerberos/www/
|
||||||
@ -230,6 +231,7 @@ ln -s NOTICE LICENSE
|
|||||||
%patch101 -p1 -b .7047
|
%patch101 -p1 -b .7047
|
||||||
%patch102 -p1 -b .7048
|
%patch102 -p1 -b .7048
|
||||||
%patch103 -p0 -b .gcc47
|
%patch103 -p0 -b .gcc47
|
||||||
|
%patch104 -p1 -b .crashfix
|
||||||
rm src/lib/krb5/krb/deltat.c
|
rm src/lib/krb5/krb/deltat.c
|
||||||
|
|
||||||
gzip doc/*.ps
|
gzip doc/*.ps
|
||||||
@ -741,6 +743,9 @@ exit 0
|
|||||||
%{_sbindir}/uuserver
|
%{_sbindir}/uuserver
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jan 26 2012 Nathaniel McCallum <nathaniel@natemccallum.com> - 1.10-1.beta1.1
|
||||||
|
- Add upstream crashfix patch
|
||||||
|
|
||||||
* Thu Jan 12 2012 Nalin Dahyabhai <nalin@redhat.com> 1.10-0.beta1.1
|
* Thu Jan 12 2012 Nalin Dahyabhai <nalin@redhat.com> 1.10-0.beta1.1
|
||||||
- update to beta 1
|
- update to beta 1
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user