[Frugalware-darcs] frugalware-current: proftpd-1.3.0-2-i686

[voroskoi]

Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061123220902-dd049-9cfd3071281625fda0f499a14f833aeaae4f7bc2.gz;

[proftpd-1.3.0-2-i686
voroskoi <voroskoi at frugalware.org>**20061123220902
 secfix relbump, closes #1484
] {
addfile ./source/network/proftpd/cmd_loop_fix.patch
hunk ./source/network/proftpd/FrugalBuild 7
-pkgrel=1
+pkgrel=2
hunk ./source/network/proftpd/FrugalBuild 17
-	rc.proftpd proftpd.conf ftpusers)
-sha1sums=('d117134035a3d8d130c5aa44d6b1788683a33410' \
-	'42e7041d44446bdc9577a3c06fc78c97e95d00e1' \
-	'08eef67bc0bf9b851899189e99ab08dc3120f064' \
-	'b98fb782b45916364e5dd0ce4084bf86bdc20ae4')
+	rc.proftpd proftpd.conf ftpusers cmd_loop_fix.patch)
hunk ./source/network/proftpd/FrugalBuild 30
+sha1sums=('d117134035a3d8d130c5aa44d6b1788683a33410' \
+	  '42e7041d44446bdc9577a3c06fc78c97e95d00e1' \
+	  '08eef67bc0bf9b851899189e99ab08dc3120f064' \
+	  'b98fb782b45916364e5dd0ce4084bf86bdc20ae4' \
+	  '3c825dfbb08a45c4927e61b90f74a86267f21128')
hunk ./source/network/proftpd/FrugalBuild 38
+# optimization OK
+
hunk ./source/network/proftpd/cmd_loop_fix.patch 1
+--- proftpd-1.3.0/src/main.c	2006-03-15 20:41:01.000000000 +0100
++++ proftpd-1.3.0/src/main.c.new	2006-11-23 22:55:28.000000000 +0100
+@@ -116,6 +116,8 @@
+ 
+ static char sbuf[PR_TUNABLE_BUFFER_SIZE] = {'\0'};
+ 
++#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,23 @@
+       pr_timer_reset(TIMER_IDLE, NULL);
+ 
+     if (cmd_buf_size == -1) {
+-      long *buf_size = get_param_ptr(main_server->conf,
+-        "CommandBufferSize", FALSE);
+-
+-      if (buf_size == NULL || *buf_size <= 0)
+-        cmd_buf_size = 512;
+-
+-      else if (*buf_size + 1 > sizeof(buf)) {
+-	pr_log_pri(PR_LOG_WARNING, "Invalid CommandBufferSize size given. "
+-          "Resetting to 512.");
+-	cmd_buf_size = 512;
++	    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, using default buffer size (%u) instead",
++				    *bufsz, 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, 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;
+       }
+     }
+ 
}