| 1 |
seemant 07/09/07 06:22:16 |
| 2 |
|
| 3 |
Modified: 003_all_mit-krb5-SA-2007-006.patch |
| 4 |
Log: |
| 5 |
update the patch with the newer one pointed to in bug 191301 |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.2 src/patchsets/mit-krb5/1.5.3/003_all_mit-krb5-SA-2007-006.patch |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/mit-krb5/1.5.3/003_all_mit-krb5-SA-2007-006.patch?rev=1.2&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/mit-krb5/1.5.3/003_all_mit-krb5-SA-2007-006.patch?rev=1.2&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/mit-krb5/1.5.3/003_all_mit-krb5-SA-2007-006.patch?r1=1.1&r2=1.2 |
| 13 |
|
| 14 |
Index: 003_all_mit-krb5-SA-2007-006.patch |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo/src/patchsets/mit-krb5/1.5.3/003_all_mit-krb5-SA-2007-006.patch,v |
| 17 |
retrieving revision 1.1 |
| 18 |
retrieving revision 1.2 |
| 19 |
diff -u -r1.1 -r1.2 |
| 20 |
--- 003_all_mit-krb5-SA-2007-006.patch 7 Sep 2007 06:10:41 -0000 1.1 |
| 21 |
+++ 003_all_mit-krb5-SA-2007-006.patch 7 Sep 2007 06:22:15 -0000 1.2 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
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 |
| 24 |
--- krb5-1.5.3.orig/src/lib/kadm5/srv/svr_policy.c 2006-04-13 14:58:56.000000000 -0400 |
| 25 |
-+++ krb5-1.5.3/src/lib/kadm5/srv/svr_policy.c 2007-09-07 02:07:03.000000000 -0400 |
| 26 |
++++ krb5-1.5.3/src/lib/kadm5/srv/svr_policy.c 2007-09-07 02:18:40.000000000 -0400 |
| 27 |
@@ -211,8 +211,9 @@ |
| 28 |
if((mask & KADM5_POLICY)) |
| 29 |
return KADM5_BAD_MASK; |
| 30 |
@@ -8,20 +8,34 @@ |
| 31 |
- ret = krb5_db_get_policy(handle->context, entry->policy, &p, &cnt); |
| 32 |
- if( ret && (cnt==0) ) |
| 33 |
+ if ((ret = krb5_db_get_policy(handle->context, entry->policy, &p, &cnt))) |
| 34 |
-+ return ret; |
| 35 |
-+ if (cnt != 1) |
| 36 |
++ return ret; |
| 37 |
++ if (cnt != 1) |
| 38 |
return KADM5_UNK_POLICY; |
| 39 |
|
| 40 |
if ((mask & KADM5_PW_MAX_LIFE)) |
| 41 |
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 |
| 42 |
--- krb5-1.5.3.orig/src/lib/rpc/svc_auth_gss.c 2004-09-17 17:52:12.000000000 -0400 |
| 43 |
-+++ krb5-1.5.3/src/lib/rpc/svc_auth_gss.c 2007-09-07 02:08:00.000000000 -0400 |
| 44 |
-@@ -365,7 +365,7 @@ |
| 45 |
- oa = &msg->rm_call.cb_cred; |
| 46 |
++++ krb5-1.5.3/src/lib/rpc/svc_auth_gss.c 2007-09-07 02:20:48.000000000 -0400 |
| 47 |
+@@ -355,6 +355,14 @@ |
| 48 |
+ memset(rpchdr, 0, sizeof(rpchdr)); |
| 49 |
+ |
| 50 |
+ /* XXX - Reconstruct RPC header for signing (from xdr_callmsg). */ |
| 51 |
++ oa = &msg->rm_call.cb_cred; |
| 52 |
++ if (oa->oa_length > MAX_AUTH_BYTES) |
| 53 |
++ return (FALSE); |
| 54 |
++ |
| 55 |
++ /* 8 XDR units from the IXDR macro calls. */ |
| 56 |
++ if (sizeof(rpchdr) < (8 * BYTES_PER_XDR_UNIT + RNDUP(oa->oa_length))) |
| 57 |
++ return FALSE; |
| 58 |
++ |
| 59 |
+ buf = (int32_t *)(void *)rpchdr; |
| 60 |
+ IXDR_PUT_LONG(buf, msg->rm_xid); |
| 61 |
+ IXDR_PUT_ENUM(buf, msg->rm_direction); |
| 62 |
+@@ -362,7 +370,6 @@ |
| 63 |
+ IXDR_PUT_LONG(buf, msg->rm_call.cb_prog); |
| 64 |
+ IXDR_PUT_LONG(buf, msg->rm_call.cb_vers); |
| 65 |
+ IXDR_PUT_LONG(buf, msg->rm_call.cb_proc); |
| 66 |
+- oa = &msg->rm_call.cb_cred; |
| 67 |
IXDR_PUT_ENUM(buf, oa->oa_flavor); |
| 68 |
IXDR_PUT_LONG(buf, oa->oa_length); |
| 69 |
-- if (oa->oa_length) { |
| 70 |
-+ if (oa->oa_length && oa->oa_length <= sizeof(rpchdr)) { |
| 71 |
- memcpy((caddr_t)buf, oa->oa_base, oa->oa_length); |
| 72 |
- buf += RNDUP(oa->oa_length) / sizeof(int32_t); |
| 73 |
- } |
| 74 |
+ if (oa->oa_length) { |
| 75 |
|
| 76 |
|
| 77 |
|
| 78 |
-- |
| 79 |
gentoo-commits@g.o mailing list |
Archives