/[gentoo]/src/patchsets/mit-krb5/1.5.3/003_all_mit-krb5-SA-2007-006.patch
Gentoo

Contents of /src/patchsets/mit-krb5/1.5.3/003_all_mit-krb5-SA-2007-006.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.2 - (hide annotations) (download)
Fri Sep 7 06:22:15 2007 UTC (6 years, 11 months ago) by seemant
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +25 -11 lines
update the patch with the newer one pointed to in bug 191301

1 seemant 1.1 diff -urN krb5-1.5.3.orig/src/lib/kadm5/srv/svr_policy.c krb5-1.5.3/src/lib/kadm5/srv/svr_policy.c
2     --- krb5-1.5.3.orig/src/lib/kadm5/srv/svr_policy.c 2006-04-13 14:58:56.000000000 -0400
3 seemant 1.2 +++ krb5-1.5.3/src/lib/kadm5/srv/svr_policy.c 2007-09-07 02:18:40.000000000 -0400
4 seemant 1.1 @@ -211,8 +211,9 @@
5     if((mask & KADM5_POLICY))
6     return KADM5_BAD_MASK;
7    
8     - ret = krb5_db_get_policy(handle->context, entry->policy, &p, &cnt);
9     - if( ret && (cnt==0) )
10     + if ((ret = krb5_db_get_policy(handle->context, entry->policy, &p, &cnt)))
11 seemant 1.2 + return ret;
12     + if (cnt != 1)
13 seemant 1.1 return KADM5_UNK_POLICY;
14    
15     if ((mask & KADM5_PW_MAX_LIFE))
16     diff -urN krb5-1.5.3.orig/src/lib/rpc/svc_auth_gss.c krb5-1.5.3/src/lib/rpc/svc_auth_gss.c
17     --- krb5-1.5.3.orig/src/lib/rpc/svc_auth_gss.c 2004-09-17 17:52:12.000000000 -0400
18 seemant 1.2 +++ krb5-1.5.3/src/lib/rpc/svc_auth_gss.c 2007-09-07 02:20:48.000000000 -0400
19     @@ -355,6 +355,14 @@
20     memset(rpchdr, 0, sizeof(rpchdr));
21    
22     /* XXX - Reconstruct RPC header for signing (from xdr_callmsg). */
23     + oa = &msg->rm_call.cb_cred;
24     + if (oa->oa_length > MAX_AUTH_BYTES)
25     + return (FALSE);
26     +
27     + /* 8 XDR units from the IXDR macro calls. */
28     + if (sizeof(rpchdr) < (8 * BYTES_PER_XDR_UNIT + RNDUP(oa->oa_length)))
29     + return FALSE;
30     +
31     buf = (int32_t *)(void *)rpchdr;
32     IXDR_PUT_LONG(buf, msg->rm_xid);
33     IXDR_PUT_ENUM(buf, msg->rm_direction);
34     @@ -362,7 +370,6 @@
35     IXDR_PUT_LONG(buf, msg->rm_call.cb_prog);
36     IXDR_PUT_LONG(buf, msg->rm_call.cb_vers);
37     IXDR_PUT_LONG(buf, msg->rm_call.cb_proc);
38     - oa = &msg->rm_call.cb_cred;
39 seemant 1.1 IXDR_PUT_ENUM(buf, oa->oa_flavor);
40     IXDR_PUT_LONG(buf, oa->oa_length);
41 seemant 1.2 if (oa->oa_length) {

  ViewVC Help
Powered by ViewVC 1.1.20