- Fix the last imported patch (which came from proftpd's CVS repo),
as it was causing segfaults prior to login. - Add the new CommandBufferSize variable into the default config file to stop proftpd complaining. Reported by: many
This commit is contained in:
parent
74b21cba44
commit
bd5fca5738
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=177332
@ -7,7 +7,7 @@
|
||||
|
||||
PORTNAME= proftpd
|
||||
DISTVERSION= 1.3.0
|
||||
PORTREVISION= 3
|
||||
PORTREVISION= 4
|
||||
CATEGORIES= ftp
|
||||
MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ \
|
||||
ftp://ftp.fastorama.com/mirrors/ftp.proftpd.org/distrib/source/ \
|
||||
|
@ -1,5 +1,5 @@
|
||||
--- src/main.c.orig Wed Mar 15 21:41:01 2006
|
||||
+++ src/main.c Tue Nov 14 08:47:12 2006
|
||||
--- src/main.c.orig Wed Mar 15 19:41:01 2006
|
||||
+++ src/main.c Wed Nov 15 19:06:18 2006
|
||||
@@ -116,6 +116,8 @@
|
||||
|
||||
static char sbuf[PR_TUNABLE_BUFFER_SIZE] = {'\0'};
|
||||
@ -27,9 +27,9 @@
|
||||
- cmd_buf_size = 512;
|
||||
+ if (bufsz == NULL ||
|
||||
+ *bufsz <= 0) {
|
||||
+ pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%d) "
|
||||
+ pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size "
|
||||
+ "given, resetting to default buffer size (%u)",
|
||||
+ *bufsz, (unsigned int) PR_DEFAULT_CMD_BUFSZ);
|
||||
+ (unsigned int) PR_DEFAULT_CMD_BUFSZ);
|
||||
+ cmd_buf_size = PR_DEFAULT_CMD_BUFSZ;
|
||||
+
|
||||
+ } else if (*bufsz + 1 > sizeof(buf)) {
|
||||
|
@ -1,5 +1,5 @@
|
||||
--- sample-configurations/basic.conf.orig Fri Jun 17 15:10:06 2005
|
||||
+++ sample-configurations/basic.conf Fri Jun 17 15:10:43 2005
|
||||
--- sample-configurations/basic.conf.orig Thu Apr 15 19:46:38 2004
|
||||
+++ sample-configurations/basic.conf Wed Nov 15 19:14:36 2006
|
||||
@@ -1,3 +1,7 @@
|
||||
+#
|
||||
+# To have more informations about Proftpd configuration
|
||||
@ -16,7 +16,16 @@
|
||||
|
||||
# Port 21 is the standard FTP port.
|
||||
Port 21
|
||||
@@ -40,23 +45,29 @@
|
||||
@@ -22,6 +27,8 @@
|
||||
# (such as xinetd).
|
||||
MaxInstances 30
|
||||
|
||||
+CommandBufferSize 512
|
||||
+
|
||||
# Set the user and group under which the server will run.
|
||||
User nobody
|
||||
Group nogroup
|
||||
@@ -40,23 +47,29 @@
|
||||
|
||||
# A basic anonymous configuration, no upload directories. If you do not
|
||||
# want anonymous users, simply delete this entire <Anonymous> section.
|
||||
|
@ -7,7 +7,7 @@
|
||||
|
||||
PORTNAME= proftpd
|
||||
DISTVERSION= 1.3.0
|
||||
PORTREVISION= 3
|
||||
PORTREVISION= 4
|
||||
CATEGORIES= ftp
|
||||
MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ \
|
||||
ftp://ftp.fastorama.com/mirrors/ftp.proftpd.org/distrib/source/ \
|
||||
|
@ -1,5 +1,5 @@
|
||||
--- src/main.c.orig Wed Mar 15 21:41:01 2006
|
||||
+++ src/main.c Tue Nov 14 08:47:12 2006
|
||||
--- src/main.c.orig Wed Mar 15 19:41:01 2006
|
||||
+++ src/main.c Wed Nov 15 19:06:18 2006
|
||||
@@ -116,6 +116,8 @@
|
||||
|
||||
static char sbuf[PR_TUNABLE_BUFFER_SIZE] = {'\0'};
|
||||
@ -27,9 +27,9 @@
|
||||
- cmd_buf_size = 512;
|
||||
+ if (bufsz == NULL ||
|
||||
+ *bufsz <= 0) {
|
||||
+ pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%d) "
|
||||
+ pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size "
|
||||
+ "given, resetting to default buffer size (%u)",
|
||||
+ *bufsz, (unsigned int) PR_DEFAULT_CMD_BUFSZ);
|
||||
+ (unsigned int) PR_DEFAULT_CMD_BUFSZ);
|
||||
+ cmd_buf_size = PR_DEFAULT_CMD_BUFSZ;
|
||||
+
|
||||
+ } else if (*bufsz + 1 > sizeof(buf)) {
|
||||
|
@ -1,5 +1,5 @@
|
||||
--- sample-configurations/basic.conf.orig Fri Jun 17 15:10:06 2005
|
||||
+++ sample-configurations/basic.conf Fri Jun 17 15:10:43 2005
|
||||
--- sample-configurations/basic.conf.orig Thu Apr 15 19:46:38 2004
|
||||
+++ sample-configurations/basic.conf Wed Nov 15 19:14:36 2006
|
||||
@@ -1,3 +1,7 @@
|
||||
+#
|
||||
+# To have more informations about Proftpd configuration
|
||||
@ -16,7 +16,16 @@
|
||||
|
||||
# Port 21 is the standard FTP port.
|
||||
Port 21
|
||||
@@ -40,23 +45,29 @@
|
||||
@@ -22,6 +27,8 @@
|
||||
# (such as xinetd).
|
||||
MaxInstances 30
|
||||
|
||||
+CommandBufferSize 512
|
||||
+
|
||||
# Set the user and group under which the server will run.
|
||||
User nobody
|
||||
Group nogroup
|
||||
@@ -40,23 +47,29 @@
|
||||
|
||||
# A basic anonymous configuration, no upload directories. If you do not
|
||||
# want anonymous users, simply delete this entire <Anonymous> section.
|
||||
|
Loading…
Reference in New Issue
Block a user