|
 |
7d8bd7f |
--- src/main.c 2006/09/29 16:38:16 1.292
|
|
|
7d8bd7f |
+++ src/main.c 2006/10/31 22:49:03 1.293
|
|
|
7d8bd7f |
@@ -116,6 +116,8 @@ static unsigned char have_dead_child = F
|
|
|
7d8bd7f |
|
|
|
7d8bd7f |
static char sbuf[PR_TUNABLE_BUFFER_SIZE] = {'\0'};
|
|
|
7d8bd7f |
|
|
|
7d8bd7f |
+#define PR_DEFAULT_CMD_BUFSZ 512
|
|
|
7d8bd7f |
+
|
|
|
7d8bd7f |
static char **Argv = NULL;
|
|
|
7d8bd7f |
static char *LastArgv = NULL;
|
|
|
7d8bd7f |
static const char *PidPath = PR_PID_FILE_PATH;
|
|
|
7d8bd7f |
@@ -832,16 +834,25 @@
|
|
|
7d8bd7f |
pr_timer_reset(TIMER_IDLE, NULL);
|
|
|
7d8bd7f |
|
|
|
7d8bd7f |
if (cmd_buf_size == -1) {
|
|
|
7d8bd7f |
- long *buf_size = get_param_ptr(main_server->conf,
|
|
|
7d8bd7f |
- "CommandBufferSize", FALSE);
|
|
|
7d8bd7f |
+ int *bufsz = get_param_ptr(main_server->conf, "CommandBufferSize",
|
|
|
7d8bd7f |
+ FALSE);
|
|
|
7d8bd7f |
|
|
|
7d8bd7f |
- if (buf_size == NULL || *buf_size <= 0)
|
|
|
7d8bd7f |
- cmd_buf_size = 512;
|
|
|
7d8bd7f |
+ if (bufsz == NULL ||
|
|
|
7d8bd7f |
+ *bufsz <= 0) {
|
|
|
7d8bd7f |
+ pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%d) "
|
|
|
7d8bd7f |
+ "given, resetting to default buffer size (%u)",
|
|
|
7d8bd7f |
+ *bufsz, (unsigned int) PR_DEFAULT_CMD_BUFSZ);
|
|
|
7d8bd7f |
+ cmd_buf_size = PR_DEFAULT_CMD_BUFSZ;
|
|
|
7d8bd7f |
+
|
|
|
7d8bd7f |
+ } else if (*bufsz + 1 > sizeof(buf)) {
|
|
|
7d8bd7f |
+ pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%d) "
|
|
|
7d8bd7f |
+ "given, resetting to default buffer size (%u)",
|
|
|
7d8bd7f |
+ *bufsz, (unsigned int) PR_DEFAULT_CMD_BUFSZ);
|
|
|
7d8bd7f |
+ cmd_buf_size = PR_DEFAULT_CMD_BUFSZ;
|
|
|
7d8bd7f |
|
|
|
7d8bd7f |
- else if (*buf_size + 1 > sizeof(buf)) {
|
|
|
7d8bd7f |
- pr_log_pri(PR_LOG_WARNING, "Invalid CommandBufferSize size given. "
|
|
|
7d8bd7f |
- "Resetting to 512.");
|
|
|
7d8bd7f |
- cmd_buf_size = 512;
|
|
|
7d8bd7f |
+ } else {
|
|
|
7d8bd7f |
+ pr_log_debug(DEBUG1, "setting CommandBufferSize to %d", *bufsz);
|
|
|
7d8bd7f |
+ cmd_buf_size = (long) *bufsz;
|
|
|
7d8bd7f |
}
|
|
|
7d8bd7f |
}
|
|
|
7d8bd7f |
|