diff options
| author | Cy Schubert <cy@FreeBSD.org> | 2009-08-28 20:02:01 +0000 |
|---|---|---|
| committer | Cy Schubert <cy@FreeBSD.org> | 2009-08-28 20:02:01 +0000 |
| commit | dff989f0d4f6dd5563e4175a21c10a9eddd6a79b (patch) | |
| tree | 3fb4a2f868f404ab1666f91125487501f33a30c6 /security | |
| parent | - Fix fetch (diff) | |
Remove redundant length check.
Notes
Notes:
svn path=/head/; revision=240469
Diffstat (limited to 'security')
| -rw-r--r-- | security/krb5-16/Makefile | 2 | ||||
| -rw-r--r-- | security/krb5-16/files/patch-ai | 11 | ||||
| -rw-r--r-- | security/krb5/Makefile | 2 | ||||
| -rw-r--r-- | security/krb5/files/patch-ai | 11 |
4 files changed, 2 insertions, 24 deletions
diff --git a/security/krb5-16/Makefile b/security/krb5-16/Makefile index c132c0249ae9..712ee7d5f134 100644 --- a/security/krb5-16/Makefile +++ b/security/krb5-16/Makefile @@ -7,7 +7,7 @@ PORTNAME= krb5 PORTVERSION= 1.6.3 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= security MASTER_SITES= http://web.mit.edu/kerberos/dist/krb5/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/ PATCH_SITES= http://web.mit.edu/kerberos/advisories/ diff --git a/security/krb5-16/files/patch-ai b/security/krb5-16/files/patch-ai index f5b733194344..3588a76ed199 100644 --- a/security/krb5-16/files/patch-ai +++ b/security/krb5-16/files/patch-ai @@ -15,14 +15,3 @@ addrlen = sizeof (his_addr); if (getpeername(0, (struct sockaddr *)&his_addr, &addrlen) < 0) { -@@ -2312,6 +2318,10 @@ - if ((length = krb_mk_safe((u_char *)&cksum, out_buf, sizeof(cksum), - &kdata.session,&ctrl_addr, &his_addr)) == -1) { - secure_error("ADAT: krb_mk_safe failed"); -+ return(0); -+ } -+ if (length >= (FTP_BUFSIZ - sizeof("ADAT=")) / 4 * 3) { -+ secure_error("ADAT: reply too long"); - return(0); - } - if (length >= (FTP_BUFSIZ - sizeof("ADAT=")) / 4 * 3) { diff --git a/security/krb5/Makefile b/security/krb5/Makefile index c132c0249ae9..712ee7d5f134 100644 --- a/security/krb5/Makefile +++ b/security/krb5/Makefile @@ -7,7 +7,7 @@ PORTNAME= krb5 PORTVERSION= 1.6.3 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= security MASTER_SITES= http://web.mit.edu/kerberos/dist/krb5/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/ PATCH_SITES= http://web.mit.edu/kerberos/advisories/ diff --git a/security/krb5/files/patch-ai b/security/krb5/files/patch-ai index f5b733194344..3588a76ed199 100644 --- a/security/krb5/files/patch-ai +++ b/security/krb5/files/patch-ai @@ -15,14 +15,3 @@ addrlen = sizeof (his_addr); if (getpeername(0, (struct sockaddr *)&his_addr, &addrlen) < 0) { -@@ -2312,6 +2318,10 @@ - if ((length = krb_mk_safe((u_char *)&cksum, out_buf, sizeof(cksum), - &kdata.session,&ctrl_addr, &his_addr)) == -1) { - secure_error("ADAT: krb_mk_safe failed"); -+ return(0); -+ } -+ if (length >= (FTP_BUFSIZ - sizeof("ADAT=")) / 4 * 3) { -+ secure_error("ADAT: reply too long"); - return(0); - } - if (length >= (FTP_BUFSIZ - sizeof("ADAT=")) / 4 * 3) { |