Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/proftpd/patches/proftpd-1.3.0a-cmdbufsize.patch

    Contents of /trunk/proftpd/patches/proftpd-1.3.0a-cmdbufsize.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 265 - (show annotations) (download)
    Wed Jul 11 23:16:10 2007 UTC (16 years, 10 months ago) by niro
    File size: 1659 byte(s) 
    - proftpd-1.3.0a-r1
    1 --- proftpd-1.3.0/src/main.c.cmdbufsize 2006-03-15 19:41:01.000000000 +0000
    2 +++ proftpd-1.3.0/src/main.c 2006-11-17 16:53:35.000000000 +0000
    3 @@ -116,6 +116,8 @@
    4
    5 static char sbuf[PR_TUNABLE_BUFFER_SIZE] = {'\0'};
    6
    7 +#define PR_DEFAULT_CMD_BUFSZ 512
    8 +
    9 static char **Argv = NULL;
    10 static char *LastArgv = NULL;
    11 static const char *PidPath = PR_PID_FILE_PATH;
    12 @@ -823,13 +825,26 @@
    13 long *buf_size = get_param_ptr(main_server->conf,
    14 "CommandBufferSize", FALSE);
    15
    16 - if (buf_size == NULL || *buf_size <= 0)
    17 - cmd_buf_size = 512;
    18 + if (buf_size == NULL) {
    19 + pr_log_debug(DEBUG1, "no CommandBufferSize size given, "
    20 + "using default buffer size (%u)", (unsigned int) PR_DEFAULT_CMD_BUFSZ);
    21 + cmd_buf_size = PR_DEFAULT_CMD_BUFSZ;
    22 +
    23 + } else if (*buf_size <= 0) {
    24 + pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%ld) "
    25 + "given, resetting to default buffer size (%u)",
    26 + *buf_size, (unsigned int) PR_DEFAULT_CMD_BUFSZ);
    27 + cmd_buf_size = PR_DEFAULT_CMD_BUFSZ;
    28 +
    29 + } else if (*buf_size + 1 > sizeof(buf)) {
    30 + pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%ld) "
    31 + "given, resetting to default buffer size (%u)",
    32 + *buf_size, (unsigned int) PR_DEFAULT_CMD_BUFSZ);
    33 + cmd_buf_size = PR_DEFAULT_CMD_BUFSZ;
    34
    35 - else if (*buf_size + 1 > sizeof(buf)) {
    36 - pr_log_pri(PR_LOG_WARNING, "Invalid CommandBufferSize size given. "
    37 - "Resetting to 512.");
    38 - cmd_buf_size = 512;
    39 + } else {
    40 + pr_log_debug(DEBUG1, "setting CommandBufferSize to %ld", *buf_size);
    41 + cmd_buf_size = (long) *buf_size;
    42 }
    43 }
    44