seemant 07/09/07 06:22:16
Modified: 003_all_mit-krb5-SA-2007-006.patch
Log:
update the patch with the newer one pointed to in bug 191301
Revision Changes Path
1.2 src/patchsets/mit-krb5/1.5.3/003_all_mit-krb5-SA-2007-006.patch
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
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
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
Index: 003_all_mit-krb5-SA-2007-006.patch
===================================================================
RCS file: /var/cvsroot/gentoo/src/patchsets/mit-krb5/1.5.3/003_all_mit-krb5-SA-2007-006.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 003_all_mit-krb5-SA-2007-006.patch 7 Sep 2007 06:10:41 -0000 1.1
+++ 003_all_mit-krb5-SA-2007-006.patch 7 Sep 2007 06:22:15 -0000 1.2
@@ -1,6 +1,6 @@
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
--- krb5-1.5.3.orig/src/lib/kadm5/srv/svr_policy.c 2006-04-13 14:58:56.000000000 -0400
-+++ krb5-1.5.3/src/lib/kadm5/srv/svr_policy.c 2007-09-07 02:07:03.000000000 -0400
++++ krb5-1.5.3/src/lib/kadm5/srv/svr_policy.c 2007-09-07 02:18:40.000000000 -0400
@@ -211,8 +211,9 @@
if((mask & KADM5_POLICY))
return KADM5_BAD_MASK;
@@ -8,20 +8,34 @@
- ret = krb5_db_get_policy(handle->context, entry->policy, &p, &cnt);
- if( ret && (cnt==0) )
+ if ((ret = krb5_db_get_policy(handle->context, entry->policy, &p, &cnt)))
-+ return ret;
-+ if (cnt != 1)
++ return ret;
++ if (cnt != 1)
return KADM5_UNK_POLICY;
if ((mask & KADM5_PW_MAX_LIFE))
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
--- krb5-1.5.3.orig/src/lib/rpc/svc_auth_gss.c 2004-09-17 17:52:12.000000000 -0400
-+++ krb5-1.5.3/src/lib/rpc/svc_auth_gss.c 2007-09-07 02:08:00.000000000 -0400
-@@ -365,7 +365,7 @@
- oa = &msg->rm_call.cb_cred;
++++ krb5-1.5.3/src/lib/rpc/svc_auth_gss.c 2007-09-07 02:20:48.000000000 -0400
+@@ -355,6 +355,14 @@
+ memset(rpchdr, 0, sizeof(rpchdr));
+
+ /* XXX - Reconstruct RPC header for signing (from xdr_callmsg). */
++ oa = &msg->rm_call.cb_cred;
++ if (oa->oa_length > MAX_AUTH_BYTES)
++ return (FALSE);
++
++ /* 8 XDR units from the IXDR macro calls. */
++ if (sizeof(rpchdr) < (8 * BYTES_PER_XDR_UNIT + RNDUP(oa->oa_length)))
++ return FALSE;
++
+ buf = (int32_t *)(void *)rpchdr;
+ IXDR_PUT_LONG(buf, msg->rm_xid);
+ IXDR_PUT_ENUM(buf, msg->rm_direction);
+@@ -362,7 +370,6 @@
+ IXDR_PUT_LONG(buf, msg->rm_call.cb_prog);
+ IXDR_PUT_LONG(buf, msg->rm_call.cb_vers);
+ IXDR_PUT_LONG(buf, msg->rm_call.cb_proc);
+- oa = &msg->rm_call.cb_cred;
IXDR_PUT_ENUM(buf, oa->oa_flavor);
IXDR_PUT_LONG(buf, oa->oa_length);
-- if (oa->oa_length) {
-+ if (oa->oa_length && oa->oa_length <= sizeof(rpchdr)) {
- memcpy((caddr_t)buf, oa->oa_base, oa->oa_length);
- buf += RNDUP(oa->oa_length) / sizeof(int32_t);
- }
+ if (oa->oa_length) {
--
gentoo-commits@g.o mailing list
|
