1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-27 00:57:50 +00:00

Add back files/patch-af which should never be removed. This patch takes care of two remote buffer overflows in server/misc.c. This patch was accidentally removed when the port was upgraded.

Since this fixes a security problem, bump the port revision.

Pointed-Out by:	TOGAWA Satoshi <toga@puyo.org>
This commit is contained in:
Masafumi Max NAKANE 2002-08-08 04:53:19 +00:00
parent febad4cafd
commit 96dff61bf0
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=64197
6 changed files with 69 additions and 3 deletions

View File

@ -8,7 +8,7 @@
PORTNAME= Canna
PORTVERSION= 3.5b2
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= japanese
MASTER_SITES= ftp://ftp.tokyonet.ad.jp/pub/misc/Canna/Canna35/ \
ftp://ftp.biglobe.ne.jp/pub/tool/Canna/Canna35/ \

View File

@ -0,0 +1,22 @@
--- server/misc.c.orig Wed Nov 27 16:30:30 1996
+++ server/misc.c Thu Aug 8 13:44:03 2002
@@ -649,12 +649,19 @@
if (client->username && client->username[0]) {
if (client->groupname && client->groupname[0]) {
+ if (strlen(DDUSER) + strlen(client->username) +
+ strlen(DDGROUP) + strlen(client->groupname) +
+ strlen(DDPATH) + 4 >= 256)
+ return ( -1 );
sprintf(dichome, "%s/%s:%s/%s:%s",
DDUSER, client->username,
DDGROUP, client->groupname,
DDPATH);
}
else {
+ if (strlen(DDUSER) + strlen(client->username) +
+ strlen(DDPATH) + 2 >= 256)
+ return ( -1 );
sprintf(dichome, "%s/%s:%s",
DDUSER, client->username,
DDPATH);

View File

@ -8,7 +8,7 @@
PORTNAME= Canna
PORTVERSION= 3.5b2
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= japanese
MASTER_SITES= ftp://ftp.tokyonet.ad.jp/pub/misc/Canna/Canna35/ \
ftp://ftp.biglobe.ne.jp/pub/tool/Canna/Canna35/ \

View File

@ -0,0 +1,22 @@
--- server/misc.c.orig Wed Nov 27 16:30:30 1996
+++ server/misc.c Thu Aug 8 13:44:03 2002
@@ -649,12 +649,19 @@
if (client->username && client->username[0]) {
if (client->groupname && client->groupname[0]) {
+ if (strlen(DDUSER) + strlen(client->username) +
+ strlen(DDGROUP) + strlen(client->groupname) +
+ strlen(DDPATH) + 4 >= 256)
+ return ( -1 );
sprintf(dichome, "%s/%s:%s/%s:%s",
DDUSER, client->username,
DDGROUP, client->groupname,
DDPATH);
}
else {
+ if (strlen(DDUSER) + strlen(client->username) +
+ strlen(DDPATH) + 2 >= 256)
+ return ( -1 );
sprintf(dichome, "%s/%s:%s",
DDUSER, client->username,
DDPATH);

View File

@ -8,7 +8,7 @@
PORTNAME= Canna
PORTVERSION= 3.5b2
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= japanese
MASTER_SITES= ftp://ftp.tokyonet.ad.jp/pub/misc/Canna/Canna35/ \
ftp://ftp.biglobe.ne.jp/pub/tool/Canna/Canna35/ \

View File

@ -0,0 +1,22 @@
--- server/misc.c.orig Wed Nov 27 16:30:30 1996
+++ server/misc.c Thu Aug 8 13:44:03 2002
@@ -649,12 +649,19 @@
if (client->username && client->username[0]) {
if (client->groupname && client->groupname[0]) {
+ if (strlen(DDUSER) + strlen(client->username) +
+ strlen(DDGROUP) + strlen(client->groupname) +
+ strlen(DDPATH) + 4 >= 256)
+ return ( -1 );
sprintf(dichome, "%s/%s:%s/%s:%s",
DDUSER, client->username,
DDGROUP, client->groupname,
DDPATH);
}
else {
+ if (strlen(DDUSER) + strlen(client->username) +
+ strlen(DDPATH) + 2 >= 256)
+ return ( -1 );
sprintf(dichome, "%s/%s:%s",
DDUSER, client->username,
DDPATH);