diff options
| author | adrianp <adrianp@pkgsrc.org> | 2006-11-23 11:57:07 +0000 |
|---|---|---|
| committer | adrianp <adrianp@pkgsrc.org> | 2006-11-23 11:57:07 +0000 |
| commit | e4d502c3f51737d57babd567f26c8eb4e15339b6 (patch) | |
| tree | c72f62b09e2b8184fa0ea2086b7301375611cae7 /net/proftpd | |
| parent | 89860a6f424207bde9dc6c7bc8042d8c7ea796af (diff) | |
| download | pkgsrc-e4d502c3f51737d57babd567f26c8eb4e15339b6.tar.gz | |
Updated patch-ac via Debian to fix PR #35092
Diffstat (limited to 'net/proftpd')
| -rw-r--r-- | net/proftpd/Makefile | 4 | ||||
| -rw-r--r-- | net/proftpd/distinfo | 4 | ||||
| -rw-r--r-- | net/proftpd/patches/patch-ac | 50 |
3 files changed, 30 insertions, 28 deletions
diff --git a/net/proftpd/Makefile b/net/proftpd/Makefile index 097797d36f6..30b6769c157 100644 --- a/net/proftpd/Makefile +++ b/net/proftpd/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.36 2006/11/18 14:32:58 adrianp Exp $ +# $NetBSD: Makefile,v 1.37 2006/11/23 11:57:07 adrianp Exp $ DISTNAME= proftpd-1.3.0 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= net MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ \ ftp://ftp.servus.at/ProFTPD/distrib/source/ \ diff --git a/net/proftpd/distinfo b/net/proftpd/distinfo index 0b91f5d2e86..0ace3b69be7 100644 --- a/net/proftpd/distinfo +++ b/net/proftpd/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.19 2006/11/18 14:32:58 adrianp Exp $ +$NetBSD: distinfo,v 1.20 2006/11/23 11:57:07 adrianp Exp $ SHA1 (proftpd-1.3.0.tar.bz2) = d117134035a3d8d130c5aa44d6b1788683a33410 RMD160 (proftpd-1.3.0.tar.bz2) = 46cdd29a6c6ce4c3dd8f1a972df0a52b90a6d2ec Size (proftpd-1.3.0.tar.bz2) = 1386086 bytes SHA1 (patch-aa) = 5ebfe97a0edb8ecee7495fd5d487eff3cf32d1fe SHA1 (patch-ab) = 8886177b90089c8a2fa580aceb7a0514fe0ea6a7 -SHA1 (patch-ac) = 25a0b27773e5e025096cf08ad33243aaf143fbb8 +SHA1 (patch-ac) = 4cdfd0cff027524c38785a5a45bae747e3b151f7 diff --git a/net/proftpd/patches/patch-ac b/net/proftpd/patches/patch-ac index 9da9504f99d..2f8048a29df 100644 --- a/net/proftpd/patches/patch-ac +++ b/net/proftpd/patches/patch-ac @@ -1,47 +1,49 @@ -$NetBSD: patch-ac,v 1.5 2006/11/18 14:32:58 adrianp Exp $ +$NetBSD: patch-ac,v 1.6 2006/11/23 11:57:07 adrianp Exp $ ---- src/main.c.orig 2006-11-18 14:24:35.000000000 +0000 +--- src/main.c.orig 2006-03-15 19:41:01.000000000 +0000 +++ src/main.c @@ -116,6 +116,8 @@ static unsigned char have_dead_child = F static char sbuf[PR_TUNABLE_BUFFER_SIZE] = {'\0'}; -+#define PR_DEFAULT_CMD_BUFSZ 512 ++#define PR_DEFAULT_CMD_BUFSZ 512 + static char **Argv = NULL; static char *LastArgv = NULL; static const char *PidPath = PR_PID_FILE_PATH; -@@ -820,16 +822,25 @@ static void cmd_loop(server_rec *server, +@@ -820,17 +822,24 @@ static void cmd_loop(server_rec *server, pr_timer_reset(TIMER_IDLE, NULL); if (cmd_buf_size == -1) { - long *buf_size = get_param_ptr(main_server->conf, - "CommandBufferSize", FALSE); -+ int *bufsz = get_param_ptr(main_server->conf, "CommandBufferSize", -+ FALSE); - +- - if (buf_size == NULL || *buf_size <= 0) - cmd_buf_size = 512; -+ if (bufsz == NULL || -+ *bufsz <= 0) { -+ pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%d) " -+ "given, resetting to default buffer size (%u)", -+ *bufsz, (unsigned int) PR_DEFAULT_CMD_BUFSZ); -+ cmd_buf_size = PR_DEFAULT_CMD_BUFSZ; -+ -+ } else if (*bufsz + 1 > sizeof(buf)) { -+ pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%d) " -+ "given, resetting to default buffer size (%u)", -+ *bufsz, (unsigned int) PR_DEFAULT_CMD_BUFSZ); -+ cmd_buf_size = PR_DEFAULT_CMD_BUFSZ; - +- - else if (*buf_size + 1 > sizeof(buf)) { - pr_log_pri(PR_LOG_WARNING, "Invalid CommandBufferSize size given. " - "Resetting to 512."); - cmd_buf_size = 512; -+ } else { -+ pr_log_debug(DEBUG1, "setting CommandBufferSize to %d", *bufsz); -+ cmd_buf_size = (long) *bufsz; - } +- } ++ int *bufsz = get_param_ptr(main_server->conf, "CommandBufferSize", FALSE); ++ if (bufsz == NULL) { ++ cmd_buf_size = PR_DEFAULT_CMD_BUFSZ; ++ } ++ else if ( bufsz <= 0 ) { ++ pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%d) " ++ "given, resetting to default buffer size (%u)", ++ *bufsz, (unsigned int) PR_DEFAULT_CMD_BUFSZ); ++ cmd_buf_size = PR_DEFAULT_CMD_BUFSZ; ++ } else if (*bufsz + 1 > sizeof(buf)) { ++ pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%d) " ++ "given, using default buffer size (%u) instead", ++ *bufsz, (unsigned int) PR_DEFAULT_CMD_BUFSZ); ++ cmd_buf_size = PR_DEFAULT_CMD_BUFSZ; ++ } else { ++ pr_log_debug(DEBUG1, "setting CommandBufferSize to %d", *bufsz); ++ cmd_buf_size = (long) *bufsz; ++ } } + buf[cmd_buf_size - 1] = '\0'; |